SVN Commit by andreas: r4409 - in trunk/pgadmin3/src: . dlg include schema - Mailing list pgadmin-hackers

Author: andreas
Date: 2005-08-17 23:08:26 +0100 (Wed, 17 Aug 2005)
New Revision: 4409

Modified:
   trunk/pgadmin3/src/dlg/dlgProperty.cpp
   trunk/pgadmin3/src/include/dlgClasses.h
   trunk/pgadmin3/src/include/precomp.h
   trunk/pgadmin3/src/pgAdmin3.dsp
   trunk/pgadmin3/src/schema/pgServer.cpp
Log:
some fixes

Modified: trunk/pgadmin3/src/dlg/dlgProperty.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgProperty.cpp    2005-08-15 22:53:55 UTC (rev 4408)
+++ trunk/pgadmin3/src/dlg/dlgProperty.cpp    2005-08-17 22:08:26 UTC (rev 4409)
@@ -1367,7 +1367,7 @@

 wxWindow *refreshFactory::StartDialog(frmMain *form, pgObject *obj)
 {
-    form->ExecDrop(false);
+    form->Refresh(obj);
     return 0;
 }


Modified: trunk/pgadmin3/src/include/dlgClasses.h
===================================================================
--- trunk/pgadmin3/src/include/dlgClasses.h    2005-08-15 22:53:55 UTC (rev 4408)
+++ trunk/pgadmin3/src/include/dlgClasses.h    2005-08-17 22:08:26 UTC (rev 4409)
@@ -56,13 +56,13 @@
     void RemoveFrame(wxWindow *frame);
     void RestorePosition(int defaultX=-1, int defaultY=-1, int defaultW=-1, int defaultH=-1, int minW=100, int
minH=70);
     void SavePosition();
+    void OnAction(wxCommandEvent& event);

 protected:

     void OnKeyDown(wxKeyEvent& event);
     void OnExit(wxCommandEvent& event);
     void OnRecent(wxCommandEvent& event);
-    void OnAction(wxCommandEvent& event);
     void OnHelp(wxCommandEvent& event);

     virtual void OpenLastFile() {}

Modified: trunk/pgadmin3/src/include/precomp.h
===================================================================
--- trunk/pgadmin3/src/include/precomp.h    2005-08-15 22:53:55 UTC (rev 4408)
+++ trunk/pgadmin3/src/include/precomp.h    2005-08-17 22:08:26 UTC (rev 4409)
@@ -34,6 +34,7 @@
 #include "pgLanguage.h"
 #include "pgOperator.h"
 #include "pgOperatorClass.h"
+#include "pgRole.h"
 #include "pgRule.h"
 #include "pgSequence.h"
 #include "pgTable.h"
@@ -56,6 +57,7 @@
 #include "dlgIndexConstraint.h"
 #include "dlgLanguage.h"
 #include "dlgOperator.h"
+#include "dlgRole.h"
 #include "dlgRule.h"
 #include "dlgSequence.h"
 #include "dlgTable.h"

Modified: trunk/pgadmin3/src/pgAdmin3.dsp
===================================================================
--- trunk/pgadmin3/src/pgAdmin3.dsp    2005-08-15 22:53:55 UTC (rev 4408)
+++ trunk/pgadmin3/src/pgAdmin3.dsp    2005-08-17 22:08:26 UTC (rev 4409)
@@ -195,6 +195,10 @@
 # End Source File
 # Begin Source File

+SOURCE=.\schema\pgRole.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\schema\pgRule.cpp
 # End Source File
 # Begin Source File
@@ -926,6 +930,10 @@
 # End Source File
 # Begin Source File

+SOURCE=.\include\pgRole.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\pgRule.h
 # End Source File
 # Begin Source File

Modified: trunk/pgadmin3/src/schema/pgServer.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgServer.cpp    2005-08-15 22:53:55 UTC (rev 4408)
+++ trunk/pgadmin3/src/schema/pgServer.cpp    2005-08-17 22:08:26 UTC (rev 4409)
@@ -23,6 +23,7 @@
 #include "pgTablespace.h"
 #include "pgGroup.h"
 #include "pgUser.h"
+#include "pgRole.h"
 #include "pgaJob.h"
 #include "utffile.h"
 #include "pgfeatures.h"
@@ -732,8 +733,16 @@
             if (!exists.IsNull())
                 browser->AppendCollection(this, jobFactory);

-            browser->AppendCollection(this, groupFactory);
-            browser->AppendCollection(this, userFactory);
+            if (conn->BackendMinimumVersion(8, 1))
+            {
+                browser->AppendCollection(this, groupRoleFactory);
+                browser->AppendCollection(this, loginRoleFactory);
+            }
+            else
+            {
+                browser->AppendCollection(this, groupFactory);
+                browser->AppendCollection(this, userFactory);
+            }
         }
     }