gmoccapy -change system dialog to accept halui messages

ok and cancel are used by the system unlock dialog as an example.
To do this properly for all dialogs would require some more thought.

Author: c-morley

src/emc/usr_intf/gmoccapy/dialogs.py

@@ -36,39 +36,65 @@ class Dialogs(GObject.GObject):
 
     __gsignals__ = {
                 'play_sound': (GObject.SignalFlags.RUN_FIRST, GObject.TYPE_NONE, (GObject.TYPE_STRING,)),
+                'system-dialog-result': (GObject.SignalFlags.RUN_FIRST , GObject.TYPE_NONE, (GObject.TYPE_INT,))
                }
 
-    def __init__(self):
+    def __init__(self, caller):
         GObject.GObject.__init__(self)
+        self.sys_dialog = self.system_dialog(caller)
+
+    def dialog_ext_control(self, answer):
+        if self.sys_dialog.get_visible():
+            if answer:
+                self.sys_dialog.response(Gtk.ResponseType.ACCEPT)
+            else:
+                self.sys_dialog.response(Gtk.ResponseType.CANCEL)
 
     # This dialog is for unlocking the system tab
     # The unlock code number is defined at the top of the page
     def system_dialog(self, caller):
         dialog = Gtk.Dialog(_("Enter System Unlock Code"),
                    caller.widgets.window1,
                    Gtk.DialogFlags.DESTROY_WITH_PARENT)
+        dialog.set_modal(True)
         label = Gtk.Label(_("Enter System Unlock Code"))
         label.modify_font(Pango.FontDescription("sans 20"))
         calc = gladevcp.Calculator()
+        dialog._calc = calc
+        dialog._caller = caller
         dialog.vbox.pack_start(label, False, False, 0)
         dialog.vbox.add(calc)
         calc.set_value("")
         calc.set_property("font", "sans 20")
         calc.set_editable(True)
         calc.integer_entry_only(True)
         calc.num_pad_only(True)
-        calc.entry.connect("activate", lambda w : dialog.emit("response", Gtk.ResponseType.ACCEPT))
+        calc.entry.connect("activate", lambda w : self.on_system_response(dialog,Gtk.ResponseType.ACCEPT))
         dialog.parse_geometry("360x400")
         dialog.set_decorated(True)
-        dialog.show_all()
+        dialog.connect("response", self.on_system_response)
+        return dialog
+
+    def show_system_dialog(self):
+        self.sys_dialog._calc.set_value("")
+        self.sys_dialog.show_all()
         self.emit("play_sound", "alert")
-        response = dialog.run()
-        code = calc.get_value()
-        dialog.destroy()
-        if response == Gtk.ResponseType.ACCEPT:
-            if code == int(caller.unlock_code):
-                return True
-        return False
+
+    def on_system_response(self, dialog, result):
+        code = dialog._calc.get_value()
+        print('Code:',code)
+        rtn = -1
+        if result == Gtk.ResponseType.ACCEPT:
+            if code == int(dialog._caller.unlock_code):
+                print('Yes')
+                rtn = 1
+            else:
+                print('No')
+                rtn = 0
+        else:
+            print('Cancelled')
+        self.emit('system-dialog-result',rtn)
+        dialog.hide()
 
     def entry_dialog(self, caller, data = None, header = _("Enter value") , label = _("Enter the value to set"), integer = False):
         dialog = Gtk.Dialog(header,

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -258,8 +258,9 @@ def __init__(self, argv):
         self.icon_theme.append_search_path(ICON_THEME_DIR)
         self.icon_theme.append_search_path(USER_ICON_THEME_DIR)
 
-        self.dialogs = dialogs.Dialogs()
+        self.dialogs = dialogs.Dialogs(caller = self)
         self.dialogs.connect("play_sound", self._on_play_sound)
+        self.dialogs.connect('system-dialog-result', self.system_dialog_return)
 
         # check the arguments given from the command line (Ini file)
         self.user_mode = False
@@ -421,6 +422,8 @@ def __init__(self, argv):
         self.GSTAT.connect('macro-call-request', lambda w, name: self.request_macro_call(name))
         self.GSTAT.connect('cycle-start-request', lambda w, state :self.request_start(state))
         self.GSTAT.connect('cycle-pause-request', lambda w, state: self.request_pause(state))
+        self.GSTAT.connect('ok-request', lambda w, state: self.dialogs.dialog_ext_control(1))
+        self.GSTAT.connect('cancel-request', lambda w, state: self.dialogs.dialog_ext_control(0))
 
         # get if run from line should be used
         self.run_from_line = self.prefs.getpref("run_from_line", "no_run", str)
@@ -4199,8 +4202,9 @@ def on_tbtn_setup_toggled(self, widget, data=None):
                 code = True
             # else we ask for the code using the system.dialog
             if self.widgets.rbt_use_unlock.get_active():
-                if self.dialogs.system_dialog(self):
-                    code = True
+                self.dialogs.show_system_dialog()
+                # we will wait for response
+                return
             # Lets see if the user has the right to enter settings
             if code:
                 self.widgets.ntb_main.set_current_page(1)
@@ -4253,6 +4257,25 @@ def on_tbtn_setup_toggled(self, widget, data=None):
 
             widget.set_image(self.widgets.img_settings)
 
+    # return code from system dialog
+    def system_dialog_return(self,widget,result):
+            print(widget,result)
+            # Lets see if the user has the right to enter settings
+            if result == 1:
+                self.widgets.ntb_main.set_current_page(1)
+                self.widgets.ntb_setup.set_current_page(0)
+                self.widgets.ntb_button.set_current_page(_BB_SETUP)
+                #widget.set_image(self.widgets.img_settings_on)
+            elif result == 0:
+                if self.widgets.rbt_hal_unlock.get_active():
+                    message = _("Hal Pin is low, Access denied")
+                else:
+                    message = _("wrong code entered, Access denied")
+                self.dialogs.warning_dialog(self, _("Just to warn you"), message)
+                self.widgets.tbtn_setup.set_active(False)
+                #widget.set_image(self.widgets.img_settings)
+
+
     # Show or hide the user tabs
     def on_tbtn_user_tabs_toggled(self, widget, data=None):
         if widget.get_active():