Ignore:
Timestamp:
07/04/19 17:29:58 (5 years ago)
Author:
István Váradi <ivaradi@…>
Branch:
python3
hg-Phase:
(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')
Message:

Removed conditions on pygobject (re #347)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/mlx/gui/common.py

    r954 r994  
    1616#
    1717# Common definitions and utilities for the GUI
    18 #
    19 # The main purpose of this module is to provide common definitions for things
    20 # that are named differently in Gtk+ 2 and 3. This way the other parts of the
    21 # GUI have to check the version in use very rarely. The variable \c pygobject
    22 # tells which version is being used. If it is \c True, Gtk+ 3 is used via the
    23 # PyGObject interface. Otherwise Gtk+ 2 is used, which is the default on
    24 # Windows or when the \c FORCE_PYGTK environment variable is set.
    25 #
    26 # Besides this there are some common utility classes and functions.
    2718
    2819#-----------------------------------------------------------------------------
    … …  
    3021appIndicator = False
    3122
    32 if not pygobject:
    33     print("Using PyGTK")
    34     pygobject = False
    35     import pygtk
    36     pygtk.require("2.0")
    37     import gtk.gdk as gdk
    38     import gtk
    39     import pango
    40 
    41     try:
    42         import appindicator
    43         appIndicator = True
    44     except Exception as e:
    45         pass
    46 
    47     MESSAGETYPE_ERROR = gtk.MESSAGE_ERROR
    48     MESSAGETYPE_QUESTION = gtk.MESSAGE_QUESTION
    49     MESSAGETYPE_INFO = gtk.MESSAGE_INFO
    50 
    51     RESPONSETYPE_NONE = gtk.RESPONSE_NONE
    52     RESPONSETYPE_OK = gtk.RESPONSE_OK
    53     RESPONSETYPE_YES = gtk.RESPONSE_YES
    54     RESPONSETYPE_NO = gtk.RESPONSE_NO
    55     RESPONSETYPE_ACCEPT = gtk.RESPONSE_ACCEPT
    56     RESPONSETYPE_REJECT = gtk.RESPONSE_REJECT
    57     RESPONSETYPE_CANCEL = gtk.RESPONSE_CANCEL
    58 
    59     ACCEL_VISIBLE = gtk.ACCEL_VISIBLE
    60     CONTROL_MASK = gdk.CONTROL_MASK
    61     DIALOG_MODAL = gtk.DIALOG_MODAL
    62     WRAP_WORD = gtk.WRAP_WORD
    63 
    64     JUSTIFY_CENTER = gtk.JUSTIFY_CENTER
    65     JUSTIFY_LEFT = gtk.JUSTIFY_LEFT
    66 
    67     CONTROL_MASK = gdk.CONTROL_MASK
    68     SHIFT_MASK = gdk.SHIFT_MASK
    69     BUTTON1_MASK = gdk.BUTTON1_MASK
    70 
    71     SCROLL_UP = gdk.SCROLL_UP
    72     SCROLL_DOWN = gdk.SCROLL_DOWN
    73 
    74     SPIN_USER_DEFINED = gtk.SPIN_USER_DEFINED
    75 
    76     FILE_CHOOSER_ACTION_SELECT_FOLDER = gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER
    77     FILE_CHOOSER_ACTION_OPEN = gtk.FILE_CHOOSER_ACTION_OPEN
    78     FILE_CHOOSER_ACTION_SAVE = gtk.FILE_CHOOSER_ACTION_SAVE
    79 
    80     SELECTION_MULTIPLE = gtk.SELECTION_MULTIPLE
    81 
    82     SHADOW_IN = gtk.SHADOW_IN
    83     SHADOW_NONE = gtk.SHADOW_NONE
    84 
    85     POLICY_AUTOMATIC = gtk.POLICY_AUTOMATIC
    86     POLICY_NEVER = gtk.POLICY_NEVER
    87     POLICY_ALWAYS = gtk.POLICY_ALWAYS
    88 
    89     WEIGHT_NORMAL = pango.WEIGHT_NORMAL
    90     WEIGHT_BOLD = pango.WEIGHT_BOLD
    91 
    92     WINDOW_STATE_ICONIFIED = gdk.WINDOW_STATE_ICONIFIED
    93     WINDOW_STATE_WITHDRAWN = gdk.WINDOW_STATE_WITHDRAWN
    94 
    95     SORT_ASCENDING = gtk.SORT_ASCENDING
    96     SORT_DESCENDING = gtk.SORT_DESCENDING
    97 
    98     EVENT_BUTTON_PRESS = gdk.BUTTON_PRESS
    99 
    100     TREE_VIEW_COLUMN_FIXED = gtk.TREE_VIEW_COLUMN_FIXED
    101 
    102     FILL = gtk.FILL
    103     EXPAND = gtk.EXPAND
    104 
    105     UPDATE_IF_VALID = gtk.UPDATE_IF_VALID
    106 
    107     SELECTION_MULTIPLE = gtk.SELECTION_MULTIPLE
    108 
    109     WINDOW_POPUP = gtk.WINDOW_POPUP
    110 
    111     pixbuf_new_from_file = gdk.pixbuf_new_from_file
    112 
    113 else: # pygobject
    114     import gi
    115     gi.require_version("Gdk", "3.0")
    116     from gi.repository import Gdk as gdk
    117     from gi.repository import GdkPixbuf as gdkPixbuf
    118     gi.require_version("Gtk", "3.0")
    119     from gi.repository import Gtk as gtk
    120     try:
    121         gi.require_version("AppIndicator3", "0.1")
    122         from gi.repository import AppIndicator3 as appindicator
    123         appIndicator = True
    124     except:
    125         pass
    126     from gi.repository import Pango as pango
    127 
    128 
    129 
    130     MESSAGETYPE_ERROR = gtk.MessageType.ERROR
    131     MESSAGETYPE_QUESTION = gtk.MessageType.QUESTION
    132     MESSAGETYPE_INFO = gtk.MessageType.INFO
    133     RESPONSETYPE_NONE = gtk.ResponseType.NONE
    134     RESPONSETYPE_OK = gtk.ResponseType.OK
    135     RESPONSETYPE_YES = gtk.ResponseType.YES
    136     RESPONSETYPE_NO = gtk.ResponseType.NO
    137     RESPONSETYPE_ACCEPT = gtk.ResponseType.ACCEPT
    138     RESPONSETYPE_REJECT = gtk.ResponseType.REJECT
    139     RESPONSETYPE_CANCEL = gtk.ResponseType.CANCEL
    140     ACCEL_VISIBLE = gtk.AccelFlags.VISIBLE
    141     CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
    142     DIALOG_MODAL = gtk.DialogFlags.MODAL
    143     WRAP_WORD = gtk.WrapMode.WORD
    144     JUSTIFY_CENTER = gtk.Justification.CENTER
    145     JUSTIFY_LEFT = gtk.Justification.LEFT
    146 
    147     CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
    148     SHIFT_MASK = gdk.ModifierType.SHIFT_MASK
    149     BUTTON1_MASK = gdk.ModifierType.BUTTON1_MASK
    150 
    151     SCROLL_UP = gdk.ScrollDirection.UP
    152     SCROLL_DOWN = gdk.ScrollDirection.DOWN
    153 
    154     SPIN_USER_DEFINED = gtk.SpinType.USER_DEFINED
    155 
    156     FILE_CHOOSER_ACTION_SELECT_FOLDER = gtk.FileChooserAction.SELECT_FOLDER
    157     FILE_CHOOSER_ACTION_OPEN = gtk.FileChooserAction.OPEN
    158     FILE_CHOOSER_ACTION_SAVE = gtk.FileChooserAction.SAVE
    159 
    160     SELECTION_MULTIPLE = gtk.SelectionMode.MULTIPLE
    161 
    162     SHADOW_IN = gtk.ShadowType.IN
    163     SHADOW_NONE = gtk.ShadowType.NONE
    164 
    165     POLICY_AUTOMATIC = gtk.PolicyType.AUTOMATIC
    166     POLICY_NEVER = gtk.PolicyType.NEVER
    167     POLICY_ALWAYS = gtk.PolicyType.ALWAYS
    168 
    169     WEIGHT_NORMAL = pango.Weight.NORMAL
    170     WEIGHT_BOLD = pango.Weight.BOLD
    171 
    172     WINDOW_STATE_ICONIFIED = gdk.WindowState.ICONIFIED
    173     WINDOW_STATE_WITHDRAWN = gdk.WindowState.WITHDRAWN
    174 
    175     SORT_ASCENDING = gtk.SortType.ASCENDING
    176     SORT_DESCENDING = gtk.SortType.DESCENDING
    177 
    178     EVENT_BUTTON_PRESS = gdk.EventType.BUTTON_PRESS
    179 
    180     TREE_VIEW_COLUMN_FIXED = gtk.TreeViewColumnSizing.FIXED
    181 
    182     FILL = gtk.AttachOptions.FILL
    183     EXPAND = gtk.AttachOptions.EXPAND
    184 
    185     UPDATE_IF_VALID = gtk.SpinButtonUpdatePolicy.IF_VALID
    186 
    187     SELECTION_MULTIPLE = gtk.SelectionMode.MULTIPLE
    188 
    189     pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file
    190 
    191     import codecs
    192     _utf8Decoder = codecs.getdecoder("utf-8")
     23import gi
     24gi.require_version("Gdk", "3.0")
     25from gi.repository import Gdk as gdk
     26from gi.repository import GdkPixbuf as gdkPixbuf
     27gi.require_version("Gtk", "3.0")
     28from gi.repository import Gtk as gtk
     29try:
     30    gi.require_version("AppIndicator3", "0.1")
     31    from gi.repository import AppIndicator3 as appindicator
     32    appIndicator = True
     33except:
     34    pass
     35from gi.repository import Pango as pango
     36
     37
     38MESSAGETYPE_ERROR = gtk.MessageType.ERROR
     39MESSAGETYPE_QUESTION = gtk.MessageType.QUESTION
     40MESSAGETYPE_INFO = gtk.MessageType.INFO
     41RESPONSETYPE_NONE = gtk.ResponseType.NONE
     42RESPONSETYPE_OK = gtk.ResponseType.OK
     43RESPONSETYPE_YES = gtk.ResponseType.YES
     44RESPONSETYPE_NO = gtk.ResponseType.NO
     45RESPONSETYPE_ACCEPT = gtk.ResponseType.ACCEPT
     46RESPONSETYPE_REJECT = gtk.ResponseType.REJECT
     47RESPONSETYPE_CANCEL = gtk.ResponseType.CANCEL
     48ACCEL_VISIBLE = gtk.AccelFlags.VISIBLE
     49CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
     50DIALOG_MODAL = gtk.DialogFlags.MODAL
     51WRAP_WORD = gtk.WrapMode.WORD
     52JUSTIFY_CENTER = gtk.Justification.CENTER
     53JUSTIFY_LEFT = gtk.Justification.LEFT
     54
     55CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
     56SHIFT_MASK = gdk.ModifierType.SHIFT_MASK
     57BUTTON1_MASK = gdk.ModifierType.BUTTON1_MASK
     58
     59SCROLL_UP = gdk.ScrollDirection.UP
     60SCROLL_DOWN = gdk.ScrollDirection.DOWN
     61
     62SPIN_USER_DEFINED = gtk.SpinType.USER_DEFINED
     63
     64FILE_CHOOSER_ACTION_SELECT_FOLDER = gtk.FileChooserAction.SELECT_FOLDER
     65FILE_CHOOSER_ACTION_OPEN = gtk.FileChooserAction.OPEN
     66FILE_CHOOSER_ACTION_SAVE = gtk.FileChooserAction.SAVE
     67
     68SELECTION_MULTIPLE = gtk.SelectionMode.MULTIPLE
     69
     70SHADOW_IN = gtk.ShadowType.IN
     71SHADOW_NONE = gtk.ShadowType.NONE
     72
     73POLICY_AUTOMATIC = gtk.PolicyType.AUTOMATIC
     74POLICY_NEVER = gtk.PolicyType.NEVER
     75POLICY_ALWAYS = gtk.PolicyType.ALWAYS
     76
     77WEIGHT_NORMAL = pango.Weight.NORMAL
     78WEIGHT_BOLD = pango.Weight.BOLD
     79
     80WINDOW_STATE_ICONIFIED = gdk.WindowState.ICONIFIED
     81WINDOW_STATE_WITHDRAWN = gdk.WindowState.WITHDRAWN
     82
     83SORT_ASCENDING = gtk.SortType.ASCENDING
     84SORT_DESCENDING = gtk.SortType.DESCENDING
     85
     86EVENT_BUTTON_PRESS = gdk.EventType.BUTTON_PRESS
     87
     88TREE_VIEW_COLUMN_FIXED = gtk.TreeViewColumnSizing.FIXED
     89
     90FILL = gtk.AttachOptions.FILL
     91EXPAND = gtk.AttachOptions.EXPAND
     92
     93UPDATE_IF_VALID = gtk.SpinButtonUpdatePolicy.IF_VALID
     94
     95SELECTION_MULTIPLE = gtk.SelectionMode.MULTIPLE
     96
     97pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file
     98
     99import codecs
     100_utf8Decoder = codecs.getdecoder("utf-8")
    193101
    194102import cairo
Note: See TracChangeset for help on using the changeset viewer.