jbah.skp/mintmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

All icon sizes in pixels, added places and system icon sizes in prefs

Browse Source
This commit is contained in:
Clement Lefebvre 2010-09-23 17:55:02 +01:00
parent b702a30e8f
commit 3f4868d504
7 changed files with 420 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr/lib/linuxmint/mintMenu/mintMenu.py
View File

@ -609,17 +609,7 @@ class MenuWin( object ):
self.theme_name = self.gconf.get( "string", "theme_name", "default" ) self.theme_name = self.gconf.get( "string", "theme_name", "default" )
self.hotkeyText = self.gconf.get( "string", "hot_key", "<Control>Super_L" ) self.hotkeyText = self.gconf.get( "string", "hot_key", "<Control>Super_L" )
self.buttonIcon = self.gconf.get( "string", "applet_icon", ICON ) self.buttonIcon = self.gconf.get( "string", "applet_icon", ICON )
self.setIconSize( self.gconf.get( "int", "applet_icon_size", 2 ) ) self.iconSize = self.gconf.get( "int", "applet_icon_size", 22 )
def setIconSize( self, icon_size):
if icon_size >= 4:
self.iconSize = gtk.ICON_SIZE_DIALOG
elif icon_size == 3:
self.iconSize = gtk.ICON_SIZE_DND
elif icon_size == 2:
self.iconSize = gtk.ICON_SIZE_BUTTON
else:
self.iconSize = gtk.ICON_SIZE_MENU
def changeBackground( self, applet, type, color, pixmap ): def changeBackground( self, applet, type, color, pixmap ):

735
usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
View File

@ -30,7 +30,7 @@
<child> <child>
<widget class="GtkTable" id="table1"> <widget class="GtkTable" id="table1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="n_rows">5</property> <property name="n_rows">4</property>
<property name="n_columns">2</property> <property name="n_columns">2</property>
<property name="column_spacing">5</property> <property name="column_spacing">5</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
@ -78,20 +78,6 @@
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Icon Size:</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child> <child>
<widget class="GtkLabel" id="label4"> <widget class="GtkLabel" id="label4">
<property name="visible">True</property> <property name="visible">True</property>
@ -99,23 +85,6 @@
<property name="label" translatable="yes">Button icon:</property> <property name="label" translatable="yes">Button icon:</property>
</widget> </widget>
<packing> <packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="main_button_icon_size">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">2 1 3 1 0 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="bottom_attach">4</property> <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
@ -180,8 +149,8 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">4</property> <property name="top_attach">3</property>
<property name="bottom_attach">5</property> <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
@ -415,168 +384,174 @@
<property name="spacing">4</property> <property name="spacing">4</property>
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
<child> <child>
<widget class="GtkFrame" id="frame25"> <widget class="GtkFrame" id="frame19">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">3</property> <property name="border_width">6</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="label_yalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<widget class="GtkTable" id="table17"> <widget class="GtkAlignment" id="alignment43">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">6</property> <property name="bottom_padding">6</property>
<property name="n_columns">2</property> <property name="left_padding">6</property>
<property name="row_spacing">5</property> <property name="right_padding">6</property>
<property name="homogeneous">True</property>
<child> <child>
<widget class="GtkLabel" id="iconSizeLabel"> <widget class="GtkVBox" id="vbox13">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property> <child>
<property name="label" translatable="yes">Icon size:</property> <widget class="GtkCheckButton" id="useCustomColors">
<property name="label" translatable="yes">Use custom colors</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkTable" id="table29">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="row_spacing">2</property>
<child>
<widget class="GtkLabel" id="headingColorLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Headings:</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="borderColorLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Borders:</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="backgroundColorLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Background:</property>
</widget>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkColorButton" id="borderColor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="color">#000000000000</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkColorButton" id="backgroundColor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="color">#000000000000</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkColorButton" id="headingColor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="color">#000000000000</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="themeLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Theme:</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="themesCombo">
<property name="visible">True</property>
<property name="items" translatable="yes">Default</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget> </widget>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="iconSize">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">1 1 4 1 0 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="showCategoryIcons">
<property name="label" translatable="yes">Show category icons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="showAppComments">
<property name="label" translatable="yes">Show application comments</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="hover">
<property name="label" translatable="yes">Hover</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="hoverLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Hover delay (seconds):</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="hoverDelay">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">100 0 1000 1 2 2</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Search command:</property>
</widget>
<packing>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="search_command">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_STRUCTURE_MASK</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options"></property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child> </child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="applicationsLabel"> <widget class="GtkLabel" id="label31">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
@ -587,8 +562,6 @@
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property>
<property name="padding">5</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -598,10 +571,10 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="label23"> <widget class="GtkLabel" id="colorsLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Applications</property> <property name="label" translatable="yes">Colors</property>
</widget> </widget>
<packing> <packing>
<property name="position">2</property> <property name="position">2</property>
@ -610,174 +583,171 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkFrame" id="frame19"> <widget class="GtkFrame" id="frame25">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">6</property> <property name="border_width">3</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="label_yalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<widget class="GtkAlignment" id="alignment43"> <widget class="GtkTable" id="table17">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="bottom_padding">6</property> <property name="n_rows">6</property>
<property name="left_padding">6</property> <property name="n_columns">2</property>
<property name="right_padding">6</property> <property name="row_spacing">5</property>
<property name="homogeneous">True</property>
<child> <child>
<widget class="GtkVBox" id="vbox13"> <widget class="GtkLabel" id="iconSizeLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child> <property name="xalign">0</property>
<widget class="GtkCheckButton" id="useCustomColors"> <property name="label" translatable="yes">Icon size:</property>
<property name="label" translatable="yes">Use custom colors</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkTable" id="table29">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="row_spacing">2</property>
<child>
<widget class="GtkLabel" id="headingColorLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Headings:</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="borderColorLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Borders:</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="backgroundColorLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Background:</property>
</widget>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkColorButton" id="borderColor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="color">#000000000000</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkColorButton" id="backgroundColor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="color">#000000000000</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkColorButton" id="headingColor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="color">#000000000000</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="themeLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Theme:</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="themesCombo">
<property name="visible">True</property>
<property name="items" translatable="yes">Default</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget> </widget>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="iconSize">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">1 1 128 1 0 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="showCategoryIcons">
<property name="label" translatable="yes">Show category icons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="showAppComments">
<property name="label" translatable="yes">Show application comments</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="hover">
<property name="label" translatable="yes">Hover</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="hoverLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Hover delay (seconds):</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="hoverDelay">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">100 0 1000 1 2 2</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Search command:</property>
</widget>
<packing>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="search_command">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_STRUCTURE_MASK</property>
<property name="invisible_char">&#x25CF;</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options"></property>
<property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child> </child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="label31"> <widget class="GtkLabel" id="applicationsLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
@ -792,10 +762,10 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="colorsLabel"> <widget class="GtkLabel" id="label23">
<property name="visible">True</property> <property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Colors</property> <property name="label" translatable="yes">Applications</property>
</widget> </widget>
<packing> <packing>
<property name="position">3</property> <property name="position">3</property>
@ -866,7 +836,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">1 1 4 1 0 0</property> <property name="adjustment">1 1 128 1 0 0</property>
</widget> </widget>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -998,6 +968,42 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="border_width">3</property>
<property name="spacing">4</property>
<child>
<widget class="GtkLabel" id="placesIconSizeLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Icon size:</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="placesIconSize">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">1 1 128 1 0 0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<widget class="GtkFrame" id="frame3"> <widget class="GtkFrame" id="frame3">
<property name="visible">True</property> <property name="visible">True</property>
@ -1092,7 +1098,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">2</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1104,7 +1110,7 @@
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</widget> </widget>
<packing> <packing>
<property name="position">3</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1269,7 +1275,7 @@
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">4</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
</widget> </widget>
@ -1373,6 +1379,45 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<property name="border_width">4</property>
<property name="spacing">4</property>
<child>
<widget class="GtkLabel" id="systemIconSizeLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Icon size:</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="systemIconSize">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="invisible_char">&#x25CF;</property>
<property name="adjustment">1 1 128 1 0 0</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<widget class="GtkFrame" id="frame5"> <widget class="GtkFrame" id="frame5">
<property name="visible">True</property> <property name="visible">True</property>
@ -1495,7 +1540,7 @@
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="position">2</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</widget> </widget>

16
usr/lib/linuxmint/mintMenu/mintMenuConfig.py
View File

@ -78,8 +78,9 @@ class mintMenuConfig( object ):
#wTree.get_widget("favoritesLabel").set_text(_("Favorites")) #wTree.get_widget("favoritesLabel").set_text(_("Favorites"))
wTree.get_widget("numberColumnsLabel").set_text(_("Number of columns:")) wTree.get_widget("numberColumnsLabel").set_text(_("Number of columns:"))
wTree.get_widget("iconSizeLabel").set_text(_("Icon size:")) wTree.get_widget("iconSizeLabel").set_text(_("Icon size:"))
wTree.get_widget("iconSizeLabel2").set_text(_("Icon size:")) wTree.get_widget("iconSizeLabel2").set_text(_("Icon size:"))
wTree.get_widget("label44").set_text(_("Icon size:")) wTree.get_widget("placesIconSizeLabel").set_text(_("Icon size:"))
wTree.get_widget("systemIconSizeLabel").set_text(_("Icon size:"))
wTree.get_widget("hoverLabel").set_text(_("Hover delay (ms):")) wTree.get_widget("hoverLabel").set_text(_("Hover delay (ms):"))
wTree.get_widget("label4").set_text(_("Button icon:")) wTree.get_widget("label4").set_text(_("Button icon:"))
wTree.get_widget("label5").set_text(_("Search command:")) wTree.get_widget("label5").set_text(_("Search command:"))
@ -123,10 +124,11 @@ class mintMenuConfig( object ):
self.showPlacesPlugin = wTree.get_widget( "showPlacesPlugin" ) self.showPlacesPlugin = wTree.get_widget( "showPlacesPlugin" )
self.swapGeneric = wTree.get_widget("swapGeneric") self.swapGeneric = wTree.get_widget("swapGeneric")
self.hover = wTree.get_widget( "hover" ) self.hover = wTree.get_widget( "hover" )
self.hoverDelay = wTree.get_widget( "hoverDelay" ) self.hoverDelay = wTree.get_widget( "hoverDelay" )
self.bttniconSize = wTree.get_widget( "main_button_icon_size" )
self.iconSize = wTree.get_widget( "iconSize" ) self.iconSize = wTree.get_widget( "iconSize" )
self.favIconSize = wTree.get_widget( "favIconSize" ) self.favIconSize = wTree.get_widget( "favIconSize" )
self.placesIconSize = wTree.get_widget( "placesIconSize" )
self.systemIconSize = wTree.get_widget( "systemIconSize" )
self.favCols = wTree.get_widget( "numFavCols" ) self.favCols = wTree.get_widget( "numFavCols" )
self.borderWidth = wTree.get_widget( "borderWidth" ) self.borderWidth = wTree.get_widget( "borderWidth" )
self.opacity = wTree.get_widget( "opacity" ) self.opacity = wTree.get_widget( "opacity" )
@ -189,10 +191,12 @@ class mintMenuConfig( object ):
self.bindGconfValueToWidget( self.gconfApplications, "bool", "swap_generic_name", self.swapGeneric, "toggled", self.swapGeneric.set_active, self.swapGeneric.get_active ) self.bindGconfValueToWidget( self.gconfApplications, "bool", "swap_generic_name", self.swapGeneric, "toggled", self.swapGeneric.set_active, self.swapGeneric.get_active )
self.bindGconfValueToWidget( self.gconfApplications, "int", "category_hover_delay", self.hoverDelay, "value-changed", self.hoverDelay.set_value, self.hoverDelay.get_value ) self.bindGconfValueToWidget( self.gconfApplications, "int", "category_hover_delay", self.hoverDelay, "value-changed", self.hoverDelay.set_value, self.hoverDelay.get_value )
self.bindGconfValueToWidget( self.gconfApplications, "int", "icon_size", self.iconSize, "value-changed", self.iconSize.set_value, self.iconSize.get_value ) self.bindGconfValueToWidget( self.gconfApplications, "int", "icon_size", self.iconSize, "value-changed", self.iconSize.set_value, self.iconSize.get_value )
self.bindGconfValueToWidget( self.gconf, "int", "applet_icon_size", self.bttniconSize, "value-changed", self.bttniconSize.set_value, self.bttniconSize.get_value )
self.bindGconfValueToWidget( self.gconfApplications, "int", "favicon_size", self.favIconSize, "value-changed", self.favIconSize.set_value, self.favIconSize.get_value ) self.bindGconfValueToWidget( self.gconfApplications, "int", "favicon_size", self.favIconSize, "value-changed", self.favIconSize.set_value, self.favIconSize.get_value )
self.bindGconfValueToWidget( self.gconfApplications, "int", "fav_cols", self.favCols, "value-changed", self.favCols.set_value, self.favCols.get_value ) self.bindGconfValueToWidget( self.gconfApplications, "int", "fav_cols", self.favCols, "value-changed", self.favCols.set_value, self.favCols.get_value )
self.bindGconfValueToWidget( self.gconfPlaces, "int", "icon_size", self.placesIconSize, "value-changed", self.placesIconSize.set_value, self.placesIconSize.get_value )
self.bindGconfValueToWidget( self.gconfSystem, "int", "icon_size", self.systemIconSize, "value-changed", self.systemIconSize.set_value, self.systemIconSize.get_value )
self.bindGconfValueToWidget( self.gconf, "int", "border_width", self.borderWidth, "value-changed", self.borderWidth.set_value, self.borderWidth.get_value_as_int ) self.bindGconfValueToWidget( self.gconf, "int", "border_width", self.borderWidth, "value-changed", self.borderWidth.set_value, self.borderWidth.get_value_as_int )
self.bindGconfValueToWidget( self.gconf, "int", "opacity", self.opacity, "value-changed", self.opacity.set_value, self.opacity.get_value_as_int ) self.bindGconfValueToWidget( self.gconf, "int", "opacity", self.opacity, "value-changed", self.opacity.set_value, self.opacity.get_value_as_int )

34
usr/lib/linuxmint/mintMenu/plugins/applications.py
View File

@ -193,19 +193,7 @@ class SuggestionButton ( gtk.Button ):
def set_image(self, path): def set_image(self, path):
self.image.set_from_file(path) self.image.set_from_file(path)
def get_icon_size (self, iconSize):
if isinstance(iconSize, int):
if iconSize >= 4:
iconSize = gtk.ICON_SIZE_DIALOG
elif iconSize == 3:
iconSize = gtk.ICON_SIZE_DND
elif iconSize == 2:
iconSize = gtk.ICON_SIZE_BUTTON
elif iconSize == 1:
iconSize = gtk.ICON_SIZE_MENU
return iconSize
def set_text( self, text): def set_text( self, text):
self.label.set_markup(text) self.label.set_markup(text)
@ -331,21 +319,7 @@ class pluginclass( object ):
# self.menuFileMonitors.append( filemonitor.addMonitor(f, self.onMenuChanged, mymenu.directory.Filename ) ) # self.menuFileMonitors.append( filemonitor.addMonitor(f, self.onMenuChanged, mymenu.directory.Filename ) )
#for f in mymenu.directory.AppDirs: #for f in mymenu.directory.AppDirs:
# self.menuFileMonitors.append( filemonitor.addMonitor(f, self.onMenuChanged, mymenu.directory.Filename ) ) # self.menuFileMonitors.append( filemonitor.addMonitor(f, self.onMenuChanged, mymenu.directory.Filename ) )
sizeIcon = 0
if isinstance(self.iconSize, int):
if self.iconSize >= 4:
sizeIcon = gtk.ICON_SIZE_DIALOG
elif self.iconSize == 3:
sizeIcon = gtk.ICON_SIZE_DND
elif self.iconSize == 2:
sizeIcon = gtk.ICON_SIZE_BUTTON
elif self.iconSize == 1:
sizeIcon = gtk.ICON_SIZE_MENU
elif self.iconSize <= 0:
return ( 0, 0 )
#sizeIcon = gtk.icon_size_lookup( sizeIcon )
self.suggestions = [] self.suggestions = []
self.current_suggestion = None self.current_suggestion = None
self.get_panel() self.get_panel()
@ -496,8 +470,8 @@ class pluginclass( object ):
self.width = self.gconf.get( "int", "width", 480 ) self.width = self.gconf.get( "int", "width", 480 )
self.height = self.gconf.get( "int", "height", 410 ) self.height = self.gconf.get( "int", "height", 410 )
self.donotfilterapps = self.gconf.get( "bool", "do_not_filter", False ) self.donotfilterapps = self.gconf.get( "bool", "do_not_filter", False )
self.iconSize = self.gconf.get( "int", "icon_size", 2 ) self.iconSize = self.gconf.get( "int", "icon_size", 24 )
self.faviconsize = self.gconf.get( "int", "favicon_size", 3 ) self.faviconsize = self.gconf.get( "int", "favicon_size", 48 )
self.favCols = self.gconf.get( "int", "fav_cols", 2 ) self.favCols = self.gconf.get( "int", "fav_cols", 2 )
self.swapgeneric = self.gconf.get( "bool", "swap_generic_name", False ) self.swapgeneric = self.gconf.get( "bool", "swap_generic_name", False )
self.showcategoryicons = self.gconf.get( "bool", "show_category_icons", True ) self.showcategoryicons = self.gconf.get( "bool", "show_category_icons", True )

41
usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
View File

@ -55,8 +55,8 @@ class IconManager(gobject.GObject):
return None return None
try: try:
[ iconWidth, iconHeight ] = self.getIconSize( iconSize ) #[ iconWidth, iconHeight ] = self.getIconSize( iconSize )
if iconWidth <= 0 or iconHeight <= 0: if iconSize <= 0:
return None return None
if iconName in self.cache and iconSize in self.cache[iconName]: if iconName in self.cache and iconSize in self.cache[iconName]:
@ -71,7 +71,7 @@ class IconManager(gobject.GObject):
tmp = None tmp = None
for theme in self.themes: for theme in self.themes:
if theme.has_icon( realIconName ): if theme.has_icon( realIconName ):
tmp = theme.lookup_icon( realIconName, iconWidth, 0 ) tmp = theme.lookup_icon( realIconName, iconSize, 0 )
if tmp: if tmp:
break break
@ -81,17 +81,17 @@ class IconManager(gobject.GObject):
iconFileName = "" iconFileName = ""
if iconFileName and os.path.exists( iconFileName ): if iconFileName and os.path.exists( iconFileName ):
icon = gtk.gdk.pixbuf_new_from_file_at_size( iconFileName, iconWidth, iconHeight ) icon = gtk.gdk.pixbuf_new_from_file_at_size( iconFileName, iconSize, iconSize )
else: else:
icon = None icon = None
# if the actual icon size is to far from the desired size resize it # if the actual icon size is to far from the desired size resize it
if icon and (( icon.get_width() - iconWidth ) > 5 or ( icon.get_height() - iconHeight ) > 5): if icon and (( icon.get_width() - iconSize ) > 5 or ( icon.get_height() - iconSize ) > 5):
if icon.get_width() > icon.get_height(): if icon.get_width() > icon.get_height():
newIcon = icon.scale_simple( iconWidth, icon.get_height() * iconWidth / icon.get_width(), gtk.gdk.INTERP_BILINEAR ) newIcon = icon.scale_simple( iconSize, icon.get_height() * iconSize / icon.get_width(), gtk.gdk.INTERP_BILINEAR )
else: else:
newIcon = icon.scale_simple( icon.get_width() * iconHeight / icon.get_height(), iconWidth, gtk.gdk.INTERP_BILINEAR ) newIcon = icon.scale_simple( icon.get_width() * iconSize / icon.get_height(), iconSize, gtk.gdk.INTERP_BILINEAR )
del icon del icon
icon = newIcon icon = newIcon
@ -105,21 +105,6 @@ class IconManager(gobject.GObject):
print "Exception " + e.__class__.__name__ + ": " + e.message print "Exception " + e.__class__.__name__ + ": " + e.message
return None return None
def getIconSize( self, iconSize ):
if isinstance(iconSize, int):
if iconSize >= 4:
iconSize = gtk.ICON_SIZE_DIALOG
elif iconSize == 3:
iconSize = gtk.ICON_SIZE_DND
elif iconSize == 2:
iconSize = gtk.ICON_SIZE_BUTTON
elif iconSize == 1:
iconSize = gtk.ICON_SIZE_MENU
elif iconSize <= 0:
return ( 0, 0 )
return gtk.icon_size_lookup( iconSize )
def themeChanged( self, theme ): def themeChanged( self, theme ):
self.cache = { } self.cache = { }
self.emit( "changed" ) self.emit( "changed" )
@ -149,8 +134,8 @@ class easyButton( gtk.Button ):
self.buttonImage.set_from_pixbuf( icon ) self.buttonImage.set_from_pixbuf( icon )
del icon del icon
else: else:
[ iW, iH ] = iconManager.getIconSize( self.iconSize ) #[ iW, iH ] = iconManager.getIconSize( self.iconSize )
self.buttonImage.set_size_request( iW, iH ) self.buttonImage.set_size_request( self.iconSize, self.iconSize )
self.buttonImage.show() self.buttonImage.show()
HBox1.pack_start( self.buttonImage, False, False, 5 ) HBox1.pack_start( self.buttonImage, False, False, 5 )
@ -232,8 +217,8 @@ class easyButton( gtk.Button ):
self.buttonImage.set_size_request( -1, -1 ) self.buttonImage.set_size_request( -1, -1 )
del icon del icon
else: else:
[iW, iH ] = iconManager.getIconSize( self.iconSize ) #[iW, iH ] = iconManager.getIconSize( self.iconSize )
self.buttonImage.set_size_request( iW, iH ) self.buttonImage.set_size_request( self.iconSize, self.iconSize )
def setIconSize( self, size ): def setIconSize( self, size ):
self.iconSize = size self.iconSize = size
@ -244,8 +229,8 @@ class easyButton( gtk.Button ):
self.buttonImage.set_size_request( -1, -1 ) self.buttonImage.set_size_request( -1, -1 )
del icon del icon
elif self.iconSize: elif self.iconSize:
[ iW, iH ] = iconManager.getIconSize( self.iconSize ) #[ iW, iH ] = iconManager.getIconSize( self.iconSize )
self.buttonImage.set_size_request( iW, iH ) self.buttonImage.set_size_request( self.iconSize, self.iconSize )
class ApplicationLauncher( easyButton ): class ApplicationLauncher( easyButton ):

2
usr/lib/linuxmint/mintMenu/plugins/places.py
View File

@ -109,7 +109,7 @@ class pluginclass( object ):
self.scrolledWindow.set_policy( gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER ) self.scrolledWindow.set_policy( gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER )
self.content_holder.set_size_request( self.width, self.height ) self.content_holder.set_size_request( self.width, self.height )
self.execapp = self.gconf.get( "string", "execute_app", "nautilus" ) self.execapp = self.gconf.get( "string", "execute_app", "nautilus" )
self.iconsize = self.gconf.get( "int","icon_size", 2 ) self.iconsize = self.gconf.get( "int","icon_size", 22 )
# Check default items # Check default items

2
usr/lib/linuxmint/mintMenu/plugins/system_management.py
View File

@ -100,7 +100,7 @@ class pluginclass( object ):
self.height = -1 self.height = -1
self.scrolledWindow.set_policy( gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER ) self.scrolledWindow.set_policy( gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER )
self.content_holder.set_size_request( self.width, self.height ) self.content_holder.set_size_request( self.width, self.height )
self.iconsize = self.gconf.get( "int","icon_size", 2 ) self.iconsize = self.gconf.get( "int","icon_size", 22 )
# Check toggles # Check toggles