[rhythmbox] replace GtkStock items with plain labels and icons
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] replace GtkStock items with plain labels and icons
- Date: Mon, 23 Feb 2015 23:07:05 +0000 (UTC)
commit 62b30b131fbf074112fcc2a5753b7dd2f6dc13a8
Author: Jonathan Matthew <jonathan d14n org>
Date: Mon Feb 23 23:00:25 2015 +1000
replace GtkStock items with plain labels and icons
data/ui/create-playlist.ui | 4 +-
data/ui/library-prefs.ui | 16 +++---
data/ui/media-player-properties.ui | 4 +-
data/ui/playlist-save.ui | 8 ++--
data/ui/song-info.ui | 65 +++++++++++++------------
data/ui/sync-dialog.ui | 3 +-
plugins/daap/daap-prefs.ui | 5 +-
plugins/ipod/ipod-init.ui | 6 +--
plugins/iradio/rb-station-properties-dialog.c | 2 +-
plugins/iradio/station-properties.ui | 17 ++++---
plugins/lyrics/lyrics-prefs.ui | 6 +-
podcast/rb-feed-podcast-properties-dialog.c | 2 +-
podcast/rb-podcast-source.c | 4 +-
shell/rb-application.c | 2 +-
shell/rb-shell-preferences.c | 4 +-
widgets/rb-alert-dialog.c | 41 ++++++----------
widgets/rb-dialog.c | 8 ++--
widgets/rb-query-creator.c | 8 ++--
widgets/rb-uri-dialog.c | 4 +-
19 files changed, 99 insertions(+), 110 deletions(-)
---
diff --git a/data/ui/create-playlist.ui b/data/ui/create-playlist.ui
index 7d16a37..9bca167 100644
--- a/data/ui/create-playlist.ui
+++ b/data/ui/create-playlist.ui
@@ -116,11 +116,11 @@
</child>
<child>
<object class="GtkButton" id="addButton">
- <property name="label">gtk-add</property>
+ <property name="label">_Add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/ui/library-prefs.ui b/data/ui/library-prefs.ui
index 62bac77..2781613 100644
--- a/data/ui/library-prefs.ui
+++ b/data/ui/library-prefs.ui
@@ -19,8 +19,8 @@
<object class="GtkLabel" id="library_location_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Library Location</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -103,7 +103,7 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-directory</property>
+ <property name="icon_name">folder</property>
</object>
<packing>
<property name="expand">False</property>
@@ -190,9 +190,9 @@
<object class="GtkLabel" id="library_structure_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Library Structure</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -229,9 +229,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">F_older hierarchy:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -243,9 +243,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_File name:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -257,9 +257,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Preferred format:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -270,8 +270,8 @@
<object class="GtkLabel" id="layout_example_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Artist/Artist - Album/Artist (Album) - 01 -
Title.ogg</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -320,8 +320,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Format settings:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/data/ui/media-player-properties.ui b/data/ui/media-player-properties.ui
index 09ccc51..4ec98cb 100644
--- a/data/ui/media-player-properties.ui
+++ b/data/ui/media-player-properties.ui
@@ -19,12 +19,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/ui/playlist-save.ui b/data/ui/playlist-save.ui
index 7d9d8e1..fdb8702 100644
--- a/data/ui/playlist-save.ui
+++ b/data/ui/playlist-save.ui
@@ -34,12 +34,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button1">
- <property name="label">gtk-cancel</property>
+ <property name="label">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -49,13 +49,13 @@
</child>
<child>
<object class="GtkButton" id="button2">
- <property name="label">gtk-save</property>
+ <property name="label">_Save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/ui/song-info.ui b/data/ui/song-info.ui
index a951296..b8a7c82 100644
--- a/data/ui/song-info.ui
+++ b/data/ui/song-info.ui
@@ -77,10 +77,10 @@
<object class="GtkLabel" id="album_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Albu_m:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_album</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -93,10 +93,10 @@
<object class="GtkLabel" id="title_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Title:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_title</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -107,10 +107,10 @@
<object class="GtkLabel" id="trackn_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Track _number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_track_cur</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">6</property>
@@ -123,10 +123,10 @@
<object class="GtkLabel" id="genre_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Genre:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_genre</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">5</property>
@@ -179,10 +179,10 @@
<object class="GtkLabel" id="artist_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Artist:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_artist</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -195,10 +195,10 @@
<object class="GtkLabel" id="discn_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Disc number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_disc_cur</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">7</property>
@@ -250,10 +250,10 @@
<object class="GtkLabel" id="year_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Year:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_year</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">8</property>
@@ -284,10 +284,10 @@
<object class="GtkLabel" id="bpm_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_BPM:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_bpm</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">9</property>
@@ -300,10 +300,10 @@
<object class="GtkLabel" id="comment_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Comm_ent:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_comment</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">10</property>
@@ -335,10 +335,10 @@
<object class="GtkLabel" id="album_artist_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Album a_rtist:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_album_artist</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">3</property>
@@ -365,10 +365,10 @@
<object class="GtkLabel" id="composer_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Composer:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_composer</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">4</property>
@@ -466,7 +466,8 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-dialog-error</property>
+ <property name="pixel_size">64</property>
+ <property name="icon_name">dialog-error</property>
<property name="icon_size">6</property>
</object>
<packing>
@@ -555,10 +556,10 @@
<object class="GtkLabel" id="album_sortname_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Albu_m sort order:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_album_sortname</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -571,10 +572,10 @@
<object class="GtkLabel" id="artist_sortname_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Artist sort order:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">song_info_artist_sortname</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -585,9 +586,9 @@
<object class="GtkLabel" id="album_artist_sortname_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Album a_rtist sort order:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -614,9 +615,9 @@
<object class="GtkLabel" id="composer_sortname_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Composer sort order:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">3</property>
@@ -668,9 +669,9 @@
<object class="GtkLabel" id="name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">File name:</property>
<property name="mnemonic_widget">song_info_name</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -681,8 +682,8 @@
<object class="GtkLabel" id="song_info_duration">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
<property name="selectable">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -697,9 +698,9 @@
<object class="GtkLabel" id="bitrate_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Bitrate:</property>
<property name="mnemonic_widget">song_info_bitrate</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -712,8 +713,8 @@
<object class="GtkLabel" id="song_info_bitrate">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
<property name="selectable">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -728,9 +729,9 @@
<object class="GtkLabel" id="location_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Location:</property>
<property name="mnemonic_widget">song_info_location</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">3</property>
@@ -756,9 +757,9 @@
<object class="GtkLabel" id="last_played_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Last played:</property>
<property name="mnemonic_widget">song_info_lastplayed</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">7</property>
@@ -771,8 +772,8 @@
<object class="GtkLabel" id="song_info_lastplayed">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
<property name="selectable">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -787,9 +788,9 @@
<object class="GtkLabel" id="play_count_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Play count:</property>
<property name="mnemonic_widget">song_info_playcount</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">8</property>
@@ -802,8 +803,8 @@
<object class="GtkLabel" id="song_info_playcount">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
<property name="selectable">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -862,10 +863,10 @@
<object class="GtkLabel" id="rating_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes">_Rating:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
</object>
<packing>
<property name="top_attach">10</property>
@@ -910,9 +911,9 @@
<object class="GtkLabel" id="duration_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Duration:</property>
<property name="mnemonic_widget">song_info_duration</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -943,9 +944,9 @@
<object class="GtkLabel" id="filesize_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">File size:</property>
<property name="mnemonic_widget">song_info_filesize</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">4</property>
@@ -958,8 +959,8 @@
<object class="GtkLabel" id="song_info_filesize">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
<property name="selectable">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -974,9 +975,9 @@
<object class="GtkLabel" id="date_added_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Date added:</property>
<property name="mnemonic_widget">song_info_dateadded</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">6</property>
@@ -989,8 +990,8 @@
<object class="GtkLabel" id="song_info_dateadded">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0</property>
<property name="selectable">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/data/ui/sync-dialog.ui b/data/ui/sync-dialog.ui
index 95b776a..6a7e434 100644
--- a/data/ui/sync-dialog.ui
+++ b/data/ui/sync-dialog.ui
@@ -102,7 +102,8 @@
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
- <property name="stock">gtk-dialog-error</property>
+ <property name="pixel_size">64</property>
+ <property name="icon_name">dialog-error</property>
<property name="icon_size">6</property>
</object>
<packing>
diff --git a/plugins/daap/daap-prefs.ui b/plugins/daap/daap-prefs.ui
index bca49c3..f27b541 100644
--- a/plugins/daap/daap-prefs.ui
+++ b/plugins/daap/daap-prefs.ui
@@ -384,12 +384,11 @@
</child>
<child>
<object class="GtkButton" id="close_pairing_button">
- <property name="label">gtk-close</property>
- <property name="use_action_appearance">False</property>
+ <property name="label">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/plugins/ipod/ipod-init.ui b/plugins/ipod/ipod-init.ui
index a6e97eb..71a6129 100644
--- a/plugins/ipod/ipod-init.ui
+++ b/plugins/ipod/ipod-init.ui
@@ -18,14 +18,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
+ <property name="label">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/iradio/rb-station-properties-dialog.c b/plugins/iradio/rb-station-properties-dialog.c
index 151490e..91d1276 100644
--- a/plugins/iradio/rb-station-properties-dialog.c
+++ b/plugins/iradio/rb-station-properties-dialog.c
@@ -183,7 +183,7 @@ rb_station_properties_dialog_constructed (GObject *object)
GTK_WIDGET (gtk_builder_get_object (builder, "stationproperties")));
dialog->priv->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CLOSE,
+ _("_Close"),
GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
diff --git a/plugins/iradio/station-properties.ui b/plugins/iradio/station-properties.ui
index 0e1d8d9..1de3bc2 100644
--- a/plugins/iradio/station-properties.ui
+++ b/plugins/iradio/station-properties.ui
@@ -25,10 +25,10 @@
<object class="GtkLabel" id="titleLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Title:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">titleEntry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -52,10 +52,10 @@
<object class="GtkLabel" id="genreLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Genre:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">genreEntry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -89,7 +89,8 @@
<object class="GtkImage" id="errorImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-dialog-error</property>
+ <property name="pixel_size">64</property>
+ <property name="icon_name">dialog-error</property>
<property name="icon_size">6</property>
</object>
<packing>
@@ -144,10 +145,10 @@
<object class="GtkLabel" id="locationLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">L_ocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">locationEntry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -171,9 +172,9 @@
<object class="GtkLabel" id="bitrateDescLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Bitrate:</property>
<property name="mnemonic_widget">bitrateLabel</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -201,10 +202,10 @@
<object class="GtkLabel" id="lastplayedDescLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Last played:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lastplayedLabel</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -232,9 +233,9 @@
<object class="GtkLabel" id="playcountDescLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Play count:</property>
<property name="mnemonic_widget">playcountLabel</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">3</property>
@@ -262,9 +263,9 @@
<object class="GtkLabel" id="ratingLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Rating:</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">4</property>
diff --git a/plugins/lyrics/lyrics-prefs.ui b/plugins/lyrics/lyrics-prefs.ui
index d1333fd..2b1b77b 100644
--- a/plugins/lyrics/lyrics-prefs.ui
+++ b/plugins/lyrics/lyrics-prefs.ui
@@ -36,8 +36,8 @@
<object class="GtkLabel" id="label58">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Search engines</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -99,7 +99,7 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
+ <property name="icon_name">folder</property>
</object>
<packing>
<property name="expand">False</property>
@@ -139,8 +139,8 @@
<object class="GtkLabel" id="label59">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Lyrics Folder</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/podcast/rb-feed-podcast-properties-dialog.c b/podcast/rb-feed-podcast-properties-dialog.c
index f40dea6..f72e028 100644
--- a/podcast/rb-feed-podcast-properties-dialog.c
+++ b/podcast/rb-feed-podcast-properties-dialog.c
@@ -127,7 +127,7 @@ rb_feed_podcast_properties_dialog_init (RBFeedPodcastPropertiesDialog *dialog)
GTK_WIDGET (gtk_builder_get_object (builder, "podcastproperties")));
dialog->priv->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CLOSE,
+ _("_Close"),
GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_CLOSE);
diff --git a/podcast/rb-podcast-source.c b/podcast/rb-podcast-source.c
index 4bfdd39..84af528 100644
--- a/podcast/rb-podcast-source.c
+++ b/podcast/rb-podcast-source.c
@@ -531,7 +531,7 @@ podcast_feed_delete_action_cb (GSimpleAction *action, GVariant *parameter, gpoin
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Delete _Feed Only"),
GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
NULL);
@@ -1101,7 +1101,7 @@ impl_delete_selected (RBSource *asource)
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
_("Delete _Episode Only"),
GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
NULL);
button = gtk_dialog_add_button (GTK_DIALOG (dialog),
diff --git a/shell/rb-application.c b/shell/rb-application.c
index 68e7a5e..76b0ae9 100644
--- a/shell/rb-application.c
+++ b/shell/rb-application.c
@@ -141,7 +141,7 @@ plugins_action_cb (GSimpleAction *action, GVariant *parameters, gpointer user_da
app->priv->plugins = gtk_dialog_new_with_buttons (_("Configure Plugins"),
window,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE,
+ _("_Close"),
GTK_RESPONSE_CLOSE,
NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (app->priv->plugins));
diff --git a/shell/rb-shell-preferences.c b/shell/rb-shell-preferences.c
index 19fad98..7073bcc 100644
--- a/shell/rb-shell-preferences.c
+++ b/shell/rb-shell-preferences.c
@@ -189,10 +189,10 @@ rb_shell_preferences_init (RBShellPreferences *shell_preferences)
shell_preferences, 0);
gtk_dialog_add_button (GTK_DIALOG (shell_preferences),
- GTK_STOCK_CLOSE,
+ _("_Close"),
GTK_RESPONSE_CLOSE);
tmp = gtk_dialog_add_button (GTK_DIALOG (shell_preferences),
- GTK_STOCK_HELP,
+ _("_Help"),
GTK_RESPONSE_HELP);
g_signal_connect_object (tmp, "clicked",
G_CALLBACK (help_cb), shell_preferences, 0);
diff --git a/widgets/rb-alert-dialog.c b/widgets/rb-alert-dialog.c
index 65c8354..1e9694d 100644
--- a/widgets/rb-alert-dialog.c
+++ b/widgets/rb-alert-dialog.c
@@ -135,7 +135,7 @@ rb_alert_dialog_init (RBAlertDialog *dialog)
dialog->details->primary_label = gtk_label_new (NULL);
dialog->details->secondary_label = gtk_label_new (NULL);
dialog->details->details_label = gtk_label_new (NULL);
- dialog->details->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
+ dialog->details->image = gtk_image_new_from_icon_name ("broken-image", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (dialog->details->image), 0.5, 0.0);
gtk_label_set_line_wrap (GTK_LABEL (dialog->details->primary_label), TRUE);
@@ -188,37 +188,26 @@ static void
setup_type (RBAlertDialog *dialog,
GtkMessageType type)
{
- const gchar *stock_id = NULL;
- GtkStockItem item;
-
+ const char *icon_name = "dialog-information";
switch (type) {
case GTK_MESSAGE_INFO:
- stock_id = GTK_STOCK_DIALOG_INFO;
+ icon_name = "dialog-information";
break;
case GTK_MESSAGE_QUESTION:
- stock_id = GTK_STOCK_DIALOG_QUESTION;
+ icon_name = "dialog-question";
break;
case GTK_MESSAGE_WARNING:
- stock_id = GTK_STOCK_DIALOG_WARNING;
+ icon_name = "dialog-warning";
break;
case GTK_MESSAGE_ERROR:
- stock_id = GTK_STOCK_DIALOG_ERROR;
+ icon_name = "dialog-error";
break;
default:
g_warning ("Unknown GtkMessageType %d", type);
break;
}
- if (stock_id == NULL) {
- stock_id = GTK_STOCK_DIALOG_INFO;
- }
-
- if (gtk_stock_lookup (stock_id, &item)) {
- gtk_image_set_from_stock (GTK_IMAGE (dialog->details->image), stock_id,
- GTK_ICON_SIZE_DIALOG);
- } else {
- g_warning ("Stock dialog ID doesn't exist?");
- }
+ gtk_image_set_from_icon_name (GTK_IMAGE (dialog->details->image), icon_name, GTK_ICON_SIZE_DIALOG);
}
static void
@@ -374,41 +363,41 @@ rb_alert_dialog_add_buttons (RBAlertDialog* alert_dialog,
break;
case GTK_BUTTONS_OK:
gtk_dialog_add_button (dialog,
- GTK_STOCK_OK,
+ _("_OK"),
GTK_RESPONSE_OK);
gtk_dialog_set_default_response (dialog,
GTK_RESPONSE_OK);
break;
case GTK_BUTTONS_CLOSE:
gtk_dialog_add_button (dialog,
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CLOSE);
+ _("_Close"),
+ GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response (dialog,
GTK_RESPONSE_CLOSE);
break;
case GTK_BUTTONS_CANCEL:
gtk_dialog_add_button (dialog,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (dialog,
GTK_RESPONSE_CANCEL);
break;
case GTK_BUTTONS_YES_NO:
gtk_dialog_add_button (dialog,
- GTK_STOCK_NO,
+ _("_No"),
GTK_RESPONSE_NO);
gtk_dialog_add_button (dialog,
- GTK_STOCK_YES,
+ _("_Yes"),
GTK_RESPONSE_YES);
gtk_dialog_set_default_response (dialog,
GTK_RESPONSE_YES);
break;
case GTK_BUTTONS_OK_CANCEL:
gtk_dialog_add_button (dialog,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (dialog,
- GTK_STOCK_OK,
+ _("_OK"),
GTK_RESPONSE_OK);
gtk_dialog_set_default_response (dialog,
GTK_RESPONSE_OK);
diff --git a/widgets/rb-dialog.c b/widgets/rb-dialog.c
index 88c19a2..5cef00d 100644
--- a/widgets/rb-dialog.c
+++ b/widgets/rb-dialog.c
@@ -130,16 +130,16 @@ rb_file_chooser_new (const char *title,
action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) {
dialog = gtk_file_chooser_dialog_new (title, parent,
action,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_ACCEPT);
} else if (action == GTK_FILE_CHOOSER_ACTION_SAVE) {
dialog = gtk_file_chooser_dialog_new (title, parent,
action,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_ACCEPT);
diff --git a/widgets/rb-query-creator.c b/widgets/rb-query-creator.c
index 640d536..c2edf4b 100644
--- a/widgets/rb-query-creator.c
+++ b/widgets/rb-query-creator.c
@@ -188,14 +188,14 @@ rb_query_creator_constructed (GObject *object)
if (priv->creating) {
gtk_dialog_add_button (GTK_DIALOG (creator),
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CLOSE);
gtk_dialog_add_button (GTK_DIALOG (creator),
- GTK_STOCK_NEW,
+ _("_New"),
GTK_RESPONSE_OK);
} else {
gtk_dialog_add_button (GTK_DIALOG (creator),
- GTK_STOCK_CLOSE,
+ _("_Close"),
GTK_RESPONSE_CLOSE);
}
gtk_dialog_set_default_response (GTK_DIALOG (creator),
@@ -799,7 +799,7 @@ append_row (RBQueryCreator *creator)
gtk_size_group_add_widget (priv->entry_size_group, entry);
gtk_box_pack_start (hbox, GTK_WIDGET (entry), TRUE, TRUE, 0);
- remove_button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+ remove_button = gtk_button_new_with_label (_("Remove"));
g_signal_connect_object (G_OBJECT (remove_button), "clicked", G_CALLBACK (remove_button_click_cb),
creator, 0);
gtk_size_group_add_widget (priv->button_size_group, remove_button);
diff --git a/widgets/rb-uri-dialog.c b/widgets/rb-uri-dialog.c
index a0ba9bc..7c7a223 100644
--- a/widgets/rb-uri-dialog.c
+++ b/widgets/rb-uri-dialog.c
@@ -155,10 +155,10 @@ rb_uri_dialog_init (RBURIDialog *dialog)
gtk_box_set_spacing (GTK_BOX (content_area), 2);
dialog->priv->cancelbutton = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL);
dialog->priv->okbutton = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_ADD,
+ _("_Add"),
GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
