[Goodies-commits] r6995 - in xfmpc/trunk: . src

Mike Massonnet mmassonnet at xfce.org
Wed Mar 25 15:11:20 CET 2009


Author: mmassonnet
Date: 2009-03-25 14:11:20 +0000 (Wed, 25 Mar 2009)
New Revision: 6995

Modified:
   xfmpc/trunk/ChangeLog
   xfmpc/trunk/autogen.sh
   xfmpc/trunk/configure.in.in
   xfmpc/trunk/src/main-window.c
   xfmpc/trunk/src/song-dialog.c
Log:
Polish the application name and the song info

Modified: xfmpc/trunk/ChangeLog
===================================================================
--- xfmpc/trunk/ChangeLog	2009-03-25 12:03:07 UTC (rev 6994)
+++ xfmpc/trunk/ChangeLog	2009-03-25 14:11:20 UTC (rev 6995)
@@ -1,5 +1,18 @@
-2009-03-21	Mike Massonnet <mmassonnet at xfce.org>
+2009-03-25	Mike Massonnet <mmassonnet at xfce.org>
 
+Polish the application name and the song info
+	* configure.in.in:
+	  - Capitalize package name
+	* src/main-window.c(xfmpc_main_window_init):
+	  - Replace the title "Xfmpc" against PACKAGE_NAME
+	* src/song-dialog.c:
+	  - Automatically hide empty values
+	  - Label informations are selectable
+	* autogen.sh:
+	  - Enable debug to full by default
+
+2009-03-25	Mike Massonnet <mmassonnet at xfce.org>
+
 Include GLib in XfmpcMpdclient for Vala GObject Introspection
 	* src/mpdclient.h:
 	  - vala-gen-introspect failed because of the missing include

Modified: xfmpc/trunk/autogen.sh
===================================================================
--- xfmpc/trunk/autogen.sh	2009-03-25 12:03:07 UTC (rev 6994)
+++ xfmpc/trunk/autogen.sh	2009-03-25 14:11:20 UTC (rev 6995)
@@ -41,6 +41,6 @@
     -e "s/@REVISION@/${revision}/g" \
     < "configure.in.in" > "configure.in"
 
-exec xdt-autogen --enable-debug $@
+exec xdt-autogen --enable-debug=full $@
 rm "configure.in"
 

Modified: xfmpc/trunk/configure.in.in
===================================================================
--- xfmpc/trunk/configure.in.in	2009-03-25 12:03:07 UTC (rev 6994)
+++ xfmpc/trunk/configure.in.in	2009-03-25 14:11:20 UTC (rev 6995)
@@ -19,7 +19,7 @@
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2008
         The Xfce development team. All rights reserved.])
-AC_INIT([xfmpc], [xfmpc_version], [http://bugzilla.xfce.org/], [xfmpc])
+AC_INIT([Xfmpc], [xfmpc_version], [http://bugzilla.xfce.org/], [xfmpc])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
 AC_REVISION([$Id$])

Modified: xfmpc/trunk/src/main-window.c
===================================================================
--- xfmpc/trunk/src/main-window.c	2009-03-25 12:03:07 UTC (rev 6994)
+++ xfmpc/trunk/src/main-window.c	2009-03-25 14:11:20 UTC (rev 6995)
@@ -182,7 +182,7 @@
   /* Window */
   gtk_window_set_default_icon_name ("xfmpc");
   gtk_window_set_icon_name (GTK_WINDOW (window), "stock_volume");
-  gtk_window_set_title (GTK_WINDOW (window), "Xfmpc");
+  gtk_window_set_title (GTK_WINDOW (window), PACKAGE_NAME);
   gtk_window_set_default_size (GTK_WINDOW (window), 330, 330);
   g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (cb_window_closed), NULL);
   g_signal_connect (G_OBJECT (window), "window-state-event", G_CALLBACK (cb_window_state_event), NULL);

Modified: xfmpc/trunk/src/song-dialog.c
===================================================================
--- xfmpc/trunk/src/song-dialog.c	2009-03-25 12:03:07 UTC (rev 6994)
+++ xfmpc/trunk/src/song-dialog.c	2009-03-25 14:11:20 UTC (rev 6995)
@@ -63,9 +63,16 @@
   GtkWidget                     *label_artist;
   GtkWidget                     *label_title;
   GtkWidget                     *label_album;
-  GtkWidget                     *label_year;
+  GtkWidget                     *label_date;
   GtkWidget                     *label_track;
   GtkWidget                     *label_genre;
+
+  GtkWidget                     *hbox_artist;
+  GtkWidget                     *hbox_title;
+  GtkWidget                     *hbox_album;
+  GtkWidget                     *hbox_date;
+  GtkWidget                     *hbox_track;
+  GtkWidget                     *hbox_genre;
 };
 
 
@@ -130,7 +137,7 @@
   gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE);
   gtk_window_set_icon_name (GTK_WINDOW (dialog), "stock_volume");
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-  gtk_window_set_title (GTK_WINDOW (dialog), _("Xfmpc"));
+  gtk_window_set_title (GTK_WINDOW (dialog), PACKAGE_NAME);
 
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
@@ -150,62 +157,75 @@
 
   /* File */
   GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
   GtkWidget *label = gtk_label_new (_("File"));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
-  priv->label_file = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), priv->label_file, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
+  label = priv->label_file = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
 
   /* Artist */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = priv->hbox_artist = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
   label = gtk_label_new (_("Artist"));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
-  priv->label_artist = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), priv->label_artist, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
+  label = priv->label_artist = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
 
   /* Title */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = priv->hbox_title = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
   label = gtk_label_new (_("Title"));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
-  priv->label_title = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), priv->label_title, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
+  label = priv->label_title = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
 
   /* Album */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = priv->hbox_album = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
   label = gtk_label_new (_("Album"));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
-  priv->label_album = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), priv->label_album, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
+  label = priv->label_album = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
 
-  /* Year and Track */
+  /* Date */
   hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
+  priv->hbox_date = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), priv->hbox_date, FALSE, FALSE, 0);
   label = gtk_label_new (_("Date"));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
-  priv->label_year = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), priv->label_year, FALSE, FALSE, 5);
+  gtk_box_pack_start (GTK_BOX (priv->hbox_date), label, FALSE, FALSE, 5);
+  label = priv->label_date = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (priv->hbox_date), label, FALSE, FALSE, 5);
+
+  /* Track */
+  priv->hbox_track = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), priv->hbox_track, FALSE, FALSE, 15);
   label = gtk_label_new (_("Track"));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 15);
-  priv->label_track = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), priv->label_track, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
+  gtk_box_pack_start (GTK_BOX (priv->hbox_track), label, FALSE, FALSE, 5);
+  label = priv->label_track = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (priv->hbox_track), label, FALSE, FALSE, 5);
 
   /* Genre */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = priv->hbox_genre = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
   label = gtk_label_new (_("Genre"));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
-  priv->label_genre = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), priv->label_genre, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 6);
+  label = priv->label_genre = gtk_label_new (NULL);
+  gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5);
 
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
@@ -251,10 +271,40 @@
   gtk_label_set_text (GTK_LABEL (priv->label_artist), song_info->artist);
   gtk_label_set_text (GTK_LABEL (priv->label_album), song_info->album);
   gtk_label_set_text (GTK_LABEL (priv->label_title), song_info->title);
-  gtk_label_set_text (GTK_LABEL (priv->label_year), song_info->date);
+  gtk_label_set_text (GTK_LABEL (priv->label_date), song_info->date);
   gtk_label_set_text (GTK_LABEL (priv->label_track), song_info->track);
   gtk_label_set_text (GTK_LABEL (priv->label_genre), song_info->genre);
 
+  if (song_info->artist == NULL)
+    gtk_widget_hide (priv->hbox_artist);
+  else
+    gtk_widget_show (priv->hbox_artist);
+
+  if (song_info->album == NULL)
+    gtk_widget_hide (priv->hbox_album);
+  else
+    gtk_widget_show (priv->hbox_album);
+
+  if (song_info->title == NULL)
+    gtk_widget_hide (priv->hbox_title);
+  else
+    gtk_widget_show (priv->hbox_title);
+
+  if (song_info->date == NULL)
+    gtk_widget_hide (priv->hbox_date);
+  else
+    gtk_widget_show (priv->hbox_date);
+
+  if (song_info->track == NULL)
+    gtk_widget_hide (priv->hbox_track);
+  else
+    gtk_widget_show (priv->hbox_track);
+
+  if (song_info->genre == NULL)
+    gtk_widget_hide (priv->hbox_genre);
+  else
+    gtk_widget_show (priv->hbox_genre);
+
   gtk_window_set_title (GTK_WINDOW (dialog), song_info->title);
 }
 




More information about the Goodies-commits mailing list