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

Revert "Added setting to disable internet searching"

Browse Source 
This reverts commit a8f751a4aa.
This commit is contained in:
JKAbrams 2016-08-09 13:27:49 +02:00
parent a8f751a4aa
commit 2bae237155
5 changed files with 65 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,7 +480,6 @@ class MenuWin( object ):
self.settings.connect( "changed::hot-key", self.reloadSettings ) self.settings.connect( "changed::hot-key", self.reloadSettings )
self.settings.connect( "changed::applet-icon", self.reloadSettings ) self.settings.connect( "changed::applet-icon", self.reloadSettings )
self.settings.connect( "changed::hide-applet-icon", self.reloadSettings ) self.settings.connect( "changed::hide-applet-icon", self.reloadSettings )
#self.settings.connect( "changed::enable-internet-search", self.reloadSettings )
self.settings.connect( "changed::applet-icon-size", self.reloadSettings ) self.settings.connect( "changed::applet-icon-size", self.reloadSettings )
self.settings.connect( "changed::hot-key", self.hotkeyChanged ) self.settings.connect( "changed::hot-key", self.hotkeyChanged )
self.loadSettings() self.loadSettings()
@ -602,7 +601,6 @@ class MenuWin( object ):
def loadSettings( self, *args, **kargs ): def loadSettings( self, *args, **kargs ):
self.hideIcon = self.settings.get_boolean( "hide-applet-icon" ) self.hideIcon = self.settings.get_boolean( "hide-applet-icon" )
#self.internetSearchEnabled = self.settings.get_boolean( "enable-internet-search" )
self.buttonText = self.settings.get_string( "applet-text" ) self.buttonText = self.settings.get_string( "applet-text" )
self.theme_name = self.settings.get_string( "theme-name" ) self.theme_name = self.settings.get_string( "theme-name" )
self.hotkeyText = self.settings.get_string( "hot-key" ) self.hotkeyText = self.settings.get_string( "hot-key" )

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

@ -913,7 +913,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">9</property> <property name="n_rows">8</property>
<property name="n_columns">2</property> <property name="n_columns">2</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
@ -1120,26 +1120,7 @@
<property name="x_padding">5</property> <property name="x_padding">5</property>
</packing> </packing>
</child> </child>
<child> </object>
<object class="GtkCheckButton" id="enableInternetSearch">
<property name="label" translatable="yes">Enable internet search</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="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">8</property>
<property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">5</property>
</packing>
</child>
</object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="applicationsLabel"> <object class="GtkLabel" id="applicationsLabel">
@ -2089,4 +2070,3 @@
</child> </child>
</object> </object>
</interface> </interface>

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

@ -44,7 +44,6 @@ class mintMenuConfig( object ):
self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane")) self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
self.builder.get_object("showButtonIcon").set_label(_("Show button icon")) self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
self.builder.get_object("enableInternetSearch").set_label(_("Enable internet search"))
self.builder.get_object("useCustomColors").set_label(_("Use custom colors")) self.builder.get_object("useCustomColors").set_label(_("Use custom colors"))
self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin")) self.builder.get_object("showRecentPlugin").set_label(_("Show recent documents plugin"))
self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin")) self.builder.get_object("showApplicationsPlugin").set_label(_("Show applications plugin"))
@ -140,7 +139,6 @@ class mintMenuConfig( object ):
self.borderColorLabel = self.builder.get_object( "borderColorLabel" ) self.borderColorLabel = self.builder.get_object( "borderColorLabel" )
self.headingColorLabel = self.builder.get_object( "headingColorLabel" ) self.headingColorLabel = self.builder.get_object( "headingColorLabel" )
self.showButtonIcon = self.builder.get_object( "showButtonIcon" ) self.showButtonIcon = self.builder.get_object( "showButtonIcon" )
self.enableInternetSearch = self.builder.get_object( "enableInternetSearch" )
self.buttonText = self.builder.get_object( "buttonText" ) self.buttonText = self.builder.get_object( "buttonText" )
self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:") ) self.hotkeyWidget = keybinding.KeybindingWidget(_("Keyboard shortcut:") )
table = self.builder.get_object( "main_table" ) table = self.builder.get_object( "main_table" )
@ -210,7 +208,7 @@ class mintMenuConfig( object ):
self.bindGSettingsValueToWidget( self.settingsApplications, "int", "favicon-size", self.favIconSize, "value-changed", self.favIconSize.set_value, self.favIconSize.get_value ) self.bindGSettingsValueToWidget( self.settingsApplications, "int", "favicon-size", self.favIconSize, "value-changed", self.favIconSize.set_value, self.favIconSize.get_value )
self.bindGSettingsValueToWidget( self.settingsApplications, "int", "fav-cols", self.favCols, "value-changed", self.favCols.set_value, self.favCols.get_value ) self.bindGSettingsValueToWidget( self.settingsApplications, "int", "fav-cols", self.favCols, "value-changed", self.favCols.set_value, self.favCols.get_value )
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "remember-filter", self.rememberFilter, "toggled", self.rememberFilter.set_active, self.rememberFilter.get_active) self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "remember-filter", self.rememberFilter, "toggled", self.rememberFilter.set_active, self.rememberFilter.get_active)
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "enable-internet-search", self.enableInternetSearch, "toggled", self.enableInternetSearch.set_active, self.enableInternetSearch.get_active)
self.bindGSettingsValueToWidget( self.settingsPlaces, "int", "icon-size", self.placesIconSize, "value-changed", self.placesIconSize.set_value, self.placesIconSize.get_value ) self.bindGSettingsValueToWidget( self.settingsPlaces, "int", "icon-size", self.placesIconSize, "value-changed", self.placesIconSize.set_value, self.placesIconSize.get_value )
self.bindGSettingsValueToWidget( self.settingsSystem, "int", "icon-size", self.systemIconSize, "value-changed", self.systemIconSize.set_value, self.systemIconSize.get_value ) self.bindGSettingsValueToWidget( self.settingsSystem, "int", "icon-size", self.systemIconSize, "value-changed", self.systemIconSize.set_value, self.systemIconSize.get_value )

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

@ -242,11 +242,9 @@ class pluginclass( object ):
self.settings.notifyAdd( "use-apt", self.switchAPTUsage) self.settings.notifyAdd( "use-apt", self.switchAPTUsage)
self.settings.notifyAdd( "fav-cols", self.changeFavCols ) self.settings.notifyAdd( "fav-cols", self.changeFavCols )
self.settings.notifyAdd( "remember-filter", self.changeRememberFilter) self.settings.notifyAdd( "remember-filter", self.changeRememberFilter)
self.settings.notifyAdd( "enable-internet-search", self.changeEnableInternetSearch)
self.settings.bindGSettingsEntryToVar( "int", "category-hover-delay", self, "categoryhoverdelay" ) self.settings.bindGSettingsEntryToVar( "int", "category-hover-delay", self, "categoryhoverdelay" )
self.settings.bindGSettingsEntryToVar( "bool", "do-not-filter", self, "donotfilterapps" ) self.settings.bindGSettingsEntryToVar( "bool", "do-not-filter", self, "donotfilterapps" )
self.settings.bindGSettingsEntryToVar( "bool", "enable-internet-search", self, "enableInternetSearch" )
self.settings.bindGSettingsEntryToVar( "string", "search-command", self, "searchtool" ) self.settings.bindGSettingsEntryToVar( "string", "search-command", self, "searchtool" )
self.settings.bindGSettingsEntryToVar( "int", "default-tab", self, "defaultTab" ) self.settings.bindGSettingsEntryToVar( "int", "default-tab", self, "defaultTab" )
except Exception, detail: except Exception, detail:
@ -389,9 +387,6 @@ class pluginclass( object ):
def changeRememberFilter( self, settings, key, args): def changeRememberFilter( self, settings, key, args):
self.rememberFilter = settings.get_boolean(key) self.rememberFilter = settings.get_boolean(key)
def changeEnableInternetSearch( self, settings, key, args):
self.enableInternetSearch = settings.get_boolean(key)
def changeShowApplicationComments( self, settings, key, args ): def changeShowApplicationComments( self, settings, key, args ):
self.showapplicationcomments = settings.get_boolean(key) self.showapplicationcomments = settings.get_boolean(key)
for child in self.applicationsBox: for child in self.applicationsBox:
@ -456,7 +451,6 @@ class pluginclass( object ):
self.showapplicationcomments = self.settings.get( "bool", "show-application-comments") self.showapplicationcomments = self.settings.get( "bool", "show-application-comments")
self.useAPT = self.settings.get( "bool", "use-apt") self.useAPT = self.settings.get( "bool", "use-apt")
self.rememberFilter = self.settings.get( "bool", "remember-filter") self.rememberFilter = self.settings.get( "bool", "remember-filter")
self.enableInternetSearch = self.settings.get( "bool", "enable-internet-search")
self.lastActiveTab = self.settings.get( "int", "last-active-tab") self.lastActiveTab = self.settings.get( "int", "last-active-tab")
self.defaultTab = self.settings.get( "int", "default-tab") self.defaultTab = self.settings.get( "int", "default-tab")
@ -583,29 +577,28 @@ class pluginclass( object ):
text = "<b>%s</b>" % text text = "<b>%s</b>" % text
if self.enableInternetSearch: suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") suggestionButton.connect("clicked", self.search_google)
suggestionButton.connect("clicked", self.search_google) suggestionButton.set_text(_("Search Google for %s") % text)
suggestionButton.set_text(_("Search Google for %s") % text) suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico") self.applicationsBox.add(suggestionButton)
self.applicationsBox.add(suggestionButton) self.suggestions.append(suggestionButton)
self.suggestions.append(suggestionButton)
suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
suggestionButton.connect("clicked", self.search_wikipedia) suggestionButton.connect("clicked", self.search_wikipedia)
suggestionButton.set_text(_("Search Wikipedia for %s") % text) suggestionButton.set_text(_("Search Wikipedia for %s") % text)
suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico") suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
self.applicationsBox.add(suggestionButton) self.applicationsBox.add(suggestionButton)
self.suggestions.append(suggestionButton) self.suggestions.append(suggestionButton)
separator = Gtk.EventBox() separator = Gtk.EventBox()
separator.add(Gtk.HSeparator()) separator.add(Gtk.HSeparator())
separator.set_visible_window(False) separator.set_visible_window(False)
separator.set_size_request(-1, 20) separator.set_size_request(-1, 20)
separator.type = "separator" separator.type = "separator"
separator.show_all() separator.show_all()
self.applicationsBox.add(separator) self.applicationsBox.add(separator)
self.suggestions.append(separator) self.suggestions.append(separator)
suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
suggestionButton.connect("clicked", self.search_dictionary) suggestionButton.connect("clicked", self.search_dictionary)
@ -1014,24 +1007,22 @@ class pluginclass( object ):
def searchPopup( self, widget=None, event=None ): def searchPopup( self, widget=None, event=None ):
menu = Gtk.Menu() menu = Gtk.Menu()
if self.enableInternetSearch: menuItem = Gtk.ImageMenuItem(_("Search Google"))
img = Gtk.Image()
img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
menuItem.set_image(img)
menuItem.connect("activate", self.search_google)
menu.append(menuItem)
menuItem = Gtk.ImageMenuItem(_("Search Google")) menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
img = Gtk.Image() img = Gtk.Image()
img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico') img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
menuItem.set_image(img) menuItem.set_image(img)
menuItem.connect("activate", self.search_google) menuItem.connect("activate", self.search_wikipedia)
menu.append(menuItem) menu.append(menuItem)
menuItem = Gtk.ImageMenuItem(_("Search Wikipedia")) menuItem = Gtk.SeparatorMenuItem()
img = Gtk.Image() menu.append(menuItem)
img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
menuItem.set_image(img)
menuItem.connect("activate", self.search_wikipedia)
menu.append(menuItem)
menuItem = Gtk.SeparatorMenuItem()
menu.append(menuItem)
menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary")) menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary"))
img = Gtk.Image() img = Gtk.Image()
@ -1105,18 +1096,16 @@ class pluginclass( object ):
return (x, y, False) return (x, y, False)
def search_google(self, widget): def search_google(self, widget):
if self.enableInternetSearch: text = self.searchEntry.get_text()
text = self.searchEntry.get_text() text = text.replace(" ", "+")
text = text.replace(" ", "+") os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &")
os.system("xdg-open \"http://www.google.com/cse?cx=002683415331144861350%3Atsq8didf9x0&ie=utf-8&sa=Search&q=" + text + "\" &") self.mintMenuWin.hide()
self.mintMenuWin.hide()
def search_wikipedia(self, widget): def search_wikipedia(self, widget):
if self.enableInternetSearch: text = self.searchEntry.get_text()
text = self.searchEntry.get_text() text = text.replace(" ", "+")
text = text.replace(" ", "+") os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &")
os.system("xdg-open \"http://en.wikipedia.org/wiki/Special:Search?search=" + text + "\" &") self.mintMenuWin.hide()
self.mintMenuWin.hide()
def search_dictionary(self, widget): def search_dictionary(self, widget):
text = self.searchEntry.get_text() text = self.searchEntry.get_text()
@ -1124,39 +1113,34 @@ class pluginclass( object ):
self.mintMenuWin.hide() self.mintMenuWin.hide()
def search_mint_tutorials(self, widget): def search_mint_tutorials(self, widget):
if self.enableInternetSearch: text = self.searchEntry.get_text()
text = self.searchEntry.get_text() text = text.replace(" ", "%20")
text = text.replace(" ", "%20") os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &")
os.system("xdg-open \"http://community.linuxmint.com/index.php/tutorial/search/0/" + text + "\" &") self.mintMenuWin.hide()
self.mintMenuWin.hide()
def search_mint_ideas(self, widget): def search_mint_ideas(self, widget):
if self.enableInternetSearch: text = self.searchEntry.get_text()
text = self.searchEntry.get_text() text = text.replace(" ", "%20")
text = text.replace(" ", "%20") os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &")
os.system("xdg-open \"http://community.linuxmint.com/index.php/idea/search/0/" + text + "\" &") self.mintMenuWin.hide()
self.mintMenuWin.hide()
def search_mint_users(self, widget): def search_mint_users(self, widget):
if self.enableInternetSearch: text = self.searchEntry.get_text()
text = self.searchEntry.get_text() text = text.replace(" ", "%20")
text = text.replace(" ", "%20") os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &")
os.system("xdg-open \"http://community.linuxmint.com/index.php/user/search/0/" + text + "\" &") self.mintMenuWin.hide()
self.mintMenuWin.hide()
def search_mint_hardware(self, widget): def search_mint_hardware(self, widget):
if self.enableInternetSearch: text = self.searchEntry.get_text()
text = self.searchEntry.get_text() text = text.replace(" ", "%20")
text = text.replace(" ", "%20") os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &")
os.system("xdg-open \"http://community.linuxmint.com/index.php/hardware/search/0/" + text + "\" &") self.mintMenuWin.hide()
self.mintMenuWin.hide()
def search_mint_software(self, widget): def search_mint_software(self, widget):
if self.enableInternetSearch: text = self.searchEntry.get_text()
text = self.searchEntry.get_text() text = text.replace(" ", "%20")
text = text.replace(" ", "%20") os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &")
os.system("xdg-open \"http://community.linuxmint.com/index.php/software/search/0/" + text + "\" &") self.mintMenuWin.hide()
self.mintMenuWin.hide()
def add_to_desktop(self, widget, desktopEntry): def add_to_desktop(self, widget, desktopEntry):
os.system("xdg-desktop-icon install --novendor %s" % desktopEntry.desktopFile) os.system("xdg-desktop-icon install --novendor %s" % desktopEntry.desktopFile)

6
usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
View File

@ -313,12 +313,6 @@
<summary></summary> <summary></summary>
<description></description> <description></description>
</key> </key>
<key type="b" name="enable-internet-search">
<default>false</default>
<summary></summary>
<description></description>
</key>
</schema> </schema>
<schema id="com.linuxmint.mintmenu.plugins.system_management" path="/com/linuxmint/mintmenu/plugins/system_management/"> <schema id="com.linuxmint.mintmenu.plugins.system_management" path="/com/linuxmint/mintmenu/plugins/system_management/">