gtk3
This commit is contained in:
parent
31be61508f
commit
150e02c0a0
@ -1,36 +0,0 @@
|
||||
#!/usr/bin/python2
|
||||
|
||||
import gi
|
||||
import ctypes
|
||||
from ctypes import *
|
||||
|
||||
libgobject = CDLL('libgobject-2.0.so.0')
|
||||
|
||||
class _PyGObject_Functions(ctypes.Structure):
|
||||
_fields_ = [
|
||||
('register_class',
|
||||
ctypes.PYFUNCTYPE(ctypes.c_void_p, ctypes.c_char_p,
|
||||
ctypes.c_int, ctypes.py_object,
|
||||
ctypes.py_object)),
|
||||
('register_wrapper',
|
||||
ctypes.PYFUNCTYPE(ctypes.c_void_p, ctypes.py_object)),
|
||||
('lookup_class',
|
||||
ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_int)),
|
||||
('newgobj',
|
||||
ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
|
||||
]
|
||||
|
||||
class PyGObjectCPAI(object):
|
||||
def __init__(self):
|
||||
PyCObject_AsVoidPtr = ctypes.pythonapi.PyCObject_AsVoidPtr
|
||||
PyCObject_AsVoidPtr.restype = ctypes.c_void_p
|
||||
PyCObject_AsVoidPtr.argtypes = [ctypes.py_object]
|
||||
addr = PyCObject_AsVoidPtr(ctypes.py_object(
|
||||
gi._gobject._PyGObject_API))
|
||||
self._api = _PyGObject_Functions.from_address(addr)
|
||||
|
||||
def pygobject_new(self, addr):
|
||||
return self._api.newgobj(addr)
|
||||
|
||||
def get_widget(ptr):
|
||||
return PyGObjectCPAI().pygobject_new(ptr)
|
@ -25,18 +25,14 @@
|
||||
# DEALINGS IN THE SOFTWARE.
|
||||
|
||||
import gi
|
||||
gi.require_version("Gtk", "2.0")
|
||||
gi.require_version("Gtk", "3.0")
|
||||
|
||||
from Xlib.display import Display
|
||||
from Xlib import X, error
|
||||
from gi.repository import Gtk, Gdk, GObject, GLib
|
||||
from gi.repository import Gtk, Gdk, GdkX11, GObject, GLib
|
||||
import threading
|
||||
import ctypes
|
||||
from ctypes import *
|
||||
import capi
|
||||
|
||||
gdk = CDLL("libgdk-x11-2.0.so.0")
|
||||
gtk = CDLL("libgtk-x11-2.0.so.0")
|
||||
|
||||
SPECIAL_MODS = (["Super_L", "<Super>"],
|
||||
["Super_R", "<Super>"],
|
||||
@ -57,8 +53,7 @@ class GlobalKeyBinding(GObject.GObject, threading.Thread):
|
||||
threading.Thread.__init__ (self)
|
||||
self.setDaemon (True)
|
||||
|
||||
gdk.gdk_keymap_get_default.restype = c_void_p
|
||||
self.keymap = capi.get_widget (gdk.gdk_keymap_get_default())
|
||||
self.keymap = Gdk.Keymap().get_default()
|
||||
self.display = Display()
|
||||
self.screen = self.display.screen()
|
||||
self.window = self.screen.root
|
||||
@ -90,12 +85,7 @@ class GlobalKeyBinding(GObject.GObject, threading.Thread):
|
||||
self.known_modifiers_mask |= modifier
|
||||
|
||||
def get_keycode(self, keyval):
|
||||
count = c_int()
|
||||
array = (KeymapKey * 10)()
|
||||
keys = cast(array, POINTER(KeymapKey))
|
||||
gdk.gdk_keymap_get_entries_for_keyval.argtypes = [c_void_p, c_uint, c_void_p, c_void_p]
|
||||
gdk.gdk_keymap_get_entries_for_keyval(hash(self.keymap), keyval, byref(keys), byref(count))
|
||||
return keys[0].keycode
|
||||
return self.keymap.get_entries_for_keyval(keyval).keys[0].keycode
|
||||
|
||||
def grab(self, key):
|
||||
accelerator = key
|
||||
@ -137,8 +127,7 @@ class GlobalKeyBinding(GObject.GObject, threading.Thread):
|
||||
if window is None:
|
||||
self.window = self.screen.root
|
||||
else:
|
||||
gdk.gdk_x11_drawable_get_xid.argtypes = [c_void_p]
|
||||
self.window = self.display.create_resource_object("window", gdk.gdk_x11_drawable_get_xid(hash(window)))
|
||||
self.window = self.display.create_resource_object("window", window.get_xid())
|
||||
self.grab(self.keytext)
|
||||
|
||||
def get_mask_combinations(self, mask):
|
||||
@ -185,7 +174,7 @@ class KeymapKey(Structure):
|
||||
("group", c_int),
|
||||
("level", c_int)]
|
||||
|
||||
class KeybindingWidget(Gtk.HBox):
|
||||
class KeybindingWidget(Gtk.Box):
|
||||
__gsignals__ = {
|
||||
'accel-edited': (GObject.SignalFlags.RUN_LAST, None, ()),
|
||||
}
|
||||
@ -235,8 +224,7 @@ class KeybindingWidget(Gtk.HBox):
|
||||
self.set_button_text()
|
||||
self.emit("accel-edited")
|
||||
return True
|
||||
gtk.gtk_accelerator_name.restype = c_char_p
|
||||
accel_string = gtk.gtk_accelerator_name(event.keyval, event.state)
|
||||
accel_string = Gtk.accelerator_name( event.keyval, event.state )
|
||||
accel_string = self.sanitize(accel_string)
|
||||
self.value = accel_string
|
||||
self.set_button_text()
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/python2
|
||||
|
||||
import gi
|
||||
gi.require_version("Gtk", "2.0")
|
||||
gi.require_version("Gtk", "3.0")
|
||||
gi.require_version('MatePanelApplet', '4.0')
|
||||
from gi.repository import Gtk, GdkPixbuf, Gdk, GObject
|
||||
from gi.repository import MatePanelApplet
|
||||
@ -26,8 +26,6 @@ except Exception, e:
|
||||
|
||||
GObject.threads_init()
|
||||
|
||||
gdk = CDLL("libgdk-x11-2.0.so.0")
|
||||
|
||||
# Rename the process
|
||||
architecture = commands.getoutput("uname -a")
|
||||
if (architecture.find("x86_64") >= 0):
|
||||
@ -77,7 +75,7 @@ class MainWindow( object ):
|
||||
builder.add_from_file(os.path.join( self.path, "mintMenu.glade" ))
|
||||
self.window = builder.get_object( "mainWindow" )
|
||||
self.window.realize()
|
||||
self.window.window.set_decorations(Gdk.WMDecoration.BORDER)
|
||||
self.window.get_window().set_decorations(Gdk.WMDecoration.BORDER)
|
||||
self.window.set_title("")
|
||||
self.paneholder = builder.get_object( "paneholder" )
|
||||
self.border = builder.get_object( "border" )
|
||||
@ -111,11 +109,11 @@ class MainWindow( object ):
|
||||
|
||||
self.getSetGSettingEntries()
|
||||
|
||||
self.tooltips = Gtk.Tooltips()
|
||||
self.tooltipsWidgets = []
|
||||
if self.globalEnableTooltips and self.enableTooltips:
|
||||
self.tooltips.enable()
|
||||
self.tooltipsEnable()
|
||||
else:
|
||||
self.tooltips.disable()
|
||||
self.tooltipsEnable( False )
|
||||
|
||||
self.PopulatePlugins();
|
||||
self.firstTime = True;
|
||||
@ -137,9 +135,9 @@ class MainWindow( object ):
|
||||
self.enableTooltips = settings.get_boolean(key)
|
||||
|
||||
if self.globalEnableTooltips and self.enableTooltips:
|
||||
self.tooltips.enable()
|
||||
self.tooltipsEnable()
|
||||
else:
|
||||
self.tooltips.disable()
|
||||
self.tooltipsEnable( False )
|
||||
|
||||
def toggleStartWithFavorites( self, settings, key, args = None ):
|
||||
self.startWithFavorites = settings.get_boolean(key)
|
||||
@ -179,12 +177,18 @@ class MainWindow( object ):
|
||||
|
||||
self.globalEnableTooltips = self.panelSettings.get_boolean( "tooltips-enabled" )
|
||||
|
||||
def SetupMintMenuBorder( self, defaultStyle = None ):
|
||||
def SetupMintMenuBorder( self ):
|
||||
context = self.window.get_style_context()
|
||||
context.save()
|
||||
context.set_state( Gtk.StateFlags.NORMAL )
|
||||
if self.usecustomcolor:
|
||||
self.window.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.custombordercolor ) )
|
||||
elif defaultStyle is not None:
|
||||
self.window.modify_bg( Gtk.StateType.NORMAL, defaultStyle.lookup_color('bg_color')[1] )
|
||||
bg_color = Gdk.RGBA()
|
||||
bg_color.parse( self.custombordercolor )
|
||||
self.window.override_background_color( Gtk.StateFlags.NORMAL, bg_color )
|
||||
else:
|
||||
self.window.override_background_color( Gtk.StateFlags.NORMAL, None )
|
||||
self.border.set_padding( self.borderwidth, self.borderwidth, self.borderwidth, self.borderwidth )
|
||||
context.restore()
|
||||
|
||||
def detect_desktop_environment (self):
|
||||
self.de = "mate"
|
||||
@ -206,7 +210,7 @@ class MainWindow( object ):
|
||||
start = time.time()
|
||||
PluginPane = Gtk.EventBox()
|
||||
PluginPane.show()
|
||||
PaneLadder = Gtk.VBox( False, 0 )
|
||||
PaneLadder = Gtk.Box( orientation=Gtk.Orientation.VERTICAL )
|
||||
PluginPane.add( PaneLadder )
|
||||
ImageBox = Gtk.EventBox()
|
||||
ImageBox.show()
|
||||
@ -267,7 +271,7 @@ class MainWindow( object ):
|
||||
self.panesToColor.append( MyPlugin.content_holder )
|
||||
MyPlugin.content_holder.show()
|
||||
|
||||
VBox1 = Gtk.VBox( False, 0 )
|
||||
VBox1 = Gtk.Box( orientation=Gtk.Orientation.VERTICAL )
|
||||
if MyPlugin.heading != "":
|
||||
Label1 = Gtk.Label(label= MyPlugin.heading )
|
||||
Align1 = Gtk.Alignment.new( 0, 0, 0, 0 )
|
||||
@ -283,7 +287,7 @@ class MainWindow( object ):
|
||||
heading.set_visible_window( False )
|
||||
heading.set_size_request( MyPlugin.width, 30 )
|
||||
else:
|
||||
heading = Gtk.HBox()
|
||||
heading = Gtk.Box( orientation=Gtk.Orientation.HORIZONTAL )
|
||||
#heading.set_relief( Gtk.ReliefStyle.NONE )
|
||||
heading.set_size_request( MyPlugin.width, -1 )
|
||||
#heading.set_sensitive(False)
|
||||
@ -294,14 +298,17 @@ class MainWindow( object ):
|
||||
VBox1.pack_start( heading, False, False, 0 )
|
||||
VBox1.show()
|
||||
#Add plugin to Plugin Box under heading button
|
||||
MyPlugin.content_holder.reparent( VBox1 )
|
||||
MyPlugin.content_holder.get_parent().remove(MyPlugin.content_holder)
|
||||
VBox1.add( MyPlugin.content_holder )
|
||||
|
||||
#Add plugin to main window
|
||||
PaneLadder.pack_start( VBox1 , True, True, 0)
|
||||
PaneLadder.show()
|
||||
|
||||
if MyPlugin.window:
|
||||
MyPlugin.window.destroy()
|
||||
try:
|
||||
MyPlugin.get_window().destroy()
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
try:
|
||||
if hasattr( MyPlugin, 'do_plugin' ):
|
||||
@ -327,7 +334,7 @@ class MainWindow( object ):
|
||||
self.paneholder.pack_start( ImageBox, False, False, 0 )
|
||||
self.paneholder.pack_start( PluginPane, False, False, 0 )
|
||||
PluginPane = Gtk.EventBox()
|
||||
PaneLadder = Gtk.VBox( False, 0 )
|
||||
PaneLadder = Gtk.Box( orientation=Gtk.Orientation.VERTICAL )
|
||||
PluginPane.add( PaneLadder )
|
||||
ImageBox = Gtk.EventBox()
|
||||
self.panesToColor.extend( [ PluginPane, ImageBox ] )
|
||||
@ -349,31 +356,25 @@ class MainWindow( object ):
|
||||
|
||||
self.paneholder.pack_start( ImageBox, False, False, 0 )
|
||||
self.paneholder.pack_start( PluginPane, False, False, 0 )
|
||||
self.tooltips.disable()
|
||||
#print u"Loading", (time.time() - start), "s"
|
||||
|
||||
# A little hacky but works
|
||||
def getDefaultStyle( self ):
|
||||
widget = Gtk.EventBox()
|
||||
widget.show()
|
||||
return Gtk.rc_get_style(widget)
|
||||
self.tooltipsEnable( False ))
|
||||
|
||||
def loadTheme( self ):
|
||||
defaultStyle = self.getDefaultStyle()
|
||||
self.SetPaneColors( self.panesToColor, defaultStyle )
|
||||
self.SetupMintMenuBorder( defaultStyle )
|
||||
self.SetPaneColors( self.panesToColor )
|
||||
self.SetupMintMenuBorder()
|
||||
self.SetHeadingStyle( self.headingsToColor )
|
||||
|
||||
def SetPaneColors( self, items, defaultStyle = None ):
|
||||
if self.usecustomcolor:
|
||||
for item in items:
|
||||
item.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.customcolor ) )
|
||||
# TODO: Changing background color isn't working for pixmaps! The following does not work:
|
||||
item.get_style().bg_pixmap[Gtk.StateType.NORMAL] = None
|
||||
elif defaultStyle is not None:
|
||||
for item in items:
|
||||
item.modify_bg( Gtk.StateType.NORMAL, defaultStyle.lookup_color('bg_color')[1] )
|
||||
item.get_style().bg_pixmap[Gtk.StateType.NORMAL] = defaultStyle.bg_pixmap[Gtk.StateType.NORMAL]
|
||||
def SetPaneColors( self, items ):
|
||||
for item in items:
|
||||
context = item.get_style_context()
|
||||
context.save()
|
||||
context.set_state( Gtk.StateFlags.NORMAL )
|
||||
if self.usecustomcolor:
|
||||
bg_color = Gdk.RGBA()
|
||||
bg_color.parse( self.customcolor )
|
||||
item.override_background_color( Gtk.StateFlags.NORMAL, bg_color )
|
||||
else:
|
||||
item.override_background_color( Gtk.StateFlags.NORMAL, None )
|
||||
context.restore()
|
||||
|
||||
def SetHeadingStyle( self, items ):
|
||||
if self.usecustomcolor:
|
||||
@ -390,8 +391,13 @@ class MainWindow( object ):
|
||||
markup = '<span size="12000" weight="bold" color="%s">%s</span>' % (color, text)
|
||||
item.set_markup( markup )
|
||||
|
||||
def setTooltip( self, widget, tip, tipPrivate = None ):
|
||||
self.tooltips.set_tip( widget, tip, tipPrivate )
|
||||
def tooltipsEnable( self, enable = True ):
|
||||
for widget in self.tooltipsWidgets:
|
||||
widget.set_has_tooltip( enable )
|
||||
|
||||
def setTooltip( self, widget, tip ):
|
||||
self.tooltipsWidgets.append( widget )
|
||||
widget.set_tooltip_text( tip )
|
||||
|
||||
def RegenPlugins( self, *args, **kargs ):
|
||||
#print
|
||||
@ -435,7 +441,7 @@ class MainWindow( object ):
|
||||
self.firstTime = False
|
||||
self.window.set_opacity(1.0)
|
||||
|
||||
self.window.window.focus( Gdk.CURRENT_TIME )
|
||||
self.window.get_window().focus( Gdk.CURRENT_TIME )
|
||||
|
||||
for plugin in self.plugins.values():
|
||||
if hasattr( plugin, "onShowMenu" ):
|
||||
@ -514,20 +520,18 @@ class MenuWin( object ):
|
||||
self.pointerMonitor.connect("activate", self.onPointerOutside)
|
||||
|
||||
def onWindowMap( self, *args ):
|
||||
self.applet.set_state( Gtk.StateType.SELECTED )
|
||||
self.keybinder.set_focus_window( self.mainwin.window.window )
|
||||
#self.pointerMonitor.grabPointer()
|
||||
self.applet.get_style_context().set_state( Gtk.StateFlags.SELECTED )
|
||||
self.keybinder.set_focus_window( self.mainwin.window.get_window() )
|
||||
return False
|
||||
|
||||
def onWindowUnmap( self, *args ):
|
||||
self.applet.set_state( Gtk.StateType.NORMAL )
|
||||
self.applet.get_style_context().set_state( Gtk.StateFlags.NORMAL )
|
||||
self.keybinder.set_focus_window()
|
||||
#self.pointerMonitor.ungrabPointer()
|
||||
return False
|
||||
|
||||
def onRealize( self, *args):
|
||||
self.pointerMonitor.addWindowToMonitor( self.mainwin.window.window )
|
||||
self.pointerMonitor.addWindowToMonitor( self.applet.window )
|
||||
self.pointerMonitor.addWindowToMonitor( self.mainwin.window.get_window() )
|
||||
self.pointerMonitor.addWindowToMonitor( self.applet.get_window() )
|
||||
self.pointerMonitor.start()
|
||||
return False
|
||||
|
||||
@ -544,8 +548,8 @@ class MenuWin( object ):
|
||||
|
||||
def leave_notify(self, applet, event):
|
||||
# Hack for mate-panel-test-applets focus issue (this can be commented)
|
||||
if event.state & Gdk.ModifierType.BUTTON1_MASK and applet.state & Gtk.StateType.SELECTED:
|
||||
if event.x >= 0 and event.y >= 0 and event.x < applet.window.get_width() and event.y < applet.window.get_height():
|
||||
if event.state & Gdk.ModifierType.BUTTON1_MASK and applet.get_style_context().get_state() & Gtk.StateFlags.SELECTED:
|
||||
if event.x >= 0 and event.y >= 0 and event.x < applet.get_window().get_width() and event.y < applet.get_window().get_height():
|
||||
self.mainwin.stopHiding()
|
||||
|
||||
self.do_image(self.buttonIcon, False)
|
||||
@ -572,19 +576,19 @@ class MenuWin( object ):
|
||||
self.systemlabel.set_tooltip_text(tooltip)
|
||||
self.button_icon.set_tooltip_text(tooltip)
|
||||
if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN:
|
||||
self.button_box = Gtk.HBox()
|
||||
self.button_box = Gtk.Box( orientation=Gtk.Orientation.HORIZONTAL )
|
||||
self.button_box.pack_start( self.button_icon, False, False, 0 )
|
||||
self.button_box.pack_start( self.systemlabel, False, False, 0 )
|
||||
self.button_icon.set_padding( 5, 0 )
|
||||
# if we have a vertical panel
|
||||
elif self.applet.get_orient() == MatePanelApplet.AppletOrient.LEFT:
|
||||
self.button_box = Gtk.VBox()
|
||||
self.button_box = Gtk.Box( orientation=Gtk.Orientation.VERTICAL )
|
||||
self.systemlabel.set_angle( 270 )
|
||||
self.button_box.pack_start( self.button_icon , False, False, 0)
|
||||
self.button_box.pack_start( self.systemlabel , False, False, 0)
|
||||
self.button_icon.set_padding( 0, 5 )
|
||||
elif self.applet.get_orient() == MatePanelApplet.AppletOrient.RIGHT:
|
||||
self.button_box = Gtk.VBox()
|
||||
elif self.applet.get_orient( orientation=Gtk.Orientation.VERTICAL ) == MatePanelApplet.AppletOrient.RIGHT:
|
||||
self.button_box = Gtk.Box()
|
||||
self.systemlabel.set_angle( 90 )
|
||||
self.button_box.pack_start( self.systemlabel , False, False, 0)
|
||||
self.button_box.pack_start( self.button_icon , False, False, 0)
|
||||
@ -626,17 +630,17 @@ class MenuWin( object ):
|
||||
def changeOrientation( self, *args, **kargs ):
|
||||
|
||||
if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN:
|
||||
tmpbox = Gtk.HBox()
|
||||
tmpbox = Gtk.Box( orientation=Gtk.Orientation.HORIZONTAL )
|
||||
self.systemlabel.set_angle( 0 )
|
||||
self.button_box.reorder_child( self.button_icon, 0 )
|
||||
self.button_icon.set_padding( 5, 0 )
|
||||
elif self.applet.get_orient() == MatePanelApplet.AppletOrient.LEFT:
|
||||
tmpbox = Gtk.VBox()
|
||||
tmpbox = Gtk.Box( orientation=Gtk.Orientation.VERTICAL )
|
||||
self.systemlabel.set_angle( 270 )
|
||||
self.button_box.reorder_child( self.button_icon, 0 )
|
||||
self.button_icon.set_padding( 0, 5 )
|
||||
elif self.applet.get_orient() == MatePanelApplet.AppletOrient.RIGHT:
|
||||
tmpbox = Gtk.VBox()
|
||||
tmpbox = Gtk.Box( orientation=Gtk.Orientation.VERTICAL )
|
||||
self.systemlabel.set_angle( 90 )
|
||||
self.button_box.reorder_child( self.button_icon, 1 )
|
||||
self.button_icon.set_padding( 0, 5 )
|
||||
@ -688,10 +692,8 @@ class MenuWin( object ):
|
||||
self.button_icon.show()
|
||||
# This code calculates width and height for the button_box
|
||||
# and takes the orientation in account
|
||||
sl_req = Gtk.Requisition()
|
||||
bi_req = Gtk.Requisition()
|
||||
self.button_icon.size_request(bi_req)
|
||||
self.systemlabel.size_request(sl_req)
|
||||
bi_req = self.button_icon.size_request()
|
||||
sl_req = self.systemlabel.size_request()
|
||||
if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN:
|
||||
if self.hideIcon:
|
||||
self.applet.set_size_request( sl_req.width + 2, bi_req.height )
|
||||
@ -751,7 +753,7 @@ class MenuWin( object ):
|
||||
self.mainwin.hide()
|
||||
|
||||
def toggleMenu( self ):
|
||||
if self.applet.state & Gtk.StateType.SELECTED:
|
||||
if self.applet.get_style_context().get_state() & Gtk.StateFlags.SELECTED:
|
||||
self.mainwin.hide()
|
||||
else:
|
||||
self.positionMenu()
|
||||
@ -769,10 +771,8 @@ class MenuWin( object ):
|
||||
x = c_int()
|
||||
y = c_int()
|
||||
# Get the dimensions/position of the widgetToAlignWith
|
||||
gdk.gdk_window_get_origin.argtypes = [c_void_p, c_void_p, c_void_p]
|
||||
gdk.gdk_window_get_origin(hash(self.applet.window), byref(x), byref(y))
|
||||
entryX = x.value
|
||||
entryY = y.value
|
||||
entryX = self.applet.get_window().get_origin().x
|
||||
entryY = self.applet.get_window().get_origin().y
|
||||
|
||||
entryWidth, entryHeight = self.applet.get_allocation().width, self.applet.get_allocation().height
|
||||
entryHeight = entryHeight + self.mainwin.offset
|
||||
@ -811,17 +811,17 @@ class MenuWin( object ):
|
||||
|
||||
# this callback is to create a context menu
|
||||
def create_menu(self):
|
||||
action_group = Gtk.ActionGroup("context-menu")
|
||||
action = Gtk.Action("MintMenuPrefs", _("Preferences"), None, "gtk-preferences")
|
||||
action_group = Gtk.ActionGroup(name="context-menu")
|
||||
action = Gtk.Action(name="MintMenuPrefs", label=_("Preferences"), tooltip=None, stock_id="gtk-preferences")
|
||||
action.connect("activate", self.showPreferences)
|
||||
action_group.add_action(action)
|
||||
action = Gtk.Action("MintMenuEdit", _("Edit menu"), None, "gtk-edit")
|
||||
action = Gtk.Action(name="MintMenuEdit", label=_("Edit menu"), tooltip=None, stock_id="gtk-edit")
|
||||
action.connect("activate", self.showMenuEditor)
|
||||
action_group.add_action(action)
|
||||
action = Gtk.Action("MintMenuReload", _("Reload plugins"), None, "gtk-refresh")
|
||||
action = Gtk.Action(name="MintMenuReload", label=_("Reload plugins"), tooltip=None, stock_id="gtk-refresh")
|
||||
action.connect("activate", self.mainwin.RegenPlugins)
|
||||
action_group.add_action(action)
|
||||
action = Gtk.Action("MintMenuAbout", _("About"), None, "gtk-about")
|
||||
action = Gtk.Action(name="MintMenuAbout", label=_("About"), tooltip=None, stock_id="gtk-about")
|
||||
action.connect("activate", self.showAboutDialog)
|
||||
action_group.add_action(action)
|
||||
action_group.set_translation_domain ("mintmenu")
|
||||
|
@ -3,7 +3,7 @@
|
||||
import sys
|
||||
|
||||
import gi
|
||||
gi.require_version("Gtk", "2.0")
|
||||
gi.require_version("Gtk", "3.0")
|
||||
|
||||
from gi.repository import Gtk, Gdk, GdkPixbuf
|
||||
import keybinding
|
||||
@ -62,7 +62,7 @@ class mintMenuConfig( object ):
|
||||
|
||||
self.builder.get_object("buttonTextLabel").set_text(_("Button text:"))
|
||||
self.builder.get_object("label1").set_text(_("Options"))
|
||||
self.builder.get_object("label23").set_text(_("Applications"))
|
||||
self.builder.get_object("applicationsLabel").set_text(_("Applications"))
|
||||
|
||||
self.builder.get_object("colorsLabel").set_text(_("Theme"))
|
||||
self.builder.get_object("favLabel").set_text(_("Favorites"))
|
||||
@ -141,8 +141,8 @@ class mintMenuConfig( object ):
|
||||
self.showButtonIcon = self.builder.get_object( "showButtonIcon" )
|
||||
self.buttonText = self.builder.get_object( "buttonText" )
|
||||
self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:") )
|
||||
table = self.builder.get_object( "main_table" )
|
||||
table.attach(self.hotkeyWidget, 0, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0)
|
||||
grid = self.builder.get_object( "main_grid" )
|
||||
grid.attach(self.hotkeyWidget, 0, 2, 2, 1)
|
||||
self.buttonIcon = self.builder.get_object( "buttonIcon" )
|
||||
self.buttonIconChooser = self.builder.get_object( "button_icon_chooser" )
|
||||
self.image_filter = Gtk.FileFilter()
|
||||
@ -214,9 +214,9 @@ class mintMenuConfig( object ):
|
||||
|
||||
self.bindGSettingsValueToWidget( self.settings, "int", "border-width", self.borderWidth, "value-changed", self.borderWidth.set_value, self.borderWidth.get_value_as_int )
|
||||
self.bindGSettingsValueToWidget( self.settings, "bool", "use-custom-color", self.useCustomColors, "toggled", self.useCustomColors.set_active, self.useCustomColors.get_active )
|
||||
self.bindGSettingsValueToWidget( self.settings, "color", "custom-color", self.backgroundColor, "color-set", self.backgroundColor.set_color, self.getBackgroundColor )
|
||||
self.bindGSettingsValueToWidget( self.settings, "color", "custom-heading-color", self.headingColor, "color-set", self.headingColor.set_color, self.getHeadingColor )
|
||||
self.bindGSettingsValueToWidget( self.settings, "color", "custom-border-color", self.borderColor, "color-set", self.borderColor.set_color, self.getBorderColor )
|
||||
self.bindGSettingsValueToWidget( self.settings, "color", "custom-color", self.backgroundColor, "color-set", self.backgroundColor.set_rgba, self.getBackgroundColor )
|
||||
self.bindGSettingsValueToWidget( self.settings, "color", "custom-heading-color", self.headingColor, "color-set", self.headingColor.set_rgba, self.getHeadingColor )
|
||||
self.bindGSettingsValueToWidget( self.settings, "color", "custom-border-color", self.borderColor, "color-set", self.borderColor.set_rgba, self.getBorderColor )
|
||||
self.bindGSettingsValueToWidget( self.settings, "bool", "hide-applet-icon", self.showButtonIcon, "toggled", self.setShowButtonIcon, self.getShowButtonIcon )
|
||||
self.bindGSettingsValueToWidget( self.settings, "string", "applet-text", self.buttonText, "changed", self.buttonText.set_text, self.buttonText.get_text )
|
||||
self.bindGSettingsValueToWidget( self.settings, "string", "hot-key", self.hotkeyWidget, "accel-edited", self.hotkeyWidget.set_val, self.hotkeyWidget.get_val )
|
||||
@ -352,7 +352,9 @@ class mintMenuConfig( object ):
|
||||
def bindGSettingsValueToWidget( self, settings, setting_type, key, widget, changeEvent, setter, getter ):
|
||||
settings.notifyAdd( key, self.callSetter, args = [ setting_type, setter ] )
|
||||
if setting_type == "color":
|
||||
setter( Gdk.color_parse( settings.get( setting_type, key ) ) )
|
||||
color = Gdk.RGBA()
|
||||
color.parse( settings.get( setting_type, key ) )
|
||||
setter( color )
|
||||
else:
|
||||
setter( settings.get( setting_type, key ) )
|
||||
widget.connect( changeEvent, lambda *args: self.callGetter( settings, setting_type, key, getter ) )
|
||||
@ -365,7 +367,9 @@ class mintMenuConfig( object ):
|
||||
elif args[0] == "int":
|
||||
args[1]( settings.get_int(key) )
|
||||
elif args[0] == "color":
|
||||
args[1]( Gdk.color_parse( settings.get_string(key) ) )
|
||||
color = Gdk.RGBA()
|
||||
color.parse( settings.get_string(key) )
|
||||
args[1]( color )
|
||||
|
||||
def callGetter( self, settings, setting_type, key, getter ):
|
||||
if (setting_type == "int"):
|
||||
@ -382,31 +386,19 @@ class mintMenuConfig( object ):
|
||||
self.headingColorLabel.set_sensitive( widget.get_active() )
|
||||
|
||||
def getBackgroundColor( self ):
|
||||
try:
|
||||
color = self.backgroundColor.get_color()
|
||||
except:
|
||||
color = Gdk.Color(0, 0, 0)
|
||||
self.backgroundColor.get_color(color)
|
||||
return self.gdkColorToString( color )
|
||||
color = self.backgroundColor.get_rgba()
|
||||
return self.gdkRGBAToString( color )
|
||||
|
||||
def getBorderColor( self ):
|
||||
try:
|
||||
color = self.borderColor.get_color()
|
||||
except:
|
||||
color = Gdk.Color(0, 0, 0)
|
||||
self.borderColor.get_color(color)
|
||||
return self.gdkColorToString( color )
|
||||
color = self.borderColor.get_rgba()
|
||||
return self.gdkRGBAToString( color )
|
||||
|
||||
def getHeadingColor( self ):
|
||||
try:
|
||||
color = self.headingColor.get_color()
|
||||
except:
|
||||
color = Gdk.Color(0, 0, 0)
|
||||
self.headingColor.get_color(color)
|
||||
return self.gdkColorToString( color )
|
||||
color = self.headingColor.get_rgba()
|
||||
return self.gdkRGBAToString( color )
|
||||
|
||||
def gdkColorToString( self, gdkColor ):
|
||||
return "#%.2X%.2X%.2X" % ( gdkColor.red / 256, gdkColor.green / 256, gdkColor.blue / 256 )
|
||||
def gdkRGBAToString( self, gdkRGBA ):
|
||||
return "#%.2X%.2X%.2X" % ( gdkRGBA.red * 256, gdkRGBA.green * 256, gdkRGBA.blue * 256 )
|
||||
|
||||
def moveUp( self, upButton ):
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/python2
|
||||
|
||||
import gi
|
||||
gi.require_version("Gtk", "2.0")
|
||||
gi.require_version("Gtk", "3.0")
|
||||
|
||||
from gi.repository import Gtk, Pango, Gdk, Gio, GLib
|
||||
|
||||
@ -20,8 +20,6 @@ from execute import Execute
|
||||
from easygsettings import EasyGSettings
|
||||
from easyfiles import *
|
||||
|
||||
gtk = CDLL("libgtk-x11-2.0.so.0")
|
||||
|
||||
import matemenu
|
||||
|
||||
from user import home
|
||||
@ -122,10 +120,11 @@ class SuggestionButton ( Gtk.Button ):
|
||||
self.set_size_request( -1, -1 )
|
||||
Align1 = Gtk.Alignment()
|
||||
Align1.set( 0, 0.5, 1.0, 0 )
|
||||
HBox1 = Gtk.HBox()
|
||||
labelBox = Gtk.VBox( False, 2 )
|
||||
HBox1 = Gtk.Box( orientation=Gtk.Orientation.HORIZONTAL )
|
||||
labelBox = Gtk.Box( orientation=Gtk.Orientation.VERTICAL, spacing=2 )
|
||||
self.image = Gtk.Image()
|
||||
self.image.set_from_stock( self.iconName, iconSize )
|
||||
self.image.set_from_icon_name( self.iconName, Gtk.IconSize.INVALID )
|
||||
self.image.set_pixel_size( iconSize )
|
||||
self.image.show()
|
||||
HBox1.pack_start( self.image, False, False, 5 )
|
||||
self.label = Gtk.Label()
|
||||
@ -148,7 +147,7 @@ class SuggestionButton ( Gtk.Button ):
|
||||
self.label.set_markup(text)
|
||||
|
||||
def set_icon_size (self, size):
|
||||
self.image.set_from_stock( self.iconName, size )
|
||||
self.image.set_pixel_size( size )
|
||||
|
||||
class TargetEntry(Structure):
|
||||
_fields_ = [("target", c_char_p),
|
||||
@ -157,13 +156,10 @@ class TargetEntry(Structure):
|
||||
|
||||
class pluginclass( object ):
|
||||
TARGET_TYPE_TEXT = 80
|
||||
array2 = TargetEntry * 2
|
||||
toButton = array2( ("text/uri-list", 0, TARGET_TYPE_TEXT), ("text/uri-list", 0, TARGET_TYPE_TEXT) )
|
||||
toButton = ( Gtk.TargetEntry.new( "text/uri-list", 0, TARGET_TYPE_TEXT ), Gtk.TargetEntry.new( "text/uri-list", 0, TARGET_TYPE_TEXT ) )
|
||||
TARGET_TYPE_FAV = 81
|
||||
array = TargetEntry * 3
|
||||
toFav = array( ( "FAVORITES", Gtk.TargetFlags.SAME_APP, 81 ), ( "text/plain", 0, 100 ), ( "text/uri-list", 0, 101 ) )
|
||||
array1 = TargetEntry * 2
|
||||
fromFav = array1( ("FAVORITES", Gtk.TargetFlags.SAME_APP, 81), ("FAVORITES", Gtk.TargetFlags.SAME_APP, 81) )
|
||||
toFav = ( Gtk.TargetEntry.new( "FAVORITES", Gtk.TargetFlags.SAME_APP, 81 ), Gtk.TargetEntry.new( "text/plain", 0, 100 ), Gtk.TargetEntry.new( "text/uri-list", 0, 101 ) )
|
||||
fromFav = ( Gtk.TargetEntry.new( "FAVORITES", Gtk.TargetFlags.SAME_APP, 81 ), Gtk.TargetEntry.new( "FAVORITES", Gtk.TargetFlags.SAME_APP, 81 ) )
|
||||
|
||||
@print_timing
|
||||
def __init__( self, mintMenuWin, toggleButton, de ):
|
||||
@ -221,10 +217,9 @@ class pluginclass( object ):
|
||||
|
||||
self.favoritesBox.connect( "drag-data-received", self.ReceiveCallback )
|
||||
|
||||
gtk.gtk_drag_dest_set.argtypes = [c_void_p, c_ushort, c_void_p, c_int, c_ushort]
|
||||
gtk.gtk_drag_dest_set ( hash(self.favoritesBox), Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, self.toButton, 2, Gdk.DragAction.COPY )
|
||||
self.favoritesBox.drag_dest_set ( Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, self.toButton, Gdk.DragAction.COPY )
|
||||
self.showFavoritesButton.connect( "drag-data-received", self.ReceiveCallback )
|
||||
gtk.gtk_drag_dest_set ( hash(self.showFavoritesButton), Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, self.toButton, 2, Gdk.DragAction.COPY )
|
||||
self.showFavoritesButton.drag_dest_set ( Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, self.toButton, Gdk.DragAction.COPY )
|
||||
|
||||
# self.searchButton.connect( "button_release_event", self.SearchWithButton )
|
||||
try:
|
||||
@ -543,8 +538,7 @@ class pluginclass( object ):
|
||||
# of the existing text, that's the most likely candidate anyhow
|
||||
self.searchEntry.grab_focus()
|
||||
if self.rememberFilter or not clear:
|
||||
gtk.gtk_editable_set_position.argtypes = [c_void_p, c_int]
|
||||
gtk.gtk_editable_set_position(hash(self.searchEntry), -1)
|
||||
self.searchEntry.set_position(-1)
|
||||
else:
|
||||
self.searchEntry.set_text("")
|
||||
|
||||
@ -577,14 +571,14 @@ class pluginclass( object ):
|
||||
|
||||
text = "<b>%s</b>" % text
|
||||
|
||||
suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
|
||||
suggestionButton = SuggestionButton("list-add", self.iconSize, "")
|
||||
suggestionButton.connect("clicked", self.search_google)
|
||||
suggestionButton.set_text(_("Search Google for %s") % text)
|
||||
suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
|
||||
self.applicationsBox.add(suggestionButton)
|
||||
self.suggestions.append(suggestionButton)
|
||||
|
||||
suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
|
||||
suggestionButton = SuggestionButton("list-add", self.iconSize, "")
|
||||
suggestionButton.connect("clicked", self.search_wikipedia)
|
||||
suggestionButton.set_text(_("Search Wikipedia for %s") % text)
|
||||
suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
|
||||
@ -592,7 +586,7 @@ class pluginclass( object ):
|
||||
self.suggestions.append(suggestionButton)
|
||||
|
||||
separator = Gtk.EventBox()
|
||||
separator.add(Gtk.HSeparator())
|
||||
separator.add(Gtk.Separator( orientation=Gtk.Orientation.HORIZONTAL ))
|
||||
separator.set_visible_window(False)
|
||||
separator.set_size_request(-1, 20)
|
||||
separator.type = "separator"
|
||||
@ -600,21 +594,21 @@ class pluginclass( object ):
|
||||
self.applicationsBox.add(separator)
|
||||
self.suggestions.append(separator)
|
||||
|
||||
suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
|
||||
suggestionButton = SuggestionButton("list-add", self.iconSize, "")
|
||||
suggestionButton.connect("clicked", self.search_dictionary)
|
||||
suggestionButton.set_text(_("Lookup %s in Dictionary") % text)
|
||||
suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/dictionary.png")
|
||||
self.applicationsBox.add(suggestionButton)
|
||||
self.suggestions.append(suggestionButton)
|
||||
|
||||
suggestionButton = SuggestionButton(Gtk.STOCK_FIND, self.iconSize, "")
|
||||
suggestionButton = SuggestionButton("edit-find", self.iconSize, "")
|
||||
suggestionButton.connect("clicked", self.Search)
|
||||
suggestionButton.set_text(_("Search Computer for %s") % text)
|
||||
self.applicationsBox.add(suggestionButton)
|
||||
self.suggestions.append(suggestionButton)
|
||||
|
||||
#self.last_separator = gtk.EventBox()
|
||||
#self.last_separator.add(gtk.HSeparator())
|
||||
#self.last_separator = Gtk.EventBox()
|
||||
#self.last_separator.add(Gtk.Separator( orientation=Gtk.Orientation.HORIZONTAL ))
|
||||
#self.last_separator.set_size_request(-1, 20)
|
||||
#self.last_separator.type = "separator"
|
||||
#self.mintMenuWin.SetPaneColors( [ self.last_separator ] )
|
||||
@ -846,8 +840,7 @@ class pluginclass( object ):
|
||||
|
||||
if event.string.strip() != "" or event.keyval == Gdk.KEY_BackSpace:
|
||||
self.searchEntry.grab_focus()
|
||||
gtk.gtk_editable_set_position.argtypes = [c_void_p, c_int]
|
||||
gtk.gtk_editable_set_position(hash(self.searchEntry), -1)
|
||||
self.searchEntry.set_position( -1 )
|
||||
self.searchEntry.event( event )
|
||||
return True
|
||||
|
||||
@ -917,8 +910,7 @@ class pluginclass( object ):
|
||||
|
||||
mTree.show_all()
|
||||
self.mintMenuWin.stopHiding()
|
||||
gtk.gtk_menu_popup.argtypes = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_uint, c_uint]
|
||||
gtk.gtk_menu_popup(hash(mTree), None, None, None, None, ev.button, ev.time)
|
||||
mTree.popup(None, None, None, None, ev.button, ev.time)
|
||||
else:
|
||||
mTree = Gtk.Menu()
|
||||
mTree.set_events(Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.POINTER_MOTION_HINT_MASK |
|
||||
@ -937,8 +929,7 @@ class pluginclass( object ):
|
||||
insertSpaceMenuItem.connect( "activate", self.onFavoritesInsertSpace, widget, insertBefore )
|
||||
insertSeparatorMenuItem.connect( "activate", self.onFavoritesInsertSeparator, widget, insertBefore )
|
||||
self.mintMenuWin.stopHiding()
|
||||
gtk.gtk_menu_popup.argtypes = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_uint, c_uint]
|
||||
gtk.gtk_menu_popup(hash(mTree), None, None, None, None, ev.button, ev.time)
|
||||
mTree.popup(None, None, None, None, ev.button, ev.time)
|
||||
|
||||
def menuPopup( self, widget, event ):
|
||||
if event.button == 3:
|
||||
@ -1000,8 +991,7 @@ class pluginclass( object ):
|
||||
startupMenuItem.connect( "toggled", self.onAddToStartup, widget )
|
||||
|
||||
self.mintMenuWin.stopHiding()
|
||||
gtk.gtk_menu_popup.argtypes = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_uint, c_uint]
|
||||
gtk.gtk_menu_popup(hash(mTree), None, None, None, None, event.button, event.time)
|
||||
mTree.popup(None, None, None, None, ev.button, ev.time)
|
||||
|
||||
|
||||
def searchPopup( self, widget=None, event=None ):
|
||||
@ -1033,7 +1023,8 @@ class pluginclass( object ):
|
||||
|
||||
menuItem = Gtk.ImageMenuItem(_("Search Computer"))
|
||||
img = Gtk.Image()
|
||||
img.set_from_stock(Gtk.STOCK_FIND, self.iconSize)
|
||||
img.set_from_icon_name("edit-find", Gtk.IconSize.INVALID)
|
||||
img.set_pixel_size( self.iconSize )
|
||||
menuItem.set_image(img)
|
||||
menuItem.connect("activate", self.Search)
|
||||
menu.append(menuItem)
|
||||
@ -1079,8 +1070,7 @@ class pluginclass( object ):
|
||||
menu.show_all()
|
||||
|
||||
self.mintMenuWin.stopHiding()
|
||||
gtk.gtk_menu_popup.argtypes = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_uint, c_uint]
|
||||
gtk.gtk_menu_popup(hash(menu), None, None, None, None, event.button, event.time)
|
||||
menu.popup(None, None, None, None, event.button, event.time)
|
||||
|
||||
#menu.attach_to_widget(self.searchButton, None)
|
||||
#menu.reposition()
|
||||
@ -1290,11 +1280,11 @@ class pluginclass( object ):
|
||||
|
||||
# Scroll button into view
|
||||
def scrollItemIntoView( self, widget, event = None ):
|
||||
viewport = widget.parent
|
||||
viewport = widget.get_parent()
|
||||
while not isinstance( viewport, Gtk.Viewport ):
|
||||
if not viewport.parent:
|
||||
if not viewport.get_parent():
|
||||
return
|
||||
viewport = viewport.parent
|
||||
viewport = viewport.get_parent()
|
||||
aloc = widget.get_allocation()
|
||||
viewport.get_vadjustment().clamp_page(aloc.y, aloc.y + aloc.height)
|
||||
|
||||
@ -1310,8 +1300,9 @@ class pluginclass( object ):
|
||||
return space
|
||||
|
||||
def favoritesBuildSeparator( self ):
|
||||
separator = Gtk.HSeparator()
|
||||
separator.set_size_request( -1, 20 )
|
||||
separator = Gtk.Separator( orientation=Gtk.Orientation.HORIZONTAL )
|
||||
separator.set_margin_top( 5 )
|
||||
separator.set_margin_bottom( 5 )
|
||||
separator.type = "separator"
|
||||
|
||||
separator.show_all()
|
||||
@ -1406,34 +1397,15 @@ class pluginclass( object ):
|
||||
self.favorites.append( favButton )
|
||||
self.favoritesPositionOnGrid( favButton )
|
||||
favButton.connect( "drag-data-received", self.onFavButtonDragReorder )
|
||||
gtk.gtk_drag_dest_set.argtypes = [c_void_p, c_ushort, c_void_p, c_int, c_ushort]
|
||||
gtk.gtk_drag_dest_set( hash(favButton), Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, self.fromFav, 2, Gdk.DragAction.COPY )
|
||||
favButton.drag_dest_set( Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, self.toFav, Gdk.DragAction.COPY
|
||||
favButton.connect( "drag-data-get", self.onFavButtonDragReorderGet )
|
||||
gtk.gtk_drag_source_set.argtypes = [c_void_p, c_ushort, c_void_p, c_int, c_ushort]
|
||||
gtk.gtk_drag_source_set( hash(favButton), Gdk.ModifierType.BUTTON1_MASK, self.toFav, 3, Gdk.DragAction.COPY )
|
||||
favButton.drag_source_set ( Gdk.ModifierType.BUTTON1_MASK, self.toFav, Gdk.DragAction.COPY )
|
||||
position += 1
|
||||
|
||||
self.favoritesSave()
|
||||
except Exception, e:
|
||||
print e
|
||||
|
||||
def favoritesGetNumRows( self ):
|
||||
rows = 0
|
||||
col = 0
|
||||
for fav in self.favorites:
|
||||
if ( fav.type == "separator" or fav.type == "space" ) and col != 0:
|
||||
rows += 1
|
||||
col = 0
|
||||
col += 1
|
||||
if fav.type == "separator" or fav.type == "space":
|
||||
rows += 1
|
||||
col = 0
|
||||
|
||||
if col >= self.favCols:
|
||||
rows += 1
|
||||
col = 0
|
||||
return rows
|
||||
|
||||
def favoritesPositionOnGrid( self, favorite ):
|
||||
row = 0
|
||||
col = 0
|
||||
@ -1453,9 +1425,9 @@ class pluginclass( object ):
|
||||
col = 0
|
||||
|
||||
if favorite.type == "separator" or favorite.type == "space":
|
||||
self.favoritesBox.attach( favorite, col, col + self.favCols, row, row + 1, yoptions = 0 )
|
||||
self.favoritesBox.attach( favorite, col, row, self.favCols, 1 )
|
||||
else:
|
||||
self.favoritesBox.attach( favorite, col, col + 1, row, row + 1, yoptions = 0 )
|
||||
self.favoritesBox.attach( favorite, col, row, 1, 1 )
|
||||
|
||||
def favoritesReorder( self, oldposition, newposition ):
|
||||
if oldposition == newposition:
|
||||
@ -1479,7 +1451,6 @@ class pluginclass( object ):
|
||||
self.favoritesPositionOnGrid( fav )
|
||||
|
||||
self.favoritesSave()
|
||||
self.favoritesBox.resize( self.favoritesGetNumRows(), self.favCols )
|
||||
|
||||
def favoritesAdd( self, favButton, position = -1 ):
|
||||
if favButton:
|
||||
@ -1488,11 +1459,9 @@ class pluginclass( object ):
|
||||
self.favoritesPositionOnGrid( favButton )
|
||||
|
||||
favButton.connect( "drag-data-received", self.onFavButtonDragReorder )
|
||||
gtk.gtk_drag_dest_set.argtypes = [c_void_p, c_ushort, c_void_p, c_int, c_ushort]
|
||||
gtk.gtk_drag_dest_set( hash(favButton), Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, self.toFav, 3, Gdk.DragAction.COPY )
|
||||
favButton.drag_dest_set( Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, self.toFav, Gdk.DragAction.COPY )
|
||||
favButton.connect( "drag-data-get", self.onFavButtonDragReorderGet )
|
||||
gtk.gtk_drag_source_set.argtypes = [c_void_p, c_ushort, c_void_p, c_int, c_ushort]
|
||||
gtk.gtk_drag_source_set ( hash(favButton), Gdk.ModifierType.BUTTON1_MASK, self.toFav, 3, Gdk.DragAction.COPY )
|
||||
favButton.drag_source_set ( Gdk.ModifierType.BUTTON1_MASK, self.toFav, Gdk.DragAction.COPY )
|
||||
|
||||
if position >= 0:
|
||||
self.favoritesReorder( favButton.position, position )
|
||||
@ -1509,7 +1478,6 @@ class pluginclass( object ):
|
||||
self.favoritesBox.remove( self.favorites[ i ] )
|
||||
self.favoritesPositionOnGrid( self.favorites[ i ] )
|
||||
self.favoritesSave()
|
||||
self.favoritesBox.resize( self.favoritesGetNumRows(), self.favCols )
|
||||
|
||||
def favoritesRemoveLocation( self, location ):
|
||||
for fav in self.favorites:
|
||||
@ -1529,7 +1497,7 @@ class pluginclass( object ):
|
||||
|
||||
appListFile.close( )
|
||||
except Exception, e:
|
||||
msgDlg = Gtk.MessageDialog( None, gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, _("Couldn't save favorites. Check if you have write access to ~/.linuxmint/mintMenu")+"\n(" + e.__str__() + ")" )
|
||||
msgDlg = Gtk.MessageDialog( None, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, _("Couldn't save favorites. Check if you have write access to ~/.linuxmint/mintMenu")+"\n(" + e.__str__() + ")" )
|
||||
msgDlg.run();
|
||||
msgDlg.destroy();
|
||||
|
||||
@ -1722,7 +1690,7 @@ class pluginclass( object ):
|
||||
for item in sortedApplicationList:
|
||||
launcherName = item[0]
|
||||
button = item[1]
|
||||
self.applicationsBox.pack_start( button, False, False, 0 )
|
||||
self.applicationsBox.add( button )
|
||||
if launcherName in launcherNames:
|
||||
button.hide()
|
||||
else:
|
||||
@ -1740,7 +1708,7 @@ class pluginclass( object ):
|
||||
|
||||
# Build a list of all categories in the menu ( [ { "name", "icon", tooltip" } ]
|
||||
def buildCategoryList( self ):
|
||||
newCategoryList = [ { "name": _("All"), "icon": "stock_select-all", "tooltip": _("Show all applications"), "filter":"", "index": 0 } ]
|
||||
newCategoryList = [ { "name": _("All"), "icon": "edit-select-all", "tooltip": _("Show all applications"), "filter":"", "index": 0 } ]
|
||||
|
||||
num = 1
|
||||
|
||||
|
@ -13,8 +13,6 @@ from filemonitor import monitor as filemonitor
|
||||
import ctypes
|
||||
from ctypes import *
|
||||
|
||||
gtk = CDLL("libgtk-x11-2.0.so.0")
|
||||
|
||||
class IconManager(GObject.GObject):
|
||||
|
||||
__gsignals__ = {
|
||||
@ -124,8 +122,8 @@ class easyButton( Gtk.Button ):
|
||||
self.set_size_request( buttonWidth, buttonHeight )
|
||||
|
||||
Align1 = Gtk.Alignment.new( 0, 0.5, 1.0, 0 )
|
||||
HBox1 = Gtk.HBox()
|
||||
self.labelBox = Gtk.VBox( False, 2 )
|
||||
HBox1 = Gtk.Box( orientation=Gtk.Orientation.HORIZONTAL )
|
||||
self.labelBox = Gtk.Box( orientation=Gtk.Orientation.VERTICAL, spacing=2 )
|
||||
|
||||
|
||||
self.buttonImage = Gtk.Image()
|
||||
@ -135,7 +133,7 @@ class easyButton( Gtk.Button ):
|
||||
else:
|
||||
#[ iW, iH ] = iconManager.getIconSize( self.iconSize )
|
||||
self.buttonImage.set_size_request( self.iconSize, self.iconSize )
|
||||
self.image_box = Gtk.HBox()
|
||||
self.image_box = Gtk.Box( orientation=Gtk.Orientation.HORIZONTAL )
|
||||
self.image_box.pack_start(self.buttonImage, False, False, 5)
|
||||
self.image_box.show_all()
|
||||
HBox1.pack_start( self.image_box, False, False, 0 )
|
||||
@ -163,7 +161,7 @@ class easyButton( Gtk.Button ):
|
||||
self.connections.append( self.connect( event, callback ) )
|
||||
|
||||
def onRelease( self, widget ):
|
||||
widget.set_state(Gtk.StateType.NORMAL)
|
||||
widget.get_style_context().set_state( Gtk.StateFlags.NORMAL )
|
||||
|
||||
def onDestroy( self, widget ):
|
||||
self.buttonImage.clear()
|
||||
@ -188,6 +186,7 @@ class easyButton( Gtk.Button ):
|
||||
|
||||
label.set_ellipsize( Pango.EllipsizeMode.END )
|
||||
label.set_alignment( 0.0, 1.0 )
|
||||
label.set_max_width_chars(0)
|
||||
label.show()
|
||||
self.labelBox.pack_start( label , True, True, 0)
|
||||
|
||||
@ -271,17 +270,13 @@ class ApplicationLauncher( easyButton ):
|
||||
# Drag and Drop
|
||||
self.connectSelf( "drag-data-get", self.dragDataGet )
|
||||
|
||||
array = TargetEntry * 2
|
||||
targets = array(( "text/plain", 0, 100 ), ( "text/uri-list", 0, 101 ))
|
||||
gtk.gtk_drag_source_set.argtypes = [c_void_p, c_ushort, c_void_p, c_int, c_ushort]
|
||||
gtk.gtk_drag_source_set(hash(self), Gdk.ModifierType.BUTTON1_MASK, targets, 2, Gdk.DragAction.COPY)
|
||||
targets = ( Gtk.TargetEntry.new( "text/plain", 0, 100 ), Gtk.TargetEntry.new( "text/uri-list", 0, 101 ) )
|
||||
self.drag_source_set( Gdk.ModifierType.BUTTON1_MASK, targets, Gdk.DragAction.COPY )
|
||||
|
||||
icon = self.getIcon( Gtk.IconSize.DND )
|
||||
if icon:
|
||||
iconName, s = icon.get_icon_name()
|
||||
c = c_char_p(iconName.decode('utf-8', 'ignore').encode('ascii', 'ignore'))
|
||||
gtk.gtk_drag_source_set_icon_name.argtypes = [c_void_p, c_char_p]
|
||||
gtk.gtk_drag_source_set_icon_name( hash(self), c)
|
||||
self.drag_source_set_icon_name( iconName )
|
||||
|
||||
self.connectSelf( "focus-in-event", self.onFocusIn )
|
||||
self.connectSelf( "focus-out-event", self.onFocusOut )
|
||||
@ -398,9 +393,7 @@ class ApplicationLauncher( easyButton ):
|
||||
icon = self.getIcon( Gtk.IconSize.DND )
|
||||
if icon:
|
||||
iconName, size = icon.get_icon_name()
|
||||
c = c_char_p(iconName.encode('ascii', 'ignore'))
|
||||
gtk.gtk_drag_source_set_icon_name.argtypes = [c_void_p, c_char_p]
|
||||
gtk.gtk_drag_source_set_icon_name( hash(self), c)
|
||||
self.drag_source_set_icon_name( iconName )
|
||||
|
||||
def startupFileChanged( self, *args ):
|
||||
self.inStartup = os.path.exists( self.startupFilePath )
|
||||
@ -493,7 +486,7 @@ class MenuApplicationLauncher( ApplicationLauncher ):
|
||||
appComment = self.appComment
|
||||
if self.highlight:
|
||||
try:
|
||||
#color = self.labelBox.rc_get_style().fg[ Gtk.StateType.SELECTED ].to_string()
|
||||
#color = self.labelBox.get_style_context().get_color( Gtk.StateFlags.SELECTED ).to_string()
|
||||
#if len(color) > 0 and color[0] == "#":
|
||||
#appName = "<span foreground=\"%s\"><b>%s</b></span>" % (color, appName);
|
||||
#appComment = "<span foreground=\"%s\"><b>%s</b></span>" % (color, appComment);
|
||||
|
@ -23,7 +23,7 @@ def Execute( cmd , commandCwd=None):
|
||||
cwd = tmpCwd
|
||||
|
||||
if isinstance( cmd, str ) or isinstance( cmd, unicode):
|
||||
if (cmd.find("ubiquity") >= 0) or (cmd.find("/home/") >= 0) or (cmd.find("su-to-root") >= 0) or (cmd.find("\"") >= 0):
|
||||
if (cmd.find("ubiquity") >= 0) or (cmd.find("/home/") >= 0) or (cmd.find("xdg-su") >= 0) or (cmd.find("\"") >= 0):
|
||||
print "running manually..."
|
||||
try:
|
||||
os.chdir(cwd)
|
||||
|
@ -15,8 +15,6 @@ from execute import Execute
|
||||
from user import home
|
||||
from urllib import unquote
|
||||
|
||||
gtk = CDLL("libgtk-x11-2.0.so.0")
|
||||
|
||||
# i18n
|
||||
gettext.install("mintmenu", "/usr/share/linuxmint/locale")
|
||||
|
||||
@ -263,8 +261,7 @@ class pluginclass( object ):
|
||||
trashMenu.show_all()
|
||||
emptyTrashMenuItem.connect ( "activate", self.emptyTrash, widget )
|
||||
self.mintMenuWin.stopHiding()
|
||||
gtk.gtk_menu_popup.argtypes = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_uint, c_uint]
|
||||
gtk.gtk_menu_popup(hash(trashMenu), None, None, None, None, 3, 0)
|
||||
trashMenu.popup(None, None, None, None, 3, 0)
|
||||
|
||||
def emptyTrash( self, menu, widget):
|
||||
os.system("rm -rf " + home + "/.local/share/Trash/info/*")
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/python2
|
||||
|
||||
import gi
|
||||
gi.require_version("Gtk", "2.0")
|
||||
gi.require_version("Gtk", "3.0")
|
||||
|
||||
from gi.repository import Gtk, Pango
|
||||
import os
|
||||
@ -140,13 +140,12 @@ class pluginclass:
|
||||
Align1 = Gtk.Alignment()
|
||||
Align1.set( 0, 0.5, 0, 0)
|
||||
Align1.set_padding( 0, 0, 0, 0 )
|
||||
HBox1 = Gtk.HBox( False, 5 )
|
||||
VBox1 = Gtk.VBox( False, 2 )
|
||||
HBox1 = Gtk.Box( orientation=Gtk.Orientation.HORIZONTAL, spacing=5 )
|
||||
VBox1 = Gtk.Box( orientation=Gtk.Orientation.VERTICAL, spacing=2 )
|
||||
|
||||
VBox1.show()
|
||||
|
||||
req = Gtk.Requisition()
|
||||
AButton.size_request(req)
|
||||
req = AButton.size_request()
|
||||
|
||||
Label1 = Gtk.Label( DispName )
|
||||
Label1.set_size_request( req.width-20, -1 )
|
||||
@ -190,7 +189,7 @@ class pluginclass:
|
||||
FileString=[]
|
||||
IconString=[]
|
||||
RecentInfo=self.RecManagerInstance.get_items()
|
||||
# print RecentInfo[0].get_icon(gtk.ICON_SIZE_MENU)
|
||||
# print RecentInfo[0].get_icon(Gtk.IconSize.MENU)
|
||||
count=0
|
||||
MaxEntries=self.numentries
|
||||
if self.numentries == -1:
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/python2
|
||||
|
||||
import gi
|
||||
gi.require_version("Gtk", "2.0")
|
||||
gi.require_version("Gtk", "3.0")
|
||||
|
||||
from gi.repository import Gtk
|
||||
import os
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/python2
|
||||
|
||||
import gi
|
||||
gi.require_version("Gtk", "2.0")
|
||||
gi.require_version("Gtk", "3.0")
|
||||
|
||||
from Xlib.display import Display
|
||||
from Xlib import X, error
|
||||
@ -10,8 +10,7 @@ import threading
|
||||
import ctypes
|
||||
from ctypes import *
|
||||
|
||||
gdk = CDLL("libgdk-x11-2.0.so.0")
|
||||
gtk = CDLL("libgtk-x11-2.0.so.0")
|
||||
gdk = CDLL("libgdk-3.so.0")
|
||||
|
||||
class PointerMonitor(GObject.GObject, threading.Thread):
|
||||
__gsignals__ = {
|
||||
|
Loading…
Reference in New Issue
Block a user