gnome-packagekit r176 - in trunk: data libpackagekit-gnome po src
- From: rhughes svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-packagekit r176 - in trunk: data libpackagekit-gnome po src
- Date: Wed, 16 Apr 2008 20:59:13 +0100 (BST)
Author: rhughes
Date: Wed Apr 16 20:59:12 2008
New Revision: 176
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=176&view=rev
Log:
from git
Modified:
trunk/data/gnome-packagekit.schemas.in
trunk/data/gpk-application.glade
trunk/data/gpk-backend-status.glade
trunk/data/gpk-error.glade
trunk/data/gpk-eula.glade
trunk/data/gpk-install-file.glade
trunk/data/gpk-log.glade
trunk/data/gpk-prefs.glade
trunk/data/gpk-progress.glade
trunk/data/gpk-repo.glade
trunk/data/gpk-signature.glade
trunk/data/gpk-update-viewer.glade
trunk/libpackagekit-gnome/gpk-client.c
trunk/libpackagekit-gnome/gpk-common.c
trunk/libpackagekit-gnome/gpk-common.h
trunk/po/POTFILES.in
trunk/src/gpk-application.c
trunk/src/gpk-notify.c
trunk/src/gpk-repo.c
trunk/src/gpk-smart-icon.c
trunk/src/gpk-update-viewer.c
Modified: trunk/data/gnome-packagekit.schemas.in
==============================================================================
--- trunk/data/gnome-packagekit.schemas.in (original)
+++ trunk/data/gnome-packagekit.schemas.in Wed Apr 16 20:59:12 2008
@@ -14,38 +14,62 @@
</schema>
<schema>
- <key>/schemas/apps/gnome-packagekit/notify_restart</key>
- <applyto>/apps/gnome-packagekit/notify_restart</applyto>
+ <key>/schemas/apps/gnome-packagekit/notify_update_failed</key>
+ <applyto>/apps/gnome-packagekit/notify_update_failed</applyto>
<owner>gnome-packagekit</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Notify the user when we have to restart</short>
- <long>Notify the user when we have to restart</long>
+ <short>Notify the user when we have failed an update</short>
+ <long>Notify the user when we have failed an update</long>
</locale>
</schema>
<schema>
- <key>/schemas/apps/gnome-packagekit/notify_battery_update</key>
- <applyto>/apps/gnome-packagekit/notify_battery_update</applyto>
+ <key>/schemas/apps/gnome-packagekit/notify_update_complete</key>
+ <applyto>/apps/gnome-packagekit/notify_update_complete</applyto>
<owner>gnome-packagekit</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Notify the user when we have not started an autoupdate on battery</short>
- <long>Notify the user when we have not started an autoupdate on battery</long>
+ <short>Notify the user when we have completed an update</short>
+ <long>Notify the user when we have completed an update</long>
</locale>
</schema>
<schema>
- <key>/schemas/apps/gnome-packagekit/notify_started</key>
- <applyto>/apps/gnome-packagekit/notify_started</applyto>
+ <key>/schemas/apps/gnome-packagekit/notify_update_complete_restart</key>
+ <applyto>/apps/gnome-packagekit/notify_update_complete_restart</applyto>
<owner>gnome-packagekit</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Notify the user when we have started a task</short>
- <long>Notify the user when we have started a task</long>
+ <short>Notify the user when we have completed an update and need to restart</short>
+ <long>Notify the user when we have completed an update and need to restart</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnome-packagekit/notify_update_not_battery</key>
+ <applyto>/apps/gnome-packagekit/notify_update_not_battery</applyto>
+ <owner>gnome-packagekit</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Notify the user when we have not started an auto-update on battery</short>
+ <long>Notify the user when we have not started an auto-update on battery</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnome-packagekit/notify_update_started</key>
+ <applyto>/apps/gnome-packagekit/notify_update_started</applyto>
+ <owner>gnome-packagekit</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Notify the user when we have started an update</short>
+ <long>Notify the user when we have started an update</long>
</locale>
</schema>
Modified: trunk/data/gpk-application.glade
==============================================================================
--- trunk/data/gpk-application.glade (original)
+++ trunk/data/gpk-application.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_manager">
- <property name="visible">True</property>
<property name="title" translatable="yes">Add/Remove Software</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="icon_name">gtk-info</property>
@@ -544,27 +543,67 @@
</widget>
</child>
<child>
- <widget class="GtkHBox" id="hbox_filesize">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label30">
+ <widget class="GtkHBox" id="hbox_filesize">
<property name="visible">True</property>
- <property name="label" translatable="yes">Package size:</property>
+ <property name="border_width">5</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label_filesize_text">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Package size:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_filesize">
+ <property name="visible">True</property>
+ <property name="label">1.4 Mb</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_filesize">
+ <widget class="GtkHBox" id="hbox_source">
<property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label_source_text">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Software source:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_source">
+ <property name="visible">True</property>
+ <property name="label">rawhide</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
Modified: trunk/data/gpk-backend-status.glade
==============================================================================
--- trunk/data/gpk-backend-status.glade (original)
+++ trunk/data/gpk-backend-status.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_backend">
- <property name="visible">True</property>
<property name="title" translatable="yes">Backend Status</property>
<property name="resizable">False</property>
<property name="modal">True</property>
@@ -36,22 +35,14 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Backend Name:</property>
- </widget>
- <packing>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label20">
+ <widget class="GtkLabel" id="label_author">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Backend Author:</property>
+ <property name="label">Richard Hughes</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
@@ -72,20 +63,28 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_author">
+ <widget class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">Richard Hughes</property>
+ <property name="label" translatable="yes">Backend Author:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Backend Name:</property>
+ </widget>
+ <packing>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -125,115 +124,109 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkLabel" id="label45">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetUpdates:</property>
+ <property name="label" translatable="yes">Resolve:</property>
</widget>
<packing>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkImage" id="image_resolve">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">RefreshCache:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkLabel" id="label37">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">UpdateSystem:</property>
+ <property name="label" translatable="yes">Cancel </property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label25">
+ <widget class="GtkImage" id="image_cancel">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">SearchName:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkImage" id="image_search_file">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">SearchDetails:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
+ <widget class="GtkImage" id="image_search_group">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">SearchGroup:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">SearchFile:</property>
- </widget>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_updates">
+ <widget class="GtkImage" id="image_search_details">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_refresh_cache">
+ <widget class="GtkImage" id="image_search_name">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -253,109 +246,115 @@
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_search_name">
+ <widget class="GtkImage" id="image_refresh_cache">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_search_details">
+ <widget class="GtkImage" id="image_get_updates">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_search_group">
+ <widget class="GtkLabel" id="label28">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">SearchFile:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label27">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">SearchGroup:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_search_file">
+ <widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">SearchDetails:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_cancel">
+ <widget class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">SearchName:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label37">
+ <widget class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Cancel </property>
+ <property name="label" translatable="yes">UpdateSystem:</property>
</widget>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_resolve">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">RefreshCache:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label45">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Resolve:</property>
+ <property name="label" translatable="yes">GetUpdates:</property>
</widget>
<packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -370,116 +369,109 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">UpdatePackage:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label33">
+ <widget class="GtkImage" id="image_get_files">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">InstallPackage:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label32">
+ <widget class="GtkLabel" id="label49">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">RemovePackage:</property>
+ <property name="label" translatable="yes">GetFiles:</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkImage" id="image_file_install">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">GetDepends:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label30">
+ <widget class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetRequires:</property>
+ <property name="label" translatable="yes">InstallFile:</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label31">
+ <widget class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetUpdate Detail:</property>
+ <property name="label" translatable="yes">GetDescription:</property>
</widget>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_package_update">
+ <widget class="GtkImage" id="image_get_description">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_package_install">
+ <widget class="GtkImage" id="image_get_update_detail">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_package_remove">
+ <widget class="GtkImage" id="image_get_requires">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -499,111 +491,118 @@
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_requires">
+ <widget class="GtkImage" id="image_package_remove">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_update_detail">
+ <widget class="GtkImage" id="image_package_install">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_description">
+ <widget class="GtkImage" id="image_package_update">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label38">
+ <widget class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetDescription:</property>
+ <property name="label" translatable="yes">GetUpdate Detail:</property>
</widget>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label44">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">InstallFile:</property>
+ <property name="label" translatable="yes">GetRequires:</property>
</widget>
<packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_file_install">
+ <widget class="GtkLabel" id="label29">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">GetDepends:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label32">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">RemovePackage:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label49">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetFiles:</property>
+ <property name="label" translatable="yes">InstallPackage:</property>
</widget>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_files">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">UpdatePackage:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -619,67 +618,56 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">GetPackages</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image_get_packages">
+ <widget class="GtkImage" id="image_what_provides">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label46">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetRepositoryList:</property>
+ <property name="label" translatable="yes">WhatProvides:</property>
</widget>
<packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label47">
+ <widget class="GtkImage" id="image_get_repo_list">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">RepositoryEnable:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label48">
+ <widget class="GtkImage" id="image_repo_set_data">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">RepositorySetData:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -697,58 +685,69 @@
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_repo_set_data">
+ <widget class="GtkLabel" id="label48">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">RepositorySetData:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_repo_list">
+ <widget class="GtkLabel" id="label47">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">RepositoryEnable:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkLabel" id="label46">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">WhatProvides:</property>
+ <property name="label" translatable="yes">GetRepositoryList:</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_what_provides">
+ <widget class="GtkImage" id="image_get_packages">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">GetPackages</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -795,99 +794,90 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Newest:</property>
- </widget>
- <packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image_newest">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">7</property>
<property name="right_attach">8</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">GUI:</property>
</widget>
<packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_gui">
+ <widget class="GtkImage" id="image_supported">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkImage" id="image_visible">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Installed:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="y_options"></property>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_installed">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Supported:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Development:</property>
+ <property name="label" translatable="yes">Visible:</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_devel">
+ <widget class="GtkImage" id="image_free">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -907,91 +897,100 @@
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_free">
+ <widget class="GtkImage" id="image_devel">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Visible:</property>
+ <property name="label" translatable="yes">Development:</property>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkImage" id="image_installed">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Supported:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_visible">
+ <widget class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Installed:</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_supported">
+ <widget class="GtkImage" id="image_gui">
<property name="visible">True</property>
<property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">GUI:</property>
</widget>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkImage" id="image_newest">
<property name="visible">True</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
<property name="left_attach">7</property>
<property name="right_attach">8</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Newest:</property>
+ </widget>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
Modified: trunk/data/gpk-error.glade
==============================================================================
--- trunk/data/gpk-error.glade (original)
+++ trunk/data/gpk-error.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_error">
- <property name="visible">True</property>
<property name="title" translatable="yes">PackageKit Error</property>
<property name="resizable">False</property>
<property name="modal">True</property>
@@ -23,54 +22,22 @@
<property name="column_spacing">9</property>
<property name="row_spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label_title">
- <property name="visible">True</property>
- <property name="label"><b>Failed to install package</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label_message">
- <property name="visible">True</property>
- <property name="label">The human readable error message.</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-warning</property>
+ <property name="icon_size">6</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkExpander" id="expander_details">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -112,19 +79,51 @@
</packing>
</child>
<child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-warning</property>
- <property name="icon_size">6</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label_title">
+ <property name="visible">True</property>
+ <property name="label"><b>Failed to install package</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label_message">
+ <property name="visible">True</property>
+ <property name="label">The human readable error message.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
</widget>
Modified: trunk/data/gpk-eula.glade
==============================================================================
--- trunk/data/gpk-eula.glade (original)
+++ trunk/data/gpk-eula.glade Wed Apr 16 20:59:12 2008
@@ -3,8 +3,7 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_eula">
- <property name="visible">True</property>
- <property name="title" translatable="yes">PackageKit Error</property>
+ <property name="title" translatable="yes">License Agreement Required</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
@@ -23,46 +22,6 @@
<property name="column_spacing">9</property>
<property name="row_spacing">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTextView" id="textview_details">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-warning</property>
- <property name="icon_size">6</property>
- </widget>
- </child>
- <child>
<widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="spacing">12</property>
@@ -102,6 +61,46 @@
<property name="right_attach">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-warning</property>
+ <property name="icon_size">6</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTextView" id="textview_details">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="cursor_visible">False</property>
+ <property name="accepts_tab">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -145,7 +144,8 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">I accept the agreement</property>
+ <property name="label" translatable="yes">_Accept Agreement</property>
+ <property name="use_underline">True</property>
<property name="response_id">0</property>
</widget>
<packing>
Modified: trunk/data/gpk-install-file.glade
==============================================================================
--- trunk/data/gpk-install-file.glade (original)
+++ trunk/data/gpk-install-file.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_updates">
- <property name="visible">True</property>
<property name="title" translatable="yes">Install Package</property>
<property name="resizable">False</property>
<property name="modal">True</property>
Modified: trunk/data/gpk-log.glade
==============================================================================
--- trunk/data/gpk-log.glade (original)
+++ trunk/data/gpk-log.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_transactions">
- <property name="visible">True</property>
<property name="title" translatable="yes">Update History</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
Modified: trunk/data/gpk-prefs.glade
==============================================================================
--- trunk/data/gpk-prefs.glade (original)
+++ trunk/data/gpk-prefs.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_prefs">
- <property name="visible">True</property>
<property name="title" translatable="yes">Software Update Preferences</property>
<property name="resizable">False</property>
<property name="modal">True</property>
@@ -48,56 +47,56 @@
<property name="column_spacing">20</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label_check">
+ <widget class="GtkComboBox" id="combobox_check">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">C_heck for updates:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">combobox_check</property>
+ <property name="items"></property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_install">
+ <widget class="GtkComboBox" id="combobox_install">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Automatically install:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">combobox_install</property>
+ <property name="items"></property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_install">
+ <widget class="GtkLabel" id="label_install">
<property name="visible">True</property>
- <property name="items"></property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Automatically install:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">combobox_install</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_check">
+ <widget class="GtkLabel" id="label_check">
<property name="visible">True</property>
- <property name="items"></property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">C_heck for updates:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">combobox_check</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
Modified: trunk/data/gpk-progress.glade
==============================================================================
--- trunk/data/gpk-progress.glade (original)
+++ trunk/data/gpk-progress.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_progress">
- <property name="visible">True</property>
<property name="title" translatable="yes">PackageKit Progress</property>
<property name="resizable">False</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
Modified: trunk/data/gpk-repo.glade
==============================================================================
--- trunk/data/gpk-repo.glade (original)
+++ trunk/data/gpk-repo.glade Wed Apr 16 20:59:12 2008
@@ -3,8 +3,7 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_repo">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Repository Viewer</property>
+ <property name="title" translatable="yes">Software Sources</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="icon_name">gtk-info</property>
@@ -36,8 +35,8 @@
<widget class="GtkCheckButton" id="checkbutton_detail">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Shows more repositories that may be interesting</property>
- <property name="label" translatable="yes" comments="shows extra -source, -debuginfo, and -devel repos">_Show source, debug, and development repositories</property>
+ <property name="tooltip" translatable="yes">Shows more software sources that may be interesting</property>
+ <property name="label" translatable="yes" comments="shows extra -source, -debuginfo, and -devel software sources">_Show debug and development software sources</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
Modified: trunk/data/gpk-signature.glade
==============================================================================
--- trunk/data/gpk-signature.glade (original)
+++ trunk/data/gpk-signature.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_gpg">
- <property name="visible">True</property>
<property name="title" translatable="yes">Software signature is required</property>
<property name="resizable">False</property>
<property name="modal">True</property>
@@ -38,36 +37,41 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkLabel" id="label_name">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Repository name:</property>
+ <property name="label">Livna.org Freeworld Repo</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkLabel" id="label_id">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Signature URL:</property>
+ <property name="label">BB7576AC</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkLabel" id="label_user">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Signature user identifier:</property>
+ <property name="label">Livna.org <rpm livna org></property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
@@ -75,42 +79,40 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label_url">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Signature identifier:</property>
+ <property name="label">http://rpm.livna.org/</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_url">
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">http://rpm.livna.org/</property>
+ <property name="label" translatable="yes">Signature identifier:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_user">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">Livna.org <rpm livna org></property>
+ <property name="label" translatable="yes">Signature user identifier:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
@@ -118,29 +120,26 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_id">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">BB7576AC</property>
+ <property name="label" translatable="yes">Signature URL:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_name">
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">Livna.org Freeworld Repo</property>
+ <property name="label" translatable="yes">Repository name:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
Modified: trunk/data/gpk-update-viewer.glade
==============================================================================
--- trunk/data/gpk-update-viewer.glade (original)
+++ trunk/data/gpk-update-viewer.glade Wed Apr 16 20:59:12 2008
@@ -3,7 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="window_updates">
- <property name="visible">True</property>
<property name="title" translatable="yes">Update System</property>
<property name="resizable">False</property>
<property name="modal">True</property>
@@ -69,50 +68,40 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkLabel" id="label_last_update">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkButton" id="button_history">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">View History</property>
- <property name="response_id">0</property>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Unknown....</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment_refresh">
+ <widget class="GtkLabel" id="label_last_refresh">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <placeholder/>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Unknown....</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Last refresh:</property>
+ <property name="label" translatable="yes">Last update:</property>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -120,38 +109,48 @@
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Last update:</property>
+ <property name="label" translatable="yes">Last refresh:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_last_refresh">
+ <widget class="GtkAlignment" id="alignment_refresh">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Unknown....</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_last_update">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Unknown....</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkButton" id="button_history">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">View History</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
Modified: trunk/libpackagekit-gnome/gpk-client.c
==============================================================================
--- trunk/libpackagekit-gnome/gpk-client.c (original)
+++ trunk/libpackagekit-gnome/gpk-client.c Wed Apr 16 20:59:12 2008
@@ -49,6 +49,7 @@
static void gpk_client_finalize (GObject *object);
#define GPK_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPK_TYPE_CLIENT, GpkClientPrivate))
+#define PK_STOCK_WINDOW_ICON "system-software-installer"
/**
* GpkClientPrivate:
@@ -390,10 +391,15 @@
gboolean ret;
GError *error_local = NULL;
gchar *text;
+ GtkWidget *widget;
g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE);
g_return_val_if_fail (file_rel != NULL, FALSE);
+ /* show window */
+ widget = glade_xml_get_widget (gclient->priv->glade_xml, "window_updates");
+ gtk_widget_show (widget);
+
ret = pk_client_install_file (gclient->priv->client_action, file_rel, &error_local);
if (!ret) {
/* check if we got a permission denied */
@@ -464,6 +470,10 @@
g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE);
g_return_val_if_fail (package_id != NULL, FALSE);
+ /* show window */
+ widget = glade_xml_get_widget (gclient->priv->glade_xml, "window_updates");
+ gtk_widget_show (widget);
+
/* are we dumb and can't check for depends? */
if (!pk_enums_contain (gclient->priv->roles, PK_ROLE_ENUM_GET_DEPENDS)) {
pk_warning ("skipping depends check");
@@ -598,10 +608,15 @@
gboolean already_installed = FALSE;
gchar *package_id = NULL;
PkPackageItem *item;
+ GtkWidget *widget;
g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE);
g_return_val_if_fail (package != NULL, FALSE);
+ /* show window */
+ widget = glade_xml_get_widget (gclient->priv->glade_xml, "window_updates");
+ gtk_widget_show (widget);
+
ret = pk_client_resolve (gclient->priv->client_resolve, PK_FILTER_ENUM_NONE, package, &error_local);
if (!ret) {
gpk_client_error_msg (gclient, _("Failed to resolve package"), _("Incorrect response from search"));
@@ -677,10 +692,15 @@
PkPackageItem *item;
PkPackageId *ident;
gchar *text;
+ GtkWidget *widget;
g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE);
g_return_val_if_fail (full_path != NULL, FALSE);
+ /* show window */
+ widget = glade_xml_get_widget (gclient->priv->glade_xml, "window_updates");
+ gtk_widget_show (widget);
+
ret = pk_client_search_file (gclient->priv->client_resolve, PK_FILTER_ENUM_NONE, full_path, &error_local);
if (!ret) {
text = g_strdup_printf ("%s: %s", _("Incorrect response from search"), error_local->message);
@@ -787,6 +807,9 @@
widget = glade_xml_get_widget (glade_xml, "button_no");
g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);
+ /* set icon name */
+ gtk_window_set_icon_name (GTK_WINDOW (widget), PK_STOCK_WINDOW_ICON);
+
/* connect up buttons */
widget = glade_xml_get_widget (glade_xml, "button_yes");
g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_sig_button_yes), gclient);
@@ -863,6 +886,9 @@
widget = glade_xml_get_widget (glade_xml, "button_cancel");
g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_main_quit), NULL);
+ /* set icon name */
+ gtk_window_set_icon_name (GTK_WINDOW (widget), PK_STOCK_WINDOW_ICON);
+
/* connect up buttons */
widget = glade_xml_get_widget (glade_xml, "button_agree");
g_signal_connect (widget, "clicked", G_CALLBACK (gpk_client_sig_button_yes), gclient);
@@ -882,6 +908,9 @@
widget = glade_xml_get_widget (glade_xml, "textview_details");
gtk_text_view_set_buffer (GTK_TEXT_VIEW (widget), buffer);
+ /* set minimum size a bit bigger */
+ gtk_widget_set_size_request (widget, 100, 200);
+
/* show window */
widget = glade_xml_get_widget (glade_xml, "window_eula");
gtk_widget_show (widget);
Modified: trunk/libpackagekit-gnome/gpk-common.c
==============================================================================
--- trunk/libpackagekit-gnome/gpk-common.c (original)
+++ trunk/libpackagekit-gnome/gpk-common.c Wed Apr 16 20:59:12 2008
@@ -204,6 +204,7 @@
gpk_package_id_format_twoline (const gchar *package_id, const gchar *summary)
{
PkPackageId *ident;
+ gchar *summary_safe;
gchar *text;
GString *string;
@@ -219,7 +220,9 @@
string = g_string_new (ident->name);
} else {
string = g_string_new ("");
- g_string_append_printf (string, "<b>%s</b>\n%s", summary, ident->name);
+ summary_safe = g_markup_escape_text (summary, -1);
+ g_string_append_printf (string, "<b>%s</b>\n%s", summary_safe, ident->name);
+ g_free (summary_safe);
}
/* some backends don't provide this */
@@ -244,6 +247,7 @@
gpk_package_id_format_oneline (const gchar *package_id, const gchar *summary)
{
PkPackageId *ident;
+ gchar *summary_safe;
gchar *text;
/* split by delimeter */
@@ -257,7 +261,9 @@
/* just have name */
text = g_strdup (ident->name);
} else {
- text = g_strdup_printf ("<b>%s</b> (%s)", summary, ident->name);
+ summary_safe = g_markup_escape_text (summary, -1);
+ text = g_strdup_printf ("<b>%s</b> (%s)", summary_safe, ident->name);
+ g_free (summary_safe);
}
pk_package_id_free (ident);
@@ -394,6 +400,12 @@
case PK_ERROR_ENUM_NO_LICENSE_AGREEMENT:
text = _("The license agreement failed");
break;
+ case PK_ERROR_ENUM_FILE_CONFLICTS:
+ text = _("Local file conflict between packages");
+ break;
+ case PK_ERROR_ENUM_REPO_NOT_AVAILABLE:
+ text = _("Problem connecting to a software source");
+ break;
default:
text = _("Unknown error");
}
@@ -496,6 +508,14 @@
text = _("The license agreement was not agreed to.\n"
"To use this software you have to accept the license.");
break;
+ case PK_ERROR_ENUM_FILE_CONFLICTS:
+ text = _("Two packages provide the same file.\n"
+ "This is usually due to mixing packages for different software sources.");
+ break;
+ case PK_ERROR_ENUM_REPO_NOT_AVAILABLE:
+ text = _("There was a (possibly temporary) problem connecting to a software source\n"
+ "Please check the detailed error for further details.");
+ break;
default:
text = _("Unknown error, please report a bug.\n"
"More information is available in the detailed report.");
Modified: trunk/libpackagekit-gnome/gpk-common.h
==============================================================================
--- trunk/libpackagekit-gnome/gpk-common.h (original)
+++ trunk/libpackagekit-gnome/gpk-common.h Wed Apr 16 20:59:12 2008
@@ -32,9 +32,11 @@
#define GPK_CONF_NOTIFY_CRITICAL "/apps/gnome-packagekit/notify_critical"
#define GPK_CONF_NOTIFY_ERROR "/apps/gnome-packagekit/notify_errors"
#define GPK_CONF_NOTIFY_MESSAGE "/apps/gnome-packagekit/notify_message"
-#define GPK_CONF_NOTIFY_STARTED "/apps/gnome-packagekit/notify_started"
-#define GPK_CONF_NOTIFY_BATTERY_UPDATE "/apps/gnome-packagekit/notify_battery_update"
-#define GPK_CONF_NOTIFY_RESTART "/apps/gnome-packagekit/notify_restart"
+#define GPK_CONF_NOTIFY_UPDATE_STARTED "/apps/gnome-packagekit/notify_update_started"
+#define GPK_CONF_NOTIFY_UPDATE_NOT_BATTERY "/apps/gnome-packagekit/notify_update_not_battery"
+#define GPK_CONF_NOTIFY_UPDATE_FAILED "/apps/gnome-packagekit/notify_update_failed"
+#define GPK_CONF_NOTIFY_UPDATE_COMPLETE "/apps/gnome-packagekit/notify_update_complete"
+#define GPK_CONF_NOTIFY_UPDATE_COMPLETE_RESTART "/apps/gnome-packagekit/notify_update_complete_restart"
#define GPK_CONF_AUTOCOMPLETE "/apps/gnome-packagekit/autocomplete"
#define GPK_CONF_SESSION_STARTUP_TIMEOUT "/apps/gnome-packagekit/session_startup_timeout"
#define GPK_CONF_FREQUENCY_GET_UPDATES "/apps/gnome-packagekit/frequency_get_updates"
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Wed Apr 16 20:59:12 2008
@@ -19,6 +19,7 @@
data/gpk-update-viewer.desktop.in
data/gpk-update-viewer.glade
data/gpk-error.glade
+data/gpk-eula.glade
libpackagekit-gnome/gpk-error.c
libpackagekit-gnome/gpk-common.c
libpackagekit-gnome/gpk-client.c
Modified: trunk/src/gpk-application.c
==============================================================================
--- trunk/src/gpk-application.c (original)
+++ trunk/src/gpk-application.c Wed Apr 16 20:59:12 2008
@@ -172,6 +172,53 @@
}
/**
+ * gpk_application_treeview_sort_none:
+ **/
+static gint
+gpk_application_treeview_sort_none (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
+{
+ return 0;
+}
+
+/**
+ * gpk_application_treeview_sort_text:
+ **/
+static gint
+gpk_application_treeview_sort_text (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
+{
+ gchar *a_txt;
+ gchar *b_txt;
+ gint ret;
+ gtk_tree_model_get (model, a, PACKAGES_COLUMN_ID, &a_txt, -1);
+ gtk_tree_model_get (model, b, PACKAGES_COLUMN_ID, &b_txt, -1);
+ ret = strcmp (a_txt, b_txt);
+ g_free (a_txt);
+ g_free (b_txt);
+ return ret;
+}
+
+/**
+ * gpk_application_treeview_set_sorted:
+ **/
+static void
+gpk_application_treeview_set_sorted (GpkApplication *application, gboolean sorted)
+{
+ if (sorted) {
+ pk_debug ("sorted");
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (application->priv->packages_store),
+ PACKAGES_COLUMN_ID, gpk_application_treeview_sort_text, NULL, NULL);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (application->priv->packages_store),
+ PACKAGES_COLUMN_ID, GTK_SORT_ASCENDING);
+ } else {
+ pk_debug ("unsorted");
+ gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (application->priv->packages_store),
+ gpk_application_treeview_sort_none, NULL, NULL);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (application->priv->packages_store),
+ GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
+ }
+}
+
+/**
* gpk_application_install:
**/
static gboolean
@@ -179,19 +226,18 @@
{
gboolean ret;
GError *error = NULL;
- GpkClient *gclient;
g_return_val_if_fail (PK_IS_APPLICATION (application), FALSE);
g_return_val_if_fail (package_id != NULL, FALSE);
pk_debug ("install %s", application->priv->package);
- /* xxx TODO: this is hacky code for testing only */
- gclient = gpk_client_new ();
- ret = gpk_client_install_package_id (gclient, package_id, NULL);
- g_object_unref (gclient);
-
- return ret;
+ /* TODO: this is hacky code for testing only */
+// GpkClient *gclient;
+// gclient = gpk_client_new ();
+// ret = gpk_client_install_package_id (gclient, package_id, NULL);
+// g_object_unref (gclient);
+// return ret;
ret = pk_client_reset (application->priv->client_action, &error);
if (!ret) {
@@ -202,12 +248,19 @@
/* do the install */
ret = pk_client_install_package (application->priv->client_action,
- application->priv->package, NULL);
+ application->priv->package, &error);
if (!ret) {
pk_warning ("failed to install package: %s", error->message);
- /* ick, we failed so pretend we didn't do the action */
- gpk_error_dialog (_("The package could not be installed"),
- _("Running the transaction failed"), error->message);
+ if (strcmp (error->message, "org.freedesktop.packagekit.install no") == 0) {
+ gpk_error_dialog (_("The package could not be installed"),
+ _("You don't have the necessary privileges to install packages"), NULL);
+ } else if (g_str_has_prefix (error->message, "org.freedesktop.packagekit.install")) {
+ /* canceled auth dialog, be silent */
+ } else {
+ /* ick, we failed so pretend we didn't do the action */
+ gpk_error_dialog (_("The package could not be installed"),
+ _("The package could not be installed"), error->message);
+ }
g_error_free (error);
}
return ret;
@@ -423,6 +476,7 @@
{
GtkWidget *widget;
gchar *text;
+ PkPackageId *ident;
g_return_if_fail (PK_IS_APPLICATION (application));
@@ -466,6 +520,19 @@
widget = glade_xml_get_widget (application->priv->glade_xml, "hbox_filesize");
gtk_widget_hide (widget);
}
+
+ /* set the repo text, or hide if installed */
+ ident = pk_package_id_new_from_string (package_id);
+ if (pk_strequal (ident->data, "installed")) {
+ widget = glade_xml_get_widget (application->priv->glade_xml, "hbox_source");
+ gtk_widget_hide (widget);
+ } else {
+ widget = glade_xml_get_widget (application->priv->glade_xml, "hbox_source");
+ gtk_widget_show (widget);
+ widget = glade_xml_get_widget (application->priv->glade_xml, "label_source");
+ gtk_label_set_label (GTK_LABEL (widget), ident->data);
+ }
+ pk_package_id_free (ident);
}
/**
@@ -708,7 +775,8 @@
if (role == PK_ROLE_ENUM_SEARCH_NAME ||
role == PK_ROLE_ENUM_SEARCH_DETAILS ||
- role == PK_ROLE_ENUM_SEARCH_GROUP) {
+ role == PK_ROLE_ENUM_SEARCH_GROUP ||
+ role == PK_ROLE_ENUM_GET_PACKAGES) {
/* switch round buttons */
gpk_application_set_find_cancel_buttons (application, TRUE);
@@ -727,6 +795,8 @@
/* focus back to the text extry */
widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
gtk_widget_grab_focus (widget);
+
+ gpk_application_treeview_set_sorted (application, TRUE);
}
/* hide widget */
@@ -832,6 +902,9 @@
return FALSE;
}
+ /* unsorted */
+ gpk_application_treeview_set_sorted (application, FALSE);
+
/* clear existing list */
gtk_list_store_clear (application->priv->packages_store);
application->priv->has_package = FALSE;
@@ -870,6 +943,9 @@
return FALSE;
}
+ /* unsorted */
+ gpk_application_treeview_set_sorted (application, FALSE);
+
/* refresh the search as the items may have changed */
gtk_list_store_clear (application->priv->packages_store);
@@ -881,6 +957,7 @@
ret = pk_client_get_packages (application->priv->client_search,
application->priv->filters_current, &error);
}
+
if (ret) {
/* switch around buttons */
gpk_application_set_find_cancel_buttons (application, FALSE);
@@ -899,6 +976,7 @@
gpk_application_perform_search (GpkApplication *application)
{
gboolean ret = FALSE;
+
if (application->priv->search_mode == PK_MODE_NAME_DETAILS_FILE) {
ret = gpk_application_perform_search_name_details_file (application);
} else if (application->priv->search_mode == PK_MODE_GROUP ||
@@ -1666,7 +1744,7 @@
/* try to refresh the cache */
ret = pk_client_refresh_cache (application->priv->client_action, FALSE, &error);
if (!ret) {
- gpk_error_dialog (_("The package could not be installed"),
+ gpk_error_dialog (_("The cache could not be refreshed"),
_("Running the transaction failed"), error->message);
g_error_free (error);
return;
@@ -1952,6 +2030,20 @@
}
/**
+ * gpk_application_group_row_separator_func:
+ **/
+static gboolean
+gpk_application_group_row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+ gchar *name = NULL;
+ gboolean ret;
+ gtk_tree_model_get (model, iter, GROUPS_COLUMN_ID, &name, -1);
+ ret = pk_strequal (name, "separator");
+ g_free (name);
+ return ret;
+}
+
+/**
* gpk_application_init:
**/
static void
@@ -2396,9 +2488,8 @@
G_TYPE_STRING,
G_TYPE_STRING);
- /* sorted */
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (application->priv->packages_store),
- PACKAGES_COLUMN_TEXT, GTK_SORT_ASCENDING);
+ /* unsorted */
+ gpk_application_treeview_set_sorted (application, FALSE);
/* create package tree view */
widget = glade_xml_get_widget (application->priv->glade_xml, "treeview_packages");
@@ -2422,6 +2513,10 @@
GROUPS_COLUMN_NAME, _("All packages"),
GROUPS_COLUMN_ID, "all-packages",
GROUPS_COLUMN_ICON, icon_name, -1);
+ /* add a separator */
+ gtk_list_store_append (application->priv->groups_store, &iter);
+ gtk_list_store_set (application->priv->groups_store, &iter,
+ GROUPS_COLUMN_ID, "separator", -1);
}
/* create group tree view if we can search by group */
@@ -2444,6 +2539,10 @@
}
}
}
+
+ /* use a seporator */
+ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget),
+ gpk_application_group_row_separator_func, NULL, NULL);
}
/**
Modified: trunk/src/gpk-notify.c
==============================================================================
--- trunk/src/gpk-notify.c (original)
+++ trunk/src/gpk-notify.c Wed Apr 16 20:59:12 2008
@@ -146,7 +146,7 @@
cmdline = g_strconcat ("gnome-open ", url, NULL);
ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
g_free (cmdline);
-
+
if (ret == FALSE) {
error_dialog = gtk_message_dialog_new (GTK_WINDOW (about),
GTK_DIALOG_MODAL,
@@ -232,10 +232,7 @@
* Display the popup menu.
**/
static void
-gpk_notify_popup_menu_cb (GtkStatusIcon *status_icon,
- guint button,
- guint32 timestamp,
- GpkNotify *icon)
+gpk_notify_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint32 timestamp, GpkNotify *icon)
{
GtkMenu *menu = (GtkMenu*) gtk_menu_new ();
GtkWidget *item;
@@ -299,7 +296,6 @@
GString *message_text;
guint skipped_number = 0;
const gchar *message;
- gboolean value;
g_return_if_fail (GPK_IS_NOTIFY (notify));
@@ -318,13 +314,6 @@
return;
}
- /* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_MESSAGE, NULL);
- if (value == FALSE) {
- pk_debug ("not showing notification as prevented in gconf");
- return;
- }
-
message_text = g_string_new ("");
/* find any we skipped */
@@ -368,16 +357,19 @@
g_string_set_size (message_text, message_text->len-1);
}
- /* do the notify, and show the right buttons */
- pk_debug ("Doing notification");
+ /* this will not show if specified in gconf */
gpk_smart_icon_notify_new (notify->priv->sicon,
_("The system update has completed"), message_text->str,
"software-update-available",
GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
if (restart == PK_RESTART_ENUM_SYSTEM) {
gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_RESTART_COMPUTER, NULL);
+ gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN,
+ GPK_CONF_NOTIFY_UPDATE_COMPLETE_RESTART);
+ } else {
+ gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN,
+ GPK_CONF_NOTIFY_UPDATE_COMPLETE);
}
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_RESTART);
gpk_smart_icon_notify_show (notify->priv->sicon);
g_string_free (message_text, TRUE);
}
@@ -411,7 +403,9 @@
gpk_smart_icon_notify_new (notify->priv->sicon, _("Failed to update system"), message,
"process-stop", GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_SHORT);
g_free (message);
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_ERROR);
+ gpk_smart_icon_notify_button (notify->priv->sicon,
+ GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN,
+ GPK_CONF_NOTIFY_UPDATE_FAILED);
gpk_smart_icon_notify_show (notify->priv->sicon);
}
return ret;
@@ -497,18 +491,10 @@
{
const gchar *title;
gchar *message;
- gboolean value;
GString *string;
g_return_if_fail (GPK_IS_NOTIFY (notify));
- /* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_CRITICAL, NULL);
- if (value == FALSE) {
- pk_debug ("not showing notification as prevented in gconf");
- return;
- }
-
/* format title */
title = ngettext ("Security update available", "Security updates available", number);
@@ -520,7 +506,7 @@
g_string_append (string, details);
message = g_string_free (string, FALSE);
- pk_debug ("Doing critical updates warning: %s", message);
+ /* this will not show if specified in gconf */
gpk_smart_icon_notify_new (notify->priv->sicon, title, message, "software-update-urgent",
GPK_NOTIFY_URGENCY_CRITICAL, GPK_NOTIFY_TIMEOUT_NEVER);
gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_UPDATE_COMPUTER, NULL);
@@ -536,23 +522,17 @@
static void
gpk_notify_auto_update_message (GpkNotify *notify)
{
- gboolean value;
-
g_return_if_fail (GPK_IS_NOTIFY (notify));
- /* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_MESSAGE, NULL);
- if (value == FALSE) {
- pk_debug ("not showing notification as prevented in gconf");
- return;
- }
-
+ /* this will not show if specified in gconf */
gpk_smart_icon_notify_new (notify->priv->sicon,
_("Updates are being installed"),
- _("Updates are being automatically installed on your computer"), "software-update-urgent",
+ _("Updates are being automatically installed on your computer"),
+ "software-update-urgent",
GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_CANCEL_UPDATE, NULL);
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_STARTED);
+ gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN,
+ GPK_CONF_NOTIFY_UPDATE_STARTED);
gpk_smart_icon_notify_show (notify->priv->sicon);
}
@@ -629,28 +609,25 @@
{
gboolean on_battery;
gboolean conf_update_battery;
- gboolean value;
+ gboolean ret;
g_return_val_if_fail (GPK_IS_NOTIFY (notify), FALSE);
on_battery = gpk_auto_refresh_get_on_battery (notify->priv->arefresh);
conf_update_battery = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_UPDATE_BATTERY, NULL);
if (!conf_update_battery && on_battery) {
- /* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_BATTERY_UPDATE, NULL);
- if (value) {
- gpk_smart_icon_notify_new (notify->priv->sicon,
- _("Will not install updates"),
- _("Automatic updates are not being installed as the computer is on battery power"),
- "dialog-information", GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
- gpk_smart_icon_notify_button (notify->priv->sicon,
- GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN,
- GPK_CONF_NOTIFY_BATTERY_UPDATE);
- gpk_smart_icon_notify_show (notify->priv->sicon);
- }
- return FALSE;
+ /* this will not show if specified in gconf */
+ gpk_smart_icon_notify_new (notify->priv->sicon,
+ _("Will not install updates"),
+ _("Automatic updates are not being installed as the computer is on battery power"),
+ "dialog-information",
+ GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
+ gpk_smart_icon_notify_button (notify->priv->sicon,
+ GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN,
+ GPK_CONF_NOTIFY_UPDATE_NOT_BATTERY);
+ ret = gpk_smart_icon_notify_show (notify->priv->sicon);
}
- return TRUE;
+ return ret;
}
/**
@@ -826,7 +803,6 @@
gpk_notify_error_code_cb (PkClient *client, PkErrorCodeEnum error_code, const gchar *details, GpkNotify *notify)
{
const gchar *title;
- gboolean value;
g_return_if_fail (GPK_IS_NOTIFY (notify));
@@ -839,16 +815,11 @@
return;
}
- /* are we accepting notifications */
- value = gconf_client_get_bool (notify->priv->gconf_client, GPK_CONF_NOTIFY_ERROR, NULL);
- if (value == FALSE) {
- pk_debug ("not showing notification as prevented in gconf");
- return;
- }
-
+ /* this will not show if specified in gconf */
gpk_smart_icon_notify_new (notify->priv->sicon, title, details, "help-browser",
GPK_NOTIFY_URGENCY_LOW, GPK_NOTIFY_TIMEOUT_LONG);
- gpk_smart_icon_notify_button (notify->priv->sicon, GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_ERROR);
+ gpk_smart_icon_notify_button (notify->priv->sicon,
+ GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN, GPK_CONF_NOTIFY_ERROR);
gpk_smart_icon_notify_show (notify->priv->sicon);
}
Modified: trunk/src/gpk-repo.c
==============================================================================
--- trunk/src/gpk-repo.c (original)
+++ trunk/src/gpk-repo.c Wed Apr 16 20:59:12 2008
@@ -188,7 +188,7 @@
/* column for text */
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Repository"), renderer,
+ column = gtk_tree_view_column_new_with_attributes (_("Software Source"), renderer,
"markup", REPO_COLUMN_TEXT, NULL);
gtk_tree_view_column_set_sort_column_id (column, REPO_COLUMN_TEXT);
gtk_tree_view_append_column (treeview, column);
@@ -399,12 +399,19 @@
widget = glade_xml_get_widget (glade_xml, "statusbar_status");
gpk_statusbar_set_widget (statusbar, widget);
+ /* show window */
+ gtk_widget_show (main_window);
+
+ /* focus back to the close button */
+ widget = glade_xml_get_widget (glade_xml, "button_close");
+ gtk_widget_grab_focus (widget);
+
if (pk_enums_contain (roles, PK_ROLE_ENUM_GET_REPO_LIST)) {
/* get the update list */
pk_repo_repo_list_refresh ();
} else {
pk_repo_detail_cb (client, "default",
- _("Getting repository list not supported by backend"), FALSE, NULL);
+ _("Getting software source list not supported by backend"), FALSE, NULL);
widget = glade_xml_get_widget (glade_xml, "treeview_repo");
gtk_widget_set_sensitive (widget, FALSE);
widget = glade_xml_get_widget (glade_xml, "checkbutton_detail");
Modified: trunk/src/gpk-smart-icon.c
==============================================================================
--- trunk/src/gpk-smart-icon.c (original)
+++ trunk/src/gpk-smart-icon.c Wed Apr 16 20:59:12 2008
@@ -38,6 +38,7 @@
#include <libnotify/notify.h>
#include <gtk/gtkstatusicon.h>
#include <libnotify/notify.h>
+#include <gconf/gconf-client.h>
#include <pk-debug.h>
#include <pk-enum.h>
@@ -56,10 +57,12 @@
{
GtkStatusIcon *status_icon;
NotifyNotification *dialog;
+ GConfClient *gconf_client;
gchar *current;
gchar *new;
gchar *notify_data;
guint event_source;
+ gboolean has_gconf_check;
};
enum {
@@ -201,12 +204,17 @@
**/
gboolean
gpk_smart_icon_notify_new (GpkSmartIcon *sicon, const gchar *title, const gchar *message,
- const gchar *icon, GpkNotifyUrgency urgency, GpkNotifyTimeout timeout)
+ const gchar *icon, GpkNotifyUrgency urgency, GpkNotifyTimeout timeout)
{
guint timeout_val = 0;
g_return_val_if_fail (PK_IS_SMART_ICON (sicon), FALSE);
+ pk_debug ("Doing notification: %s, %s, %s", title, message, icon);
+
+ /* no gconf to check */
+ sicon->priv->has_gconf_check = FALSE;
+
/* default values */
if (timeout == GPK_NOTIFY_TIMEOUT_SHORT) {
timeout_val = 5000;
@@ -259,8 +267,10 @@
/* find the localised text */
if (button == GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN) {
text = _("Do not show this notification again");
+ sicon->priv->has_gconf_check = TRUE;
} else if (button == GPK_NOTIFY_BUTTON_DO_NOT_WARN_AGAIN) {
text = _("Do not warn me again");
+ sicon->priv->has_gconf_check = TRUE;
} else if (button == GPK_NOTIFY_BUTTON_CANCEL_UPDATE) {
text = _("Cancel system update");
} else if (button == GPK_NOTIFY_BUTTON_UPDATE_COMPUTER) {
@@ -279,15 +289,35 @@
/**
* gpk_smart_icon_notify_show:
+ * Return value: if the notification is being displayed
+ *
+ * This will show the notification previously setup with gpk_smart_icon_notify_new() and
+ * gpk_smart_icon_notify_button().
+ *
+ * If you set a key using %GPK_NOTIFY_BUTTON_DO_NOT_SHOW_AGAIN or
+ * %GPK_NOTIFY_BUTTON_DO_NOT_WARN_AGAIN then this key will be checked before the notification is
+ * shown.
**/
gboolean
gpk_smart_icon_notify_show (GpkSmartIcon *sicon)
{
GError *error = NULL;
+ gboolean value;
g_return_val_if_fail (PK_IS_SMART_ICON (sicon), FALSE);
g_return_val_if_fail (sicon->priv->dialog != NULL, FALSE);
+ /* check the gconf key isn't set to ignore */
+ if (sicon->priv->has_gconf_check) {
+ pk_debug ("key is %s", sicon->priv->notify_data);
+ /* are we accepting notifications */
+ value = gconf_client_get_bool (sicon->priv->gconf_client, sicon->priv->notify_data, NULL);
+ if (!value) {
+ pk_debug ("not showing notification as prevented in gconf with %s", sicon->priv->notify_data);
+ return FALSE;
+ }
+ }
+
notify_notification_close (sicon->priv->dialog, NULL);
notify_notification_show (sicon->priv->dialog, &error);
if (error != NULL) {
@@ -323,6 +353,8 @@
sicon->priv->dialog = NULL;
sicon->priv->notify_data = NULL;
sicon->priv->event_source = 0;
+ sicon->priv->has_gconf_check = FALSE;
+ sicon->priv->gconf_client = gconf_client_get_default ();
/* signal we are here... */
notify_init ("packagekit");
@@ -346,6 +378,7 @@
g_free (sicon->priv->new);
g_free (sicon->priv->current);
+ g_object_unref (sicon->priv->gconf_client);
g_object_unref (sicon->priv->status_icon);
if (sicon->priv->dialog != NULL) {
Modified: trunk/src/gpk-update-viewer.c
==============================================================================
--- trunk/src/gpk-update-viewer.c (original)
+++ trunk/src/gpk-update-viewer.c Wed Apr 16 20:59:12 2008
@@ -2026,6 +2026,9 @@
g_signal_connect (tlist, "finished",
G_CALLBACK (pk_update_viewer_task_list_finished_cb), NULL);
+ /* show window */
+ gtk_widget_show (main_window);
+
/* coldplug */
pk_update_viewer_get_new_update_list ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
