SVN Commit by dpage: r4619 - in trunk/pgadmin3: . src/frm src/main

Author: dpage
Date: 2005-10-27 23:28:57 +0100 (Thu, 27 Oct 2005)
New Revision: 4619

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/frm/frmQuery.cpp
   trunk/pgadmin3/src/main/dlgClasses.cpp
Log:
Reverse dialog OK/Cancel buttons for UI consistency on OS X per John DeSoi
Append the .sql file extension when saving files as type sql on OS X, per Florian G. Pflug


Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-10-25 20:01:31 UTC (rev 4618)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-10-27 22:28:57 UTC (rev 4619)
@@ -17,6 +17,8 @@
 </ul>
 <br>
 <ul>
+    <li>2005-10-27 DP  1.4B4 Reverse dialog OK/Cancel buttons for UI consistency on OS X per John DeSoi
+    <li>2005-10-27 DP  1.4B4 Append the .sql file extension when saving files as type sql on OS X, per Florian G.
Pflug
     <li>2005-10-24 DP  1.4B4 Prevent attempts to backup or restore is pg_dump/pg_restore cannot be found.
     <li>2005-10-23 AP  1.4B4 Fix crash when extracting schema from slony cluster
     <li>2005-10-22 AP  1.4B4 Fix New.. context menu

Modified: trunk/pgadmin3/src/frm/frmQuery.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmQuery.cpp    2005-10-25 20:01:31 UTC (rev 4618)
+++ trunk/pgadmin3/src/frm/frmQuery.cpp    2005-10-27 22:28:57 UTC (rev 4619)
@@ -841,9 +841,17 @@
         {
             case 0:
                 lastFileFormat = false;
+#ifdef __WXMAC__
+        if (!lastPath.Contains(wxT(".")))
+            lastPath += wxT(".sql");
+#endif
                 break;
             case 1:
                 lastFileFormat = true;
+#ifdef __WXMAC__
+                if (!lastPath.Contains(wxT(".")))
+                        lastPath += wxT(".sql");
+#endif
                 break;
             default:
                 lastFileFormat = settings->GetUnicodeFile();

Modified: trunk/pgadmin3/src/main/dlgClasses.cpp
===================================================================
--- trunk/pgadmin3/src/main/dlgClasses.cpp    2005-10-25 20:01:31 UTC (rev 4618)
+++ trunk/pgadmin3/src/main/dlgClasses.cpp    2005-10-27 22:28:57 UTC (rev 4619)
@@ -99,6 +99,26 @@
         right -= size.GetWidth() - ConvertDialogToPixels(wxSize(3,0)).x;
         btnApply->Move(right, pos.y);
     }
+
+// On OS X, reverse the buttons for UI consistency
+#ifdef __WXMAC__
+    wxPoint pos2;
+    pos = btnCancel->GetPosition();
+
+    if (btnOK)
+    {
+        pos2 = btnOK->GetPosition();
+        btnOK->Move(pos.x, pos.y);
+    }
+
+    if (btnApply)
+    {
+        pos2 = btnApply->GetPosition();
+        btnApply->Move(pos.x, pos.y);
+    }
+
+    btnCancel->Move(pos2.x, pos2.y);
+#endif

     int w, h;
     size=GetSize();