[Ocfs2-tools-commits] manish commits r739 - trunk/ocfs2console/ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-03-27 03:05:42 -0600 (Sun, 27 Mar 2005)
New Revision: 739

Modified:
   trunk/ocfs2console/ocfs2interface/format.py
   trunk/ocfs2console/ocfs2interface/guiutil.py
   trunk/ocfs2console/ocfs2interface/tune.py
Log:
Support for alternative button order


Modified: trunk/ocfs2console/ocfs2interface/format.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/format.py	2005-03-26 01:18:17 UTC (rev 738)
+++ trunk/ocfs2console/ocfs2interface/format.py	2005-03-27 09:05:42 UTC (rev 739)
@@ -19,7 +19,7 @@
 
 import ocfs2
 
-from guiutil import set_props, error_box, format_bytes
+from guiutil import set_props, error_box, format_bytes, set_alt_button_order
 from process import Process
 
 from fswidgets import BaseCombo, NumNodes, VolumeLabel, ClusterSize, BlockSize
@@ -63,6 +63,8 @@
                         buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
                                  gtk.STOCK_OK,     gtk.RESPONSE_OK))
 
+    set_alt_button_order(dialog, (gtk.RESPONSE_OK, gtk.RESPONSE_CANCEL))
+
     table = gtk.Table(rows=5, columns=2)
     set_props(table, row_spacing=4,
                      column_spacing=4,

Modified: trunk/ocfs2console/ocfs2interface/guiutil.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/guiutil.py	2005-03-26 01:18:17 UTC (rev 738)
+++ trunk/ocfs2console/ocfs2interface/guiutil.py	2005-03-27 09:05:42 UTC (rev 739)
@@ -21,7 +21,7 @@
     for k, v in kwargs.items():
         obj.set_property(k, v)
 
-suffixes = ['K', 'MB', 'GB', 'TB']
+suffixes = ('K', 'MB', 'GB', 'TB')
 
 def format_bytes(bytes, show_bytes=False):
     if bytes == 1:
@@ -45,7 +45,8 @@
     dialog = gtk.MessageDialog(parent=parent,
                                flags=gtk.DIALOG_DESTROY_WITH_PARENT,
                                type=gtk.MESSAGE_ERROR,
-                               buttons=gtk.BUTTONS_OK, message_format=msg)
+                               buttons=gtk.BUTTONS_OK,
+                               message_format=msg)
     dialog.run()
     dialog.destroy()
 
@@ -77,4 +78,10 @@
 
     dialog.destroy()
 
-    return text    
+    return text
+
+try:
+    set_alt_button_order = gtk.Dialog.set_alternative_button_order
+except AttributeError:
+    def set_alt_button_order(dialog, new_order):
+        pass

Modified: trunk/ocfs2console/ocfs2interface/tune.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/tune.py	2005-03-26 01:18:17 UTC (rev 738)
+++ trunk/ocfs2console/ocfs2interface/tune.py	2005-03-27 09:05:42 UTC (rev 739)
@@ -19,7 +19,7 @@
 
 import ocfs2
 
-from guiutil import set_props, error_box, format_bytes
+from guiutil import set_props, error_box, format_bytes, set_alt_button_order
 from process import Process
 
 from fswidgets import NumNodes, VolumeLabel
@@ -67,6 +67,9 @@
                         buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
                                  gtk.STOCK_OK,     gtk.RESPONSE_OK))
 
+    set_alt_button_order(dialog, (gtk.RESPONSE_OK, gtk.RESPONSE_CANCEL))
+
+
     table = gtk.Table(rows=1, columns=2)
     set_props(table, row_spacing=4,
                      column_spacing=4,