Merge lp:~hid-iwata/tortoisebzr/cmenu_customize into lp:~tortoisebzr-developers/tortoisebzr/trunk-2a

[IWATA Hidetaka]

Context menu customizing feature
---------------------------------
Make it possible to reorder context menus or hide unused menus as users like.
Related bug : #591774

Drive type filter and path filter for context menu
-----------------------------------------------------------
As same as icon overlays, make it possible to define folders on which tbzr avoids showing context menus, with drive type filters and path wildcards.

.. note::
Some of menus (e.g. ``settings``) are always shown regardless of these settings.

A little improvement for context menu filtering
------------------------------------------------
Hide obviously useless menus (e.g. ``annotate`` when no file selected) even when status of files/folders are unavailable.

[Jelmer Vernooij (jelmer)]

Hi!

On Sat, 2010-12-04 at 03:59 +0000, iwata wrote:
> iwata has proposed merging lp:~hid-iwata/tortoisebzr/cmenu_customize into lp:tortoisebzr.
>
> Requested reviews:
> TortoiseBZR Developers (tortoisebzr-developers)
>
>
> Context menu customizing feature
> ---------------------------------
> Make it possible to reorder context menus or hide unused menus as users like.
> Related bug : #591774
>
> Drive type filter and path filter for context menu
> -----------------------------------------------------------
> As same as icon overlays, make it possible to define folders on which tbzr avoids showing context menus, with drive type filters and path wildcards.
>
> .. note::
> Some of menus (e.g. ``settings``) are always shown regardless of these settings.
>
> A little improvement for context menu filtering
> ------------------------------------------------
> Hide obviously useless menus (e.g. ``annotate`` when no file selected) even when status of files/folders are unavailable.
Thanks for the patch, this seems like a useful addition. Is there any
chance you can split this branch up a bit ? That might make it a bit
easier for reviewer(s) to review and merge it.

Cheers,

Jelmer

[IWATA Hidetaka (hid-iwata)]

Hi, Jelmer.
Thank you for your advice.

I've split this changes into these 3 new branches.

lp:~hid-iwata/tortoisebzr/cmenu_customize2 for "Context menu customizing".
lp:~hid-iwata/tortoisebzr/pathfilter_for_cmenu for "Drive type & path filter"
lp:~hid-iwata/tortoisebzr/cmenu_filter_improve for "Improvement for menu filtering"

1st one is ready to be reviewed.

2nd & 3rd are not ready (I've not reviewed them by myself yet).
I'll make other merge-proposal for 2nd & 3rd in a few days (maybe this weekend).

Cheers.

> Hi!
>
> On Sat, 2010-12-04 at 03:59 +0000, iwata wrote:
> > iwata has proposed merging lp:~hid-iwata/tortoisebzr/cmenu_customize into
> lp:tortoisebzr.
> >
> > Requested reviews:
> > TortoiseBZR Developers (tortoisebzr-developers)
> >
> >
> > Context menu customizing feature
> > ---------------------------------
> > Make it possible to reorder context menus or hide unused menus as users
> like.
> > Related bug : #591774
> >
> > Drive type filter and path filter for context menu
> > -----------------------------------------------------------
> > As same as icon overlays, make it possible to define folders on which tbzr
> avoids showing context menus, with drive type filters and path wildcards.
> >
> > .. note::
> > Some of menus (e.g. ``settings``) are always shown regardless of these
> settings.
> >
> > A little improvement for context menu filtering
> > ------------------------------------------------
> > Hide obviously useless menus (e.g. ``annotate`` when no file selected) even
> when status of files/folders are unavailable.
> Thanks for the patch, this seems like a useful addition. Is there any
> chance you can split this branch up a bit ? That might make it a bit
> easier for reviewer(s) to review and merge it.
>
> Cheers,
>
> Jelmer

Unmerged revisions

366. By IWATA Hidetaka on 2010-12-04

trivial fix.

365. By IWATA Hidetaka on 2010-11-21

Add drive type filter, whitelist and blacklist for context menu.

364. By IWATA Hidetaka on 2010-11-20

Enable contextmenu filtering by selected count, by item type(file or folder), even when sleeping, in progress, or unoverlayed.

363. By IWATA Hidetaka on 2010-11-20

context menu preferences : disable collapsing treeview.

362. By IWATA Hidetaka on 2010-11-18

Change button text etc.

361. By IWATA Hidetaka on 2010-11-18

Imprements contextmenu customize feature

=== modified file 'tbzrcommands/cmd_settings.py'
--- tbzrcommands/cmd_settings.py	2010-10-13 14:20:40 +0000
+++ tbzrcommands/cmd_settings.py	2010-12-04 03:59:48 +0000
@@ -6,161 +6,13 @@
     )
 
 from tbzrcommands.ui.settings import Ui_SettingsForm
+from tbzrcommands.prefwidgets import *
 from tbzrlib.i18n import (gettext, N_)
 from tbzrlib.app import get_app
 
-class PrefItem:
-    def __init__(self, pref_name):
-        self.pref_name = pref_name
-        self.config = get_app().config
-        self.pref_ob = self.config.get_opt(pref_name)
-
-    # Add widget to specified QGridLayout. QGridLayout has 2 columns.
-    # 1st is for label, 2nd is for input box. 
-    def add_to(self, grid, rowno):
-        pass
-
-    # Get new value from widget.
-    def get_value(self):
-        pass
-
-    def apply(self):
-        self.config.set(self.pref_name, self.get_value())
-
-class CheckBoxPref(PrefItem):
-    
-    def add_to(self, parent, grid, rowno):
-        cb = QtGui.QCheckBox(parent)
-
-        val = self.config.get(self.pref_name)
-        if val:
-            cb.setCheckState(QtCore.Qt.Checked)
-        else:
-            cb.setCheckState(QtCore.Qt.Unchecked)
-
-        cb.setText(gettext(self.pref_ob.doc))
-        help = self.pref_ob.help_text
-        if help:
-            cb.setToolTip(gettext(help))
-
-        grid.addWidget(cb, rowno, 0, 1, -1)
-
-        self.cb = cb
-
-    def get_value(self):
-        return (self.cb.checkState() == QtCore.Qt.Checked)
-
-class TextPref(PrefItem):
-
-    def __init__(self, pref_name, multiline = False, height = 48):
-        PrefItem.__init__(self, pref_name)
-        self.multiline = multiline
-        self.height = height
-
-    def add_to(self, parent, grid, rowno):
-        if self.multiline:
-            edt = QtGui.QTextEdit(parent)
-            edt.setLineWrapMode(QtGui.QTextEdit.NoWrap)
-            edt.setAcceptRichText(False)
-            edt.setMaximumHeight(self.height)
-            edt.setTabChangesFocus(True)
-        else:
-            edt = QtGui.QLineEdit(parent)
-
-        lbl = QtGui.QLabel(parent)
-        val = self.config.get(self.pref_name)
-        if val:
-            edt.setText(val)
-        lbl.setText(gettext(self.pref_ob.doc))
-
-        help = self.pref_ob.help_text
-        if help:
-            edt.setToolTip(gettext(help))
-            lbl.setToolTip(gettext(help))
-
-        grid.addWidget(lbl, rowno, 0, 1, 1)
-        grid.addWidget(edt, rowno, 1, 1, 1)
-
-        self.edt = edt
-
-    def get_value(self):
-        if self.multiline:
-            return self.edt.toPlainText()
-        else:
-            return self.edt.text()
-
-# Generic 'panel' tied to the tree widget.
-class PrefPanel(QtGui.QWidget):
-    def __init__(self, parent):
-        QtGui.QWidget.__init__(self, parent)
-        self.centralwidget = QtGui.QVBoxLayout(self)
-        self.setup()
-
-    def addGroupBoxAndLayout(self, text, klass = QtGui.QVBoxLayout):
-        gb = QtGui.QGroupBox(gettext(text), self)
-        self.centralwidget.addWidget(gb)
-        layout = klass(gb)
-        return layout
-
-    def setup(self):
-        pass
-
-    def apply(self):
-        pass
-
-# A panel that knows about our config object.
-class ConfigPanel(PrefPanel):
-    # 'connect' a bool preference with a checkbox. Keep the 'connection' with
-    # the checkbox separate from the creation of the checkbox, incase we use
-    # QtDesigner based forms.
-    
-    def __init__(self, parent):
-        self.apply_handlers = []
-        PrefPanel.__init__(self, parent)
-
-    def apply(self):
-        for handler in self.apply_handlers:
-            handler()
-
-    # XXX Obsolete
-    def connect_checkbox_to_pref(self, cb, pref_name):
-        config = get_app().config
-        pref_ob = config.get_opt(pref_name)
-        val = config.get(pref_name)
-        if val:
-            cb.setCheckState(QtCore.Qt.Checked)
-        else:
-            cb.setCheckState(QtCore.Qt.Unchecked)
-
-        cb.setText(gettext(pref_ob.doc))
-        help = pref_ob.help_text
-        if help:
-            cb.setToolTip(gettext(help))
-        # the event handler.
-        def cb_changed(state, cb=cb, pref_name=pref_name, config=config):
-            new_val = state == QtCore.Qt.Checked
-            config.set(pref_name, new_val)
-
-        self.parentWidget().connect(cb, QtCore.SIGNAL("stateChanged(int)"),
-                                    cb_changed)
-
-    # XXX Obsolete
-    # Create a groupbox filled with boolean checkboxes.
-    def create_groupbox_of_bool_prefs(self, gb_title, *pref_names):
-        gb = self.addGroupBoxAndLayout(gb_title)
-        for name in pref_names:
-            cb = QtGui.QCheckBox(self)
-            self.connect_checkbox_to_pref(cb, name)
-            gb.addWidget(cb)
-        return gb
-
-    def create_groupbox_of_prefs(self, gb_title, *pref_items):
-        gb = self.addGroupBoxAndLayout(gb_title, QtGui.QGridLayout)
-        gb.setColumnStretch(0, 0)
-        for idx, item in enumerate(pref_items):
-            gb.setRowStretch(idx, 0)
-            item.add_to(self, gb, idx)
-            self.apply_handlers.append(item.apply)
+from tbzrcommands.contextmenuprefs import (
+        ContextMenuGeneralPrefPanel,
+        ContextMenuPrefPanel)
 
 # Implementation classes for specific options...
 class GeneralPrefPanel(ConfigPanel):
@@ -180,7 +32,7 @@
 
         # Add the button to the form - must put it in a VBox to prevent it
         # stretching to the full width of the window.
-        layout = QtGui.QHBoxLayout(self)
+        layout = QtGui.QHBoxLayout()
         layout.addWidget(button)
         layout.addStretch(1)
 
@@ -216,7 +68,11 @@
             (N_("Other Options"), PrefPanel, []),
             ]
          ),
-        (N_("Icon Overlays"), OverlaysPrefPanel, [],)
+        (N_("Icon Overlays"), OverlaysPrefPanel, [],),
+        (N_("Context Menu"), ContextMenuGeneralPrefPanel, [
+            (N_("Order of Menus"), ContextMenuPrefPanel, [],),
+            ],
+         ),
     ]
 
 # The main, top-level settings window.  Holds the tree and the 'stacked'

=== added file 'tbzrcommands/contextmenuprefs.py'
--- tbzrcommands/contextmenuprefs.py	1970-01-01 00:00:00 +0000
+++ tbzrcommands/contextmenuprefs.py	2010-12-04 03:59:48 +0000
@@ -0,0 +1,499 @@
+import sys
+from PyQt4 import QtCore, QtGui
+
+if sys.getwindowsversion() >= (5,1):
+    import winxpgui as win32gui
+else:
+    import win32gui
+import win32con
+
+from tbzrcommands.prefwidgets import ConfigPanel, CheckBoxPref, TextPref
+from tbzrlib.i18n import (gettext, N_)
+from tbzrlib.app import get_app
+
+from tbzrlib.actions import get_default_actions, separate_actions
+from tbzrlib.ui.taskbar import load_icon
+
+_blank_icon = QtGui.QColor(255, 255, 255, 0)
+
+class MenuData(object):
+    def __init__(self, id, text, ico_file):
+        self.id = id
+        self.text = gettext(text).replace('&', '')
+        self.ico = _blank_icon
+        if ico_file:
+            hico = load_icon(ico_file, cx = 16, cy = 16)
+            try:
+                if hico:
+                    self.ico = QtGui.QPixmap.fromWinHICON(hico)
+            finally:
+                win32gui.DestroyIcon(hico)
+
+        self.is_active = False
+        self.in_folder = False
+
+    @classmethod
+    def from_action(cls, action):
+        return cls(action.id, action.text, action.ico_file)
+
+    @classmethod
+    def separator(cls):
+        # separator instance must be created new instance for each call.
+        return cls('--', N_('--Separator--'), None)
+
+    @classmethod
+    def folder(cls):
+        return cls('__FOLDER__', N_('Tortoise Bazaar'), 'bzr.ico')
+
+
+# Implementation classes for specific options...
+
+class ContextMenuGeneralPrefPanel(ConfigPanel):
+    def setup(self):
+        self.create_groupbox_of_prefs(N_("Drive Types"),
+                CheckBoxPref('queried_drives_cmenu.removable'),
+                CheckBoxPref('queried_drives_cmenu.floppy'),
+                CheckBoxPref('queried_drives_cmenu.cdrom'),
+                CheckBoxPref('queried_drives_cmenu.fixed'),
+                CheckBoxPref('queried_drives_cmenu.remote'),
+                CheckBoxPref('queried_drives_cmenu.unknown'))
+
+        self.create_groupbox_of_prefs(N_("Whitelist / Blacklist"),
+                TextPref('context_menu.include_path', multiline = True),
+                TextPref('context_menu.exclude_path', multiline = True))
+
+        self.centralwidget.addStretch(1)
+
+class ContextMenuPrefPanel(ConfigPanel):
+    def setup(self):
+        self.config = get_app().config
+        self.layout()
+        self.set_model()
+
+    def layout(self):
+        layout = self.addGroupBoxAndLayout(N_("Order of Menus"), QtGui.QGridLayout)
+        layout.setMargin(10)
+        for i, x in enumerate((1, 0)):
+            layout.setRowStretch(i, x)
+        for i, x in enumerate((1, 0, 1)):
+            layout.setColumnStretch(i, x)
+
+        self.left_view= QtGui.QTreeView()
+        layout.addWidget(self.left_view, 0, 0) 
+
+        button_panel = QtGui.QVBoxLayout()
+        layout.addLayout(button_panel, 0, 1)
+
+        add_button = QtGui.QPushButton('>>')
+        remove_button = QtGui.QPushButton('<<')
+        up_button = QtGui.QPushButton(gettext('Up'))
+        down_button = QtGui.QPushButton(gettext('Down'))
+
+        button_panel.addStretch(3)
+        for b in (add_button, remove_button, up_button, down_button):
+            b.setMaximumSize(50, b.height())
+            button_panel.addWidget(b)
+        button_panel.insertStretch(3, 1)
+        button_panel.addStretch(3)
+
+        self.right_view= QtGui.QTreeView()
+        layout.addWidget(self.right_view, 0, 2) 
+
+        reset_button = QtGui.QPushButton(gettext("Reset"))
+        layout.addWidget(reset_button, 1, 2, QtCore.Qt.AlignRight) 
+
+        self.connect(add_button, QtCore.SIGNAL("clicked()"), self.add_clicked)
+        self.connect(remove_button, QtCore.SIGNAL("clicked()"), self.remove_clicked)
+        self.connect(up_button, QtCore.SIGNAL("clicked()"), self.up_clicked)
+        self.connect(down_button, QtCore.SIGNAL("clicked()"), self.down_clicked)
+        self.connect(reset_button, QtCore.SIGNAL("clicked()"), self.reset_clicked)
+
+        # disable collapsing
+        def right_collapsed(index):
+            self.right_view.expand(index)
+        self.connect(self.right_view, QtCore.SIGNAL("collapsed(QModelIndex)"), right_collapsed)
+
+    def set_model(self):
+        default_actions = get_default_actions()
+        all_menus = [MenuData.from_action(a) for a in default_actions if a]
+        menu_dict = {}
+        for m in all_menus:
+            menu_dict[m.id] = m
+
+        actions, sub_actions = separate_actions(default_actions)
+        def get_id(action):
+            return action.id if action else '--'
+
+        def get_menu(id):
+            if id == '--':
+                return MenuData.separator()
+            else:
+                return menu_dict[id]
+
+        default_menu_ids = [get_id(a) for a in actions]
+        default_submenu_ids = [get_id(a) for a in sub_actions]
+        self.default_menus = [get_menu(x) for x in default_menu_ids]
+        self.default_submenus = [get_menu(x) for x in default_submenu_ids]
+
+        left_model = UnusedMenuFilter(
+                AllMenusModel(all_menus, self.left_view))
+        self.left_view.setModel(left_model)
+        self.left_view.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
+
+        menu_ids = self.config.get("context_menu.actions").split(",")
+        submenu_ids = self.config.get("context_menu.sub_actions").split(",")
+        if not menu_ids[0] and not submenu_ids[0]:
+            menu_ids = list(default_menu_ids)
+            submenu_ids = list(default_submenu_ids)
+
+        if menu_ids[0] or submenu_ids[0]:
+            try:
+                menus = [get_menu(x) for x in menu_ids if x]
+                submenus = [get_menu(x) for x in submenu_ids if x]
+            except:
+                menus = self.default_menus
+                submenus = self.default_submenus
+        else:
+            menus = self.default_menus
+            submenus = self.default_submenus
+
+        right_model = ContextMenuModel(menus, submenus, self.right_view)
+        self.right_view.setModel(right_model)
+        self.right_view.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
+        self.right_view.expand(right_model._create_folder_index())
+
+        left_model.invalidateFilter()
+
+    def add_clicked(self):
+        indices = self.left_view.selectedIndexes()
+        if not indices:
+            return
+        
+        left_model, right_model = self.left_view.model(), self.right_view.model()
+        
+        actions = [left_model.mapToSource(x).internalPointer() for x in indices]
+
+        indices = self.right_view.selectedIndexes()
+        if len(indices) > 0:
+            insert_index = right_model.sort_indices(indices, reverse=True)[0]
+        else:
+            insert_index = None
+
+        right_model.add(actions, insert_index)
+        left_model.invalidateFilter()
+
+    def remove_clicked(self):
+        indices = self.right_view.selectedIndexes()
+        if len(indices) > 0:
+            self.right_view.model().remove(indices)
+            self.left_view.model().invalidateFilter()
+
+
+    def up_clicked(self):
+        indices = self.right_view.selectedIndexes()
+        self.right_view.model().up(indices)
+
+    def down_clicked(self):
+        indices = self.right_view.selectedIndexes()
+        self.right_view.model().down(indices)
+
+    def reset_clicked(self):
+        left_model = self.left_view.model()
+        right_model = self.right_view.model()
+        right_model.beginResetModel()
+        right_model.reset_menus(
+                self.default_menus, self.default_submenus)
+        right_model.endResetModel()
+        self.right_view.expand(right_model._create_folder_index())
+        left_model.invalidateFilter()
+
+    def apply(self):
+        # XXX: Should we show alert when `settings` menu will be hidden ? 
+        menu_ids = ",".join(m.id for m in self.right_view.model().menus)
+        submenu_ids = ",".join(m.id for m in self.right_view.model().submenus)
+
+        default_menu_ids = ",".join(m.id for m in self.default_menus)
+        default_submenu_ids = ",".join(m.id for m in self.default_submenus)
+        
+        if menu_ids == default_menu_ids and submenu_ids == default_submenu_ids:
+            self.config.set("context_menu.actions", "")
+            self.config.set("context_menu.sub_actions", "")
+        else:
+            self.config.set("context_menu.actions", menu_ids)
+            self.config.set("context_menu.sub_actions", submenu_ids)
+
+class UnusedMenuFilter(QtGui.QSortFilterProxyModel):
+    def __init__(self, source, parent = None):
+        QtGui.QSortFilterProxyModel.__init__(self, parent)
+        self.setSourceModel(source)
+
+    def filterAcceptsRow(self, row, parent):
+        return not self.sourceModel().menus[row].is_active
+
+class AllMenusModel(QtCore.QAbstractItemModel):
+    def __init__(self, menus, parent = None):
+        QtCore.QAbstractItemModel.__init__(self, parent)
+        self.menus = list(menus)
+        self.menus.append(MenuData.separator())
+
+    def rowCount(self, parent=QtCore.QModelIndex()):
+        if parent.column() > 0:
+            return 0
+        if parent.isValid():
+            return 0
+        else:
+            return len(self.menus)
+
+    def columnCount(self, parent=QtCore.QModelIndex()):
+        return 1
+
+    def flags(self, index):
+        if index.isValid():
+            if index.internalPointer().is_active:
+                return QtCore.Qt.NoItemFlags
+            else:
+                return QtCore.Qt.ItemIsEnabled|QtCore.Qt.ItemIsSelectable
+        else:
+            return QtCore.Qt.NoItemFlags
+        
+    def headerData(self, section, orientation, role):
+        if orientation == QtCore.Qt.Horizontal and role == QtCore.Qt.DisplayRole:
+            if section == 0:
+                return QtCore.QVariant(gettext("Available Commands"))
+        return None
+
+    def index(self, row, column, parent):
+        if not self.hasIndex(row, column, parent):
+            return QtCore.QModelIndex()
+        if row < len(self.menus):
+            return self.createIndex(row, column, self.menus[row])
+        else:
+            return QtCore.QModelIndex()
+
+    def parent(self, index):
+        return QtCore.QModelIndex()
+
+    def data(self, index, role):
+        if not index.isValid():
+            return QtCore.QVariant()
+        if role == QtCore.Qt.DisplayRole:
+            return index.internalPointer().text
+        elif role == QtCore.Qt.DecorationRole:
+            return index.internalPointer().ico
+        return QtCore.QVariant()
+
+class ContextMenuModel(QtCore.QAbstractItemModel):
+    def __init__(self, menus, submenus, parent = None):
+        QtCore.QAbstractItemModel.__init__(self, parent)
+        self.menus = []
+        self.submenus = []
+        self.reset_menus(menus, submenus)
+        self.folder = MenuData.folder()
+
+    def rowCount(self, parent=QtCore.QModelIndex()):
+        if parent.column() > 0:
+            return 0
+        if parent.isValid():
+            if parent.internalPointer() == self.folder:
+                return len(self.submenus)
+            else:
+                return 0
+        else:
+            return len(self.menus) + 1
+
+    def columnCount(self, parent=QtCore.QModelIndex()):
+        return 1
+
+    def flags(self, index):
+        if index.isValid():
+            if index.internalPointer() == self.folder:
+                return QtCore.Qt.ItemIsEnabled
+            else:
+                return QtCore.Qt.ItemIsEnabled|QtCore.Qt.ItemIsSelectable
+        else:
+            return QtCore.Qt.NoItemFlags
+        
+    def headerData(self, section, orientation, role):
+        if orientation == QtCore.Qt.Horizontal and role == QtCore.Qt.DisplayRole:
+            if section == 0:
+                return QtCore.QVariant(gettext("Context Menu"))
+        return None
+
+    def index(self, row, column, parent):
+        if not self.hasIndex(row, column, parent):
+            return QtCore.QModelIndex()
+        if parent.isValid():
+            if row < len(self.submenus):
+                return self.createIndex(row, column, self.submenus[row])
+        else:
+            if row < len(self.menus):
+                return self.createIndex(row, column, self.menus[row])
+            else:
+                return self.createIndex(row, column, self.folder)
+        return QtCore.QModelIndex()
+
+    def parent(self, index):
+        if not index.isValid():
+            return QtCore.QModelIndex()
+        item = index.internalPointer()
+        if item.in_folder:
+            return self._create_folder_index()
+        else:
+            return QtCore.QModelIndex()
+
+    def data(self, index, role):
+        if not index.isValid():
+            return QtCore.QVariant()
+        if role == QtCore.Qt.DisplayRole:
+            return index.internalPointer().text
+        elif role == QtCore.Qt.DecorationRole:
+            return index.internalPointer().ico
+        return QtCore.QVariant()
+
+    def reset_menus(self, menus, submenus):
+        def set_flag(menus, is_active, in_folder):
+            for m in menus:
+                m.is_active = is_active
+                m.in_folder = in_folder
+        
+        set_flag(self.menus, False, False)
+        set_flag(self.submenus, False, False)
+
+        self.menus[:] = menus
+        self.submenus[:] = submenus
+
+        set_flag(self.menus, True, False)
+        set_flag(self.submenus, True, True)
+
+    def sort_indices(self, indices, reverse = False, split = False):
+        temp = sorted(((x.parent().isValid(), x.row(), x) for x in indices),
+                      reverse=reverse)
+        sorted_indexes = [x[2] for x in temp]
+        if split:
+            return [x[2] for x in temp if not x[0]], \
+                   [x[2] for x in temp if x[0]]
+        else:
+            return [x[2] for x in temp]
+
+    def add(self, actions, insert_index):
+        if insert_index is None:
+            parent = QtCore.QModelIndex()
+            row = -1
+            in_folder = False
+        else:
+            parent = insert_index.parent()
+            row = insert_index.row()
+            in_folder = parent.isValid()
+
+        for action in actions:
+            if action.is_active:
+                continue
+            if action.id == '--':
+                action = MenuData.separator()
+
+            action.in_folder = in_folder
+            action.is_active = True
+
+            row += 1
+            self.beginInsertRows(parent, row, row)
+            if in_folder:
+                self.submenus.insert(row, action)
+            else:
+                self.menus.insert(row, action)
+            self.endInsertRows()
+
+    def remove(self, indices):
+        for index in self.sort_indices(indices, reverse=True):
+            row = index.row()
+            self.beginRemoveRows(index.parent(), row, row)
+            action = index.internalPointer()
+            if action.in_folder:
+                del(self.submenus[row])
+            else:
+                del(self.menus[row])
+            action.in_folder = False
+            action.is_active = False
+            self.endRemoveRows()
+
+    def _up(self, menus, row):
+        if menus[row].in_folder:
+            parent = self._create_folder_index()
+        else:
+            parent = QtCore.QModelIndex()
+        self.beginMoveRows(parent, row, row, parent, row - 1)
+        menus[row], menus[row - 1] = menus[row - 1], menus[row]
+        self.endMoveRows()
+
+    def _down(self, menus, row):
+        self._up(menus, row + 1)
+
+    def _move_to_folder(self, num):
+        folder_idx = self._create_folder_index()
+        end = len(self.menus) - 1
+        start = end - num + 1
+        self.beginMoveRows(QtCore.QModelIndex(), start, end, folder_idx, 0)
+        while num > 0:
+            action = self.menus.pop(-1)
+            action.in_folder = True
+            self.submenus.insert(0, action)
+            num -= 1
+        self.endMoveRows()
+
+    def _move_from_folder(self, num):
+        folder_idx = self._create_folder_index()
+        self.beginMoveRows(folder_idx, 0, num - 1, QtCore.QModelIndex(), folder_idx.row())
+        while num > 0:
+            action = self.submenus.pop(0)
+            action.in_folder = False
+            self.menus.append(action)
+            num -= 1
+        self.endMoveRows()
+
+    def up(self, indices):
+        indices, sub_indices =self.sort_indices(indices, split=True)
+
+        def move_in_same_level(indices, menus):
+            minimum_row = 0
+            for index in indices:
+                action = index.internalPointer()
+                row = index.row()
+                if row > minimum_row:
+                    self._up(menus, row)
+                    minimum_row = row
+                else:
+                    minimum_row = row + 1
+
+        move_in_same_level(indices, self.menus)
+
+        if sub_indices:
+            if sub_indices[-1].row() == len(sub_indices) - 1:
+                self._move_from_folder(len(sub_indices))
+            else:
+                move_in_same_level(sub_indices, self.submenus)
+
+    def down(self, indices):
+        def move_in_same_level(indices, menus):
+            maximum_row = len(menus) - 1
+            for index in indices:
+                action = index.internalPointer()
+                row = index.row()
+                if row < maximum_row:
+                    self._down(menus, row)
+                    maxmum_row = row
+                else:
+                    maximum_row = row - 1
+
+        indices, sub_indices = self.sort_indices(indices, reverse=True, split=True)
+        move_in_same_level(sub_indices, self.submenus)
+
+        if (indices):
+            if indices[-1].row() == len(self.menus) - len(indices):
+                self._move_to_folder(len(indices))
+            else:
+                move_in_same_level(indices, self.menus)
+
+    def _create_folder_index(self):
+        return self.createIndex(len(self.menus), 0, self.folder)
+
+
+

=== added file 'tbzrcommands/prefwidgets.py'
--- tbzrcommands/prefwidgets.py	1970-01-01 00:00:00 +0000
+++ tbzrcommands/prefwidgets.py	2010-12-04 03:59:48 +0000
@@ -0,0 +1,159 @@
+import sys
+from PyQt4 import QtCore, QtGui
+
+from tbzrlib.i18n import (gettext, N_)
+from tbzrlib.app import get_app
+
+class PrefItem:
+    def __init__(self, pref_name):
+        self.pref_name = pref_name
+        self.config = get_app().config
+        self.pref_ob = self.config.get_opt(pref_name)
+
+    # Add widget to specified QGridLayout. QGridLayout has 2 columns.
+    # 1st is for label, 2nd is for input box. 
+    def add_to(self, grid, rowno):
+        pass
+
+    # Get new value from widget.
+    def get_value(self):
+        pass
+
+    def apply(self):
+        self.config.set(self.pref_name, self.get_value())
+
+class CheckBoxPref(PrefItem):
+    
+    def add_to(self, parent, grid, rowno):
+        cb = QtGui.QCheckBox(parent)
+
+        val = self.config.get(self.pref_name)
+        if val:
+            cb.setCheckState(QtCore.Qt.Checked)
+        else:
+            cb.setCheckState(QtCore.Qt.Unchecked)
+
+        cb.setText(gettext(self.pref_ob.doc))
+        help = self.pref_ob.help_text
+        if help:
+            cb.setToolTip(gettext(help))
+
+        grid.addWidget(cb, rowno, 0, 1, -1)
+
+        self.cb = cb
+
+    def get_value(self):
+        return (self.cb.checkState() == QtCore.Qt.Checked)
+
+class TextPref(PrefItem):
+
+    def __init__(self, pref_name, multiline = False, height = 48):
+        PrefItem.__init__(self, pref_name)
+        self.multiline = multiline
+        self.height = height
+
+    def add_to(self, parent, grid, rowno):
+        if self.multiline:
+            edt = QtGui.QTextEdit(parent)
+            edt.setLineWrapMode(QtGui.QTextEdit.NoWrap)
+            edt.setAcceptRichText(False)
+            edt.setMaximumHeight(self.height)
+            edt.setTabChangesFocus(True)
+        else:
+            edt = QtGui.QLineEdit(parent)
+
+        lbl = QtGui.QLabel(parent)
+        val = self.config.get(self.pref_name)
+        if val:
+            edt.setText(val)
+        lbl.setText(gettext(self.pref_ob.doc))
+
+        help = self.pref_ob.help_text
+        if help:
+            edt.setToolTip(gettext(help))
+            lbl.setToolTip(gettext(help))
+
+        grid.addWidget(lbl, rowno, 0, 1, 1)
+        grid.addWidget(edt, rowno, 1, 1, 1)
+
+        self.edt = edt
+
+    def get_value(self):
+        if self.multiline:
+            return self.edt.toPlainText()
+        else:
+            return self.edt.text()
+
+# Generic 'panel' tied to the tree widget.
+class PrefPanel(QtGui.QWidget):
+    def __init__(self, parent):
+        QtGui.QWidget.__init__(self, parent)
+        self.centralwidget = QtGui.QVBoxLayout(self)
+        self.setup()
+
+    def addGroupBoxAndLayout(self, text, klass = QtGui.QVBoxLayout):
+        gb = QtGui.QGroupBox(gettext(text), self)
+        self.centralwidget.addWidget(gb)
+        layout = klass(gb)
+        return layout
+
+    def setup(self):
+        pass
+
+    def apply(self):
+        pass
+
+# A panel that knows about our config object.
+class ConfigPanel(PrefPanel):
+    # 'connect' a bool preference with a checkbox. Keep the 'connection' with
+    # the checkbox separate from the creation of the checkbox, incase we use
+    # QtDesigner based forms.
+    
+    def __init__(self, parent):
+        self.apply_handlers = []
+        PrefPanel.__init__(self, parent)
+
+    def apply(self):
+        for handler in self.apply_handlers:
+            handler()
+
+    # XXX Obsolete
+    def connect_checkbox_to_pref(self, cb, pref_name):
+        config = get_app().config
+        pref_ob = config.get_opt(pref_name)
+        val = config.get(pref_name)
+        if val:
+            cb.setCheckState(QtCore.Qt.Checked)
+        else:
+            cb.setCheckState(QtCore.Qt.Unchecked)
+
+        cb.setText(gettext(pref_ob.doc))
+        help = pref_ob.help_text
+        if help:
+            cb.setToolTip(gettext(help))
+        # the event handler.
+        def cb_changed(state, cb=cb, pref_name=pref_name, config=config):
+            new_val = state == QtCore.Qt.Checked
+            config.set(pref_name, new_val)
+
+        self.parentWidget().connect(cb, QtCore.SIGNAL("stateChanged(int)"),
+                                    cb_changed)
+
+    # XXX Obsolete
+    # Create a groupbox filled with boolean checkboxes.
+    def create_groupbox_of_bool_prefs(self, gb_title, *pref_names):
+        gb = self.addGroupBoxAndLayout(gb_title)
+        for name in pref_names:
+            cb = QtGui.QCheckBox(self)
+            self.connect_checkbox_to_pref(cb, name)
+            gb.addWidget(cb)
+        return gb
+
+    def create_groupbox_of_prefs(self, gb_title, *pref_items):
+        gb = self.addGroupBoxAndLayout(gb_title, QtGui.QGridLayout)
+        gb.setColumnStretch(0, 0)
+        for idx, item in enumerate(pref_items):
+            gb.setRowStretch(idx, 0)
+            item.add_to(self, gb, idx)
+            self.apply_handlers.append(item.apply)
+

=== modified file 'tbzrcommands/ui/settings.ui'
--- tbzrcommands/ui/settings.ui	2008-09-13 03:35:48 +0000
+++ tbzrcommands/ui/settings.ui	2010-12-04 03:59:48 +0000
@@ -17,6 +17,12 @@
     <layout class="QHBoxLayout" name="horizontalLayout" >
      <item>
       <widget class="QTreeWidget" name="tree" >
+       <property name="maximumSize" >
+        <size>
+         <width>200</width>
+         <height>16777215</height>
+        </size>
+       </property>
        <property name="rootIsDecorated" >
         <bool>true</bool>
        </property>

=== modified file 'tbzrlib/actions.py'
--- tbzrlib/actions.py	2010-08-05 18:12:10 +0000
+++ tbzrlib/actions.py	2010-12-04 03:59:48 +0000
@@ -28,6 +28,12 @@
 ITEMIS_EXTENDED =                              1<<13
 ITEMIS_UNVERSIONED =                           1<<14
 
+ITEMIS_UNKNOWN = (
+        ITEMIS_VERSIONED | ITEMIS_UNCHANGED | ITEMIS_IGNORED |
+        ITEMIS_ADDED | ITEMIS_DELETED | ITEMIS_CONFLICT |
+        ITEMIS_UNVERSIONED | ITEMIS_INVERSIONEDFOLDER)
+
+ITEMIS_UNKNOWNFOLDER = ITEMIS_UNKNOWN | ITEMIS_FOLDER | ITEMIS_VERSIONEDFOLDER
 
 # A couple of containers for action definitions and their commands.
 class ActionExec(object):
@@ -62,6 +68,10 @@
     def __repr__(self):
         return "Action(id=%r)" % self.id
 
+class TbzrMenu(object):
+    def __nonzero__(self):
+        return 0
+
 def get_tbzr_exec(command, want_sel=True):
     # fist workout how to execute tbzrcommand itself.
     bindir = os.path.dirname(os.path.abspath(sys.executable.decode("mbcs")))
@@ -87,6 +97,10 @@
 # default order for actions
 _action_order = []
 
+def on_config_change():
+    del(_action_order[:])
+get_app().register_notify_config_change(on_config_change)
+
 def get_default_actions():
     return [
         Action("tbzr.newtree", get_tbzr_exec("getnew"),
@@ -114,7 +128,7 @@
                [(ITEMIS_FOLDER|ITEMIS_ONLYONE, 0),
                ]),
 
-        None, # a sep
+        TbzrMenu(), # `Tortoise Bazaar` menu (placeholder of sub menus)
 
         Action("tbzr.browse", get_tbzr_exec("browse"),
                N_("Bro&wse inventory"),
@@ -324,38 +338,71 @@
     ]
 
 def _build_actions():
-    assert not _actions and not _action_order
-    for a in get_default_actions():
-        if a is not None:
-            _actions[a.id] = a
-        _action_order.append(a) # even Nones get in here!
+    all_actions = get_default_actions()
+    if not _actions:
+        for a in all_actions:
+            if a:
+                _actions[a.id] = a
+
+    if not _action_order:
+        config = get_app().config
+        action_ids = config.get("context_menu.actions")
+        subaction_ids = config.get("context_menu.sub_actions")
+
+        if action_ids or subaction_ids:
+            def append_action_order(action_ids):
+                if not action_ids:
+                    return
+                for id in action_ids.split(","):
+                    if id == "--":
+                        _action_order.append(None)
+                    else:
+                        _action_order.append(_actions[id])
+            try:
+                append_action_order(action_ids)
+                if subaction_ids:
+                    _action_order.append(TbzrMenu())
+                    append_action_order(subaction_ids)
+                return
+            except:
+                pass
+
+        for a in all_actions:
+            _action_order.append(a) # even Nones get in here!
+
 
 def get_action(action_id):
-    if not _actions:
+    if not _actions or not _action_order:
         _build_actions()
     try:
         return _actions[action_id]
     except KeyError:
         raise ValueError(repr(action_id))
 
-def _filtered_actions(flags):
+def _filtered_actions(maybe_flags, assured_flags):
+    """
+    Filter executable actions by flags.
+
+    :param maybe_flags:     what files maybe. (includes all possibilities)
+    :param assured_flags:   what files surely are.
+    """
     ret = []
     for act in _action_order:
-        if act is None: # a sep
+        if not act: # a sep or "Tortoise Bazaar" menu
             result = True
         elif act.conditions:
             result = False
             for yes, no in act.conditions:
                 if yes and no:
-                    if yes & flags == yes and (no & ~flags) == no:
+                    if yes & maybe_flags == yes and (no & ~assured_flags) == no:
                         result = True
                         break
                 elif yes:
-                    if yes & flags == yes:
+                    if yes & maybe_flags == yes:
                         result = True
                         break
                 elif no:
-                    if (no & ~flags) == no:
+                    if (no & ~assured_flags) == no:
                         result = True
                         break
                 else:
@@ -364,49 +411,93 @@
             result = True
         if result:
             ret.append(act)
+
+    return ret
+
+def _remove_duplicate_separator(actions):
+    ret = []
+    ends_with_action = False
+    for act in actions:
+        if act:
+            ends_with_action = True
+            ret.append(act)
+        elif ends_with_action or act is not None:
+            ends_with_action = False
+            ret.append(act)
+
+    if not ends_with_action:
+        del(ret[-1])
+
     return ret
 
 def _get_flag(filenames):
+    """
+    This method return tuple (maybe_flags, assured_flags)
+    maybe_flags represents what files maybe. (includes all possibilities)
+    assured_flags represents what files surely are.
+    """
     app = get_app()
     dir_cache = app.dir_cache
-
-    flags = 0
+    sleeping = app.sleeping
+
+    flags = [0, 0]  # [maybe_flags, assured_flags]
+
+    def set_flag(flag):
+        flags[0] |= flag
+        flags[1] |= flag
+
+    def set_unknown(path):
+        if path.is_directory:
+            flags[0] |= ITEMIS_UNKNOWNFOLDER
+            flags[1] |= ITEMIS_FOLDER
+        else:
+            flags[0] |= ITEMIS_UNKNOWN
+
     if len(filenames)==1:
-        flags |= ITEMIS_ONLYONE
+        set_flag(ITEMIS_ONLYONE)
     elif len(filenames)==2:
-        flags |= ITEMIS_TWO
+        set_flag(ITEMIS_TWO)
     for raw_path in filenames:
         path = VCSPath(raw_path)
+        if not app.is_path_allowed_for_cmenu(path):
+            return 0, 0
+        
+        if sleeping:
+            set_unknown(path)
+            continue
+
         if not app.is_path_allowed(path):
-            return -1 # show all flags
+            set_unknown(path)
+            continue
 
         status = dir_cache.get_status_for_path(path, 1)
         if status.is_progress():
-            return -1 # show all flags
+            set_unknown(path)
+            continue
 
         is_versioned = status.is_versioned()
         if not status.is_nothing():
-            flags |= ITEMIS_INVERSIONEDFOLDER
+            set_flag(ITEMIS_INVERSIONEDFOLDER)
         if is_versioned:
-            flags |= ITEMIS_VERSIONED
+            set_flag(ITEMIS_VERSIONED)
             # must usual case us unchanged - test that first.
             if status.is_changed():
                 if status.is_modified():
                     pass # hrm - no flag for this??
                 elif status.is_added():
-                    flags |= ITEMIS_ADDED
+                    set_flag(ITEMIS_ADDED)
                 elif status.is_deleted():
-                    flags |= ITEMIS_DELETED
+                    set_flag(ITEMIS_DELETED)
                 elif status.is_conflicted():
-                    flags |= ITEMIS_CONFLICT
+                    set_flag(ITEMIS_CONFLICT)
                 else:
                     assert False, status # missed a state!
             else:
-                flags |= ITEMIS_UNCHANGED
+                set_flag(ITEMIS_UNCHANGED)
         elif status.is_unversioned():
-            flags |= ITEMIS_UNVERSIONED
+            set_flag(ITEMIS_UNVERSIONED)
         elif status.is_ignored():
-            flags |= ITEMIS_IGNORED
+            set_flag(ITEMIS_IGNORED)
         else:
             # not in a versioned folder.
             pass
@@ -414,44 +505,45 @@
         # ack - the below is wrong in some cases?  Are we sure its a
         # VERSIONEDFOLDER?  What about ITEMIS_INVERSIONEDFOLDER?
         if path.is_directory:
-            flags |= ITEMIS_FOLDER
-            if flags & is_versioned:
-                flags |= ITEMIS_VERSIONEDFOLDER
-    return flags
+            set_flag(ITEMIS_FOLDER)
+            for i in (0, 1):
+                if flags[i] & is_versioned:
+                    flags[i] |= ITEMIS_VERSIONEDFOLDER
+    return flags[0], flags[1]
 
 def get_actions_for_files(filenames):
-    if not _actions:
+    if not _actions or not _action_order:
         _build_actions()
 
-    if get_app().sleeping:
-        ret = list(_action_order)
-    else:
-        # flags that define the specified items
-        flags = _get_flag(filenames)
+    # flags that define the specified items
+    maybe_flags, assured_flags = _get_flag(filenames)
 
-        # if success to get flag, filter actions by the flag.
-        if flags < 0:
-            ret = list(_action_order)
-        else:
-            ret = _filtered_actions(flags)
+    # if success to get flag, filter actions by the flag.
+    ret = _filtered_actions(maybe_flags, assured_flags)
+    ret = _remove_duplicate_separator(ret)
 
     # We still need to implement a user-preference for which commands go
     # on which menu, but for now we stick with TSVN's defaults, which
     # boil down to all items before the first sep go on the top-level.
     # We also probably don't need arbitrary depths - so just return "toplevel,
     # sub" for now.
-    actions = [None] # always start with a sep
-    sub_actions = []
-    filling = actions
-    for action in ret:
-        # if first sep, just swap
-        if action is None and filling is actions: # first sep!
-            filling = sub_actions
-        else:
-            filling.append(action)
+    actions, sub_actions = separate_actions(ret)
+    actions.insert(0, None) # always start with a sep
     if logger.isEnabledFor(logging.DEBUG):
         logger.debug("actions for %s are %s/%s",
                      filenames,
                      [a.id for a in actions if a],
                      [a.id for a in sub_actions if a])
     return actions, sub_actions
+    
+def separate_actions(actions):
+    toplevel_actions = []
+    sub_actions = []
+    filling = toplevel_actions
+    for a in actions:
+        if type(a) is TbzrMenu:
+            filling = sub_actions
+        else:
+            filling.append(a)
+    return toplevel_actions, sub_actions
+

=== modified file 'tbzrlib/app.py'
--- tbzrlib/app.py	2010-08-05 18:04:39 +0000
+++ tbzrlib/app.py	2010-12-04 03:59:48 +0000
@@ -171,6 +171,14 @@
         return (self.config.get(config_name) or
                 path.is_matched(self.config.get("icon_overlays.include_path")))
 
+    def is_path_allowed_for_cmenu(self, path):
+        if path.is_matched(self.config.get("context_menu.exclude_path")):
+            return False
+
+        config_name = "queried_drives_cmenu." + path.get_device_type()
+        return (self.config.get(config_name) or
+                path.is_matched(self.config.get("context_menu.include_path")))
+
     def initialize(self):
         i18n.install()
         self.on_activity()

=== modified file 'tbzrlib/config.py'
--- tbzrlib/config.py	2010-04-26 12:35:10 +0000
+++ tbzrlib/config.py	2010-12-04 03:59:48 +0000
@@ -99,6 +99,34 @@
             BoolOpt(True, N_("Show an icon in the taskbar when tbzrcache is running"),
                     N_("If set, then an icon will be created in the taskbar, providing a menu for shutting down the application, displaying preferences, etc.")),
     },
+    'queried_drives_cmenu' : {
+        'removable' :
+            BoolOpt(True, N_("Removable devices")),
+        'floppy' :
+            BoolOpt(True, N_("Floppy Drives")),
+        'cdrom' :
+            BoolOpt(True, N_("CD and DVD Drives")),
+        'fixed' :
+            BoolOpt(True, N_("Fixed disks")),
+        'remote' :
+            BoolOpt(True, N_("Network Drives")),
+        'unknown' :
+            BoolOpt(False, N_("Unknown Drives")),
+    },
+    'context_menu' : {
+        'actions' :
+            StringOpt("", N_("Actions")),
+        'sub_actions' :
+            StringOpt("", N_("Sub actions")),
+        'include_path' :
+            StringOpt("", N_("Include path"),
+                    N_("Specify folder paths (separated by newline) in which tbzr will show bazaar commands in context menu.\n"
+                       "You can use wildcard here.(*, ?, [abc], [!abc])")),
+        'exclude_path' :
+            StringOpt("", N_("Exclude path"),
+                    N_("Specify folder paths (separated by newline) in which tbzr will not show bazaar commands in context menu.\n"
+                       "You can use wildcard here.(*, ?, [abc], [!abc])")),
+    },
 }
 
 class Config(object):

=== modified file 'tbzrlib/dispatcher.py'
--- tbzrlib/dispatcher.py	2010-07-16 02:23:30 +0000
+++ tbzrlib/dispatcher.py	2010-12-04 03:59:48 +0000
@@ -164,25 +164,26 @@
                     fixup_ico(a.ico_file), commands)
         items.append(item)
     # and children
-    depth += 1
-    last = None
-    for a in subs:
-        if a is None:
-            if last is None:
-                continue # avoid dupe seps
-            item = (0, depth, u"", u"", u"", [])
-        else:
-            commands = [(c.keystate, c.exec_options, c.cmdline) for c in a.commands]
-            item = (MENU_FLAG_NORMAL, depth, gettext(a.text), gettext(a.long_text),
-                    fixup_ico(a.ico_file), commands)
+    if subs:
+        depth += 1
+        last = None
+        for a in subs:
+            if a is None:
+                if last is None:
+                    continue # avoid dupe seps
+                item = (0, depth, u"", u"", u"", [])
+            else:
+                commands = [(c.keystate, c.exec_options, c.cmdline) for c in a.commands]
+                item = (MENU_FLAG_NORMAL, depth, gettext(a.text), gettext(a.long_text),
+                        fixup_ico(a.ico_file), commands)
+            items.append(item)
+            last = a
+        # and finally the "parent" of the children, which goes last
+        depth -= 1
+        item = (MENU_FLAG_NORMAL, depth, u"&Tortoise Bazaar",
+                gettext("More Tortoise Bazaar options"),
+                fixup_ico("bzr.ico"), [])
         items.append(item)
-        last = a
-    # and finally the "parent" of the children, which goes last
-    depth -= 1
-    item = (MENU_FLAG_NORMAL, depth, u"&Tortoise Bazaar",
-            gettext("More Tortoise Bazaar options"),
-            fixup_ico("bzr.ico"), [])
-    items.append(item)
     return items
 
 class CommandDispatcher:

=== modified file 'tbzrlib/ui/taskbar.py'
--- tbzrlib/ui/taskbar.py	2010-07-11 12:17:53 +0000
+++ tbzrlib/ui/taskbar.py	2010-12-04 03:59:48 +0000
@@ -33,9 +33,8 @@
 
 # Loads an icon given a string in one of the formats we support.
 # NOTE: you must call win32gui.DestroyIcon on the result if not None
-def load_icon(ico_name):
+def load_icon(ico_name, ico_flags = win32con.LR_DEFAULTSIZE, cx = 0, cy = 0):
     ico = fixup_ico(ico_name)
-    ico_flags = win32con.LR_DEFAULTSIZE
     try:
         if '#' in ico:
             mod_name, res = ico.split('#', 1)
@@ -49,7 +48,7 @@
             ico_flags |= win32con.LR_LOADFROMFILE
             logger.debug("Loading icon file %r", ico)
 
-        hico = win32gui.LoadImage(mod, res, win32con.IMAGE_ICON, 0, 0,
+        hico = win32gui.LoadImage(mod, res, win32con.IMAGE_ICON, cx, cy,
                                   ico_flags)
     except win32gui.error, exc:
         logger.error("Failed to load icon %r: %s", ico, exc)