summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pyanaconda/ui/gui/spokes/datetime_spoke.glade8
-rw-r--r--pyanaconda/ui/gui/spokes/keyboard.glade18
-rw-r--r--pyanaconda/ui/gui/spokes/software.glade301
-rw-r--r--pyanaconda/ui/gui/spokes/source.glade56
-rw-r--r--pyanaconda/ui/gui/spokes/welcome.glade56
-rw-r--r--widgets/src/BaseWindow.c2
6 files changed, 224 insertions, 217 deletions
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
index 4731d92ed..419ad6090 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.glade
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
@@ -147,10 +147,12 @@
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="xscale">0.20000000298023224</property>
+ <property name="right_padding">24</property>
<child>
<object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<child>
<object class="GtkLabel" id="networkTimeLabel">
<property name="visible">True</property>
@@ -232,11 +234,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="xscale">0.94999998807907104</property>
+ <property name="xscale">1</property>
+ <property name="left_padding">24</property>
<child>
<object class="GtkBox" id="footerBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_bottom">6</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
@@ -500,10 +504,12 @@
<property name="xalign">1</property>
<property name="xscale">0.30000001192092896</property>
<property name="yscale">0.20000000298023224</property>
+ <property name="right_padding">24</property>
<child>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
<child>
<object class="GtkComboBox" id="monthCombobox">
<property name="visible">True</property>
diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade
index 40c0e0976..f056c5fec 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.glade
+++ b/pyanaconda/ui/gui/spokes/keyboard.glade
@@ -197,7 +197,9 @@
<child internal-child="alignment">
<object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
<property name="can_focus">False</property>
- <property name="margin_top">24</property>
+ <property name="margin_top">12</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="yalign">0</property>
<property name="xscale">0.75</property>
<property name="yscale">0.75</property>
@@ -232,12 +234,16 @@
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="spacing">30</property>
+ <property name="homogeneous">True</property>
<child>
<object class="GtkBox" id="leftSideBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -288,7 +294,7 @@
<property name="toolbar_style">icons</property>
<property name="icon_size">1</property>
<style>
- <class name="STYLE_CLASS_INLINE_TOOLBAR"/>
+ <class name="inline-toolbar"/>
</style>
<child>
<object class="GtkToolButton" id="addLayoutButton">
@@ -369,8 +375,8 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -378,6 +384,8 @@
<object class="GtkBox" id="rightSideBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
diff --git a/pyanaconda/ui/gui/spokes/software.glade b/pyanaconda/ui/gui/spokes/software.glade
index d0e7ad2c8..4a013f2a6 100644
--- a/pyanaconda/ui/gui/spokes/software.glade
+++ b/pyanaconda/ui/gui/spokes/software.glade
@@ -25,13 +25,17 @@
<object class="AnacondaSpokeWindow" id="softwareWindow">
<property name="startup_id">filler</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="startup_id">filler</property>
<property name="window_name">SOFTWARE SELECTION</property>
- <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
<signal name="info-bar-clicked" handler="on_info_bar_clicked" swapped="no"/>
+ <signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
<child internal-child="main_box">
<object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child internal-child="nav_area">
<object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
@@ -46,164 +50,170 @@
<child internal-child="alignment">
<object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xscale">0.5</property>
- <property name="yscale">0.75</property>
+ <property name="top_padding">12</property>
+ <property name="bottom_padding">48</property>
+ <property name="left_padding">24</property>
+ <property name="right_padding">24</property>
<child internal-child="action_area">
- <object class="GtkBox" id="softwareWindow-actionArea">
+ <object class="GtkBox" id="AnacondaSpokeWindow-action_area1">
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="homogeneous">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">24</property>
- <property name="homogeneous">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="column_spacing">24</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkBox" id="environmentBox">
+ <object class="GtkLabel" id="label1">
<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="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Choose your environment</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="margin_bottom">6</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Choose your environment</property>
+ <attributes>
+ <attribute name="font-desc" value="Cantarell 12"/>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">6</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Choose your add-ons</property>
+ <attributes>
+ <attribute name="font-desc" value="Cantarell 12"/>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="addonScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow" id="environmentScrolledWindow">
+ <object class="GtkTreeView" id="addonView">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">12</property>
+ <property name="model">addonStore</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
<child>
- <object class="GtkViewport" id="viewport2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <object class="GtkTreeViewColumn" id="addonSelectedCol">
+ <property name="title" translatable="yes">column</property>
+ <signal name="clicked" handler="on_addon_toggled" swapped="no"/>
<child>
- <object class="GtkTreeView" id="environmentView">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
- <property name="model">environmentStore</property>
- <property name="headers_visible">False</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="environmentSelector"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="environmentSelectedCol">
- <property name="title" translatable="yes">column</property>
- <child>
- <object class="GtkCellRendererToggle" id="environmentSelectedRenderer">
- <property name="yalign">0</property>
- <property name="radio">True</property>
- <signal name="toggled" handler="on_environment_toggled" swapped="no"/>
- </object>
- <attributes>
- <attribute name="active">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="environmentDescCol">
- <property name="title" translatable="yes">column</property>
- <child>
- <object class="GtkCellRendererText" id="environmentDescRenderer">
- <property name="width">250</property>
- <property name="yalign">0</property>
- <property name="wrap_mode">word-char</property>
- <property name="wrap_width">200</property>
- </object>
- <attributes>
- <attribute name="markup">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
+ <object class="GtkCellRendererToggle" id="addonSelectedRenderer">
+ <property name="yalign">0</property>
+ <signal name="toggled" handler="on_addon_toggled" swapped="no"/>
+ </object>
+ <attributes>
+ <attribute name="active">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="addonDescCol">
+ <property name="title" translatable="yes">column</property>
+ <property name="expand">True</property>
+ <child>
+ <object class="GtkCellRendererText" id="addonDescRenderer">
+ <property name="width">250</property>
+ <property name="yalign">0</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="wrap_width">200</property>
</object>
+ <attributes>
+ <attribute name="markup">1</attribute>
+ </attributes>
</child>
</object>
</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">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <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>
- <object class="GtkBox" id="addonsBox">
+ <object class="GtkScrolledWindow" id="environmentScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkViewport" id="viewport2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Choose your add-ons</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="addonScrolledWindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkTreeView" id="addonView">
+ <object class="GtkTreeView" id="environmentView">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="border_width">6</property>
- <property name="model">addonStore</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">12</property>
+ <property name="model">environmentStore</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
<child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection2"/>
+ <object class="GtkTreeSelection" id="environmentSelector"/>
</child>
<child>
- <object class="GtkTreeViewColumn" id="addonSelectedCol">
+ <object class="GtkTreeViewColumn" id="environmentSelectedCol">
<property name="title" translatable="yes">column</property>
- <signal name="clicked" handler="on_addon_toggled" swapped="no"/>
<child>
- <object class="GtkCellRendererToggle" id="addonSelectedRenderer">
+ <object class="GtkCellRendererToggle" id="environmentSelectedRenderer">
<property name="yalign">0</property>
- <signal name="toggled" handler="on_addon_toggled" swapped="no"/>
+ <property name="radio">True</property>
+ <signal name="toggled" handler="on_environment_toggled" swapped="no"/>
</object>
<attributes>
<attribute name="active">0</attribute>
@@ -212,10 +222,11 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn" id="addonDescCol">
+ <object class="GtkTreeViewColumn" id="environmentDescCol">
<property name="title" translatable="yes">column</property>
+ <property name="expand">True</property>
<child>
- <object class="GtkCellRendererText" id="addonDescRenderer">
+ <object class="GtkCellRendererText" id="environmentDescRenderer">
<property name="width">250</property>
<property name="yalign">0</property>
<property name="wrap_mode">word-char</property>
@@ -230,44 +241,40 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="addAddonButton">
- <property name="label" translatable="yes">_Add custom add-on...</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="halign">end</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_custom_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="addAddonButton">
+ <property name="label" translatable="yes">_Add custom add-on...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="margin_top">6</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_custom_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
</child>
</object>
diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade
index cec5276ec..73452a385 100644
--- a/pyanaconda/ui/gui/spokes/source.glade
+++ b/pyanaconda/ui/gui/spokes/source.glade
@@ -19,11 +19,9 @@
<child>
<object class="GtkButton" id="add_repo_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="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -35,11 +33,9 @@
<child>
<object class="GtkButton" id="add_repo_add_button">
<property name="label" translatable="yes">_Add</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_underline">True</property>
</object>
<packing>
@@ -163,11 +159,9 @@
</child>
<child>
<object class="GtkRadioButton" id="addRepositorySelectList">
- <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</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -241,11 +235,9 @@
</child>
<child>
<object class="GtkRadioButton" id="addRepositorySelectUrl">
- <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</property>
<property name="draw_indicator">True</property>
<property name="group">addRepositorySelectList</property>
@@ -368,11 +360,9 @@
<child>
<object class="GtkButton" id="cancelChooserButton">
<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="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -384,11 +374,9 @@
<child>
<object class="GtkButton" id="openChooserButton">
<property name="label">gtk-open</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>
@@ -449,12 +437,10 @@
<child>
<object class="GtkButton" id="doneButton">
<property name="label" translatable="yes">_DONE</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_done_clicked" swapped="no"/>
</object>
@@ -604,11 +590,9 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkButton" id="proxyCancelButton">
<property name="label" translatable="yes">_CANCEL</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_underline">True</property>
<signal name="clicked" handler="on_proxy_cancel_clicked" swapped="no"/>
</object>
@@ -621,11 +605,9 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkButton" id="proxyAddButton">
<property name="label" translatable="yes">_ADD</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_underline">True</property>
<signal name="clicked" handler="on_proxy_add_clicked" swapped="no"/>
</object>
@@ -651,11 +633,9 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkCheckButton" id="enableProxyCheck">
<property name="label" translatable="yes">_Enable HTTP Proxy</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</property>
<property name="draw_indicator">True</property>
@@ -737,11 +717,9 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkCheckButton" id="enableAuthCheck">
<property name="label" translatable="yes">_Use Authentication</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</property>
<property name="draw_indicator">True</property>
@@ -868,12 +846,18 @@ TeXlive 2012 repository</col>
<child internal-child="alignment">
<object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0.5</property>
+ <property name="top_padding">12</property>
+ <property name="bottom_padding">48</property>
+ <property name="left_padding">24</property>
+ <property name="right_padding">24</property>
<child internal-child="action_area">
<object class="GtkBox" id="sourceWindow-actionArea">
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
@@ -883,6 +867,7 @@ TeXlive 2012 repository</col>
<property name="halign">start</property>
<property name="label" translatable="yes">WHICH INSTALLATION SOURCE WOULD YOU LIKE TO USE?</property>
<attributes>
+ <attribute name="font-desc" value="Cantarell 10"/>
<attribute name="weight" value="bold"/>
</attributes>
</object>
@@ -895,12 +880,10 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkRadioButton" id="autodetectRadioButton">
<property name="label" translatable="yes">_Auto-detected install media:</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -914,11 +897,11 @@ TeXlive 2012 repository</col>
</child>
<child>
<object class="GtkBox" id="autodetectBox">
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="margin_left">24</property>
<property name="spacing">6</property>
- <property name="sensitive">False</property>
<child>
<object class="GtkScrolledWindow" id="autodetectWindow">
<property name="visible">True</property>
@@ -952,12 +935,10 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkButton" id="verifyMediaButton">
<property name="label" translatable="yes">_Verify</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="valign">center</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_verify_media_clicked" swapped="no"/>
</object>
@@ -977,12 +958,10 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkRadioButton" id="isoRadioButton">
<property name="label" translatable="yes">_ISO file:</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -996,11 +975,11 @@ TeXlive 2012 repository</col>
</child>
<child>
<object class="GtkBox" id="isoBox">
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="margin_left">24</property>
<property name="spacing">6</property>
- <property name="sensitive">False</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
@@ -1034,11 +1013,9 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkButton" id="isoChooserButton">
<property name="label" translatable="yes">_Choose an ISO</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_underline">True</property>
<signal name="clicked" handler="on_chooser_clicked" swapped="no"/>
</object>
@@ -1051,12 +1028,10 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkButton" id="verifyIsoButton">
<property name="label" translatable="yes">_Verify</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_verify_iso_clicked" object="isoChooserButton" swapped="no"/>
</object>
@@ -1076,12 +1051,10 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkRadioButton" id="networkRadioButton">
<property name="label" translatable="yes">On the _network:</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="margin_left">12</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -1097,11 +1070,11 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkBox" id="networkBox">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
- <property name="sensitive">False</property>
<child>
<object class="GtkBox" id="urlBox">
<property name="visible">True</property>
@@ -1143,11 +1116,9 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkButton" id="proxyButton">
<property name="label" translatable="yes">_Proxy setup...</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_underline">True</property>
<signal name="clicked" handler="on_proxy_clicked" swapped="no"/>
</object>
@@ -1219,6 +1190,7 @@ TeXlive 2012 repository</col>
<property name="margin_top">12</property>
<property name="label" translatable="yes">UPDATES</property>
<attributes>
+ <attribute name="font-desc" value="Cantarell 10"/>
<attribute name="weight" value="bold"/>
</attributes>
</object>
@@ -1231,12 +1203,10 @@ TeXlive 2012 repository</col>
<child>
<object class="GtkCheckButton" id="noUpdatesCheckbox">
<property name="label" translatable="yes">D_on't install the latest available software updates. Install the default versions provided by the install source above.</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="margin_left">12</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
diff --git a/pyanaconda/ui/gui/spokes/welcome.glade b/pyanaconda/ui/gui/spokes/welcome.glade
index cf8f4903d..1f91487a6 100644
--- a/pyanaconda/ui/gui/spokes/welcome.glade
+++ b/pyanaconda/ui/gui/spokes/welcome.glade
@@ -19,11 +19,9 @@
<child>
<object class="GtkButton" id="quitButton">
<property name="label" translatable="yes">_Get me out of here!</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_underline">True</property>
</object>
<packing>
@@ -35,11 +33,9 @@
<child>
<object class="GtkButton" id="continueButton">
<property name="label" translatable="yes">_I accept my fate.</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_underline">True</property>
</object>
<packing>
@@ -69,6 +65,7 @@
<property name="halign">start</property>
<property name="label" translatable="yes">This is unstable, pre-release software.</property>
<attributes>
+ <attribute name="font-desc" value="Cantarell Bold 12"/>
<attribute name="weight" value="bold"/>
</attributes>
</object>
@@ -101,6 +98,9 @@
<property name="valign">start</property>
<property name="label" translatable="yes">You wake up inside an OS installer in Timbuktu, and it's six months in the future. But, there are bugs. Bugs everywhere. Bugs you must live with. This OS of the future isn't a stable OS you can rely on. It's for testing purposes only.</property>
<property name="wrap">True</property>
+ <attributes>
+ <attribute name="font-desc" value="Cantarell 12"/>
+ </attributes>
</object>
<packing>
<property name="left_attach">1</property>
@@ -153,8 +153,11 @@
<object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1">
<property name="can_focus">False</property>
<property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="bottom_padding">48</property>
+ <property name="left_padding">24</property>
+ <property name="right_padding">24</property>
<child internal-child="action_area">
<object class="GtkBox" id="languageSpokeWindowContentBox">
<property name="can_focus">False</property>
@@ -197,7 +200,7 @@
<property name="startup_id">filler</property>
<property name="mnemonics_visible">False</property>
<property name="focus_visible">False</property>
- <property name="window_name"></property>
+ <property name="window_name"/>
<child internal-child="main_box">
<object class="GtkBox" id="AnacondaStandaloneWindow-main_box1">
<property name="can_focus">False</property>
@@ -218,14 +221,20 @@
<child internal-child="alignment">
<object class="GtkAlignment" id="AnacondaStandaloneWindow-alignment1">
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="bottom_padding">48</property>
+ <property name="left_padding">24</property>
+ <property name="right_padding">24</property>
<child internal-child="action_area">
<object class="GtkBox" id="welcomeWindowContentBox">
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">5</property>
<child>
<object class="GtkLabel" id="welcomeLabel">
<property name="visible">True</property>
@@ -233,7 +242,7 @@
<property name="ypad">6</property>
<property name="label" translatable="yes">WELCOME TO %s %s.</property>
<attributes>
- <attribute name="font-desc" value="Sans 26"/>
+ <attribute name="font-desc" value="Cantarell Bold 16"/>
</attributes>
</object>
<packing>
@@ -244,18 +253,18 @@
</child>
<child>
<object class="GtkLabel" id="pickLanguageLabel">
- <property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
+ <property name="valign">start</property>
+ <property name="ypad">6</property>
<property name="label" translatable="yes">What language would you like to use during the installation process?</property>
<attributes>
- <attribute name="font-desc" value="Sans 14"/>
+ <attribute name="font-desc" value="Cantarell 12"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -263,18 +272,21 @@
<object class="GtkAlignment" id="languageAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
+ <property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="yalign">0</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="languageWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
@@ -282,8 +294,11 @@
<object class="GtkTreeView" id="languageView">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="model">languageStoreFilter</property>
<property name="headers_visible">False</property>
+ <property name="enable_search">False</property>
<property name="search_column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="languageViewSelection">
@@ -302,7 +317,6 @@
</object>
<attributes>
<attribute name="markup">0</attribute>
- <attribute name="text">0</attribute>
</attributes>
</child>
</object>
@@ -328,7 +342,7 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@@ -337,6 +351,8 @@
<object class="GtkEntry" id="languageEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">start</property>
+ <property name="margin_top">6</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
<property name="secondary_icon_name">edit-clear-symbolic</property>
@@ -353,7 +369,7 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
diff --git a/widgets/src/BaseWindow.c b/widgets/src/BaseWindow.c
index dd7d41fa6..bc096c3a3 100644
--- a/widgets/src/BaseWindow.c
+++ b/widgets/src/BaseWindow.c
@@ -219,7 +219,7 @@ static void anaconda_base_window_init(AnacondaBaseWindow *win) {
* to control the amount of space the Window's content takes up on the
* screen.
*/
- win->priv->alignment = gtk_alignment_new(0.5, 0.0, 0.0, 0.5);
+ win->priv->alignment = gtk_alignment_new(0.5, 0.0, 1.0, 1.0);
gtk_box_pack_start(GTK_BOX(win->priv->main_box), win->priv->alignment, TRUE, TRUE, 0);
/* The action_area goes inside the alignment and represents the main