GNOME.org
 

[Rhythmbox-devel] [PATCH] 2 small issues for "Disc number" entry in properties dialogs

#1 Single song properties dialog

        The "_Disc number:" label is connected to wrong GtkEntry
        (song_info_artist, but should be song_info_disc_cur)
        
#2 Multiple songs properties dialog

        The "_Disk Number:" label is using the wrong capitalization[1]
        (should be sentence, not header)
        
Attached a patch to solve both. OK to commit?


PS It seems that a lot of properties was added opening and saving
song-info.glade in glade-2. Are just additional and not relevant
properties for GtkLabel using default values.
        
        
[1]
http://developer.gnome.org/projects/gup/hig/2.0/design-text-labels.html#layout-capitalization

? backends/.deps
? backends/.libs
? backends/librbbackends.la
? backends/rb-encoder.lo
? backends/rb-player.lo
? backends/gstreamer/.deps
? backends/gstreamer/.libs
? backends/gstreamer/librbbackendsgstreamer.la
? backends/gstreamer/rb-encoder-gst.lo
? backends/gstreamer/rb-player-gst.lo
? bindings/python/.deps
? bindings/python/.libs
? bindings/python/rb.la
? bindings/python/rb_la-override_common.lo
? bindings/python/rb_la-rb.lo
? bindings/python/rb_la-rhythmdb.lo
? daapsharing/.deps
? daapsharing/.libs
? daapsharing/libdaapsharing.la
? daapsharing/rb-daap-connection.lo
? daapsharing/rb-daap-dialog.lo
? daapsharing/rb-daap-hash.lo
? daapsharing/rb-daap-mdns-browser-avahi.lo
? daapsharing/rb-daap-mdns-publisher-avahi.lo
? daapsharing/rb-daap-share.lo
? daapsharing/rb-daap-sharing.lo
? daapsharing/rb-daap-src.lo
? daapsharing/rb-daap-structure.lo
? iradio/librbiradio.la
? iradio/rb-new-station-dialog.lo
? iradio/rb-station-properties-dialog.lo
? lib/eel-gconf-extensions.lo
? lib/librb.la
? lib/md5.lo
? lib/rb-cut-and-paste-code.lo
? lib/rb-debug.lo
? lib/rb-file-helpers.lo
? lib/rb-glade-helpers.lo
? lib/rb-marshal.lo
? lib/rb-proxy-config.lo
? lib/rb-stock-icons.lo
? lib/rb-tree-dnd.lo
? lib/rb-util.lo
? metadata/.deps
? metadata/.libs
? metadata/librbmetadata.la
? metadata/librbmetadatasvc.la
? metadata/rb-metadata-common.lo
? metadata/rb-metadata-dbus-client.lo
? metadata/rb-metadata-dbus.lo
? metadata/rb-metadata-gst.lo
? metadata/sj-error.lo
? metadata/sj-metadata-marshal.lo
? metadata/sj-metadata-musicbrainz.lo
? metadata/sj-metadata.lo
? metadata/sj-structures.lo
? plugins/.deps
? plugins/.libs
? plugins/librbplugins.la
? plugins/rb-module.lo
? plugins/rb-plugin-manager.lo
? plugins/rb-plugin.lo
? plugins/rb-plugins-engine.lo
? plugins/rb-python-module.lo
? plugins/rb-python-plugin.lo
? plugins/audiocd/.deps
? plugins/audiocd/.libs
? plugins/audiocd/libaudiocd.la
? plugins/audiocd/rb-audiocd-plugin.lo
? plugins/audiocd/rb-audiocd-source.lo
? plugins/audiocd/sj-error.lo
? plugins/audiocd/sj-metadata-marshal.lo
? plugins/audiocd/sj-metadata-musicbrainz.lo
? plugins/audiocd/sj-metadata.lo
? plugins/audiocd/sj-structures.lo
? plugins/audioscrobbler/.deps
? plugins/audioscrobbler/.libs
? plugins/audioscrobbler/libaudioscrobbler.la
? plugins/audioscrobbler/rb-audioscrobbler-plugin.lo
? plugins/audioscrobbler/rb-audioscrobbler.lo
? plugins/cd-recorder/.deps
? plugins/cd-recorder/.libs
? plugins/cd-recorder/libcd-recorder.la
? plugins/cd-recorder/rb-cd-recorder-plugin.lo
? plugins/cd-recorder/rb-playlist-source-recorder.lo
? plugins/cd-recorder/rb-recorder-gst.lo
? plugins/generic-player/.deps
? plugins/generic-player/.libs
? plugins/generic-player/libgeneric-player.la
? plugins/generic-player/rb-generic-player-plugin.lo
? plugins/generic-player/rb-generic-player-source.lo
? plugins/generic-player/rb-nokia770-source.lo
? plugins/generic-player/rb-psp-source.lo
? plugins/ipod/.deps
? plugins/lirc/.deps
? plugins/sample/.deps
? plugins/sample/.libs
? plugins/sample/libsample.la
? plugins/sample/rb-sample-plugin.lo
? po/.intltool-merge-cache
? podcast/.deps
? podcast/.libs
? podcast/librbpodcast.la
? podcast/rb-feed-podcast-properties-dialog.lo
? podcast/rb-new-podcast-dialog.lo
? podcast/rb-podcast-manager.lo
? podcast/rb-podcast-parse.lo
? podcast/rb-podcast-properties-dialog.lo
? remote/dbus/.deps
? remote/dbus/.libs
? rhythmdb/.deps
? rhythmdb/.libs
? rhythmdb/gsequence.lo
? rhythmdb/librhythmdb.la
? rhythmdb/rb-refstring.lo
? rhythmdb/rhythmdb-monitor.lo
? rhythmdb/rhythmdb-property-model.lo
? rhythmdb/rhythmdb-query-model.lo
? rhythmdb/rhythmdb-query-results.lo
? rhythmdb/rhythmdb-query.lo
? rhythmdb/rhythmdb-tree.lo
? rhythmdb/rhythmdb.lo
? shell/.deps
? shell/.libs
? shell/librbshell.la
? shell/rb-history.lo
? shell/rb-play-order-linear-loop.lo
? shell/rb-play-order-linear.lo
? shell/rb-play-order-queue.lo
? shell/rb-play-order-random-by-age-and-rating.lo
? shell/rb-play-order-random-by-age.lo
? shell/rb-play-order-random-by-rating.lo
? shell/rb-play-order-random-equal-weights.lo
? shell/rb-play-order-random.lo
? shell/rb-play-order-shuffle.lo
? shell/rb-play-order.lo
? shell/rb-playlist-manager.lo
? shell/rb-removable-media-manager.lo
? shell/rb-shell-clipboard.lo
? shell/rb-shell-player.lo
? shell/rb-shell-preferences.lo
? shell/rb-shell.lo
? shell/rb-source-header.lo
? shell/rb-statusbar.lo
? shell/rb-tray-icon.lo
? sources/.deps
? sources/.libs
? sources/libsources.la
? sources/libsourcesimpl.la
? sources/rb-audiocd-source.lo
? sources/rb-auto-playlist-source.lo
? sources/rb-browser-source.lo
? sources/rb-daap-source.lo
? sources/rb-import-errors-source.lo
? sources/rb-iradio-source.lo
? sources/rb-library-source.lo
? sources/rb-missing-files-source.lo
? sources/rb-play-queue-source.lo
? sources/rb-playlist-source.lo
? sources/rb-podcast-source.lo
? sources/rb-removable-media-source.lo
? sources/rb-source.lo
? sources/rb-sourcelist-model.lo
? sources/rb-sourcelist.lo
? sources/rb-static-playlist-source.lo
? tests/.deps
? tests/.libs
? widgets/.deps
? widgets/.libs
? widgets/bacon-volume.lo
? widgets/eggtrayicon.lo
? widgets/librbwidgets.la
? widgets/rb-cell-renderer-pixbuf.lo
? widgets/rb-cell-renderer-rating.lo
? widgets/rb-dialog.lo
? widgets/rb-druid.lo
? widgets/rb-entry-view.lo
? widgets/rb-header.lo
? widgets/rb-library-browser.lo
? widgets/rb-property-view.lo
? widgets/rb-query-creator-properties.lo
? widgets/rb-query-creator.lo
? widgets/rb-rating-helper.lo
? widgets/rb-rating.lo
? widgets/rb-search-entry.lo
? widgets/rb-song-info.lo
? widgets/libsexy/.deps
Index: data/glade/song-info-multiple.glade
===================================================================
RCS file: /cvs/gnome/rhythmbox/data/glade/song-info-multiple.glade,v
retrieving revision 1.7
diff -n -u -r1.7 song-info-multiple.glade
--- data/glade/song-info-multiple.glade	17 May 2006 03:52:55 -0000	1.7
+++ data/glade/song-info-multiple.glade	8 Oct 2006 10:12:52 -0000
@@ -2,7 +2,6 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
 
 <glade-interface>
-<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="song_info">
   <property name="visible">True</property>
@@ -290,7 +289,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="discn_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Disc Number:</property>
+	      <property name="label" translatable="yes">_Disc number:</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
Index: data/glade/song-info.glade
===================================================================
RCS file: /cvs/gnome/rhythmbox/data/glade/song-info.glade,v
retrieving revision 1.36
diff -n -u -r1.36 song-info.glade
--- data/glade/song-info.glade	14 May 2006 14:33:13 -0000	1.36
+++ data/glade/song-info.glade	8 Oct 2006 10:12:53 -0000
@@ -2,7 +2,6 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
 
 <glade-interface>
-<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="window3">
   <property name="visible">True</property>
@@ -17,6 +16,8 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child>
     <widget class="GtkNotebook" id="song_info_vbox">
@@ -54,7 +55,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -75,7 +76,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -96,7 +97,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -122,6 +123,10 @@
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">song_info_album</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="left_attach">0</property>
@@ -147,6 +152,10 @@
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">song_info_title</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="left_attach">0</property>
@@ -172,6 +181,10 @@
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">song_info_track_cur</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="left_attach">0</property>
@@ -197,6 +210,10 @@
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">song_info_genre</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="left_attach">0</property>
@@ -217,7 +234,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		  <property name="width_chars">3</property>
 		</widget>
@@ -239,7 +256,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -265,6 +282,10 @@
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">song_info_artist</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="left_attach">0</property>
@@ -275,7 +296,7 @@
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
-	      
+
 	      <child>
 		<widget class="GtkLabel" id="discn_label">
 		  <property name="visible">True</property>
@@ -289,7 +310,11 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">song_info_artist</property>
+		  <property name="mnemonic_widget">song_info_disc_cur</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="left_attach">0</property>
@@ -310,7 +335,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
@@ -416,6 +441,10 @@
 		  <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>
@@ -450,6 +479,10 @@
 	  <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="type">tab</property>
@@ -479,6 +512,10 @@
 	      <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="left_attach">0</property>
@@ -503,6 +540,10 @@
 	      <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="left_attach">1</property>
@@ -527,6 +568,10 @@
 	      <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="left_attach">0</property>
@@ -552,6 +597,10 @@
 	      <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="left_attach">1</property>
@@ -604,6 +653,10 @@
 	      <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="left_attach">0</property>
@@ -628,6 +681,10 @@
 	      <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="left_attach">0</property>
@@ -653,6 +710,10 @@
 	      <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="left_attach">1</property>
@@ -677,6 +738,10 @@
 	      <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="left_attach">0</property>
@@ -702,6 +767,10 @@
 	      <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="left_attach">1</property>
@@ -726,6 +795,10 @@
 	      <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="left_attach">0</property>
@@ -750,6 +823,10 @@
 	      <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="left_attach">1</property>
@@ -795,6 +872,10 @@
 	      <property name="yalign">0</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="left_attach">0</property>
@@ -978,6 +1059,10 @@
 	  <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="type">tab</property>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]