mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-08-30 23:00:21 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
5c5d168369
@ -117,6 +117,11 @@
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><p>Click to move the row up 1. Shift+click to move the row up 5.
|
||||
Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.
|
||||
Keyboard shortcut: Ctrl-Up arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
|
||||
@ -141,6 +146,11 @@
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><p>Click to move the row down 1. Shift+click to move the row down 5.
|
||||
Ctrl+click to move the row down 10. Ctrl+Shift+click to move the row to the bottom.
|
||||
Keyboard shortcut: Ctrl-Down arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
|
||||
|
@ -1060,12 +1060,18 @@ class EditRules(QWidget): # {{{
|
||||
|
||||
self.up_button = b = QToolButton(self)
|
||||
b.setIcon(QIcon.ic('arrow-up.png'))
|
||||
b.setToolTip(_('Move the selected rule up'))
|
||||
b.setToolTip('<p>' + _('Click to move the row up 1. Shift+click '
|
||||
'to move the row up 5. Ctrl+click to move the row up 10. '
|
||||
'Ctrl+Shift+click to move the row to the top. '
|
||||
'Keyboard shortcut: Ctrl-Up arrow') + '</p>')
|
||||
b.clicked.connect(partial(self.move_rows, moving_up=True))
|
||||
g.addWidget(b, 0, 1, 1, 1, Qt.AlignmentFlag.AlignTop)
|
||||
self.down_button = b = QToolButton(self)
|
||||
b.setIcon(QIcon.ic('arrow-down.png'))
|
||||
b.setToolTip(_('Move the selected rule down'))
|
||||
b.setToolTip('<p>' + _('Click to move the row down 1. Shift+click to move the '
|
||||
'row down 5. Ctrl+click to move the row down 10. Ctrl+Shift+click '
|
||||
'to move the row to the bottom. '
|
||||
'Keyboard shortcut: Ctrl-Down arrow') + '</p>')
|
||||
b.clicked.connect(partial(self.move_rows, moving_up=False))
|
||||
self.rules_view.set_movement_functions(partial(self.move_rows, moving_up=True),
|
||||
partial(self.move_rows, moving_up=False))
|
||||
|
@ -40,7 +40,8 @@
|
||||
<widget class="QToolButton" name="column_up">
|
||||
<property name="toolTip">
|
||||
<string><p>Click to move the row up 1. Shift+click to move the row up 5.
|
||||
Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.</p></string>
|
||||
Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.
|
||||
Keyboard shortcut: Ctrl-Up arrow</p></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
@ -173,7 +174,8 @@ Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.&l
|
||||
<widget class="QToolButton" name="column_down">
|
||||
<property name="toolTip">
|
||||
<string><p>Click to move the row down 1. Shift+click to move the row down 5.
|
||||
Ctrl+click to move the row down 10. Ctrl+Shift+click to move the row to the bottom.</p></string>
|
||||
Ctrl+click to move the row down 10. Ctrl+Shift+click to move the row to the bottom.
|
||||
Keyboard shortcut: Ctrl-Down arrow</p></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
|
@ -60,7 +60,9 @@
|
||||
<item row="3" column="1">
|
||||
<widget class="QToolButton" name="df_down_button">
|
||||
<property name="toolTip">
|
||||
<string>Move down. Keyboard shortcut: Ctrl-Down arrow</string>
|
||||
<string><p>Click to move the row down 1. Shift+click to move the row down 5.
|
||||
Ctrl+click to move the row down 10. Ctrl+Shift+click to move the row to the bottom.
|
||||
Keyboard shortcut: Ctrl-Down arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
@ -71,7 +73,9 @@
|
||||
<item row="1" column="1">
|
||||
<widget class="QToolButton" name="df_up_button">
|
||||
<property name="toolTip">
|
||||
<string>Move up. Keyboard shortcut: Ctrl-Up arrow</string>
|
||||
<string><p>Click to move the row up 1. Shift+click to move the row up 5.
|
||||
Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.
|
||||
Keyboard shortcut: Ctrl-Up arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
|
@ -41,7 +41,9 @@
|
||||
<item row="3" column="1">
|
||||
<widget class="QToolButton" name="em_down_button">
|
||||
<property name="toolTip">
|
||||
<string>Move down. Keyboard shortcut: Ctrl-Down arrow</string>
|
||||
<string><p>Click to move the row up 1. Shift+click to move the row up 5.
|
||||
Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.
|
||||
Keyboard shortcut: Ctrl-Up arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../../resources/images.qrc">
|
||||
@ -52,7 +54,9 @@
|
||||
<item row="1" column="1">
|
||||
<widget class="QToolButton" name="em_up_button">
|
||||
<property name="toolTip">
|
||||
<string>Move up. Keyboard shortcut: Ctrl-Up arrow</string>
|
||||
<string><p>Click to move the row up 1. Shift+click to move the row up 5.
|
||||
Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.
|
||||
Keyboard shortcut: Ctrl-Down arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../../resources/images.qrc">
|
||||
|
@ -61,7 +61,9 @@ column being examined (the left-hand panel)</p></string>
|
||||
<item row="0" column="1">
|
||||
<widget class="QToolButton" name="qv_up_button">
|
||||
<property name="toolTip">
|
||||
<string>Move up. Keyboard shortcut: Ctrl-Up arrow</string>
|
||||
<string><p>Click to move the row up 1. Shift+click to move the row up 5.
|
||||
Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.
|
||||
Keyboard shortcut: Ctrl-Up arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../../resources/images.qrc">
|
||||
@ -72,7 +74,9 @@ column being examined (the left-hand panel)</p></string>
|
||||
<item row="2" column="1">
|
||||
<widget class="QToolButton" name="qv_down_button">
|
||||
<property name="toolTip">
|
||||
<string>Move down. Keyboard shortcut: Ctrl-Down arrow</string>
|
||||
<string><p>Click to move the row down 1. Shift+click to move the row down 5.
|
||||
Ctrl+click to move the row down 10. Ctrl+Shift+click to move the row to the bottom.
|
||||
Keyboard shortcut: Ctrl-Down arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../../resources/images.qrc">
|
||||
|
@ -32,7 +32,10 @@
|
||||
<item row="1" column="1">
|
||||
<widget class="QToolButton" name="tb_up_button">
|
||||
<property name="toolTip">
|
||||
<string>Move up. User categories and Saved searches cannot be moved. Keyboard shortcut: Ctrl-Up arrow</string>
|
||||
<string><p>Click to move the row up 1. Shift+click to move the row up 5.
|
||||
Ctrl+click to move the row up 10. Ctrl+Shift+click to move the row to the top.
|
||||
User categories and Saved searches cannot be moved.
|
||||
Keyboard shortcut: Ctrl-Up arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../../resources/images.qrc">
|
||||
@ -56,7 +59,10 @@
|
||||
<item row="3" column="1">
|
||||
<widget class="QToolButton" name="tb_down_button">
|
||||
<property name="toolTip">
|
||||
<string>Move down. User categories and Saved searches cannot be moved. Keyboard shortcut: Ctrl-Down arrow</string>
|
||||
<string><p>Click to move the row down 1. Shift+click to move the row down 5.
|
||||
Ctrl+click to move the row down 10. Ctrl+Shift+click to move the row to the bottom.
|
||||
User categories and Saved searches cannot be moved.
|
||||
Keyboard shortcut: Ctrl-Down arrow</p></string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../../resources/images.qrc">
|
||||
|
Loading…
x
Reference in New Issue
Block a user