[Xfce4-commits] <parole:0.2.2> Minor fine tuning.

[Ali Abdallah]

Updating branch refs/heads/0.2.2
         to 0553de6283f1dd9fc0fefff528a7818f55ccc542 (commit)
       from ab4c6e7d099cb6d256b7ec879695f0b96bcc8c89 (commit)

commit 0553de6283f1dd9fc0fefff528a7818f55ccc542
Author: Ali Abdallah <aliov at xfce.org>
Date:   Sun Jan 10 17:50:44 2010 +0100

    Minor fine tuning.

 gst/parole-gst.c         |    2 +-
 src/parole-conf-dialog.c |   32 +++++++++++++++++++++++++++++++-
 src/parole-conf.c        |    9 +++++++++
 src/parole-medialist.c   |   10 +++-------
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index 6fbe2d0..d5e1c5a 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -952,7 +952,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
 	    g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0, 
 			   gst->priv->stream, PAROLE_MEDIA_STATE_STOPPED);
 
-	    if ( gst->priv->target == GST_STATE_PLAYING && pending != GST_STATE_PLAYING)
+	    if ( gst->priv->target == GST_STATE_PLAYING && pending < GST_STATE_PAUSED)
 	    {
 		parole_gst_play_file_internal (gst);
 	    }
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index d7558c7..c2374f7 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -84,6 +84,10 @@ void		remove_duplicated_toggled_cb			(GtkToggleButton *widget,
 
 void		start_playing_opened_toggled_cb			(GtkToggleButton *widget,
 								 ParoleConfDialog *self);
+								 
+void		multimedia_keys_toggled_cb			(GtkToggleButton *widget,
+								 ParoleConfDialog *self);
+								
 /*
  * End of GtkBuilder callbacks
  */
@@ -138,13 +142,19 @@ void start_playing_opened_toggled_cb (GtkToggleButton *widget, ParoleConfDialog
 		  NULL);
 }
 
+void multimedia_keys_toggled_cb (GtkToggleButton *widget, ParoleConfDialog *self)
+{
+    g_object_set (G_OBJECT (self->priv->conf),
+		  "multimedia-keys", gtk_toggle_button_get_active (widget),
+		  NULL);
+}
+
 void reset_color_clicked_cb (GtkButton *button, ParoleConfDialog *self)
 {
     gtk_range_set_value (GTK_RANGE (self->priv->brightness), 0);
     gtk_range_set_value (GTK_RANGE (self->priv->contrast), 0);
     gtk_range_set_value (GTK_RANGE (self->priv->hue), 0);
     gtk_range_set_value (GTK_RANGE (self->priv->saturation), 0);
-    
 }
 
 void parole_conf_dialog_response_cb (GtkDialog *dialog, gint response_id, ParoleConfDialog *self)
@@ -372,6 +382,25 @@ parole_conf_dialog_set_defaults_playlist (ParoleConfDialog  *self, GtkBuilder *b
 }
 
 static void
+parole_conf_dialog_set_defaults_general (ParoleConfDialog *self, GtkBuilder *builder)
+{
+    GtkWidget *widget;
+    gboolean option;
+    
+     /**
+     * Replace playlist with opened files.
+     **/
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "multimedia-keys"));
+    
+    g_object_get (G_OBJECT (self->priv->conf),
+		  "multimedia-keys", &option,
+		  NULL);
+		  
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), option);
+    
+}
+
+static void
 parole_conf_dialog_set_defaults (ParoleConfDialog *self)
 {
     GtkTreeModel *model;
@@ -442,6 +471,7 @@ void parole_conf_dialog_open (ParoleConfDialog *self, GtkWidget *parent)
     self->priv->vis_combox = combox;
 
     parole_conf_dialog_set_defaults (self);
+    parole_conf_dialog_set_defaults_general (self, builder);
     parole_conf_dialog_set_defaults_playlist (self, builder);
     
     g_object_get (G_OBJECT (self->priv->conf),
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 3c19f48..1141c85 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -65,6 +65,7 @@ enum
     PROP_ASPECT_RATIO,
     PROP_WINDOW_WIDTH,
     PROP_WINDOW_HEIGHT,
+    PROP_MULTIMEDIA_KEYS,
     /*Playlist*/
     PROP_REPLACE_PLAYLIST,
     PROP_SCAN_FOLDER_RECURSIVELY,
@@ -327,6 +328,14 @@ parole_conf_class_init (ParoleConfClass *klass)
 						       G_MAXINT16,
 						       480,
                                                        G_PARAM_READWRITE));
+    
+    g_object_class_install_property (object_class,
+                                     PROP_MULTIMEDIA_KEYS,
+                                     g_param_spec_boolean ("multimedia-key",
+                                                           NULL, NULL,
+                                                           TRUE,
+                                                           G_PARAM_READWRITE));
+							   
     /**
      *Playlist options
      **/
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 9bd9431..3704d31 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -962,7 +962,7 @@ parole_media_list_show_menu (ParoleMediaList *list, guint button, guint activate
 		  "replace-playlist", &val,
 		  NULL);
 
-    mi = gtk_check_menu_item_new_with_label (_("Replace playlist with opened files"));
+    mi = gtk_check_menu_item_new_with_label (_("Replace playlist when opening files"));
     gtk_widget_set_sensitive (mi, TRUE);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), val);
     g_signal_connect (mi, "activate",
@@ -1442,11 +1442,7 @@ gboolean parole_media_list_add_files (ParoleMediaList *list, gchar **filenames)
 {
     guint i;
     guint added = 0;
-    gboolean play;
     
-    g_object_get (G_OBJECT (list->priv->conf),
-		  "play-opened-files", &play,
-		  NULL);
     for ( i = 0; filenames && filenames[i] != NULL; i++)
     {
 	/*
@@ -1454,14 +1450,14 @@ gboolean parole_media_list_add_files (ParoleMediaList *list, gchar **filenames)
 	 */
 	if ( g_file_test (filenames[i], G_FILE_TEST_EXISTS ) )
 	{
-	    added += parole_media_list_add_by_path (list, filenames[i], i == 0 ? play : FALSE);
+	    added += parole_media_list_add_by_path (list, filenames[i], i == 0 ? TRUE : FALSE);
 	}
 	else
 	{
 	    ParoleFile *file;
 	    TRACE ("File=%s", filenames[i]);
 	    file = parole_file_new (filenames[i]);
-	    parole_media_list_add (list, file, i == 0 ? TRUE : FALSE, i == 0 ? play : FALSE);
+	    parole_media_list_add (list, file, i == 0 ? TRUE : FALSE, i == 0 ? TRUE : FALSE);
 	    added++;
 	}
     }