Haha... dit dus :)

On 15 December 2014 at 12:45, Merlijn Sebrechts <<email address hidden>
> 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://bugs.launchpad.net/xpad/+bug/1395889
>
> For more details, see:
>
> https://code.launchpad.net/~merlijn-sebrechts/xpad/better_menus/+merge/244712
>
> Implemented changes in menu as per blueprint
> https://blueprints.launchpad.net/xpad/+spec/xpad-menu-organization
> --
> 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->settings, "has-decorations",
> &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_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item),
> 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->settings, "has-toolbar", &has_toolbar,
> "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_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item),
> has_toolbar);
> -       menu_item = g_object_get_data (G_OBJECT (pad->priv->menu),
> "has-autohide-toolbar");
> -       gtk_widget_set_sensitive (menu_item, has_toolbar);
> -
>         if (has_toolbar && !autohide_toolbar)
>                 xpad_pad_show_toolbar (pad);
>         else
> @@ -553,10 +543,6 @@
>         gboolean autohide_toolbar;
>         g_object_get (pad->priv->settings, "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-autohide-toolbar");
> -       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item),
> 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->settings, "has-scrollbar",
> &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_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item),
> has_scrollbar);
> -
>         if (has_scrollbar)
>                 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW
> (pad->priv->scrollbar),
>                         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
> @@ -892,7 +874,7 @@
>         if (!pad->priv->properties)
>                 return;
>
> -       title = g_strdup_printf (_("'%s' Properties"),
> gtk_window_get_title (GTK_WINDOW (pad)));
> +       title = g_strdup_printf (_("'%s' Layout"), gtk_window_get_title
> (GTK_WINDOW (pad)));
>         gtk_window_set_title (GTK_WINDOW (pad->priv->properties), title);
>         g_free (title);
>  }
> @@ -1304,38 +1286,6 @@
>                 gtk_widget_override_background_color (pad->priv->textview,
> GTK_STATE_FLAG_SELECTED, &text_color);
>         }
>
> -       /*
> -        * Find the sticky notes menu setting for this pad (which is on
> the global default),
> -        * and change its setting to the setting from the info file (pad
> specific default).
> -        */
> -       if (GTK_IS_CONTAINER (pad->priv->menu)) {
> -               GObject *obj;
> -               GList *elem, *children;
> -               children = gtk_container_get_children (GTK_CONTAINER
> (pad->priv->menu));
> -
> -               for (elem = children; elem; elem = elem->next) {
> -                       obj = (GObject *) elem->data;
> -
> -                       if (GTK_IS_BIN (obj) && GTK_IS_MENU_ITEM (obj)) {
> -                               GList *elem2, *children2;
> -                               children2 = gtk_container_get_children
> (GTK_CONTAINER (gtk_menu_item_get_submenu (GTK_MENU_ITEM(obj))));
> -                               for(elem2 = children2; elem2; elem2 =
> elem2->next) {
> -                                       obj = (GObject *) elem2->data;
> -                                       if (GTK_IS_CHECK_MENU_ITEM (obj)) {
> -                                               if
> (!g_strcmp0(gtk_menu_item_get_label (GTK_MENU_ITEM (obj)), "Show on _All
> Workspaces")) {
> -
>  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (obj),
> pad->priv->sticky);
> -                                                       break;
> -                                               }
> -                                       }
> -                               }
> -                               g_list_free(elem2);
> -                       }
> -               }
> -               g_list_free(elem);
> -       }
> -       else
> -               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.");
> -
>         if (pad->priv->sticky)
>                 gtk_window_stick (GTK_WINDOW (pad));
>         else
> @@ -1537,45 +1487,6 @@
>         menu_toggle_tag (pad, "strikethrough");
>  }
>
> -/*
> - * Make the pad visually stick to the workspace and save this setting to
> the individual pad info file,
> - * because this function has been probably been called, because of a menu
> toggle.
> - */
> -static void
> -menu_sticky (GtkCheckMenuItem *check, XpadPad *pad)
> -{
> -       pad->priv->sticky = gtk_check_menu_item_get_active (check);
> -       if (pad->priv->sticky)
> -               gtk_window_stick (GTK_WINDOW (pad));
> -       else
> -               gtk_window_unstick (GTK_WINDOW (pad));
> -       xpad_pad_save_info_delayed (pad);
> -}
> -
> -static void
> -menu_toolbar (GtkCheckMenuItem *check, XpadPad *pad)
> -{
> -       g_object_set (pad->priv->settings, "has-toolbar",
> gtk_check_menu_item_get_active (check), NULL);
> -}
> -
> -static void
> -menu_scrollbar (GtkCheckMenuItem *check, XpadPad *pad)
> -{
> -       g_object_set (pad->priv->settings, "has-scrollbar",
> gtk_check_menu_item_get_active (check), NULL);
> -}
> -
> -static void
> -menu_autohide (GtkCheckMenuItem *check, XpadPad *pad)
> -{
> -       g_object_set (pad->priv->settings, "autohide-toolbar",
> gtk_check_menu_item_get_active (check), NULL);
> -}
> -
> -static void
> -menu_decorated (GtkCheckMenuItem *check, XpadPad *pad)
> -{
> -       g_object_set (pad->priv->settings, "has-decorations",
> gtk_check_menu_item_get_active (check), NULL);
> -}
> -
>  static gint
>  menu_title_compare (GtkWindow *a, GtkWindow *b)
>  {
> @@ -1625,29 +1536,12 @@
>  menu_get_popup_no_highlight (XpadPad *pad, GtkAccelGroup *accel_group)
>  {
>         GtkWidget *uppermenu, *menu, *item;
> -       gboolean has_toolbar, autohide_toolbar, has_scrollbar, decorations;
> -
> -       g_object_get (pad->priv->settings,
> -                       "has-toolbar", &has_toolbar,
> -                       "autohide-toolbar", &autohide_toolbar,
> -                       "has-decorations", &decorations,
> -                       "has-scrollbar", &has_scrollbar, NULL);
> -
> +
> +       /* Upper menu */
>         uppermenu = gtk_menu_new ();
>         gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group);
> -
> -       /* Pad submenu */
> -       item = gtk_menu_item_new_with_mnemonic (_("_Pad"));
> -       gtk_container_add (GTK_CONTAINER (uppermenu), item);
> -       menu = gtk_menu_new ();
> -       gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
> +       menu = uppermenu;
>         MENU_ADD (_("_New"), "document-new", GDK_KEY_N, GDK_CONTROL_MASK,
> xpad_pad_spawn);
> -       MENU_ADD_SEP ();
> -       MENU_ADD_CHECK (_("Show on _All Workspaces"), pad->priv->sticky,
> menu_sticky);
> -       g_object_set_data (G_OBJECT (uppermenu), "sticky", item);
> -       MENU_ADD (_("_Properties"), "document-properties", 0, 0,
> xpad_pad_open_properties);
> -       MENU_ADD_SEP ();
> -       MENU_ADD (_("_Close"), "window-close", 0, 0, xpad_pad_close);
>         MENU_ADD (_("_Delete"), "edit-delete", GDK_KEY_Delete,
> GDK_SHIFT_MASK, xpad_pad_delete);
>
>         /* Edit submenu */
> @@ -1662,23 +1556,12 @@
>         MENU_ADD_SEP();
>         MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste);
>         g_object_set_data (G_OBJECT (uppermenu), "paste", item);
> -       MENU_ADD_SEP ();
> -       MENU_ADD (_("_Preferences"), "preferences-system", 0, 0,
> xpad_pad_open_preferences);
> +       MENU_ADD_SEP();
> +       MENU_ADD (_("_Layout"), "document-properties", 0, 0,
> xpad_pad_open_properties);
>
> -       /* View submenu */
> -       item = gtk_menu_item_new_with_mnemonic (_("_View"));
> -       gtk_container_add (GTK_CONTAINER (uppermenu), item);
> -       menu = gtk_menu_new ();
> -       gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
> -       MENU_ADD_CHECK (_("_Toolbar"), has_toolbar, menu_toolbar);
> -       g_object_set_data (G_OBJECT (uppermenu), "has-toolbar", item);
> -       MENU_ADD_CHECK (_("_Autohide Toolbar"), autohide_toolbar,
> menu_autohide);
> -       g_object_set_data (G_OBJECT (uppermenu), "has-autohide-toolbar",
> item);
> -       gtk_widget_set_sensitive (item, has_toolbar);
> -       MENU_ADD_CHECK (_("_Scrollbar"), has_scrollbar, menu_scrollbar);
> -       g_object_set_data (G_OBJECT (uppermenu), "has-scrollbar", item);
> -       MENU_ADD_CHECK (_("_Window Decorations"), decorations,
> menu_decorated);
> -       g_object_set_data (G_OBJECT (uppermenu), "has-decorations", item);
> +       menu = uppermenu;
> +       MENU_ADD (_("_Close"), "window-close", 0, 0, xpad_pad_close);
> +       MENU_ADD_SEP();
>
>         /* Notes submenu - The list of notes will get added in the prep
> function below */
>         item = gtk_menu_item_new_with_mnemonic (_("_Notes"));
> @@ -1697,6 +1580,11 @@
>         MENU_ADD (_("_Help"), "help-browser", GDK_KEY_F1, 0, show_help);
>         MENU_ADD (_("_About"), "help-about", 0, 0, menu_about);
>
> +       /* Upper menu */
> +       menu = uppermenu;
> +       MENU_ADD_SEP ();
> +       MENU_ADD (_("_Preferences"), "preferences-system", 0, 0,
> xpad_pad_open_preferences);
> +
>         gtk_widget_show_all (uppermenu);
>
>         return uppermenu;
>
> === modified file 'src/xpad-preferences.c'
> --- src/xpad-preferences.c      2014-10-02 22:45:34 +0000
> +++ src/xpad-preferences.c      2014-12-15 11:45:07 +0000
> @@ -49,6 +49,10 @@
>         GtkWidget *tray_click_configuration;
>         GtkWidget *editcheck;
>         GtkWidget *confirmcheck;
> +       GtkWidget *has_decorations;
> +       GtkWidget *has_toolbar;
> +       GtkWidget *autohide_toolbar;
> +       GtkWidget *has_scrollbar;
>
>         gulong fontcheck_handler;
>         gulong font_handler;
> @@ -65,6 +69,10 @@
>         gulong tray_click_handler;
>         gulong editcheck_handler;
>         gulong confirmcheck_handler;
> +       gulong has_decorations_handler;
> +       gulong has_toolbar_handler;
> +       gulong autohide_toolbar_handler;
> +       gulong has_scrollbar_handler;
>
>         gulong notify_font_handler;
>         gulong notify_text_handler;
> @@ -79,6 +87,10 @@
>         gulong notify_tray_click_handler;
>         gulong notify_edit_handler;
>         gulong notify_confirm_handler;
> +       gulong notify_has_decorations_handler;
> +       gulong notify_has_toolbar_handler;
> +       gulong notify_autohide_toolbar_handler;
> +       gulong notify_has_scrollbar_handler;
>  };
>
>  G_DEFINE_TYPE_WITH_PRIVATE (XpadPreferences, xpad_preferences,
> GTK_TYPE_DIALOG)
> @@ -104,6 +116,10 @@
>  static void change_tray_click (GtkComboBox *box, XpadPreferences *pref);
>  static void change_edit_check (GtkToggleButton *button, XpadPreferences
> *pref);
>  static void change_confirm_check (GtkToggleButton *button,
> XpadPreferences *pref);
> +static void change_has_decorations (GtkToggleButton *button,
> XpadPreferences *pref);
> +static void change_has_toolbar (GtkToggleButton *button, XpadPreferences
> *pref);
> +static void change_autohide_toolbar (GtkToggleButton *button,
> XpadPreferences *pref);
> +static void change_has_scrollbar (GtkToggleButton *button,
> XpadPreferences *pref);
>
>  static void notify_fontname (XpadPreferences *pref);
>  static void notify_text_color (XpadPreferences *pref);
> @@ -118,6 +134,10 @@
>  static void notify_tray_click (XpadPreferences *pref);
>  static void notify_edit (XpadPreferences *pref);
>  static void notify_confirm (XpadPreferences *pref);
> +static void notify_has_decorations(XpadPreferences *pref);
> +static void notify_has_toolbar(XpadPreferences *pref);
> +static void notify_autohide_toolbar(XpadPreferences *pref);
> +static void notify_has_scrollbar(XpadPreferences *pref);
>
>  static GtkWidget * create_label (const gchar *label_text);
>
> @@ -169,8 +189,8 @@
>  {
>         XpadPreferences *pref = XPAD_PREFERENCES (object);
>
> -       GtkWidget *appearance_frame, *start_frame, *tray_frame,
> *other_frame, *label, *alignment;
> -       GtkBox *font_hbox, *vbox, *hbox, *appearance_vbox,
> *autostart_vbox, *tray_vbox, *other_vbox;
> +       GtkWidget *view_frame, *appearance_frame, *start_frame,
> *tray_frame, *other_frame, *label, *alignment;
> +       GtkBox *font_hbox, *vbox, *hbox, *view_vbox, *appearance_vbox,
> *autostart_vbox, *tray_vbox, *other_vbox;
>         const GdkRGBA *text_color, *back_color;
>         const gchar *fontname;
>         GtkStyleContext *style;
> @@ -178,7 +198,7 @@
>         GtkRequisition req;
>         GdkRGBA theme_text_color = {0, 0, 0, 0}, theme_background_color =
> {0, 0, 0, 0};
>         guint tray_click_configuration, autostart_delay,
> autostart_display_pads;
> -       gboolean confirm_destroy, edit_lock, autostart_xpad,
> autostart_wait_systray, autostart_new_pad, autostart_sticky;
> +       gboolean confirm_destroy, edit_lock, autostart_xpad,
> autostart_wait_systray, autostart_new_pad, autostart_sticky,
> has_decorations, has_toolbar, autohide_toolbar, has_scrollbar;
>
>         g_object_get (pref->priv->settings,
>                         "fontname", &fontname,
> @@ -193,13 +213,61 @@
>                         "autostart-sticky", &autostart_sticky,
>                         "autostart-delay", &autostart_delay,
>                         "autostart-display-pads", &autostart_display_pads,
> +                       "has-decorations", &has_decorations,
> +                       "has-toolbar", &has_toolbar,
> +                       "autohide-toolbar", &autohide_toolbar,
> +                       "has-scrollbar", &has_scrollbar,
>                         NULL);
>
>         /* create notebook to add pages */
>         pref->priv->notebook = gtk_notebook_new ();
>
> -       /* Appearance options */
> -       label = create_label (_("Appearance"));
> +       /* View options */
> +       label = create_label (_("View"));
> +
> +       view_vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 20));
> +       gtk_box_set_homogeneous (view_vbox, FALSE);
> +
> +       alignment = gtk_alignment_new (1, 1, 1, 1);
> +       g_object_set (G_OBJECT (alignment),
> +               "left-padding", 12,
> +               "top-padding", 12,
> +               "child", view_vbox,
> +               NULL);
> +       view_frame = GTK_WIDGET (g_object_new (GTK_TYPE_FRAME,
> +               "label-widget", NULL,
> +               "shadow-type", GTK_SHADOW_NONE,
> +               "child", alignment,
> +               NULL));
> +
> +       gtk_notebook_append_page (GTK_NOTEBOOK (pref->priv->notebook),
> GTK_WIDGET (view_frame), label);
> +
> +       pref->priv->has_toolbar = gtk_check_button_new_with_mnemonic
> (_("_Show toolbar"));
> +       gtk_box_pack_start (view_vbox, pref->priv->has_toolbar, FALSE,
> FALSE, 0);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->has_toolbar), has_toolbar);
> +
> +       pref->priv->autohide_toolbar = gtk_check_button_new_with_mnemonic
> (_("_Autohide toolbar"));
> +       hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20));
> +       gtk_box_pack_start (hbox, gtk_alignment_new (1, 1, 1, 1), FALSE,
> FALSE, 0);
> +       gtk_box_pack_start (hbox, pref->priv->autohide_toolbar, FALSE,
> FALSE, 0);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->autohide_toolbar), autohide_toolbar);
> +       gtk_widget_set_sensitive (pref->priv->autohide_toolbar,
> has_toolbar);
> +       gtk_box_pack_start (view_vbox, GTK_WIDGET (hbox), FALSE, FALSE, 0);
> +
> +       pref->priv->has_scrollbar = gtk_check_button_new_with_mnemonic
> (_("_Show scrollbar"));
> +       gtk_box_pack_start (view_vbox, pref->priv->has_scrollbar, FALSE,
> FALSE, 0);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->has_scrollbar), has_scrollbar);
> +
> +       pref->priv->autostart_sticky = gtk_check_button_new_with_mnemonic
> (_("_Show notes on all workspaces"));
> +       gtk_box_pack_start (view_vbox, pref->priv->autostart_sticky,
> FALSE, FALSE, 0);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->autostart_sticky), autostart_sticky);
> +
> +       pref->priv->has_decorations = gtk_check_button_new_with_mnemonic
> (_("_Show window decorations"));
> +       gtk_box_pack_start (view_vbox, pref->priv->has_decorations, FALSE,
> FALSE, 0);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->has_decorations), has_decorations);
> +
> +       /* Layout options */
> +       label = create_label (_("Layout"));
>
>         appearance_vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL,
> 20));
>         gtk_box_set_homogeneous (appearance_vbox, FALSE);
> @@ -353,10 +421,6 @@
>         gtk_box_pack_start (autostart_vbox, pref->priv->autostart_new_pad,
> FALSE, FALSE, 0);
>         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->autostart_new_pad), autostart_new_pad);
>
> -       pref->priv->autostart_sticky = gtk_check_button_new_with_mnemonic
> (_("_Pads start on all workspaces"));
> -       gtk_box_pack_start (autostart_vbox, pref->priv->autostart_sticky,
> FALSE, FALSE, 0);
> -       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->autostart_sticky), autostart_sticky);
> -
>         label = gtk_label_new (_("Delay in seconds"));
>         pref->priv->autostart_delay = gtk_combo_box_text_new();
>         guint i;
> @@ -450,6 +514,11 @@
>         gtk_window_set_title (GTK_WINDOW (pref), _("Xpad Preferences"));
>
>         /* Activate all handlers */
> +       pref->priv->has_decorations_handler = g_signal_connect
> (pref->priv->has_decorations, "toggled", G_CALLBACK
> (change_has_decorations), pref);
> +       pref->priv->has_toolbar_handler = g_signal_connect
> (pref->priv->has_toolbar, "toggled", G_CALLBACK (change_has_toolbar), pref);
> +       pref->priv->autohide_toolbar_handler = g_signal_connect
> (pref->priv->autohide_toolbar, "toggled", G_CALLBACK
> (change_autohide_toolbar), pref);
> +       pref->priv->has_scrollbar_handler = g_signal_connect
> (pref->priv->has_scrollbar, "toggled", G_CALLBACK (change_has_scrollbar),
> pref);
> +
>         pref->priv->fontcheck_handler = g_signal_connect
> (pref->priv->fontcheck, "toggled", G_CALLBACK (change_font_check), pref);
>         pref->priv->font_handler = g_signal_connect
> (pref->priv->fontbutton, "font-set", G_CALLBACK (change_font_face), pref);
>         pref->priv->colorcheck_handler = g_signal_connect
> (pref->priv->colorcheck, "toggled", G_CALLBACK (change_color_check), pref);
> @@ -468,6 +537,11 @@
>         pref->priv->editcheck_handler = g_signal_connect
> (pref->priv->editcheck, "toggled", G_CALLBACK (change_edit_check), pref);
>         pref->priv->confirmcheck_handler = g_signal_connect
> (pref->priv->confirmcheck, "toggled", G_CALLBACK (change_confirm_check),
> pref);
>
> +       pref->priv->notify_has_decorations_handler =
> g_signal_connect_swapped (pref->priv->settings, "notify::has-decorations",
> G_CALLBACK (notify_has_decorations), pref);
> +       pref->priv->notify_has_toolbar_handler = g_signal_connect_swapped
> (pref->priv->settings, "notify::has-toolbar", G_CALLBACK
> (notify_has_toolbar), pref);
> +       pref->priv->notify_autohide_toolbar_handler =
> g_signal_connect_swapped (pref->priv->settings, "notify::autohide-toolbar",
> G_CALLBACK (notify_autohide_toolbar), pref);
> +       pref->priv->notify_has_scrollbar_handler =
> g_signal_connect_swapped (pref->priv->settings, "notify::has-scrollbar",
> G_CALLBACK (notify_has_scrollbar), pref);
> +
>         pref->priv->notify_font_handler = g_signal_connect_swapped
> (pref->priv->settings, "notify::fontname", G_CALLBACK (notify_fontname),
> pref);
>         pref->priv->notify_text_handler = g_signal_connect_swapped
> (pref->priv->settings, "notify::text-color", G_CALLBACK
> (notify_text_color), pref);
>         pref->priv->notify_back_handler = g_signal_connect_swapped
> (pref->priv->settings, "notify::back-color", G_CALLBACK
> (notify_back_color), pref);
> @@ -737,6 +811,36 @@
>  }
>
>  static void
> +change_has_decorations (GtkToggleButton *button, XpadPreferences *pref)
> +{
> +       g_signal_handler_block (pref->priv->settings,
> pref->priv->notify_has_decorations_handler);
> +       g_object_set (pref->priv->settings, "has-decorations",
> gtk_toggle_button_get_active (button), NULL);
> +       g_signal_handler_unblock (pref->priv->settings,
> pref->priv->notify_has_decorations_handler);
> +}
> +
> +static void
> +change_has_toolbar (GtkToggleButton *button, XpadPreferences *pref)
> +{
> +       g_object_set (pref->priv->settings, "has-toolbar",
> gtk_toggle_button_get_active (button), NULL);
> +}
> +
> +static void
> +change_autohide_toolbar (GtkToggleButton *button, XpadPreferences *pref)
> +{
> +       g_signal_handler_block (pref->priv->settings,
> pref->priv->notify_autohide_toolbar_handler);
> +       g_object_set (pref->priv->settings, "autohide-toolbar",
> gtk_toggle_button_get_active (button), NULL);
> +       g_signal_handler_unblock (pref->priv->settings,
> pref->priv->notify_autohide_toolbar_handler);
> +}
> +
> +static void
> +change_has_scrollbar (GtkToggleButton *button, XpadPreferences *pref)
> +{
> +       g_signal_handler_block (pref->priv->settings,
> pref->priv->notify_has_scrollbar_handler);
> +       g_object_set (pref->priv->settings, "has-scrollbar",
> gtk_toggle_button_get_active (button), NULL);
> +       g_signal_handler_unblock (pref->priv->settings,
> pref->priv->notify_has_scrollbar_handler);
> +}
> +
> +static void
>  notify_fontname (XpadPreferences *pref)
>  {
>         const gchar *fontname;
> @@ -918,3 +1022,44 @@
>         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->confirmcheck), value);
>         g_signal_handler_unblock (pref->priv->confirmcheck,
> pref->priv->confirmcheck_handler);
>  }
> +
> +static void
> +notify_has_decorations (XpadPreferences *pref)
> +{
> +       gboolean value;
> +       g_object_get (pref->priv->settings, "has-decorations", &value,
> NULL);
> +       g_signal_handler_block (pref->priv->has_decorations,
> pref->priv->has_decorations_handler);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->has_decorations), value);
> +       g_signal_handler_unblock (pref->priv->has_decorations,
> pref->priv->has_decorations_handler);
> +}
> +
> +static void
> +notify_has_toolbar (XpadPreferences *pref)
> +{
> +       gboolean value;
> +       g_object_get (pref->priv->settings, "has-toolbar", &value, NULL);
> +       g_signal_handler_block (pref->priv->has_toolbar,
> pref->priv->has_toolbar_handler);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->has_toolbar), value);
> +       gtk_widget_set_sensitive (pref->priv->autohide_toolbar, value);
> +       g_signal_handler_unblock (pref->priv->has_toolbar,
> pref->priv->has_toolbar_handler);
> +}
> +
> +static void
> +notify_autohide_toolbar (XpadPreferences *pref)
> +{
> +       gboolean value;
> +       g_object_get (pref->priv->settings, "autohide-toolbar", &value,
> NULL);
> +       g_signal_handler_block (pref->priv->autohide_toolbar,
> pref->priv->autohide_toolbar_handler);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->autohide_toolbar), value);
> +       g_signal_handler_unblock (pref->priv->autohide_toolbar,
> pref->priv->autohide_toolbar_handler);
> +}
> +
> +static void
> +notify_has_scrollbar (XpadPreferences *pref)
> +{
> +       gboolean value;
> +       g_object_get (pref->priv->settings, "has-scrollbar", &value, NULL);
> +       g_signal_handler_block (pref->priv->has_scrollbar,
> pref->priv->has_scrollbar_handler);
> +       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->has_scrollbar), value);
> +       g_signal_handler_unblock (pref->priv->has_scrollbar,
> pref->priv->has_scrollbar_handler);
> +}
>
>
>

-- 
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://uk.linkedin.com/in/arthurborsboom>