@@ -345,7 +345,6 @@ public: // Settings functions const wxLongLong& GetId() const; - void MoveOldSettings(eSettings& settings); // List of documents void GetDocList(vector<doc_id>& doclist) const; ecore/Catalyst.h ecore/ecore.lib ecore/ecored.lib @@ -21,8 +21,8 @@ #include "images/tmLanguage.xpm" /// Open a page saved from a previous session -BundleItemEditorCtrl::BundleItemEditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame, const wxPoint& pos, const wxSize& size): - EditorCtrl(page_id, cw, bitmap,parent,parentFrame,pos,size) +BundleItemEditorCtrl::BundleItemEditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame): + EditorCtrl(page_id, cw, bitmap, parent, parentFrame) { const PListHandler& plistHandler = m_syntaxHandler.GetPListHandler(); m_bundleType = plistHandler.GetBundleTypeFromUri(m_remotePath); src/BundleItemEditorCtrl.cpp @@ -7,7 +7,7 @@ class IUpdatePanel; class BundleItemEditorCtrl : public EditorCtrl { public: - BundleItemEditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame, const wxPoint& pos = wxPoint(-100,-100), const wxSize& size = wxDefaultSize); + BundleItemEditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame); BundleItemEditorCtrl(CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame, const wxPoint& pos = wxPoint(-100,-100), const wxSize& size = wxDefaultSize); src/BundleItemEditorCtrl.h @@ -46,13 +46,13 @@ CompareDlg::CompareDlg(wxWindow *parent, eSettings& settings): // Add recents wxArrayString recentPaths; - m_settings.GetRecentDiffs(recentPaths, eSettings::SP_LEFT); + m_settings.GetRecentDiffs(recentPaths, SP_LEFT); if (!recentPaths.empty()) { m_leftPathCtrl->Append(recentPaths); m_leftPathCtrl->SetSelection(0); } recentPaths.clear(); - m_settings.GetRecentDiffs(recentPaths, eSettings::SP_RIGHT); + m_settings.GetRecentDiffs(recentPaths, SP_RIGHT); if (!recentPaths.empty()) { m_rightPathCtrl->Append(recentPaths); m_rightPathCtrl->SetSelection(0); @@ -81,8 +81,8 @@ void CompareDlg::OnButtonOk(wxCommandEvent& evt) { const wxString leftPath = m_leftPathCtrl->GetValue(); const wxString rightPath = m_rightPathCtrl->GetValue(); - m_settings.AddRecentDiff(leftPath, eSettings::SP_LEFT); - m_settings.AddRecentDiff(rightPath, eSettings::SP_RIGHT); + m_settings.AddRecentDiff(leftPath, SP_LEFT); + m_settings.AddRecentDiff(rightPath, SP_RIGHT); // If we get here the paths are valid evt.Skip(); src/CompareDlg.cpp @@ -179,12 +179,12 @@ void DiffPanel::OnChildFocus(wxChildFocusEvent& event) { } } -void DiffPanel::SaveSettings(unsigned int i, eSettings& settings) { +void DiffPanel::SaveSettings(unsigned int i, eFrameSettings& settings) { m_leftEditor->SaveSettings(i, settings, 1); m_rightEditor->SaveSettings(i, settings, 2); } -void DiffPanel::RestoreSettings(unsigned int i, eSettings& settings) { +void DiffPanel::RestoreSettings(unsigned int i, eFrameSettings& settings) { m_leftEditor->RestoreSettings(i, settings, 1); m_rightEditor->RestoreSettings(i, settings, 2); src/DiffPanel.cpp @@ -28,6 +28,7 @@ class EditorCtrl; class DiffBar; class DiffMarkBar; class wxGridBagSizer; +class eFrameSettings; class DiffPanel : public wxPanel, public ITabPage { public: @@ -41,8 +42,8 @@ public: bool CmpPaths(const wxString& path1, const wxString& path2) const; void UpdateMarkBars(); - virtual void SaveSettings(unsigned int i, eSettings& settings); - void RestoreSettings(unsigned int i, eSettings& settings); + virtual void SaveSettings(unsigned int i, eFrameSettings& settings); + void RestoreSettings(unsigned int i, eFrameSettings& settings); virtual EditorCtrl* GetActiveEditor(); virtual const char** RecommendedIcon() const; src/DiffPanel.h @@ -40,7 +40,7 @@ END_EVENT_TABLE() DocHistory::DocHistory(CatalystWrapper& cw, int win_id, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size) : wxControl(parent, id, pos, size, wxNO_BORDER|wxWANTS_CHARS|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE), m_catalyst(cw), m_dispatcher(cw.GetDispatcher()), m_doc(cw), m_mdc(), m_bitmap(1,1), m_cell(m_mdc, m_doc), m_hotNode(-1), - m_revTooltip(cw) + m_revTooltip(cw), m_editorCtrl(NULL), m_source_win_id(win_id) { m_revTooltip.Create(this); m_tooltipTimer.SetOwner(this, ID_TOOLTIP_TIMER); @@ -49,7 +49,6 @@ DocHistory::DocHistory(CatalystWrapper& cw, int win_id, wxWindow* parent, wxWind // Initialize variables m_needRedrawing = true; // Make sure the ctrl gets drawn on first idle event m_document_id = -1; - m_source_win_id = win_id; m_scrollPos = 0; m_isScrolling = false; m_lineHeight = 18; @@ -65,6 +64,7 @@ DocHistory::DocHistory(CatalystWrapper& cw, int win_id, wxWindow* parent, wxWind m_mdc.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false)); // Make sure we recieve notifications of new versions and updates + m_dispatcher.SubscribeC(wxT("WIN_CLOSEPAGE"), (CALL_BACK)OnClosePage, this); m_dispatcher.SubscribeC(wxT("WIN_CHANGEDOC"), (CALL_BACK)OnChangeDoc, this); m_dispatcher.SubscribeC(wxT("DOC_UPDATED"), (CALL_BACK)OnDocUpdated, this); m_dispatcher.SubscribeC(wxT("DOC_DELETED"), (CALL_BACK)OnDocDeleted, this); @@ -74,6 +74,7 @@ DocHistory::DocHistory(CatalystWrapper& cw, int win_id, wxWindow* parent, wxWind } DocHistory::~DocHistory() { + m_dispatcher.UnSubscribe(wxT("WIN_CLOSEPAGE"), (CALL_BACK)OnClosePage, this); m_dispatcher.UnSubscribe(wxT("WIN_CHANGEDOC"), (CALL_BACK)OnChangeDoc, this); m_dispatcher.UnSubscribe(wxT("DOC_UPDATED"), (CALL_BACK)OnDocUpdated, this); m_dispatcher.UnSubscribe(wxT("DOC_DELETED"), (CALL_BACK)OnDocDeleted, this); @@ -85,6 +86,7 @@ DocHistory::~DocHistory() { void DocHistory::Clear() { // Invalidate doc ref m_sourceDoc.Invalidate(); + m_editorCtrl = NULL; // Clear data structures m_items.clear(); @@ -475,9 +477,9 @@ void DocHistory::OnMouseLeftDown(wxMouseEvent& event) { cxLOCK_READ(m_catalyst) draft_head = catalyst.GetDraftHead(hot_doc.document_id); cxENDLOCK - m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &draft_head, m_source_win_id); + m_editorCtrl->SetDocument(draft_head); } - else m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &hot_doc, m_source_win_id); + else m_editorCtrl->SetDocument(hot_doc); } } @@ -597,9 +599,9 @@ void DocHistory::OnVersionTreeSel(VersionTreeEvent& event) { cxLOCK_READ(m_catalyst) draft_head = catalyst.GetDraftHead(hot_doc.document_id); cxENDLOCK - m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &draft_head, m_source_win_id); + m_editorCtrl->SetDocument(draft_head); } - else m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &hot_doc, m_source_win_id); + else m_editorCtrl->SetDocument(hot_doc); } void DocHistory::OnVersionTreeTooltip(VersionTreeEvent& event) { @@ -651,12 +653,38 @@ void DocHistory::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { // # no evt.skip() as we don't want the control to erase the background } +void DocHistory::HandleDocUpdate(const doc_id& di) { + if (di == m_editorCtrl->GetDocID()) { + SetDocument(di); + } + else { + bool isSameDoc; + cxLOCK_READ(m_catalyst) + isSameDoc = catalyst.InSameHistory(di, m_sourceDoc); + cxENDLOCK + + // Doc has been changed in another editor, so we just redraw + if (isSameDoc) { + ReBuildTree(); + m_isScrolling = false; // avoid moving old image if scrolling during update + wxClientDC dc(this); + DrawLayout(dc); + } + } +} + +// static notification handler +void DocHistory::OnClosePage(DocHistory* self, void* data, int WXUNUSED(filter)) { + if (self->m_editorCtrl == (EditorCtrl*)data) self->Clear(); +} + // static notification handler void DocHistory::OnChangeDoc(DocHistory* self, void* data, int filter) { - const doc_id di = ((EditorCtrl*)data)->GetDocID(); + if (filter != self->m_source_win_id) return; //wxLogTrace("OnChangeDoc %d %d - %d", di.document_id, di.revision_id, filter); - self->m_source_win_id = filter; + self->m_editorCtrl = (EditorCtrl*)data; + const doc_id di = self->m_editorCtrl->GetDocID(); self->SetDocument(di); } @@ -665,18 +693,7 @@ void DocHistory::OnDocUpdated(DocHistory* self, void* data, int WXUNUSED(filter) if (!self->m_sourceDoc.IsOk()) return; const doc_id& di = *(const doc_id*)data; - - bool isSameDoc; - cxLOCK_READ(self->m_catalyst) - isSameDoc = catalyst.InSameHistory(di, self->m_sourceDoc); - cxENDLOCK - - if (isSameDoc) { - self->ReBuildTree(); - self->m_isScrolling = false; // avoid moving old image if scrolling during update - wxClientDC dc(self); - self->DrawLayout(dc); - } + self->HandleDocUpdate(di); } // static notification handler @@ -700,43 +717,24 @@ void DocHistory::OnDocCommited(DocHistory* self, void* data, int WXUNUSED(filter if (self->m_sourceDoc.SameDoc(diPair->doc1)) { self->m_isScrolling = false; // avoid moving old image if scrolling during update self->SetDocument(diPair->doc2); - /*self->m_sourceDoc = diPair->doc2; - - self->ReBuildTree(); - self->m_isScrolling = false; // avoid moving old image if scrolling during update - wxClientDC dc(self); - self->DrawLayout(dc);*/ + } + else { + self->HandleDocUpdate(diPair->doc2); } } // static notification handler void DocHistory::OnNewRevision(DocHistory* self, void* data, int WXUNUSED(filter)) { if (!self->m_sourceDoc.IsOk()) return; - const doc_id* const di = (doc_id*)data; - wxASSERT(di->IsDraft()); - - bool inSame; - cxLOCK_READ(self->m_catalyst) - inSame = catalyst.InSameHistory(self->m_sourceDoc, *di); - cxENDLOCK - if (inSame) { - self->SetDocument(*di); - } + const doc_id& di = *(const doc_id*)data; + self->HandleDocUpdate(di); } // static notification handler void DocHistory::OnUpdateRevision(DocHistory* self, void* data, int WXUNUSED(filter)) { if (!self->m_sourceDoc.IsOk()) return; - const doc_id* const di = (doc_id*)data; - wxASSERT(di->IsDraft()); - bool inSame; - cxLOCK_READ(self->m_catalyst) - inSame = catalyst.InSameHistory(self->m_sourceDoc, *di); - cxENDLOCK - - if (inSame) { - self->SetDocument(*di); - } + const doc_id& di = *(const doc_id*)data; + self->HandleDocUpdate(di); } src/DocHistory.cpp @@ -24,6 +24,7 @@ class VersionTree; class VersionTreeEvent; class Timeline; +class EditorCtrl; class DocHistory : public wxControl { public: @@ -38,6 +39,7 @@ private: void MakeItemVisible(unsigned int item_id); void DrawLayout(wxDC& dc); void AddChildren(int parent_pos, const doc_id& doc, const doc_id& sel_doc, const Catalyst& catalyst); + void HandleDocUpdate(const doc_id& di); // Event handlers void OnPaint(wxPaintEvent& event); @@ -56,6 +58,7 @@ private: DECLARE_EVENT_TABLE(); // Notifier handlers + static void OnClosePage(DocHistory* self, void* data, int filter); static void OnChangeDoc(DocHistory* self, void* data, int filter); static void OnDocUpdated(DocHistory* self, void* data, int filter); static void OnDocDeleted(DocHistory* self, void* data, int filter); @@ -75,6 +78,7 @@ private: wxTimer m_tooltipTimer; int m_hotNode; RevTooltip m_revTooltip; + EditorCtrl* m_editorCtrl; wxBrush bgBrush; wxPen linePen; @@ -92,7 +96,7 @@ private: int m_document_id; doc_id m_sourceDoc; int m_selectedNode; - int m_source_win_id; + const int m_source_win_id; int m_lineHeight; int m_treeHeight; int m_scrollPos; src/DocHistory.h @@ -173,7 +173,7 @@ const char** EditorBundlePanel::RecommendedIcon() const { return m_editorCtrl->RecommendedIcon(); } -void EditorBundlePanel::SaveSettings(unsigned int i, eSettings& settings) { +void EditorBundlePanel::SaveSettings(unsigned int i, eFrameSettings& settings) { m_editorCtrl->SaveSettings(i, settings); } src/EditorBundlePanel.cpp @@ -46,7 +46,7 @@ public: virtual EditorCtrl* GetActiveEditor(); virtual const char** RecommendedIcon() const; - virtual void SaveSettings(unsigned int i, eSettings& settings); + virtual void SaveSettings(unsigned int i, eFrameSettings& settings); private: void Init(); src/EditorBundlePanel.h @@ -107,7 +107,7 @@ unsigned long EditorCtrl::s_ctrlDownTime = 0; bool EditorCtrl::s_altGrDown = false; /// Open a page saved from a previous session -EditorCtrl::EditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame, const wxPoint& pos, const wxSize& size) : +EditorCtrl::EditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame) : m_catalyst(cw), m_doc(cw), dispatcher(cw.GetDispatcher()), @@ -144,11 +144,11 @@ EditorCtrl::EditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, m_re(NULL), m_symbolCacheToken(0) { - Create(parent, wxID_ANY, pos, size, wxNO_BORDER|wxWANTS_CHARS|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE); + Create(parent, wxID_ANY, wxPoint(-100,-100), wxDefaultSize, wxNO_BORDER|wxWANTS_CHARS|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE); Hide(); // start hidden to avoid flicker Init(); - eSettings& settings = eGetSettings(); + eFrameSettings& settings = parentFrame.GetFrameSettings(); RestoreSettings(page_id, settings); } @@ -263,7 +263,7 @@ EditorCtrl::EditorCtrl(CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, FoldingInvalidate(); } -void EditorCtrl::RestoreSettings(unsigned int page_id, eSettings& settings, unsigned int subid) { +void EditorCtrl::RestoreSettings(unsigned int page_id, eFrameSettings& settings, unsigned int subid) { wxString mirrorPath; doc_id di; int newpos; @@ -274,7 +274,7 @@ void EditorCtrl::RestoreSettings(unsigned int page_id, eSettings& settings, unsi // Retrieve the page info wxASSERT(0 <= page_id && page_id < (int)settings.GetPageCount()); - settings.GetPageSettings(page_id, mirrorPath, di, newpos, topline, syntax, folds, bookmarks, (eSettings::SubPage)subid); + settings.GetPageSettings(page_id, mirrorPath, di, newpos, topline, syntax, folds, bookmarks, (SubPage)subid); if (eDocumentPath::IsRemotePath(mirrorPath)) { // If the mirror points to a remote file, we have to download it first. @@ -453,11 +453,11 @@ EditorCtrl::~EditorCtrl() { ClearRemoteInfo(); } -void EditorCtrl::SaveSettings(unsigned int i, eSettings& settings) { +void EditorCtrl::SaveSettings(unsigned int i, eFrameSettings& settings) { SaveSettings(i, settings, 0); } -void EditorCtrl::SaveSettings(unsigned int i, eSettings& settings, unsigned int subid) { +void EditorCtrl::SaveSettings(unsigned int i, eFrameSettings& settings, unsigned int subid) { const wxString& path = GetPath(); const doc_id di = GetDocID(); const int pos = GetPos(); @@ -466,7 +466,7 @@ void EditorCtrl::SaveSettings(unsigned int i, eSettings& settings, unsigned int const vector<unsigned int> folds = GetFoldedLines(); const vector<cxBookmark>& bookmarks = GetBookmarks(); - settings.SetPageSettings(i, path, di, pos, topline, syntax, folds, bookmarks, (eSettings::SubPage)subid); + settings.SetPageSettings(i, path, di, pos, topline, syntax, folds, bookmarks, (SubPage)subid); //wxLogDebug(wxT(" %d (%d,%d,%d) pos:%d topline:%d"), i, di.type, di.document_id, di.version_id, pos, topline); } @@ -2933,7 +2933,7 @@ bool EditorCtrl::SetDocument(const doc_id& di, const wxString& path, const Remot // Notify that we have changed document const doc_id docId = di; // AdamV: Does this exist just to be on the stack in bug reports? - dispatcher.Notify(wxT("WIN_CHANGEDOC"), this, GetId()); + dispatcher.Notify(wxT("WIN_CHANGEDOC"), this, m_parentFrame.GetId()); return true; } src/EditorCtrl.cpp @@ -51,6 +51,7 @@ class PreviewDlg; class cxRemoteAction; class MultilineDataObject; class TextTip; +class eFrameSettings; struct thTheme; class tmAction; @@ -68,7 +69,7 @@ class EditorCtrl : public KeyHookable<wxControl>, public: EditorCtrl(const doc_id di, const wxString& mirrorPath, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame, const wxPoint& pos = wxPoint(-100,-100), const wxSize& size = wxDefaultSize); - EditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame, const wxPoint& pos = wxPoint(-100,-100), const wxSize& size = wxDefaultSize); + EditorCtrl(const int page_id, CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame); EditorCtrl(CatalystWrapper& cw, wxBitmap& bitmap, wxWindow* parent, EditorFrame& parentFrame, const wxPoint& pos = wxPoint(-100,-100), const wxSize& size = wxDefaultSize); @@ -166,7 +167,7 @@ public: // TabPage interface virtual EditorCtrl* GetActiveEditor(); virtual const char** RecommendedIcon() const; - virtual void SaveSettings(unsigned int i, eSettings& settings); + virtual void SaveSettings(unsigned int i, eFrameSettings& settings); // Bundle Editing bool IsBundleItem() const {return m_remotePath.StartsWith(wxT("bundle://"));}; @@ -237,8 +238,8 @@ public: void ClearSearchRange(bool reset=false); // Settings - void SaveSettings(unsigned int i, eSettings& settings, unsigned int id); - void RestoreSettings(unsigned int i, eSettings& settings, unsigned int id=0); + void SaveSettings(unsigned int i, eFrameSettings& settings, unsigned int id); + void RestoreSettings(unsigned int i, eFrameSettings& settings, unsigned int id=0); // Needed by IEditorSearch interface wxEvtHandler* GetEventHandlerI() const {return GetEventHandler();}; src/EditorCtrl.h @@ -80,6 +80,8 @@ enum { // Menu id's enum { + MENU_NEWWINDOW, + MENU_CLOSEWINDOW, MENU_DIFF, MENU_OPENPROJECT, MENU_OPENREMOTE, @@ -184,7 +186,6 @@ enum { MENU_BOOKMARK_CLEAR }; - wxString EditorFrame::DefaultFileFilters = wxT("All files (*.*)|*.*|Text files (*.txt)|*.txt|") \ wxT("Batch Files (*.bat)|*.bat|INI Files (*.ini)|*.ini|") \ wxT("C/C++ Files (*.c, *.cpp, *.cxx)|*.c;*.cpp;*.cxx|") \ @@ -193,10 +194,14 @@ wxString EditorFrame::DefaultFileFilters = wxT("All files (*.*)|*.*|Text files ( wxT("Perl Files (*.pl, *.pm, *.pod)|*.pl;*.pm;*.pod|") \ wxT("Python Files (*.py, *.pyw)|*.py;*.pyw"); +// This sets RTTI info but without the dynamic part +wxIMPLEMENT_CLASS_COMMON1(EditorFrame, wxFrame, NULL) + BEGIN_EVENT_TABLE(EditorFrame, wxFrame) EVT_SIZE(EditorFrame::OnSize) EVT_MENU_OPEN(EditorFrame::OnOpeningMenu) EVT_MENU(wxID_NEW, EditorFrame::OnMenuNew) + EVT_MENU(MENU_NEWWINDOW, EditorFrame::OnMenuNewWindow) EVT_MENU(wxID_OPEN, EditorFrame::OnMenuOpen) EVT_MENU(MENU_DIFF, EditorFrame::OnMenuCompareFiles) EVT_MENU(MENU_OPENPROJECT, EditorFrame::OnMenuOpenProject) @@ -209,6 +214,7 @@ BEGIN_EVENT_TABLE(EditorFrame, wxFrame) //EVT_MENU(wxID_PREVIEW, EditorFrame::OnMenuPrintPreview) EVT_MENU(wxID_PRINT, EditorFrame::OnMenuPrint) EVT_MENU(MENU_CLOSE, EditorFrame::OnMenuClose) + EVT_MENU(MENU_CLOSEWINDOW, EditorFrame::OnMenuCloseWindow) EVT_MENU(wxID_EXIT, EditorFrame::OnMenuExit) EVT_MENU(wxID_UNDO, EditorFrame::OnMenuUndo) EVT_MENU(wxID_REDO, EditorFrame::OnMenuRedo) @@ -328,10 +334,11 @@ BEGIN_EVENT_TABLE(EditorFrame, wxFrame) //EVT_MENU(MENU_HL_USERS, EditorFrame::OnMenuHighlightUsers) END_EVENT_TABLE() -EditorFrame::EditorFrame(CatalystWrapper cat, int id, const wxString& title, const wxRect& rect, TmSyntaxHandler& syntax_handler): +EditorFrame::EditorFrame(CatalystWrapper cat, unsigned int frameId, const wxString& title, const wxRect& rect, TmSyntaxHandler& syntax_handler): m_catalyst(cat), dispatcher(cat.GetDispatcher()), - m_settings(eGetSettings()), + m_generalSettings(eGetSettings()), + m_settings(m_generalSettings.GetFrameSettings(frameId)), m_syntax_handler(syntax_handler), m_sizeChanged(false), m_needStateSave(true), m_keyDiags(false), m_inAskReload(false), @@ -341,7 +348,7 @@ EditorFrame::EditorFrame(CatalystWrapper cat, int id, const wxString& title, co bitmap(1,1) //,m_incommingBmp(incomming_xpm), m_incommingFullBmp(incomming_full_xpm) { - Create(NULL, id, title, rect.GetPosition(), rect.GetSize(), wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxWANTS_CHARS, wxT("eMainFrame")); + Create(NULL, wxID_ANY, title, rect.GetPosition(), rect.GetSize(), wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxWANTS_CHARS, wxT("eMainFrame")); m_remoteThread = new RemoteThread(); @@ -388,7 +395,7 @@ EditorFrame::EditorFrame(CatalystWrapper cat, int id, const wxString& title, co box->Add(m_tabBar, 1, wxEXPAND); // Create and add the searchpanel - m_searchPanel = new SearchPanel(*this, panel, -1, wxDefaultPosition, wxSize(10,25)); + m_searchPanel = new SearchPanel(*this, panel, wxID_ANY, wxDefaultPosition, wxSize(10,25)); box->Add(m_searchPanel, 0, wxEXPAND); box->Show(m_searchPanel, false); @@ -401,17 +408,13 @@ EditorFrame::EditorFrame(CatalystWrapper cat, int id, const wxString& title, co m_frameManager.AddPane(panel, wxAuiPaneInfo().Name(wxT("Center")).CenterPane().PaneBorder(false)); // Add the Document History Pane - documentHistory = new DocHistory(m_catalyst, id, this, 1); + documentHistory = new DocHistory(m_catalyst, GetId(), this, wxID_ANY); m_frameManager.AddPane(documentHistory, wxAuiPaneInfo().Name(wxT("History")).Hide().Right().Caption(_("History")).BestSize(wxSize(150,200))); // Add the Undo History Pane - undoHistory = new UndoHistory(m_catalyst, this, id, this, 1); + undoHistory = new UndoHistory(m_catalyst, this, GetId(), this, wxID_ANY); m_frameManager.AddPane(undoHistory, wxAuiPaneInfo().Name(wxT("Undo")).Hide().Right().Caption(_("Undo")).BestSize(wxSize(150,50))); - //incommingPane = new Incomming(m_catalyst, this, 1); // Add the Incomming Pane - //incommingPane->MakeLastItemVisible(); - //m_frameManager.AddPane(incommingPane, wxAuiPaneInfo().Name(wxT("Incoming")).Hide().Top().Caption(_("Incoming")).BestSize(wxSize(150,100))); - m_outputPane = new HtmlOutputPane(this, *this); m_frameManager.AddPane(m_outputPane, wxAuiPaneInfo().Name(wxT("Output")).Hide().Bottom().Caption(_("Output")).BestSize(wxSize(150,100))); @@ -505,10 +508,10 @@ EditorFrame::~EditorFrame() { // Loads settings that end up as member variables void EditorFrame::InitMemberSettings() { - if (!m_settings.GetSettingInt(wxT("wrapmode"), (int&)m_wrapMode)) { + if (!m_generalSettings.GetSettingInt(wxT("wrapmode"), (int&)m_wrapMode)) { // fallback to old settings format bool wordwrap = cxWRAP_NORMAL; - if (m_settings.GetSettingBool(wxT("wordwrap"), wordwrap)) { + if (m_generalSettings.GetSettingBool(wxT("wordwrap"), wordwrap)) { m_wrapMode = wordwrap ? cxWRAP_NORMAL : cxWRAP_NONE; } } @@ -521,16 +524,16 @@ void EditorFrame::InitMemberSettings() { regKey.SetValue(wxT("ww"), ww); #endif // __WXMSW__ - if (!m_settings.GetSettingBool(wxT("showgutter"), m_showGutter)) m_showGutter = true; - if (!m_settings.GetSettingBool(wxT("hl_users"), m_userHighlight)) m_userHighlight = true; - if (!m_settings.GetSettingBool(wxT("softtabs"), m_softTabs)) m_softTabs = false; - if (!m_settings.GetSettingInt(wxT("tabwidth"), m_tabWidth)) m_tabWidth = 4; - if (!m_settings.GetSettingBool(wxT("showindent"), m_showIndent)) m_showIndent = false; + if (!m_generalSettings.GetSettingBool(wxT("showgutter"), m_showGutter)) m_showGutter = true; + if (!m_generalSettings.GetSettingBool(wxT("hl_users"), m_userHighlight)) m_userHighlight = true; + if (!m_generalSettings.GetSettingBool(wxT("softtabs"), m_softTabs)) m_softTabs = false; + if (!m_generalSettings.GetSettingInt(wxT("tabwidth"), m_tabWidth)) m_tabWidth = 4; + if (!m_generalSettings.GetSettingBool(wxT("showindent"), m_showIndent)) m_showIndent = false; } void EditorFrame::InitStatusbar() { bool showStatusbar = true; - m_settings.GetSettingBool(wxT("statusbar"), showStatusbar); + m_generalSettings.GetSettingBool(wxT("statusbar"), showStatusbar); if (showStatusbar) CreateAndSetStatusbar(); } @@ -569,6 +572,7 @@ void EditorFrame::InitMenus() { fileMenu->Append(wxID_NEW, _("&New\tCtrl+N"), _("New File")); fileMenu->Append(wxID_OPEN, _("&Open...\tCtrl+O"), _("Open File")); fileMenu->Append(MENU_DIFF, _("&Compare..."), _("Compare...")); + fileMenu->Append(MENU_NEWWINDOW, _("New Window"), _("Open New Window")); fileMenu->AppendSeparator(); fileMenu->Append(wxID_SAVE, _("&Save\tCtrl+S"), _("Save File")); fileMenu->Append(wxID_SAVEAS, _("Save &As...\tCtrl-Shift-S"), _("Save File as")); @@ -594,6 +598,7 @@ void EditorFrame::InitMenus() { fileMenu->Append(MENU_CLOSE, _("&Close Tab\tCtrl+W"), _("Close Tab")); fileMenu->Append(MENU_TABS_CLOSE_ALL, _("Close all &Tabs"), _("Close all Tabs")); fileMenu->Append(MENU_TABS_CLOSE_OTHER, _("Clos&e other Tabs\tCtrl+Alt+W"), _("Close other Tabs")); + fileMenu->Append(MENU_CLOSEWINDOW, _("Close &Window"), _("Close Window")); fileMenu->Append(wxID_EXIT, _("E&xit"), _("Exit")); menuBar->Append(fileMenu, _("&File")); @@ -792,9 +797,9 @@ void EditorFrame::RestoreState() { unsigned int sp = isDiff ? 1 : 0; const unsigned int sp_end = isDiff ? 3 : 1; // diffs have both left and rightd for (; sp < sp_end; ++sp) { - mirrorPath = m_settings.GetPagePath(i, (eSettings::SubPage)sp); + mirrorPath = m_settings.GetPagePath(i, (SubPage)sp); if (mirrorPath.empty()) continue; - const doc_id mirrorDoc = m_settings.GetPageDoc(i, (eSettings::SubPage)sp); + const doc_id mirrorDoc = m_settings.GetPageDoc(i, (SubPage)sp); cxLOCK_READ(m_catalyst) isMirrored = catalyst.VerifyMirror(mirrorPath, mirrorDoc); @@ -1314,7 +1319,7 @@ void EditorFrame::AddTab(wxWindow* page) { Thaw(); // Notify that we are editing a new document - dispatcher.Notify(wxT("WIN_CHANGEDOC"), editorCtrl, editorCtrl->GetId()); + dispatcher.Notify(wxT("WIN_CHANGEDOC"), editorCtrl, GetId()); UpdateTabMenu(); } @@ -1655,7 +1660,7 @@ void EditorFrame::ShowProjectPane(const wxString& project) { if (!project.empty()) { m_settings.SetSettingBool(wxT("showproject"), true); m_settings.SetSettingString(wxT("project"), project); - m_settings.AddRecentProject(project); + m_generalSettings.AddRecentProject(project); UpdateRecentFiles(); } @@ -1876,7 +1881,7 @@ const RemoteProfile* EditorFrame::GetRemoteProfile(const wxString& url, bool wit wxASSERT(eDocumentPath::IsRemotePath(url)); // Get (or create) matching profile - return m_settings.GetRemoteProfileFromUrl(url, withDir); + return m_generalSettings.GetRemoteProfileFromUrl(url, withDir); } bool EditorFrame::AskRemoteLogin(const RemoteProfile* rp) { @@ -1885,7 +1890,7 @@ bool EditorFrame::AskRemoteLogin(const RemoteProfile* rp) { return false; // this also updates rp with the new login - m_settings.SetRemoteProfileLogin(rp, dlg.GetUsername(), dlg.GetPassword(), dlg.GetSaveProfile()); + m_generalSettings.SetRemoteProfileLogin(rp, dlg.GetUsername(), dlg.GetPassword(), dlg.GetSaveProfile()); return true; } @@ -1985,7 +1990,7 @@ bool EditorFrame::DoOpenFile(const wxString& filepath, wxFontEncoding enc, const } // Add to recent files list - m_settings.AddRecentFile(filepath); + m_generalSettings.AddRecentFile(filepath); UpdateRecentFiles(); // Create and draw the new page @@ -2329,6 +2334,10 @@ void EditorFrame::OnMenuNew(wxCommandEvent& WXUNUSED(event)) { AddTab(); } +void EditorFrame::OnMenuNewWindow(wxCommandEvent& WXUNUSED(event)) { + ((eApp*)wxTheApp)->NewFrame(); +} + void EditorFrame::OnNotebookDClick(wxAuiNotebookEvent& WXUNUSED(event)) { AddTab(); } @@ -2425,7 +2434,7 @@ void EditorFrame::OnMenuOpen(wxCommandEvent& event) { } void EditorFrame::OnMenuCompareFiles(wxCommandEvent& WXUNUSED(event)) { - CompareDlg dlg(this, m_settings); + CompareDlg dlg(this, m_generalSettings); if (dlg.ShowModal() != wxID_OK) return; const wxString leftPath = dlg.GetLeftPath(); @@ -2466,14 +2475,14 @@ void EditorFrame::OnMenuOpenProject(wxCommandEvent& WXUNUSED(event)) { } void EditorFrame::OnMenuOpenRemote(wxCommandEvent& WXUNUSED(event)) { - RemoteProfileDlg dlg(this, this->m_settings); + RemoteProfileDlg dlg(this, this->m_generalSettings); if (dlg.ShowModal() != wxID_OPEN) return; const int profile_id = dlg.GetCurrentProfile(); if (profile_id == -1) return; // Get the profile from db - const RemoteProfile* rp = m_settings.GetRemoteProfile(profile_id); + const RemoteProfile* rp = m_generalSettings.GetRemoteProfile(profile_id); if (rp) OpenRemoteProject(rp); } @@ -2507,7 +2516,7 @@ void EditorFrame::OnMenuSaveAs(wxCommandEvent& WXUNUSED(event)) { // Add to recent files list const wxString path = editorCtrl->GetPath(); if (!path.empty()) { - m_settings.AddRecentFile(path); + m_generalSettings.AddRecentFile(path); UpdateRecentFiles(); } } @@ -2575,10 +2584,14 @@ void EditorFrame::OnMenuClose(wxCommandEvent& WXUNUSED(event)) { CloseTab(tab_id); } -void EditorFrame::OnMenuExit(wxCommandEvent& WXUNUSED(event)) { +void EditorFrame::OnMenuCloseWindow(wxCommandEvent& WXUNUSED(event)) { Close(); } +void EditorFrame::OnMenuExit(wxCommandEvent& WXUNUSED(event)) { + ((eApp*)wxTheApp)->CloseAllFrames(); +} + void EditorFrame::OnMenuUndo(wxCommandEvent& WXUNUSED(event)) { editorCtrl->DoUndo(); } @@ -2733,7 +2746,7 @@ void EditorFrame::OnMenuSpacesToTabs(wxCommandEvent& WXUNUSED(event)) { } void EditorFrame::OnMenuSettings(wxCommandEvent& WXUNUSED(event)) { - SettingsDlg dlg(this, m_catalyst, m_settings); + SettingsDlg dlg(this, m_catalyst, m_generalSettings); dlg.ShowModal(); } @@ -2896,8 +2909,8 @@ void EditorFrame::UpdateRecentFiles() { m_recentFiles.clear(); m_recentProjects.clear(); - m_settings.GetRecentFiles(m_recentFiles); - m_settings.GetRecentProjects(m_recentProjects); + m_generalSettings.GetRecentFiles(m_recentFiles); + m_generalSettings.GetRecentProjects(m_recentProjects); Freeze(); @@ -3059,7 +3072,7 @@ void EditorFrame::OnMenuCommit(wxCommandEvent& WXUNUSED(event)) { cxENDLOCK // Notify that we are editing a new document - dispatcher.Notify(wxT("WIN_CHANGEDOC"), editorCtrl, editorCtrl->GetId()); + dispatcher.Notify(wxT("WIN_CHANGEDOC"), editorCtrl, GetId()); } /* void EditorFrame::OnMenuRevTooltip(wxCommandEvent& WXUNUSED(event)) { @@ -3403,7 +3416,7 @@ void EditorFrame::OnNotebook(wxAuiNotebookEvent& event) { UpdateWindowTitle(); // Notify that we are editing a new document - dispatcher.Notify(wxT("WIN_CHANGEDOC"), editorCtrl, editorCtrl->GetId()); + dispatcher.Notify(wxT("WIN_CHANGEDOC"), editorCtrl, GetId()); } void EditorFrame::UpdateNotebook() { @@ -3414,7 +3427,7 @@ void EditorFrame::UpdateNotebook() { UpdateWindowTitle(); // Notify that we are editing a new document - dispatcher.Notify(wxT("WIN_CHANGEDOC"), editorCtrl, editorCtrl->GetId()); + dispatcher.Notify(wxT("WIN_CHANGEDOC"), editorCtrl, GetId()); } void EditorFrame::OnNotebookDragDone(wxAuiNotebookEvent& WXUNUSED(event)) { @@ -3427,7 +3440,6 @@ void EditorFrame::OnClose(wxCloseEvent& event) { m_settings.GetSettingBool(wxT("keepState"), keep_state); if (wxGetKeyState(WXK_SHIFT)) keep_state = true; // override - // Check if we have any unsaved documents // and ask the user if he wants to save them if (AskToSaveMulti() == false) { @@ -3435,10 +3447,6 @@ void EditorFrame::OnClose(wxCloseEvent& event) { return; } - // Make sure any data copied to the clipboard stays there after - // the app has closed - wxTheClipboard->Flush(); - #ifdef __WXMSW__ // Show nag screen if the trial is about to expire if (!((eApp*)wxTheApp)->IsRegistered() && ((eApp*)wxTheApp)->DaysLeftOfTrial() <= 5) { @@ -3485,15 +3493,11 @@ void EditorFrame::OnClose(wxCloseEvent& event) { } editorCtrl = NULL; // avoid dangling pointer - // Commit the documents & settings before closing + // Clean up state info if (!keep_state) { - m_settings.DeleteAllPageSettings(); // remove old state m_settings.SetSettingBool(wxT("showproject"), false); + m_generalSettings.RemoveFrame(m_settings); } - m_settings.Save(); - cxLOCK_WRITE(m_catalyst) - catalyst.Commit(); - cxENDLOCK Destroy(); } @@ -3807,6 +3811,9 @@ bool EditorFrame::DeletePage(unsigned int page_id, bool removetab) { // Notify PreviewDlg that the tab is closing (it might be pinned) if (m_previewDlg) m_previewDlg->PageClosed(ec); + // Notify that we are closing the page (there might be subscribers with refs) + dispatcher.Notify(wxT("WIN_CLOSEPAGE"), editorCtrl, GetId()); + if (ec == editorCtrl) editorCtrl = NULL; // Make sure we don't accidentally use deleted ctrl //eGetSettings().DeletePageSettings(page_id); src/EditorFrame.cpp @@ -26,6 +26,7 @@ #include "Catalyst.h" #include "RemoteThread.h" #include "key_hook.h" +#include "eSettings.h" #include "WrapMode.h" @@ -51,7 +52,6 @@ class ChangeCheckerThread; class BundlePane; class DocHistory; class UndoHistory; -class eSettings; class SearchPanel; class TmSyntaxHandler; class StatusBar; @@ -73,7 +73,7 @@ class EditorFrame : public KeyHookable<wxFrame>, public IOpenTextmateURL { public: - EditorFrame(CatalystWrapper cat, int id, const wxString& title, const wxRect& rect, TmSyntaxHandler& syntax_handler); + EditorFrame(CatalystWrapper cat, unsigned int frameId, const wxString& title, const wxRect& rect, TmSyntaxHandler& syntax_handler); ~EditorFrame(); void RestoreState(); @@ -139,6 +139,7 @@ public: cxWrapMode GetWrapMode() const {return m_wrapMode;}; bool IsGutterShown() const {return m_showGutter;}; bool IsIndentShown() const {return m_showIndent;}; + eFrameSettings& GetFrameSettings() {return m_settings;}; // Registration void RemoveRegMenus(); @@ -242,6 +243,7 @@ private: void OnOpeningMenu(wxMenuEvent& event); void OnMenuNew(wxCommandEvent& event); + void OnMenuNewWindow(wxCommandEvent& event); void OnMenuOpen(wxCommandEvent& event); void OnMenuCompareFiles(wxCommandEvent& event); void OnMenuOpenProject(wxCommandEvent& event); @@ -256,6 +258,7 @@ private: //void OnMenuPrintPreview(wxCommandEvent& event); void OnMenuPrint(wxCommandEvent& event); void OnMenuClose(wxCommandEvent& event); + void OnMenuCloseWindow(wxCommandEvent& event); void OnMenuExit(wxCommandEvent& event); void OnMenuUndo(wxCommandEvent& event); void OnMenuRedo(wxCommandEvent& event); @@ -382,7 +385,8 @@ private: // Member variables CatalystWrapper m_catalyst; Dispatcher& dispatcher; - eSettings& m_settings; + eSettings& m_generalSettings; + eFrameSettings m_settings; TmSyntaxHandler& m_syntax_handler; wxImageList imageList; @@ -455,6 +459,8 @@ private: wxPageSetupDialogData m_printData; wxBitmap bitmap; // shared by EditorCtrl's + + DECLARE_DYNAMIC_CLASS_NO_COPY(EditorFrame) }; #endif // __EDITORFRAME_H__ src/EditorFrame.h @@ -3,13 +3,13 @@ // Pre-definitions class EditorCtrl; -class eSettings; +class eFrameSettings; class ITabPage { public: virtual EditorCtrl* GetActiveEditor() = 0; virtual const char** RecommendedIcon() const = 0; - virtual void SaveSettings(unsigned int i, eSettings& settings) = 0; + virtual void SaveSettings(unsigned int i, eFrameSettings& settings) = 0; }; #endif // __ITABPAGE_H__ src/ITabPage.h @@ -183,7 +183,7 @@ PreviewDlg::~PreviewDlg() { if (m_re_href) free(m_re_href); } -void PreviewDlg::LoadSettings(const eSettings& settings) { +void PreviewDlg::LoadSettings(const eFrameSettings& settings) { // Get saved position bool showOptions = false; bool doPipe = false; @@ -208,7 +208,7 @@ void PreviewDlg::LoadSettings(const eSettings& settings) { } } -void PreviewDlg::SaveSettings(eSettings& settings) const { +void PreviewDlg::SaveSettings(eFrameSettings& settings) const { settings.SetSettingBool(wxT("prvw_showoptions"), m_showOptions->IsChecked()); settings.SetSettingBool(wxT("prvw_dopipe"), m_pipeCheck->IsChecked()); settings.SetSettingString(wxT("prvw_pipecmd"), m_cmdText->GetValue()); src/PreviewDlg.cpp @@ -34,7 +34,7 @@ struct real_pcre; // This double pre-definition is needed typedef struct real_pcre pcre; // because of the way it is defined in pcre.h class EditorFrame; class EditorCtrl; -class eSettings; +class eFrameSettings; class wxProcessEvent; class wxWebControl; class wxWebEvent; @@ -44,8 +44,8 @@ public: PreviewDlg(EditorFrame& parent); ~PreviewDlg(); - void LoadSettings(const eSettings& settings); - void SaveSettings(eSettings& settings) const; + void LoadSettings(const eFrameSettings& settings); + void SaveSettings(eFrameSettings& settings) const; void PageClosed(const EditorCtrl* ec); // Utility functions src/PreviewDlg.h @@ -41,13 +41,12 @@ END_EVENT_TABLE() UndoHistory::UndoHistory(CatalystWrapper& cw, IFrameUndoPane* parentFrame, int win_id, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size) : wxControl(parent, id, pos, size, wxNO_BORDER|wxWANTS_CHARS|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE), m_catalyst(cw), m_doc(cw), m_dispatcher(cw.GetDispatcher()), m_mdc(), m_bitmap(1,1), m_cell(m_mdc, m_doc), - m_ignoreUpdates(false), m_editorCtrl(NULL), m_parentFrame(parentFrame) + m_ignoreUpdates(false), m_editorCtrl(NULL), m_parentFrame(parentFrame), m_source_win_id(win_id) { SetBackgroundStyle(wxBG_STYLE_CUSTOM); // Avoid flicker // Initialize variables m_needRedrawing = true; // Make sure the ctrl gets drawn on first idle event - m_source_win_id = win_id; m_scrollPos = 0; m_isScrolling = false; m_lineHeight = 18; @@ -62,6 +61,7 @@ UndoHistory::UndoHistory(CatalystWrapper& cw, IFrameUndoPane* parentFrame, int w m_mdc.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false)); // Make sure we recieve notifications of new versions and updates + m_dispatcher.SubscribeC(wxT("WIN_CLOSEPAGE"), (CALL_BACK)OnClosePage, this); m_dispatcher.SubscribeC(wxT("WIN_CHANGEDOC"), (CALL_BACK)OnChangeDoc, this); m_dispatcher.SubscribeC(wxT("DOC_DELETED"), (CALL_BACK)OnDocDeleted, this); m_dispatcher.SubscribeC(wxT("DOC_NEWREVISION"), (CALL_BACK)OnNewRevision, this); @@ -71,6 +71,7 @@ UndoHistory::UndoHistory(CatalystWrapper& cw, IFrameUndoPane* parentFrame, int w } UndoHistory::~UndoHistory() { + m_dispatcher.UnSubscribe(wxT("WIN_CLOSEPAGE"), (CALL_BACK)OnClosePage, this); m_dispatcher.UnSubscribe(wxT("WIN_CHANGEDOC"), (CALL_BACK)OnChangeDoc, this); m_dispatcher.UnSubscribe(wxT("DOC_DELETED"), (CALL_BACK)OnDocDeleted, this); m_dispatcher.UnSubscribe(wxT("DOC_NEWREVISION"), (CALL_BACK)OnNewRevision, this); @@ -80,6 +81,7 @@ UndoHistory::~UndoHistory() { } void UndoHistory::Clear() { + m_editorCtrl = NULL; m_sourceDoc.Invalidate(); m_pTree->Clear(); m_scrollPos = 0; @@ -428,7 +430,7 @@ void UndoHistory::OnChar(wxKeyEvent& event) { cxENDLOCK if (!di.IsOk()) return; // We are in top document (has no parent) - m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &di, m_source_win_id); + m_editorCtrl->SetDocument(di); } break; @@ -441,7 +443,7 @@ void UndoHistory::OnChar(wxKeyEvent& event) { if (!childlist.empty()) { const doc_id di(DRAFT, m_sourceDoc.document_id, childlist[0]); - m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &di, m_source_win_id); + m_editorCtrl->SetDocument(di); } } break; @@ -457,7 +459,7 @@ void UndoHistory::OnChar(wxKeyEvent& event) { vector<int>::const_iterator idx = find(childlist.begin(), childlist.end(), m_sourceDoc.version_id); if (idx > childlist.begin()) { const doc_id di(DRAFT, m_sourceDoc.document_id, *(idx-1)); - m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &di, m_source_win_id); + m_editorCtrl->SetDocument(di); } } break; @@ -473,7 +475,7 @@ void UndoHistory::OnChar(wxKeyEvent& event) { vector<int>::const_iterator idx = find(childlist.begin(), childlist.end(), m_sourceDoc.version_id); if (idx < childlist.end()-1) { const doc_id di(DRAFT, m_sourceDoc.document_id, *(idx+1)); - m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &di, m_source_win_id); + m_editorCtrl->SetDocument(di); } } } @@ -506,7 +508,7 @@ void UndoHistory::OnVersionTreeSel(VersionTreeEvent& event) { // a WIN_CHANGEDOC notifer if the documents actually gets // set on a page. - m_dispatcher.Notify(wxT("WIN_SETDOCUMENT"), &clicked_doc, m_source_win_id); + m_editorCtrl->SetDocument(clicked_doc); // Check if we were double-clicked if (event.GetInt() == 1) { @@ -576,11 +578,16 @@ void UndoHistory::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { } // static notification handler +void UndoHistory::OnClosePage(UndoHistory* self, void* data, int WXUNUSED(filter)) { + if (self->m_editorCtrl == (EditorCtrl*)data) self->Clear(); +} + +// static notification handler void UndoHistory::OnChangeDoc(UndoHistory* self, void* data, int filter) { + if (filter != self->m_source_win_id) return; //wxLogTrace("OnChangeDoc %d %d - %d", di.document_id, di.revision_id, filter); self->m_editorCtrl = (EditorCtrl*)data; - self->m_source_win_id = filter; const doc_id di = self->m_editorCtrl->GetDocID(); self->m_range.Set(0, 0); // reset to no selection (will update in idle) self->SetDocument(di); @@ -605,38 +612,46 @@ void UndoHistory::OnDocDeleted(UndoHistory* self, void* data, int WXUNUSED(filte // static notification handler void UndoHistory::OnNewRevision(UndoHistory* self, void* data, int WXUNUSED(filter)) { - const doc_id* const di = (doc_id*)data; - wxASSERT(di->IsDraft()); + if (!self->m_editorCtrl) return; // may be called before first editor - self->SetDocument(*di); + const doc_id& di = *(const doc_id*)data; + wxASSERT(di.IsDraft()); + + if (di == self->m_editorCtrl->GetDocID()) { + self->SetDocument(di); + } + else if (self->m_sourceDoc.SameDoc(di)) { + // Doc has been changed in another editor, so we just redraw + self->UpdateTree(); + } } // static notification handler void UndoHistory::OnUpdateRevision(UndoHistory* self, void* data, int WXUNUSED(filter)) { if (!self->m_sourceDoc.IsOk()) return; - const doc_id* const di = (doc_id*)data; - wxASSERT(di->IsDraft()); + const doc_id& di = *(const doc_id*)data; + wxASSERT(di.IsDraft()); - if (self->m_sourceDoc.SameDoc(*di)) { - self->SetDocument(*di); + if (di == self->m_editorCtrl->GetDocID()) { + self->SetDocument(di); + } + else if (self->m_sourceDoc.SameDoc(di)) { + // Doc has been changed in another editor, so we just redraw + self->UpdateTree(); } } // static notification handler void UndoHistory::OnDocUpdated(UndoHistory* self, void* data, int WXUNUSED(filter)) { if (!self->m_sourceDoc.IsOk()) return; - const doc_id& di = *(const doc_id*)data; - bool isSameDoc; - cxLOCK_READ(self->m_catalyst) - isSameDoc = catalyst.InSameHistory(di, self->m_sourceDoc); - cxENDLOCK - - if (isSameDoc) { - wxClientDC dc(self); - self->m_pTree->UpdateTree(); - self->DrawLayout(dc); + if (di == self->m_editorCtrl->GetDocID()) { + self->SetDocument(di); + } + else if (self->m_sourceDoc.SameDoc(di)) { + // Doc has been changed in another editor, so we just redraw + self->UpdateTree(); } } src/UndoHistory.cpp @@ -59,6 +59,7 @@ private: DECLARE_EVENT_TABLE(); // Notifier handlers + static void OnClosePage(UndoHistory* self, void* data, int filter); static void OnChangeDoc(UndoHistory* self, void* data, int filter); static void OnDocDeleted(UndoHistory* self, void* data, int filter); static void OnNewRevision(UndoHistory* self, void* data, int filter); @@ -74,20 +75,20 @@ private: wxMemoryDC m_mdc; wxBitmap m_bitmap; + DiffLineCell m_cell; bool m_ignoreUpdates; EditorCtrl* m_editorCtrl; IFrameUndoPane* m_parentFrame; - DiffLineCell m_cell; VersionTree* m_pTree; wxBrush bgBrush; wxPen linePen; doc_id m_sourceDoc; - int m_source_win_id; + const int m_source_win_id; interval m_range; std::vector<cxDiffEntry> m_rangeHistory; src/UndoHistory.h @@ -28,6 +28,7 @@ #include <wx/file.h> #include <wx/image.h> #include <wx/stdpaths.h> +#include <wx/clipbrd.h> #include "UpdaterThread.h" #include "Dispatcher.h" @@ -58,7 +59,6 @@ END_EVENT_TABLE() bool eApp::OnInit() { // Initialize variables - frame = NULL; m_pCatalyst = NULL; m_catalyst = NULL; m_pSyntaxHandler = NULL; @@ -165,7 +165,6 @@ bool eApp::OnInit() { // Load Settings m_settings.Load(m_appDataPath); - if (m_settings.IsEmpty()) m_pCatalyst->MoveOldSettings(m_settings); // Apply options if (clearState) ClearState(); @@ -180,21 +179,19 @@ bool eApp::OnInit() { m_pListHandler = new PListHandler(GetAppPath(), GetAppDataPath(), clearBundleCache); m_pSyntaxHandler = new TmSyntaxHandler(m_pCatalyst->GetDispatcher(), *m_pListHandler); - // Create the main window - wxLogDebug(wxT("Creating main frame")); - frame = new EditorFrame( *m_catalyst, -1, wxT("e"), DetermineFrameSize(), *m_pSyntaxHandler); - SetTopWindow(frame); - - // Show the main window, bringing it to the top. - frame->Show(true); - frame->Raise(); - frame->Update(); - - // Open files from saved state - frame->RestoreState(); + // Create the main windows + wxLogDebug(wxT("Creating main frames")); + const size_t framecount = m_settings.GetFrameCount(); + if (framecount == 0) NewFrame(); + else { + for (size_t i = 0; i < framecount; ++i) { + OpenFrame(i); + } + } // Open files from command-line options if (argc > 1) { + EditorFrame* frame = GetTopFrame(); for (unsigned int i = 0; i < m_files.Count(); ++i) { const wxString& arg = m_files[i]; frame->Open(arg, mate); @@ -218,9 +215,7 @@ bool eApp::OnInit() { eDocumentPath::InitCygwinOnce(); #endif - wxLogDebug(wxT("Checking for modified files")); - frame->CheckForModifiedFilesAsync(); - wxLogDebug(wxT("Done Checking for modified files")); + CheckForModifiedFiles(); // If the command-line option didn't prevent checking for updates, // read the corresponding setting. @@ -234,34 +229,107 @@ bool eApp::OnInit() { return true; } -void eApp::ClearState() { - // Pages - m_settings.DeleteAllPageSettings(); +EditorFrame* eApp::OpenFrame(size_t frameId) { + const wxRect frameSize = DetermineFrameSize(); + EditorFrame* frame = new EditorFrame( *m_catalyst, frameId, wxT("e"), frameSize, *m_pSyntaxHandler); + + // Show the main window, bringing it to the top. + frame->Show(true); + frame->Raise(); + frame->Update(); + + // Open files from saved state + frame->RestoreState(); + + return frame; +} + +EditorFrame* eApp::NewFrame() { + // We want to copy settings from currently active frame + size_t activeId = 0; + EditorFrame* frame = GetTopFrame(); + if (frame) { + activeId = m_settings.GetIndexFromFrameSettings(frame->GetFrameSettings()); + } - // Tab layout - m_settings.RemoveSetting(wxT("topwin/tablayout")); - m_settings.RemoveSetting(wxT("topwin/page_id")); + // Create settings for new frame and open + const size_t frameId = m_settings.AddFrame(activeId); + return OpenFrame(frameId); +} + +void eApp::CloseAllFrames() { + wxWindowList::const_iterator i; + const wxWindowList::const_iterator end = wxTopLevelWindows.end(); + + // The app will exit when all frames are closed + for ( i = wxTopLevelWindows.begin(); i != end; ++i ) + { + if (!(*i)->IsKindOf(CLASSINFO(EditorFrame))) continue; + + EditorFrame* win = wx_static_cast(EditorFrame*, *i); + if (!win->Close()) return; + } +} + +EditorFrame* eApp::GetTopFrame() { + EditorFrame* win = NULL; + wxWindowList::const_iterator i; + const wxWindowList::const_iterator end = wxTopLevelWindows.end(); + + for ( i = wxTopLevelWindows.begin(); i != end; ++i ) + { + if (!(*i)->IsKindOf(CLASSINFO(EditorFrame))) continue; + + win = wx_static_cast(EditorFrame*, *i); + if (win->IsActive()) return win; + } + + // If no frame is active, just return last + return win; +} + +void eApp::CheckForModifiedFiles() { + wxWindowList::const_iterator i; + const wxWindowList::const_iterator end = wxTopLevelWindows.end(); + wxLogDebug(wxT("Checking for modified files")); + for ( i = wxTopLevelWindows.begin(); i != end; ++i ) + { + if (!(*i)->IsKindOf(CLASSINFO(EditorFrame))) continue; + + EditorFrame* win = wx_static_cast(EditorFrame*, *i); + win->CheckForModifiedFilesAsync(); + } + wxLogDebug(wxT("Done Checking for modified files")); +} + +void eApp::ClearState() { + m_settings.DeleteAllFrameSettings(0); m_settings.Save(); } void eApp::ClearLayout() { + m_settings.DeleteAllFrameSettings(0); + if (m_settings.GetFrameCount() == 0) return; + + eFrameSettings settings = m_settings.GetFrameSettings(0); + // Window size and position - m_settings.RemoveSetting(wxT("topwin/x")); - m_settings.RemoveSetting(wxT("topwin/y")); - m_settings.RemoveSetting(wxT("topwin/width")); - m_settings.RemoveSetting(wxT("topwin/height")); - m_settings.RemoveSetting(wxT("topwin/ismax")); + settings.RemoveSetting(wxT("topwin/x")); + settings.RemoveSetting(wxT("topwin/y")); + settings.RemoveSetting(wxT("topwin/width")); + settings.RemoveSetting(wxT("topwin/height")); + settings.RemoveSetting(wxT("topwin/ismax")); // wxAUI perspective - m_settings.RemoveSetting(wxT("topwin/panes")); + settings.RemoveSetting(wxT("topwin/panes")); // pane settings - m_settings.RemoveSetting(wxT("symbol_pane")); - m_settings.RemoveSetting(wxT("showsymbols")); - m_settings.RemoveSetting(wxT("prvw_pane")); - m_settings.RemoveSetting(wxT("showpreview")); - m_settings.RemoveSetting(wxT("showproject")); + settings.RemoveSetting(wxT("symbol_pane")); + settings.RemoveSetting(wxT("showsymbols")); + settings.RemoveSetting(wxT("prvw_pane")); + settings.RemoveSetting(wxT("showpreview")); + settings.RemoveSetting(wxT("showproject")); m_settings.Save(); } @@ -407,7 +475,8 @@ void eApp::OnIdle(wxIdleEvent& event) { if (!m_openStack.IsEmpty()) { const wxString cmd = m_openStack[0]; m_openStack.RemoveAt(0); - frame->Open(cmd); + + GetTopFrame()->Open(cmd); } if (m_pSyntaxHandler) { @@ -425,6 +494,7 @@ bool eApp::ExecuteCmd(const wxString& cmd) { bool eApp::ExecuteCmd(const wxString& cmd, wxString& result) { wxASSERT(!cmd.empty()); + EditorFrame* frame = GetTopFrame(); if (!frame) return false; // May not be created yet wxString exec_cmd = cmd; @@ -590,6 +660,15 @@ wxRect eApp::DetermineFrameSize() { } int eApp::OnExit() { + // Make sure any data copied to the clipboard stays there after + // the app has closed + wxTheClipboard->Flush(); + + m_settings.Save(); + cxLOCK_WRITE((*m_catalyst)) + catalyst.Commit(); + cxENDLOCK + // Release allocated memory #ifndef __WXMSW__ if (m_server) delete m_server; @@ -630,7 +709,7 @@ wxString eApp::GetAppTitle() { void eApp::OnUpdatesAvailable(wxCommandEvent& WXUNUSED(event)) { // Ask user if he wants to download new release - const int answer = wxMessageBox(_("A new release of e is available.\nDo you wish to go the the website to download it now?"), wxT("Program update!"), wxYES_NO|wxICON_EXCLAMATION, frame); + const int answer = wxMessageBox(_("A new release of e is available.\nDo you wish to go the the website to download it now?"), wxT("Program update!"), wxYES_NO|wxICON_EXCLAMATION, GetTopFrame()); if (answer == wxYES) { // Go to website wxLaunchDefaultBrowser(wxT("http://www.e-texteditor.com")); src/eApp.cpp @@ -54,6 +54,10 @@ public: const wxString& VersionName() const { return m_version_name; } const unsigned int VersionId() const { return m_version_id; } + // Frames + EditorFrame* NewFrame(); + void CloseAllFrames(); + // Execute internal commands virtual bool ExecuteCmd(const wxString& cmd); virtual bool ExecuteCmd(const wxString& cmd, wxString& result); @@ -86,8 +90,12 @@ public: #endif //__WXDEBUG__ private: + // Frames + EditorFrame* OpenFrame(size_t frameId); + EditorFrame* GetTopFrame(); + void CheckForModifiedFiles(); + // Member variables - EditorFrame* frame; wxString m_version_name; unsigned int m_version_id; src/eApp.h @@ -61,6 +61,24 @@ void eSettings::Load(const wxString& appDataPath) { env[key] = envNode.ItemAt(key).AsString(); } } + + // If this is an old config file, move frame related settings into it's own section + if (!m_jsonRoot.HasMember(wxT("frames"))) { + wxJSONValue& frames = m_jsonRoot[wxT("frames")]; + wxJSONValue& frame = frames[0]; // there should always be at least one frame + + // Move page settings + if (m_jsonRoot.HasMember(wxT("pages"))) { + wxJSONValue& pages = m_jsonRoot[wxT("pages")]; + frame[wxT("pages")] = pages; + m_jsonRoot.Remove(wxT("pages")); + } + + // Copy general settings + if (m_jsonRoot.HasMember(wxT("settings"))) { + frame[wxT("settings")] = m_jsonRoot[wxT("settings")]; + } + } } bool eSettings::Save() { @@ -93,6 +111,94 @@ bool eSettings::IsEmpty() const { return !m_jsonRoot.IsObject(); } +unsigned int eSettings::GetFrameCount() const { + if (!m_jsonRoot.HasMember(wxT("frames"))) return 0; + + const wxJSONValue frames = m_jsonRoot.ItemAt(wxT("frames")); + return frames.Size(); +} + +eFrameSettings eSettings::GetFrameSettings(unsigned int frameId) { + wxASSERT(m_jsonRoot.HasMember(wxT("frames"))); + + wxJSONValue& frames = m_jsonRoot[wxT("frames")]; + wxASSERT((int)frameId < frames.Size()); + + wxJSONValue& frame = frames[frameId]; + return eFrameSettings(frame); +} + +unsigned int eSettings::AddFrame(unsigned int top) { + // Create new frame + wxJSONValue& frames = m_jsonRoot[wxT("frames")]; + wxJSONValue& frame = frames.IsArray() ? frames[frames.Size()] : frames[0]; + + // Copy settings from active frame + if (frames.Size() > 1) { + frame[wxT("settings")] = frames[top][wxT("settings")]; + } + + return frames.Size()-1; +} + +void eSettings::RemoveFrame(unsigned int frameId) { + wxASSERT(m_jsonRoot.HasMember(wxT("frames"))); + + wxJSONValue frames = m_jsonRoot.ItemAt(wxT("frames")); + wxASSERT((int)frameId < frames.Size()); + + // we need to leave at least one frame + if (frames.Size() == 1) { + // just clear page info + wxJSONValue& frame = frames[0]; + frame.Remove(wxT("pages")); + } + else frames.Remove(frameId); +} + +void eSettings::RemoveFrame(const eFrameSettings& fs) { + const int frameId = GetIndexFromFrameSettings(fs); + if (frameId == -1) return; + + RemoveFrame(frameId); +} + +void eSettings::DeleteAllFrameSettings(int top) { + if (!m_jsonRoot.HasMember(wxT("frames"))) return; + + wxJSONValue& frames = m_jsonRoot[wxT("frames")]; + if (frames.Size() == 0) return; + + // Remove all frames, but keep settings from the active one + for (int i = frames.Size()-1; i >= 0; --i) { + if (i == top) { + // just clear page info + wxJSONValue& frame = frames[i]; + frame.Remove(wxT("pages")); + continue; + } + frames.Remove(i); + } + + // Remove page related settings + eFrameSettings frmSettings = GetFrameSettings(0); + frmSettings.RemoveSetting(wxT("topwin/tablayout")); + frmSettings.RemoveSetting(wxT("topwin/page_id")); +} + +int eSettings::GetIndexFromFrameSettings(const eFrameSettings& fs) const { + if (!m_jsonRoot.HasMember(wxT("frames"))) return -1; + + wxJSONValue frames = m_jsonRoot.ItemAt(wxT("frames")); + if (frames.Size() == 0) return -1; + + for (int i = 0; i < frames.Size(); ++i) { + if (frames[i].GetRefData() == fs.GetRefData()) return i; + } + + return -1; // not found +} + bool eSettings::GetSettingBool(const wxString& name, bool& value) const { if (!m_jsonRoot.HasMember(wxT("settings"))) return false; @@ -232,125 +338,6 @@ void eSettings::GetRecents(const wxJSONValue& jarray, wxArrayString& recents) co } } -size_t eSettings::GetPageCount() const { - if (!m_jsonRoot.HasMember(wxT("pages"))) return 0; - - const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); - return pages.Size(); -} - -void eSettings::SetPageSettings(size_t page_id, const wxString& path, doc_id di, int pos, int topline, const wxString& syntax, const vector<unsigned int>& folds, const vector<cxBookmark>& bookmarks, SubPage sp) { - wxJSONValue& pages = m_jsonRoot.Item(wxT("pages")); - if (!pages.IsArray()) pages.SetType(wxJSONTYPE_ARRAY); - - wxASSERT((int)page_id <= pages.Size()); - wxJSONValue& toppage = ((int)page_id == pages.Size()) ? pages.Append(wxJSONValue(wxJSONTYPE_OBJECT)) : pages[page_id]; - - // With diffs we may have subpages - wxJSONValue& page = (sp == SP_MAIN) ? toppage : ((sp == SP_LEFT) ? toppage[wxT("left")] : toppage[wxT("right")]); - - page.RemoveAll(); - page[wxT("path")] = path; - page[wxT("pos")] = pos; - page[wxT("topline")] = topline; - page[wxT("syntax")] = syntax; - - // doc_id - page[wxT("doc_type")] = di.type; - page[wxT("doc_doc")] = di.document_id; - page[wxT("doc_version")] = di.version_id; - - // Set folds - wxJSONValue& foldsArray = page[wxT("folds")]; - if (!foldsArray.IsArray()) foldsArray.SetType(wxJSONTYPE_ARRAY); - for (vector<unsigned int>::const_iterator p = folds.begin(); p != folds.end(); ++p) { - foldsArray.Append(*p); - } - - // Set bookmarks - wxJSONValue& bookmarksArray = page[wxT("bookmarks")]; - if (!bookmarksArray.IsArray()) bookmarksArray.SetType(wxJSONTYPE_ARRAY); - for (vector<cxBookmark>::const_iterator b = bookmarks.begin(); b != bookmarks.end(); ++b) { - bookmarksArray.Append(b->line_id); - } -} - -void eSettings::GetPageSettings(size_t page_id, wxString& path, doc_id& di, int& pos, int& topline, wxString& syntax, vector<unsigned int>& folds, vector<unsigned int>& bookmarks, SubPage sp) const { - const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); - wxASSERT((int)page_id < pages.Size()); - const wxJSONValue toppage = pages.ItemAt(page_id); - - // With diffs we may have subpages - const wxJSONValue page = (sp == SP_MAIN) ? toppage : ((sp == SP_LEFT) ? toppage.ItemAt(wxT("left")) : toppage.ItemAt(wxT("right"))); - - path = page.ItemAt(wxT("path")).AsString(); - pos = page.ItemAt(wxT("pos")).AsInt(); - topline = page.ItemAt(wxT("topline")).AsInt(); - syntax = page.ItemAt(wxT("syntax")).AsString(); - - // doc_id - di.type = (doc_type)page.ItemAt(wxT("doc_type")).AsInt(); - di.document_id = page.ItemAt(wxT("doc_doc")).AsInt(); - di.version_id = page.ItemAt(wxT("doc_version")).AsInt(); - - // Set folds - const wxJSONValue foldsArray = page.ItemAt(wxT("folds")); - for (int f = 0; f < foldsArray.Size(); ++f) { - folds.push_back(foldsArray.ItemAt(f).AsInt()); - } - - // Set bookmarks - const wxJSONValue bookmarksArray = page.ItemAt(wxT("bookmarks")); - for (int b = 0; b < bookmarksArray.Size(); ++b) { - bookmarks.push_back(bookmarksArray.ItemAt(b).AsInt()); - } -} - -bool eSettings::IsPageDiff(size_t page_id) const { - const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); - wxASSERT((int)page_id < pages.Size()); - const wxJSONValue page = pages.ItemAt(page_id); - return page.HasMember(wxT("left")); -} - -wxString eSettings::GetPagePath(size_t page_id, SubPage sp) const { - const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); - wxASSERT((int)page_id < pages.Size()); - const wxJSONValue toppage = pages.ItemAt(page_id); - - // With diffs we may have subpages - const wxJSONValue page = (sp == SP_MAIN) ? toppage : ((sp == SP_LEFT) ? toppage.ItemAt(wxT("left")) : toppage.ItemAt(wxT("right"))); - - return page.ItemAt(wxT("path")).AsString(); -} - -doc_id eSettings::GetPageDoc(size_t page_id, SubPage sp) const { - const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); - wxASSERT((int)page_id < pages.Size()); - const wxJSONValue toppage = pages.ItemAt(page_id); - - // With diffs we may have subpages - const wxJSONValue page = (sp == SP_MAIN) ? toppage : ((sp == SP_LEFT) ? toppage.ItemAt(wxT("left")) : toppage.ItemAt(wxT("right"))); - - doc_id di; - di.type = (doc_type)page.ItemAt(wxT("doc_type")).AsInt(); - di.document_id = page.ItemAt(wxT("doc_doc")).AsInt(); - di.version_id = page.ItemAt(wxT("doc_version")).AsInt(); - - return di; -} - -void eSettings::DeleteAllPageSettings() { - m_jsonRoot.Remove(wxT("pages")); -} - -void eSettings::DeletePageSettings(size_t page_id) { - wxJSONValue& pages = m_jsonRoot.Item(wxT("pages")); - wxASSERT((int)page_id < pages.Size()); - - pages.Remove(page_id); -} - RemoteProfile* eSettings::DoGetRemoteProfile(size_t profile_id) { // Check if profile is already in cache for (auto_vector<RemoteProfile>::iterator p = m_tempRemotes.begin(); p != m_tempRemotes.end(); ++p) { @@ -688,3 +675,189 @@ bool eSettings::AddFilterCommand(const wxString& command) { return true; } + +// ---- eFrameSettings --------------------------------------------------------- + +eFrameSettings::eFrameSettings(wxJSONValue& framesettings) : m_jsonRoot(framesettings) { +} + +void eFrameSettings::RemoveSetting(const wxString& name) { + wxJSONValue& settings = m_jsonRoot[wxT("settings")]; + settings.Remove(name); +} + +bool eFrameSettings::GetSettingBool(const wxString& name, bool& value) const { + if (!m_jsonRoot.HasMember(wxT("settings"))) return false; + + const wxJSONValue settings = m_jsonRoot.ItemAt(wxT("settings")); + if (!settings.HasMember(name)) return false; + + // old bool values may have been stored as ints + const wxJSONValue val = settings.ItemAt(name); + if (val.IsInt()) return (val.AsInt() > 0); + + if (!val.IsBool()) return false; + + value = val.AsBool(); + return true; +} + +void eFrameSettings::SetSettingBool(const wxString& name, bool value) { + wxJSONValue& settings = m_jsonRoot[wxT("settings")]; + settings[name] = value; +} + +bool eFrameSettings::GetSettingInt(const wxString& name, int& value) const { + if (!m_jsonRoot.HasMember(wxT("settings"))) return false; + + const wxJSONValue settings = m_jsonRoot.ItemAt(wxT("settings")); + if (!settings.HasMember(name)) return false; + + const wxJSONValue val = settings.ItemAt(name); + if (!val.IsInt()) return false; + + value = val.AsInt(); + return true; +} + +void eFrameSettings::SetSettingInt(const wxString& name, int value) { + wxJSONValue& settings = m_jsonRoot[wxT("settings")]; + settings[name] = value; +} + +bool eFrameSettings::GetSettingString(const wxString& name, wxString& value) const { + if (!m_jsonRoot.HasMember(wxT("settings"))) return false; + + const wxJSONValue settings = m_jsonRoot.ItemAt(wxT("settings")); + if (!settings.HasMember(name)) return false; + + const wxJSONValue val = settings.ItemAt(name); + if (!val.IsString()) return false; + + value = val.AsString(); + return true; +} + +void eFrameSettings::SetSettingString(const wxString& name, const wxString& value) { + wxJSONValue& settings = m_jsonRoot[wxT("settings")]; + settings[name] = value; +} + +size_t eFrameSettings::GetPageCount() const { + if (!m_jsonRoot.HasMember(wxT("pages"))) return 0; + + const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); + return pages.Size(); +} + +void eFrameSettings::SetPageSettings(size_t page_id, const wxString& path, doc_id di, int pos, int topline, const wxString& syntax, const vector<unsigned int>& folds, const vector<cxBookmark>& bookmarks, SubPage sp) { + wxJSONValue& pages = m_jsonRoot.Item(wxT("pages")); + if (!pages.IsArray()) pages.SetType(wxJSONTYPE_ARRAY); + + wxASSERT((int)page_id <= pages.Size()); + wxJSONValue& toppage = ((int)page_id == pages.Size()) ? pages.Append(wxJSONValue(wxJSONTYPE_OBJECT)) : pages[page_id]; + + // With diffs we may have subpages + wxJSONValue& page = (sp == SP_MAIN) ? toppage : ((sp == SP_LEFT) ? toppage[wxT("left")] : toppage[wxT("right")]); + + page.RemoveAll(); + page[wxT("path")] = path; + page[wxT("pos")] = pos; + page[wxT("topline")] = topline; + page[wxT("syntax")] = syntax; + + // doc_id + page[wxT("doc_type")] = di.type; + page[wxT("doc_doc")] = di.document_id; + page[wxT("doc_version")] = di.version_id; + + // Set folds + wxJSONValue& foldsArray = page[wxT("folds")]; + if (!foldsArray.IsArray()) foldsArray.SetType(wxJSONTYPE_ARRAY); + for (vector<unsigned int>::const_iterator p = folds.begin(); p != folds.end(); ++p) { + foldsArray.Append(*p); + } + + // Set bookmarks + wxJSONValue& bookmarksArray = page[wxT("bookmarks")]; + if (!bookmarksArray.IsArray()) bookmarksArray.SetType(wxJSONTYPE_ARRAY); + for (vector<cxBookmark>::const_iterator b = bookmarks.begin(); b != bookmarks.end(); ++b) { + bookmarksArray.Append(b->line_id); + } +} + +void eFrameSettings::GetPageSettings(size_t page_id, wxString& path, doc_id& di, int& pos, int& topline, wxString& syntax, vector<unsigned int>& folds, vector<unsigned int>& bookmarks, SubPage sp) const { + const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); + wxASSERT((int)page_id < pages.Size()); + const wxJSONValue toppage = pages.ItemAt(page_id); + + // With diffs we may have subpages + const wxJSONValue page = (sp == SP_MAIN) ? toppage : ((sp == SP_LEFT) ? toppage.ItemAt(wxT("left")) : toppage.ItemAt(wxT("right"))); + + path = page.ItemAt(wxT("path")).AsString(); + pos = page.ItemAt(wxT("pos")).AsInt(); + topline = page.ItemAt(wxT("topline")).AsInt(); + syntax = page.ItemAt(wxT("syntax")).AsString(); + + // doc_id + di.type = (doc_type)page.ItemAt(wxT("doc_type")).AsInt(); + di.document_id = page.ItemAt(wxT("doc_doc")).AsInt(); + di.version_id = page.ItemAt(wxT("doc_version")).AsInt(); + + // Set folds + const wxJSONValue foldsArray = page.ItemAt(wxT("folds")); + for (int f = 0; f < foldsArray.Size(); ++f) { + folds.push_back(foldsArray.ItemAt(f).AsInt()); + } + + // Set bookmarks + const wxJSONValue bookmarksArray = page.ItemAt(wxT("bookmarks")); + for (int b = 0; b < bookmarksArray.Size(); ++b) { + bookmarks.push_back(bookmarksArray.ItemAt(b).AsInt()); + } +} + +bool eFrameSettings::IsPageDiff(size_t page_id) const { + const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); + wxASSERT((int)page_id < pages.Size()); + const wxJSONValue page = pages.ItemAt(page_id); + return page.HasMember(wxT("left")); +} + +wxString eFrameSettings::GetPagePath(size_t page_id, SubPage sp) const { + const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); + wxASSERT((int)page_id < pages.Size()); + const wxJSONValue toppage = pages.ItemAt(page_id); + + // With diffs we may have subpages + const wxJSONValue page = (sp == SP_MAIN) ? toppage : ((sp == SP_LEFT) ? toppage.ItemAt(wxT("left")) : toppage.ItemAt(wxT("right"))); + + return page.ItemAt(wxT("path")).AsString(); +} + +doc_id eFrameSettings::GetPageDoc(size_t page_id, SubPage sp) const { + const wxJSONValue pages = m_jsonRoot.ItemAt(wxT("pages")); + wxASSERT((int)page_id < pages.Size()); + const wxJSONValue toppage = pages.ItemAt(page_id); + + // With diffs we may have subpages + const wxJSONValue page = (sp == SP_MAIN) ? toppage : ((sp == SP_LEFT) ? toppage.ItemAt(wxT("left")) : toppage.ItemAt(wxT("right"))); + + doc_id di; + di.type = (doc_type)page.ItemAt(wxT("doc_type")).AsInt(); + di.document_id = page.ItemAt(wxT("doc_doc")).AsInt(); + di.version_id = page.ItemAt(wxT("doc_version")).AsInt(); + + return di; +} + +void eFrameSettings::DeleteAllPageSettings() { + m_jsonRoot.Remove(wxT("pages")); +} + +void eFrameSettings::DeletePageSettings(size_t page_id) { + wxJSONValue& pages = m_jsonRoot.Item(wxT("pages")); + wxASSERT((int)page_id < pages.Size()); + + pages.Remove(page_id); +} src/eSettings.cpp @@ -27,6 +27,37 @@ // pre-declarations class RemoteProfile; +enum SubPage {SP_MAIN=0, SP_LEFT, SP_RIGHT}; + +class eFrameSettings { +public: + eFrameSettings(wxJSONValue& framesettings); + + // Individual settings + bool GetSettingBool(const wxString& name, bool& value) const; + void SetSettingBool(const wxString& name, bool value); + bool GetSettingInt(const wxString& name, int& value) const; + void SetSettingInt(const wxString& name, int value); + bool GetSettingString(const wxString& name, wxString& value) const; + void SetSettingString(const wxString& name, const wxString& value); + void RemoveSetting(const wxString& name); + + // Pages + size_t GetPageCount() const; + void SetPageSettings(size_t page_id, const wxString& path, doc_id di, int pos, int topline, const wxString& syntax, const vector<unsigned int>& folds, const vector<cxBookmark>& bookmarks, SubPage sp=SP_MAIN); + void GetPageSettings(size_t page_id, wxString& path, doc_id& di, int& pos, int& topline, wxString& syntax, vector<unsigned int>& folds, vector<unsigned int>& bookmarks, SubPage sp=SP_MAIN) const; + bool IsPageDiff(size_t page_id) const; + wxString GetPagePath(size_t page_id, SubPage sp=SP_MAIN) const; + doc_id GetPageDoc(size_t page_id, SubPage sp=SP_MAIN) const; + void DeletePageSettings(size_t page_id); + void DeleteAllPageSettings(); + + wxJSONRefData* GetRefData() const {return m_jsonRoot.GetRefData();}; + +private: + wxJSONValue& m_jsonRoot; +}; + class eSettings: public ISettings { public: eSettings(); @@ -44,26 +75,23 @@ public: void SetSettingLong(const wxString& name, const wxLongLong& value); bool GetSettingString(const wxString& name, wxString& value) const; void SetSettingString(const wxString& name, const wxString& value); - void RemoveSetting(const wxString& name); + // Frames + unsigned int GetFrameCount() const; + eFrameSettings GetFrameSettings(unsigned int frameId); + unsigned int AddFrame(unsigned int top); + void RemoveFrame(unsigned int frameId); + void RemoveFrame(const eFrameSettings& fs); + void DeleteAllFrameSettings(int top); + int GetIndexFromFrameSettings(const eFrameSettings& fs) const; + // Recent files void AddRecentFile(const wxString& path); void AddRecentProject(const wxString& path); void GetRecentFiles(wxArrayString& recentfiles) const; void GetRecentProjects(wxArrayString& recentprojects) const; - // Pages - enum SubPage {SP_MAIN=0, SP_LEFT, SP_RIGHT}; - size_t GetPageCount() const; - void SetPageSettings(size_t page_id, const wxString& path, doc_id di, int pos, int topline, const wxString& syntax, const vector<unsigned int>& folds, const vector<cxBookmark>& bookmarks, SubPage sp=SP_MAIN); - void GetPageSettings(size_t page_id, wxString& path, doc_id& di, int& pos, int& topline, wxString& syntax, vector<unsigned int>& folds, vector<unsigned int>& bookmarks, SubPage sp=SP_MAIN) const; - bool IsPageDiff(size_t page_id) const; - wxString GetPagePath(size_t page_id, SubPage sp=SP_MAIN) const; - doc_id GetPageDoc(size_t page_id, SubPage sp=SP_MAIN) const; - void DeletePageSettings(size_t page_id); - void DeleteAllPageSettings(); - // Recent Diffs void AddRecentDiff(const wxString& path, SubPage sp); void GetRecentDiffs(wxArrayString& recentprojectsh, SubPage sp) const; src/eSettings.h 5e061bc457af3093e82cab310fadfd7f4a022f2b Alexander Stigsen stigsen@e-texteditor.com http://github.com/adamv/e/commit/00a68e16258ba551a0100439eb05ee6b1c2ec728 00a68e16258ba551a0100439eb05ee6b1c2ec728 2009-10-12T05:20:28-07:00 2009-10-12T05:20:28-07:00 Added Multi-Window support c257b5e806987bfb91a76b63e43ff709f2c6b7ec Alexander Stigsen stigsen@e-texteditor.com