--- pyanaconda/ui/gui/spokes/custom.glade | 81 +++++++++++++++++++-------- pyanaconda/ui/gui/spokes/custom.py | 4 +- pyanaconda/ui/gui/spokes/datetime_spoke.glade | 20 ++++--- pyanaconda/ui/gui/spokes/keyboard.glade | 5 +- pyanaconda/ui/gui/spokes/lib/accordion.py | 3 +- pyanaconda/ui/gui/spokes/lib/cart.glade | 1 + pyanaconda/ui/gui/spokes/lib/cart.py | 4 +- pyanaconda/ui/gui/spokes/lib/passphrase.glade | 13 ++++- pyanaconda/ui/gui/spokes/lib/resize.glade | 12 +++- pyanaconda/ui/gui/spokes/network.glade | 43 +------------- pyanaconda/ui/gui/spokes/password.glade | 9 ++- pyanaconda/ui/gui/spokes/source.glade | 35 +++++++----- pyanaconda/ui/gui/spokes/storage.glade | 12 ++-- 13 files changed, 139 insertions(+), 103 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 59eb541..72d06ca 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -137,8 +137,10 @@ <property name="can_focus">False</property> <property name="margin_top">6</property> <property name="xalign">1</property> - <property name="label" translatable="yes"><b>Desired Capacity:</b></property> + <property name="label" translatable="yes"><b>_Desired Capacity:</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sizeEntry</property> </object> <packing> <property name="left_attach">0</property> @@ -152,8 +154,10 @@ <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="label" translatable="yes"><b>M_ount Point:</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">addMountPointEntry</property> </object> <packing> <property name="left_attach">0</property> @@ -320,10 +324,11 @@ use. Try something else?</property> </child> <child> <object class="GtkCheckButton" id="removeAllCheckbox"> - <property name="label" translatable="yes">Delete all other filesystems in the %s root as well.</property> + <property name="label" translatable="yes">Delete _all other filesystems in the %s root as well.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -556,8 +561,10 @@ you'll be able to view their details here.</property> <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="label" translatable="yes"><b>M_ount Point:</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mountPointEntry</property> </object> <packing> <property name="left_attach">0</property> @@ -586,8 +593,10 @@ you'll be able to view their details here.</property> <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="label" translatable="yes"><b>_Label:</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">labelEntry</property> </object> <packing> <property name="left_attach">0</property> @@ -602,8 +611,10 @@ you'll be able to view their details here.</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="label" translatable="yes"><b>_Desired Capacity (MB):</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sizeSpinner</property> </object> <packing> <property name="left_attach">2</property> @@ -649,7 +660,9 @@ you'll be able to view their details here.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Name:</property> + <property name="label" translatable="yes">_Name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nameEntry</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -710,8 +723,10 @@ you'll be able to view their details here.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Device Type:</b></property> + <property name="label" translatable="yes"><b>Device _Type:</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">deviceTypeCombo</property> </object> <packing> <property name="left_attach">0</property> @@ -725,8 +740,10 @@ you'll be able to view their details here.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>File System:</b></property> + <property name="label" translatable="yes"><b>File _System:</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fileSystemTypeCombo</property> </object> <packing> <property name="left_attach">0</property> @@ -804,10 +821,11 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="lvmRedundancyCheckbox"> - <property name="label" translatable="yes">Redundancy (mirror)</property> + <property name="label" translatable="yes">Redundancy (_mirror)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -848,10 +866,11 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="lvmPerformanceCheckbox"> - <property name="label" translatable="yes">Optimized performance (stripe)</property> + <property name="label" translatable="yes">Optimi_zed performance (stripe)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -901,10 +920,11 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="raidRedundancyCheckbox"> - <property name="label" translatable="yes">Redundancy (mirror)</property> + <property name="label" translatable="yes">Redundancy (_mirror)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -945,10 +965,11 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="raidPerformanceCheckbox"> - <property name="label" translatable="yes">Optimized performance (stripe)</property> + <property name="label" translatable="yes">Optimi_zed performance (stripe)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -988,10 +1009,11 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="raidErrorCheckbox"> - <property name="label" translatable="yes">Error detection (parity)</property> + <property name="label" translatable="yes">Error detection (_parity)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1032,10 +1054,11 @@ you'll be able to view their details here.</property> <property name="margin_left">12</property> <child> <object class="GtkCheckButton" id="raidDistErrorCheckbox"> - <property name="label" translatable="yes">Distributed</property> + <property name="label" translatable="yes">D_istributed</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1063,11 +1086,12 @@ you'll be able to view their details here.</property> </child> <child> <object class="GtkCheckButton" id="raidRedundantErrorCheckbox"> - <property name="label" translatable="yes">Redundant</property> + <property name="label" translatable="yes">Red_undant</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_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1142,10 +1166,11 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="btrfsRedundancyCheckbox"> - <property name="label" translatable="yes">Redundancy (mirror)</property> + <property name="label" translatable="yes">Redundancy (_mirror)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1186,10 +1211,11 @@ you'll be able to view their details here.</property> <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="btrfsPerformanceCheckbox"> - <property name="label" translatable="yes">Optimized performance (stripe)</property> + <property name="label" translatable="yes">Optimi_zed performance (stripe)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_raid_feature_toggled" swapped="no"/> @@ -1241,10 +1267,11 @@ you'll be able to view their details here.</property> </child> <child> <object class="GtkCheckButton" id="reformatCheckbox"> - <property name="label" translatable="yes">Reformat</property> + <property name="label" translatable="yes">_Reformat</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_reformat_toggled" swapped="no"/> @@ -1260,7 +1287,9 @@ you'll be able to view their details here.</property> <object class="GtkLabel" id="volumeGroupLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Volume Group:</property> + <property name="label" translatable="yes">_Volume Group:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">volumeGroupCombo</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1289,10 +1318,11 @@ you'll be able to view their details here.</property> </child> <child> <object class="GtkButton" id="modifyVGButton"> - <property name="label" translatable="yes">Modify ...</property> + <property name="label" translatable="yes">Modif_y...</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_modify_vg_clicked" swapped="no"/> </object> <packing> @@ -1433,7 +1463,8 @@ you'll be able to view their details here.</property> <object class="GtkLabel" id="passphraseLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Passphrase:</property> + <property name="label" translatable="yes">_Passphrase:</property> + <property name="use_underline">True</property> <attributes> <attribute name="font-desc" value="Cantarell 11"/> </attributes> @@ -1450,6 +1481,7 @@ you'll be able to view their details here.</property> <property name="can_focus">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <accelerator key="p" signal="grab-focus" modifiers="GDK_MOD1_MASK"/> </object> <packing> <property name="expand">False</property> @@ -2034,7 +2066,9 @@ you'll be able to view their details here.</property> <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Name:</property> + <property name="label" translatable="yes">_Name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">vg_name_entry</property> </object> <packing> <property name="expand">False</property> @@ -2047,6 +2081,7 @@ you'll be able to view their details here.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> + <accelerator key="n" signal="grab-focus" modifiers="GDK_MOD1_MASK"/> </object> <packing> <property name="expand">False</property> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 95a4398..e7b47e5 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -633,8 +633,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
summaryLabel = self._summaryButton.get_children()[0] count = len(self.data.clearpart.drives) - summary = P_("%d storage device selected", - "%d storage devices selected", + summary = P_("%d _storage device selected", + "%d _storage devices selected", count) % count
summaryLabel.set_use_markup(True) diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade index d302645..d2b9825 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.glade +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade @@ -84,7 +84,9 @@ <object class="GtkLabel" id="regionLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Region:</property> + <property name="label" translatable="yes">_Region:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">regionCombobox</property> </object> <packing> <property name="expand">False</property> @@ -117,7 +119,9 @@ <object class="GtkLabel" id="cityLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">City:</property> + <property name="label" translatable="yes">_City:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">cityCombobox</property> </object> <packing> <property name="expand">False</property> @@ -161,7 +165,9 @@ <object class="GtkLabel" id="networkTimeLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Network Time</property> + <property name="label" translatable="yes">_Network Time</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">networkTimeSwitch</property> </object> <packing> <property name="expand">False</property> @@ -458,11 +464,11 @@ <property name="orientation">vertical</property> <child> <object class="GtkRadioButton" id="timeFormatRB"> - <property name="label" translatable="yes">24-hour</property> + <property name="label" translatable="yes">24-_hour</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="active">True</property> <property name="draw_indicator">True</property> @@ -476,11 +482,11 @@ </child> <child> <object class="GtkRadioButton" id="timeFormatRB2"> - <property name="label" translatable="yes">AM/PM</property> + <property name="label" translatable="yes">_AM/PM</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> <property name="group">timeFormatRB</property> diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade index 0eb063c..d48c1c9 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.glade +++ b/pyanaconda/ui/gui/spokes/keyboard.glade @@ -187,6 +187,7 @@ <property name="orientation">vertical</property> <child internal-child="nav_box"> <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1"> + <property name="can_focus">False</property> <child internal-child="nav_area"> <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1"> <property name="can_focus">False</property> @@ -450,7 +451,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Test the layout configuration below:</property> + <property name="label" translatable="yes">_Test the layout configuration below:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">layoutTextView</property> <attributes> <attribute name="font-desc" value="Cantarell 10"/> </attributes> diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py index af10a1e..2b1f217 100644 --- a/pyanaconda/ui/gui/spokes/lib/accordion.py +++ b/pyanaconda/ui/gui/spokes/lib/accordion.py @@ -237,9 +237,10 @@ class CreateNewPage(Page): label.set_line_wrap(True) self._createBox.add(label)
- self._createNewButton = Gtk.LinkButton("", label=_("Click here to create them automatically.")) + self._createNewButton = Gtk.LinkButton("", label=_("_Click here to create them automatically.")) label = self._createNewButton.get_children()[0] label.set_line_wrap(True) + label.set_use_underline(True)
self._createNewButton.set_has_tooltip(False) self._createNewButton.set_halign(Gtk.Align.START) diff --git a/pyanaconda/ui/gui/spokes/lib/cart.glade b/pyanaconda/ui/gui/spokes/lib/cart.glade index a51d1b2..0743a9f 100644 --- a/pyanaconda/ui/gui/spokes/lib/cart.glade +++ b/pyanaconda/ui/gui/spokes/lib/cart.glade @@ -234,6 +234,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">Disk summary goes here</property> <property name="use_markup">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py index ea3cac2..76d3649 100644 --- a/pyanaconda/ui/gui/spokes/lib/cart.py +++ b/pyanaconda/ui/gui/spokes/lib/cart.py @@ -135,9 +135,9 @@ class SelectedDisksDialog(GUIObject): size = str(Size(bytes=long(size))).upper() free = str(Size(bytes=long(free))).upper()
- text = P_("<b>%d disk; %s capacity; %s free space</b> " + text = P_("<b>%d d_isk; %s capacity; %s free space</b> " "(unpartitioned and in filesystems)", - "<b>%d disks; %s capacity; %s free space</b> " + "<b>%d d_isks; %s capacity; %s free space</b> " "(unpartitioned and in filesystems)", count) % (count, size, free) self._summary_label.set_markup(text) diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.glade b/pyanaconda/ui/gui/spokes/lib/passphrase.glade index ca912f5..cb08899 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.glade +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.glade @@ -49,10 +49,11 @@ </child> <child> <object class="GtkButton" id="passphrase_save_button"> - <property name="label" translatable="yes">Save Passphrase</property> + <property name="label" translatable="yes">_Save Passphrase</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_save_clicked" swapped="no"/> </object> <packing> @@ -94,7 +95,10 @@ <object class="GtkLabel" id="passphrase_entry_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Passphrase:</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Passphrase:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">passphrase_entry</property> </object> <packing> <property name="left_attach">0</property> @@ -124,7 +128,10 @@ <object class="GtkLabel" id="confirm_entry_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Confirm:</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Confirm:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">confirm_entry</property> </object> <packing> <property name="left_attach">0</property> diff --git a/pyanaconda/ui/gui/spokes/lib/resize.glade b/pyanaconda/ui/gui/spokes/lib/resize.glade index c7074ba..05f5ad3 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.glade +++ b/pyanaconda/ui/gui/spokes/lib/resize.glade @@ -209,7 +209,9 @@ <object class="GtkToolButton" id="preserveButton"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Preserve</property> + <property name="label" translatable="yes">_Preserve</property> + <property name="use_underline">True</property> + <accelerator key="p" signal="clicked" modifiers="GDK_MOD1_MASK"/> <signal name="clicked" handler="on_preserve_clicked" swapped="no"/> </object> <packing> @@ -221,7 +223,9 @@ <object class="GtkToolButton" id="shrinkButton"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Shrink</property> + <property name="label" translatable="yes">_Shrink</property> + <property name="use_underline">True</property> + <accelerator key="s" signal="clicked" modifiers="GDK_MOD1_MASK"/> <signal name="clicked" handler="on_shrink_clicked" swapped="no"/> </object> <packing> @@ -233,7 +237,9 @@ <object class="GtkToolButton" id="deleteButton"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Delete</property> + <property name="label" translatable="yes">_Delete</property> + <property name="use_underline">True</property> + <accelerator key="d" signal="clicked" modifiers="GDK_MOD1_MASK"/> <signal name="clicked" handler="on_delete_clicked" swapped="no"/> </object> <packing> diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade index 5fc0613..4d8042f 100644 --- a/pyanaconda/ui/gui/spokes/network.glade +++ b/pyanaconda/ui/gui/spokes/network.glade @@ -575,27 +575,6 @@ updates available for you.</property> <child> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -1083,24 +1062,6 @@ updates available for you.</property> <property name="height">1</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -2200,11 +2161,11 @@ updates available for you.</property> <property name="can_focus">False</property> <child> <object class="GtkButton" id="button_unlock"> - <property name="label" translatable="yes">Unlock</property> + <property name="label" translatable="yes">Unloc_k</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> <property name="expand">False</property> diff --git a/pyanaconda/ui/gui/spokes/password.glade b/pyanaconda/ui/gui/spokes/password.glade index 043f0ad..75ac957 100644 --- a/pyanaconda/ui/gui/spokes/password.glade +++ b/pyanaconda/ui/gui/spokes/password.glade @@ -15,6 +15,7 @@ <property name="spacing">6</property> <child internal-child="nav_box"> <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1"> + <property name="can_focus">False</property> <child internal-child="nav_area"> <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1"> <property name="can_focus">False</property> @@ -49,8 +50,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Root Password:</property> + <property name="label" translatable="yes">_Root Password:</property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">pw</property> </object> <packing> <property name="left_attach">0</property> @@ -64,8 +67,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Confirm:</property> + <property name="label" translatable="yes">_Confirm:</property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">confirm</property> </object> <packing> <property name="left_attach">0</property> diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade index 07fc23d..78cc901 100644 --- a/pyanaconda/ui/gui/spokes/source.glade +++ b/pyanaconda/ui/gui/spokes/source.glade @@ -186,7 +186,8 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Fedora People Repositories</property> + <property name="label" translatable="yes">_Fedora People Repositories</property> + <property name="use_underline">True</property> </object> </child> </object> @@ -303,7 +304,8 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Standard YUM repository:</property> + <property name="label" translatable="yes">_Standard YUM repository:</property> + <property name="use_underline">True</property> </object> </child> </object> @@ -665,8 +667,10 @@ TeXlive 2012 repository</col> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Proxy URL</b></property> + <property name="label" translatable="yes"><b>_Proxy URL</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxyURLEntry</property> </object> <packing> <property name="left_attach">0</property> @@ -740,8 +744,10 @@ TeXlive 2012 repository</col> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Username</b></property> + <property name="label" translatable="yes"><b>User_name</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxyUsernameEntry</property> </object> <packing> <property name="left_attach">0</property> @@ -755,8 +761,10 @@ TeXlive 2012 repository</col> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Password</b></property> + <property name="label" translatable="yes"><b>Pass_word</b></property> <property name="use_markup">True</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxyPasswordEntry</property> </object> <packing> <property name="left_attach">0</property> @@ -832,6 +840,7 @@ TeXlive 2012 repository</col> <property name="orientation">vertical</property> <child internal-child="nav_box"> <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1"> + <property name="can_focus">False</property> <child internal-child="nav_area"> <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1"> <property name="can_focus">False</property> @@ -985,7 +994,9 @@ TeXlive 2012 repository</col> <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Device:</property> + <property name="label" translatable="yes">D_evice:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">isoPartitionCombo</property> </object> <packing> <property name="expand">False</property> @@ -1083,12 +1094,6 @@ TeXlive 2012 repository</col> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <object class="GtkComboBoxText" id="protocolComboBox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1179,7 +1184,9 @@ TeXlive 2012 repository</col> <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">NFS mount options:</property> + <property name="label" translatable="yes">NFS mount _options:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nfsOptsEntry</property> </object> <packing> <property name="expand">False</property> @@ -1237,7 +1244,7 @@ TeXlive 2012 repository</col> </child> <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="label" translatable="yes">Don't install the latest available software _updates. Install the default versions provided by the install source above.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade index 27f5e61..43e2791 100644 --- a/pyanaconda/ui/gui/spokes/storage.glade +++ b/pyanaconda/ui/gui/spokes/storage.glade @@ -152,7 +152,8 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Partition scheme configuration</property> + <property name="label" translatable="yes">Partition _scheme configuration</property> + <property name="use_underline">True</property> <attributes> <attribute name="font-desc" value="Cantarell 11"/> </attributes> @@ -507,7 +508,8 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Partition scheme configuration</property> + <property name="label" translatable="yes">Partition _scheme configuration</property> + <property name="use_underline">True</property> <attributes> <attribute name="font-desc" value="Cantarell 11"/> </attributes> @@ -853,6 +855,7 @@ <property name="spacing">6</property> <child internal-child="nav_box"> <object class="GtkEventBox" id="AnacondaSpokeWindow-nav_box1"> + <property name="can_focus">False</property> <child internal-child="nav_area"> <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1"> <property name="can_focus">False</property> @@ -969,7 +972,7 @@ </child> <child> <object class="GtkButton" id="summary_button"> - <property name="label" translatable="yes">Full disk summary and options...</property> + <property name="label" translatable="yes">_Full disk summary and options...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1008,13 +1011,14 @@ </child> <child> <object class="GtkCheckButton" id="encryption_checkbutton"> - <property name="label" translatable="yes">Encrypt my data. I'll set a passphrase later.</property> + <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">end</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="left_attach">1</property>
--- pyanaconda/ui/gui/spokes/__init__.py | 5 ----- pyanaconda/ui/gui/spokes/datetime_spoke.py | 2 +- pyanaconda/ui/gui/spokes/keyboard.py | 2 +- pyanaconda/ui/gui/spokes/network.py | 2 +- pyanaconda/ui/gui/spokes/password.py | 2 +- pyanaconda/ui/gui/spokes/software.py | 2 +- pyanaconda/ui/gui/spokes/source.py | 2 +- pyanaconda/ui/gui/spokes/storage.py | 2 +- widgets/src/SpokeSelector.c | 5 +++-- 9 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/__init__.py b/pyanaconda/ui/gui/spokes/__init__.py index 99039a6..c1a35b3 100644 --- a/pyanaconda/ui/gui/spokes/__init__.py +++ b/pyanaconda/ui/gui/spokes/__init__.py @@ -58,11 +58,6 @@ class Spoke(GUIObject): """ pass
- def initialize(self): - GUIObject.initialize(self) - - self.window.set_property("window-name", self.title or "") - class StandaloneSpoke(Spoke, common.StandaloneSpoke): def __init__(self, data, storage, payload, instclass): Spoke.__init__(self, data) diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py index 91af50f..b9b59bb 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.py +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py @@ -293,7 +293,7 @@ class DatetimeSpoke(NormalSpoke): category = LocalizationCategory
icon = "preferences-system-time-symbolic" - title = N_("DATE & TIME") + title = N_("DATE & _TIME")
def __init__(self, *args): NormalSpoke.__init__(self, *args) diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index c4281fe..10ede4c 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -260,7 +260,7 @@ class KeyboardSpoke(NormalSpoke): category = LocalizationCategory
icon = "input-keyboard-symbolic" - title = N_("KEYBOARD") + title = N_("_KEYBOARD")
def __init__(self, *args): NormalSpoke.__init__(self, *args) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 95fd1ac..0c49f0d 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -954,7 +954,7 @@ class NetworkSpoke(NormalSpoke): mainWidgetName = "networkWindow" uiFile = "spokes/network.glade"
- title = N_("NETWORK CONFIGURATION") + title = N_("_NETWORK CONFIGURATION") icon = "network-transmit-receive-symbolic"
category = SoftwareCategory diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py index 44be1ca..6950472 100644 --- a/pyanaconda/ui/gui/spokes/password.py +++ b/pyanaconda/ui/gui/spokes/password.py @@ -46,7 +46,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke): category = UserSettingsCategory
icon = "dialog-password-symbolic" - title = N_("ROOT PASSWORD") + title = N_("_ROOT PASSWORD")
def __init__(self, *args): NormalSpoke.__init__(self, *args) diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index 59c1787..8ab93d3 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -50,7 +50,7 @@ class SoftwareSelectionSpoke(NormalSpoke): category = SoftwareCategory
icon = "package-x-generic-symbolic" - title = N_("SOFTWARE SELECTION") + title = N_("_SOFTWARE SELECTION")
def __init__(self, *args, **kwargs): NormalSpoke.__init__(self, *args, **kwargs) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 528193d..d989d98 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -425,7 +425,7 @@ class SourceSpoke(NormalSpoke): category = SoftwareCategory
icon = "media-optical-symbolic" - title = N_("INSTALLATION SOURCE") + title = N_("_INSTALLATION SOURCE")
def __init__(self, *args, **kwargs): NormalSpoke.__init__(self, *args, **kwargs) diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index ae7b419..eb1c2f2 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -321,7 +321,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
# other candidates: computer-symbolic, folder-symbolic icon = "drive-harddisk-symbolic" - title = N_("INSTALLATION DESTINATION") + title = N_("INSTALLATION _DESTINATION")
def __init__(self, *args, **kwargs): NormalSpoke.__init__(self, *args, **kwargs) diff --git a/widgets/src/SpokeSelector.c b/widgets/src/SpokeSelector.c index 94966c2..25d7cd9 100644 --- a/widgets/src/SpokeSelector.c +++ b/widgets/src/SpokeSelector.c @@ -210,7 +210,8 @@ static void anaconda_spoke_selector_init(AnacondaSpokeSelector *spoke) { spoke->priv->title_label = gtk_label_new(NULL); markup = g_markup_printf_escaped("<span weight='bold' size='large'>%s</span>", _(DEFAULT_TITLE)); gtk_label_set_justify(GTK_LABEL(spoke->priv->title_label), GTK_JUSTIFY_LEFT); - gtk_label_set_markup(GTK_LABEL(spoke->priv->title_label), markup); + gtk_label_set_markup_with_mnemonic(GTK_LABEL(spoke->priv->title_label), markup); + gtk_label_set_mnemonic_widget(GTK_LABEL(spoke->priv->title_label), GTK_WIDGET(spoke)); gtk_misc_set_alignment(GTK_MISC(spoke->priv->title_label), 0, 1); gtk_widget_set_hexpand(GTK_WIDGET(spoke->priv->title_label), FALSE); g_free(markup); @@ -284,7 +285,7 @@ static void anaconda_spoke_selector_set_property(GObject *object, guint prop_id,
case PROP_TITLE: { char *markup = g_markup_printf_escaped("<span weight='bold' size='large'>%s</span>", g_value_get_string(value)); - gtk_label_set_markup(GTK_LABEL(priv->title_label), markup); + gtk_label_set_markup_with_mnemonic(GTK_LABEL(priv->title_label), markup); g_free(markup); break; }
--- pyanaconda/ui/gui/spokes/custom.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index e7b47e5..b71e9e2 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -2201,7 +2201,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): selector.set_chosen(True) self._current_selector = selector
- self._configButton.set_sensitive(not selector._device.protected and + self._configButton.set_sensitive(not selector._device.exists and + not selector._device.protected and getDeviceType(selector._device) != DEVICE_TYPE_LVM) self._removeButton.set_sensitive(not selector._device.protected) return True @@ -2419,7 +2420,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): raid_level = "raid0"
# lvm uses the RHS to set disk set. no foolish minds here. - self._configButton.set_sensitive(new_type != DEVICE_TYPE_LVM) + exists = self._current_selector and self._current_selector._device.exists + self._configButton.set_sensitive(not exists and new_type != DEVICE_TYPE_LVM)
size = self.builder.get_object("sizeSpinner").get_value() self._populate_raid(raid_level, size)
On Fri, Jan 04, 2013 at 10:49:15AM -0500, Chris Lumens wrote:
pyanaconda/ui/gui/spokes/custom.glade | 81 +++++++++++++++++++-------- pyanaconda/ui/gui/spokes/custom.py | 4 +- pyanaconda/ui/gui/spokes/datetime_spoke.glade | 20 ++++--- pyanaconda/ui/gui/spokes/keyboard.glade | 5 +- pyanaconda/ui/gui/spokes/lib/accordion.py | 3 +- pyanaconda/ui/gui/spokes/lib/cart.glade | 1 + pyanaconda/ui/gui/spokes/lib/cart.py | 4 +- pyanaconda/ui/gui/spokes/lib/passphrase.glade | 13 ++++- pyanaconda/ui/gui/spokes/lib/resize.glade | 12 +++- pyanaconda/ui/gui/spokes/network.glade | 43 +------------- pyanaconda/ui/gui/spokes/password.glade | 9 ++- pyanaconda/ui/gui/spokes/source.glade | 35 +++++++----- pyanaconda/ui/gui/spokes/storage.glade | 12 ++-- 13 files changed, 139 insertions(+), 103 deletions(-)
Ack to these 3. Although I really only looked at the .py bits.
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
Chris Lumens