Merge pull request #2381 from phillc54/phillc54/gladevcp

gladevcp: replace some deprecated widgets

Author: hansu

lib/python/gladevcp/calculator.glade

@@ -34,7 +34,7 @@
 from gi.repository import GObject
 from gi.repository import Pango
 
-class Calculator( Gtk.VBox ):
+class Calculator( Gtk.Box ):
     __gtype_name__ = 'Calculator'
     __gproperties__ = {
         'is_editable' : ( GObject.TYPE_BOOLEAN, 'Is Editable', 'Ability to use a keyboard to enter data',
@@ -45,7 +45,7 @@ class Calculator( Gtk.VBox ):
     __gproperties = __gproperties__
 
     def __init__( self, *a, **kw ):
-        Gtk.VBox.__init__( self, *a, **kw )
+        Gtk.Box.__init__( self, *a, **kw )
         self.preset_value = None
         self.eval_string = ""
         self.font = "sans 12"
@@ -94,7 +94,7 @@ def __init__( self, *a, **kw ):
         self.window = self.calc_box.get_parent()
         self.window.remove(self.calc_box)
         self.add(self.calc_box)
-        
+
         # Use CSS style for buttons
         screen = Gdk.Screen.get_default()
         provider = Gtk.CssProvider()
@@ -105,22 +105,21 @@ def __init__( self, *a, **kw ):
 
     def num_pad_only( self, value ):
         self.has_num_pad_only = value
-        objects = ["Left_bracket", "Right_bracket", "Pi", "Divide", "Multiply", 
-            "Add", "Minus", "Equal", "Inch_mm", "mm_Inch", "Backspace", "CLR", 
+        objects = ["Left_bracket", "Right_bracket", "Pi", "Divide", "Multiply",
+            "Add", "Minus", "Equal", "Inch_mm", "mm_Inch", "Backspace", "CLR",
             "Inch_mm", "mm_Inch", "cancel_button", "ok_button"]
-        if value:    
+        if value:
             for i in objects:
                 self.table.remove(self.wTree.get_object(i))
         if self.integer_only:
             col_offs = 0
         else:
             col_offs = 1
-        self.table.resize(5, 3+col_offs)
-        # reorder items to fit size-reduced table
-        self.table.attach(self.wTree.get_object("Backspace"), 1, 2, 0, 1)
-        self.table.attach(self.wTree.get_object("CLR"), 2, 3, 0, 1)
-        self.table.attach(self.wTree.get_object("cancel_button"), 1+col_offs, 2+col_offs, 4, 5)
-        self.table.attach(self.wTree.get_object("ok_button"), 2+col_offs, 3+col_offs, 4, 5)        
+        # reorder items to fit size-reduced grid
+        self.table.attach(self.wTree.get_object("Backspace"), 1, 0, 1, 1)
+        self.table.attach(self.wTree.get_object("CLR"), 2, 0, 1, 1)
+        self.table.attach(self.wTree.get_object("cancel_button"), 1+col_offs, 4, 1, 1)
+        self.table.attach(self.wTree.get_object("ok_button"), 2+col_offs, 4, 1, 1)
         self.show_all()
 
     def integer_entry_only( self, value ):
@@ -218,7 +217,7 @@ def displayOperand( self, i ):
         if i not in "+-*/" and self.eval_string != "":
             if self.eval_string[-1] == " ":
                 self.eval_string = ""
-    
+
         self.eval_string = self.eval_string + i
         self.wTree.get_object( "displayText" ).set_text( str( self.eval_string ) )
 
@@ -307,13 +306,13 @@ def displayInchMm( self, widget ):
         self.eval_string = "("+ self.eval_string + ") * " + locale.format("%f", float(25.4))
         self.compute()
 
-    def on_ok_button_clicked ( self, widget ):        
+    def on_ok_button_clicked ( self, widget ):
         dialog = self.calc_box.get_toplevel()
         dialog.response(Gtk.ResponseType.ACCEPT)
 
     def on_cancel_button_clicked ( self, widget ):
         dialog = self.calc_box.get_toplevel()
-        dialog.response(Gtk.ResponseType.REJECT)        
+        dialog.response(Gtk.ResponseType.REJECT)
 
     def do_get_property( self, property ):
         name = property.name.replace( '-', '_' )
@@ -334,9 +333,10 @@ def do_set_property( self, property, value ):
 
 # for testing without glade editor:
 def main():
-    window = Gtk.Dialog( "My dialog",
-                   None,
-                   modal=True, destroy_with_parent=True )
+    window = Gtk.Dialog("My dialog",
+                        None,
+                        modal=True,
+                        destroy_with_parent=True)
     calc = Calculator()
 
     window.vbox.add( calc )

lib/python/gladevcp/calculatorwidget.py

@@ -47,7 +47,7 @@
     pass
 
 # This is the main class
-class Combi_DRO(Gtk.VBox):
+class Combi_DRO(Gtk.Box):
     '''
     Combi_DRO will display an linuxcnc DRO with all three types at ones
 
@@ -104,6 +104,7 @@ class Combi_DRO(Gtk.VBox):
     # Init the class
     def __init__(self, joint_number = 0):
         super(Combi_DRO, self).__init__()
+        self.set_orientation(Gtk.Orientation.VERTICAL)
 
         # we have to distinguish this, as we use the joints number to check homing
         # and we do need the axis to check for the positions
@@ -142,7 +143,7 @@ def __init__(self, joint_number = 0):
         self.widgets = {}  # will hold all our widgets we need to style
 
         # Make the GUI and connect signals
-        
+
         self.css_text = """
                         .background  {background-color: #000000;}
                         .labelcolor  {color: #FF0000;}
@@ -157,9 +158,10 @@ def __init__(self, joint_number = 0):
         eventbox.get_style_context().add_provider(self.css,Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
         eventbox.get_style_context().add_class('background')
         self.add(eventbox)
-        vbox_main = Gtk.VBox(homogeneous = False, spacing = 0)
+        vbox_main = Gtk.Box(homogeneous = False, spacing = 0)
+        vbox_main.set_orientation(Gtk.Orientation.VERTICAL)
         eventbox.add(vbox_main)
-        hbox_up = Gtk.HBox(homogeneous = False, spacing = 5)
+        hbox_up = Gtk.Box(homogeneous = False, spacing = 5)
         vbox_main.pack_start(hbox_up, True, True, 0)
         self.widgets["eventbox"] = eventbox
 
@@ -171,12 +173,13 @@ def __init__(self, joint_number = 0):
         hbox_up.pack_start(lbl_axisletter, False, False, 0)
         self.widgets["lbl_axisletter"] = lbl_axisletter
 
-        vbox_ref_type = Gtk.VBox(homogeneous = False, spacing = 0)
+        vbox_ref_type = Gtk.Box(homogeneous = False, spacing = 0)
+        vbox_ref_type.set_orientation(Gtk.Orientation.VERTICAL)
         hbox_up.pack_start(vbox_ref_type, False, False, 0)
         # This label is needed to press the main index (rel,Abs;Dtg) to the upper part
         lbl_space = Gtk.Label(label = "")
         vbox_ref_type.pack_start(lbl_space, True, True, 0)
-        
+
         lbl_sys_main = Gtk.Label(label = self.system)
         lbl_sys_main.get_style_context().add_provider(self.css,Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
         lbl_sys_main.get_style_context().add_class('background')
@@ -194,7 +197,7 @@ def __init__(self, joint_number = 0):
         hbox_up.pack_start(main_dro, True, True, 0)
         self.widgets["main_dro"] = main_dro
 
-        hbox_down = Gtk.HBox(homogeneous = True, spacing = 5)
+        hbox_down = Gtk.Box(homogeneous = True, spacing = 5)
         vbox_main.pack_start(hbox_down, False, False, 0)
 
         lbl_sys_left = Gtk.Label(label = "Abs")
@@ -223,7 +226,7 @@ def __init__(self, joint_number = 0):
         lbl_sys_right.get_style_context().add_class('size_small')
         hbox_down.pack_start(lbl_sys_right, False, False, 0)
         self.widgets["lbl_sys_right"] = lbl_sys_right
-        
+
         dro_right = Gtk.Label(label = "22.222")
         dro_right.get_style_context().add_provider(self.css,Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
         dro_right.get_style_context().add_class('background')
@@ -278,6 +281,7 @@ def _on_eventbox_clicked(self, widget, event):
     def do_get_property(self, property):
         name = property.name.replace('-', '_')
         if name in list(self.__gproperties.keys()):
+            if name == 'auto_units': name = '_auto_units'
             return getattr(self, name)
         else:
             raise AttributeError('unknown property %s' % property.name)
@@ -362,7 +366,10 @@ def _get_current_units(self):
 
     # update the labels
     def _set_labels(self):
-        self.status.poll()
+        try:
+            self.status.poll()
+        except:
+            pass
         if self._ORDER[0] == "Rel":
             self.widgets["lbl_sys_main"].set_text(self._get_current_system())
         else:
@@ -389,38 +396,38 @@ def set_style(self, property, Data):
         if property == "background":
             for widget in self.widgets:
                 self.widgets[widget].get_style_context().remove_class('background')
-            replacement_string = ".background  {background-color: " + Data + ";}"        
+            replacement_string = ".background  {background-color: " + Data + ";}"
             self.css_text = re.sub(r'[.][b][a][c][k][g][r][o][u][n][d].*', replacement_string, self.css_text, re.IGNORECASE)
-        
+
         elif property == "labelcolor":
             for widget in self.widgets:
                 self.widgets[widget].get_style_context().remove_class('labelcolor')
-            replacement_string = ".labelcolor  {color: " + Data + ";}"        
+            replacement_string = ".labelcolor  {color: " + Data + ";}"
             self.css_text = re.sub(r'[.][l][a][b][e][l][c][o][l][o][r].*', replacement_string, self.css_text, re.IGNORECASE)
-            
-        elif property == "size":            
+
+        elif property == "size":
             for widget in self.widgets:
                 self.widgets[widget].get_style_context().remove_class('size_big')
                 self.widgets[widget].get_style_context().remove_class('size_small')
-            replacement_string = ".size_big    {font-size: " + str(Data) + "px;font-weight: bold;}"        
+            replacement_string = ".size_big    {font-size: " + str(Data) + "px;font-weight: bold;}"
             self.css_text = re.sub(r'[.][s][i][z][e][_][b][i][g].*', replacement_string, self.css_text, re.IGNORECASE)
-            replacement_string = ".size_small    {font-size: " + str(int(Data / 2.5)) + "px;font-weight: bold;}"        
+            replacement_string = ".size_small    {font-size: " + str(int(Data / 2.5)) + "px;font-weight: bold;}"
             self.css_text = re.sub(r'[.][s][i][z][e][_][s][m][a][l][l].*', replacement_string, self.css_text, re.IGNORECASE)
 
         else:
             print("Got unknown property in <<set_style>>")
             return
 
         self.css.load_from_data(bytes(self.css_text, 'utf-8'))
-        
+
         for widget in self.widgets:
             self.widgets[widget].get_style_context().add_class('background')
             self.widgets[widget].get_style_context().add_class('labelcolor')
             if widget in ("lbl_axisletter", "main_dro"):
                 self.widgets[widget].get_style_context().add_class('size_big')
             else:
                 self.widgets[widget].get_style_context().add_class('size_small')
-                
+
         self.queue_draw()
 
     def _user_system_changed(self, object, system):
@@ -492,7 +499,7 @@ def _not_all_homed(self, widget, data = None):
         if self.homed:
             self.set_style("labelcolor", self.homed_color)
         else:
-            self.set_style("labelcolor", self.unhomed_color)            
+            self.set_style("labelcolor", self.unhomed_color)
 
     def _all_homed(self, widget, data = None):
         if self.status.kinematics_type == linuxcnc.KINEMATICS_IDENTITY:
@@ -666,7 +673,8 @@ def get_position(self):
 def main():
     window = Gtk.Window(type = Gtk.WindowType.TOPLEVEL)
 
-    vbox = Gtk.VBox(homogeneous = False, spacing = 5)
+    vbox = Gtk.Box(homogeneous = False, spacing = 5)
+    vbox.set_orientation(Gtk.Orientation.VERTICAL)
     MDRO_X = Combi_DRO(0)
     MDRO_Y = Combi_DRO(1)
     MDRO_Z = Combi_DRO(2)

lib/python/gladevcp/combi_dro.py

@@ -191,10 +191,11 @@ def set_to_radius(self):
 # for testing without glade editor:
 def main():
     window = Gtk.Dialog("My dialog",
-                   None,
-                   Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
-                   (Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT,
-                    Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT))
+                        None,
+                        modal = True,
+                        destroy_with_parent = True)
+    window.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT,
+                       Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT)
     dro = HAL_DRO()
     window.vbox.add(dro)
     window.connect("destroy", Gtk.main_quit)