Icons for lots of popup menus.

diff --git a/disobedience/added.c b/disobedience/added.c
index aa15f48902d83079396d6ec566e1b44f253c286c..04e1d77e13e233d0d569efcd86b20e12df46fa21 100644 (file)
--- a/disobedience/added.c
+++ b/disobedience/added.c
@@ -80,10 +80,10 @@ static const struct queue_column added_columns[] = {
 
 /** @brief Pop-up menu for new tracks list */
 static struct menuitem added_menuitems[] = {
 
 /** @brief Pop-up menu for new tracks list */
 static struct menuitem added_menuitems[] = {

-  { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 },
-  { "Play track", ql_play_activate, ql_play_sensitive, 0, 0 },
-  { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
-  { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },
+  { "Track properties", GTK_STOCK_PROPERTIES, ql_properties_activate, ql_properties_sensitive, 0, 0 },
+  { "Play track", GTK_STOCK_MEDIA_PLAY, ql_play_activate, ql_play_sensitive, 0, 0 },
+  { "Select all tracks", GTK_STOCK_SELECT_ALL, ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
+  { "Deselect all tracks", NULL, ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },

 };
 
 struct queuelike ql_added = {
 };
 
 struct queuelike ql_added = {

diff --git a/disobedience/choose-menu.c b/disobedience/choose-menu.c
index 61943d251fcb81544bb9a88250e22fb15dd7fd6d..b0f59b5dad7deb3b6b23f104c6ca8061362f1243 100644 (file)
--- a/disobedience/choose-menu.c
+++ b/disobedience/choose-menu.c
@@ -265,6 +265,7 @@ static void choose_playchildren_played(void attribute((unused)) *v,
 static struct menuitem choose_menuitems[] = {
   {
     "Play track",
 static struct menuitem choose_menuitems[] = {
   {
     "Play track",

+    GTK_STOCK_MEDIA_PLAY,

     choose_play_activate,
     choose_play_sensitive,
     0,
     choose_play_activate,
     choose_play_sensitive,
     0,


@@ -272,6 +273,7 @@ static struct menuitem choose_menuitems[] = {
   },
   {
     "Track properties",
   },
   {
     "Track properties",

+    GTK_STOCK_PROPERTIES,

     choose_properties_activate,
     choose_properties_sensitive,
     0,
     choose_properties_activate,
     choose_properties_sensitive,
     0,


@@ -279,6 +281,7 @@ static struct menuitem choose_menuitems[] = {
   },
   {
     "Select children",
   },
   {
     "Select children",

+    NULL,

     choose_selectchildren_activate,
     choose_selectchildren_sensitive,
     0,
     choose_selectchildren_activate,
     choose_selectchildren_sensitive,
     0,


@@ -286,6 +289,7 @@ static struct menuitem choose_menuitems[] = {
   },
   {
     "Play children",
   },
   {
     "Play children",

+    NULL,

     choose_playchildren_activate,
     choose_selectchildren_sensitive,    /* re-use */
     0,
     choose_playchildren_activate,
     choose_selectchildren_sensitive,    /* re-use */
     0,


@@ -293,6 +297,7 @@ static struct menuitem choose_menuitems[] = {
   },
   {
     "Deselect all tracks",
   },
   {
     "Deselect all tracks",

+    NULL,

     choose_selectnone_activate,
     choose_selectnone_sensitive,
     0,
     choose_selectnone_activate,
     choose_selectnone_sensitive,
     0,

diff --git a/disobedience/playlists.c b/disobedience/playlists.c
index 1f836ad89c0f8b5e9206c4a463bb8198757ce03f..2762aa4fc1c04391c522f8a442f22be9caf7ef7e 100644 (file)
--- a/disobedience/playlists.c
+++ b/disobedience/playlists.c
@@ -151,12 +151,12 @@ static const struct queue_column playlist_columns[] = {
  * - select/deselect all work
  */
 static struct menuitem playlist_menuitems[] = {
  * - select/deselect all work
  */
 static struct menuitem playlist_menuitems[] = {

-  { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 },
-  { "Play track", ql_play_activate, ql_play_sensitive, 0, 0 },
-  { "Play playlist", playlist_playall_activate, playlist_playall_sensitive, 0, 0 },
-  { "Remove track from playlist", playlist_remove_activate, playlist_remove_sensitive, 0, 0 },
-  { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
-  { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },
+  { "Track properties", GTK_STOCK_PROPERTIES, ql_properties_activate, ql_properties_sensitive, 0, 0 },
+  { "Play track", GTK_STOCK_MEDIA_PLAY, ql_play_activate, ql_play_sensitive, 0, 0 },
+  { "Play playlist", NULL, playlist_playall_activate, playlist_playall_sensitive, 0, 0 },
+  { "Remove track from playlist", GTK_STOCK_CUT, playlist_remove_activate, playlist_remove_sensitive, 0, 0 },
+  { "Select all tracks", GTK_STOCK_SELECT_ALL, ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
+  { "Deselect all tracks", NULL, ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },

 };
 
 static const GtkTargetEntry playlist_targets[] = {
 };
 
 static const GtkTargetEntry playlist_targets[] = {


@@ -995,6 +995,7 @@ static int playlist_picker_remove_sensitive(void *extra) {
 static struct menuitem playlist_picker_menuitems[] = {
   {
     "Select playlist",
 static struct menuitem playlist_picker_menuitems[] = {
   {
     "Select playlist",

+    NULL,

     playlist_picker_select_activate,
     playlist_picker_select_sensitive,
     0,
     playlist_picker_select_activate,
     playlist_picker_select_sensitive,
     0,


@@ -1002,6 +1003,7 @@ static struct menuitem playlist_picker_menuitems[] = {
   },
   {
     "Play playlist",
   },
   {
     "Play playlist",

+    GTK_STOCK_MEDIA_PLAY, 

     playlist_picker_play_activate,
     playlist_picker_play_sensitive,
     0,
     playlist_picker_play_activate,
     playlist_picker_play_sensitive,
     0,


@@ -1009,6 +1011,7 @@ static struct menuitem playlist_picker_menuitems[] = {
   },
   {
     "Remove playlist",
   },
   {
     "Remove playlist",

+    GTK_STOCK_CUT,

     playlist_picker_remove_activate,
     playlist_picker_remove_sensitive,
     0,
     playlist_picker_remove_activate,
     playlist_picker_remove_sensitive,
     0,

diff --git a/disobedience/popup.c b/disobedience/popup.c
index 1a7c2e5224de2fd8a89b6e682b9c8f0d1b2998fc..d7e91f34117a6c9a8007867ac0725e308d6c18ea 100644 (file)
--- a/disobedience/popup.c
+++ b/disobedience/popup.c
@@ -34,7 +34,14 @@ void popup(GtkWidget **menup,
     g_signal_connect(menu, "destroy",
                      G_CALLBACK(gtk_widget_destroyed), menup);
     for(int n = 0; n < nitems; ++n) {
     g_signal_connect(menu, "destroy",
                      G_CALLBACK(gtk_widget_destroyed), menup);
     for(int n = 0; n < nitems; ++n) {

-      items[n].w = gtk_menu_item_new_with_label(items[n].name);
+      if(items[n].stock) {
+        GtkWidget *image = gtk_image_new_from_stock(items[n].stock,
+                                                    GTK_ICON_SIZE_MENU);
+        items[n].w = gtk_image_menu_item_new_with_label(items[n].name);
+        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(items[n].w),
+                                      image);
+      } else
+        items[n].w = gtk_menu_item_new_with_label(items[n].name);

       /* TODO accelerators would be useful here.  There might be some
        * interaction with the main menu accelerators, _except_ for playlist
        * case!  */
       /* TODO accelerators would be useful here.  There might be some
        * interaction with the main menu accelerators, _except_ for playlist
        * case!  */

diff --git a/disobedience/popup.h b/disobedience/popup.h
index 9706e0398b2de45bbe2db7b5dabf1fa0298ed148..25726b2fa451e96ee86bba14626a9c3f4acb8afa 100644 (file)
--- a/disobedience/popup.h
+++ b/disobedience/popup.h
@@ -26,6 +26,9 @@ struct menuitem {
   /** @brief Menu item name */
   const char *name;
 
   /** @brief Menu item name */
   const char *name;
 

+  /** @brief Stock icon name */
+  const char *stock;
+

   /** @brief Called to activate the menu item */
   void (*activate)(GtkMenuItem *menuitem,
                    gpointer user_data);
   /** @brief Called to activate the menu item */
   void (*activate)(GtkMenuItem *menuitem,
                    gpointer user_data);

diff --git a/disobedience/queue.c b/disobedience/queue.c
index 6c0e1362c4aa7231d20214bfd17ac5ce06f56b19..d899d3e8223923422af9228af758da359b97e270 100644 (file)
--- a/disobedience/queue.c
+++ b/disobedience/queue.c
@@ -233,12 +233,12 @@ static const struct queue_column queue_columns[] = {
 
 /** @brief Pop-up menu for queue */
 static struct menuitem queue_menuitems[] = {
 
 /** @brief Pop-up menu for queue */
 static struct menuitem queue_menuitems[] = {

-  { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 },
-  { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
-  { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },
-  { "Scratch playing track", ql_scratch_activate, ql_scratch_sensitive, 0, 0 },
-  { "Remove track from queue", ql_remove_activate, ql_remove_sensitive, 0, 0 },
-  { "Adopt track", ql_adopt_activate, ql_adopt_sensitive, 0, 0 },
+  { "Track properties", GTK_STOCK_PROPERTIES, ql_properties_activate, ql_properties_sensitive, 0, 0 },
+  { "Select all tracks", GTK_STOCK_SELECT_ALL, ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
+  { "Deselect all tracks", NULL, ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },
+  { "Scratch playing track", GTK_STOCK_STOP, ql_scratch_activate, ql_scratch_sensitive, 0, 0 },
+  { "Remove track from queue", GTK_STOCK_CUT, ql_remove_activate, ql_remove_sensitive, 0, 0 },
+  { "Adopt track", NULL, ql_adopt_activate, ql_adopt_sensitive, 0, 0 },

 };
 
 static const GtkTargetEntry queue_targets[] = {
 };
 
 static const GtkTargetEntry queue_targets[] = {

diff --git a/disobedience/recent.c b/disobedience/recent.c
index 0e74feb07e7adc8b671057f49ef3c282561b856c..510aac901c964519133f966816db8b80ed304843 100644 (file)
--- a/disobedience/recent.c
+++ b/disobedience/recent.c
@@ -78,10 +78,10 @@ static const struct queue_column recent_columns[] = {
 
 /** @brief Pop-up menu for recently played list */
 static struct menuitem recent_menuitems[] = {
 
 /** @brief Pop-up menu for recently played list */
 static struct menuitem recent_menuitems[] = {

-  { "Track properties", ql_properties_activate, ql_properties_sensitive,0, 0 },
-  { "Play track", ql_play_activate, ql_play_sensitive, 0, 0 },
-  { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
-  { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },
+  { "Track properties", GTK_STOCK_PROPERTIES, ql_properties_activate, ql_properties_sensitive,0, 0 },
+  { "Play track", GTK_STOCK_MEDIA_PLAY, ql_play_activate, ql_play_sensitive, 0, 0 },
+  { "Select all tracks", GTK_STOCK_SELECT_ALL, ql_selectall_activate, ql_selectall_sensitive, 0, 0 },
+  { "Deselect all tracks", NULL, ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 },

 };
 
 struct queuelike ql_recent = {
 };
 
 struct queuelike ql_recent = {