Changeset 996:8035d80d5feb for src/mlx/gui/common.py

Timestamp:

07/04/19 17:57:45 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Using 'Gtk' instead of 'gtk' (re #347)

File:

• src/mlx/gui/common.py (modified) (15 diffs)

src/mlx/gui/common.py

@@ -26 +26 @@
 from gi.repository import GdkPixbuf as gdkPixbuf
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk as gtk
+from gi.repository import Gtk
 try:
     gi.require_version("AppIndicator3", "0.1")
@@ -36 +36 @@
 
 
-MESSAGETYPE_ERROR = gtk.MessageType.ERROR
-MESSAGETYPE_QUESTION = gtk.MessageType.QUESTION
-MESSAGETYPE_INFO = gtk.MessageType.INFO
-RESPONSETYPE_NONE = gtk.ResponseType.NONE
-RESPONSETYPE_OK = gtk.ResponseType.OK
-RESPONSETYPE_YES = gtk.ResponseType.YES
-RESPONSETYPE_NO = gtk.ResponseType.NO
-RESPONSETYPE_ACCEPT = gtk.ResponseType.ACCEPT
-RESPONSETYPE_REJECT = gtk.ResponseType.REJECT
-RESPONSETYPE_CANCEL = gtk.ResponseType.CANCEL
-ACCEL_VISIBLE = gtk.AccelFlags.VISIBLE
+MESSAGETYPE_ERROR = Gtk.MessageType.ERROR
+MESSAGETYPE_QUESTION = Gtk.MessageType.QUESTION
+MESSAGETYPE_INFO = Gtk.MessageType.INFO
+RESPONSETYPE_NONE = Gtk.ResponseType.NONE
+RESPONSETYPE_OK = Gtk.ResponseType.OK
+RESPONSETYPE_YES = Gtk.ResponseType.YES
+RESPONSETYPE_NO = Gtk.ResponseType.NO
+RESPONSETYPE_ACCEPT = Gtk.ResponseType.ACCEPT
+RESPONSETYPE_REJECT = Gtk.ResponseType.REJECT
+RESPONSETYPE_CANCEL = Gtk.ResponseType.CANCEL
+ACCEL_VISIBLE = Gtk.AccelFlags.VISIBLE
 CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
-DIALOG_MODAL = gtk.DialogFlags.MODAL
-WRAP_WORD = gtk.WrapMode.WORD
-JUSTIFY_CENTER = gtk.Justification.CENTER
-JUSTIFY_LEFT = gtk.Justification.LEFT
+DIALOG_MODAL = Gtk.DialogFlags.MODAL
+WRAP_WORD = Gtk.WrapMode.WORD
+JUSTIFY_CENTER = Gtk.Justification.CENTER
+JUSTIFY_LEFT = Gtk.Justification.LEFT
 
 CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
@@ -60 +60 @@
 SCROLL_DOWN = gdk.ScrollDirection.DOWN
 
-SPIN_USER_DEFINED = gtk.SpinType.USER_DEFINED
-
-FILE_CHOOSER_ACTION_SELECT_FOLDER = gtk.FileChooserAction.SELECT_FOLDER
-FILE_CHOOSER_ACTION_OPEN = gtk.FileChooserAction.OPEN
-FILE_CHOOSER_ACTION_SAVE = gtk.FileChooserAction.SAVE
-
-SELECTION_MULTIPLE = gtk.SelectionMode.MULTIPLE
-
-SHADOW_IN = gtk.ShadowType.IN
-SHADOW_NONE = gtk.ShadowType.NONE
-
-POLICY_AUTOMATIC = gtk.PolicyType.AUTOMATIC
-POLICY_NEVER = gtk.PolicyType.NEVER
-POLICY_ALWAYS = gtk.PolicyType.ALWAYS
+SPIN_USER_DEFINED = Gtk.SpinType.USER_DEFINED
+
+FILE_CHOOSER_ACTION_SELECT_FOLDER = Gtk.FileChooserAction.SELECT_FOLDER
+FILE_CHOOSER_ACTION_OPEN = Gtk.FileChooserAction.OPEN
+FILE_CHOOSER_ACTION_SAVE = Gtk.FileChooserAction.SAVE
+
+SELECTION_MULTIPLE = Gtk.SelectionMode.MULTIPLE
+
+SHADOW_IN = Gtk.ShadowType.IN
+SHADOW_NONE = Gtk.ShadowType.NONE
+
+POLICY_AUTOMATIC = Gtk.PolicyType.AUTOMATIC
+POLICY_NEVER = Gtk.PolicyType.NEVER
+POLICY_ALWAYS = Gtk.PolicyType.ALWAYS
 
 WEIGHT_NORMAL = pango.Weight.NORMAL
@@ -81 +81 @@
 WINDOW_STATE_WITHDRAWN = gdk.WindowState.WITHDRAWN
 
-SORT_ASCENDING = gtk.SortType.ASCENDING
-SORT_DESCENDING = gtk.SortType.DESCENDING
+SORT_ASCENDING = Gtk.SortType.ASCENDING
+SORT_DESCENDING = Gtk.SortType.DESCENDING
 
 EVENT_BUTTON_PRESS = gdk.EventType.BUTTON_PRESS
 
-TREE_VIEW_COLUMN_FIXED = gtk.TreeViewColumnSizing.FIXED
-
-FILL = gtk.AttachOptions.FILL
-EXPAND = gtk.AttachOptions.EXPAND
-
-UPDATE_IF_VALID = gtk.SpinButtonUpdatePolicy.IF_VALID
-
-SELECTION_MULTIPLE = gtk.SelectionMode.MULTIPLE
+TREE_VIEW_COLUMN_FIXED = Gtk.TreeViewColumnSizing.FIXED
+
+FILL = Gtk.AttachOptions.FILL
+EXPAND = Gtk.AttachOptions.EXPAND
+
+UPDATE_IF_VALID = Gtk.SpinButtonUpdatePolicy.IF_VALID
+
+SELECTION_MULTIPLE = Gtk.SelectionMode.MULTIPLE
 
 pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file
@@ -139 +139 @@
 #------------------------------------------------------------------------------
 
-class IntegerEntry(gtk.Entry):
+class IntegerEntry(Gtk.Entry):
     """An entry that allows only either an empty value, or an integer."""
     def __init__(self, defaultValue = None):
         """Construct the entry."""
-        gtk.Entry.__init__(self)
+        Gtk.Entry.__init__(self)
 
         self.set_alignment(1.0)
@@ -191 +191 @@
 #------------------------------------------------------------------------------
 
-class TimeEntry(gtk.Entry):
+class TimeEntry(Gtk.Entry):
     """Widget to display and edit a time value in HH:MM format."""
     def __init__(self):
@@ -296 +296 @@
             pass
         else:
-            gtk.gdk.display_get_default().beep()
+            Gtk.gdk.display_get_default().beep()
             self.stop_emission(signal)
 
 #------------------------------------------------------------------------------
 
-class CredentialsDialog(gtk.Dialog):
+class CredentialsDialog(Gtk.Dialog):
     """A dialog window to ask for a user name and a password."""
     def __init__(self, gui, userName, password,
@@ -320 +320 @@
         contentArea = self.get_content_area()
 
-        contentAlignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
+        contentAlignment = Gtk.Alignment(xalign = 0.5, yalign = 0.5,
                                          xscale = 0.0, yscale = 0.0)
         contentAlignment.set_padding(padding_top = 4, padding_bottom = 16,
@@ -327 +327 @@
         contentArea.pack_start(contentAlignment, False, False, 0)
 
-        contentVBox = gtk.VBox()
+        contentVBox = Gtk.VBox()
         contentAlignment.add(contentVBox)
 
         if infoText is not None:
-            label = gtk.Label(infoText)
+            label = Gtk.Label(infoText)
             label.set_alignment(0.0, 0.0)
 
             contentVBox.pack_start(label, False, False, 0)
 
-        tableAlignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
+        tableAlignment = Gtk.Alignment(xalign = 0.5, yalign = 0.5,
                                        xscale = 0.0, yscale = 0.0)
         tableAlignment.set_padding(padding_top = 24, padding_bottom = 0,
                                    padding_left = 0, padding_right = 0)
 
-        table = gtk.Table(3, 2)
+        table = Gtk.Table(3, 2)
         table.set_row_spacings(4)
         table.set_col_spacings(16)
@@ -349 +349 @@
         contentVBox.pack_start(tableAlignment, True, True, 0)
 
-        label = gtk.Label(userNameLabel)
+        label = Gtk.Label(userNameLabel)
         label.set_use_underline(True)
         label.set_alignment(0.0, 0.5)
         table.attach(label, 0, 1, 0, 1)
 
-        self._userName = gtk.Entry()
+        self._userName = Gtk.Entry()
         self._userName.set_width_chars(16)
         # FIXME: enabled the OK button only when there is something in thr
@@ -365 +365 @@
         label.set_mnemonic_widget(self._userName)
 
-        label = gtk.Label(passwordLabel)
+        label = Gtk.Label(passwordLabel)
         label.set_use_underline(True)
         label.set_alignment(0.0, 0.5)
         table.attach(label, 0, 1, 1, 2)
 
-        self._password = gtk.Entry()
+        self._password = Gtk.Entry()
         self._password.set_visibility(False)
         #self._password.connect("changed",
@@ -380 +380 @@
 
         if rememberPassword is not None:
-            self._rememberButton = gtk.CheckButton(rememberLabel)
+            self._rememberButton = Gtk.CheckButton(rememberLabel)
             self._rememberButton.set_use_underline(True)
             self._rememberButton.set_tooltip_text(rememberTooltip)
@@ -522 +522 @@
 
     Return a boolean indicating the answer."""
-    dialog = gtk.MessageDialog(parent = parent,
+    dialog = Gtk.MessageDialog(parent = parent,
                                type = MESSAGETYPE_QUESTION,
                                message_format = question)
@@ -540 +540 @@
                 title = WINDOW_TITLE_BASE):
     """Display an error dialog box with the given message."""
-    dialog = gtk.MessageDialog(parent = parent,
+    dialog = Gtk.MessageDialog(parent = parent,
                                type = MESSAGETYPE_ERROR,
                                message_format = message)
@@ -562 +562 @@
 
 def createFlightTypeComboBox():
-        flightTypeModel = gtk.ListStore(str, int)
+        flightTypeModel = Gtk.ListStore(str, int)
         for type in _const.flightTypes:
             name = "flighttype_" + _const.flightType2string(type)
             flightTypeModel.append([xstr(name), type])
 
-        flightType = gtk.ComboBox(model = flightTypeModel)
-        renderer = gtk.CellRendererText()
+        flightType = Gtk.ComboBox(model = flightTypeModel)
+        renderer = Gtk.CellRendererText()
         flightType.pack_start(renderer, True)
         flightType.add_attribute(renderer, "text", 0)