diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-13 13:51:23 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-08-13 13:51:23 +0200 |
commit | 9e618cc3f9a59038213aa8a91382a4c84315f569 (patch) | |
tree | 62a1ac64c4a6299e6ab787864ed3b97305acdecc /resources/ui | |
parent | 394ad3b32f9f79775bcac4c6cc2a4dfa74586800 (diff) | |
parent | d98e3381ccbe703a6df8fad73b69546dd72a8705 (diff) |
Merge branch 'release/0.7.1-1'0.7.1-1
Diffstat (limited to 'resources/ui')
-rw-r--r-- | resources/ui/icon_select.ui | 18 | ||||
-rw-r--r-- | resources/ui/pie_options.ui | 51 | ||||
-rw-r--r-- | resources/ui/preferences.ui | 33 | ||||
-rw-r--r-- | resources/ui/slice_select.ui | 22 |
4 files changed, 39 insertions, 85 deletions
diff --git a/resources/ui/icon_select.ui b/resources/ui/icon_select.ui index 6870f53..f9a7ee2 100644 --- a/resources/ui/icon_select.ui +++ b/resources/ui/icon_select.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.8"/> <object class="GtkWindow" id="window"> @@ -41,20 +41,6 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkBox" id="combo-box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkEntry" id="filter-entry"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -157,7 +143,6 @@ <child> <object class="GtkButton" id="cancel-button"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -172,7 +157,6 @@ <child> <object class="GtkButton" id="ok-button"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/resources/ui/pie_options.ui b/resources/ui/pie_options.ui index 0e0820b..883e0ea 100644 --- a/resources/ui/pie_options.ui +++ b/resources/ui/pie_options.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.8"/> <object class="GtkImage" id="shape1"> @@ -70,7 +70,6 @@ <child> <object class="GtkButton" id="cancel-button"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -86,7 +85,6 @@ <child> <object class="GtkButton" id="ok-button"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -118,11 +116,10 @@ <property name="can_focus">False</property> <child> <object class="GtkButton" id="icon-button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> <property name="focus_on_click">False</property> + <property name="receives_default">True</property> <child> <object class="GtkImage" id="icon"> <property name="visible">True</property> @@ -180,20 +177,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkLabel" id="id-label"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">0.11999999731779099</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -211,8 +194,8 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="hexpand">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes">ID:</property> <property name="ellipsize">middle</property> <attributes> @@ -227,10 +210,10 @@ </packing> </child> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="hint"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> + <property name="halign">end</property> <property name="label" translatable="yes">It's possible to bind mouse buttons as well!</property> <attributes> <attribute name="weight" value="light"/> @@ -251,7 +234,7 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkFrame" id="optionsFrame"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> @@ -272,14 +255,13 @@ <child> <object class="GtkCheckButton" id="turbo-check"> <property name="label" translatable="yes">Turbo mode</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If checked, the Pie will close when you release the chosen hot key.</property> <property name="tooltip_text" translatable="yes">If checked, the Pie will close when you release the chosen hot key.</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -291,14 +273,13 @@ <child> <object class="GtkCheckButton" id="delay-check"> <property name="label" translatable="yes">Long press for activation</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If checked, the Pie will only open if you press this hot key a bit longer.</property> <property name="tooltip_text" translatable="yes">If checked, the Pie will only open if you press this hot key a bit longer.</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -310,14 +291,13 @@ <child> <object class="GtkCheckButton" id="center-check"> <property name="label" translatable="yes">Open Pie centered on the screen</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If checked, the Pie will open in the middle of your screen. Else it will pop up at your pointer.</property> <property name="tooltip_text" translatable="yes">If checked, the Pie will open in the middle of your screen. Else it will pop up at your pointer.</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -329,14 +309,13 @@ <child> <object class="GtkCheckButton" id="warp-check"> <property name="label" translatable="yes">Warp mouse pointer to center of Pie</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If checked, the mouse pointer will be warped to the center of the Pie. This allows for quick selections even if the Pie is opened at the screen's boundary.</property> <property name="tooltip_text" translatable="yes">If checked, the mouse pointer will be warped to the center of the Pie. This allows for quick selections even if the Pie is opened at the screen's boundary.</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -398,7 +377,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape1</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> </object> @@ -413,7 +391,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape2</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> @@ -429,7 +406,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape3</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> @@ -445,7 +421,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape4</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> @@ -461,7 +436,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape5</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> @@ -477,7 +451,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape6</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> @@ -493,7 +466,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape7</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> @@ -509,7 +481,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape8</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> @@ -525,7 +496,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="image">shape9</property> - <property name="xalign">0</property> <property name="always_show_image">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> @@ -549,7 +519,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, the shape will be automatically selected to minimize mouse travelling.</property> - <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">rshape1</property> diff --git a/resources/ui/preferences.ui b/resources/ui/preferences.ui index 8f9eebc..2c15fea 100644 --- a/resources/ui/preferences.ui +++ b/resources/ui/preferences.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.8"/> <object class="GtkWindow" id="window"> @@ -39,14 +39,13 @@ <child> <object class="GtkCheckButton" id="autostart-checkbox"> <property name="label" translatable="yes">Start Gnome-Pie on login</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If checked, Gnome-Pie will start silently everytime you log in.</property> <property name="tooltip_text" translatable="yes">If checked, Gnome-Pie will start silently everytime you log in.</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -58,14 +57,13 @@ <child> <object class="GtkCheckButton" id="indicator-checkbox"> <property name="label" translatable="yes">Display panel icon </property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If not checked, you can access this menu by launching Gnome-Pie a second time.</property> <property name="tooltip_text" translatable="yes">If not checked, you can access this menu by launching Gnome-Pie a second time.</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -77,14 +75,13 @@ <child> <object class="GtkCheckButton" id="select-by-string-checkbox"> <property name="label" translatable="yes">Select Slices by typing their names</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If checked, you can select items in a Pie by typing their names. Otherwise you can activate them with a hotkey (which can be displayed by pressing ALT when a Pie is openened).</property> <property name="tooltip_text" translatable="yes">If checked, you can select items in a Pie by typing their names. Otherwise you can activate them with a hotkey (which can be displayed by pressing ALT when a Pie is openened).</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -96,14 +93,13 @@ <child> <object class="GtkCheckButton" id="captions-checkbox"> <property name="label" translatable="yes">Display Slice labels</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property> <property name="tooltip_text" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="draw_indicator">True</property> </object> <packing> @@ -725,13 +721,14 @@ <object class="GtkBox" id="pie-edit-box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">2</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="no-slice-label"> <property name="can_focus">False</property> - <property name="xpad">6</property> - <property name="ypad">6</property> + <property name="margin_left">6</property> + <property name="margin_right">6</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> <property name="label" translatable="yes"><b><big>This Pie is empty!</big> Start adding Slices to it!</b> This can be done by dragging stuff to the plus sign below. You can try a lot! For example application launchers or folders. Even URLs from your browser are possible... @@ -751,8 +748,10 @@ For manual and advanced configuration click on the plus sign.</property> <child> <object class="GtkLabel" id="no-pie-label"> <property name="can_focus">False</property> - <property name="xpad">6</property> - <property name="ypad">6</property> + <property name="margin_left">6</property> + <property name="margin_right">6</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> <property name="label" translatable="yes"><b><big>You have no Pies!</big> Start by creating one! </b> This can be done by clicking on the tiny little plus sign in the lower left corner.</property> @@ -775,6 +774,9 @@ Start by creating one! </b> This can be done by clicking on the tiny littl <child> <placeholder/> </child> + <style> + <class name="view"/> + </style> </object> <packing> <property name="expand">True</property> @@ -801,6 +803,9 @@ Start by creating one! </b> This can be done by clicking on the tiny littl <property name="position">3</property> </packing> </child> + <style> + <class name="view"/> + </style> </object> </child> </object> diff --git a/resources/ui/slice_select.ui b/resources/ui/slice_select.ui index 6db2adf..10672dd 100644 --- a/resources/ui/slice_select.ui +++ b/resources/ui/slice_select.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.8"/> <object class="GtkDialog" id="window"> @@ -24,7 +24,6 @@ <child> <object class="GtkButton" id="cancel-button"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -39,7 +38,6 @@ <child> <object class="GtkButton" id="ok-button"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -102,7 +100,6 @@ <property name="spacing">6</property> <child> <object class="GtkButton" id="icon-button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -138,7 +135,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">There are no options for this Slice type.</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -163,8 +159,8 @@ <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">URI to open</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -201,8 +197,8 @@ <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Command to execute</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -230,8 +226,8 @@ <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Hotkey to press</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -259,8 +255,8 @@ <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Pie to open</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -288,8 +284,8 @@ <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Name of the Slice </property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -326,8 +322,8 @@ <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Is Quick Action</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -365,8 +361,8 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Clipboard history length</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -405,8 +401,8 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Current workspace only</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> |