diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2009-12-24 17:06:48 +0100 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2009-12-24 17:06:48 +0100 |
commit | 13554d86f74879c5218ac6c58b6ffe31c685612a (patch) | |
tree | 4a9f7c261224f7c4243e8a11fa1f7bd5c16c4984 /plugins/gtkui/interface.c | |
parent | dd3857e6e91453582c063c015752c808938b1d9c (diff) |
changed main menu slightly
Diffstat (limited to 'plugins/gtkui/interface.c')
-rw-r--r-- | plugins/gtkui/interface.c | 167 |
1 files changed, 87 insertions, 80 deletions
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index d93c556a..017b87b6 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -35,27 +35,31 @@ create_mainwin (void) GtkWidget *menuitem1; GtkWidget *menuitem1_menu; GtkWidget *open; - GtkWidget *image255; + GtkWidget *image269; GtkWidget *separator2; GtkWidget *add_files; - GtkWidget *image256; + GtkWidget *image270; GtkWidget *add_folders; - GtkWidget *image257; + GtkWidget *image271; GtkWidget *add_audio_cd; - GtkWidget *image258; + GtkWidget *image272; GtkWidget *add_location1; GtkWidget *separatormenuitem1; + GtkWidget *playlist_load; + GtkWidget *playlist_save; + GtkWidget *playlist_save_as; + GtkWidget *separator8; GtkWidget *quit; - GtkWidget *image259; + GtkWidget *image273; GtkWidget *edit1; GtkWidget *edit1_menu; GtkWidget *clear1; - GtkWidget *image260; + GtkWidget *image274; GtkWidget *select_all1; GtkWidget *selection1; GtkWidget *selection1_menu; GtkWidget *remove1; - GtkWidget *image261; + GtkWidget *image275; GtkWidget *crop1; GtkWidget *find1; GtkWidget *separator5; @@ -64,11 +68,8 @@ create_mainwin (void) GtkWidget *view1_menu; GtkWidget *view_status_bar; GtkWidget *view_headers; - GtkWidget *playlist1; - GtkWidget *playlist1_menu; - GtkWidget *playlist_load; - GtkWidget *playlist_save; - GtkWidget *playlist_save_as; + GtkWidget *playback1; + GtkWidget *playback1_menu; GtkWidget *order1; GtkWidget *order1_menu; GSList *order_linear_group = NULL; @@ -87,7 +88,7 @@ create_mainwin (void) GtkWidget *menuitem4_menu; GtkWidget *about1; GtkWidget *help1; - GtkWidget *image262; + GtkWidget *image276; GtkWidget *hbox2; GtkWidget *hbox3; GtkWidget *stopbtn; @@ -142,9 +143,9 @@ create_mainwin (void) GDK_O, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image255 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image255); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image255); + image269 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image269); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image269); separator2 = gtk_separator_menu_item_new (); gtk_widget_show (separator2); @@ -155,25 +156,25 @@ create_mainwin (void) gtk_widget_show (add_files); gtk_container_add (GTK_CONTAINER (menuitem1_menu), add_files); - image256 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image256); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image256); + image270 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image270); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image270); 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); - image257 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image257); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image257); + image271 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image271); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image271); 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); - image258 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image258); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_audio_cd), image258); + image272 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image272); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_audio_cd), image272); add_location1 = gtk_menu_item_new_with_mnemonic ("Add location"); gtk_widget_show (add_location1); @@ -184,6 +185,23 @@ create_mainwin (void) gtk_container_add (GTK_CONTAINER (menuitem1_menu), separatormenuitem1); gtk_widget_set_sensitive (separatormenuitem1, FALSE); + playlist_load = gtk_menu_item_new_with_mnemonic ("Load playlist"); + gtk_widget_show (playlist_load); + gtk_container_add (GTK_CONTAINER (menuitem1_menu), playlist_load); + + playlist_save = gtk_menu_item_new_with_mnemonic ("Save playlist"); + gtk_widget_show (playlist_save); + gtk_container_add (GTK_CONTAINER (menuitem1_menu), playlist_save); + + playlist_save_as = gtk_menu_item_new_with_mnemonic ("Save playlist as"); + gtk_widget_show (playlist_save_as); + gtk_container_add (GTK_CONTAINER (menuitem1_menu), playlist_save_as); + + separator8 = gtk_separator_menu_item_new (); + gtk_widget_show (separator8); + gtk_container_add (GTK_CONTAINER (menuitem1_menu), separator8); + gtk_widget_set_sensitive (separator8, FALSE); + quit = gtk_image_menu_item_new_with_mnemonic ("_Quit"); gtk_widget_show (quit); gtk_container_add (GTK_CONTAINER (menuitem1_menu), quit); @@ -191,9 +209,9 @@ create_mainwin (void) GDK_Q, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image259 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); - gtk_widget_show (image259); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image259); + image273 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); + gtk_widget_show (image273); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image273); edit1 = gtk_menu_item_new_with_mnemonic ("_Edit"); gtk_widget_show (edit1); @@ -206,9 +224,9 @@ create_mainwin (void) gtk_widget_show (clear1); gtk_container_add (GTK_CONTAINER (edit1_menu), clear1); - image260 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); - gtk_widget_show (image260); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image260); + image274 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); + gtk_widget_show (image274); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image274); select_all1 = gtk_menu_item_new_with_mnemonic ("Select all"); gtk_widget_show (select_all1); @@ -231,9 +249,9 @@ create_mainwin (void) GDK_Delete, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image261 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); - gtk_widget_show (image261); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image261); + image275 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); + gtk_widget_show (image275); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image275); crop1 = gtk_menu_item_new_with_mnemonic ("Crop"); gtk_widget_show (crop1); @@ -270,28 +288,16 @@ create_mainwin (void) gtk_widget_show (view_headers); gtk_container_add (GTK_CONTAINER (view1_menu), view_headers); - playlist1 = gtk_menu_item_new_with_mnemonic ("_Playlist"); - gtk_widget_show (playlist1); - gtk_container_add (GTK_CONTAINER (menubar1), playlist1); - - playlist1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (playlist1), playlist1_menu); + playback1 = gtk_menu_item_new_with_mnemonic ("_Playback"); + gtk_widget_show (playback1); + gtk_container_add (GTK_CONTAINER (menubar1), playback1); - playlist_load = gtk_menu_item_new_with_mnemonic ("Load"); - gtk_widget_show (playlist_load); - gtk_container_add (GTK_CONTAINER (playlist1_menu), playlist_load); - - playlist_save = gtk_menu_item_new_with_mnemonic ("Save"); - gtk_widget_show (playlist_save); - gtk_container_add (GTK_CONTAINER (playlist1_menu), playlist_save); - - playlist_save_as = gtk_menu_item_new_with_mnemonic ("Save As"); - gtk_widget_show (playlist_save_as); - gtk_container_add (GTK_CONTAINER (playlist1_menu), playlist_save_as); + playback1_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (playback1), playback1_menu); order1 = gtk_menu_item_new_with_mnemonic ("Order"); gtk_widget_show (order1); - gtk_container_add (GTK_CONTAINER (playlist1_menu), order1); + gtk_container_add (GTK_CONTAINER (playback1_menu), order1); order1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (order1), order1_menu); @@ -316,7 +322,7 @@ create_mainwin (void) looping1 = gtk_menu_item_new_with_mnemonic ("Looping"); gtk_widget_show (looping1); - gtk_container_add (GTK_CONTAINER (playlist1_menu), looping1); + gtk_container_add (GTK_CONTAINER (playback1_menu), looping1); looping1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (looping1), looping1_menu); @@ -341,12 +347,12 @@ create_mainwin (void) scroll_follows_playback = gtk_check_menu_item_new_with_mnemonic ("Scroll follows playback"); gtk_widget_show (scroll_follows_playback); - gtk_container_add (GTK_CONTAINER (playlist1_menu), scroll_follows_playback); + gtk_container_add (GTK_CONTAINER (playback1_menu), scroll_follows_playback); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (scroll_follows_playback), TRUE); stop_after_current = gtk_check_menu_item_new_with_mnemonic ("Stop after current"); gtk_widget_show (stop_after_current); - gtk_container_add (GTK_CONTAINER (playlist1_menu), stop_after_current); + gtk_container_add (GTK_CONTAINER (playback1_menu), stop_after_current); gtk_widget_add_accelerator (stop_after_current, "activate", accel_group, GDK_M, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); @@ -366,9 +372,9 @@ create_mainwin (void) gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menuitem4_menu), help1); - image262 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image262); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image262); + image276 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image276); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image276); hbox2 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox2); @@ -534,6 +540,15 @@ create_mainwin (void) g_signal_connect ((gpointer) add_location1, "activate", G_CALLBACK (on_add_location_activate), NULL); + g_signal_connect ((gpointer) playlist_load, "activate", + G_CALLBACK (on_playlist_load_activate), + NULL); + g_signal_connect ((gpointer) playlist_save, "activate", + G_CALLBACK (on_playlist_save_activate), + NULL); + g_signal_connect ((gpointer) playlist_save_as, "activate", + G_CALLBACK (on_playlist_save_as_activate), + NULL); g_signal_connect ((gpointer) quit, "activate", G_CALLBACK (on_quit_activate), NULL); @@ -561,15 +576,6 @@ create_mainwin (void) g_signal_connect ((gpointer) view_headers, "activate", G_CALLBACK (on_toggle_column_headers_activate), NULL); - g_signal_connect ((gpointer) playlist_load, "activate", - G_CALLBACK (on_playlist_load_activate), - NULL); - g_signal_connect ((gpointer) playlist_save, "activate", - G_CALLBACK (on_playlist_save_activate), - NULL); - g_signal_connect ((gpointer) playlist_save_as, "activate", - G_CALLBACK (on_playlist_save_as_activate), - NULL); g_signal_connect ((gpointer) order_linear, "activate", G_CALLBACK (on_order_linear_activate), NULL); @@ -728,27 +734,31 @@ 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, image255, "image255"); + GLADE_HOOKUP_OBJECT (mainwin, image269, "image269"); GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2"); GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files"); - GLADE_HOOKUP_OBJECT (mainwin, image256, "image256"); + GLADE_HOOKUP_OBJECT (mainwin, image270, "image270"); GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders"); - GLADE_HOOKUP_OBJECT (mainwin, image257, "image257"); + GLADE_HOOKUP_OBJECT (mainwin, image271, "image271"); GLADE_HOOKUP_OBJECT (mainwin, add_audio_cd, "add_audio_cd"); - GLADE_HOOKUP_OBJECT (mainwin, image258, "image258"); + GLADE_HOOKUP_OBJECT (mainwin, image272, "image272"); GLADE_HOOKUP_OBJECT (mainwin, add_location1, "add_location1"); GLADE_HOOKUP_OBJECT (mainwin, separatormenuitem1, "separatormenuitem1"); + GLADE_HOOKUP_OBJECT (mainwin, playlist_load, "playlist_load"); + GLADE_HOOKUP_OBJECT (mainwin, playlist_save, "playlist_save"); + 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, image259, "image259"); + GLADE_HOOKUP_OBJECT (mainwin, image273, "image273"); GLADE_HOOKUP_OBJECT (mainwin, edit1, "edit1"); GLADE_HOOKUP_OBJECT (mainwin, edit1_menu, "edit1_menu"); GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1"); - GLADE_HOOKUP_OBJECT (mainwin, image260, "image260"); + GLADE_HOOKUP_OBJECT (mainwin, image274, "image274"); 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, image261, "image261"); + GLADE_HOOKUP_OBJECT (mainwin, image275, "image275"); GLADE_HOOKUP_OBJECT (mainwin, crop1, "crop1"); GLADE_HOOKUP_OBJECT (mainwin, find1, "find1"); GLADE_HOOKUP_OBJECT (mainwin, separator5, "separator5"); @@ -757,11 +767,8 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, view1_menu, "view1_menu"); GLADE_HOOKUP_OBJECT (mainwin, view_status_bar, "view_status_bar"); GLADE_HOOKUP_OBJECT (mainwin, view_headers, "view_headers"); - GLADE_HOOKUP_OBJECT (mainwin, playlist1, "playlist1"); - GLADE_HOOKUP_OBJECT (mainwin, playlist1_menu, "playlist1_menu"); - GLADE_HOOKUP_OBJECT (mainwin, playlist_load, "playlist_load"); - GLADE_HOOKUP_OBJECT (mainwin, playlist_save, "playlist_save"); - GLADE_HOOKUP_OBJECT (mainwin, playlist_save_as, "playlist_save_as"); + GLADE_HOOKUP_OBJECT (mainwin, playback1, "playback1"); + GLADE_HOOKUP_OBJECT (mainwin, playback1_menu, "playback1_menu"); GLADE_HOOKUP_OBJECT (mainwin, order1, "order1"); GLADE_HOOKUP_OBJECT (mainwin, order1_menu, "order1_menu"); GLADE_HOOKUP_OBJECT (mainwin, order_linear, "order_linear"); @@ -778,7 +785,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, image262, "image262"); + GLADE_HOOKUP_OBJECT (mainwin, image276, "image276"); GLADE_HOOKUP_OBJECT (mainwin, hbox2, "hbox2"); GLADE_HOOKUP_OBJECT (mainwin, hbox3, "hbox3"); GLADE_HOOKUP_OBJECT (mainwin, stopbtn, "stopbtn"); |