diff --git a/pgadmin/dlg/dlgClasses.cpp b/pgadmin/dlg/dlgClasses.cpp index 943a8a5..2ed3170 100644 --- a/pgadmin/dlg/dlgClasses.cpp +++ b/pgadmin/dlg/dlgClasses.cpp @@ -293,7 +293,7 @@ void pgFrame::OnRecent(wxCommandEvent& event) -void pgFrame::UpdateRecentFiles() +void pgFrame::UpdateRecentFiles(bool updatefile) { if (!recentFileMenu) return; @@ -314,7 +314,7 @@ void pgFrame::UpdateRecentFiles() while (i <= maxFiles) lastFiles[i++] = wxT(""); - if (recentIndex > 1 && !lastPath.IsNull()) + if (recentIndex > 1 && !lastPath.IsNull() && updatefile) { for (i=recentIndex ; i > 1 ; i--) lastFiles[i] = lastFiles[i-1]; @@ -332,7 +332,8 @@ void pgFrame::UpdateRecentFiles() for (i=1 ; i <= maxFiles ; i++) { - settings->Write(recentKey + wxString::Format(wxT("/%d"), i), lastFiles[i]); + if (updatefile) + settings->Write(recentKey + wxString::Format(wxT("/%d"), i), lastFiles[i]); if (!lastFiles[i].IsNull()) recentFileMenu->Append(MNU_RECENT+i, wxT("&") + wxString::Format(wxT("%d"), i) + wxT(" ") + lastFiles[i]); diff --git a/pgadmin/frm/frmMain.cpp b/pgadmin/frm/frmMain.cpp index 67e9b67..1db4c06 100644 --- a/pgadmin/frm/frmMain.cpp +++ b/pgadmin/frm/frmMain.cpp @@ -76,7 +76,6 @@ #include "slony/slCluster.h" #include "slony/slSet.h" - #if wxDIALOG_UNIT_COMPATIBILITY #error wxWindows must be compiled with wxDIALOG_UNIT_COMPATIBILITY=0! #endif @@ -88,6 +87,8 @@ frmMain::frmMain(const wxString& title) lastPluginUtility=NULL; pluginUtilityCount = 0; + frmQueries.Clear(); + dlgName = wxT("frmMain"); SetMinSize(wxSize(400,300)); RestorePosition(50, 50, 750, 550, 600, 450); @@ -230,7 +231,42 @@ frmMain::~frmMain() delete treeContextMenu; } +void frmMain::AddFrmQueryTool(frmQuery* fq) +{ + frmQueries.Add(fq); +} +void frmMain::RemoveFrmQueryTool(frmQuery* fq) +{ + frmQueries.Remove(fq); +} + +void frmMain::UpdateRecentFilesOnFrmQueries() +{ + for (size_t i=0; i < frmQueries.GetCount(); i++) + { + frmQuery *fq = frmQueries.Item(i); + fq->UpdateRecentFiles(false); + } +} + +void frmMain::UpdateFavouritesListOnFrmQueries() +{ + for (size_t i=0; i < frmQueries.GetCount(); i++) + { + frmQuery *fq = frmQueries.Item(i); + fq->UpdateFavouritesList(); + } +} + +void frmMain::UpdateMacrosListOnFrmQueries() +{ + for (size_t i=0; i < frmQueries.GetCount(); i++) + { + frmQuery *fq = frmQueries.Item(i); + fq->UpdateMacrosList(); + } +} void frmMain::CreateMenus() { diff --git a/pgadmin/frm/frmQuery.cpp b/pgadmin/frm/frmQuery.cpp index 1a460f3..8b57784 100644 --- a/pgadmin/frm/frmQuery.cpp +++ b/pgadmin/frm/frmQuery.cpp @@ -192,6 +192,7 @@ class DnDFile : public wxFileDropTarget m_fquery->setExtendedTitle(); m_fquery->SetLineEndingStyle(); m_fquery->UpdateRecentFiles(); + m_fquery->UpdateRecentFilesOnFrmQueries(); } } return true; @@ -305,14 +306,14 @@ pgsTimer(new pgScriptTimer(this)) favouritesMenu->Append(MNU_FAVOURITES_ADD, _("Add favourite..."), _("Add current query to favourites")); favouritesMenu->Append(MNU_FAVOURITES_MANAGE, _("Manage favourites..."), _("Edit and delete favourites")); favouritesMenu->AppendSeparator(); - favourites = queryFavouriteFileProvider::LoadFavourites(true); + favourites = 0L; UpdateFavouritesList(); menuBar->Append(favouritesMenu, _("Fav&ourites")); macrosMenu = new wxMenu(); macrosMenu->Append(MNU_MACROS_MANAGE, _("Manage macros..."), _("Edit and delete macros")); macrosMenu->AppendSeparator(); - macros = queryMacroFileProvider::LoadMacros(true); + macros = 0L; UpdateMacrosList(); menuBar->Append(macrosMenu, _("&Macros")); @@ -593,6 +594,8 @@ pgsTimer(new pgScriptTimer(this)) msgResult->SetMaxLength(0L); msgHistory->SetMaxLength(0L); + + form->AddFrmQueryTool(this); } @@ -600,6 +603,8 @@ frmQuery::~frmQuery() { closing = true; + mainForm->RemoveFrmQueryTool(this); + // Save frmQuery Perspective settings->Write(wxT("frmQuery/Perspective-") + VerFromRev(FRMQUERY_PERPSECTIVE_VER), manager.SavePerspective()); @@ -875,6 +880,12 @@ void frmQuery::Go() } +void frmQuery::UpdateRecentFilesOnFrmQueries() +{ + mainForm->UpdateRecentFilesOnFrmQueries(); +} + + typedef struct __sqltokenhelp { const wxChar *token; @@ -1385,6 +1396,11 @@ void frmQuery::updateMenu(wxObject *obj) void frmQuery::UpdateFavouritesList() { + if (favourites) + delete favourites; + + favourites = queryFavouriteFileProvider::LoadFavourites(true); + while (favouritesMenu->GetMenuItemCount() > 3) { favouritesMenu->Destroy(favouritesMenu->GetMenuItems()[3]); @@ -1396,6 +1412,11 @@ void frmQuery::UpdateFavouritesList() void frmQuery::UpdateMacrosList() { + if (macros) + delete macros; + + macros = queryMacroFileProvider::LoadMacros(true); + while (macrosMenu->GetMenuItemCount() > 2) { macrosMenu->Destroy(macrosMenu->GetMenuItems()[2]); @@ -1413,7 +1434,7 @@ void frmQuery::OnAddFavourite(wxCommandEvent &event) { // Added a favourite, so save queryFavouriteFileProvider::SaveFavourites(favourites); - UpdateFavouritesList(); + mainForm->UpdateFavouritesListOnFrmQueries(); } } @@ -1425,14 +1446,11 @@ void frmQuery::OnManageFavourites(wxCommandEvent &event) { // Changed something, so save queryFavouriteFileProvider::SaveFavourites(favourites); - UpdateFavouritesList(); } - else if (r == -1) + if (r == 1 || r == -1) { // Changed something requiring rollback - delete favourites; - favourites = queryFavouriteFileProvider::LoadFavourites(true); - UpdateFavouritesList(); + mainForm->UpdateFavouritesListOnFrmQueries(); } } @@ -1594,6 +1612,7 @@ void frmQuery::OpenLastFile() setExtendedTitle(); SetLineEndingStyle(); UpdateRecentFiles(); + mainForm->UpdateRecentFilesOnFrmQueries(); } } @@ -2135,14 +2154,11 @@ void frmQuery::OnMacroManage(wxCommandEvent &event) { // Changed something, so save queryMacroFileProvider::SaveMacros(macros); - UpdateMacrosList(); } - else if (r == -1) + if (r == -1 || r == 1) { // Changed something requiring rollback - delete macros; - macros = queryMacroFileProvider::LoadMacros(true); - UpdateMacrosList(); + mainForm->UpdateMacrosListOnFrmQueries(); } } diff --git a/pgadmin/include/dlg/dlgClasses.h b/pgadmin/include/dlg/dlgClasses.h index 26f576e..c5c4d23 100644 --- a/pgadmin/include/dlg/dlgClasses.h +++ b/pgadmin/include/dlg/dlgClasses.h @@ -60,7 +60,7 @@ public: void SavePosition(); void OnAction(wxCommandEvent& event); - void UpdateRecentFiles(); + void UpdateRecentFiles(bool updatefile=true); menuFactoryList *GetMenuFactories() { return menuFactories; } diff --git a/pgadmin/include/frm/frmMain.h b/pgadmin/include/frm/frmMain.h index d9980a9..27d3559 100644 --- a/pgadmin/include/frm/frmMain.h +++ b/pgadmin/include/frm/frmMain.h @@ -17,10 +17,12 @@ #include #include #include +#include // wxAUI #include +#include "frm/frmQuery.h" #include "dlg/dlgClasses.h" #include "utils/factory.h" @@ -70,6 +72,9 @@ enum }; +WX_DEFINE_ARRAY_PTR(frmQuery *, ArrayOfFrmQuery); + + // Class declarations class frmMain : public pgFrame { @@ -116,6 +121,12 @@ public: wxString GetCurrentNodePath(); bool SetCurrentNode(wxTreeItemId node, const wxString &path); + void AddFrmQueryTool(frmQuery *fq); + void RemoveFrmQueryTool(frmQuery *fq); + void UpdateRecentFilesOnFrmQueries(); + void UpdateFavouritesListOnFrmQueries(); + void UpdateMacrosListOnFrmQueries(); + private: wxAuiManager manager; ctlTree *browser; @@ -145,6 +156,8 @@ private: wxTreeItemId denyCollapseItem; pgObject *currentObject; + ArrayOfFrmQuery frmQueries; + void OnEraseBackground(wxEraseEvent& event); void OnSize(wxSizeEvent& event); void OnSelectItem(wxListEvent &event); diff --git a/pgadmin/include/frm/frmQuery.h b/pgadmin/include/frm/frmQuery.h index c94ad7e..c23f0d4 100644 --- a/pgadmin/include/frm/frmQuery.h +++ b/pgadmin/include/frm/frmQuery.h @@ -82,6 +82,10 @@ public: void SetLastPath(wxString p_lastpath) { lastPath = p_lastpath; } bool CheckChanged(bool canVeto); + void UpdateRecentFilesOnFrmQueries(); + void UpdateFavouritesList(); + void UpdateMacrosList(); + private: frmMain *mainForm; wxAuiManager manager; @@ -200,13 +204,11 @@ private: void OnScriptComplete(wxCommandEvent &ev); void setTools(const bool running); void showMessage(const wxString& msg, const wxString &msgShort=wxT("")); - void UpdateFavouritesList(); int GetLineEndingStyle(); void OnSetEOLMode(wxCommandEvent& event); void SetEOLModeDisplay(int mode); void OnMacroInvoke(wxCommandEvent& event); void OnMacroManage(wxCommandEvent& event); - void UpdateMacrosList(); void LoadQueries(); void SaveQueries();