diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2009-12-31 14:37:59 +0100 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2009-12-31 14:37:59 +0100 |
commit | 9e3e84fe80a7984dc20817f993295fdced09dc7b (patch) | |
tree | e729d03eb286a512fc4563577bb7d82e489cd9d1 | |
parent | e92ebe02724afd4f100728106e405b0c75aa511d (diff) |
fixed "edit->selection->remove" menu item
-rw-r--r-- | plugins/gtkui/callbacks.c | 9 | ||||
-rw-r--r-- | plugins/gtkui/deadbeef.glade | 17 | ||||
-rw-r--r-- | plugins/gtkui/interface.c | 83 |
3 files changed, 55 insertions, 54 deletions
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 17805f56..d9b69fd2 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -524,8 +524,13 @@ void on_remove1_activate (GtkMenuItem *menuitem, gpointer user_data) { - // does nothing here -- required for hotkey hint in the menu - // job is done in keypress handlers + int cursor = deadbeef->pl_delete_selected (); + if (cursor >= main_playlist.get_count ()) { + cursor = main_playlist.get_count ()-1; + } + gtkpl_set_cursor (main_playlist.iterator, cursor); + main_refresh (); + search_refresh (); } diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index 3cce56a5..f3df317f 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -57,7 +57,7 @@ <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image290"> + <widget class="GtkImage" id="image297"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -84,7 +84,7 @@ <signal name="activate" handler="on_add_files_activate" last_modification_time="Sat, 04 Jul 2009 13:04:01 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image291"> + <widget class="GtkImage" id="image298"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -105,7 +105,7 @@ <signal name="activate" handler="on_add_folders_activate" last_modification_time="Sun, 06 Sep 2009 17:51:40 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image292"> + <widget class="GtkImage" id="image299"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -126,7 +126,7 @@ <signal name="activate" handler="on_add_audio_cd_activate" last_modification_time="Sat, 10 Oct 2009 15:29:22 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image293"> + <widget class="GtkImage" id="image300"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -196,7 +196,7 @@ <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image294"> + <widget class="GtkImage" id="image301"> <property name="visible">True</property> <property name="stock">gtk-quit</property> <property name="icon_size">1</property> @@ -230,7 +230,7 @@ <signal name="activate" handler="on_clear1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image295"> + <widget class="GtkImage" id="image302"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> @@ -268,10 +268,9 @@ <property name="label" translatable="yes">Remove</property> <property name="use_underline">True</property> <signal name="activate" handler="on_remove1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/> - <accelerator key="Delete" modifiers="0" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image296"> + <widget class="GtkImage" id="image303"> <property name="visible">True</property> <property name="stock">gtk-remove</property> <property name="icon_size">1</property> @@ -519,7 +518,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Tue, 08 Sep 2009 17:32:06 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image297"> + <widget class="GtkImage" id="image304"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index e06c8882..27795a21 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -35,14 +35,14 @@ create_mainwin (void) GtkWidget *menuitem1; GtkWidget *menuitem1_menu; GtkWidget *open; - GtkWidget *image290; + GtkWidget *image297; GtkWidget *separator2; GtkWidget *add_files; - GtkWidget *image291; + GtkWidget *image298; GtkWidget *add_folders; - GtkWidget *image292; + GtkWidget *image299; GtkWidget *add_audio_cd; - GtkWidget *image293; + GtkWidget *image300; GtkWidget *add_location1; GtkWidget *separatormenuitem1; GtkWidget *playlist_load; @@ -50,16 +50,16 @@ create_mainwin (void) GtkWidget *playlist_save_as; GtkWidget *separator8; GtkWidget *quit; - GtkWidget *image294; + GtkWidget *image301; GtkWidget *edit1; GtkWidget *edit1_menu; GtkWidget *clear1; - GtkWidget *image295; + GtkWidget *image302; GtkWidget *select_all1; GtkWidget *selection1; GtkWidget *selection1_menu; GtkWidget *remove1; - GtkWidget *image296; + GtkWidget *image303; GtkWidget *crop1; GtkWidget *find1; GtkWidget *separator5; @@ -89,7 +89,7 @@ create_mainwin (void) GtkWidget *menuitem4_menu; GtkWidget *about1; GtkWidget *help1; - GtkWidget *image297; + GtkWidget *image304; GtkWidget *hbox2; GtkWidget *hbox3; GtkWidget *stopbtn; @@ -144,9 +144,9 @@ create_mainwin (void) GDK_O, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image290 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image290); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image290); + image297 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image297); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image297); separator2 = gtk_separator_menu_item_new (); gtk_widget_show (separator2); @@ -157,25 +157,25 @@ create_mainwin (void) gtk_widget_show (add_files); gtk_container_add (GTK_CONTAINER (menuitem1_menu), add_files); - image291 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image291); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image291); + image298 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image298); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image298); add_folders = gtk_image_menu_item_new_with_mnemonic ("Add folder(s)"); gtk_widget_show (add_folders); gtk_container_add (GTK_CONTAINER (menuitem1_menu), add_folders); - image292 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image292); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image292); + image299 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image299); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image299); add_audio_cd = gtk_image_menu_item_new_with_mnemonic ("Add Audio CD"); gtk_widget_show (add_audio_cd); gtk_container_add (GTK_CONTAINER (menuitem1_menu), add_audio_cd); - image293 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image293); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_audio_cd), image293); + image300 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image300); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_audio_cd), image300); add_location1 = gtk_menu_item_new_with_mnemonic ("Add location"); gtk_widget_show (add_location1); @@ -210,9 +210,9 @@ create_mainwin (void) GDK_Q, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image294 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); - gtk_widget_show (image294); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image294); + image301 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); + gtk_widget_show (image301); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image301); edit1 = gtk_menu_item_new_with_mnemonic ("_Edit"); gtk_widget_show (edit1); @@ -225,9 +225,9 @@ create_mainwin (void) gtk_widget_show (clear1); gtk_container_add (GTK_CONTAINER (edit1_menu), clear1); - image295 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); - gtk_widget_show (image295); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image295); + image302 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); + gtk_widget_show (image302); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image302); select_all1 = gtk_menu_item_new_with_mnemonic ("Select all"); gtk_widget_show (select_all1); @@ -246,13 +246,10 @@ create_mainwin (void) remove1 = gtk_image_menu_item_new_with_mnemonic ("Remove"); gtk_widget_show (remove1); gtk_container_add (GTK_CONTAINER (selection1_menu), remove1); - gtk_widget_add_accelerator (remove1, "activate", accel_group, - GDK_Delete, (GdkModifierType) 0, - GTK_ACCEL_VISIBLE); - image296 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); - gtk_widget_show (image296); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image296); + image303 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); + gtk_widget_show (image303); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image303); crop1 = gtk_menu_item_new_with_mnemonic ("Crop"); gtk_widget_show (crop1); @@ -377,9 +374,9 @@ create_mainwin (void) gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menuitem4_menu), help1); - image297 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image297); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image297); + image304 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image304); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image304); hbox2 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox2); @@ -742,14 +739,14 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, menuitem1, "menuitem1"); GLADE_HOOKUP_OBJECT (mainwin, menuitem1_menu, "menuitem1_menu"); GLADE_HOOKUP_OBJECT (mainwin, open, "open"); - GLADE_HOOKUP_OBJECT (mainwin, image290, "image290"); + GLADE_HOOKUP_OBJECT (mainwin, image297, "image297"); GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2"); GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files"); - GLADE_HOOKUP_OBJECT (mainwin, image291, "image291"); + GLADE_HOOKUP_OBJECT (mainwin, image298, "image298"); GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders"); - GLADE_HOOKUP_OBJECT (mainwin, image292, "image292"); + GLADE_HOOKUP_OBJECT (mainwin, image299, "image299"); GLADE_HOOKUP_OBJECT (mainwin, add_audio_cd, "add_audio_cd"); - GLADE_HOOKUP_OBJECT (mainwin, image293, "image293"); + GLADE_HOOKUP_OBJECT (mainwin, image300, "image300"); GLADE_HOOKUP_OBJECT (mainwin, add_location1, "add_location1"); GLADE_HOOKUP_OBJECT (mainwin, separatormenuitem1, "separatormenuitem1"); GLADE_HOOKUP_OBJECT (mainwin, playlist_load, "playlist_load"); @@ -757,16 +754,16 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, playlist_save_as, "playlist_save_as"); GLADE_HOOKUP_OBJECT (mainwin, separator8, "separator8"); GLADE_HOOKUP_OBJECT (mainwin, quit, "quit"); - GLADE_HOOKUP_OBJECT (mainwin, image294, "image294"); + GLADE_HOOKUP_OBJECT (mainwin, image301, "image301"); GLADE_HOOKUP_OBJECT (mainwin, edit1, "edit1"); GLADE_HOOKUP_OBJECT (mainwin, edit1_menu, "edit1_menu"); GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1"); - GLADE_HOOKUP_OBJECT (mainwin, image295, "image295"); + GLADE_HOOKUP_OBJECT (mainwin, image302, "image302"); GLADE_HOOKUP_OBJECT (mainwin, select_all1, "select_all1"); GLADE_HOOKUP_OBJECT (mainwin, selection1, "selection1"); GLADE_HOOKUP_OBJECT (mainwin, selection1_menu, "selection1_menu"); GLADE_HOOKUP_OBJECT (mainwin, remove1, "remove1"); - GLADE_HOOKUP_OBJECT (mainwin, image296, "image296"); + GLADE_HOOKUP_OBJECT (mainwin, image303, "image303"); GLADE_HOOKUP_OBJECT (mainwin, crop1, "crop1"); GLADE_HOOKUP_OBJECT (mainwin, find1, "find1"); GLADE_HOOKUP_OBJECT (mainwin, separator5, "separator5"); @@ -794,7 +791,7 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, menuitem4_menu, "menuitem4_menu"); GLADE_HOOKUP_OBJECT (mainwin, about1, "about1"); GLADE_HOOKUP_OBJECT (mainwin, help1, "help1"); - GLADE_HOOKUP_OBJECT (mainwin, image297, "image297"); + GLADE_HOOKUP_OBJECT (mainwin, image304, "image304"); GLADE_HOOKUP_OBJECT (mainwin, hbox2, "hbox2"); GLADE_HOOKUP_OBJECT (mainwin, hbox3, "hbox3"); GLADE_HOOKUP_OBJECT (mainwin, stopbtn, "stopbtn"); |