Hi Sachin,

Thanks for proposing your code for merging. I would like to finish my
current work first (garbage collection with the two bugs). Once the
"garbage counter" is at 0, and the application is still working, I will
upload my code and start merging yours in the main branch, ok?

Some introduction from my side:

I'm Dutch (= The Netherlands), 34 years old, male (duhh), and currently
travelling through South-America by bike. Well, travelling, I am staying in
a nice appartment in Lima, right now. :)

How's life coping for you? You are Indian, am I right?



On 14 October 2013 12:37, Sachin Raut <email address hidden> wrote:

> Sachin Raut has proposed merging lp:~sachinr/xpad/xpad-tray-config into
> lp:xpad.
>
> Requested reviews:
>   Xpad Administrators (xpad-team)
> Related bugs:
>   Bug #304331 in Xpad: "controlling right/left click on tray icon"
>   https://bugs.launchpad.net/xpad/+bug/304331
>   Bug #345278 in Xpad: "toggle on left mouse click"
>   https://bugs.launchpad.net/xpad/+bug/345278
>
> For more details, see:
> https://code.launchpad.net/~sachinr/xpad/xpad-tray-config/+merge/191013
>
> fixed Bug #304331: controlling right/left click on tray icon.
> fixed Bug #345278: toggle on left mouse click.
> --
> https://code.launchpad.net/~sachinr/xpad/xpad-tray-config/+merge/191013
> You are subscribed to branch lp:xpad.
>
> === modified file 'src/xpad-preferences.c'
> --- src/xpad-preferences.c      2008-09-21 00:03:40 +0000
> +++ src/xpad-preferences.c      2013-10-14 17:36:30 +0000
> @@ -39,6 +39,7 @@
>         GtkWidget *editcheck;
>         GtkWidget *stickycheck;
>         GtkWidget *confirmcheck;
> +       GtkWidget *trayconfigbox;
>
>         GtkWidget *textbutton;
>         GtkWidget *backbutton;
> @@ -50,6 +51,7 @@
>         guint notify_font_handler;
>         guint notify_back_handler;
>         guint notify_text_handler;
> +       guint notify_tray_handler;
>         guint font_handler;
>         guint back_handler;
>         guint text_handler;
> @@ -58,6 +60,7 @@
>         guint editcheck_handler;
>         guint stickycheck_handler;
>         guint confirmcheck_handler;
> +       guint trayclick_handler;
>  };
>
>  static void change_edit_check (GtkToggleButton *button, XpadPreferences
> *pref);
> @@ -68,12 +71,14 @@
>  static void change_text_color (GtkColorButton *button, XpadPreferences
> *pref);
>  static void change_back_color (GtkColorButton *button, XpadPreferences
> *pref);
>  static void change_font_face (GtkFontButton *button, XpadPreferences
> *pref);
> +static void change_tray_click_configuration(GtkComboBox *box,
> XpadPreferences *pref);
>  static void notify_edit (XpadPreferences *pref);
>  static void notify_sticky (XpadPreferences *pref);
>  static void notify_confirm (XpadPreferences *pref);
>  static void notify_fontname (XpadPreferences *pref);
>  static void notify_text_color (XpadPreferences *pref);
>  static void notify_back_color (XpadPreferences *pref);
> +static void notify_tray_click (XpadPreferences *pref);
>  static void xpad_preferences_finalize (GObject *object);
>  static void xpad_preferences_response (GtkDialog *dialog, gint response);
>
> @@ -112,7 +117,7 @@
>         const gchar *fontname;
>         GtkStyle *style;
>         GtkWidget *label, *appearance_frame, *alignment, *appearance_vbox;
> -       GtkWidget *options_frame, *options_vbox, *global_vbox;
> +       GtkWidget *options_frame, *options_vbox, *global_vbox,
> *tray_config_vbox;
>         gchar *text;
>         GtkSizeGroup *size_group_labels = gtk_size_group_new
> (GTK_SIZE_GROUP_HORIZONTAL);
>         GtkRequisition req;
> @@ -272,10 +277,28 @@
>                 "child", alignment,
>                 NULL));
>
> -
> +       tray_config_vbox = GTK_WIDGET (g_object_new (GTK_TYPE_VBOX,
> +               "homogeneous", FALSE,
> +               "spacing", 6,
> +               NULL));
> +
> +       pref->priv->trayconfigbox = gtk_combo_box_new_text();
> +       gtk_combo_box_append_text( GTK_COMBO_BOX(
> pref->priv->trayconfigbox ), "Do Nothing" );
> +       gtk_combo_box_append_text( GTK_COMBO_BOX(
> pref->priv->trayconfigbox ), "Toggle Show All" );
> +       gtk_combo_box_append_text( GTK_COMBO_BOX(
> pref->priv->trayconfigbox ), "List of Pads" );
> +       gtk_combo_box_append_text( GTK_COMBO_BOX(
> pref->priv->trayconfigbox ), "New Pad" );
> +       gtk_combo_box_set_active( GTK_COMBO_BOX( pref->priv->trayconfigbox
> ), xpad_settings_get_tray_click_handler(xpad_settings()));
> +
> +       hbox = gtk_hbox_new(FALSE, 12);
> +       label = gtk_label_new_with_mnemonic(_("Tray click behaviour"));
> +       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
> +       gtk_box_pack_start(GTK_BOX(hbox), pref->priv->trayconfigbox, TRUE,
> TRUE, 0);
> +       gtk_box_pack_start(GTK_BOX(tray_config_vbox), hbox, TRUE, TRUE, 0);
> +
>         gtk_box_pack_start (GTK_BOX (options_vbox), pref->priv->editcheck,
> FALSE, FALSE, 0);
>         gtk_box_pack_start (GTK_BOX (options_vbox),
> pref->priv->stickycheck, FALSE, FALSE, 0);
>         gtk_box_pack_start (GTK_BOX (options_vbox),
> pref->priv->confirmcheck, FALSE, FALSE, 0);
> +       g_object_set (GTK_WIDGET(options_vbox), "child", tray_config_vbox,
> NULL);
>
>         global_vbox = g_object_new (GTK_TYPE_VBOX,
>                 "border-width", 6,
> @@ -295,12 +318,14 @@
>         pref->priv->text_handler = g_signal_connect
> (pref->priv->textbutton, "color-set", G_CALLBACK (change_text_color), pref);
>         pref->priv->back_handler = g_signal_connect
> (pref->priv->backbutton, "color-set", G_CALLBACK (change_back_color), pref);
>         pref->priv->font_handler = g_signal_connect
> (pref->priv->fontbutton, "font-set", G_CALLBACK (change_font_face), pref);
> +       pref->priv->trayclick_handler =
> g_signal_connect(pref->priv->trayconfigbox, "changed",
> G_CALLBACK(change_tray_click_configuration), pref);
>         pref->priv->notify_font_handler = g_signal_connect_swapped
> (xpad_settings (), "notify::fontname", G_CALLBACK (notify_fontname), pref);
>         pref->priv->notify_text_handler = g_signal_connect_swapped
> (xpad_settings (), "notify::text-color", G_CALLBACK (notify_text_color),
> pref);
>         pref->priv->notify_back_handler = g_signal_connect_swapped
> (xpad_settings (), "notify::back-color", G_CALLBACK (notify_back_color),
> pref);
>         pref->priv->notify_sticky_handler = g_signal_connect_swapped
> (xpad_settings (), "notify::sticky", G_CALLBACK (notify_sticky), pref);
>         pref->priv->notify_edit_handler = g_signal_connect_swapped
> (xpad_settings (), "notify::edit-lock", G_CALLBACK (notify_edit), pref);
>         pref->priv->notify_confirm_handler = g_signal_connect_swapped
> (xpad_settings (), "notify::confirm-destroy", G_CALLBACK (notify_confirm),
> pref);
> +       pref->priv->notify_tray_handler = g_signal_connect_swapped
> (xpad_settings (), "notify::tray_click_configuration",
> G_CALLBACK(notify_tray_click), pref);
>
>         g_object_unref (size_group_labels);
>
> @@ -394,6 +419,14 @@
>  }
>
>  static void
> +change_tray_click_configuration(GtkComboBox *box, XpadPreferences *pref)
> +{
> +       g_signal_handler_block(xpad_settings(),
> pref->priv->notify_tray_handler);
> +       xpad_settings_set_tray_click_handler(xpad_settings(),
> gtk_combo_box_get_active(box));
> +       g_signal_handler_unblock(xpad_settings(),
> pref->priv->notify_tray_handler);
> +}
> +
> +static void
>  change_text_color (GtkColorButton *button, XpadPreferences *pref)
>  {
>         GdkColor color;
> @@ -516,3 +549,12 @@
>         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
> (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy
> (xpad_settings ()));
>         g_signal_handler_unblock (pref->priv->confirmcheck,
> pref->priv->confirmcheck_handler);
>  }
> +
> +static void
> +notify_tray_click(XpadPreferences *pref)
> +{
> +       g_signal_handler_block(pref->priv->trayconfigbox,
> pref->priv->trayclick_handler);
> +       gtk_combo_box_set_active(GTK_COMBO_BOX(pref->priv->trayconfigbox),
> xpad_settings_get_tray_click_handler(xpad_settings()));
> +       g_signal_handler_unblock(pref->priv->trayconfigbox,
> pref->priv->trayclick_handler);
> +}
> +
>
> === modified file 'src/xpad-settings.c'
> --- src/xpad-settings.c 2013-10-07 20:07:46 +0000
> +++ src/xpad-settings.c 2013-10-14 17:36:30 +0000
> @@ -35,6 +35,7 @@
>         gboolean confirm_destroy;
>         gboolean edit_lock;
>         gboolean sticky;
> +       guint tray_click_configuration;
>         gboolean has_toolbar;
>         gboolean autohide_toolbar;
>         gboolean has_scrollbar;
> @@ -59,6 +60,7 @@
>    PROP_CONFIRM_DESTROY,
>    PROP_STICKY,
>    PROP_EDIT_LOCK,
> +  PROP_TRAY_CLICK_CONFIGURATION,
>    PROP_HAS_TOOLBAR,
>    PROP_AUTOHIDE_TOOLBAR,
>    PROP_HAS_SCROLLBAR,
> @@ -149,7 +151,15 @@
>                                                                "Whether
> edit lock mode is enabled",
>                                                                FALSE,
>
>  G_PARAM_READWRITE));
> -
> +       g_object_class_install_property (gobject_class,
> +                                     PROP_TRAY_CLICK_CONFIGURATION,
> +                                     g_param_spec_uint
> ("tray_click_configuration",
> +                                                        "Tray Click
> Configuration",
> +                                                        "What
> configuration is selected on tray click",
> +                                                        0,
> +                                                        G_MAXUINT,
> +                                                        2,
> +
>  G_PARAM_READWRITE));
>         g_object_class_install_property (gobject_class,
>                                          PROP_HAS_TOOLBAR,
>                                          g_param_spec_boolean
> ("has_toolbar",
> @@ -239,6 +249,7 @@
>         settings->priv->confirm_destroy = TRUE;
>         settings->priv->sticky = FALSE;
>         settings->priv->edit_lock = FALSE;
> +       settings->priv->tray_click_configuration = 0;
>         settings->priv->fontname = NULL;
>         settings->priv->has_toolbar = TRUE;
>         settings->priv->autohide_toolbar = TRUE;
> @@ -350,6 +361,21 @@
>         return settings->priv->edit_lock;
>  }
>
> +void xpad_settings_set_tray_click_handler (XpadSettings *settings, guint
> conf)
> +{
> +       if (settings->priv->tray_click_configuration == conf)
> +               return;
> +
> +       settings->priv->tray_click_configuration = conf;
> +       save_to_file(settings, DEFAULTS_FILENAME);
> +       g_object_notify (G_OBJECT (settings), "tray_click_configuration");
> +}
> +
> +guint xpad_settings_get_tray_click_handler(XpadSettings *settings)
> +{
> +       return settings->priv->tray_click_configuration;
> +}
> +
>  void xpad_settings_set_has_toolbar (XpadSettings *settings, gboolean
> toolbar)
>  {
>         if (settings->priv->has_toolbar == toolbar)
> @@ -607,7 +633,11 @@
>         case PROP_EDIT_LOCK:
>                 xpad_settings_set_edit_lock (settings, g_value_get_boolean
> (value));
>                 break;
> -
> +
> +       case PROP_TRAY_CLICK_CONFIGURATION:
> +               xpad_settings_set_tray_click_handler(settings,
> g_value_get_uint(value));
> +               break;
> +
>         case PROP_HAS_TOOLBAR:
>                 xpad_settings_set_has_toolbar (settings,
> g_value_get_boolean (value));
>                 break;
> @@ -727,6 +757,7 @@
>                 "b|confirm_destroy", &settings->priv->confirm_destroy,
>                 "b|edit_lock", &settings->priv->edit_lock,
>                 "b|sticky_on_start", &settings->priv->sticky,
> +               "u|tray_click_configuration",
> &settings->priv->tray_click_configuration,
>                 "h|back_red", &back.red,
>                 "h|back_green", &back.green,
>                 "h|back_blue", &back.blue,
> @@ -818,6 +849,7 @@
>                 "b|confirm_destroy", settings->priv->confirm_destroy,
>                 "b|edit_lock", settings->priv->edit_lock,
>                 "b|sticky_on_start", settings->priv->sticky,
> +               "u|tray_click_configuration",
> settings->priv->tray_click_configuration,
>                 "h|back_red", settings->priv->back ?
> settings->priv->back->red : 0,
>                 "h|back_green", settings->priv->back ?
> settings->priv->back->green : 0,
>                 "h|back_blue", settings->priv->back ?
> settings->priv->back->blue : 0,
>
> === modified file 'src/xpad-tray.c'
> --- src/xpad-tray.c     2013-10-09 14:46:10 +0000
> +++ src/xpad-tray.c     2013-10-14 17:36:30 +0000
> @@ -29,8 +29,23 @@
>  #include "xpad-preferences.h"
>  #include "xpad-tray.h"
>
> +enum
> +{
> +       DO_NOTHING,
> +       TOGGLE_SHOW_ALL,
> +       LIST_OF_PADS,
> +       NEW_PAD
> +};
> +// tray icon left click handler
>  static void xpad_tray_activate_cb (GtkStatusIcon *icon);
> +// tray icon right click handler
>  static void xpad_tray_popup_menu_cb (GtkStatusIcon *icon, guint button,
> guint time);
> +// "toggle show all" menu item handler
> +static void xpad_tray_show_hide_all (void);
> +// "show pads" menu item handler
> +static void xpad_tray_show_windows_list (GtkStatusIcon *icon);
> +// helper function to append pad window title as item to menu
> +static void xpad_tray_append_pad_window_titles_to_menu (GtkWidget *menu);
>
>  static GtkStatusIcon  *docklet = NULL;
>
> @@ -101,6 +116,25 @@
>         g_slist_free (pads);
>  }
>
> +static void
> +xpad_tray_show_hide_all (void)
> +{
> +       GSList *pads = xpad_pad_group_get_pads (xpad_app_get_pad_group ());
> +       // find if any pad is visible
> +       gboolean open = FALSE;
> +       GSList *i;
> +       for(i = pads; i != NULL; i = i->next)
> +       {
> +               if (gtk_widget_get_visible(GTK_WIDGET(i->data)))
> +               {
> +                       open = TRUE;
> +                       break;
> +               }
> +       }
> +       g_slist_foreach(pads, (GFunc) (open ? gtk_widget_hide :
> gtk_widget_show), NULL);
> +       g_slist_free (pads);
> +}
> +
>  static void
>  menu_spawn (XpadPadGroup *group)
>  {
> @@ -112,11 +146,13 @@
>  xpad_tray_popup_menu_cb (GtkStatusIcon *icon, guint button, guint time)
>  {
>         GtkWidget *menu, *item;
> -       GSList *pads, *l;
> -       gint n;
> -
> +       GSList *pads;
> +       gboolean no_any_pad = FALSE;
>         menu = gtk_menu_new ();
>         pads = xpad_pad_group_get_pads (xpad_app_get_pad_group ());
> +       if (!pads)
> +               no_any_pad = TRUE;
> +       g_slist_free (pads);
>
>         item = gtk_image_menu_item_new_from_stock (GTK_STOCK_NEW, NULL);
>         g_signal_connect_swapped (item, "activate", G_CALLBACK
> (menu_spawn), xpad_app_get_pad_group ());
> @@ -131,28 +167,72 @@
>         g_signal_connect_swapped (item, "activate", G_CALLBACK
> (menu_show_all), xpad_app_get_pad_group ());
>         gtk_container_add (GTK_CONTAINER (menu), item);
>         gtk_widget_show (item);
> -       if (!pads)
> +       if (no_any_pad)
>                 gtk_widget_set_sensitive (item, FALSE);
>
>         item = gtk_image_menu_item_new_with_mnemonic (_("_Close All"));
>         g_signal_connect_swapped (item, "activate", G_CALLBACK
> (xpad_pad_group_close_all), xpad_app_get_pad_group ());
>         gtk_container_add (GTK_CONTAINER (menu), item);
>         gtk_widget_show (item);
> -       if (!pads)
> +       if (no_any_pad)
>                 gtk_widget_set_sensitive (item, FALSE);
>
>         item = gtk_separator_menu_item_new ();
>         gtk_container_add (GTK_CONTAINER (menu), item);
>         gtk_widget_show (item);
>
> -       /**
> -        * Order pads according to title.
> -        */
> +       // append window titles
> +       xpad_tray_append_pad_window_titles_to_menu (menu);
> +
> +       item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PREFERENCES,
> NULL);
> +       g_signal_connect (item, "activate", G_CALLBACK
> (xpad_preferences_open), NULL);
> +       gtk_container_add (GTK_CONTAINER (menu), item);
> +       gtk_widget_show (item);
> +
> +       item = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL);
> +       g_signal_connect (item, "activate", G_CALLBACK (gtk_main_quit),
> NULL);
> +       gtk_container_add (GTK_CONTAINER (menu), item);
> +       gtk_widget_show (item);
> +
> +       gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
> gtk_status_icon_position_menu, icon, button, time);
> +}
> +
> +static void
> +xpad_tray_activate_cb (GtkStatusIcon *icon)
> +{
> +       switch (xpad_settings_get_tray_click_handler(xpad_settings()))
> +       {
> +               case TOGGLE_SHOW_ALL:
> +                       xpad_tray_show_hide_all();
> +                       break;
> +               case LIST_OF_PADS:
> +                       xpad_tray_show_windows_list(icon);
> +                       break;
> +               case NEW_PAD:
> +                       menu_spawn(xpad_app_get_pad_group());
> +                       break;
> +       }
> +}
> +
> +static void
> +xpad_tray_show_windows_list (GtkStatusIcon *icon)
> +{
> +       GtkWidget* menu = gtk_menu_new ();
> +       xpad_tray_append_pad_window_titles_to_menu (menu);
> +       gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
> gtk_status_icon_position_menu, icon, 0, gtk_get_current_event_time());
> +}
> +
> +static void
> +xpad_tray_append_pad_window_titles_to_menu (GtkWidget *menu)
> +{
> +       GSList *pads, *l;
> +       GtkWidget *item;
> +       gint n;
> +
> +       pads = xpad_pad_group_get_pads (xpad_app_get_pad_group ());
> +       // Order pads according to title.
>         pads = g_slist_sort (pads, (GCompareFunc) menu_title_compare);
> -
> -       /**
> -        * Populate list of windows.
> -        */
> +       // Populate list of windows.
>         for (l = pads, n = 1; l; l = l->next, n++)
>         {
>                 gchar *title;
> @@ -174,6 +254,7 @@
>                 g_free (title);
>         }
>         g_slist_free (pads);
> +<<<<<<< TREE
>
>         if (pads)
>         {
> @@ -203,3 +284,6 @@
>         g_slist_free (pads);
>  }
>
> +=======
> +}
> +>>>>>>> MERGE-SOURCE
>
>
>


-- 
Arthur Borsboom
Appartment 10-01 (level 10, app 1)
Avenida Arequipa 4130
Lima, Peru
Mob: +51 984 230 576
Email: <email address hidden>