[gnome-packagekit] Move the '7 Updates (45Mb)' text to the button box to match the mockup
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-packagekit] Move the '7 Updates (45Mb)' text to the button box to match the mockup
- Date: Mon, 22 Aug 2011 15:05:53 +0000 (UTC)
commit f5411b06b84eec42203b8e1b40e39ba5eb4830fe
Author: Richard Hughes <richard hughsie com>
Date: Wed Aug 17 16:50:36 2011 +0100
Move the '7 Updates (45Mb)' text to the button box to match the mockup
data/gpk-update-viewer.ui | 168 ++++++++++++++++++++++++++------------------
1 files changed, 99 insertions(+), 69 deletions(-)
---
diff --git a/data/gpk-update-viewer.ui b/data/gpk-update-viewer.ui
index 461c55a..be91d6d 100644
--- a/data/gpk-update-viewer.ui
+++ b/data/gpk-update-viewer.ui
@@ -1,31 +1,96 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="dialog_updates">
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Software Update</property>
<property name="window_position">center</property>
<property name="icon_name">software-update-available</property>
<property name="type_hint">normal</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</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="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button_quit">
+ <property name="label">gtk-quit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_install">
+ <property name="label" translatable="yes">_Install Updates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_summary">
+ <property name="can_focus">False</property>
+ <property name="label">7 updates selected (45Mb)</property>
+ <property name="use_markup">True</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ <property name="secondary">True</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="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox_header">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">9</property>
<child>
<object class="GtkImage" id="image_header">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="pixel_size">48</property>
<property name="icon_name">system-software-update</property>
</object>
@@ -38,15 +103,17 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox_header_title">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label_header_title">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"><big><b>There are updates available</b></big></property>
<property name="use_markup">True</property>
</object>
@@ -59,12 +126,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_header_desc">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Software updates correct errors, eliminate security vulnerabilities and provide new features.</property>
<property name="wrap">True</property>
</object>
@@ -77,28 +146,33 @@
</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>
</packing>
</child>
<child>
<object class="GtkViewport" id="viewport_upgrade">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<property name="shadow_type">out</property>
<child>
<object class="GtkHBox" id="hbox_upgrade">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label_upgrade">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"><b>New distribution upgrade release available</b></property>
<property name="use_markup">True</property>
</object>
@@ -114,6 +188,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -128,6 +203,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -135,20 +211,20 @@
<object class="GtkVPaned" id="vpaned_updates">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="orientation">vertical</property>
<property name="position">800</property>
<property name="position_set">True</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow_updates">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="treeview_updates">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
</object>
</child>
</object>
@@ -161,8 +237,6 @@
<object class="GtkScrolledWindow" id="scrolledwindow_details">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="textview_details">
@@ -178,20 +252,23 @@
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkHBox" id="hbox_status">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="image_progress">
+ <property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</object>
<packing>
@@ -214,26 +291,31 @@
</child>
<child>
<object class="GtkLabel" id="label_status">
+ <property name="can_focus">False</property>
<property name="label"><b>Downloading</b></property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox_info">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">9</property>
<child>
<object class="GtkImage" id="image_info">
+ <property name="can_focus">False</property>
<property name="stock">gtk-remove</property>
</object>
<packing>
@@ -244,29 +326,20 @@
</child>
<child>
<object class="GtkLabel" id="label_info">
+ <property name="can_focus">False</property>
<property name="label">data that doesn't need the progressbar</property>
<property name="use_markup">True</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="label_summary">
- <property name="label">7 updates selected (45Mb)</property>
- <property name="use_markup">True</property>
- <property name="justify">right</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -279,57 +352,14 @@
</child>
</object>
<packing>
- <property name="position">1</property>
- <property name="fill">True</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button_quit">
- <property name="label">gtk-quit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_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">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_install">
- <property name="label" translatable="yes">_Install Updates</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
- <action-widget response="0">button_help</action-widget>
<action-widget response="0">button_quit</action-widget>
<action-widget response="0">button_install</action-widget>
</action-widgets>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
