Merge lp:~merlijn-sebrechts/xpad/better_menus into lp:xpad
- better_menus
- Merge into trunk
Status: | Merged |
---|---|
Merged at revision: | 713 |
Proposed branch: | lp:~merlijn-sebrechts/xpad/better_menus |
Merge into: | lp:xpad |
Diff against target: |
494 lines (+171/-137) 3 files modified
README (+3/-2) src/xpad-pad.c (+14/-126) src/xpad-preferences.c (+154/-9) |
To merge this branch: | bzr merge lp:~merlijn-sebrechts/xpad/better_menus |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Arthur Borsboom | Pending | ||
Review via email: mp+244712@code.launchpad.net |
Commit message
Description of the change
Implemented changes in menu as per blueprint https:/
Arthur Borsboom (arthurborsboom) wrote : | # |
Arthur Borsboom (arthurborsboom) wrote : | # |
Hi Merlijn,
The new menus look fine and are according to specification.
I have one request for a change.
The Edit and Close items look a bit out of order.
Would you mind to switch the Edit and Close menu items and ask for another merge?
| New
| Delete
| Close
+ Edit
| Undo
| Redo
---------
| Paste
-----------
| Layout
- 718. By Merlijn Sebrechts
-
Switched edit and close
- 719. By Merlijn Sebrechts
-
fixed bug in README
README didn't mention autogen.sh and didn't mention make install should be run as root. Fixed this
Merlijn Sebrechts (merlijn-sebrechts) wrote : | # |
I switched edit and close. I also found a bug in the README. It didn't mention autogen.sh, and it didn't mention make install should be run as root.
Arthur Borsboom (arthurborsboom) wrote : | # |
Hi Merlijn, Thans for making the change. I will redo the merge and test.
For the README I believe you are partially correct.
Developers have to run the autogen.sh, that is true.
However, the 'ready' packages which users can download at the launchpad
website (https:/
run the autogen.sh for them when creating this package.
For the make install, I believe you are right. I will add the fact that you
have to run the 'make install' as root. Good point.
Thank you for your help.
Stay tuned. :)
On 21 December 2014 at 12:31, Merlijn Sebrechts <<email address hidden>
> wrote:
> I switched edit and close. I also found a bug in the README. It didn't
> mention autogen.sh, and it didn't mention make install should be run as
> root.
> --
>
> https:/
> You are requested to review the proposed merge of
> lp:~merlijn-sebrechts/xpad/better_menus into lp:xpad.
>
--
Arthur Borsboom
Lieven de Keystraat 77
3067 KG, Rotterdam
The Netherlands
Mob: +31629089953
Email: <email address hidden>
Skype: Arthur Borsboom, The Hague, The Netherlands
[image: View Arthur's LinkedIn profile]
<http://
Preview Diff
1 | === modified file 'README' | |||
2 | --- README 2014-11-22 15:21:30 +0000 | |||
3 | +++ README 2014-12-21 11:27:28 +0000 | |||
4 | @@ -7,8 +7,9 @@ | |||
5 | 7 | -------------------------------------------------------------------------- | 7 | -------------------------------------------------------------------------- |
6 | 8 | INSTALLATION NOTES | 8 | INSTALLATION NOTES |
7 | 9 | -------------------------------------------------------------------------- | 9 | -------------------------------------------------------------------------- |
10 | 10 | To compile, just type "./configure", "make", and "make install". | 10 | To compile, run "./autogen.sh", which will give you all files to |
11 | 11 | Type "xpad" now to run. | 11 | compile and make the package. Then type "./configure" and "make". |
12 | 12 | Finally, run "make install" as root. Type "xpad" now to run. | ||
13 | 12 | 13 | ||
14 | 13 | Read the INSTALL file for more information. | 14 | Read the INSTALL file for more information. |
15 | 14 | 15 | ||
16 | 15 | 16 | ||
17 | === modified file 'src/xpad-pad.c' | |||
18 | --- src/xpad-pad.c 2014-11-22 12:14:17 +0000 | |||
19 | +++ src/xpad-pad.c 2014-12-21 11:27:28 +0000 | |||
20 | @@ -506,10 +506,6 @@ | |||
21 | 506 | gboolean decorations; | 506 | gboolean decorations; |
22 | 507 | g_object_get (pad->priv->settings, "has-decorations", &decorations, NULL); | 507 | g_object_get (pad->priv->settings, "has-decorations", &decorations, NULL); |
23 | 508 | 508 | ||
24 | 509 | /* Update pad menu with the new status */ | ||
25 | 510 | GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-decorations"); | ||
26 | 511 | gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), decorations); | ||
27 | 512 | |||
28 | 513 | /* | 509 | /* |
29 | 514 | * There are two modes of operation: a normal mode and a 'stealth' mode. | 510 | * There are two modes of operation: a normal mode and a 'stealth' mode. |
30 | 515 | * If decorations are disabled, we also don't show up in the taskbar or pager. | 511 | * If decorations are disabled, we also don't show up in the taskbar or pager. |
31 | @@ -535,12 +531,6 @@ | |||
32 | 535 | gboolean has_toolbar, autohide_toolbar; | 531 | gboolean has_toolbar, autohide_toolbar; |
33 | 536 | g_object_get (pad->priv->settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL); | 532 | g_object_get (pad->priv->settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL); |
34 | 537 | 533 | ||
35 | 538 | /* Update pad menu with the new status */ | ||
36 | 539 | GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-toolbar"); | ||
37 | 540 | gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), has_toolbar); | ||
38 | 541 | menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-autohide-toolbar"); | ||
39 | 542 | gtk_widget_set_sensitive (menu_item, has_toolbar); | ||
40 | 543 | |||
41 | 544 | if (has_toolbar && !autohide_toolbar) | 534 | if (has_toolbar && !autohide_toolbar) |
42 | 545 | xpad_pad_show_toolbar (pad); | 535 | xpad_pad_show_toolbar (pad); |
43 | 546 | else | 536 | else |
44 | @@ -553,10 +543,6 @@ | |||
45 | 553 | gboolean autohide_toolbar; | 543 | gboolean autohide_toolbar; |
46 | 554 | g_object_get (pad->priv->settings, "autohide-toolbar", &autohide_toolbar, NULL); | 544 | g_object_get (pad->priv->settings, "autohide-toolbar", &autohide_toolbar, NULL); |
47 | 555 | 545 | ||
48 | 556 | /* Update pad menu with the new status */ | ||
49 | 557 | GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-autohide-toolbar"); | ||
50 | 558 | gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), autohide_toolbar); | ||
51 | 559 | |||
52 | 560 | if (autohide_toolbar) | 546 | if (autohide_toolbar) |
53 | 561 | { | 547 | { |
54 | 562 | /* Likely not to be in pad when turning setting on */ | 548 | /* Likely not to be in pad when turning setting on */ |
55 | @@ -579,10 +565,6 @@ | |||
56 | 579 | gboolean has_scrollbar; | 565 | gboolean has_scrollbar; |
57 | 580 | g_object_get (pad->priv->settings, "has-scrollbar", &has_scrollbar, NULL); | 566 | g_object_get (pad->priv->settings, "has-scrollbar", &has_scrollbar, NULL); |
58 | 581 | 567 | ||
59 | 582 | /* Update pad menu with the new status */ | ||
60 | 583 | GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-scrollbar"); | ||
61 | 584 | gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), has_scrollbar); | ||
62 | 585 | |||
63 | 586 | if (has_scrollbar) | 568 | if (has_scrollbar) |
64 | 587 | gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar), | 569 | gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar), |
65 | 588 | GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); | 570 | GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); |
66 | @@ -892,7 +874,7 @@ | |||
67 | 892 | if (!pad->priv->properties) | 874 | if (!pad->priv->properties) |
68 | 893 | return; | 875 | return; |
69 | 894 | 876 | ||
71 | 895 | title = g_strdup_printf (_("'%s' Properties"), gtk_window_get_title (GTK_WINDOW (pad))); | 877 | title = g_strdup_printf (_("'%s' Layout"), gtk_window_get_title (GTK_WINDOW (pad))); |
72 | 896 | gtk_window_set_title (GTK_WINDOW (pad->priv->properties), title); | 878 | gtk_window_set_title (GTK_WINDOW (pad->priv->properties), title); |
73 | 897 | g_free (title); | 879 | g_free (title); |
74 | 898 | } | 880 | } |
75 | @@ -1304,38 +1286,6 @@ | |||
76 | 1304 | gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, &text_color); | 1286 | gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, &text_color); |
77 | 1305 | } | 1287 | } |
78 | 1306 | 1288 | ||
79 | 1307 | /* | ||
80 | 1308 | * Find the sticky notes menu setting for this pad (which is on the global default), | ||
81 | 1309 | * and change its setting to the setting from the info file (pad specific default). | ||
82 | 1310 | */ | ||
83 | 1311 | if (GTK_IS_CONTAINER (pad->priv->menu)) { | ||
84 | 1312 | GObject *obj; | ||
85 | 1313 | GList *elem, *children; | ||
86 | 1314 | children = gtk_container_get_children (GTK_CONTAINER (pad->priv->menu)); | ||
87 | 1315 | |||
88 | 1316 | for (elem = children; elem; elem = elem->next) { | ||
89 | 1317 | obj = (GObject *) elem->data; | ||
90 | 1318 | |||
91 | 1319 | if (GTK_IS_BIN (obj) && GTK_IS_MENU_ITEM (obj)) { | ||
92 | 1320 | GList *elem2, *children2; | ||
93 | 1321 | children2 = gtk_container_get_children (GTK_CONTAINER (gtk_menu_item_get_submenu (GTK_MENU_ITEM(obj)))); | ||
94 | 1322 | for(elem2 = children2; elem2; elem2 = elem2->next) { | ||
95 | 1323 | obj = (GObject *) elem2->data; | ||
96 | 1324 | if (GTK_IS_CHECK_MENU_ITEM (obj)) { | ||
97 | 1325 | if (!g_strcmp0(gtk_menu_item_get_label (GTK_MENU_ITEM (obj)), "Show on _All Workspaces")) { | ||
98 | 1326 | gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (obj), pad->priv->sticky); | ||
99 | 1327 | break; | ||
100 | 1328 | } | ||
101 | 1329 | } | ||
102 | 1330 | } | ||
103 | 1331 | g_list_free(elem2); | ||
104 | 1332 | } | ||
105 | 1333 | } | ||
106 | 1334 | g_list_free(elem); | ||
107 | 1335 | } | ||
108 | 1336 | else | ||
109 | 1337 | g_warning("For some reason the variable pad->priv->menu is not a container. This results in not having a unique sticky setting for this pad. Falling back to the global sticky setting. Please send a bugreport."); | ||
110 | 1338 | |||
111 | 1339 | if (pad->priv->sticky) | 1289 | if (pad->priv->sticky) |
112 | 1340 | gtk_window_stick (GTK_WINDOW (pad)); | 1290 | gtk_window_stick (GTK_WINDOW (pad)); |
113 | 1341 | else | 1291 | else |
114 | @@ -1537,45 +1487,6 @@ | |||
115 | 1537 | menu_toggle_tag (pad, "strikethrough"); | 1487 | menu_toggle_tag (pad, "strikethrough"); |
116 | 1538 | } | 1488 | } |
117 | 1539 | 1489 | ||
118 | 1540 | /* | ||
119 | 1541 | * Make the pad visually stick to the workspace and save this setting to the individual pad info file, | ||
120 | 1542 | * because this function has been probably been called, because of a menu toggle. | ||
121 | 1543 | */ | ||
122 | 1544 | static void | ||
123 | 1545 | menu_sticky (GtkCheckMenuItem *check, XpadPad *pad) | ||
124 | 1546 | { | ||
125 | 1547 | pad->priv->sticky = gtk_check_menu_item_get_active (check); | ||
126 | 1548 | if (pad->priv->sticky) | ||
127 | 1549 | gtk_window_stick (GTK_WINDOW (pad)); | ||
128 | 1550 | else | ||
129 | 1551 | gtk_window_unstick (GTK_WINDOW (pad)); | ||
130 | 1552 | xpad_pad_save_info_delayed (pad); | ||
131 | 1553 | } | ||
132 | 1554 | |||
133 | 1555 | static void | ||
134 | 1556 | menu_toolbar (GtkCheckMenuItem *check, XpadPad *pad) | ||
135 | 1557 | { | ||
136 | 1558 | g_object_set (pad->priv->settings, "has-toolbar", gtk_check_menu_item_get_active (check), NULL); | ||
137 | 1559 | } | ||
138 | 1560 | |||
139 | 1561 | static void | ||
140 | 1562 | menu_scrollbar (GtkCheckMenuItem *check, XpadPad *pad) | ||
141 | 1563 | { | ||
142 | 1564 | g_object_set (pad->priv->settings, "has-scrollbar", gtk_check_menu_item_get_active (check), NULL); | ||
143 | 1565 | } | ||
144 | 1566 | |||
145 | 1567 | static void | ||
146 | 1568 | menu_autohide (GtkCheckMenuItem *check, XpadPad *pad) | ||
147 | 1569 | { | ||
148 | 1570 | g_object_set (pad->priv->settings, "autohide-toolbar", gtk_check_menu_item_get_active (check), NULL); | ||
149 | 1571 | } | ||
150 | 1572 | |||
151 | 1573 | static void | ||
152 | 1574 | menu_decorated (GtkCheckMenuItem *check, XpadPad *pad) | ||
153 | 1575 | { | ||
154 | 1576 | g_object_set (pad->priv->settings, "has-decorations", gtk_check_menu_item_get_active (check), NULL); | ||
155 | 1577 | } | ||
156 | 1578 | |||
157 | 1579 | static gint | 1490 | static gint |
158 | 1580 | menu_title_compare (GtkWindow *a, GtkWindow *b) | 1491 | menu_title_compare (GtkWindow *a, GtkWindow *b) |
159 | 1581 | { | 1492 | { |
160 | @@ -1625,30 +1536,14 @@ | |||
161 | 1625 | menu_get_popup_no_highlight (XpadPad *pad, GtkAccelGroup *accel_group) | 1536 | menu_get_popup_no_highlight (XpadPad *pad, GtkAccelGroup *accel_group) |
162 | 1626 | { | 1537 | { |
163 | 1627 | GtkWidget *uppermenu, *menu, *item; | 1538 | GtkWidget *uppermenu, *menu, *item; |
172 | 1628 | gboolean has_toolbar, autohide_toolbar, has_scrollbar, decorations; | 1539 | |
173 | 1629 | 1540 | /* Upper menu */ | |
166 | 1630 | g_object_get (pad->priv->settings, | ||
167 | 1631 | "has-toolbar", &has_toolbar, | ||
168 | 1632 | "autohide-toolbar", &autohide_toolbar, | ||
169 | 1633 | "has-decorations", &decorations, | ||
170 | 1634 | "has-scrollbar", &has_scrollbar, NULL); | ||
171 | 1635 | |||
174 | 1636 | uppermenu = gtk_menu_new (); | 1541 | uppermenu = gtk_menu_new (); |
175 | 1637 | gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group); | 1542 | gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group); |
182 | 1638 | 1543 | menu = uppermenu; | |
177 | 1639 | /* Pad submenu */ | ||
178 | 1640 | item = gtk_menu_item_new_with_mnemonic (_("_Pad")); | ||
179 | 1641 | gtk_container_add (GTK_CONTAINER (uppermenu), item); | ||
180 | 1642 | menu = gtk_menu_new (); | ||
181 | 1643 | gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); | ||
183 | 1644 | MENU_ADD (_("_New"), "document-new", GDK_KEY_N, GDK_CONTROL_MASK, xpad_pad_spawn); | 1544 | MENU_ADD (_("_New"), "document-new", GDK_KEY_N, GDK_CONTROL_MASK, xpad_pad_spawn); |
189 | 1645 | MENU_ADD_SEP (); | 1545 | MENU_ADD (_("_Delete"), "edit-delete", GDK_KEY_Delete, GDK_SHIFT_MASK, xpad_pad_delete); |
185 | 1646 | MENU_ADD_CHECK (_("Show on _All Workspaces"), pad->priv->sticky, menu_sticky); | ||
186 | 1647 | g_object_set_data (G_OBJECT (uppermenu), "sticky", item); | ||
187 | 1648 | MENU_ADD (_("_Properties"), "document-properties", 0, 0, xpad_pad_open_properties); | ||
188 | 1649 | MENU_ADD_SEP (); | ||
190 | 1650 | MENU_ADD (_("_Close"), "window-close", 0, 0, xpad_pad_close); | 1546 | MENU_ADD (_("_Close"), "window-close", 0, 0, xpad_pad_close); |
191 | 1651 | MENU_ADD (_("_Delete"), "edit-delete", GDK_KEY_Delete, GDK_SHIFT_MASK, xpad_pad_delete); | ||
192 | 1652 | 1547 | ||
193 | 1653 | /* Edit submenu */ | 1548 | /* Edit submenu */ |
194 | 1654 | item = gtk_menu_item_new_with_mnemonic (_("_Edit")); | 1549 | item = gtk_menu_item_new_with_mnemonic (_("_Edit")); |
195 | @@ -1662,23 +1557,11 @@ | |||
196 | 1662 | MENU_ADD_SEP(); | 1557 | MENU_ADD_SEP(); |
197 | 1663 | MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste); | 1558 | MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste); |
198 | 1664 | g_object_set_data (G_OBJECT (uppermenu), "paste", item); | 1559 | g_object_set_data (G_OBJECT (uppermenu), "paste", item); |
201 | 1665 | MENU_ADD_SEP (); | 1560 | MENU_ADD_SEP(); |
202 | 1666 | MENU_ADD (_("_Preferences"), "preferences-system", 0, 0, xpad_pad_open_preferences); | 1561 | MENU_ADD (_("_Layout"), "document-properties", 0, 0, xpad_pad_open_properties); |
203 | 1667 | 1562 | ||
218 | 1668 | /* View submenu */ | 1563 | menu = uppermenu; |
219 | 1669 | item = gtk_menu_item_new_with_mnemonic (_("_View")); | 1564 | MENU_ADD_SEP(); |
206 | 1670 | gtk_container_add (GTK_CONTAINER (uppermenu), item); | ||
207 | 1671 | menu = gtk_menu_new (); | ||
208 | 1672 | gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); | ||
209 | 1673 | MENU_ADD_CHECK (_("_Toolbar"), has_toolbar, menu_toolbar); | ||
210 | 1674 | g_object_set_data (G_OBJECT (uppermenu), "has-toolbar", item); | ||
211 | 1675 | MENU_ADD_CHECK (_("_Autohide Toolbar"), autohide_toolbar, menu_autohide); | ||
212 | 1676 | g_object_set_data (G_OBJECT (uppermenu), "has-autohide-toolbar", item); | ||
213 | 1677 | gtk_widget_set_sensitive (item, has_toolbar); | ||
214 | 1678 | MENU_ADD_CHECK (_("_Scrollbar"), has_scrollbar, menu_scrollbar); | ||
215 | 1679 | g_object_set_data (G_OBJECT (uppermenu), "has-scrollbar", item); | ||
216 | 1680 | MENU_ADD_CHECK (_("_Window Decorations"), decorations, menu_decorated); | ||
217 | 1681 | g_object_set_data (G_OBJECT (uppermenu), "has-decorations", item); | ||
220 | 1682 | 1565 | ||
221 | 1683 | /* Notes submenu - The list of notes will get added in the prep function below */ | 1566 | /* Notes submenu - The list of notes will get added in the prep function below */ |
222 | 1684 | item = gtk_menu_item_new_with_mnemonic (_("_Notes")); | 1567 | item = gtk_menu_item_new_with_mnemonic (_("_Notes")); |
223 | @@ -1697,6 +1580,11 @@ | |||
224 | 1697 | MENU_ADD (_("_Help"), "help-browser", GDK_KEY_F1, 0, show_help); | 1580 | MENU_ADD (_("_Help"), "help-browser", GDK_KEY_F1, 0, show_help); |
225 | 1698 | MENU_ADD (_("_About"), "help-about", 0, 0, menu_about); | 1581 | MENU_ADD (_("_About"), "help-about", 0, 0, menu_about); |
226 | 1699 | 1582 | ||
227 | 1583 | /* Upper menu */ | ||
228 | 1584 | menu = uppermenu; | ||
229 | 1585 | MENU_ADD_SEP (); | ||
230 | 1586 | MENU_ADD (_("_Preferences"), "preferences-system", 0, 0, xpad_pad_open_preferences); | ||
231 | 1587 | |||
232 | 1700 | gtk_widget_show_all (uppermenu); | 1588 | gtk_widget_show_all (uppermenu); |
233 | 1701 | 1589 | ||
234 | 1702 | return uppermenu; | 1590 | return uppermenu; |
235 | 1703 | 1591 | ||
236 | === modified file 'src/xpad-preferences.c' | |||
237 | --- src/xpad-preferences.c 2014-10-02 22:45:34 +0000 | |||
238 | +++ src/xpad-preferences.c 2014-12-21 11:27:28 +0000 | |||
239 | @@ -49,6 +49,10 @@ | |||
240 | 49 | GtkWidget *tray_click_configuration; | 49 | GtkWidget *tray_click_configuration; |
241 | 50 | GtkWidget *editcheck; | 50 | GtkWidget *editcheck; |
242 | 51 | GtkWidget *confirmcheck; | 51 | GtkWidget *confirmcheck; |
243 | 52 | GtkWidget *has_decorations; | ||
244 | 53 | GtkWidget *has_toolbar; | ||
245 | 54 | GtkWidget *autohide_toolbar; | ||
246 | 55 | GtkWidget *has_scrollbar; | ||
247 | 52 | 56 | ||
248 | 53 | gulong fontcheck_handler; | 57 | gulong fontcheck_handler; |
249 | 54 | gulong font_handler; | 58 | gulong font_handler; |
250 | @@ -65,6 +69,10 @@ | |||
251 | 65 | gulong tray_click_handler; | 69 | gulong tray_click_handler; |
252 | 66 | gulong editcheck_handler; | 70 | gulong editcheck_handler; |
253 | 67 | gulong confirmcheck_handler; | 71 | gulong confirmcheck_handler; |
254 | 72 | gulong has_decorations_handler; | ||
255 | 73 | gulong has_toolbar_handler; | ||
256 | 74 | gulong autohide_toolbar_handler; | ||
257 | 75 | gulong has_scrollbar_handler; | ||
258 | 68 | 76 | ||
259 | 69 | gulong notify_font_handler; | 77 | gulong notify_font_handler; |
260 | 70 | gulong notify_text_handler; | 78 | gulong notify_text_handler; |
261 | @@ -79,6 +87,10 @@ | |||
262 | 79 | gulong notify_tray_click_handler; | 87 | gulong notify_tray_click_handler; |
263 | 80 | gulong notify_edit_handler; | 88 | gulong notify_edit_handler; |
264 | 81 | gulong notify_confirm_handler; | 89 | gulong notify_confirm_handler; |
265 | 90 | gulong notify_has_decorations_handler; | ||
266 | 91 | gulong notify_has_toolbar_handler; | ||
267 | 92 | gulong notify_autohide_toolbar_handler; | ||
268 | 93 | gulong notify_has_scrollbar_handler; | ||
269 | 82 | }; | 94 | }; |
270 | 83 | 95 | ||
271 | 84 | G_DEFINE_TYPE_WITH_PRIVATE (XpadPreferences, xpad_preferences, GTK_TYPE_DIALOG) | 96 | G_DEFINE_TYPE_WITH_PRIVATE (XpadPreferences, xpad_preferences, GTK_TYPE_DIALOG) |
272 | @@ -104,6 +116,10 @@ | |||
273 | 104 | static void change_tray_click (GtkComboBox *box, XpadPreferences *pref); | 116 | static void change_tray_click (GtkComboBox *box, XpadPreferences *pref); |
274 | 105 | static void change_edit_check (GtkToggleButton *button, XpadPreferences *pref); | 117 | static void change_edit_check (GtkToggleButton *button, XpadPreferences *pref); |
275 | 106 | static void change_confirm_check (GtkToggleButton *button, XpadPreferences *pref); | 118 | static void change_confirm_check (GtkToggleButton *button, XpadPreferences *pref); |
276 | 119 | static void change_has_decorations (GtkToggleButton *button, XpadPreferences *pref); | ||
277 | 120 | static void change_has_toolbar (GtkToggleButton *button, XpadPreferences *pref); | ||
278 | 121 | static void change_autohide_toolbar (GtkToggleButton *button, XpadPreferences *pref); | ||
279 | 122 | static void change_has_scrollbar (GtkToggleButton *button, XpadPreferences *pref); | ||
280 | 107 | 123 | ||
281 | 108 | static void notify_fontname (XpadPreferences *pref); | 124 | static void notify_fontname (XpadPreferences *pref); |
282 | 109 | static void notify_text_color (XpadPreferences *pref); | 125 | static void notify_text_color (XpadPreferences *pref); |
283 | @@ -118,6 +134,10 @@ | |||
284 | 118 | static void notify_tray_click (XpadPreferences *pref); | 134 | static void notify_tray_click (XpadPreferences *pref); |
285 | 119 | static void notify_edit (XpadPreferences *pref); | 135 | static void notify_edit (XpadPreferences *pref); |
286 | 120 | static void notify_confirm (XpadPreferences *pref); | 136 | static void notify_confirm (XpadPreferences *pref); |
287 | 137 | static void notify_has_decorations(XpadPreferences *pref); | ||
288 | 138 | static void notify_has_toolbar(XpadPreferences *pref); | ||
289 | 139 | static void notify_autohide_toolbar(XpadPreferences *pref); | ||
290 | 140 | static void notify_has_scrollbar(XpadPreferences *pref); | ||
291 | 121 | 141 | ||
292 | 122 | static GtkWidget * create_label (const gchar *label_text); | 142 | static GtkWidget * create_label (const gchar *label_text); |
293 | 123 | 143 | ||
294 | @@ -169,8 +189,8 @@ | |||
295 | 169 | { | 189 | { |
296 | 170 | XpadPreferences *pref = XPAD_PREFERENCES (object); | 190 | XpadPreferences *pref = XPAD_PREFERENCES (object); |
297 | 171 | 191 | ||
300 | 172 | GtkWidget *appearance_frame, *start_frame, *tray_frame, *other_frame, *label, *alignment; | 192 | GtkWidget *view_frame, *appearance_frame, *start_frame, *tray_frame, *other_frame, *label, *alignment; |
301 | 173 | GtkBox *font_hbox, *vbox, *hbox, *appearance_vbox, *autostart_vbox, *tray_vbox, *other_vbox; | 193 | GtkBox *font_hbox, *vbox, *hbox, *view_vbox, *appearance_vbox, *autostart_vbox, *tray_vbox, *other_vbox; |
302 | 174 | const GdkRGBA *text_color, *back_color; | 194 | const GdkRGBA *text_color, *back_color; |
303 | 175 | const gchar *fontname; | 195 | const gchar *fontname; |
304 | 176 | GtkStyleContext *style; | 196 | GtkStyleContext *style; |
305 | @@ -178,7 +198,7 @@ | |||
306 | 178 | GtkRequisition req; | 198 | GtkRequisition req; |
307 | 179 | GdkRGBA theme_text_color = {0, 0, 0, 0}, theme_background_color = {0, 0, 0, 0}; | 199 | GdkRGBA theme_text_color = {0, 0, 0, 0}, theme_background_color = {0, 0, 0, 0}; |
308 | 180 | guint tray_click_configuration, autostart_delay, autostart_display_pads; | 200 | guint tray_click_configuration, autostart_delay, autostart_display_pads; |
310 | 181 | gboolean confirm_destroy, edit_lock, autostart_xpad, autostart_wait_systray, autostart_new_pad, autostart_sticky; | 201 | gboolean confirm_destroy, edit_lock, autostart_xpad, autostart_wait_systray, autostart_new_pad, autostart_sticky, has_decorations, has_toolbar, autohide_toolbar, has_scrollbar; |
311 | 182 | 202 | ||
312 | 183 | g_object_get (pref->priv->settings, | 203 | g_object_get (pref->priv->settings, |
313 | 184 | "fontname", &fontname, | 204 | "fontname", &fontname, |
314 | @@ -193,13 +213,61 @@ | |||
315 | 193 | "autostart-sticky", &autostart_sticky, | 213 | "autostart-sticky", &autostart_sticky, |
316 | 194 | "autostart-delay", &autostart_delay, | 214 | "autostart-delay", &autostart_delay, |
317 | 195 | "autostart-display-pads", &autostart_display_pads, | 215 | "autostart-display-pads", &autostart_display_pads, |
318 | 216 | "has-decorations", &has_decorations, | ||
319 | 217 | "has-toolbar", &has_toolbar, | ||
320 | 218 | "autohide-toolbar", &autohide_toolbar, | ||
321 | 219 | "has-scrollbar", &has_scrollbar, | ||
322 | 196 | NULL); | 220 | NULL); |
323 | 197 | 221 | ||
324 | 198 | /* create notebook to add pages */ | 222 | /* create notebook to add pages */ |
325 | 199 | pref->priv->notebook = gtk_notebook_new (); | 223 | pref->priv->notebook = gtk_notebook_new (); |
326 | 200 | 224 | ||
329 | 201 | /* Appearance options */ | 225 | /* View options */ |
330 | 202 | label = create_label (_("Appearance")); | 226 | label = create_label (_("View")); |
331 | 227 | |||
332 | 228 | view_vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 20)); | ||
333 | 229 | gtk_box_set_homogeneous (view_vbox, FALSE); | ||
334 | 230 | |||
335 | 231 | alignment = gtk_alignment_new (1, 1, 1, 1); | ||
336 | 232 | g_object_set (G_OBJECT (alignment), | ||
337 | 233 | "left-padding", 12, | ||
338 | 234 | "top-padding", 12, | ||
339 | 235 | "child", view_vbox, | ||
340 | 236 | NULL); | ||
341 | 237 | view_frame = GTK_WIDGET (g_object_new (GTK_TYPE_FRAME, | ||
342 | 238 | "label-widget", NULL, | ||
343 | 239 | "shadow-type", GTK_SHADOW_NONE, | ||
344 | 240 | "child", alignment, | ||
345 | 241 | NULL)); | ||
346 | 242 | |||
347 | 243 | gtk_notebook_append_page (GTK_NOTEBOOK (pref->priv->notebook), GTK_WIDGET (view_frame), label); | ||
348 | 244 | |||
349 | 245 | pref->priv->has_toolbar = gtk_check_button_new_with_mnemonic (_("_Show toolbar")); | ||
350 | 246 | gtk_box_pack_start (view_vbox, pref->priv->has_toolbar, FALSE, FALSE, 0); | ||
351 | 247 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->has_toolbar), has_toolbar); | ||
352 | 248 | |||
353 | 249 | pref->priv->autohide_toolbar = gtk_check_button_new_with_mnemonic (_("_Autohide toolbar")); | ||
354 | 250 | hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20)); | ||
355 | 251 | gtk_box_pack_start (hbox, gtk_alignment_new (1, 1, 1, 1), FALSE, FALSE, 0); | ||
356 | 252 | gtk_box_pack_start (hbox, pref->priv->autohide_toolbar, FALSE, FALSE, 0); | ||
357 | 253 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autohide_toolbar), autohide_toolbar); | ||
358 | 254 | gtk_widget_set_sensitive (pref->priv->autohide_toolbar, has_toolbar); | ||
359 | 255 | gtk_box_pack_start (view_vbox, GTK_WIDGET (hbox), FALSE, FALSE, 0); | ||
360 | 256 | |||
361 | 257 | pref->priv->has_scrollbar = gtk_check_button_new_with_mnemonic (_("_Show scrollbar")); | ||
362 | 258 | gtk_box_pack_start (view_vbox, pref->priv->has_scrollbar, FALSE, FALSE, 0); | ||
363 | 259 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->has_scrollbar), has_scrollbar); | ||
364 | 260 | |||
365 | 261 | pref->priv->autostart_sticky = gtk_check_button_new_with_mnemonic (_("_Show notes on all workspaces")); | ||
366 | 262 | gtk_box_pack_start (view_vbox, pref->priv->autostart_sticky, FALSE, FALSE, 0); | ||
367 | 263 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_sticky), autostart_sticky); | ||
368 | 264 | |||
369 | 265 | pref->priv->has_decorations = gtk_check_button_new_with_mnemonic (_("_Show window decorations")); | ||
370 | 266 | gtk_box_pack_start (view_vbox, pref->priv->has_decorations, FALSE, FALSE, 0); | ||
371 | 267 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->has_decorations), has_decorations); | ||
372 | 268 | |||
373 | 269 | /* Layout options */ | ||
374 | 270 | label = create_label (_("Layout")); | ||
375 | 203 | 271 | ||
376 | 204 | appearance_vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 20)); | 272 | appearance_vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 20)); |
377 | 205 | gtk_box_set_homogeneous (appearance_vbox, FALSE); | 273 | gtk_box_set_homogeneous (appearance_vbox, FALSE); |
378 | @@ -353,10 +421,6 @@ | |||
379 | 353 | gtk_box_pack_start (autostart_vbox, pref->priv->autostart_new_pad, FALSE, FALSE, 0); | 421 | gtk_box_pack_start (autostart_vbox, pref->priv->autostart_new_pad, FALSE, FALSE, 0); |
380 | 354 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_new_pad), autostart_new_pad); | 422 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_new_pad), autostart_new_pad); |
381 | 355 | 423 | ||
382 | 356 | pref->priv->autostart_sticky = gtk_check_button_new_with_mnemonic (_("_Pads start on all workspaces")); | ||
383 | 357 | gtk_box_pack_start (autostart_vbox, pref->priv->autostart_sticky, FALSE, FALSE, 0); | ||
384 | 358 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_sticky), autostart_sticky); | ||
385 | 359 | |||
386 | 360 | label = gtk_label_new (_("Delay in seconds")); | 424 | label = gtk_label_new (_("Delay in seconds")); |
387 | 361 | pref->priv->autostart_delay = gtk_combo_box_text_new(); | 425 | pref->priv->autostart_delay = gtk_combo_box_text_new(); |
388 | 362 | guint i; | 426 | guint i; |
389 | @@ -450,6 +514,11 @@ | |||
390 | 450 | gtk_window_set_title (GTK_WINDOW (pref), _("Xpad Preferences")); | 514 | gtk_window_set_title (GTK_WINDOW (pref), _("Xpad Preferences")); |
391 | 451 | 515 | ||
392 | 452 | /* Activate all handlers */ | 516 | /* Activate all handlers */ |
393 | 517 | pref->priv->has_decorations_handler = g_signal_connect (pref->priv->has_decorations, "toggled", G_CALLBACK (change_has_decorations), pref); | ||
394 | 518 | pref->priv->has_toolbar_handler = g_signal_connect (pref->priv->has_toolbar, "toggled", G_CALLBACK (change_has_toolbar), pref); | ||
395 | 519 | pref->priv->autohide_toolbar_handler = g_signal_connect (pref->priv->autohide_toolbar, "toggled", G_CALLBACK (change_autohide_toolbar), pref); | ||
396 | 520 | pref->priv->has_scrollbar_handler = g_signal_connect (pref->priv->has_scrollbar, "toggled", G_CALLBACK (change_has_scrollbar), pref); | ||
397 | 521 | |||
398 | 453 | pref->priv->fontcheck_handler = g_signal_connect (pref->priv->fontcheck, "toggled", G_CALLBACK (change_font_check), pref); | 522 | pref->priv->fontcheck_handler = g_signal_connect (pref->priv->fontcheck, "toggled", G_CALLBACK (change_font_check), pref); |
399 | 454 | pref->priv->font_handler = g_signal_connect (pref->priv->fontbutton, "font-set", G_CALLBACK (change_font_face), pref); | 523 | pref->priv->font_handler = g_signal_connect (pref->priv->fontbutton, "font-set", G_CALLBACK (change_font_face), pref); |
400 | 455 | pref->priv->colorcheck_handler = g_signal_connect (pref->priv->colorcheck, "toggled", G_CALLBACK (change_color_check), pref); | 524 | pref->priv->colorcheck_handler = g_signal_connect (pref->priv->colorcheck, "toggled", G_CALLBACK (change_color_check), pref); |
401 | @@ -468,6 +537,11 @@ | |||
402 | 468 | pref->priv->editcheck_handler = g_signal_connect (pref->priv->editcheck, "toggled", G_CALLBACK (change_edit_check), pref); | 537 | pref->priv->editcheck_handler = g_signal_connect (pref->priv->editcheck, "toggled", G_CALLBACK (change_edit_check), pref); |
403 | 469 | pref->priv->confirmcheck_handler = g_signal_connect (pref->priv->confirmcheck, "toggled", G_CALLBACK (change_confirm_check), pref); | 538 | pref->priv->confirmcheck_handler = g_signal_connect (pref->priv->confirmcheck, "toggled", G_CALLBACK (change_confirm_check), pref); |
404 | 470 | 539 | ||
405 | 540 | pref->priv->notify_has_decorations_handler = g_signal_connect_swapped (pref->priv->settings, "notify::has-decorations", G_CALLBACK (notify_has_decorations), pref); | ||
406 | 541 | pref->priv->notify_has_toolbar_handler = g_signal_connect_swapped (pref->priv->settings, "notify::has-toolbar", G_CALLBACK (notify_has_toolbar), pref); | ||
407 | 542 | pref->priv->notify_autohide_toolbar_handler = g_signal_connect_swapped (pref->priv->settings, "notify::autohide-toolbar", G_CALLBACK (notify_autohide_toolbar), pref); | ||
408 | 543 | pref->priv->notify_has_scrollbar_handler = g_signal_connect_swapped (pref->priv->settings, "notify::has-scrollbar", G_CALLBACK (notify_has_scrollbar), pref); | ||
409 | 544 | |||
410 | 471 | pref->priv->notify_font_handler = g_signal_connect_swapped (pref->priv->settings, "notify::fontname", G_CALLBACK (notify_fontname), pref); | 545 | pref->priv->notify_font_handler = g_signal_connect_swapped (pref->priv->settings, "notify::fontname", G_CALLBACK (notify_fontname), pref); |
411 | 472 | pref->priv->notify_text_handler = g_signal_connect_swapped (pref->priv->settings, "notify::text-color", G_CALLBACK (notify_text_color), pref); | 546 | pref->priv->notify_text_handler = g_signal_connect_swapped (pref->priv->settings, "notify::text-color", G_CALLBACK (notify_text_color), pref); |
412 | 473 | pref->priv->notify_back_handler = g_signal_connect_swapped (pref->priv->settings, "notify::back-color", G_CALLBACK (notify_back_color), pref); | 547 | pref->priv->notify_back_handler = g_signal_connect_swapped (pref->priv->settings, "notify::back-color", G_CALLBACK (notify_back_color), pref); |
413 | @@ -737,6 +811,36 @@ | |||
414 | 737 | } | 811 | } |
415 | 738 | 812 | ||
416 | 739 | static void | 813 | static void |
417 | 814 | change_has_decorations (GtkToggleButton *button, XpadPreferences *pref) | ||
418 | 815 | { | ||
419 | 816 | g_signal_handler_block (pref->priv->settings, pref->priv->notify_has_decorations_handler); | ||
420 | 817 | g_object_set (pref->priv->settings, "has-decorations", gtk_toggle_button_get_active (button), NULL); | ||
421 | 818 | g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_has_decorations_handler); | ||
422 | 819 | } | ||
423 | 820 | |||
424 | 821 | static void | ||
425 | 822 | change_has_toolbar (GtkToggleButton *button, XpadPreferences *pref) | ||
426 | 823 | { | ||
427 | 824 | g_object_set (pref->priv->settings, "has-toolbar", gtk_toggle_button_get_active (button), NULL); | ||
428 | 825 | } | ||
429 | 826 | |||
430 | 827 | static void | ||
431 | 828 | change_autohide_toolbar (GtkToggleButton *button, XpadPreferences *pref) | ||
432 | 829 | { | ||
433 | 830 | g_signal_handler_block (pref->priv->settings, pref->priv->notify_autohide_toolbar_handler); | ||
434 | 831 | g_object_set (pref->priv->settings, "autohide-toolbar", gtk_toggle_button_get_active (button), NULL); | ||
435 | 832 | g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_autohide_toolbar_handler); | ||
436 | 833 | } | ||
437 | 834 | |||
438 | 835 | static void | ||
439 | 836 | change_has_scrollbar (GtkToggleButton *button, XpadPreferences *pref) | ||
440 | 837 | { | ||
441 | 838 | g_signal_handler_block (pref->priv->settings, pref->priv->notify_has_scrollbar_handler); | ||
442 | 839 | g_object_set (pref->priv->settings, "has-scrollbar", gtk_toggle_button_get_active (button), NULL); | ||
443 | 840 | g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_has_scrollbar_handler); | ||
444 | 841 | } | ||
445 | 842 | |||
446 | 843 | static void | ||
447 | 740 | notify_fontname (XpadPreferences *pref) | 844 | notify_fontname (XpadPreferences *pref) |
448 | 741 | { | 845 | { |
449 | 742 | const gchar *fontname; | 846 | const gchar *fontname; |
450 | @@ -918,3 +1022,44 @@ | |||
451 | 918 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), value); | 1022 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), value); |
452 | 919 | g_signal_handler_unblock (pref->priv->confirmcheck, pref->priv->confirmcheck_handler); | 1023 | g_signal_handler_unblock (pref->priv->confirmcheck, pref->priv->confirmcheck_handler); |
453 | 920 | } | 1024 | } |
454 | 1025 | |||
455 | 1026 | static void | ||
456 | 1027 | notify_has_decorations (XpadPreferences *pref) | ||
457 | 1028 | { | ||
458 | 1029 | gboolean value; | ||
459 | 1030 | g_object_get (pref->priv->settings, "has-decorations", &value, NULL); | ||
460 | 1031 | g_signal_handler_block (pref->priv->has_decorations, pref->priv->has_decorations_handler); | ||
461 | 1032 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->has_decorations), value); | ||
462 | 1033 | g_signal_handler_unblock (pref->priv->has_decorations, pref->priv->has_decorations_handler); | ||
463 | 1034 | } | ||
464 | 1035 | |||
465 | 1036 | static void | ||
466 | 1037 | notify_has_toolbar (XpadPreferences *pref) | ||
467 | 1038 | { | ||
468 | 1039 | gboolean value; | ||
469 | 1040 | g_object_get (pref->priv->settings, "has-toolbar", &value, NULL); | ||
470 | 1041 | g_signal_handler_block (pref->priv->has_toolbar, pref->priv->has_toolbar_handler); | ||
471 | 1042 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->has_toolbar), value); | ||
472 | 1043 | gtk_widget_set_sensitive (pref->priv->autohide_toolbar, value); | ||
473 | 1044 | g_signal_handler_unblock (pref->priv->has_toolbar, pref->priv->has_toolbar_handler); | ||
474 | 1045 | } | ||
475 | 1046 | |||
476 | 1047 | static void | ||
477 | 1048 | notify_autohide_toolbar (XpadPreferences *pref) | ||
478 | 1049 | { | ||
479 | 1050 | gboolean value; | ||
480 | 1051 | g_object_get (pref->priv->settings, "autohide-toolbar", &value, NULL); | ||
481 | 1052 | g_signal_handler_block (pref->priv->autohide_toolbar, pref->priv->autohide_toolbar_handler); | ||
482 | 1053 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autohide_toolbar), value); | ||
483 | 1054 | g_signal_handler_unblock (pref->priv->autohide_toolbar, pref->priv->autohide_toolbar_handler); | ||
484 | 1055 | } | ||
485 | 1056 | |||
486 | 1057 | static void | ||
487 | 1058 | notify_has_scrollbar (XpadPreferences *pref) | ||
488 | 1059 | { | ||
489 | 1060 | gboolean value; | ||
490 | 1061 | g_object_get (pref->priv->settings, "has-scrollbar", &value, NULL); | ||
491 | 1062 | g_signal_handler_block (pref->priv->has_scrollbar, pref->priv->has_scrollbar_handler); | ||
492 | 1063 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->has_scrollbar), value); | ||
493 | 1064 | g_signal_handler_unblock (pref->priv->has_scrollbar, pref->priv->has_scrollbar_handler); | ||
494 | 1065 | } |
Haha... dit dus :)
On 15 December 2014 at 12:45, Merlijn Sebrechts <<email address hidden> /bugs.launchpad .net/xpad/ +bug/1395889 /code.launchpad .net/~merlijn- sebrechts/ xpad/better_ menus/+ merge/244712 /blueprints. launchpad. net/xpad/ +spec/xpad- menu-organizati on >settings, "has-decorations", menu_item_ set_active (GTK_CHECK_ MENU_ITEM (menu_item), >settings, "has-toolbar", &has_toolbar, menu_item_ set_active (GTK_CHECK_ MENU_ITEM (menu_item), toolbar" ); set_sensitive (menu_item, has_toolbar); show_toolbar (pad); >settings, "autohide-toolbar", toolbar" ); menu_item_ set_active (GTK_CHECK_ MENU_ITEM (menu_item), >settings, "has-scrollbar", menu_item_ set_active (GTK_CHECK_ MENU_ITEM (menu_item), window_ set_policy (GTK_SCROLLED_ WINDOW
> wrote:
>
> Merlijn Sebrechts has proposed merging
> lp:~merlijn-sebrechts/xpad/better_menus into lp:xpad.
>
> Requested reviews:
> Arthur Borsboom (arthurborsboom)
> Related bugs:
> Bug #1395889 in Xpad: "Better defaults and simpler menus"
> https:/
>
> For more details, see:
>
> https:/
>
> Implemented changes in menu as per blueprint
> https:/
> --
> You are requested to review the proposed merge of
> lp:~merlijn-sebrechts/xpad/better_menus into lp:xpad.
>
> === modified file 'src/xpad-pad.c'
> --- src/xpad-pad.c 2014-11-22 12:14:17 +0000
> +++ src/xpad-pad.c 2014-12-15 11:45:07 +0000
> @@ -506,10 +506,6 @@
> gboolean decorations;
> g_object_get (pad->priv-
> &decorations, NULL);
>
> - /* Update pad menu with the new status */
> - GtkWidget *menu_item = g_object_get_data (G_OBJECT
> (pad->priv->menu), "has-decorations");
> - gtk_check_
> decorations);
> -
> /*
> * There are two modes of operation: a normal mode and a
> 'stealth' mode.
> * If decorations are disabled, we also don't show up in the
> taskbar or pager.
> @@ -535,12 +531,6 @@
> gboolean has_toolbar, autohide_toolbar;
> g_object_get (pad->priv-
> "autohide-toolbar", &autohide_toolbar, NULL);
>
> - /* Update pad menu with the new status */
> - GtkWidget *menu_item = g_object_get_data (G_OBJECT
> (pad->priv->menu), "has-toolbar");
> - gtk_check_
> has_toolbar);
> - menu_item = g_object_get_data (G_OBJECT (pad->priv->menu),
> "has-autohide-
> - gtk_widget_
> -
> if (has_toolbar && !autohide_toolbar)
> xpad_pad_
> else
> @@ -553,10 +543,6 @@
> gboolean autohide_toolbar;
> g_object_get (pad->priv-
> &autohide_toolbar, NULL);
>
> - /* Update pad menu with the new status */
> - GtkWidget *menu_item = g_object_get_data (G_OBJECT
> (pad->priv->menu), "has-autohide-
> - gtk_check_
> autohide_toolbar);
> -
> if (autohide_toolbar)
> {
> /* Likely not to be in pad when turning setting on */
> @@ -579,10 +565,6 @@
> gboolean has_scrollbar;
> g_object_get (pad->priv-
> &has_scrollbar, NULL);
>
> - /* Update pad menu with the new status */
> - GtkWidget *menu_item = g_object_get_data (G_OBJECT
> (pad->priv->menu), "has-scrollbar");
> - gtk_check_
> has_scrollbar);
> -
> if (has_scrollbar)
> gtk_scrolled_
> (pad-...