diff options
author | waker <wakeroid@gmail.com> | 2009-08-21 18:53:18 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2009-08-21 18:53:18 +0200 |
commit | 460a139cf18d74567e910258c57001be12b9ec92 (patch) | |
tree | 57d34b3c8f01970f02d3eb126fbb436d4a020620 /interface.c | |
parent | 42600a39a625293a21656e05fdd6471fc5bf8802 (diff) |
restored shuffle option in gui
Diffstat (limited to 'interface.c')
-rw-r--r-- | interface.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/interface.c b/interface.c index 265cb976..e14b4328 100644 --- a/interface.c +++ b/interface.c @@ -30,7 +30,6 @@ GtkWidget* create_mainwin (void) { GtkWidget *mainwin; - GdkPixbuf *mainwin_icon_pixbuf; GtkWidget *vbox1; GtkWidget *menubar1; GtkWidget *menuitem1; @@ -58,6 +57,7 @@ create_mainwin (void) GtkWidget *order1_menu; GSList *order_linear_group = NULL; GtkWidget *order_linear; + GtkWidget *order_shuffle; GtkWidget *order_random; GtkWidget *looping1; GtkWidget *looping1_menu; @@ -98,12 +98,6 @@ create_mainwin (void) gtk_widget_set_events (mainwin, GDK_KEY_PRESS_MASK); gtk_window_set_title (GTK_WINDOW (mainwin), "DeaDBeeF"); gtk_window_set_default_size (GTK_WINDOW (mainwin), 500, 300); - mainwin_icon_pixbuf = create_pixbuf ("play_24.png"); - if (mainwin_icon_pixbuf) - { - gtk_window_set_icon (GTK_WINDOW (mainwin), mainwin_icon_pixbuf); - gdk_pixbuf_unref (mainwin_icon_pixbuf); - } vbox1 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox1); @@ -208,6 +202,11 @@ create_mainwin (void) gtk_container_add (GTK_CONTAINER (order1_menu), order_linear); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_linear), TRUE); + order_shuffle = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, "Shuffle"); + order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_shuffle)); + gtk_widget_show (order_shuffle); + gtk_container_add (GTK_CONTAINER (order1_menu), order_shuffle); + order_random = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, "Random"); order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_random)); gtk_widget_show (order_random); @@ -397,6 +396,9 @@ create_mainwin (void) g_signal_connect ((gpointer) order_linear, "activate", G_CALLBACK (on_order_linear_activate), NULL); + g_signal_connect ((gpointer) order_shuffle, "activate", + G_CALLBACK (on_order_shuffle_activate), + NULL); g_signal_connect ((gpointer) order_random, "activate", G_CALLBACK (on_order_random_activate), NULL); @@ -561,6 +563,7 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, order1, "order1"); GLADE_HOOKUP_OBJECT (mainwin, order1_menu, "order1_menu"); GLADE_HOOKUP_OBJECT (mainwin, order_linear, "order_linear"); + GLADE_HOOKUP_OBJECT (mainwin, order_shuffle, "order_shuffle"); GLADE_HOOKUP_OBJECT (mainwin, order_random, "order_random"); GLADE_HOOKUP_OBJECT (mainwin, looping1, "looping1"); GLADE_HOOKUP_OBJECT (mainwin, looping1_menu, "looping1_menu"); |