[rhythmbox] Remove more markup from UI files
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] Remove more markup from UI files
- Date: Mon, 30 Jul 2012 11:16:28 +0000 (UTC)
commit 4f969dfb1d0e557fc7274acfa312323bebcaef7c
Author: Jonathan Matthew <jonathan d14n org>
Date: Mon Jul 30 21:13:26 2012 +1000
Remove more markup from UI files
plugins/audiocd/album-info.ui | 17 +--------
plugins/daap/daap-prefs.ui | 83 +++++++++++++++++++++++++++++++++-------
plugins/ipod/ipod-init.ui | 11 ++++-
plugins/lyrics/lyrics-prefs.ui | 30 ++++++++++----
4 files changed, 100 insertions(+), 41 deletions(-)
---
diff --git a/plugins/audiocd/album-info.ui b/plugins/audiocd/album-info.ui
index eeaf804..018def8 100644
--- a/plugins/audiocd/album-info.ui
+++ b/plugins/audiocd/album-info.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkGrid" id="album_info">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -13,7 +13,6 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">A_lbum:</property>
- <property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">album_entry</property>
</object>
@@ -30,7 +29,6 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Artist:</property>
- <property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">artist_entry</property>
</object>
@@ -47,7 +45,6 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Artist s_ort order:</property>
- <property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">artist_sort_entry</property>
</object>
@@ -64,7 +61,6 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Genre:</property>
- <property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">genre_entry</property>
</object>
@@ -147,7 +143,6 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Year:</property>
- <property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">year_entry</property>
<accessibility>
@@ -182,7 +177,6 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Disc:</property>
- <property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">disc_number_entry</property>
<accessibility>
@@ -223,14 +217,5 @@
<child>
<placeholder/>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</interface>
diff --git a/plugins/daap/daap-prefs.ui b/plugins/daap/daap-prefs.ui
index eabfdb9..332a9fc 100644
--- a/plugins/daap/daap-prefs.ui
+++ b/plugins/daap/daap-prefs.ui
@@ -1,18 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkVBox" id="daap_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">18</property>
<child>
<object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="browser_views_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Sharing</property>
<attributes>
@@ -28,9 +30,11 @@
<child>
<object class="GtkHBox" id="hbox12">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -41,9 +45,11 @@
<child>
<object class="GtkHBox" id="hbox13">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xpad">8</property>
</object>
<packing>
@@ -55,17 +61,24 @@
<child>
<object class="GtkTable" id="table1">
<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">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkCheckButton" id="dacp_enable_check">
<property name="label" translatable="yes">_Look for touch Remotes</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="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -77,10 +90,13 @@
<child>
<object class="GtkCheckButton" id="daap_enable_check">
<property name="label" translatable="yes">_Share my music</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="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -93,7 +109,7 @@
<object class="GtkEntry" id="daap_name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -103,6 +119,7 @@
<child>
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Library _name:</property>
<property name="use_underline">True</property>
@@ -115,9 +132,11 @@
<child>
<object class="GtkButton" id="forget_remotes_button">
<property name="label" translatable="yes">Forget known Remotes</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>
</object>
<packing>
<property name="left_attach">1</property>
@@ -129,10 +148,13 @@
<child>
<object class="GtkCheckButton" id="daap_password_check">
<property name="label" translatable="yes">Require _password:</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="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -146,7 +168,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -155,21 +177,24 @@
<property name="bottom_attach">4</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -183,12 +208,15 @@
</object>
<object class="GtkAlignment" id="passcode_widget">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox98">
<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="xalign">0</property>
<property name="label" translatable="yes">Add Remote</property>
<attributes>
@@ -204,37 +232,44 @@
<child>
<object class="GtkAlignment" id="pairing_widget">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkVBox" id="vbox99">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">16</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">Please enter the passcode displayed on your device.</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
<object class="GtkEntry" id="passcode_entry1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">1</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â</property>
<property name="width_chars">1</property>
<property name="xalign">0.5</property>
</object>
@@ -249,7 +284,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">1</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â</property>
<property name="width_chars">1</property>
<property name="xalign">0.5</property>
</object>
@@ -264,7 +299,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">1</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â</property>
<property name="width_chars">1</property>
<property name="xalign">0.5</property>
</object>
@@ -279,7 +314,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">1</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â</property>
<property name="width_chars">1</property>
<property name="xalign">0.5</property>
</object>
@@ -293,15 +328,22 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="pairing_status_widget">
- <property name="label" translatable="yes"><span foreground="red">Could not pair with this Remote.</span></property>
- <property name="use_markup">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Could not pair with this Remote</property>
+ <attributes>
+ <attribute name="foreground" value="#ffff00000000"/>
+ </attributes>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -309,35 +351,46 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="finished_widget">
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkHBox" id="finished_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">16</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">You can now control Rhythmbox through your Remote</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="close_pairing_button">
<property name="label">gtk-close</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="use_stock">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -345,6 +398,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
diff --git a/plugins/ipod/ipod-init.ui b/plugins/ipod/ipod-init.ui
index 2b3c621..a6e97eb 100644
--- a/plugins/ipod/ipod-init.ui
+++ b/plugins/ipod/ipod-init.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="ipod_init">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -19,6 +19,7 @@
<child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -35,6 +36,7 @@
<child>
<object class="GtkButton" id="initialise_button">
<property name="label" translatable="yes">_Initialize</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -148,8 +150,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><span size="x-large" weight="bold">Do you want to initialize your iPod?</span></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Do you want to initialize your iPod?</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="scale" value="1.4399999999999999"/>
+ </attributes>
</object>
<packing>
<property name="right_attach">2</property>
diff --git a/plugins/lyrics/lyrics-prefs.ui b/plugins/lyrics/lyrics-prefs.ui
index 067ec63..1bf7252 100644
--- a/plugins/lyrics/lyrics-prefs.ui
+++ b/plugins/lyrics/lyrics-prefs.ui
@@ -1,25 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkVBox" 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">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="sites">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<placeholder/>
@@ -31,6 +32,7 @@
<child type="label">
<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>
<attributes>
@@ -48,43 +50,53 @@
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHBox" id="hbox23">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkEntry" id="path_display">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="choose_button">
+ <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>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkHBox" id="hbox24">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-open</property>
</object>
<packing>
@@ -96,6 +108,7 @@
<child>
<object class="GtkLabel" id="label60">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Browse...</property>
<property name="use_underline">True</property>
</object>
@@ -123,11 +136,12 @@
<child type="label">
<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"><b>Lyrics Folder</b></property
+ <property name="label" translatable="yes">Lyrics Folder</property>
<attributes>
<attribute name="weight" value="bold"/>
- </attributes>>
+ </attributes>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
