Mercurial > audlegacy

changeset 816:8073d8300502 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] display audacious version and revision in the prefs window
author giacomo
date Sat, 11 Mar 2006 16:56:50 -0800
parents c2ddf4dda767
children 7483ff99b335
files audacious/glade/prefswin.glade audacious/prefswin.c
diffstat 2 files changed, 57 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/audacious/glade/prefswin.glade	Sat Mar 11 14:20:40 2006 -0800
+++ b/audacious/glade/prefswin.glade	Sat Mar 11 16:56:50 2006 -0800
@@ -2998,22 +2998,60 @@
       </child>
 
       <child>
-	<widget class="GtkHButtonBox" id="prefswin_button_box">
+	<widget class="GtkHBox" id="hbox4">
 	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+	  <property name="homogeneous">False</property>
 	  <property name="spacing">0</property>
 
 	  <child>
-	    <widget class="GtkButton" id="close">
+	    <widget class="GtkLabel" id="audversionlabel">
 	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="gtk_widget_hide" object="prefswin" last_modification_time="Sat, 03 Jul 2004 04:24:48 GMT"/>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkHButtonBox" id="prefswin_button_box">
+	      <property name="visible">True</property>
+	      <property name="layout_style">GTK_BUTTONBOX_END</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkButton" id="close">
+		  <property name="visible">True</property>
+		  <property name="can_default">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-close</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <signal name="clicked" handler="gtk_widget_hide" object="prefswin" last_modification_time="Sat, 03 Jul 2004 04:24:48 GMT"/>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
 	  </child>
 	</widget>
 	<packing>
--- a/audacious/prefswin.c	Sat Mar 11 14:20:40 2006 -0800
+++ b/audacious/prefswin.c	Sat Mar 11 16:56:50 2006 -0800
@@ -47,6 +47,7 @@
 #include "ui_playlist.h"
 #include "skinwin.h"
 #include "playlist_list.h"
+#include "build_stamp.h"
 
 
 enum CategoryViewCols {
@@ -1643,6 +1644,7 @@
 
     GladeXML *xml;
     GtkWidget *widget, *widget2;
+    GString *aud_version_string;
 
     GtkWidget *titlestring_tag_menu, *menu_item;
     guint i;
@@ -1830,6 +1832,13 @@
     g_signal_connect(widget, "clicked",
                      G_CALLBACK(on_titlestring_help_button_clicked),
                      titlestring_tag_menu);
+
+   /* audacious version label */
+   widget = glade_xml_get_widget(xml, "audversionlabel");
+   aud_version_string = g_string_new( "" );
+   g_string_printf( aud_version_string , "%s (r%s)" , "Audacious " PACKAGE_VERSION , svn_stamp );
+   gtk_label_set_text( GTK_LABEL(widget) , aud_version_string->str );
+   g_string_free( aud_version_string , TRUE );
 }
 
 void