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

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-03-27 14:09:58 -0600 (Sun, 27 Mar 2005)
New Revision: 741

Modified:
   trunk/ocfs2console/ocfs2interface/format.py
   trunk/ocfs2console/ocfs2interface/guiutil.py
   trunk/ocfs2console/ocfs2interface/tune.py
Log:
Somewhat cleaner compat implementation of alternative button order compat


Modified: trunk/ocfs2console/ocfs2interface/format.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/format.py	2005-03-27 09:15:19 UTC (rev 740)
+++ trunk/ocfs2console/ocfs2interface/format.py	2005-03-27 20:09:58 UTC (rev 741)
@@ -19,7 +19,7 @@
 
 import ocfs2
 
-from guiutil import set_props, error_box, format_bytes, set_alt_button_order
+from guiutil import Dialog, set_props, error_box, format_bytes
 from process import Process
 
 from fswidgets import BaseCombo, NumNodes, VolumeLabel, ClusterSize, BlockSize
@@ -59,14 +59,14 @@
 
     partitions.sort(sort_partition)
 
-    dialog = gtk.Dialog(parent=parent, title='Format',
-                        buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
-                                 gtk.STOCK_OK,     gtk.RESPONSE_OK))
+    dialog = Dialog(parent=parent, title='Format',
+                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                             gtk.STOCK_OK,     gtk.RESPONSE_OK))
 
+    dialog.set_alternative_button_order((gtk.RESPONSE_OK, gtk.RESPONSE_CANCEL))
+
     dialog.set_default_response(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-27 09:15:19 UTC (rev 740)
+++ trunk/ocfs2console/ocfs2interface/guiutil.py	2005-03-27 20:09:58 UTC (rev 741)
@@ -80,8 +80,9 @@
 
     return text
 
-try:
-    set_alt_button_order = gtk.Dialog.set_alternative_button_order
-except AttributeError:
-    def set_alt_button_order(dialog, new_order):
-        pass
+if hasattr(gtk.Dialog, 'set_alternative_button_order'):
+    Dialog = gtk.Dialog
+else:
+    class Dialog(gtk.Dialog):
+        def set_alternative_button_order(self, new_order=None):
+            pass

Modified: trunk/ocfs2console/ocfs2interface/tune.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/tune.py	2005-03-27 09:15:19 UTC (rev 740)
+++ trunk/ocfs2console/ocfs2interface/tune.py	2005-03-27 20:09:58 UTC (rev 741)
@@ -19,7 +19,7 @@
 
 import ocfs2
 
-from guiutil import set_props, error_box, format_bytes, set_alt_button_order
+from guiutil import Dialog, set_props, error_box, format_bytes
 from process import Process
 
 from fswidgets import NumNodes, VolumeLabel
@@ -63,15 +63,14 @@
                           (widget_type.label.lower(), device))
         return False
 
-    dialog = gtk.Dialog(parent=parent, title=widget_type.title,
-                        buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
-                                 gtk.STOCK_OK,     gtk.RESPONSE_OK))
+    dialog = Dialog(parent=parent, title=widget_type.title,
+                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                             gtk.STOCK_OK,     gtk.RESPONSE_OK))
 
+    dialog.set_alternative_button_order((gtk.RESPONSE_OK, gtk.RESPONSE_CANCEL))
+
     dialog.set_default_response(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,