New: [rhinstaller/anaconda/pulls/179 master] Do something when dialog widgets are activated
Along with some assorted minor cleanups
From: David Shea dshea@redhat.com
Remove properties equal to the default value and alphabetize other properties. --- pyanaconda/ui/gui/spokes/advstorage/dasd.glade | 33 +++++----------- pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 52 ++++++++++++------------- pyanaconda/ui/gui/spokes/advstorage/zfcp.glade | 42 +++++--------------- 3 files changed, 45 insertions(+), 82 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade index 2246829..8d017aa 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="dasdDialog"> @@ -22,8 +22,8 @@ <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="use_underline">True</property> <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -37,8 +37,8 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="use_underline">True</property> <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -64,8 +64,8 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">ADD DASD STORAGE TARGET</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -93,15 +93,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">To use DASD disks, you must provide the device number.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -114,23 +113,20 @@ <property name="left_attach">1</property> <property name="top_attach">1</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Device number:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">deviceEntry</property> + <property name="xalign">0</property> </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> <child> @@ -212,16 +208,14 @@ <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="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Device discovery failed.</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -229,37 +223,31 @@ <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="GtkLabel" id="label22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">The following error occurred discovering DASD devices. Please double check your configuration information and try again.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <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="GtkLabel" id="deviceErrorLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">Error message goes here.</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -276,8 +264,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -302,7 +288,6 @@ <property name="left_attach">0</property> <property name="top_attach">2</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade index 40dd3bb..cd7e021 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade @@ -82,8 +82,8 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">ADD iSCSI STORAGE TARGET</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -111,9 +111,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">To use iSCSI disks, you must provide the address of your iSCSI target and the iSCSI initiator name you've configured for your host.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -138,10 +138,10 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">_Target IP Address:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">targetEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -165,10 +165,10 @@ <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">iSCSI _Initiator Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">initiatorEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -198,10 +198,10 @@ <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure">_Discovery Authentication Type:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">authTypeCombo</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -213,9 +213,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes"><span size="small"><b>Example:</b> iqn.2012-09.com.example:diskarrays-sn-a8675309</span></property> <property name="use_markup">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -258,10 +258,10 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|CHAP">CHAP _User name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">chapUsernameEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -272,10 +272,10 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|CHAP">CHAP _Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">chapPasswordEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -378,10 +378,10 @@ <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" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">CHAP _User name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rchapUsernameEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -392,10 +392,10 @@ <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">CHAP _Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rchapPasswordEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -406,10 +406,10 @@ <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">Reverse CHAP User _name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rchapReverseUsername</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -420,10 +420,10 @@ <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Configure|Reverse CHAP">Reverse CHAP Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rchapReversePassword</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -530,8 +530,8 @@ <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Discovery login rejected.</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -545,9 +545,9 @@ <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">The following error occurred discovering iSCSI targets. Please double check your authorization information and try again.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -558,8 +558,8 @@ <object class="GtkLabel" id="discoveryErrorLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">Error message goes here.</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -642,10 +642,10 @@ <object class="GtkLabel" id="discoveredLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">The following nodes have been discovered using the iSCSI initiator <b>%(initiatorName)s</b> using the target IP address <b>%(targetAddress)s</b>. Please select which nodes you wish to log into:</property> <property name="use_markup">True</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -733,10 +733,10 @@ <object class="GtkLabel" id="loginAuthTypeLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login">_Node Login Authentication Type:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginAuthTypeCombo</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -785,10 +785,10 @@ <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|CHAP">CHAP _User name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginChapUsernameEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -799,10 +799,10 @@ <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|CHAP">CHAP _Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginChapPasswordEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -905,10 +905,10 @@ <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">CHAP _User name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginRchapUsernameEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -919,10 +919,10 @@ <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">CHAP _Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginRchapPasswordEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -933,10 +933,10 @@ <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">_Reverse CHAP User name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginRchapReverseUsername</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -947,10 +947,10 @@ <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|iSCSI|Login|Reverse CHAP">Reverse CHAP Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">loginRchapReversePassword</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1051,8 +1051,8 @@ <object class="GtkLabel" id="label21"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Node login failed.</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1066,9 +1066,9 @@ <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">The following error occurred logging into the selected iSCSI node. Please double check your authorization information and try again</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -1079,8 +1079,8 @@ <object class="GtkLabel" id="loginErrorLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">Error message goes here.</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> diff --git a/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade b/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade index 56b95a5..9624d1b 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkListStore" id="nodeStore"> <columns> <!-- column-name nodeSelected --> @@ -78,8 +79,8 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">ADD zFCP STORAGE TARGET</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -107,15 +108,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> - <property name="xalign">0</property> <property name="label" translatable="yes">To use zFCP disks, you must provide the device number, WWPN, and LUN configured for the device.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">3</property> - <property name="height">1</property> </packing> </child> <child> @@ -128,23 +128,20 @@ <property name="left_attach">1</property> <property name="top_attach">1</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="GUI|Advanced Storage|zFCP|Device Number">_Device number:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">deviceEntry</property> + <property name="xalign">0</property> </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> <child> @@ -157,23 +154,19 @@ <property name="left_attach">1</property> <property name="top_attach">2</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">WWPN:</property> - <property name="use_underline">False</property> <property name="mnemonic_widget">wwpnEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -255,16 +248,14 @@ <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="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Device discovery failed.</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -272,37 +263,31 @@ <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="GtkLabel" id="label22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">The following error occurred discovering zFCP devices. Please double check your configuration information and try again.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <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="GtkLabel" id="deviceErrorLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">Error message goes here.</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -319,8 +304,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -345,23 +328,19 @@ <property name="left_attach">0</property> <property name="top_attach">7</property> <property name="width">3</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="xalign">0</property> <property name="label" translatable="yes">LUN:</property> - <property name="use_underline">False</property> <property name="mnemonic_widget">lunEntry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -374,7 +353,6 @@ <property name="left_attach">1</property> <property name="top_attach">3</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child>
From: David Shea dshea@redhat.com
The glade changes look pretty gnarly, but all each one does is remove a GtkNotebook and unindent the grid that was the only page of the notebook.
Also remove all the placeholders from the zfcp grid. --- pyanaconda/ui/gui/spokes/advstorage/dasd.glade | 343 +++++++++--------- pyanaconda/ui/gui/spokes/advstorage/dasd.py | 2 - pyanaconda/ui/gui/spokes/advstorage/zfcp.glade | 458 +++++++++++-------------- pyanaconda/ui/gui/spokes/advstorage/zfcp.py | 2 - 4 files changed, 364 insertions(+), 441 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade index 8d017aa..f8a2487 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade @@ -77,235 +77,212 @@ </packing> </child> <child> - <object class="GtkNotebook" id="dasdNotebook"> + <object class="GtkGrid" id="configureGrid"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkGrid" id="configureGrid"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> - <property name="label" translatable="yes">To use DASD disks, you must provide the device number.</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> - </child> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">To use DASD disks, you must provide the device number.</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="deviceEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Device number:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">deviceEntry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkNotebook" id="conditionNotebook"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="show_tabs">False</property> + <property name="show_border">False</property> <child> - <object class="GtkEntry" id="deviceEntry"> + <object class="GtkButton" id="startButton"> + <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Start Discovery</property> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_start_clicked" swapped="no"/> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> + </child> + <child type="tab"> + <placeholder/> </child> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkBox" id="waitBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Device number:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">deviceEntry</property> - <property name="xalign">0</property> + <property name="halign">center</property> + <property name="spacing">5</property> + <child> + <object class="GtkSpinner" id="waitSpinner"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Discovering DASD devices. This may take a moment...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="position">1</property> </packing> </child> + <child type="tab"> + <placeholder/> + </child> <child> - <object class="GtkNotebook" id="conditionNotebook"> + <object class="GtkGrid" id="errorBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> + <property name="halign">center</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkButton" id="startButton"> - <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Start Discovery</property> + <object class="GtkImage" id="image3"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_start_clicked" swapped="no"/> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="icon_name">dialog-error</property> </object> - </child> - <child type="tab"> - <placeholder/> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> <child> - <object class="GtkBox" id="waitBox"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="spacing">5</property> - <child> - <object class="GtkSpinner" id="waitSpinner"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Discovering DASD devices. This may take a moment...</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">Device discovery failed.</property> + <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> - <child type="tab"> - <placeholder/> + <child> + <object class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">The following error occurred discovering DASD devices. Please double check your configuration information and try again.</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> <child> - <object class="GtkGrid" id="errorBox"> + <object class="GtkLabel" id="deviceErrorLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label">Error message goes here.</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="retryButton"> + <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Retry Discovery</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="halign">center</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="icon_name">dialog-error</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Device discovery failed.</property> - <property name="xalign">0</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">The following error occurred discovering DASD devices. Please double check your configuration information and try again.</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="deviceErrorLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">Error message goes here.</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="retryButton"> - <property name="label" translatable="yes" context="GUI|Advanced Storage|DASD|Configure">_Retry Discovery</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_start_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="valign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_start_clicked" swapped="no"/> </object> <packing> - <property name="position">2</property> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> - <child type="tab"> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> <placeholder/> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">3</property> + <property name="position">2</property> </packing> </child> + <child type="tab"> + <placeholder/> + </child> </object> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <placeholder/> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">3</property> + </packing> </child> </object> <packing> diff --git a/pyanaconda/ui/gui/spokes/advstorage/dasd.py b/pyanaconda/ui/gui/spokes/advstorage/dasd.py index 7fdd7c5..6da52ed 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/dasd.py +++ b/pyanaconda/ui/gui/spokes/advstorage/dasd.py @@ -43,8 +43,6 @@ def __init__(self, data, storage): self._update_devicetree = False
# grab all of the ui objects - self._dasdNotebook = self.builder.get_object("dasdNotebook") - self._configureGrid = self.builder.get_object("configureGrid") self._conditionNotebook = self.builder.get_object("conditionNotebook")
diff --git a/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade b/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade index 9624d1b..5d00af9 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade @@ -92,316 +92,266 @@ </packing> </child> <child> - <object class="GtkNotebook" id="zfcpNotebook"> + <object class="GtkGrid" id="configureGrid"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkGrid" id="configureGrid"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> - <property name="label" translatable="yes">To use zFCP disks, you must provide the device number, WWPN, and LUN configured for the device.</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> - </child> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">To use zFCP disks, you must provide the device number, WWPN, and LUN configured for the device.</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="deviceEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="GUI|Advanced Storage|zFCP|Device Number">_Device number:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">deviceEntry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="wwpnEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">WWPN:</property> + <property name="mnemonic_widget">wwpnEntry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkNotebook" id="conditionNotebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="show_tabs">False</property> + <property name="show_border">False</property> <child> - <object class="GtkEntry" id="deviceEntry"> + <object class="GtkButton" id="startButton"> + <property name="label" translatable="yes" context="GUI|Advanced Storage|zFCP|Start Discovery">_Start Discovery</property> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="GUI|Advanced Storage|zFCP|Device Number">_Device number:</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="vexpand">True</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">deviceEntry</property> - <property name="xalign">0</property> + <signal name="clicked" handler="on_start_clicked" swapped="no"/> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> </child> - <child> - <object class="GtkEntry" id="wwpnEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> + <child type="tab"> + <placeholder/> </child> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkBox" id="waitBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">WWPN:</property> - <property name="mnemonic_widget">wwpnEntry</property> - <property name="xalign">0</property> + <property name="halign">center</property> + <property name="spacing">5</property> + <child> + <object class="GtkSpinner" id="waitSpinner"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="active">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Discovering zFCP devices. This may take a moment...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="position">1</property> </packing> </child> + <child type="tab"> + <placeholder/> + </child> <child> - <object class="GtkNotebook" id="conditionNotebook"> + <object class="GtkGrid" id="errorBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkButton" id="startButton"> - <property name="label" translatable="yes" context="GUI|Advanced Storage|zFCP|Start Discovery">_Start Discovery</property> + <object class="GtkImage" id="image3"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="vexpand">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_start_clicked" swapped="no"/> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="icon_name">dialog-error</property> </object> - </child> - <child type="tab"> - <placeholder/> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> <child> - <object class="GtkBox" id="waitBox"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="spacing">5</property> - <child> - <object class="GtkSpinner" id="waitSpinner"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="active">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Discovering zFCP devices. This may take a moment...</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">Device discovery failed.</property> + <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> - <child type="tab"> - <placeholder/> + <child> + <object class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">The following error occurred discovering zFCP devices. Please double check your configuration information and try again.</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> <child> - <object class="GtkGrid" id="errorBox"> + <object class="GtkLabel" id="deviceErrorLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label">Error message goes here.</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="retryButton"> + <property name="label" translatable="yes" context="GUI|Advanced Storage|zFCP|Retry Discovery">_Retry Discovery</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="halign">center</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="icon_name">dialog-error</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Device discovery failed.</property> - <property name="xalign">0</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">The following error occurred discovering zFCP devices. Please double check your configuration information and try again.</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="deviceErrorLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">Error message goes here.</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="retryButton"> - <property name="label" translatable="yes" context="GUI|Advanced Storage|zFCP|Retry Discovery">_Retry Discovery</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_start_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="valign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_start_clicked" swapped="no"/> </object> <packing> - <property name="position">2</property> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> - <child type="tab"> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> <placeholder/> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">LUN:</property> - <property name="mnemonic_widget">lunEntry</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="lunEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">2</property> + <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> + <child type="tab"> <placeholder/> </child> </object> - </child> - <child type="tab"> - <placeholder/> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">3</property> + </packing> </child> <child> - <placeholder/> - </child> - <child type="tab"> - <placeholder/> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">LUN:</property> + <property name="mnemonic_widget">lunEntry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> </child> <child> - <placeholder/> - </child> - <child type="tab"> - <placeholder/> + <object class="GtkEntry" id="lunEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> diff --git a/pyanaconda/ui/gui/spokes/advstorage/zfcp.py b/pyanaconda/ui/gui/spokes/advstorage/zfcp.py index 1d7ab46..5523b16 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/zfcp.py +++ b/pyanaconda/ui/gui/spokes/advstorage/zfcp.py @@ -43,8 +43,6 @@ def __init__(self, data, storage): self._update_devicetree = False
# grab all of the ui objects - self._zfcpNotebook = self.builder.get_object("zfcpNotebook") - self._configureGrid = self.builder.get_object("configureGrid") self._conditionNotebook = self.builder.get_object("conditionNotebook")
From: David Shea dshea@redhat.com
For the dialogs with relatively simple layouts (a single view with a set of inputs followed by OK/Cancel buttons), change the widget properties so that hitting enter in any of the inputs is equivalent to hitting the OK button. --- pyanaconda/ui/gui/spokes/advanced_user.glade | 10 ++++++++-- .../ui/gui/spokes/lib/custom_storage_helpers.glade | 19 ++++++++++++++----- pyanaconda/ui/gui/spokes/lib/passphrase.glade | 9 ++++++--- pyanaconda/ui/gui/spokes/source.glade | 7 ++++++- 4 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/advanced_user.glade b/pyanaconda/ui/gui/spokes/advanced_user.glade index 0bf041f..8bec496 100644 --- a/pyanaconda/ui/gui/spokes/advanced_user.glade +++ b/pyanaconda/ui/gui/spokes/advanced_user.glade @@ -36,7 +36,7 @@ <property name="label" translatable="yes" context="GUI|Advanced User">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> </object> <packing> @@ -50,7 +50,9 @@ <property name="label" translatable="yes" context="GUI|Advanced User">_Save Changes</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> </object> <packing> @@ -115,6 +117,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_left">8</property> + <property name="activates_default">True</property> </object> <packing> <property name="expand">True</property> @@ -193,6 +196,7 @@ <property name="can_focus">True</property> <property name="margin_left">8</property> <property name="invisible_char">●</property> + <property name="activates_default">True</property> <property name="width_chars">5</property> <property name="progress_pulse_step">0.0099999997764825821</property> <property name="adjustment">uid</property> @@ -209,6 +213,7 @@ <property name="can_focus">True</property> <property name="margin_left">8</property> <property name="invisible_char">●</property> + <property name="activates_default">True</property> <property name="width_chars">5</property> <property name="adjustment">gid</property> </object> @@ -273,6 +278,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_top">3</property> + <property name="activates_default">True</property> </object> <packing> <property name="expand">False</property> diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade index 19b4486..ff3c0ef 100644 --- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade +++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.19.0 --> <interface> <requires lib="gtk+" version="3.2"/> <object class="GtkDialog" id="confirmDeleteDialog"> @@ -321,7 +321,7 @@ <property name="label" translatable="yes" context="GUI|Custom Partitioning|Add Dialog">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="receives_default">False</property> <property name="halign">end</property> <property name="use_underline">True</property> </object> @@ -336,7 +336,9 @@ <property name="label" translatable="yes" context="GUI|Custom Partitioning|Add Dialog">_Add mount point</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> <property name="halign">end</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_add_confirm_clicked" swapped="no"/> @@ -478,6 +480,7 @@ use. Try something else?</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes">eg: "20 GB", "500mb" (minus the quotation marks)</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> @@ -493,6 +496,7 @@ use. Try something else?</property> <object class="GtkEntry" id="comboboxtext-entry"> <property name="can_focus">True</property> <property name="buffer">mountPointEntryBuffer</property> + <property name="activates_default">True</property> <property name="completion">mountPointCompletion</property> </object> </child> @@ -583,7 +587,7 @@ use. Try something else?</property> <property name="label" translatable="yes" context="GUI|Custom Partitioning|Container Dialog">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> </object> <packing> @@ -597,7 +601,10 @@ use. Try something else?</property> <property name="label" translatable="yes" context="GUI|Custom Partitioning|Container Dialog">_Save</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> <property name="use_underline">True</property> </object> <packing> @@ -672,6 +679,7 @@ use. Try something else?</property> <object class="GtkEntry" id="container_name_entry"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="expand">False</property> @@ -907,6 +915,7 @@ use. Try something else?</property> <object class="GtkEntry" id="containerSizeEntry"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="expand">False</property> diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.glade b/pyanaconda/ui/gui/spokes/lib/passphrase.glade index f2ea51f..dcfda4b 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.glade +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.19.0 --> <interface> <requires lib="gtk+" version="3.6"/> <requires lib="AnacondaWidgets" version="1.0"/> @@ -23,7 +23,7 @@ <property name="label" translatable="yes" context="GUI|Passphrase Dialog">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="receives_default">False</property> <property name="halign">end</property> <property name="use_underline">True</property> </object> @@ -39,7 +39,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="receives_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> </object> <packing> @@ -114,6 +115,7 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <property name="activates_default">True</property> <property name="width_chars">32</property> <signal name="activate" handler="on_entry_activated" swapped="no"/> <signal name="changed" handler="on_passphrase_changed" swapped="no"/> @@ -143,6 +145,7 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <property name="activates_default">True</property> <property name="width_chars">32</property> <signal name="activate" handler="on_entry_activated" swapped="no"/> <signal name="changed" handler="on_confirm_changed" swapped="no"/> diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade index 1d4260c..0b1045c 100644 --- a/pyanaconda/ui/gui/spokes/source.glade +++ b/pyanaconda/ui/gui/spokes/source.glade @@ -238,7 +238,9 @@ <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> </object> <packing> @@ -324,6 +326,7 @@ <object class="GtkEntry" id="proxyURLEntry"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> <property name="width_chars">40</property> </object> <packing> @@ -403,6 +406,7 @@ <object class="GtkEntry" id="proxyUsernameEntry"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> <signal name="changed" handler="on_proxyUsernameEntry_changed" swapped="no"/> </object> <packing> @@ -416,6 +420,7 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <property name="activates_default">True</property> <signal name="changed" handler="on_proxyPasswordEntry_changed" swapped="no"/> </object> <packing>
In reply to line 607 of pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:
Is this ``halign`` specification added intentionally?
In reply to line 607 of pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade:
Is this halign specification added intentionally?
No, I probably caught something while scrolling. Thanks for catching that.
From: David Shea dshea@redhat.com
Besides removing the need for a pile of Gdk constants and flags to detect double clicks, row-activated is fired on a wider variety of events, such as hitting Enter when a row is selected.
Also remove the check for whether the button is sensitive, since the button will take care of that itself. --- pyanaconda/ui/gui/spokes/keyboard.glade | 9 ++++----- pyanaconda/ui/gui/spokes/keyboard.py | 18 +++++++----------- 2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade index 4df7951..392afe0 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.glade +++ b/pyanaconda/ui/gui/spokes/keyboard.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.19.0 --> <interface> <requires lib="gtk+" version="3.2"/> <requires lib="AnacondaWidgets" version="3.0"/> @@ -53,9 +53,9 @@ <object class="GtkLabel" id="pickLayoutLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Which keyboard layouts would you like to use on this system? You may move any layout to the top of the list to select it as the default.</property> <property name="wrap">True</property> + <property name="xalign">0</property> <attributes> <attribute name="font-desc" value="Cantarell 12"/> <attribute name="weight" value="normal"/> @@ -480,8 +480,8 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">You may add a keyboard layout by selecting it below:</property> + <property name="xalign">0</property> <attributes> <attribute name="font-desc" value="Cantarell 12"/> </attributes> @@ -503,12 +503,11 @@ <object class="GtkTreeView" id="newLayoutView"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> <property name="model">newLayoutStoreSort</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> <property name="enable_search">False</property> - <signal name="button-press-event" handler="on_layout_view_button_press" swapped="no"/> + <signal name="row-activated" handler="on_layout_row_activated" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="newLayoutSelection"> <property name="mode">multiple</property> diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 6c024e7..f7f20c8 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -20,7 +20,7 @@ # Vratislav Podzimek vpodzime@redhat.com #
-from gi.repository import Gkbd, Gdk, Gtk +from gi.repository import Gkbd, Gtk
from pyanaconda.ui.gui import GUIObject from pyanaconda.ui.gui.spokes import NormalSpoke @@ -160,16 +160,12 @@ def on_entry_changed(self, *args): def on_entry_icon_clicked(self, *args): self._entry.set_text("")
- def on_layout_view_button_press(self, widget, event, *args): - if event.type == Gdk.EventType._2BUTTON_PRESS and \ - self._confirmAddButton.get_sensitive(): - # double-click should close the dialog if something is selected - # (i.e. the Add button is sensitive) - # @see on_add_layout_selection_changed - self._confirmAddButton.emit("clicked") - - # let the other actions happen as well - return False + def on_layout_row_activated(self, treeview, path, column, user_data=None): + # Activating a row (double-click, Enter, space, shift+space) should + # close the dialog if something is selected (i.e. the Add button is + # sensitive) + # @see on_add_layout_selection_changed + self._confirmAddButton.emit("clicked")
def _addLayout(self, name, store): store.append([name])
From: David Shea dshea@redhat.com
--- pyanaconda/ui/gui/spokes/advstorage/dasd.glade | 1 + pyanaconda/ui/gui/spokes/advstorage/dasd.py | 10 ++++++++++ 2 files changed, 11 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade index f8a2487..20315e9 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade @@ -102,6 +102,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_device_entry_activate" swapped="no"/> </object> <packing> <property name="left_attach">1</property> diff --git a/pyanaconda/ui/gui/spokes/advstorage/dasd.py b/pyanaconda/ui/gui/spokes/advstorage/dasd.py index 6da52ed..a8ac681 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/dasd.py +++ b/pyanaconda/ui/gui/spokes/advstorage/dasd.py @@ -49,6 +49,7 @@ def __init__(self, data, storage): self._startButton = self.builder.get_object("startButton") self._okButton = self.builder.get_object("okButton") self._cancelButton = self.builder.get_object("cancelButton") + self._retryButton = self.builder.get_object("retryButton")
self._deviceEntry = self.builder.get_object("deviceEntry")
@@ -128,3 +129,12 @@ def _discover(self, device): except blockdev.S390Error as err: self._discoveryError = str(err) return + + def on_device_entry_activate(self, entry, user_data=None): + # If the user hit Enter while the start button is displayed, activate + # whichever button is displayed. + current_page = self._conditionNotebook.get_current_page() + if current_page == 0: + self._startButton.clicked() + elif current_page == 2: + self._retryButton.clicked()
From: David Shea dshea@redhat.com
When an entry or a treeview is activated in the iscsi dialog, click the button to discover nodes or login to a node. --- pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 15 +++++++++++++++ pyanaconda/ui/gui/spokes/advstorage/iscsi.py | 20 ++++++++++++++++++++ 2 files changed, 35 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade index cd7e021..7b95897 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade @@ -126,6 +126,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_discover_entry_activated" swapped="no"/> <signal name="changed" handler="on_discover_field_changed" swapped="no"/> </object> <packing> @@ -153,6 +154,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_discover_entry_activated" swapped="no"/> <signal name="changed" handler="on_discover_field_changed" swapped="no"/> </object> <packing> @@ -287,6 +289,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_discover_entry_activated" swapped="no"/> <signal name="changed" handler="on_discover_field_changed" swapped="no"/> </object> <packing> @@ -301,6 +304,7 @@ <property name="hexpand">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <signal name="activate" handler="on_discover_entry_activated" swapped="no"/> <signal name="changed" handler="on_discover_field_changed" swapped="no"/> </object> <packing> @@ -327,6 +331,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_discover_entry_activated" swapped="no"/> <signal name="changed" handler="on_discover_field_changed" swapped="no"/> </object> <packing> @@ -341,6 +346,7 @@ <property name="hexpand">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <signal name="activate" handler="on_discover_entry_activated" swapped="no"/> <signal name="changed" handler="on_discover_field_changed" swapped="no"/> </object> <packing> @@ -353,6 +359,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_discover_entry_activated" swapped="no"/> <signal name="changed" handler="on_discover_field_changed" swapped="no"/> </object> <packing> @@ -367,6 +374,7 @@ <property name="hexpand">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <signal name="activate" handler="on_discover_entry_activated" swapped="no"/> <signal name="changed" handler="on_discover_field_changed" swapped="no"/> </object> <packing> @@ -666,6 +674,7 @@ <property name="model">nodeStoreFiltered</property> <property name="headers_clickable">False</property> <property name="search_column">0</property> + <signal name="row-activated" handler="on_login_entry_activated" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection"/> </child> @@ -814,6 +823,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_login_entry_activated" swapped="no"/> <signal name="changed" handler="on_login_field_changed" swapped="no"/> </object> <packing> @@ -828,6 +838,7 @@ <property name="hexpand">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <signal name="activate" handler="on_login_entry_activated" swapped="no"/> <signal name="changed" handler="on_login_field_changed" swapped="no"/> </object> <packing> @@ -854,6 +865,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_login_entry_activated" swapped="no"/> <signal name="changed" handler="on_login_field_changed" swapped="no"/> </object> <packing> @@ -868,6 +880,7 @@ <property name="hexpand">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <signal name="activate" handler="on_login_entry_activated" swapped="no"/> <signal name="changed" handler="on_login_field_changed" swapped="no"/> </object> <packing> @@ -880,6 +893,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_login_entry_activated" swapped="no"/> <signal name="changed" handler="on_login_field_changed" swapped="no"/> </object> <packing> @@ -894,6 +908,7 @@ <property name="hexpand">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <signal name="activate" handler="on_login_entry_activated" swapped="no"/> <signal name="changed" handler="on_login_field_changed" swapped="no"/> </object> <packing> diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py index 1f4ed30..cb3c83c 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py +++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py @@ -127,6 +127,7 @@ def __init__(self, data, storage): self._iscsiNotebook = self.builder.get_object("iscsiNotebook")
self._loginButton = self.builder.get_object("loginButton") + self._retryLoginButton = self.builder.get_object("retryLoginButton") self._loginAuthTypeCombo = self.builder.get_object("loginAuthTypeCombo") self._loginAuthNotebook = self.builder.get_object("loginAuthNotebook") self._loginGrid = self.builder.get_object("loginGrid") @@ -140,6 +141,7 @@ def __init__(self, data, storage): self._startButton = self.builder.get_object("startButton") self._okButton = self.builder.get_object("okButton") self._cancelButton = self.builder.get_object("cancelButton") + self._retryButton = self.builder.get_object("retryButton")
self._initiatorEntry = self.builder.get_object("initiatorEntry")
@@ -451,3 +453,21 @@ def on_login_field_changed(self, *args): credentials = loginMap[page](self.builder)
self._loginButton.set_sensitive(credentials_valid(credentials)) + + def on_discover_entry_activated(self, *args): + # When an entry is activated in the discovery view, push either the + # start or retry discovery button. + current_page = self._conditionNotebook.get_current_page() + if current_page == 0: + self._startButton.clicked() + elif current_page == 2: + self._retryButton.clicked() + + def on_login_entry_activated(self, *args): + # When an entry or a row in the tree view is activated on the login view, + # push the login or retry button + current_page = self._loginConditionNotebook.get_current_page() + if current_page == 0: + self._loginButton.clicked() + elif current_page == 1: + self._retryLoginButton.clicked()
From: David Shea dshea@redhat.com
--- pyanaconda/ui/gui/spokes/advstorage/zfcp.glade | 3 +++ pyanaconda/ui/gui/spokes/advstorage/zfcp.py | 9 +++++++++ 2 files changed, 12 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade b/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade index 5d00af9..646a88a 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade +++ b/pyanaconda/ui/gui/spokes/advstorage/zfcp.glade @@ -117,6 +117,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_entry_activated" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -143,6 +144,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_entry_activated" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -342,6 +344,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <signal name="activate" handler="on_entry_activated" swapped="no"/> </object> <packing> <property name="left_attach">1</property> diff --git a/pyanaconda/ui/gui/spokes/advstorage/zfcp.py b/pyanaconda/ui/gui/spokes/advstorage/zfcp.py index 5523b16..544142a 100644 --- a/pyanaconda/ui/gui/spokes/advstorage/zfcp.py +++ b/pyanaconda/ui/gui/spokes/advstorage/zfcp.py @@ -49,6 +49,7 @@ def __init__(self, data, storage): self._startButton = self.builder.get_object("startButton") self._okButton = self.builder.get_object("okButton") self._cancelButton = self.builder.get_object("cancelButton") + self._retryButton = self.builder.get_object("retryButton")
self._deviceEntry = self.builder.get_object("deviceEntry") self._wwpnEntry = self.builder.get_object("wwpnEntry") @@ -140,3 +141,11 @@ def _discover(self, *args): except ValueError as e: self._discoveryError = str(e) return + + def on_entry_activated(self, entry, user_data=None): + # When an entry is activated, press the discover or retry button + current_page = self._conditionNotebook.get_current_page() + if current_page == 0: + self._startButton.clicked() + elif current_page == 2: + self._retryButton.clicked()
Looks good to me other than the nitpick above.
Added label: ACK.
Fixed the stray halign and pushed.
Closed.
anaconda-patches@lists.fedorahosted.org
-
dashea