[rhythmbox] use GtkBox instead of H/VBox in plugin builder files
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] use GtkBox instead of H/VBox in plugin builder files
- Date: Mon, 29 Dec 2014 11:13:24 +0000 (UTC)
commit 0d6cd8279795ca9a4fca96cd37b60b3c94155d63
Author: Jonathan Matthew <jonathan d14n org>
Date: Tue Dec 23 09:44:07 2014 +1000
use GtkBox instead of H/VBox in plugin builder files
also GtkScale in place of HScale while I'm here
plugins/audiocd/album-info.ui | 27 +--
.../audioscrobbler/audioscrobbler-preferences.ui | 42 ++-
plugins/audioscrobbler/audioscrobbler-profile.ui | 111 ++++++---
plugins/daap/daap-prefs.ui | 34 ++--
plugins/iradio/station-properties.ui | 74 ++++--
plugins/lyrics/lyrics-prefs.ui | 14 +-
plugins/magnatune/magnatune-loading.ui | 18 +-
plugins/magnatune/magnatune-prefs.ui | 268 ++++++++++----------
plugins/replaygain/replaygain-prefs.ui | 64 +++--
9 files changed, 370 insertions(+), 282 deletions(-)
---
diff --git a/plugins/audiocd/album-info.ui b/plugins/audiocd/album-info.ui
index 018def8..7fa983e 100644
--- a/plugins/audiocd/album-info.ui
+++ b/plugins/audiocd/album-info.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.6"/>
<object class="GtkGrid" id="album_info">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -19,8 +20,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -35,8 +34,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -51,8 +48,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -67,8 +62,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -77,13 +70,10 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -92,13 +82,10 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -107,17 +94,14 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -128,7 +112,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -162,7 +145,6 @@
<property name="max_length">4</property>
<property name="invisible_char">●</property>
<property name="width_chars">4</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -195,7 +177,6 @@
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_chars">2</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -207,8 +188,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
diff --git a/plugins/audioscrobbler/audioscrobbler-preferences.ui
b/plugins/audioscrobbler/audioscrobbler-preferences.ui
index 0668ed8..c93882c 100644
--- a/plugins/audioscrobbler/audioscrobbler-preferences.ui
+++ b/plugins/audioscrobbler/audioscrobbler-preferences.ui
@@ -1,14 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkVBox" id="config">
+ <requires lib="gtk+" version="3.6"/>
+ <object class="GtkImage" id="lastfm_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">Last.fm-icon.png</property>
+ </object>
+ <object class="GtkImage" id="librefm_image">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">Libre.fm-icon.png</property>
+ </object>
+ <object class="GtkBox" id="config">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Which Audioscrobbler services do you wish to
use?</property>
</object>
@@ -19,21 +31,25 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xpad">8</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="lastfm_enabled_check">
@@ -42,6 +58,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="image">lastfm_image</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -57,6 +74,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="image">librefm_image</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -67,21 +85,17 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
- <object class="GtkImage" id="lastfm_image">
- <property name="visible">True</property>
- <property name="pixbuf">Last.fm-icon.png</property>
- </object>
- <object class="GtkImage" id="librefm_image">
- <property name="visible">True</property>
- <property name="pixbuf">Libre.fm-icon.png</property>
- </object>
</interface>
diff --git a/plugins/audioscrobbler/audioscrobbler-profile.ui
b/plugins/audioscrobbler/audioscrobbler-profile.ui
index 47f68ce..c4f9f96 100644
--- a/plugins/audioscrobbler/audioscrobbler-profile.ui
+++ b/plugins/audioscrobbler/audioscrobbler-profile.ui
@@ -1,28 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.6"/>
<object class="GtkScrolledWindow" id="profile_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkVBox" id="profile_vbox">
+ <object class="GtkBox" id="profile_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
- <object class="GtkHBox" id="user_info_area">
+ <object class="GtkBox" id="user_info_area">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xscale">0</property>
@@ -30,10 +32,12 @@
<child>
<object class="GtkViewport" id="viewport2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<child>
<object class="GtkImage" id="profile_image">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
</object>
@@ -46,20 +50,23 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkBox" id="hbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="username_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.000000"/>
+ <attribute name="scale" value="2"/>
</attributes>
</object>
<packing>
@@ -75,7 +82,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">half</property>
- <signal name="clicked" handler="logout_button_clicked_cb"/>
+ <signal name="clicked" handler="logout_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -94,12 +101,14 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xscale">0</property>
<property name="left_padding">4</property>
<child>
<object class="GtkLabel" id="playcount_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
</object>
@@ -112,6 +121,7 @@
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xscale">0</property>
<child>
@@ -133,6 +143,7 @@
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xscale">0</property>
<property name="left_padding">4</property>
@@ -142,8 +153,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="scrobbling_enabled_check_toggled_cb"/>
+ <signal name="toggled" handler="scrobbling_enabled_check_toggled_cb"
swapped="no"/>
</object>
</child>
</object>
@@ -161,6 +173,7 @@
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
@@ -168,17 +181,19 @@
<child>
<object class="GtkLabel" id="label41">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Status:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label42">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Queued tracks:</property>
</object>
@@ -186,12 +201,13 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label43">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Tracks submitted:</property>
</object>
@@ -199,12 +215,13 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label44">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Last submission time:</property>
</object>
@@ -212,12 +229,13 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="scrobbler_submit_time_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Never</property>
</object>
@@ -227,12 +245,13 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="scrobbler_status_msg_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Disabled</property>
</object>
@@ -240,12 +259,13 @@
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="scrobbler_queue_count_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">0</property>
</object>
@@ -255,12 +275,13 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="scrobbler_submit_count_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">0</property>
</object>
@@ -270,7 +291,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
</object>
@@ -278,11 +299,14 @@
<child type="label">
<object class="GtkLabel" id="statistics_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Submission statistics</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -305,21 +329,25 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="station_creator_area">
+ <object class="GtkBox" id="station_creator_area">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHSeparator" id="hseparator6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="radio_creator_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
@@ -335,12 +363,14 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="station_creator_type_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Type:</property>
</object>
<packing>
@@ -351,8 +381,9 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="station_creator_combo_container">
+ <object class="GtkBox" id="station_creator_combo_container">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
@@ -367,7 +398,7 @@
<object class="GtkEntry" id="station_creator_arg_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
@@ -382,7 +413,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="station_creator_button_clicked_cb"/>
+ <signal name="clicked" handler="station_creator_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -405,21 +436,25 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="recent_tracks_area">
+ <object class="GtkBox" id="recent_tracks_area">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="recent_tracks_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
@@ -442,21 +477,25 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="top_artists_area">
+ <object class="GtkBox" id="top_artists_area">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="top_artists_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
@@ -479,21 +518,25 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="recommended_artists_area">
+ <object class="GtkBox" id="recommended_artists_area">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHSeparator" id="hseparator3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="recommended_artists_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
@@ -516,21 +559,25 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="top_tracks_area">
+ <object class="GtkBox" id="top_tracks_area">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHSeparator" id="hseparator4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="top_tracks_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
@@ -553,21 +600,25 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="loved_tracks_area">
+ <object class="GtkBox" id="loved_tracks_area">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHSeparator" id="hseparator5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="loved_tracks_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
diff --git a/plugins/daap/daap-prefs.ui b/plugins/daap/daap-prefs.ui
index 332a9fc..bca49c3 100644
--- a/plugins/daap/daap-prefs.ui
+++ b/plugins/daap/daap-prefs.ui
@@ -1,15 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkVBox" id="daap_vbox">
+ <requires lib="gtk+" version="3.6"/>
+ <object class="GtkSizeGroup" id="daap_group">
+ <property name="mode">both</property>
+ </object>
+ <object class="GtkBox" id="daap_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
- <object class="GtkVBox" id="vbox9">
+ <object class="GtkBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="browser_views_label">
@@ -28,7 +34,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox12">
+ <object class="GtkBox" id="hbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -43,7 +49,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox13">
+ <object class="GtkBox" id="hbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -76,7 +82,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -94,7 +99,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -136,7 +140,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -152,7 +155,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -210,9 +212,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="vbox98">
+ <object class="GtkBox" id="vbox98">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
@@ -236,9 +239,10 @@
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkVBox" id="vbox99">
+ <object class="GtkBox" id="vbox99">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">16</property>
<child>
<object class="GtkLabel" id="label1">
@@ -260,7 +264,7 @@
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
@@ -362,7 +366,7 @@
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="finished_hbox">
+ <object class="GtkBox" id="finished_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">16</property>
@@ -385,7 +389,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -406,7 +409,4 @@
</object>
</child>
</object>
- <object class="GtkSizeGroup" id="daap_group">
- <property name="mode">both</property>
- </object>
</interface>
diff --git a/plugins/iradio/station-properties.ui b/plugins/iradio/station-properties.ui
index 0f38c38..0e1d8d9 100644
--- a/plugins/iradio/station-properties.ui
+++ b/plugins/iradio/station-properties.ui
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 2.12 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.6"/>
<object class="GtkNotebook" id="stationproperties">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9,14 +9,22 @@
<child>
<object class="GtkTable" id="stationpropertiesTable">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<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>
@@ -24,25 +32,26 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="titleEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<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>
@@ -52,14 +61,14 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="genreEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
@@ -67,19 +76,21 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <object class="GtkHBox" id="errorBox">
+ <object class="GtkBox" id="errorBox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
<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="icon-size">6</property>
+ <property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
@@ -90,6 +101,7 @@
<child>
<object class="GtkLabel" id="errorLabel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Error message</property>
<property name="wrap">True</property>
</object>
@@ -107,17 +119,12 @@
<property name="x_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Basic</property>
</object>
<packing>
@@ -127,6 +134,7 @@
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
@@ -135,6 +143,7 @@
<child>
<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>
@@ -142,25 +151,26 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="locationEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<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>
@@ -169,12 +179,13 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="bitrateLabel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -183,12 +194,13 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<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>
@@ -198,12 +210,13 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="lastplayedLabel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -212,12 +225,13 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<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>
@@ -226,12 +240,13 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="playcountLabel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -240,12 +255,13 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<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>
@@ -254,12 +270,13 @@
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <object class="GtkVBox" id="ratingVBox">
+ <object class="GtkBox" id="ratingVBox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
@@ -282,6 +299,7 @@
<child type="tab">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Details</property>
</object>
<packing>
diff --git a/plugins/lyrics/lyrics-prefs.ui b/plugins/lyrics/lyrics-prefs.ui
index 1bf7252..d1333fd 100644
--- a/plugins/lyrics/lyrics-prefs.ui
+++ b/plugins/lyrics/lyrics-prefs.ui
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkVBox" id="config">
+ <requires lib="gtk+" version="3.6"/>
+ <object class="GtkBox" id="config">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
+ <property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<object class="GtkFrame" id="frame1">
@@ -18,9 +20,10 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="sites">
+ <object class="GtkBox" id="sites">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<placeholder/>
@@ -59,7 +62,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkHBox" id="hbox23">
+ <object class="GtkBox" id="hbox23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -81,7 +84,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
@@ -89,7 +91,7 @@
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox24">
+ <object class="GtkBox" id="hbox24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
diff --git a/plugins/magnatune/magnatune-loading.ui b/plugins/magnatune/magnatune-loading.ui
index af87da2..cd689be 100644
--- a/plugins/magnatune/magnatune-loading.ui
+++ b/plugins/magnatune/magnatune-loading.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <requires lib="gtk+" version="3.6"/>
<object class="GtkScrolledWindow" id="magnatune_loading_scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -10,10 +11,11 @@
<property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<child>
- <object class="GtkVBox" id="magnatune_loading_vbox">
+ <object class="GtkBox" id="magnatune_loading_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="image1">
@@ -71,7 +73,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -85,7 +87,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -99,7 +101,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -113,7 +115,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -127,7 +129,7 @@
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
</object>
@@ -152,12 +154,12 @@
<child>
<object class="GtkLinkButton" id="linkbutton1">
<property name="label" translatable="yes">http://www.magnatune.com/</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="halign">center</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="uri">http://www.magnatune.com/?ref=rhythmbox</property>
</object>
diff --git a/plugins/magnatune/magnatune-prefs.ui b/plugins/magnatune/magnatune-prefs.ui
index 457bc73..aa39d72 100644
--- a/plugins/magnatune/magnatune-prefs.ui
+++ b/plugins/magnatune/magnatune-prefs.ui
@@ -1,10 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 2.12 -->
- <object class="GtkVBox" id="magnatune_vbox">
+ <requires lib="gtk+" version="3.6"/>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">January (01)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">February (02)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">March (03)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">April (04)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">May (05)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">June (06)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">July (07)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">August (08)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">September (09)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">October (10)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">November (11)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">December (12)</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">$5 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$6 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$7 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$8 US (typical)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$9 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$10 US (better than average)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$11 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$12 US (generous)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$13 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$14 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$15 US (VERY generous!)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$16 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$17 US</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">$18 US (We love you!)</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model3">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Ogg Vorbis</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">FLAC</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">WAV</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">VBR MP3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">128K MP3</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkBox" id="magnatune_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkImage" id="image1">
@@ -19,9 +138,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="account_details_box">
+ <object class="GtkBox" id="account_details_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="magnatune_label">
@@ -37,16 +157,18 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="no_account_radio">
<property name="label" translatable="yes">I don't have a Magnatune account</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="rb_magnatune_radio_account_toggled_cb" swapped="no"/>
@@ -60,10 +182,11 @@
<child>
<object class="GtkRadioButton" id="stream_account_radio">
<property name="label" translatable="yes">I have a streaming account</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<property name="group">no_account_radio</property>
<signal name="toggled" handler="rb_magnatune_radio_account_toggled_cb" swapped="no"/>
@@ -77,10 +200,11 @@
<child>
<object class="GtkRadioButton" id="download_account_radio">
<property name="label" translatable="yes">I have a download account</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<property name="group">no_account_radio</property>
<signal name="toggled" handler="rb_magnatune_radio_account_toggled_cb" swapped="no"/>
@@ -162,7 +286,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox21">
+ <object class="GtkBox" id="hbox21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -207,11 +331,12 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox14">
+ <object class="GtkBox" id="vbox14">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox23">
+ <object class="GtkBox" id="hbox23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -229,10 +354,10 @@
<child>
<object class="GtkLinkButton" id="href1">
<property name="label" translatable="yes">http://magnatune.com/compare_plans</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="uri">http://magnatune.com/compare_plans?referal_id=rhythmbox</property>
</object>
@@ -250,7 +375,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox15">
+ <object class="GtkBox" id="hbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -270,10 +395,10 @@
<child>
<object class="GtkLinkButton" id="magnatune_link">
<property name="label" translatable="yes">http://www.magnatune.com/info/</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="uri">http://www.magnatune.com/info/</property>
</object>
@@ -298,121 +423,4 @@
</packing>
</child>
</object>
- <object class="GtkListStore" id="model1">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">January (01)</col>
- </row>
- <row>
- <col id="0" translatable="yes">February (02)</col>
- </row>
- <row>
- <col id="0" translatable="yes">March (03)</col>
- </row>
- <row>
- <col id="0" translatable="yes">April (04)</col>
- </row>
- <row>
- <col id="0" translatable="yes">May (05)</col>
- </row>
- <row>
- <col id="0" translatable="yes">June (06)</col>
- </row>
- <row>
- <col id="0" translatable="yes">July (07)</col>
- </row>
- <row>
- <col id="0" translatable="yes">August (08)</col>
- </row>
- <row>
- <col id="0" translatable="yes">September (09)</col>
- </row>
- <row>
- <col id="0" translatable="yes">October (10)</col>
- </row>
- <row>
- <col id="0" translatable="yes">November (11)</col>
- </row>
- <row>
- <col id="0" translatable="yes">December (12)</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model2">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">$5 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$6 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$7 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$8 US (typical)</col>
- </row>
- <row>
- <col id="0" translatable="yes">$9 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$10 US (better than average)</col>
- </row>
- <row>
- <col id="0" translatable="yes">$11 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$12 US (generous)</col>
- </row>
- <row>
- <col id="0" translatable="yes">$13 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$14 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$15 US (VERY generous!)</col>
- </row>
- <row>
- <col id="0" translatable="yes">$16 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$17 US</col>
- </row>
- <row>
- <col id="0" translatable="yes">$18 US (We love you!)</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model3">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Ogg Vorbis</col>
- </row>
- <row>
- <col id="0" translatable="yes">FLAC</col>
- </row>
- <row>
- <col id="0" translatable="yes">WAV</col>
- </row>
- <row>
- <col id="0" translatable="yes">VBR MP3</col>
- </row>
- <row>
- <col id="0" translatable="yes">128K MP3</col>
- </row>
- </data>
- </object>
</interface>
diff --git a/plugins/replaygain/replaygain-prefs.ui b/plugins/replaygain/replaygain-prefs.ui
index 1ea9732..71da142 100644
--- a/plugins/replaygain/replaygain-prefs.ui
+++ b/plugins/replaygain/replaygain-prefs.ui
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.6"/>
<object class="GtkAdjustment" id="preampadjustment">
<property name="lower">-15</property>
<property name="upper">25</property>
@@ -9,37 +9,62 @@
<property name="page_increment">5</property>
<property name="page_size">10</property>
</object>
- <object class="GtkVBox" id="replaygain-prefs">
+ <object class="GtkListStore" id="replaygainmodemodel">
+ <columns>
+ <!-- column-name display -->
+ <column type="gchararray"/>
+ <!-- column-name setting -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Radio (equal loudness for all tracks)</col>
+ <col id="1">radio</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Album (ideal loudness for all tracks)</col>
+ <col id="1">album</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkBox" id="replaygain-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkLabel" id="headerlabel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">ReplayGain preferences</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xpad">8</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
@@ -47,6 +72,7 @@
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">ReplayGain _mode:</property>
<property name="use_underline">True</property>
@@ -59,6 +85,7 @@
<child>
<object class="GtkComboBox" id="replaygainmode">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">replaygainmodemodel</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
@@ -76,6 +103,7 @@
<child>
<object class="GtkLabel" id="preamplabel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Pre-amp:</property>
<property name="use_underline">True</property>
@@ -88,7 +116,7 @@
</packing>
</child>
<child>
- <object class="GtkHScale" id="preamp">
+ <object class="GtkScale" id="preamp">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">preampadjustment</property>
@@ -116,17 +144,20 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -142,26 +173,9 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
- <object class="GtkListStore" id="replaygainmodemodel">
- <columns>
- <!-- column-name display -->
- <column type="gchararray"/>
- <!-- column-name setting -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Radio (equal loudness for all tracks)</col>
- <col id="1" translatable="no">radio</col>
- </row>
- <row>
- <col id="0" translatable="yes">Album (ideal loudness for all tracks)</col>
- <col id="1" translatable="no">album</col>
- </row>
- </data>
- </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
