Merge lp:~ian-clatworthy/qbzr/qrun-categories into lp:qbzr

[Ian Clatworthy]

[Ian Clatworthy (ian-clatworthy)]

This branch adds a Category combo to qrun, making it much easier to find commands.

[Alexander Belchenko (bialix)]

Recently I've fixed regression in signals handling introduced by you in command patch.
Now my change and your new code are conflicted. Please, resolve this conflict.

review: Needs Fixing

[lp:~ian-clatworthy/qbzr/qrun-categories]

1158. By Ian Clatworthy on 2009-12-07

Merge trunk

[Alexander Belchenko (bialix)]

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2009-12-07 23:23:40 +0000
+++ NEWS.txt	2009-12-07 23:41:10 +0000
@@ -29,6 +29,11 @@
      Gary van der Merwe)
    * Show all revisions that touch the file in the log list. (Bug #488824,
      Gary van der Merwe)
+ * qrun:
+   * A category field has been added to make finding commands easier.
+     (#486968, Ian Clatworthy)
+   * The command name, command parameters and command category can be
+     passed on the command line. (Ian Clatworthy)
  * qsubprocess:
    * Catch possible errors from bencode decoder is we got malformed string
      from child process. Show the error nicely. 

=== modified file 'lib/commands.py'
--- lib/commands.py	2009-12-06 02:48:19 +0000
+++ lib/commands.py	2009-12-07 23:41:10 +0000
@@ -1059,17 +1059,21 @@
             short_name='d',
             type=unicode,
             ),
+        Option('category',
+            help='Initial category selection.',
+            type=unicode,
+            ),
         ]
     aliases = ['qcmd']
 
     def _qbzr_run(self, command=None, parameters_list=None, ui_mode=False,
-        directory=None):
+        directory=None, category=None):
         from bzrlib.plugins.qbzr.lib.run import QBzrRunDialog
         if parameters_list:
             parameters = " ".join(parameters_list)
         else:
             parameters = None
         window = QBzrRunDialog(command=command, parameters=parameters,
-            workdir=directory, ui_mode=ui_mode)
+            workdir=directory, category=category, ui_mode=ui_mode)
         window.show()
         self._application.exec_()

=== modified file 'lib/run.py'
--- lib/run.py	2009-12-06 11:27:14 +0000
+++ lib/run.py	2009-12-07 23:41:10 +0000
@@ -38,12 +38,13 @@
 class QBzrRunDialog(SubProcessDialog):
 
     def __init__(self, command=None, parameters=None, workdir=None,
-        ui_mode=False, parent=None):
+        category=None, ui_mode=False, parent=None):
         """Build dialog.
 
         @param command: initial command selection.
         @param parameters: initial options and arguments (string) for command.
         @param workdir: working directory to run command.
+        @param category: initial category selection.
         @param ui_mode: wait after the operation is complete.
         @param parent:  parent window.
         """
@@ -61,6 +62,8 @@
         self.ui.cmd_layout.setColumnStretch(2, 1)
         # fill cmd_combobox with available commands
         self.collect_command_names()
+        categories = sorted(self.all_cmds.keys())
+        self.ui.cat_combobox.insertItems(0, categories)
         self.set_cmd_combobox(cmd_name=command)
         # add the parameters, if any
         if parameters:
@@ -76,13 +79,16 @@
         # setup signals
         QtCore.QObject.connect(self.ui.hidden_checkbox,
             QtCore.SIGNAL("stateChanged(int)"),
-            lambda x: self.set_cmd_combobox(all=x))
+            self.set_show_hidden)
         QtCore.QObject.connect(self.ui.cmd_combobox,
             QtCore.SIGNAL("currentIndexChanged(const QString&)"),
             self.set_cmd_help)
         QtCore.QObject.connect(self.ui.cmd_combobox,
             QtCore.SIGNAL("editTextChanged(const QString&)"),
             self.set_cmd_help)
+        QtCore.QObject.connect(self.ui.cat_combobox,
+            QtCore.SIGNAL("currentIndexChanged(const QString&)"),
+            self.set_category)
         hookup_directory_picker(self, self.ui.browse_button, 
             self.ui.wd_edit, gettext("Select working directory"))
         QtCore.QObject.connect(self.ui.directory_button,
@@ -91,6 +97,13 @@
         QtCore.QObject.connect(self.ui.filenames_button,
             QtCore.SIGNAL("clicked()"),
             self.insert_filenames)
+        # Init the category if set.
+        # (This needs to be done after the signals are hooked up)
+        if category:
+            cb = self.ui.cat_combobox
+            index = cb.findText(category)
+            if index >= 0:
+                cb.setCurrentIndex(index)
         # ready to go
         if command:
             self.ui.opt_arg_edit.setFocus()
@@ -108,24 +121,61 @@
         names = list(_mod_commands.all_command_names())
         self.cmds_dict = dict((n, _mod_commands.get_cmd_object(n)) 
                               for n in names)
-        self.all_cmds = sorted(names)
-        self.public_cmds = sorted([n 
-                                   for n,o in self.cmds_dict.iteritems()
-                                   if not o.hidden])
-
-    def set_cmd_combobox(self, cmd_name=None, all=False):
+        # Find the commands for each category, public or otherwise
+        builtins = _mod_commands.builtin_command_names()
+        self.all_cmds = {'All': []}
+        self.public_cmds = {'All': []}
+        for name, cmd in self.cmds_dict.iteritems():
+            # If a command is builtin, we always put it into the Core
+            # category, even if overridden in a plugin
+            if name in builtins:
+                category = 'Core'
+            else:
+                category = cmd.plugin_name()
+            self.all_cmds['All'].append(name)
+            self.all_cmds.setdefault(category, []).append(name)
+            if not cmd.hidden:
+                self.public_cmds['All'].append(name)
+                self.public_cmds.setdefault(category, []).append(name)
+        # Sort them
+        for category in self.all_cmds:
+            self.all_cmds[category].sort()
+            try:
+                self.public_cmds[category].sort()
+            except KeyError:
+                # no public commands - that's ok
+                pass
+
+    def set_category(self, category):
+        cmd_name = self._get_cmd_name()
+        all = self.ui.hidden_checkbox.isChecked()
+        category = unicode(category)
+        self.set_cmd_combobox(cmd_name=cmd_name, all=all, category=category)
+
+    def set_show_hidden(self, show):
+        cmd_name = self._get_cmd_name()
+        all = bool(show)
+        category = unicode(self.ui.cat_combobox.currentText())
+        self.set_cmd_combobox(cmd_name=cmd_name, all=all, category=category)
+
+    def set_cmd_combobox(self, cmd_name=None, all=False, category=None):
         """Fill command combobox with bzr commands names.
 
         @param cmd_name: if not None, the command to initially select
             if it exists in the list.
         @param all: show all commands including hidden ones.
+        @param category: show commands just for this category.
+            If None, commands in all categories are shown.
         """
         cb = self.ui.cmd_combobox
         cb.clear()
         if all:
-            cb.addItems(self.all_cmds)
+            lookup = self.all_cmds
         else:
-            cb.addItems(self.public_cmds)
+            lookup = self.public_cmds
+        if category is None:
+            category = 'All'
+        cb.addItems(lookup.get(category, []))
         if cmd_name is None:
             index = -1
         else:

=== modified file 'lib/ui_run.py'
--- lib/ui_run.py	2009-08-23 17:37:51 +0000
+++ lib/ui_run.py	2009-12-07 23:41:10 +0000
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'ui/run.ui'
 #
-# Created: Sun Aug 23 20:03:41 2009
-#      by: PyQt4 UI code generator 4.4.3
+# Created: Mon Dec  7 01:25:47 2009
+#      by: PyQt4 UI code generator 4.6
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -49,17 +49,24 @@
         self.frame_layout.addLayout(self.wd_layout)
         self.cmd_layout = QtGui.QGridLayout()
         self.cmd_layout.setObjectName("cmd_layout")
+        self.cat_label = QtGui.QLabel(self.frame)
+        self.cat_label.setObjectName("cat_label")
+        self.cmd_layout.addWidget(self.cat_label, 0, 0, 1, 1)
+        self.cat_combobox = QtGui.QComboBox(self.frame)
+        self.cat_combobox.setMinimumSize(QtCore.QSize(170, 0))
+        self.cat_combobox.setObjectName("cat_combobox")
+        self.cmd_layout.addWidget(self.cat_combobox, 0, 1, 1, 1)
         self.cmd_label = QtGui.QLabel(self.frame)
         self.cmd_label.setObjectName("cmd_label")
-        self.cmd_layout.addWidget(self.cmd_label, 0, 0, 1, 1)
+        self.cmd_layout.addWidget(self.cmd_label, 1, 0, 1, 1)
         self.cmd_combobox = QtGui.QComboBox(self.frame)
         self.cmd_combobox.setMinimumSize(QtCore.QSize(170, 0))
         self.cmd_combobox.setEditable(True)
         self.cmd_combobox.setObjectName("cmd_combobox")
-        self.cmd_layout.addWidget(self.cmd_combobox, 0, 1, 1, 1)
+        self.cmd_layout.addWidget(self.cmd_combobox, 1, 1, 1, 1)
         self.hidden_checkbox = QtGui.QCheckBox(self.frame)
         self.hidden_checkbox.setObjectName("hidden_checkbox")
-        self.cmd_layout.addWidget(self.hidden_checkbox, 0, 2, 1, 1)
+        self.cmd_layout.addWidget(self.hidden_checkbox, 1, 2, 1, 1)
         self.frame_layout.addLayout(self.cmd_layout)
         self.opt_arg_label = QtGui.QLabel(self.frame)
         self.opt_arg_label.setLineWidth(0)
@@ -83,6 +90,7 @@
         self.help_browser.setObjectName("help_browser")
         self.main_v_layout.addWidget(self.splitter)
         self.wd_label.setBuddy(self.wd_edit)
+        self.cat_label.setBuddy(self.cmd_combobox)
         self.cmd_label.setBuddy(self.cmd_combobox)
         self.opt_arg_label.setBuddy(self.opt_arg_edit)
 
@@ -101,6 +109,7 @@
         RunDialog.setWindowTitle(gettext("Run bzr command"))
         self.wd_label.setText(gettext("&Working directory:"))
         self.browse_button.setText(gettext("&Browse..."))
+        self.cat_label.setText(gettext("C&ategory:"))
         self.cmd_label.setText(gettext("&Command:"))
         self.hidden_checkbox.setText(gettext("&Show hidden commands"))
         self.opt_arg_label.setText(gettext("&Options and arguments for command:"))

=== modified file 'ui/run.ui'
--- ui/run.ui	2009-08-23 17:37:51 +0000
+++ ui/run.ui	2009-12-07 23:41:10 +0000
@@ -71,6 +71,26 @@
        <item>
         <layout class="QGridLayout" name="cmd_layout" >
          <item row="0" column="0" >
+          <widget class="QLabel" name="cat_label" >
+           <property name="text" >
+            <string>C&amp;ategory:</string>
+           </property>
+           <property name="buddy" >
+            <cstring>cmd_combobox</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1" >
+          <widget class="QComboBox" name="cat_combobox" >
+           <property name="minimumSize" >
+            <size>
+             <width>170</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" >
           <widget class="QLabel" name="cmd_label" >
            <property name="text" >
             <string>&amp;Command:</string>
@@ -80,7 +100,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1" >
+         <item row="1" column="1" >
           <widget class="QComboBox" name="cmd_combobox" >
            <property name="minimumSize" >
             <size>
@@ -93,7 +113,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="2" >
+         <item row="1" column="2" >
           <widget class="QCheckBox" name="hidden_checkbox" >
            <property name="text" >
             <string>&amp;Show hidden commands</string>