Browse code

Don't show modal dialogs when testing.

Jose Fonseca authored on 14/02/2016 08:58:58
Showing 2 changed files

  • test.py index e453184..f5a4916 100755
  • xdot.py index f5e6fe0..519feb4 100755
... ...
@@ -89,6 +89,10 @@ class TestDotWidget(DotWidget):
89 89
 
90 90
         Gtk.main_quit()
91 91
 
92
+    def error_dialog(self, message):
93
+        sys.stderr.write(message)
94
+        sys.stderr.write("\n")
95
+
92 96
 
93 97
 def main():
94 98
     for arg in sys.argv[1:]:
... ...
@@ -1586,12 +1586,7 @@ class DotWidget(Gtk.DrawingArea):
1586 1586
             error = error.decode()
1587 1587
             sys.stderr.write(error + '\n')
1588 1588
         if p.returncode != 0:
1589
-            dialog = Gtk.MessageDialog(type=Gtk.MessageType.ERROR,
1590
-                                       message_format=error,
1591
-                                       buttons=Gtk.ButtonsType.OK)
1592
-            dialog.set_title('Dot Viewer')
1593
-            dialog.run()
1594
-            dialog.destroy()
1589
+            self.error_dialog(error)
1595 1590
             return None
1596 1591
         return xdotcode
1597 1592
 
... ...
@@ -1605,12 +1600,7 @@ class DotWidget(Gtk.DrawingArea):
1605 1600
         try:
1606 1601
             self.set_xdotcode(xdotcode)
1607 1602
         except ParseError as ex:
1608
-            dialog = Gtk.MessageDialog(type=Gtk.MessageType.ERROR,
1609
-                                       message_format=str(ex),
1610
-                                       buttons=Gtk.ButtonsType.OK)
1611
-            dialog.set_title('Dot Viewer')
1612
-            dialog.run()
1613
-            dialog.destroy()
1603
+            self.error_dialog(str(ex))
1614 1604
             return False
1615 1605
         else:
1616 1606
             if filename is None:
... ...
@@ -2080,12 +2070,7 @@ class DotWindow(Gtk.Window):
2080 2070
             self.set_dotcode(fp.read(), filename)
2081 2071
             fp.close()
2082 2072
         except IOError as ex:
2083
-            dlg = Gtk.MessageDialog(type=Gtk.MessageType.ERROR,
2084
-                                    message_format=str(ex),
2085
-                                    buttons=Gtk.ButtonsType.OK)
2086
-            dlg.set_title(self.base_title)
2087
-            dlg.run()
2088
-            dlg.destroy()
2073
+            self.error_dialog(str(ex))
2089 2074
 
2090 2075
     def on_open(self, action):
2091 2076
         chooser = Gtk.FileChooserDialog(title="Open dot File",
... ...
@@ -2115,6 +2100,14 @@ class DotWindow(Gtk.Window):
2115 2100
     def on_reload(self, action):
2116 2101
         self.dotwidget.reload()
2117 2102
 
2103
+    def error_dialog(self, message):
2104
+        dlg = Gtk.MessageDialog(type=Gtk.MessageType.ERROR,
2105
+                                message_format=message,
2106
+                                buttons=Gtk.ButtonsType.OK)
2107
+        dlg.set_title(self.base_title)
2108
+        dlg.run()
2109
+        dlg.destroy()
2110
+
2118 2111
 
2119 2112
 class OptionParser(optparse.OptionParser):
2120 2113