applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

printers: Remove usage of deprecated GtkAlignment

Browse source 
Use halign and valign of children instead of adding
GtkAlignment and setting of xalign and yalign.

https://bugzilla.gnome.org/show_bug.cgi?id=739737
This commit is contained in:
Marek Kasik 2014-11-25 11:57:00 +01:00
parent 8c67e72821
commit a5c6e53f65
5 changed files with 364 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

29
panels/printers/authentication-dialog.ui
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="authentication-dialog"> <object class="GtkDialog" id="authentication-dialog">
<property name="width_request">430</property> <property name="width_request">430</property>
<property name="height_request">270</property> <property name="height_request">270</property>
@ -60,17 +61,14 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkAlignment" id="content-alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<child> <child>
<object class="GtkGrid" id="grid1"> <object class="GtkGrid" id="grid1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_start">5</property> <property name="margin_start">5</property>
<property name="margin_end">5</property> <property name="margin_end">5</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
<property name="column_spacing">15</property> <property name="column_spacing">15</property>
<child> <child>
@ -87,8 +85,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -105,8 +101,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -116,13 +110,10 @@
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="invisible_char">●</property> <property name="invisible_char">●</property>
<property name="activates_default">True</property> <property name="activates_default">True</property>
<property name="invisible_char_set">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -133,13 +124,10 @@
<property name="visibility">False</property> <property name="visibility">False</property>
<property name="invisible_char">●</property> <property name="invisible_char">●</property>
<property name="activates_default">True</property> <property name="activates_default">True</property>
<property name="invisible_char_set">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -156,8 +144,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -173,7 +159,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">2</property> <property name="height">2</property>
</packing> </packing>
</child> </child>
@ -190,15 +175,11 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>

20
panels/printers/jobs-dialog.ui
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="jobs-dialog"> <object class="GtkDialog" id="jobs-dialog">
<property name="width_request">500</property> <property name="width_request">500</property>
<property name="height_request">350</property> <property name="height_request">350</property>
@ -43,14 +44,12 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkAlignment" id="content-alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkBox" id="box2"> <object class="GtkBox" id="box2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkScrolledWindow" id="queue-scrolledwindow"> <object class="GtkScrolledWindow" id="queue-scrolledwindow">
@ -78,9 +77,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
<style>
<class name="inline-toolbar"/>
</style>
<child> <child>
<object class="GtkToolButton" id="job-release-button"> <object class="GtkToolButton" id="job-release-button">
<property name="visible">True</property> <property name="visible">True</property>
@ -123,6 +119,9 @@
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
</packing> </packing>
</child> </child>
<style>
<class name="inline-toolbar"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -131,10 +130,8 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -145,5 +142,4 @@
<action-widget response="0">jobs-close-button</action-widget> <action-widget response="0">jobs-close-button</action-widget>
</action-widgets> </action-widgets>
</object> </object>
<object class="GtkSizeGroup" id="sizegroup1"/>
</interface> </interface>

23
panels/printers/new-printer-dialog.ui
View file

@ -112,15 +112,13 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkAlignment" id="content-alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkBox" id="box2"> <object class="GtkBox" id="box2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child> <child>
<object class="GtkStack" id="stack"> <object class="GtkStack" id="stack">
<property name="visible">True</property> <property name="visible">True</property>
@ -186,7 +184,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkAlignment" id="alignment2"> <object class="GtkFixed" id="fixed">
<property name="width_request">24</property> <property name="width_request">24</property>
<property name="height_request">24</property> <property name="height_request">24</property>
<property name="visible">True</property> <property name="visible">True</property>
@ -219,19 +217,13 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkAlignment" id="alignment3"> <object class="GtkSpinner" id="spinner">
<property name="width_request">24</property> <property name="width_request">24</property>
<property name="height_request">24</property> <property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkSpinner" id="spinner">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
@ -257,13 +249,6 @@
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
<action-widgets> <action-widgets>
<action-widget response="-6">new-printer-cancel-button</action-widget> <action-widget response="-6">new-printer-cancel-button</action-widget>

22
panels/printers/options-dialog.ui
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="options-dialog"> <object class="GtkDialog" id="options-dialog">
<property name="width_request">500</property> <property name="width_request">500</property>
<property name="height_request">400</property> <property name="height_request">400</property>
@ -17,14 +18,12 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">10</property> <property name="spacing">10</property>
<child>
<object class="GtkAlignment" id="content-alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkBox" id="box2"> <object class="GtkBox" id="box2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolled-window1"> <object class="GtkScrolledWindow" id="scrolled-window1">
<property name="width_request">120</property> <property name="width_request">120</property>
@ -64,10 +63,8 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
@ -82,18 +79,12 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkAlignment" id="alignment1"> <object class="GtkSpinner" id="options-spinner">
<property name="width_request">24</property> <property name="width_request">24</property>
<property name="height_request">24</property> <property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkSpinner" id="options-spinner">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
@ -148,5 +139,4 @@
<action-widget response="0">options-close-button</action-widget> <action-widget response="0">options-close-button</action-widget>
</action-widgets> </action-widgets>
</object> </object>
<object class="GtkSizeGroup" id="sizegroup1"/>
</interface> </interface>

22
panels/printers/ppd-selection-dialog.ui
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="ppd-selection-dialog"> <object class="GtkDialog" id="ppd-selection-dialog">
<property name="width_request">600</property> <property name="width_request">600</property>
<property name="height_request">400</property> <property name="height_request">400</property>
@ -53,18 +54,12 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkAlignment" id="alignment1"> <object class="GtkSpinner" id="ppd-spinner">
<property name="width_request">24</property> <property name="width_request">24</property>
<property name="height_request">24</property> <property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkSpinner" id="ppd-spinner">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
@ -100,14 +95,12 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkAlignment" id="content-alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<object class="GtkBox" id="box3"> <object class="GtkBox" id="box3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="spacing">10</property> <property name="spacing">10</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow1"> <object class="GtkScrolledWindow" id="scrolledwindow1">
@ -154,10 +147,8 @@
</packing> </packing>
</child> </child>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -169,5 +160,4 @@
<action-widget response="-5">ppd-selection-select-button</action-widget> <action-widget response="-5">ppd-selection-select-button</action-widget>
</action-widgets> </action-widgets>
</object> </object>
<object class="GtkSizeGroup" id="sizegroup1"/>
</interface> </interface>