← Back to branch summary

~seb128/software-center/dont_use_gwibber

« back to all changes in this revision

Viewing changes to softwarecenter/ui/gtk3/app.py

  • Committer: Tarmac
  • Author(s): Rodney Dawes
  • Date: 2013-04-05 13:52:58 UTC
  • mfrom: (3300.1.2 fix-typeerror)
  • Revision ID: tarmac-20130405135258-cn6rqf6rnjmy8oi4
Don't use the main copy/cut menu items for search entry selections.
Remove the main cut menu item as it was not used for anything else.

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/ui/gtk3/app.py
668
668
        if (event.keyval == Gdk.keyval_from_name("x") and
669
669
                event.state == Gdk.ModifierType.CONTROL_MASK):
670
670
            self.menuitem_edit.activate()
671
 
            if self.menuitem_cut.get_sensitive():
672
 
                self.menuitem_cut.activate()
673
671
 
674
672
        if (event.keyval == Gdk.keyval_from_name("c") and
675
673
                event.state == Gdk.ModifierType.CONTROL_MASK):
938
936
        """
939
937
        edit_menu_items = [self.menuitem_undo,
940
938
                           self.menuitem_redo,
941
 
                           self.menuitem_cut,
942
939
                           self.menuitem_copy,
943
940
                           self.menuitem_copy_web_link,
944
941
                           self.menuitem_paste,
964
961
                    self.menuitem_undo.set_sensitive(True)
965
962
                if len(self.active_pane.searchentry._redo_stack) > 0:
966
963
                    self.menuitem_redo.set_sensitive(True)
967
 
                bounds = self.active_pane.searchentry.get_selection_bounds()
968
 
                if bounds:
969
 
                    self.menuitem_cut.set_sensitive(True)
970
 
                    self.menuitem_copy.set_sensitive(True)
 
964
 
971
965
                self.menuitem_paste.set_sensitive(True)
972
966
                if self.active_pane.searchentry.get_text():
973
967
                    self.menuitem_delete.set_sensitive(True)
998
992
    def on_menuitem_redo_activate(self, menuitem):
999
993
        self.active_pane.searchentry.redo()
1000
994
 
1001
 
    def on_menuitem_cut_activate(self, menuitem):
1002
 
        self.active_pane.searchentry.cut_clipboard()
1003
 
 
1004
995
    def on_menuitem_copy_activate(self, menuitem):
1005
996
        if (self.active_pane and
1006
997
                self.active_pane.is_app_details_view_showing()):
1007
998
            self.active_pane.app_details_view.desc.copy_clipboard()
1008
 
        elif self.active_pane:
1009
 
            self.active_pane.searchentry.copy_clipboard()
1010
999
 
1011
1000
    def on_menuitem_paste_activate(self, menuitem):
1012
1001
        self.active_pane.searchentry.paste_clipboard()