--- pyanaconda/ui/gui/spokes/storage.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade index 6cd96f7..5d12c84 100644 --- a/pyanaconda/ui/gui/spokes/storage.glade +++ b/pyanaconda/ui/gui/spokes/storage.glade @@ -130,7 +130,7 @@ <property name="can_focus">False</property> <property name="active">2</property> <items> - <item translatable="yes">Plain</item> + <item translatable="yes">Standard Partition</item> <item translatable="yes">BTRFS</item> <item translatable="yes">LVM</item> </items> @@ -462,7 +462,7 @@ <property name="can_focus">False</property> <property name="active">2</property> <items> - <item translatable="yes">Plain</item> + <item translatable="yes">Standard Partition</item> <item translatable="yes">BTRFS</item> <item translatable="yes">LVM</item> </items>
--- pyanaconda/ui/gui/spokes/custom.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 74cf4eb..53d0fde 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -688,10 +688,10 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <items> - <item translatable="yes">LVM</item> - <item translatable="yes">RAID</item> <item translatable="yes">Standard Partition</item> <item translatable="yes">BTRFS</item> + <item translatable="yes">LVM</item> + <item translatable="yes">RAID</item> </items> <signal name="changed" handler="on_device_type_changed" swapped="no"/> </object>
--- pyanaconda/ui/gui/spokes/storage.py | 3 --- 1 file changed, 3 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index a468b7d..95ac1b7 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -503,9 +503,6 @@ class StorageSpoke(NormalSpoke, StorageChecker): self.local_disks_box = self.builder.get_object("local_disks_box") #specialized_disks_box = self.builder.get_object("specialized_disks_box")
- viewport = self.builder.get_object("localViewport") - setViewportBackground(viewport) - threadMgr.add(AnacondaThread(name="AnaStorageWatcher", target=self._initialize))
def _initialize(self):
--- pyanaconda/ui/gui/spokes/custom.py | 1 - 1 file changed, 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 5bbc50a..2612f03 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -558,7 +558,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): self._grabObjects() setViewportBackground(self.builder.get_object("availableSpaceViewport"), "#db3279") setViewportBackground(self.builder.get_object("totalSpaceViewport"), "#60605b") - setViewportBackground(self._partitionsViewport)
# Set the background of the options notebook to slightly darker than # everything else, and give it a border.
--- pyanaconda/ui/gui/spokes/storage.glade | 81 ++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 18 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade index 5d12c84..45d39c2 100644 --- a/pyanaconda/ui/gui/spokes/storage.glade +++ b/pyanaconda/ui/gui/spokes/storage.glade @@ -27,7 +27,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="halign">center</property> + <property name="halign">start</property> <property name="border_width">6</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_cancel_clicked" swapped="no"/> @@ -45,7 +45,7 @@ <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="receives_default">True</property> - <property name="halign">center</property> + <property name="halign">end</property> <property name="border_width">6</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_continue_clicked" swapped="no"/> @@ -78,6 +78,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">INSTALLATION OPTIONS</property> <attributes> + <attribute name="font-desc" value="Cantarell Bold 10"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -93,7 +94,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Here we'll describe what your options are.</property> - <property name="use_markup">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -149,6 +152,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Partition scheme configuration</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> </child> </object> @@ -161,11 +167,9 @@ <child> <object class="GtkCheckButton" id="options1_custom_check"> <property name="label" translatable="yes">Let me customize the _partitioning of the disks instead.</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> @@ -217,7 +221,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="halign">center</property> + <property name="halign">start</property> <property name="border_width">6</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_cancel_clicked" swapped="no"/> @@ -254,7 +258,7 @@ <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="receives_default">True</property> - <property name="halign">center</property> + <property name="halign">end</property> <property name="border_width">6</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_reclaim_clicked" swapped="no"/> @@ -287,6 +291,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">INSTALLATION OPTIONS</property> <attributes> + <attribute name="font-desc" value="Cantarell Bold 10"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -302,7 +307,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Here we'll describe how much space is needed for the current software selection.</property> - <property name="use_markup">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -316,7 +323,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Here we'll describe what your options are.</property> - <property name="use_markup">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -340,6 +349,7 @@ <property name="xalign">1</property> <property name="label" translatable="yes">disk free</property> <attributes> + <attribute name="font-desc" value="Cantarell Bold 11"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -356,6 +366,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Free space available for use.</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="left_attach">1</property> @@ -371,6 +384,7 @@ <property name="xalign">1</property> <property name="label" translatable="yes">fs free</property> <attributes> + <attribute name="font-desc" value="Cantarell Bold 11"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -387,6 +401,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Free space unavailable but reclaimable from existing partitions.</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="left_attach">1</property> @@ -402,6 +419,7 @@ <property name="xalign">1</property> <property name="label" translatable="yes">disks size</property> <attributes> + <attribute name="font-desc" value="Cantarell Bold 11"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -418,6 +436,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Space in selected disks reclaimable by deleting existing partitions.</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="left_attach">1</property> @@ -481,6 +502,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Partition scheme configuration</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> </child> </object> @@ -493,11 +517,9 @@ <child> <object class="GtkCheckButton" id="options2_custom_check"> <property name="label" translatable="yes">I don't need help; let me customize disk _partitioning.</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> @@ -550,7 +572,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="halign">center</property> + <property name="halign">start</property> <property name="border_width">6</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_quit_clicked" swapped="no"/> @@ -567,10 +589,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Please wait... software metadata still loading.</property> <property name="halign">center</property> <property name="border_width">6</property> <property name="use_underline">True</property> - <property name="tooltip_text" translatable="yes">Please wait... software metadata still loading.</property> <signal name="clicked" handler="on_modify_sw_clicked" swapped="no"/> </object> <packing> @@ -587,7 +609,7 @@ <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="receives_default">True</property> - <property name="halign">center</property> + <property name="halign">end</property> <property name="border_width">6</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_cancel_clicked" swapped="no"/> @@ -636,7 +658,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Here we'll describe how much space is needed for the current software selection.</property> - <property name="use_markup">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -676,6 +700,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Free space available for use.</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="left_attach">1</property> @@ -691,6 +718,7 @@ <property name="xalign">1</property> <property name="label" translatable="yes">fs free</property> <attributes> + <attribute name="font-desc" value="Cantarell 11"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -707,6 +735,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Free space unavailable but reclaimable from existing partitions.</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="left_attach">1</property> @@ -722,6 +753,7 @@ <property name="xalign">1</property> <property name="label" translatable="yes">disks size</property> <attributes> + <attribute name="font-desc" value="Cantarell Bold 11"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -738,6 +770,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Space in selected disks reclaimable by deleting existing partitions.</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="left_attach">1</property> @@ -759,7 +794,9 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Here we'll describe what your options are.</property> - <property name="use_markup">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -814,9 +851,12 @@ <child internal-child="alignment"> <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1"> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xscale">0.89999997615814209</property> + <property name="xscale">1</property> <property name="yscale">0.5</property> + <property name="left_padding">24</property> + <property name="right_padding">24</property> <child internal-child="action_area"> <object class="GtkBox" id="storageWindow-action_area1"> <property name="can_focus">False</property> @@ -830,6 +870,7 @@ <property name="label" translatable="yes">LOCAL STANDARD DISKS</property> <property name="track_visited_links">False</property> <attributes> + <attribute name="font-desc" value="Cantarell Bold 10"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -854,7 +895,8 @@ <object class="GtkBox" id="local_disks_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="margin_left">6</property> + <property name="margin_right">6</property> <property name="spacing">30</property> <child> <placeholder/> @@ -935,6 +977,9 @@ <property name="halign">start</property> <property name="margin_left">6</property> <property name="label" translatable="yes">summary</property> + <attributes> + <attribute name="font-desc" value="Cantarell 10"/> + </attributes> </object> <packing> <property name="left_attach">0</property>
--- pyanaconda/ui/gui/spokes/welcome.glade | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/welcome.glade b/pyanaconda/ui/gui/spokes/welcome.glade index 1f91487..b9761b9 100644 --- a/pyanaconda/ui/gui/spokes/welcome.glade +++ b/pyanaconda/ui/gui/spokes/welcome.glade @@ -253,6 +253,7 @@ </child> <child> <object class="GtkLabel" id="pickLanguageLabel"> + <property name="height_request">45</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> @@ -313,7 +314,7 @@ <property name="sort_column_id">0</property> <child> <object class="GtkCellRendererText" id="nativeNameRenderer"> - <property name="font">Sans 14</property> + <property name="font">Cantarell 12</property> </object> <attributes> <attribute name="markup">0</attribute> @@ -329,7 +330,7 @@ <property name="sort_column_id">1</property> <child> <object class="GtkCellRendererText" id="englishNameRenderer"> - <property name="font">Sans Italic 14</property> + <property name="font">Cantarell Italic 14</property> <property name="foreground">gray</property> </object> <attributes> @@ -359,6 +360,7 @@ <signal name="changed" handler="on_entry_changed" swapped="no"/> <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> </object> + <packing> <property name="expand">False</property> <property name="fill">True</property>
- Convert the button bar to a GtkToolbar with appropriate styling. - Font changes. - Size and alignment changes to make the accordion larger. --- pyanaconda/ui/gui/spokes/custom.glade | 221 ++++++++++++++++------------------ 1 file changed, 102 insertions(+), 119 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 53d0fde..eee70c9 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -11,6 +11,7 @@ <object class="GtkEntryCompletion" id="mountPointCompletion"> <property name="model">mountPointStore</property> </object> + <object class="GtkAction" id="action1"/> <object class="GtkDialog" id="addDialog"> <property name="can_focus">False</property> <property name="border_width">5</property> @@ -29,12 +30,10 @@ <child> <object class="GtkButton" id="addCancelButton"> <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="halign">end</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -46,12 +45,10 @@ <child> <object class="GtkButton" id="addConfirmButton"> <property name="label" translatable="yes">_Add mount point</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_add_confirm_clicked" swapped="no"/> </object> @@ -130,6 +127,10 @@ <property name="margin_bottom">12</property> <property name="label" translatable="yes">More customization options are available after creating the mount point below.</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + <attribute name="scale" value="1"/> + </attributes> </object> <packing> <property name="left_attach">0</property> @@ -178,7 +179,8 @@ after creating the mount point below.</property> <property name="label" translatable="yes">That mount point is already in use. Try something else?</property> <attributes> - <attribute name="scale" value="0.80000000000000004"/> + <attribute name="font-desc" value="Cantarell 10"/> + <attribute name="scale" value="1"/> <attribute name="foreground" value="#ffff00000000"/> </attributes> </object> @@ -227,11 +229,6 @@ use. Try something else?</property> <action-widget response="1">addConfirmButton</action-widget> </action-widgets> </object> - <object class="GtkImage" id="addImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - </object> <object class="GtkDialog" id="confirmDeleteDialog"> <property name="can_focus">False</property> <property name="border_width">5</property> @@ -250,6 +247,9 @@ use. Try something else?</property> <property name="yalign">0</property> <property name="label" translatable="yes">Are you sure you want to delete all of the data on %s?</property> <property name="wrap">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="expand">True</property> @@ -295,11 +295,9 @@ use. Try something else?</property> <child> <object class="GtkButton" id="deleteConfirmButton"> <property name="label" translatable="yes">_Delete It</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_delete_confirm_clicked" swapped="no"/> </object> @@ -353,91 +351,37 @@ use. Try something else?</property> <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.89999997615814209</property> - <property name="yscale">0.5</property> + <property name="left_padding">24</property> + <property name="right_padding">24</property> <child internal-child="action_area"> <object class="GtkBox" id="customStorageWindow-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> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkButtonBox" id="buttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="addButton"> - <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="image">addImage</property> - <signal name="clicked" handler="on_add_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="removeButton"> - <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="image">removeImage</property> - <signal name="clicked" handler="on_remove_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="configureButton"> - <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="image">settingsImage</property> - <signal name="clicked" handler="on_configure_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="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="column_spacing">24</property> <child> <object class="GtkScrolledWindow" id="partitionsScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="shadow_type">in</property> <child> <object class="GtkViewport" id="partitionsViewport"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> <placeholder/> </child> @@ -719,12 +663,10 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="encryptCheckbox"> <property name="label" translatable="yes">_Encrypt</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="halign">start</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> @@ -754,11 +696,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="lvmRedundancyCheckbox"> <property name="label" translatable="yes">Redundancy (mirror)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -800,11 +740,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="lvmPerformanceCheckbox"> <property name="label" translatable="yes">Optimized performance (stripe)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -855,11 +793,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="raidRedundancyCheckbox"> <property name="label" translatable="yes">Redundancy (mirror)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -901,11 +837,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="raidPerformanceCheckbox"> <property name="label" translatable="yes">Optimized performance (stripe)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -946,11 +880,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="raidErrorCheckbox"> <property name="label" translatable="yes">Error detection (parity)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -992,11 +924,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="raidDistErrorCheckbox"> <property name="label" translatable="yes">Distributed</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1025,12 +955,10 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="raidRedundantErrorCheckbox"> <property name="label" translatable="yes">Redundant</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">6</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1106,11 +1034,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="btrfsRedundancyCheckbox"> <property name="label" translatable="yes">Redundancy (mirror)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1152,11 +1078,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkCheckButton" id="btrfsPerformanceCheckbox"> <property name="label" translatable="yes">Optimized performance (stripe)</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1254,11 +1178,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkButton" id="applyButton"> <property name="label" translatable="yes">_Apply Changes</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_apply_clicked" swapped="no"/> </object> @@ -1302,6 +1224,7 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Selected Device</property> <attributes> + <attribute name="font-desc" value="Cantarell Bold 10"/> <attribute name="weight" value="bold"/> <attribute name="scale" value="1.2"/> </attributes> @@ -1319,6 +1242,7 @@ you'll be able to view their details here.</property> <property name="halign">end</property> <property name="label" translatable="yes">Device description</property> <attributes> + <attribute name="font-desc" value="Cantarell Italic 10"/> <attribute name="style" value="italic"/> </attributes> </object> @@ -1352,6 +1276,9 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <property name="label" translatable="yes">This device is encrypted and cannot be read without a valid passphrase. You may unlock it below.</property> <property name="wrap">True</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -1369,6 +1296,9 @@ you'll be able to view their details here.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Passphrase:</property> + <attributes> + <attribute name="font-desc" value="Cantarell 11"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -1380,8 +1310,8 @@ you'll be able to view their details here.</property> <object class="GtkEntry" id="passphraseEntry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> <property name="visibility">False</property> + <property name="invisible_char">●</property> </object> <packing> <property name="expand">False</property> @@ -1392,11 +1322,9 @@ you'll be able to view their details here.</property> <child> <object class="GtkButton" id="unlockButton"> <property name="label" translatable="yes">_Unlock</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_unlock_clicked" swapped="no"/> </object> @@ -1429,9 +1357,78 @@ you'll be able to view their details here.</property> <property name="height">2</property> </packing> </child> + <child> + <object class="GtkToolbar" id="toolbar1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <style> + <class name="inline-toolbar"/> + </style> + <child> + <object class="GtkToolButton" id="addButton"> + <property name="use_action_appearance">False</property> + <property name="related_action">action1</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Add a new mountpoint.</property> + <property name="label" translatable="yes">addButton</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="on_add_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="removeButton"> + <property name="use_action_appearance">False</property> + <property name="related_action">action1</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Remove the selected mountpoint(s.)</property> + <property name="label" translatable="yes">removeButton</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="on_remove_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="configureButton"> + <property name="use_action_appearance">False</property> + <property name="related_action">action1</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Configure selected mountpoint.</property> + <property name="label" translatable="yes">configureButton</property> + <property name="use_underline">True</property> + <property name="icon_name">preferences-system-symbolic</property> + <signal name="clicked" handler="on_configure_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -1449,8 +1446,8 @@ you'll be able to view their details here.</property> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="margin_left">24</property> + <property name="margin_right">24</property> <property name="margin_bottom">6</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> @@ -1562,14 +1559,12 @@ you'll be able to view their details here.</property> <child> <object class="GtkButton" id="finishPartitionsButton"> <property name="label" translatable="yes">_FINISH PARTITIONING</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="valign">start</property> <property name="hexpand">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_finish_clicked" swapped="no"/> </object> @@ -1583,12 +1578,10 @@ you'll be able to view their details here.</property> <child> <object class="GtkButton" id="summary_button"> <property name="label" translatable="yes">summary</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">start</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> @@ -1816,16 +1809,6 @@ you'll be able to view their details here.</property> <action-widget response="1">select_button</action-widget> </action-widgets> </object> - <object class="GtkImage" id="removeImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - </object> - <object class="GtkImage" id="settingsImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">system-run-symbolic</property> - </object> <object class="GtkAdjustment" id="sizeAdjustment"> <property name="upper">100</property> <property name="step_increment">1</property>
--- pyanaconda/ui/gui/spokes/custom.glade | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index eee70c9..645e919 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -485,6 +485,7 @@ you'll be able to view their details here.</property> <object class="GtkLabel" id="mountPointLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes"><b>Mount Point:</b></property> <property name="use_markup">True</property> </object> @@ -514,6 +515,7 @@ you'll be able to view their details here.</property> <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes"><b>Label:</b></property> <property name="use_markup">True</property> </object> @@ -529,6 +531,7 @@ you'll be able to view their details here.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> + <property name="xalign">0</property> <property name="label" translatable="yes"><b>Desired Capacity (MB):</b></property> <property name="use_markup">True</property> </object> @@ -593,7 +596,7 @@ you'll be able to view their details here.</property> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> + <property name="margin_left">30</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child>
This is to match the same level of indent as is being applied to the customize expander in custom partitioning. --- pyanaconda/ui/gui/spokes/storage.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade index 45d39c2..e59beaf 100644 --- a/pyanaconda/ui/gui/spokes/storage.glade +++ b/pyanaconda/ui/gui/spokes/storage.glade @@ -112,7 +112,7 @@ <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> + <property name="margin_left">30</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label3"> @@ -462,7 +462,7 @@ <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> + <property name="margin_left">30</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label4">
Right now it gets lost floating around in all the free space in the bottom right side of the screen, or even worse gets confused with the Finish Partitioning button. This moves it to the left and up right under the customize expander where it will hopefully be easier to find. --- pyanaconda/ui/gui/spokes/custom.glade | 37 ++++++++++------------------------- 1 file changed, 10 insertions(+), 27 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 645e919..c9b77b6 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -1168,37 +1168,20 @@ you'll be able to view their details here.</property> </packing> </child> <child> - <object class="GtkBox" id="box10"> + <object class="GtkButton" id="applyButton"> + <property name="label" translatable="yes">_Apply Changes</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkButton" id="applyButton"> - <property name="label" translatable="yes">_Apply Changes</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_apply_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <property name="margin_top">18</property> + <signal name="clicked" handler="on_apply_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> <property name="position">4</property> </packing> </child>
Ack. All that XML...
anaconda-patches@lists.fedorahosted.org