[gnome-software] Use new-style dialogs
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Use new-style dialogs
- Date: Fri, 28 Feb 2014 18:15:31 +0000 (UTC)
commit b0a56f23e6aa6c9a5da9cbc5117a906bf6242059
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Feb 28 13:12:31 2014 -0500
Use new-style dialogs
The history and updates dialogs now use header bars.
And the history dialogs back button is an image button.
src/gnome-software.ui | 97 ++++++++++++++++---------------------------------
1 files changed, 31 insertions(+), 66 deletions(-)
---
diff --git a/src/gnome-software.ui b/src/gnome-software.ui
index 2f8ffd7..458d024 100644
--- a/src/gnome-software.ui
+++ b/src/gnome-software.ui
@@ -2040,6 +2040,7 @@
<object class="GtkDialog" id="dialog_history">
<property name="can_focus">False</property>
<property name="modal">True</property>
+ <property name="use-header-bar">1</property>
<property name="default_width">600</property>
<property name="default_height">300</property>
<property name="destroy_with_parent">True</property>
@@ -2056,32 +2057,6 @@
<property name="margin_bottom">6</property>
<property name="orientation">vertical</property>
<property name="spacing">9</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area2">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button_history_close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</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="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow_history">
<property name="visible">True</property>
@@ -2121,61 +2096,51 @@
<object class="GtkDialog" id="dialog_update">
<property name="can_focus">False</property>
<property name="modal">True</property>
+ <property name="use-header-bar">1</property>
<property name="default_width">600</property>
<property name="default_height">600</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="transient_for">window_software</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
- <property name="margin_start">6</property>
- <property name="margin_end">6</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button_update_back">
- <property name="label">gtk-go-back</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <child internal-child="headerbar">
+ <object class="GtkHeaderBar">
+ <child>
+ <object class="GtkButton" id="button_update_back">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="button_update_back_accessible">
+ <property name="accessible-name" translatable="yes">Go back</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
</child>
+ <style>
+ <class name="image-button"/>
+ </style>
<child>
- <object class="GtkButton" id="button_update_close">
- <property name="label" translatable="yes" comments="Translators: Label for a button to close
the update dialogue.">_Done</property>
+ <object class="GtkImage" id="image_update_back">
<property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-previous-symbolic</property>
+ <property name="icon_size">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="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="pack-type">start</property>
</packing>
</child>
+ </object>
+ </child>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="margin_start">6</property>
+ <property name="margin_end">6</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
<child>
<object class="GtkBox" id="box7">
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]