Sound Juicer UI changes



Hi,

Attached is a patch that makes some minor changes to the SJ UI
(following a UI review with Calum etc):

* add accelerator labels to main window artist/title/genre fields
* Use a multiply symbols rather than x in status bar
* Add a space before strings destined for status bar for padding
* Add ellipsis to Edit Profiles button
* Align check boxes in Preferences dialog with dropdowns rather than
labels
* Change two "Example Path:" and "/foobar/" labels into a single, small
label.
* Use real data for the sample track

Cheers,
Ross
-- 
Ross Burton                                 mail: ross burtonini com
                                          jabber: ross burtonini com
                                     www: http://www.burtonini.com./
 PGP Fingerprint: 1A21 F5B0 D8D0 CFE3 81D4 E25A 2D09 E447 D0B4 33DF

Index: data/sound-juicer.glade
===================================================================
RCS file: /cvs/gnome/sound-juicer/data/sound-juicer.glade,v
retrieving revision 1.63
diff -u -r1.63 sound-juicer.glade
--- data/sound-juicer.glade	8 Jan 2006 13:51:51 -0000	1.63
+++ data/sound-juicer.glade	13 Feb 2006 20:05:32 -0000
@@ -122,7 +125,7 @@
 		    <widget class="GtkMenuItem" id="submit">
 		      <property name="visible">True</property>
 		      <property name="sensitive">False</property>
-		      <property name="label" translatable="yes">_Submit...</property>
+		      <property name="label" translatable="yes">_Submit Track Names...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_submit_activate" last_modification_time="Wed, 18 Jun 2003 16:06:41 GMT"/>
 		      <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
@@ -147,13 +150,13 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="re-read">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Re-read</property>
+		      <property name="label" translatable="yes">_Re-read Disc</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_reread_activate" last_modification_time="Tue, 25 Mar 2003 07:45:51 GMT"/>
 		      <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image108">
+			<widget class="GtkImage" id="image112">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -303,8 +306,8 @@
 	      <child>
 		<widget class="GtkLabel" id="label1">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Title:&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
+		  <property name="label" translatable="yes">&lt;b&gt;_Title:&lt;/b&gt;</property>
+		  <property name="use_underline">True</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
@@ -313,6 +316,7 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="mnemonic_widget">title_entry</property>
 		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
@@ -331,8 +335,8 @@
 	      <child>
 		<widget class="GtkLabel" id="label2">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Artist:&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
+		  <property name="label" translatable="yes">&lt;b&gt;_Artist:&lt;/b&gt;</property>
+		  <property name="use_underline">True</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
@@ -341,6 +345,7 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="mnemonic_widget">artist_entry</property>
 		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
@@ -403,8 +408,8 @@
 	      <child>
 		<widget class="GtkLabel" id="label31">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Genre:&lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
+		  <property name="label" translatable="yes">&lt;b&gt;_Genre:&lt;/b&gt;</property>
+		  <property name="use_underline">True</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
@@ -413,6 +418,7 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="mnemonic_widget">genre_entry</property>
 		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
@@ -1025,7 +1033,7 @@
 			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">0</property>
+			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
@@ -1127,6 +1135,7 @@
 			  <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
 			  <property name="local_only">False</property>
 			  <property name="show_hidden">False</property>
+			  <property name="do_overwrite_confirmation">False</property>
 			  <property name="width_chars">-1</property>
 			  <signal name="current_folder_changed" handler="prefs_base_folder_changed" last_modification_time="Mon, 07 Feb 2005 17:45:23 GMT"/>
 			</widget>
@@ -1258,59 +1267,41 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="example_label">
+			<widget class="GtkComboBox" id="path_option">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Example Path:</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</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>
+			  <property name="items" translatable="yes"></property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkCheckButton" id="check_strip">
+			<widget class="GtkComboBox" id="file_option">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Strip special characters</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="items" translatable="yes"></property>
+			  <property name="add_tearoffs">False</property>
 			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">0</property>
+			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
+			  <property name="top_attach">1</property>
+			  <property name="bottom_attach">2</property>
+			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
 
 		      <child>
 			<widget class="GtkLabel" id="path_example_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;i&gt;path_example_label&lt;/i&gt;</property>
+			  <property name="label" translatable="yes">path_example_label</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1320,49 +1311,40 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
+			  <property name="single_line_mode">True</property>
 			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkComboBox" id="path_option">
-			  <property name="visible">True</property>
-			  <property name="items" translatable="yes"></property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkComboBox" id="file_option">
+			<widget class="GtkCheckButton" id="check_strip">
 			  <property name="visible">True</property>
-			  <property name="items" translatable="yes"></property>
-			  <property name="add_tearoffs">False</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Strip special characters</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options">fill</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 		    </widget>
@@ -1513,7 +1495,7 @@
 				  <child>
 				    <widget class="GtkLabel" id="label38">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Edit _Profiles</property>
+				      <property name="label" translatable="yes">Edit _Profiles...</property>
 				      <property name="use_underline">True</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
Index: src/sj-extracting.c
===================================================================
RCS file: /cvs/gnome/sound-juicer/src/sj-extracting.c,v
retrieving revision 1.67
diff -u -r1.67 sj-extracting.c
--- src/sj-extracting.c	15 Jan 2006 19:18:31 -0000	1.67
+++ src/sj-extracting.c	13 Feb 2006 20:05:32 -0000
@@ -356,9 +356,11 @@
   char *eta_str;
 
   if (eta >= 0) {
-    eta_str = g_strdup_printf (_("Estimated time left: %d:%02d (at %0.1fx)"), eta / 60, eta % 60, speed);	
+    /* The leading space is intentional for padding */
+    eta_str = g_strdup_printf (_(" Estimated time left: %d:%02d at %0.1fx\303\227"), eta / 60, eta % 60, speed);	
   } else {
-    eta_str = g_strdup (_("Estimated time left: unknown"));  
+    /* The leading space is intentional for padding */
+    eta_str = g_strdup (_(" Estimated time left: unknown"));  
   }
   
   gtk_statusbar_push (GTK_STATUSBAR (status_bar), 0, eta_str);
Index: src/sj-prefs.c
===================================================================
RCS file: /cvs/gnome/sound-juicer/src/sj-prefs.c,v
retrieving revision 1.48
diff -u -r1.48 sj-prefs.c
--- src/sj-prefs.c	30 Jan 2006 18:12:59 -0000	1.48
+++ src/sj-prefs.c	13 Feb 2006 20:05:32 -0000
@@ -199,9 +199,9 @@
   char *file_pattern, *path_pattern;
   char *file_value, *path_value, *example, *format;
   static AlbumDetails sample_album = {
-    N_("Album Title"), /* title */
-    N_("Album Artist"), /* artist */
-    N_("Album Artist's Sortable Name"), /* sortname */
+    N_("Abbey Road"), /* title */
+    N_("The Beatles"), /* artist */
+    N_("Beatles, The"), /* sortname */
     NULL, /* genre */
     0, /* number of tracks*/
     NULL, /* track list */
@@ -211,11 +211,11 @@
   };
   static TrackDetails sample_track = {
     &sample_album,  /*album */
-    9, /* track number */
-    N_("Track Title"), /* title */
-    N_("Track Artist"), /* artist */
-    N_("Track Artist's Sortable Name"), /* sortname */
-    60, /* duration */
+    1, /* track number */
+    N_("Come Together"), /* title */
+    N_("The Beatles"), /* artist */
+    N_("Beatles, The"), /* sortname */
+    260, /* duration */
     NULL, /* track ID */
     NULL, /* artist ID */
     {0,0,0,0}, /* treeview iterator */
@@ -250,7 +250,7 @@
   g_free (path_value);
   g_free (path_pattern);
 
-  format = g_strconcat ("<i><small>", example, "</small></i>", NULL);
+  format = g_strconcat ("<small><i><b>Example Path:</b> ", example, "</i></small>", NULL);
   g_free (example);
   
   gtk_label_set_markup (GTK_LABEL (path_example_label), format);
@@ -323,7 +323,7 @@
   int rc;
 
   if (prefs_dialog == NULL) {
-    const char * labels[] = { "cd_label", "path_label", "folder_label", "file_label", "example_label", "profile_label" };
+    const char * labels[] = { "cd_label", "path_label", "folder_label", "file_label", "profile_label" };
     guint i;
     GtkSizeGroup *group;
     GConfBridge *bridge = gconf_bridge_get ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]