neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show UI before opening any file

This commit is contained in:
Zane U. Ji 2014-04-22 22:40:36 +08:00
parent 00d8e7783f
commit 89f25edc5d
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
+ x64 installation package + x64 installation package
+ Supported HTTPS on validation + Supported HTTPS on validation
* Auto complete list for DTDs that are on the internet * Auto complete list for DTDs that are on the internet
* Show UI before opening any file
* Fixed tab order * Fixed tab order
* Fixed encoding problems * Fixed encoding problems
* Fixed invisible captions in high contrast mode (Windows only, http://trac.wxwidgets.org/ticket/16186) * Fixed invisible captions in high contrast mode (Windows only, http://trac.wxwidgets.org/ticket/16186)

18
src/xmlcopyeditor.cpp
View File

@ -387,6 +387,13 @@ bool MyApp::OnInit()
singleInstanceCheck, singleInstanceCheck,
lang ); lang );
frame->Show ( true ); frame->Show ( true );
bool rememberOpenTabs = config->Read ( _T ( "rememberOpenTabs" ), true );
if ( rememberOpenTabs )
frame->openRememberedTabs();
else if ( !frame->getHandleCommandLineFlag() )
frame->newDocument ( wxEmptyString );
if ( frame->getHandleCommandLineFlag() ) if ( frame->getHandleCommandLineFlag() )
frame->handleCommandLine(); frame->handleCommandLine();
} }
@ -1033,21 +1040,10 @@ MyFrame::MyFrame (
// handle command line and, on Windows, MS Word integration // handle command line and, on Windows, MS Word integration
handleCommandLineFlag = ( wxTheApp->argc > 1 ) ? true : false; handleCommandLineFlag = ( wxTheApp->argc > 1 ) ? true : false;
if ( rememberOpenTabs && !openTabsOnClose.empty() )
openRememberedTabs();
else
{
if ( !handleCommandLineFlag )
newDocument ( wxEmptyString );
}
#ifdef __WXMSW__ #ifdef __WXMSW__
DragAcceptFiles ( true ); // currently Windows only DragAcceptFiles ( true ); // currently Windows only
#endif #endif
XmlDoc *doc = getActiveDocument();
insertEntityPanel->update ( doc ); // NULL is ok
manager.Update(); manager.Update();
/* /*

2
src/xmlcopyeditor.h
View File

@ -353,6 +353,7 @@ class MyFrame : public wxFrame
bool activateTab ( const wxString& fileName ); bool activateTab ( const wxString& fileName );
void reloadTab(); void reloadTab();
void addToFileQueue ( wxString& fileName ); void addToFileQueue ( wxString& fileName );
void openRememberedTabs();
private: private:
wxAuiManager manager; wxAuiManager manager;
wxFileConfig *config; // owned by MyApp wxFileConfig *config; // owned by MyApp
@ -536,7 +537,6 @@ class MyFrame : public wxFrame
void showTopBars ( bool b ); void showTopBars ( bool b );
void modifiedMessage(); void modifiedMessage();
void loadBitmaps(); void loadBitmaps();
void openRememberedTabs();
void getRawText ( XmlDoc *doc, std::string& buffer ); void getRawText ( XmlDoc *doc, std::string& buffer );
void updateToolbar(); void updateToolbar();
std::string getApproximateEncoding ( char *docBuffer, size_t docBufferLen ); std::string getApproximateEncoding ( char *docBuffer, size_t docBufferLen );