Skip to content

Commit

Permalink
Replace GtkSpinner (#1204242)
Browse files Browse the repository at this point in the history 
GtkSpinner chews up CPU cycles like candy, which is especially noticable
on a VM, so steal a workaround from Evolution.
  • Loading branch information
@dashea
dashea committed Apr 17, 2015
1 parent 1a08892 commit a67bf57
Show file tree
Hide file tree
Showing 12 changed files with 515 additions and 133 deletions.
7 changes: 2 additions & 5 deletions pyanaconda/ui/gui/hubs/progress.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="AnacondaWidgets" version="3.0"/>
<requires lib="AnacondaWidgets" version="3.2"/>
<object class="AnacondaHubWindow" id="progressWindow">
<property name="can_focus">False</property>
<property name="window_name" translatable="yes">CONFIGURATION</property>
Expand All @@ -23,9 +23,6 @@
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
Expand Down Expand Up @@ -72,7 +69,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkSpinner" id="progressSpinner">
<object class="AnacondaSpinner" id="progressSpinner">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="active">True</property>
Expand Down
36 changes: 11 additions & 25 deletions pyanaconda/ui/gui/spokes/advstorage/dasd.glade
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?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"/>
<requires lib="AnacondaWidgets" version="3.2"/>
<object class="GtkDialog" id="dasdDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
Expand All @@ -22,8 +23,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>
Expand All @@ -37,8 +38,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>
Expand All @@ -64,8 +65,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>
Expand Down Expand Up @@ -93,15 +94,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>
Expand All @@ -114,23 +114,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>
Expand Down Expand Up @@ -164,7 +161,7 @@
<property name="halign">center</property>
<property name="spacing">5</property>
<child>
<object class="GtkSpinner" id="waitSpinner">
<object class="AnacondaSpinner" id="waitSpinner">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="active">True</property>
Expand Down Expand Up @@ -212,54 +209,46 @@
<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>
</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="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>
Expand All @@ -276,8 +265,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>
Expand All @@ -302,7 +289,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>
Expand Down
13 changes: 7 additions & 6 deletions pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="AnacondaWidgets" version="3.2"/>
<object class="GtkDialog" id="fcoeDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
Expand Down Expand Up @@ -52,9 +53,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">Please select the network interface which is connected to your FCoE switch.</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
Expand All @@ -66,10 +67,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|FCoE">_NIC:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nicCombo</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
Expand Down Expand Up @@ -126,7 +127,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkSpinner" id="addSpinner">
<object class="AnacondaSpinner" id="addSpinner">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="halign">end</property>
Expand Down Expand Up @@ -183,8 +184,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">Error adding FCoE SAN.</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
Expand All @@ -198,9 +199,9 @@
<object class="GtkLabel" id="errorLabel">
<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="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
Expand All @@ -211,9 +212,9 @@
<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">The following error occurred while attempting to add an FCoE SAN. Please check your configuration and try again</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
Expand Down
Loading

0 comments on commit a67bf57

Please sign in to comment.