diff --git a/usr/lib/linuxmint/mintMenu/mintRemove.glade b/usr/lib/linuxmint/mintMenu/mintRemove.glade index ec947e9..6335aed 100644 --- a/usr/lib/linuxmint/mintMenu/mintRemove.glade +++ b/usr/lib/linuxmint/mintMenu/mintRemove.glade @@ -1,11 +1,15 @@ - - - + + + 6 mintMenu - GTK_WIN_POS_CENTER + False + True + center + True + True True @@ -20,19 +24,20 @@ True 0 0 - /usr/lib/linuxmint/mintSystem/icon.png + gtk-dialog-warning + 6 False False 9 + 0 True 2 - 1 19 11 @@ -40,7 +45,7 @@ True 0 Name - GTK_JUSTIFY_CENTER + center GTK_FILL @@ -72,6 +77,7 @@ False False 2 + 0 @@ -79,15 +85,17 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + automatic + automatic + etched-in 120 True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True + False + False @@ -99,29 +107,35 @@ True 10 - GTK_BUTTONBOX_SPREAD + spread + gtk-cancel True True - gtk-cancel + False True - 0 + + False + False + 0 + + gtk-remove True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-remove True - 0 + False + False 1 diff --git a/usr/lib/linuxmint/mintMenu/mintRemove.py b/usr/lib/linuxmint/mintMenu/mintRemove.py index 6d1d8df..56407cd 100755 --- a/usr/lib/linuxmint/mintMenu/mintRemove.py +++ b/usr/lib/linuxmint/mintMenu/mintRemove.py @@ -68,7 +68,8 @@ class mintRemoveWindow: #Set the Glade file self.gladefile = "/usr/lib/linuxmint/mintMenu/mintRemove.glade" wTree = gtk.glade.XML(self.gladefile,"main_window") - wTree.get_widget("main_window").set_icon_from_file("/usr/lib/linuxmint/mintSystem/icon.png") + wTree.get_widget("main_window").set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") + wTree.get_widget("main_window").set_title("") wTree.get_widget("main_window").connect("destroy", self.giveUp) # Get the window socket (needed for synaptic later on) @@ -78,8 +79,7 @@ class mintRemoveWindow: socket.show() window_id = repr(socket.get_id()) - wTree.get_widget("txt_name").set_text("" + _("Remove application") + "") - wTree.get_widget("txt_name").set_use_markup(True) + package = commands.getoutput("dpkg -S " + self.desktopFile) package = package[:package.find(":")] @@ -109,9 +109,11 @@ class mintRemoveWindow: warnDlg.destroy() gtk.main_quit() sys.exit(0) + + wTree.get_widget("txt_name").set_text("" + _("Remove %s?") % package + "") + wTree.get_widget("txt_name").set_use_markup(True) - wTree.get_widget("txt_guidance").set_text("" + _("Remove package %s and all its dependencies?") % package + "") - wTree.get_widget("txt_guidance").set_use_markup(True) + wTree.get_widget("txt_guidance").set_text(_("The following packages will be removed:")) treeview = wTree.get_widget("tree") column1 = gtk.TreeViewColumn(_("Packages to be removed"))