Ticket #149: ticket149_v1.patch

pgadmin/dlg/dlgClasses.cpp

@@ -293 +293 @@
 
 
 
-void pgFrame::UpdateRecentFiles()
+void pgFrame::UpdateRecentFiles(bool updatefile)
 {
     if (!recentFileMenu)
         return;
@@ -314 +314 @@
     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 +332 @@
 
     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]);

pgadmin/frm/frmMain.cpp

@@ -76 +76 @@
 #include "slony/slCluster.h"
 #include "slony/slSet.h"
 
-
 #if wxDIALOG_UNIT_COMPATIBILITY
 #error wxWindows must be compiled with wxDIALOG_UNIT_COMPATIBILITY=0!
 #endif
@@ -88 +87 @@
     lastPluginUtility=NULL;
     pluginUtilityCount = 0;
 
+    frmQueries.Clear();
+
     dlgName = wxT("frmMain");
     SetMinSize(wxSize(400,300));
     RestorePosition(50, 50, 750, 550, 600, 450);
@@ -230 +231 @@
         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()
 {

pgadmin/frm/frmQuery.cpp

@@ -192 +192 @@
                                                 m_fquery->setExtendedTitle();
                                                 m_fquery->SetLineEndingStyle();
                                                 m_fquery->UpdateRecentFiles();
+                        m_fquery->UpdateRecentFilesOnFrmQueries();
                                 }
                         }
                         return true;
@@ -305 +306 @@
     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 +594 @@
 
     msgResult->SetMaxLength(0L);
     msgHistory->SetMaxLength(0L);
+
+    form->AddFrmQueryTool(this);
 }
 
 
@@ -600 +603 @@
 {
     closing = true;
 
+    mainForm->RemoveFrmQueryTool(this);
+
     // Save frmQuery Perspective
     settings->Write(wxT("frmQuery/Perspective-") + VerFromRev(FRMQUERY_PERPSECTIVE_VER), manager.SavePerspective());
 
@@ -875 +880 @@
 }
 
 
+void frmQuery::UpdateRecentFilesOnFrmQueries()
+{
+    mainForm->UpdateRecentFilesOnFrmQueries();
+}
+
+
 typedef struct __sqltokenhelp
 {
     const wxChar *token;
@@ -1385 +1396 @@
 
 void frmQuery::UpdateFavouritesList()
 {
+    if (favourites)
+        delete favourites;
+
+    favourites = queryFavouriteFileProvider::LoadFavourites(true);
+
     while (favouritesMenu->GetMenuItemCount() > 3)
     {
         favouritesMenu->Destroy(favouritesMenu->GetMenuItems()[3]);
@@ -1396 +1412 @@
 
 void frmQuery::UpdateMacrosList()
 {
+    if (macros)
+        delete macros;
+
+    macros = queryMacroFileProvider::LoadMacros(true);
+
     while (macrosMenu->GetMenuItemCount() > 2)
     {
         macrosMenu->Destroy(macrosMenu->GetMenuItems()[2]);
@@ -1413 +1434 @@
     {
         // Added a favourite, so save
         queryFavouriteFileProvider::SaveFavourites(favourites);
-        UpdateFavouritesList();
+        mainForm->UpdateFavouritesListOnFrmQueries();
     }
 }
 
@@ -1425 +1446 @@
     {
         // 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 +1612 @@
         setExtendedTitle();
         SetLineEndingStyle();
         UpdateRecentFiles();
+        mainForm->UpdateRecentFilesOnFrmQueries();
     }
 }
 
@@ -2135 +2154 @@
     {
         // 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();
     }
 
 }

pgadmin/include/dlg/dlgClasses.h

@@ -60 +60 @@
     void SavePosition();
     void OnAction(wxCommandEvent& event);
                 
-    void UpdateRecentFiles();
+    void UpdateRecentFiles(bool updatefile=true);
 
         menuFactoryList *GetMenuFactories() { return menuFactories; }
 

pgadmin/include/frm/frmMain.h

@@ -17 +17 @@
 #include <wx/wx.h>
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
+#include <wx/dynarray.h>
 
 // wxAUI
 #include <wx/aui/aui.h>
 
+#include "frm/frmQuery.h"
 #include "dlg/dlgClasses.h"
 #include "utils/factory.h"
 
@@ -70 +72 @@
 };
 
 
+WX_DEFINE_ARRAY_PTR(frmQuery *, ArrayOfFrmQuery);
+
+
 // Class declarations
 class frmMain : public pgFrame
 {
@@ -116 +121 @@
     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 +156 @@
     wxTreeItemId denyCollapseItem;
     pgObject *currentObject;
 
+    ArrayOfFrmQuery frmQueries;
+
     void OnEraseBackground(wxEraseEvent& event);
     void OnSize(wxSizeEvent& event);
         void OnSelectItem(wxListEvent &event);

pgadmin/include/frm/frmQuery.h

@@ -82 +82 @@
                 void SetLastPath(wxString p_lastpath) { lastPath = p_lastpath; }
     bool CheckChanged(bool canVeto);
 
+    void UpdateRecentFilesOnFrmQueries();
+    void UpdateFavouritesList();
+    void UpdateMacrosList();
+
 private:
     frmMain *mainForm;
     wxAuiManager manager;
@@ -200 +204 @@
     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();