Merge branch 'master' into devel

Conflicts:
	plugins/gtkui/callbacks.c
	plugins/gtkui/callbacks.h
	plugins/gtkui/gtkui.h

1 files changed, 18 insertions, 0 deletions

diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index 4ae9d5a7..7ccc50de 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -69,6 +69,7 @@ create_mainwin (void)
   GtkWidget *album1;
   GtkWidget *artist1;
   GtkWidget *date1;
+  GtkWidget *random1;
   GtkWidget *custom2;
   GtkWidget *separator5;
   GtkWidget *preferences;
@@ -310,6 +311,10 @@ create_mainwin (void)
   gtk_widget_show (date1);
   gtk_container_add (GTK_CONTAINER (sort_by1_menu), date1);
 
+  random1 = gtk_menu_item_new_with_mnemonic (_("Random"));
+  gtk_widget_show (random1);
+  gtk_container_add (GTK_CONTAINER (sort_by1_menu), random1);
+
   custom2 = gtk_menu_item_new_with_mnemonic (_("Custom"));
   gtk_widget_show (custom2);
   gtk_container_add (GTK_CONTAINER (sort_by1_menu), custom2);
@@ -682,6 +687,9 @@ create_mainwin (void)
   g_signal_connect ((gpointer) date1, "activate",
                     G_CALLBACK (on_sort_by_date_activate),
                     NULL);
+  g_signal_connect ((gpointer) random1, "activate",
+                    G_CALLBACK (on_sort_by_random_activate),
+                    NULL);
   g_signal_connect ((gpointer) custom2, "activate",
                     G_CALLBACK (on_sort_by_custom_activate),
                     NULL);
@@ -811,6 +819,7 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, album1, "album1");
   GLADE_HOOKUP_OBJECT (mainwin, artist1, "artist1");
   GLADE_HOOKUP_OBJECT (mainwin, date1, "date1");
+  GLADE_HOOKUP_OBJECT (mainwin, random1, "random1");
   GLADE_HOOKUP_OBJECT (mainwin, custom2, "custom2");
   GLADE_HOOKUP_OBJECT (mainwin, separator5, "separator5");
   GLADE_HOOKUP_OBJECT (mainwin, preferences, "preferences");
@@ -1668,6 +1677,7 @@ create_prefwin (void)
   GtkWidget *cli_playlist_name;
   GtkWidget *resume_last_session;
   GtkWidget *ignore_archives;
+  GtkWidget *reset_autostop;
   GtkWidget *label39;
   GtkWidget *vbox29;
   GtkWidget *hbox80;
@@ -1948,6 +1958,10 @@ create_prefwin (void)
   gtk_widget_show (ignore_archives);
   gtk_box_pack_start (GTK_BOX (vbox8), ignore_archives, FALSE, FALSE, 0);
 
+  reset_autostop = gtk_check_button_new_with_mnemonic (_("Auto-reset \"Stop after current\""));
+  gtk_widget_show (reset_autostop);
+  gtk_box_pack_start (GTK_BOX (vbox8), reset_autostop, FALSE, FALSE, 0);
+
   label39 = gtk_label_new (_("Playback"));
   gtk_widget_show (label39);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), label39);
@@ -2582,6 +2596,9 @@ create_prefwin (void)
   g_signal_connect ((gpointer) ignore_archives, "toggled",
                     G_CALLBACK (on_ignore_archives_toggled),
                     NULL);
+  g_signal_connect ((gpointer) reset_autostop, "toggled",
+                    G_CALLBACK (on_reset_autostop_toggled),
+                    NULL);
   g_signal_connect ((gpointer) dsp_add, "clicked",
                     G_CALLBACK (on_dsp_add_clicked),
                     NULL);
@@ -2746,6 +2763,7 @@ create_prefwin (void)
   GLADE_HOOKUP_OBJECT (prefwin, cli_playlist_name, "cli_playlist_name");
   GLADE_HOOKUP_OBJECT (prefwin, resume_last_session, "resume_last_session");
   GLADE_HOOKUP_OBJECT (prefwin, ignore_archives, "ignore_archives");
+  GLADE_HOOKUP_OBJECT (prefwin, reset_autostop, "reset_autostop");
   GLADE_HOOKUP_OBJECT (prefwin, label39, "label39");
   GLADE_HOOKUP_OBJECT (prefwin, vbox29, "vbox29");
   GLADE_HOOKUP_OBJECT (prefwin, hbox80, "hbox80");