[rhythmbox] replace GtkMisc xpad and ypad properties with margin-*
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] replace GtkMisc xpad and ypad properties with margin-*
- Date: Sun, 10 Aug 2014 21:52:05 +0000 (UTC)
commit af586cbd3f5390ac44ab2b1eb724f7fead079ca1
Author: Jonathan Matthew <jonathan d14n org>
Date: Mon Aug 11 07:46:42 2014 +1000
replace GtkMisc xpad and ypad properties with margin-*
margin-left and margin-right are deprecated too, but we can easily switch
to margin-start and margin-end once the gtk+ requirement goes up.
data/ui/general-prefs.ui | 100 +++++++++++++++++++++++++++-------------------
data/ui/main-toolbar.ui | 45 ++++++++++++--------
data/ui/podcast-prefs.ui | 91 +++++++++++++++++++++++++----------------
data/ui/sync-dialog.ui | 35 ++++++++++++----
widgets/rb-button-bar.c | 2 +-
5 files changed, 168 insertions(+), 105 deletions(-)
---
diff --git a/data/ui/general-prefs.ui b/data/ui/general-prefs.ui
index 38a41d3..0834a89 100644
--- a/data/ui/general-prefs.ui
+++ b/data/ui/general-prefs.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="GtkVBox" id="general_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -48,7 +49,8 @@
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">8</property>
+ <property name="margin_left">8</property>
+ <property name="margin_right">8</property>
</object>
<packing>
<property name="expand">False</property>
@@ -64,11 +66,12 @@
<child>
<object class="GtkRadioButton" id="library_browser_views_radio">
<property name="label" translatable="yes">_Artists and albums</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="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="rb_shell_preferences_browser_views_activated_cb"
swapped="no"/>
@@ -82,11 +85,12 @@
<child>
<object class="GtkRadioButton" id="radio2">
<property name="label" translatable="yes">_Genres and artists</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>
<property name="group">library_browser_views_radio</property>
<signal name="toggled" handler="rb_shell_preferences_browser_views_activated_cb"
swapped="no"/>
@@ -100,11 +104,12 @@
<child>
<object class="GtkRadioButton" id="radio3">
<property name="label" translatable="yes">G_enres, artists and albums</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>
<property name="group">library_browser_views_radio</property>
<signal name="toggled" handler="rb_shell_preferences_browser_views_activated_cb"
swapped="no"/>
@@ -194,7 +199,8 @@
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">8</property>
+ <property name="margin_left">8</property>
+ <property name="margin_right">8</property>
</object>
<packing>
<property name="expand">False</property>
@@ -214,124 +220,132 @@
<child>
<object class="GtkCheckButton" id="track_check">
<property name="label" translatable="yes">Track _number</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>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="artist_check">
<property name="label" translatable="yes">_Artist</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>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- <child>
+ <child>
<object class="GtkCheckButton" id="composer_check">
<property name="label" translatable="yes">_Composer</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>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- <child>
+ <child>
<object class="GtkCheckButton" id="album_check">
<property name="label" translatable="yes">A_lbum</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>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="year_check">
<property name="label" translatable="yes">_Year</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>
<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="GtkCheckButton" id="last_played_check">
<property name="label" translatable="yes">_Last played</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>
<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="GtkCheckButton" id="genre_check">
<property name="label" translatable="yes">_Genre</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>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="first_seen_check">
<property name="label" translatable="yes">Da_te added</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>
@@ -340,17 +354,18 @@
<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="GtkCheckButton" id="play_count_check">
<property name="label" translatable="yes">_Play count</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>
@@ -359,17 +374,18 @@
<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="GtkCheckButton" id="comment_check">
<property name="label" translatable="yes">C_omment</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>
@@ -378,17 +394,18 @@
<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="GtkCheckButton" id="bpm_check">
<property name="label" translatable="yes">_BPM</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>
@@ -397,17 +414,18 @@
<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="GtkCheckButton" id="rating_check">
<property name="label" translatable="yes">_Rating</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>
@@ -416,17 +434,18 @@
<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="GtkCheckButton" id="duration_check">
<property name="label" translatable="yes">Ti_me</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>
@@ -435,17 +454,18 @@
<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="GtkCheckButton" id="location_check">
<property name="label" translatable="yes">Lo_cation</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>
@@ -454,17 +474,18 @@
<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="GtkCheckButton" id="quality_check">
<property name="label" translatable="yes">_Quality</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>
@@ -473,12 +494,9 @@
<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>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/data/ui/main-toolbar.ui b/data/ui/main-toolbar.ui
index e6a9177..f053363 100644
--- a/data/ui/main-toolbar.ui
+++ b/data/ui/main-toolbar.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="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -16,24 +17,32 @@
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">8</property>
- <property name="ypad">9</property>
+ <property name="margin_left">8</property>
+ <property name="margin_right">8</property>
+ <property name="margin_top">9</property>
+ <property name="margin_bottom">9</property>
<property name="pixel_size">24</property>
<property name="icon_name">media-skip-forward-symbolic</property>
+ <property name="icon_size">6</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">12</property>
- <property name="ypad">9</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">9</property>
+ <property name="margin_bottom">9</property>
<property name="pixel_size">24</property>
<property name="icon_name">media-playback-start-symbolic</property>
+ <property name="icon_size">6</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">8</property>
- <property name="ypad">9</property>
+ <property name="margin_left">8</property>
+ <property name="margin_right">8</property>
+ <property name="margin_top">9</property>
+ <property name="margin_bottom">9</property>
<property name="pixel_size">24</property>
<property name="icon_name">media-skip-backward-symbolic</property>
</object>
@@ -53,9 +62,6 @@
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
- <style>
- <class name="linked" />
- </style>
<child>
<object class="GtkButton" id="previous-button">
<property name="visible">True</property>
@@ -65,7 +71,7 @@
<property name="image">image5</property>
<property name="always_show_image">True</property>
<style>
- <class name="raised" />
+ <class name="raised"/>
</style>
</object>
<packing>
@@ -82,7 +88,7 @@
<property name="action_name">app.play</property>
<property name="image">image4</property>
<style>
- <class name="raised" />
+ <class name="raised"/>
</style>
</object>
<packing>
@@ -99,7 +105,7 @@
<property name="action_name">app.play-next</property>
<property name="image">image3</property>
<style>
- <class name="raised" />
+ <class name="raised"/>
</style>
</object>
<packing>
@@ -108,6 +114,9 @@
<property name="position">2</property>
</packing>
</child>
+ <style>
+ <class name="linked"/>
+ </style>
</object>
</child>
</object>
@@ -127,9 +136,6 @@
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <style>
- <class name="linked" />
- </style>
<child>
<object class="GtkToggleButton" id="repeat-button">
<property name="visible">True</property>
@@ -138,7 +144,7 @@
<property name="action_name">app.play-repeat</property>
<property name="image">image2</property>
<style>
- <class name="raised" />
+ <class name="raised"/>
</style>
</object>
<packing>
@@ -155,7 +161,7 @@
<property name="action_name">app.play-shuffle</property>
<property name="image">image1</property>
<style>
- <class name="raised" />
+ <class name="raised"/>
</style>
</object>
<packing>
@@ -164,6 +170,9 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="linked"/>
+ </style>
</object>
</child>
</object>
diff --git a/data/ui/podcast-prefs.ui b/data/ui/podcast-prefs.ui
index 3bb6b05..e50f04b 100644
--- a/data/ui/podcast-prefs.ui
+++ b/data/ui/podcast-prefs.ui
@@ -1,21 +1,48 @@
-<?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 toplevel-contextual -->
+ <requires lib="gtk+" version="3.6"/>
+ <object class="GtkListStore" id="interval-values">
+ <columns>
+ <!-- column-name display -->
+ <column type="gchararray"/>
+ <!-- column-name setting -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Every hour</col>
+ <col id="1">hourly</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Every day</col>
+ <col id="1">daily</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Every week</col>
+ <col id="1">weekly</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Manually</col>
+ <col id="1">manual</col>
+ </row>
+ </data>
+ </object>
<object class="GtkVBox" id="podcast_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<property name="spacing">18</property>
- <property name="valign">start</property>
<child>
<object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="download_manager_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Podcast Downloads</property>
<attributes>
@@ -31,9 +58,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>
@@ -44,10 +73,13 @@
<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="xpad">8</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">8</property>
+ <property name="margin_right">8</property>
</object>
<packing>
<property name="expand">False</property>
@@ -58,6 +90,7 @@
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
@@ -65,6 +98,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">_Download location:</property>
<property name="use_underline">True</property>
@@ -73,12 +107,13 @@
</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="label19">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Check for _new episodes:</property>
<property name="use_underline">True</property>
@@ -88,12 +123,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="GtkComboBox" id="update_interval">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">interval-values</property>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
@@ -113,15 +149,18 @@
<child>
<object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkFileChooserButton" id="location_chooser">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="action">select-folder</property>
<property name="show_hidden">True</property>
<property name="title" translatable="yes">Select Folder For Podcasts</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -135,16 +174,22 @@
</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>
@@ -156,30 +201,4 @@
</packing>
</child>
</object>
- <object class="GtkListStore" id="interval-values">
- <columns>
- <!-- column-name display -->
- <column type="gchararray"/>
- <!-- column-name setting -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Every hour</col>
- <col id="1" translatable="no">hourly</col>
- </row>
- <row>
- <col id="0" translatable="yes">Every day</col>
- <col id="1" translatable="no">daily</col>
- </row>
- <row>
- <col id="0" translatable="yes">Every week</col>
- <col id="1" translatable="no">weekly</col>
- </row>
- <row>
- <col id="0" translatable="yes">Manually</col>
- <col id="1" translatable="no">manual</col>
- </row>
- </data>
- </object>
</interface>
diff --git a/data/ui/sync-dialog.ui b/data/ui/sync-dialog.ui
index ef3faf8..dab76eb 100644
--- a/data/ui/sync-dialog.ui
+++ b/data/ui/sync-dialog.ui
@@ -1,33 +1,34 @@
-<?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="GtkVBox" id="sync-dialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame4">
<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="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="sync-settings-ui-container">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -36,6 +37,7 @@
<child type="label">
<object class="GtkLabel" id="label-frame-sync">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Sync Preferences</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -44,21 +46,26 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame7">
<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="GtkHBox" id="sync-state-ui-container">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
@@ -69,6 +76,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Sync Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -78,21 +86,26 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="sync-dialog-message">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkImage" id="error-image">
<property name="visible">True</property>
- <property name="xpad">6</property>
+ <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="icon-size">6</property>
+ <property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">12</property>
<property name="position">0</property>
</packing>
@@ -100,15 +113,19 @@
<child>
<object class="GtkLabel" id="sync-dialog-reason">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
+ <property name="expand">True</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="padding">6</property>
<property name="position">2</property>
</packing>
diff --git a/widgets/rb-button-bar.c b/widgets/rb-button-bar.c
index 3ca0ebb..fb9bc74 100644
--- a/widgets/rb-button-bar.c
+++ b/widgets/rb-button-bar.c
@@ -207,7 +207,7 @@ append_menu (RBButtonBar *bar, GMenuModel *menu, gboolean need_separator)
label_text = NULL;
g_menu_model_get_item_attribute (menu, i, "label", "s", &label_text);
label = gtk_label_new (g_dgettext (NULL, label_text));
- g_object_set (label, "xpad", 6, NULL);
+ g_object_set (label, "margin-left", 6, "margin-right", 6, NULL);
gtk_container_add (GTK_CONTAINER (button), label);
if (g_menu_model_get_item_attribute (menu, i, "accel", "s", &accel)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]