Skip to content

Commit

Permalink
MATE Menu is no longer a package manager.
Browse files Browse the repository at this point in the history
  • Loading branch information
flexiondotorg committed Mar 2, 2015
1 parent 2775ef9 commit 24a64f6
Show file tree
Hide file tree
Showing 11 changed files with 6 additions and 332 deletions.
19 changes: 0 additions & 19 deletions data/mate-menu-config.glade
Original file line number Diff line number Diff line change
Expand Up @@ -1127,25 +1127,6 @@
<property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="use_apt">
<property name="label" translatable="yes">Search for packages to install</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">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="remember_filter">
<property name="label" translatable="yes">Remember the last category or search</property>
Expand Down
4 changes: 2 additions & 2 deletions data/mate-menu.1
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ mate-menu \- Advanced menu for the MATE desktop environment's panel
.SH SYNOPSIS
.B mate-menu \fR[option]
.SH DESCRIPTION
An advanced menu for MATE. Supports filtering, favorites,
easy\-uninstallation, autosession, and many other features.
An advanced menu for MATE. Supports filtering, favorites, autosession,
and many other features.

.SH OPTIONS
.TP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@
<description></description>
</key>

<key type="b" name="use-apt">
<default>true</default>
<summary></summary>
<description></description>
</key>

<key type="i" name="last-active-tab">
<default>0</default>
<summary></summary>
Expand Down
35 changes: 0 additions & 35 deletions lib/get_apt_cache.py

This file was deleted.

5 changes: 1 addition & 4 deletions lib/mate-menu-config.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ def __init__( self ):
self.builder.get_object("showCategoryIcons").set_label(_("Show category icons"))
self.builder.get_object("hover").set_label(_("Hover"))
self.builder.get_object("remember_filter").set_label(_("Remember the last category or search"))
self.builder.get_object("use_apt").set_label(_("Search for packages to install"))
self.builder.get_object("swapGeneric").set_label(_("Swap name and generic name"))

self.builder.get_object("label11").set_text(_("Border width:"))
Expand Down Expand Up @@ -125,8 +124,7 @@ def __init__( self ):
self.folderChooserDialogTitle = (_("Select a folder"))

self.startWithFavorites = self.builder.get_object( "startWithFavorites" )
self.showAppComments = self.builder.get_object( "showAppComments" )
self.useAPT = self.builder.get_object( "use_apt" )
self.showAppComments = self.builder.get_object( "showAppComments" )
self.showCategoryIcons = self.builder.get_object( "showCategoryIcons" )
self.showRecentPlugin = self.builder.get_object( "showRecentPlugin" )
self.showApplicationsPlugin = self.builder.get_object( "showApplicationsPlugin" )
Expand Down Expand Up @@ -204,7 +202,6 @@ def __init__( self ):

self.bindGSettingsValueToWidget( self.settings, "bool", "start-with-favorites", self.startWithFavorites, "toggled", self.startWithFavorites.set_active, self.startWithFavorites.get_active )
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "show-application-comments", self.showAppComments, "toggled", self.showAppComments.set_active, self.showAppComments.get_active )
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "use-apt", self.useAPT, "toggled", self.useAPT.set_active, self.useAPT.get_active )
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "show-category-icons", self.showCategoryIcons, "toggled", self.showCategoryIcons.set_active, self.showCategoryIcons.get_active )
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "categories-mouse-over", self.hover, "toggled", self.hover.set_active, self.hover.get_active )
self.bindGSettingsValueToWidget( self.settingsApplications, "bool", "swap-generic-name", self.swapGeneric, "toggled", self.swapGeneric.set_active, self.swapGeneric.get_active )
Expand Down
11 changes: 2 additions & 9 deletions lib/mate-menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

import apt
import ctypes
import gc
import gi
Expand Down Expand Up @@ -706,14 +705,8 @@ def reloadSettings( self, *args ):
self.updateButton()

def getVersion(self):
try:
cache = apt.Cache()
pkg = cache['mate-menu']
if pkg.installed is not None:
version = str(pkg.installed.version)
except:
version = ''

#FIXME - Get this from a sane location
version = '5.6.2'
return version

def showAboutDialog( self, action, userdata = None ):
Expand Down
126 changes: 0 additions & 126 deletions lib/mate-remove-application.py

This file was deleted.

3 changes: 0 additions & 3 deletions mate_menu/easybuttons.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,6 @@ def execute( self, *args ):
else:
Execute(self.appExec, self.appPath)

def uninstall (self, *args ):
Execute("/usr/lib/mate-menu/mate-remove-application.py " + self.desktopFile)

# IconTheme changed, setup new icons for button and drag 'n drop
def iconChanged( self ):
easyButton.iconChanged( self )
Expand Down
Loading

0 comments on commit 24a64f6

Please sign in to comment.