github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Binary files viewer (and detection)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8270 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-03-15 14:13:59 +00:00
commit 7aeed9b17b
18 changed files with 196 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

42
uppsrc/ide/idefile.cpp
View file

@ -460,20 +460,26 @@ void Ide::EditFile0(const String& path, byte charset, bool astext, const String&
editfile_isfolder = IsFolder(editfile);
svn_dirs = SvnDirs(true).GetCount(); // Perhaps not the best place, but should be ok
if(!astext && !(debugger && (PathIsEqual(path, posfile[0]) || PathIsEqual(path, posfile[0])))
&& editastext.Find(path) < 0 && !IsNestReadOnly(editfile)) {
bool candesigner = !astext && !(debugger && (PathIsEqual(path, posfile[0]) || PathIsEqual(path, posfile[0])))
&& editastext.Find(path) < 0 && !IsNestReadOnly(editfile);
if(candesigner) {
for(int i = 0; i < GetIdeModuleCount() && !designer; i++)
designer = GetIdeModule(i).CreateDesigner(this, path, charset);
if(designer) {
editpane.Add(designer->DesignerCtrl().SizePos());
designer->RestoreEditPos();
if(filetabs)
tabs.SetAddFile(editfile);
MakeTitle();
SetBar();
designer->SetFocus();
return;
}
}
if(!designer && editastext.Find(path) < 0 && (FileIsBinary(path) || editashex.Find(path) >= 0))
designer.Create<FileHexView>().Open(path);
if(designer) {
editpane.Add(designer->DesignerCtrl().SizePos());
designer->RestoreEditPos();
if(filetabs)
tabs.SetAddFile(editfile);
MakeTitle();
SetBar();
designer->SetFocus();
return;
}
tabs.SetAddFile(editfile);
@ -574,9 +580,20 @@ void Ide::TriggerAssistSync()
text_updated.KillSet(1000, THISBACK(EditFileAssistSync));
}
void Ide::EditAsHex()
{
String path = editfile;
editastext.RemoveKey(editfile);
editashex.FindPut(editfile);
byte cs = editor.GetCharset();
FlushFile();
EditFile0(path, cs);
}
void Ide::EditAsText()
{
String path = editfile;
editashex.RemoveKey(editfile);
editastext.FindPut(editfile);
byte cs = editor.GetCharset();
FlushFile();
@ -586,6 +603,7 @@ void Ide::EditAsText()
void Ide::EditUsingDesigner()
{
String path = editfile;
editashex.RemoveKey(editfile);
editastext.RemoveKey(editfile);
byte cs = editor.GetCharset();
FlushFile();