Use an action bar for the conficts ui in the print dialog

This commit is contained in:
William Jon McCann 2014-02-13 18:20:29 -05:00 committed by Matthias Clasen
parent 83ed0f8d47
commit 9a5f7c7978

View File

@ -65,10 +65,11 @@
<property name="can_focus">False</property>
<property name="border_width">0</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="spacing">0</property>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="border_width">0</property>
<property name="can_focus">True</property>
<property name="show_border">False</property>
<child>
@ -1634,21 +1635,15 @@
</packing>
</child>
<child>
<object class="GtkBox" id="conflicts_widget">
<object class="GtkActionBar" id="conflicts_widget">
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">dialog-warning</property>
<property name="icon_name">dialog-warning-symbolic</property>
<property name="icon_size">1</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="label24">
@ -1656,11 +1651,6 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">Some of the settings in the dialog conflict</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>