diff options
| author | Julien Valroff <julien@kirya.net> | 2011-04-16 16:39:17 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2011-04-16 16:39:17 +0200 |
| commit | 5539b9c5aa11891c66104fe51ebb5e9b4ad31538 (patch) | |
| tree | a08efd10faf1ac622a62e29d17da6d4f1f0aeac3 /rapid/glade3/rapid.ui | |
| parent | 07934178861343ee213674120db367b8faeef1be (diff) | |
| parent | 75b28642dd41fb4a7925b42cb24274de90a4f52c (diff) | |
Merge commit 'upstream/0.4.0_beta1' into experimental
Diffstat (limited to 'rapid/glade3/rapid.ui')
| -rw-r--r-- | rapid/glade3/rapid.ui | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rapid/glade3/rapid.ui b/rapid/glade3/rapid.ui index 1b587b4..bd9638e 100644 --- a/rapid/glade3/rapid.ui +++ b/rapid/glade3/rapid.ui @@ -253,8 +253,8 @@ <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/> <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/> + <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/> </object> </child> <child> @@ -405,8 +405,8 @@ <object class="GtkScrolledWindow" id="device_collection_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">never</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> <child> <object class="GtkViewport" id="device_collection_viewport"> <property name="visible">True</property> |