restored shuffle option in gui

4 files changed, 27 insertions, 8 deletions

diff --git a/callbacks.c b/callbacks.c
index 62efd595..2aa28890 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -1128,3 +1128,4 @@ on_volumebar_scroll_event              (GtkWidget       *widget,
     return FALSE;
 }
 
+
diff --git a/callbacks.h b/callbacks.h
index 9fb48534..640cb10b 100644
--- a/callbacks.h
+++ b/callbacks.h
@@ -482,3 +482,8 @@ gboolean
 on_volumebar_scroll_event              (GtkWidget       *widget,
                                         GdkEventScroll        *event,
                                         gpointer         user_data);
+
+
+void
+on_order_shuffle_activate              (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
diff --git a/deadbeef.glade b/deadbeef.glade
index c81cad8a..a4e18d11 100644
--- a/deadbeef.glade
+++ b/deadbeef.glade
@@ -14,7 +14,6 @@
   <property name="default_height">300</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">play_24.png</property>
   <property name="icon_name"></property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
@@ -217,6 +216,17 @@
 			  </child>
 
 			  <child>
+			    <widget class="GtkRadioMenuItem" id="order_shuffle">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Shuffle</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">False</property>
+			      <property name="group">order_linear</property>
+			      <signal name="activate" handler="on_order_shuffle_activate" last_modification_time="Fri, 21 Aug 2009 16:46:02 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
 			    <widget class="GtkRadioMenuItem" id="order_random">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">Random</property>
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");