cairo-dock-team team mailing list archive
-
cairo-dock-team team
-
Mailing list archive
-
Message #02271
[Merge] lp:~meuarrr/cairo-dock-plug-ins/SQP into lp:cairo-dock-plug-ins
SQP has proposed merging lp:~meuarrr/cairo-dock-plug-ins/SQP into lp:cairo-dock-plug-ins.
Requested reviews:
Cairo-Dock Team (cairo-dock-team)
Updated applets right click menu : Groups Accessories and Internet
--
https://code.launchpad.net/~meuarrr/cairo-dock-plug-ins/SQP/+merge/34622
Your team Cairo-Dock Team is requested to review the proposed merge of lp:~meuarrr/cairo-dock-plug-ins/SQP into lp:cairo-dock-plug-ins.
=== modified file 'clock/src/applet-notifications.c'
--- clock/src/applet-notifications.c 2010-09-04 00:50:31 +0000
+++ clock/src/applet-notifications.c 2010-09-04 17:08:49 +0000
@@ -89,7 +89,7 @@
GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
// Main Menu
- CD_APPLET_ADD_IN_MENU (D_("Show today's tasks"), _cd_clock_show_tasks_today, CD_APPLET_MY_MENU);
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Show today's tasks"), MY_APPLET_SHARE_DATA_DIR"/icon-task.png", _cd_clock_show_tasks_today, CD_APPLET_MY_MENU);
CD_APPLET_ADD_IN_MENU (D_("Show this week's tasks"), _cd_clock_show_tasks_week, CD_APPLET_MY_MENU);
// Sub-Menu
=== modified file 'mail/src/cd-mail-applet-notifications.c'
--- mail/src/cd-mail-applet-notifications.c 2010-09-04 00:50:31 +0000
+++ mail/src/cd-mail-applet-notifications.c 2010-09-04 17:08:49 +0000
@@ -131,28 +131,29 @@
_cd_mail_force_update(myApplet);
}
CD_APPLET_ON_BUILD_MENU_BEGIN
-
+ // Sub-Menu
GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
+ CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
+ // Main Menu
if(myData.pMailAccounts && myData.pMailAccounts->len > 0)
{
- /* add a "update account" item for each mailbox */
- GtkWidget *pRefreshAccountSubMenu = CD_APPLET_ADD_SUB_MENU (D_("Refresh a mail account"), pSubMenu);
-
- guint i;
- for (i = 0; i < myData.pMailAccounts->len; i ++)
- {
- CDMailAccount *pMailAccount = g_ptr_array_index (myData.pMailAccounts, i);
- CD_APPLET_ADD_IN_MENU_WITH_DATA (pMailAccount->name, _cd_mail_update_account, pRefreshAccountSubMenu, pMailAccount);
- }
+ /* add a "update account" item for each mailbox */
+ GtkWidget *pRefreshAccountSubMenu = CD_APPLET_ADD_SUB_MENU_WITH_IMAGE (D_("Refresh a mail account"), CD_APPLET_MY_MENU, GTK_STOCK_REFRESH);
+
+ guint i;
+ for (i = 0; i < myData.pMailAccounts->len; i ++)
+ {
+ CDMailAccount *pMailAccount = g_ptr_array_index (myData.pMailAccounts, i);
+ CD_APPLET_ADD_IN_MENU_WITH_DATA (pMailAccount->name, _cd_mail_update_account, pRefreshAccountSubMenu, pMailAccount);
+ }
}
- CD_APPLET_ADD_IN_MENU (D_("Mark all emails as read"), _cd_mail_mark_all_as_read, pSubMenu);
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Mark all emails as read"), GTK_STOCK_OK, _cd_mail_mark_all_as_read, CD_APPLET_MY_MENU);
if (myConfig.cMailApplication)
{
gchar *cLabel = g_strdup_printf (D_("Launch %s"), myConfig.cMailApplication);
- CD_APPLET_ADD_IN_MENU (cLabel, _cd_mail_launch_mail_appli, pSubMenu);
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel, GTK_STOCK_EXECUTE, _cd_mail_launch_mail_appli, CD_APPLET_MY_MENU);
g_free (cLabel);
}
- CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
CD_APPLET_ON_BUILD_MENU_END
=== modified file 'slider/src/applet-notifications.c'
--- slider/src/applet-notifications.c 2010-09-04 00:50:31 +0000
+++ slider/src/applet-notifications.c 2010-09-04 17:08:49 +0000
@@ -160,18 +160,20 @@
//\___________ Define here the entries you want to add to the menu when the user right-clicks on your icon or on its subdock or your desklet. The icon and the container that were clicked are available through the macros CD_APPLET_CLICKED_ICON and CD_APPLET_CLICKED_CONTAINER. CD_APPLET_CLICKED_ICON may be NULL if the user clicked in the container but out of icons. The menu where you can add your entries is available throught the macro CD_APPLET_MY_MENU; you can add sub-menu to it if you want.
CD_APPLET_ON_BUILD_MENU_BEGIN
+ // Sub Menu
GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
-
- if (myConfig.iClickOption != SLIDER_PAUSE) {
- CD_APPLET_ADD_IN_MENU (myData.bPause ? D_("Play") : D_("Pause"), _cd_slider_toogle_pause, pSubMenu);
- }
- if (myConfig.iClickOption != SLIDER_OPEN_IMAGE) {
- CD_APPLET_ADD_IN_MENU (D_("Open current image"), _cd_slider_open_current_slide, pSubMenu);
- }
- CD_APPLET_ADD_IN_MENU (D_("Browse images folder"), _cd_slider_run_dir, pSubMenu);
+ CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
+
+ // Main Menu
+ if (myConfig.iClickOption != SLIDER_PAUSE)
+ {
+ CD_APPLET_ADD_IN_MENU (myData.bPause ? D_("Play") : D_("Pause"), _cd_slider_toogle_pause, CD_APPLET_MY_MENU);
+ }
+ if (myConfig.iClickOption != SLIDER_OPEN_IMAGE) {
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Open current image"), GTK_STOCK_OPEN, _cd_slider_open_current_slide, CD_APPLET_MY_MENU);
+ }
+ CD_APPLET_ADD_IN_MENU (D_("Browse images folder"), _cd_slider_run_dir, CD_APPLET_MY_MENU);
- CD_APPLET_ADD_SEPARATOR_IN_MENU (pSubMenu);
- CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
CD_APPLET_ON_BUILD_MENU_END
=== modified file 'tomboy/src/tomboy-notifications.c'
--- tomboy/src/tomboy-notifications.c 2010-09-04 00:50:31 +0000
+++ tomboy/src/tomboy-notifications.c 2010-09-04 17:08:49 +0000
@@ -185,14 +185,17 @@
CD_APPLET_ON_BUILD_MENU_BEGIN
gboolean bClickOnNotes = (pClickedIcon != myIcon);
+ // Sub-Menu
+ GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
+ if (bClickOnNotes && pClickedIcon != NULL)
+ {
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Delete this note"), GTK_STOCK_REMOVE, _cd_tomboy_delete_note, pSubMenu, pClickedIcon);
+ CD_APPLET_ADD_SEPARATOR_IN_MENU (pSubMenu);
+ }
+ CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
+
// Main Menu
CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Add a note"), GTK_STOCK_ADD, _cd_tomboy_add_note, CD_APPLET_MY_MENU);
-
- if (bClickOnNotes && pClickedIcon != NULL)
- {
- CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Delete this note"), GTK_STOCK_REMOVE, _cd_tomboy_delete_note, CD_APPLET_MY_MENU, pClickedIcon);
- }
-
CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Reload notes"), GTK_STOCK_REFRESH, _cd_tomboy_reload_notes, CD_APPLET_MY_MENU);
if (bClickOnNotes) // on ne le fait pas pour un clic sur myIcon, car le sous-dock gene le dialogue.
@@ -219,8 +222,6 @@
}
}
}
- CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
- CD_APPLET_ADD_ABOUT_IN_MENU (CD_APPLET_MY_MENU);
if (bClickOnNotes && pClickedIcon != NULL)
CD_APPLET_LEAVE (CAIRO_DOCK_INTERCEPT_NOTIFICATION);
=== modified file 'weather/src/applet-notifications.c'
--- weather/src/applet-notifications.c 2010-09-04 00:50:31 +0000
+++ weather/src/applet-notifications.c 2010-09-04 17:08:49 +0000
@@ -82,9 +82,10 @@
CD_APPLET_ON_BUILD_MENU_BEGIN
// Sub-Menu
GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
- CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Reload now"), GTK_STOCK_REFRESH, _cd_weather_reload, pSubMenu);
- CD_APPLET_ADD_SEPARATOR (pSubMenu);
- CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
+ CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
+ // Main Menu
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Reload now"), GTK_STOCK_REFRESH, _cd_weather_reload, CD_APPLET_MY_MENU);
+
CD_APPLET_ON_BUILD_MENU_END
=== modified file 'weblets/src/applet-notifications.c'
--- weblets/src/applet-notifications.c 2010-09-04 00:50:31 +0000
+++ weblets/src/applet-notifications.c 2010-09-04 17:08:49 +0000
@@ -96,8 +96,6 @@
//\___________ Define here the entries you want to add to the menu when the user right-clicks on your icon or on its subdock or your desklet. The icon and the container that were clicked are available through the macros CD_APPLET_CLICKED_ICON and CD_APPLET_CLICKED_CONTAINER. CD_APPLET_CLICKED_ICON may be NULL if the user clicked in the container but out of icons. The menu where you can add your entries is available throught the macro CD_APPLET_MY_MENU; you can add sub-menu to it if you want.
CD_APPLET_ON_BUILD_MENU_BEGIN
gint i = 0;
- // Main Menu
- CD_APPLET_ADD_IN_MENU("Reload webpage", _cd_weblets_reload_webpage, CD_APPLET_MY_MENU);
// Sub Menu
GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
if( myConfig.cListURI != NULL )
@@ -116,6 +114,8 @@
CD_APPLET_ADD_SEPARATOR_IN_MENU (pSubMenu);
}
CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
+ // Main Menu
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Reload webpage", GTK_STOCK_REFRESH, _cd_weblets_reload_webpage, CD_APPLET_MY_MENU);
CD_APPLET_ON_BUILD_MENU_END
=== modified file 'wifi/src/applet-notifications.c'
--- wifi/src/applet-notifications.c 2010-09-04 00:50:31 +0000
+++ wifi/src/applet-notifications.c 2010-09-04 17:08:49 +0000
@@ -73,8 +73,8 @@
// Sub-Menu
GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
if (! myData.bWirelessExt)
- CD_APPLET_ADD_IN_MENU (D_("Check for Wireless Extension"), _wifi_recheck_wireless_extension, pSubMenu);
- CD_APPLET_ADD_IN_MENU (D_("Network Administration"), _cd_wifi_show_config, pSubMenu);
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Check for Wireless Extension"), GTK_STOCK_REFRESH, _wifi_recheck_wireless_extension, pSubMenu);
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Network Administration"), GTK_STOCK_PREFERENCES, _cd_wifi_show_config, pSubMenu);
CD_APPLET_ADD_SEPARATOR (pSubMenu);
CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
CD_APPLET_ON_BUILD_MENU_END
