The Find button should not be on the right most side of the window because it often gets a horizontal scrollbar making the Find button jump of the visible area.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- pyanaconda/ui/gui/spokes/filter.glade | 1540 ++++++++++++++++----------------- 1 file changed, 767 insertions(+), 773 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade index 07fb4f2..fd11c18 100644 --- a/pyanaconda/ui/gui/spokes/filter.glade +++ b/pyanaconda/ui/gui/spokes/filter.glade @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires AnacondaWidgets 1.0 --> <object class="GtkListStore" id="diskStore"> <columns> @@ -40,6 +41,21 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkTreeModelFilter" id="multipathModel"> + <property name="child_model">diskStore</property> + </object> + <object class="GtkTreeModelFilter" id="otherModel"> + <property name="child_model">diskStore</property> + </object> + <object class="GtkTreeModelFilter" id="raidModel"> + <property name="child_model">diskStore</property> + </object> + <object class="GtkTreeModelFilter" id="searchModel"> + <property name="child_model">diskStore</property> + </object> + <object class="GtkTreeModelFilter" id="zModel"> + <property name="child_model">diskStore</property> + </object> <object class="AnacondaSpokeWindow" id="filterWindow"> <property name="startup_id">filler</property> <property name="can_focus">False</property> @@ -105,233 +121,248 @@ <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <object class="GtkGrid" id="searchGrid"> + <object class="GtkBox" id="searchBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">6</property> <property name="margin_right">6</property> <property name="margin_top">12</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <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">Search Results:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">5</property> - <property name="height">1</property> - </packing> - </child> - <child> - <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">Search _By:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">searchTypeCombo</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkComboBoxText" id="searchTypeCombo"> + <object class="GtkBox" id="searchDetailsBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - <items> - <item translatable="yes">None</item> - <item translatable="yes">Port / Target / LUN #</item> - <item translatable="yes">Target WWID</item> - </items> - <signal name="changed" handler="on_search_type_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkNotebook" id="searchTypeNotebook"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="show_tabs">False</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label11"> + <object class="GtkLabel" id="label1"> <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">Search _By:</property> + <property name="use_underline">True</property> </object> - </child> - <child type="tab"> - <placeholder/> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> <child> - <object class="GtkBox" id="searchPTLBox"> + <object class="GtkComboBoxText" id="searchTypeCombo"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> - <property name="spacing">6</property> + <items> + <item translatable="yes">None</item> + <item translatable="yes">Port / Target / LUN #</item> + <item translatable="yes">Target WWID</item> + </items> + <signal name="changed" handler="on_search_type_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkNotebook" id="searchTypeNotebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="show_tabs">False</property> <child> - <object class="GtkLabel" id="label13"> + <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Port:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">searchPortCombo</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + </child> + <child type="tab"> + <placeholder/> </child> <child> - <object class="GtkComboBoxText" id="searchPortCombo"> + <object class="GtkBox" id="searchPTLBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> + <property name="no_show_all">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Port:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">searchPortCombo</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="searchPortCombo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</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">_Target:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">searchTargetEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="searchTargetEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="secondary_icon_name">edit-clear-symbolic</property> + <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_LUN:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">searchLUNEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="searchLUNEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="secondary_icon_name">edit-clear-symbolic</property> + <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> + <child type="tab"> + <placeholder/> + </child> <child> - <object class="GtkLabel" id="label14"> + <object class="GtkBox" id="searchWWIDBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Target:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">searchTargetEntry</property> + <property name="spacing">5</property> + <child> + <object class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_WWID:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">searchWWIDEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="searchWWIDEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="width_chars">30</property> + <property name="secondary_icon_name">edit-clear-symbolic</property> + <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> - <child> - <object class="GtkEntry" id="searchTargetEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="secondary_icon_name">edit-clear-symbolic</property> - <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> + <child type="tab"> + <placeholder/> </child> <child> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_LUN:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">searchLUNEntry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> + <placeholder/> </child> - <child> - <object class="GtkEntry" id="searchLUNEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="secondary_icon_name">edit-clear-symbolic</property> - <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> + <child type="tab"> + <placeholder/> </child> </object> <packing> - <property name="position">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> - <child type="tab"> - <placeholder/> - </child> <child> - <object class="GtkBox" id="searchWWIDBox"> + <object class="GtkButton" id="searchFindButton"> + <property name="label">_Find</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">5</property> - <child> - <object class="GtkLabel" id="label18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_WWID:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">searchWWIDEntry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="searchWWIDEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="width_chars">30</property> - <property name="secondary_icon_name">edit-clear-symbolic</property> - <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_find_clicked" swapped="no"/> </object> <packing> - <property name="position">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <placeholder/> - </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</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">Search Results:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> @@ -489,26 +520,9 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">5</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="searchFindButton"> - <property name="label" translatable="yes">_Find</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_find_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - <property name="width">2</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> @@ -538,196 +552,211 @@ <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <object class="GtkGrid" id="multipathGrid"> + <object class="GtkBox" id="mpathBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">6</property> <property name="margin_right">6</property> <property name="margin_top">12</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <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">Filter _By:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">multipathTypeCombo</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkComboBoxText" id="multipathTypeCombo"> + <object class="GtkBox" id="mpathFilterBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - <items> - <item translatable="yes">None</item> - <item translatable="yes">Vendor</item> - <item translatable="yes">Interconnect</item> - <item translatable="yes">WWID</item> - </items> - <signal name="changed" handler="on_multipath_type_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkNotebook" id="multipathTypeNotebook"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> - <property name="show_tabs">False</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="label2"> <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">Filter _By:</property> + <property name="use_underline">True</property> </object> - </child> - <child type="tab"> - <placeholder/> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> <child> - <object class="GtkBox" id="multipathVendorBox"> + <object class="GtkComboBoxText" id="multipathTypeCombo"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <items> + <item translatable="yes">None</item> + <item translatable="yes">Vendor</item> + <item translatable="yes">Interconnect</item> + <item translatable="yes">WWID</item> + </items> + <signal name="changed" handler="on_multipath_type_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkNotebook" id="multipathTypeNotebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="show_tabs">False</property> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Show Only _Devices From:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">multipathVendorCombo</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + </child> + <child type="tab"> + <placeholder/> </child> <child> - <object class="GtkComboBoxText" id="multipathVendorCombo"> + <object class="GtkBox" id="multipathVendorBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Show Only _Devices From:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">multipathVendorCombo</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="multipathVendorCombo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <object class="GtkBox" id="multipathInterconnectBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> + <child type="tab"> + <placeholder/> + </child> <child> - <object class="GtkLabel" id="label16"> + <object class="GtkBox" id="multipathInterconnectBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Show Only _Devices With:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">multipathInterconnectCombo</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Show Only _Devices With:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">multipathInterconnectCombo</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="multipathInterconnectCombo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> + <child type="tab"> + <placeholder/> + </child> <child> - <object class="GtkComboBoxText" id="multipathInterconnectCombo"> + <object class="GtkBox" id="multipathWWIDBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Show Only _Devices Containing:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">multipathWWIDEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="multipathWWIDEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="width_chars">30</property> + <property name="secondary_icon_name">edit-clear-symbolic</property> + <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> + <child type="tab"> + <placeholder/> + </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> - <child type="tab"> - <placeholder/> - </child> <child> - <object class="GtkBox" id="multipathWWIDBox"> + <object class="GtkButton" id="multipathFindButton"> + <property name="label">_Find</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show Only _Devices Containing:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">multipathWWIDEntry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="multipathWWIDEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="width_chars">30</property> - <property name="secondary_icon_name">edit-clear-symbolic</property> - <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_find_clicked" swapped="no"/> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> - <child type="tab"> - <placeholder/> - </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> @@ -830,26 +859,9 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">5</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="multipathFindButton"> - <property name="label" translatable="yes">_Find</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_find_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - <property name="width">2</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -883,49 +895,211 @@ <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <object class="GtkGrid" id="otherGrid"> + <object class="GtkBox" id="sanBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">6</property> <property name="margin_right">6</property> <property name="margin_top">12</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <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">_Filter By:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">multipathTypeCombo</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkComboBoxText" id="otherTypeCombo"> + <object class="GtkBox" id="sanFilterBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - <items> - <item translatable="yes">None</item> - <item translatable="yes">Vendor</item> - <item translatable="yes">Interconnect</item> - <item translatable="yes">ID</item> - </items> - <signal name="changed" handler="on_other_type_combo_changed" swapped="no"/> + <property name="spacing">6</property> + <child> + <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">_Filter By:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="otherTypeCombo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes">None</item> + <item translatable="yes">Vendor</item> + <item translatable="yes">Interconnect</item> + <item translatable="yes">ID</item> + </items> + <signal name="changed" handler="on_other_type_combo_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkNotebook" id="otherTypeNotebook"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="show_tabs">False</property> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child type="tab"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="otherVendorBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Show Only _Devices From:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">otherVendorCombo</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="otherVendorCombo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="otherInterconnectBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Show Only _Devices With:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">otherInterconnectCombo</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="otherInterconnectCombo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="otherIDBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Show Only _Devices Containing:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">otherIDEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="otherIDEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="width_chars">30</property> + <property name="secondary_icon_name">edit-clear-symbolic</property> + <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child type="tab"> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="otherFindButton"> + <property name="label">_Find</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_find_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> @@ -1016,174 +1190,9 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">5</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="otherFindButton"> - <property name="label" translatable="yes">_Find</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_find_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - <property name="width">2</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkNotebook" id="otherTypeNotebook"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> - <property name="show_tabs">False</property> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <object class="GtkBox" id="otherVendorBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show Only _Devices From:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">otherVendorCombo</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="otherVendorCombo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <object class="GtkBox" id="otherInterconnectBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show Only _Devices With:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">otherInterconnectCombo</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="otherInterconnectCombo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <object class="GtkBox" id="otherIDBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label21"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show Only _Devices Containing:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">otherIDEntry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="otherIDEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="width_chars">30</property> - <property name="invisible_char_set">True</property> - <property name="secondary_icon_name">edit-clear-symbolic</property> - <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child type="tab"> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -1239,43 +1248,222 @@ <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <object class="GtkGrid" id="zGrid"> + <object class="GtkBox" id="zBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">6</property> <property name="margin_right">6</property> <property name="margin_top">12</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label10"> + <object class="GtkBox" id="zFilterBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Filter _By:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="zFindButton"> - <property name="label" translatable="yes">_Find</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_find_clicked" swapped="no"/> + <property name="spacing">6</property> + <child> + <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">Filter _By:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="zTypeCombo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes">None</item> + <item translatable="yes">CCW</item> + <item translatable="yes">WWPN</item> + <item translatable="yes">LUN</item> + </items> + <signal name="changed" handler="on_z_type_combo_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkNotebook" id="zTypeNotebook"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="show_tabs">False</property> + <child> + <object class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child type="tab"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="zCCWBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_CCW:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">zCCWEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="zCCWEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">?</property> + <property name="width_chars">30</property> + <property name="secondary_icon_name">edit-clear-symbolic</property> + <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="zWWPNBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_WWPN:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">zWWPNEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="zWWPNEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">?</property> + <property name="width_chars">30</property> + <property name="secondary_icon_name">edit-clear-symbolic</property> + <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child type="tab"> + <placeholder/> + </child> + <child> + <object class="GtkBox" id="zLUNBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_LUN:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">zLUNEntry</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="zLUNEntry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">?</property> + <property name="width_chars">30</property> + <property name="secondary_icon_name">edit-clear-symbolic</property> + <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="zFindButton"> + <property name="label" translatable="yes">_Find</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_find_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - <property name="width">2</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> @@ -1405,188 +1593,9 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">5</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkNotebook" id="zTypeNotebook"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="hexpand">True</property> - <property name="show_tabs">False</property> - <child> - <object class="GtkLabel" id="label19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <object class="GtkBox" id="zCCWBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label23"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_CCW:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">zCCWEntry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="zCCWEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">?</property> - <property name="width_chars">30</property> - <property name="invisible_char_set">True</property> - <property name="secondary_icon_name">edit-clear-symbolic</property> - <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <object class="GtkBox" id="zWWPNBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_WWPN:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">zWWPNEntry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="zWWPNEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">?</property> - <property name="width_chars">30</property> - <property name="invisible_char_set">True</property> - <property name="secondary_icon_name">edit-clear-symbolic</property> - <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child type="tab"> - <placeholder/> - </child> - <child> - <object class="GtkBox" id="zLUNBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_LUN:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">zLUNEntry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="zLUNEntry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">?</property> - <property name="width_chars">30</property> - <property name="invisible_char_set">True</property> - <property name="secondary_icon_name">edit-clear-symbolic</property> - <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="zTypeCombo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - <items> - <item translatable="yes">None</item> - <item translatable="yes">CCW</item> - <item translatable="yes">WWPN</item> - <item translatable="yes">LUN</item> - </items> - <signal name="changed" handler="on_z_type_combo_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -1732,19 +1741,4 @@ </object> </child> </object> - <object class="GtkTreeModelFilter" id="multipathModel"> - <property name="child_model">diskStore</property> - </object> - <object class="GtkTreeModelFilter" id="otherModel"> - <property name="child_model">diskStore</property> - </object> - <object class="GtkTreeModelFilter" id="raidModel"> - <property name="child_model">diskStore</property> - </object> - <object class="GtkTreeModelFilter" id="searchModel"> - <property name="child_model">diskStore</property> - </object> - <object class="GtkTreeModelFilter" id="zModel"> - <property name="child_model">diskStore</property> - </object> </interface>