gnome-packagekit r122 - in trunk: . data src
- From: rhughes svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-packagekit r122 - in trunk: . data src
- Date: Sun, 23 Mar 2008 23:28:26 +0000 (GMT)
Author: rhughes
Date: Sun Mar 23 23:28:26 2008
New Revision: 122
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=122&view=rev
Log:
from git
Modified:
trunk/configure.ac
trunk/data/pk-application.desktop.in
trunk/data/pk-update-viewer.glade
trunk/src/pk-common-gui.c
trunk/src/pk-install-file.c
trunk/src/pk-install-package.c
trunk/src/pk-progress.c
trunk/src/pk-update-viewer.c
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Mar 23 23:28:26 2008
@@ -41,7 +41,7 @@
dnl ---------------------------------------------------------------------------
dnl - Library dependencies
dnl ---------------------------------------------------------------------------
-PACKAGEKIT_REQUIRED=0.1.2
+PACKAGEKIT_REQUIRED=0.1.10
GLIB_REQUIRED=2.14.0
GTK_REQUIRED=2.12.0
DBUS_REQUIRED=1.1.2
Modified: trunk/data/pk-application.desktop.in
==============================================================================
--- trunk/data/pk-application.desktop.in (original)
+++ trunk/data/pk-application.desktop.in Sun Mar 23 23:28:26 2008
@@ -3,7 +3,7 @@
_Name=Add/Remove Software
_GenericName=Add/Remove Software
_Comment=Change the software installed on the system
-Icon=system-installer
+Icon=system-software-installer
Exec=pk-application
Terminal=false
Type=Application
Modified: trunk/data/pk-update-viewer.glade
==============================================================================
--- trunk/data/pk-update-viewer.glade (original)
+++ trunk/data/pk-update-viewer.glade Sun Mar 23 23:28:26 2008
@@ -14,9 +14,8 @@
<widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<child>
- <widget class="GtkNotebook" id="notebook_hidden">
+ <widget class="GtkHBox" id="hbox_hidden">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<child>
<widget class="GtkVBox" id="vbox_preview">
<property name="visible">True</property>
@@ -63,6 +62,80 @@
</packing>
</child>
<child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Time since last refresh:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_last_refresh">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Unknown....</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="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Time since last updated:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_last_update">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Unknown....</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>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
@@ -234,31 +307,19 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Preview</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
<widget class="GtkVBox" id="vbox_details">
- <property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
<widget class="GtkVPaned" id="vpaned1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow_packages">
<property name="visible">True</property>
@@ -399,52 +460,6 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_update">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="response_id">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Update _Package</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton" id="button_apply">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -472,7 +487,7 @@
<child>
<widget class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Update System</property>
+ <property name="label" translatable="yes">_Apply Updates</property>
<property name="use_underline">True</property>
</widget>
<packing>
@@ -487,7 +502,7 @@
</child>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -500,7 +515,7 @@
<property name="response_id">0</property>
</widget>
<packing>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -516,45 +531,43 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Details</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
<widget class="GtkVBox" id="vbox_progress">
- <property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_history">
+ <widget class="GtkLabel" id="progress_part_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTreeView" id="treeview_history">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label"><b>Downloading</b></property>
+ <property name="use_markup">True</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
<child>
- <widget class="GtkProgressBar" id="progressbar_subpercent">
+ <widget class="GtkProgressBar" id="progressbar_percent">
<property name="visible">True</property>
<property name="pulse_step">0.10000000149</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="progress_package_label">
+ <property name="visible">True</property>
+ <property name="label"><b>The second update</b> (update2)</property>
+ <property name="use_markup">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
@@ -571,9 +584,6 @@
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
- <packing>
- <property name="secondary">True</property>
- </packing>
</child>
<child>
<widget class="GtkButton" id="button_cancel">
@@ -639,7 +649,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -648,103 +658,111 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Progress</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
<widget class="GtkVBox" id="vbox_confirm">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">18</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <widget class="GtkImage" id="image15">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><b>System Update Completed!</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="stock">gtk-dialog-info</property>
+ <property name="icon_size">6</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox18">
+ <widget class="GtkVBox" id="vbox6">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label20">
+ <widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">All selected updates have been successfully installed</property>
+ <child>
+ <widget class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>System Update Completed</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>
- <property name="fill">False</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_restart">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">12</property>
<child>
- <widget class="GtkImage" id="image15">
+ <widget class="GtkHBox" id="hbox18">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-dialog-info</property>
- <property name="icon_size">6</property>
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">All selected updates have been successfully installed</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>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkHBox" id="hbox_restart">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><b>A system restart is recommended</b></property>
- <property name="use_markup">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-warning</property>
+ <property name="icon_size">2</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">A system restart is recommended</property>
+ <property name="use_markup">True</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>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label"> </property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -838,31 +856,16 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Confirm</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
<widget class="GtkVBox" id="vbox_confirm2">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">5</property>
<child>
<widget class="GtkHBox" id="hbox20">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkImage" id="image17">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-dialog-error</property>
<property name="icon_size">6</property>
</widget>
@@ -875,16 +878,13 @@
<child>
<widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">10</property>
<child>
<widget class="GtkHBox" id="hbox21">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkLabel" id="label_error_title">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"><b>Update was cancelled</b></property>
<property name="use_markup">True</property>
</widget>
@@ -901,11 +901,9 @@
<child>
<widget class="GtkHBox" id="hbox22">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkLabel" id="label_error_message">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">The transaction was cancelled before any actions were taken</property>
</widget>
<packing>
@@ -923,15 +921,12 @@
<widget class="GtkExpander" id="expander1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkHBox" id="hbox24">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkLabel" id="label_error_details">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">Geeky information about the error...</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
@@ -945,7 +940,6 @@
<child>
<widget class="GtkLabel" id="label27">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes"><b>More details:</b></property>
<property name="use_markup">True</property>
</widget>
@@ -961,6 +955,15 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label"> </property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -973,7 +976,7 @@
<child>
<widget class="GtkHButtonBox" id="hbuttonbox6">
<property name="visible">True</property>
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button_help5">
@@ -983,9 +986,6 @@
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
- <packing>
- <property name="secondary">True</property>
- </packing>
</child>
<child>
<widget class="GtkButton" id="button_close5">
@@ -1012,29 +1012,7 @@
<property name="position">4</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Error</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">4</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkStatusbar" id="statusbar_status">
- <property name="visible">True</property>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
Modified: trunk/src/pk-common-gui.c
==============================================================================
--- trunk/src/pk-common-gui.c (original)
+++ trunk/src/pk-common-gui.c Sun Mar 23 23:28:26 2008
@@ -121,7 +121,7 @@
{PK_GROUP_ENUM_DESKTOP_KDE, "pk-desktop-kde"},
{PK_GROUP_ENUM_DESKTOP_XFCE, "pk-desktop-xfce"},
{PK_GROUP_ENUM_DESKTOP_OTHER, "user-desktop"},
- {PK_GROUP_ENUM_PUBLISHING, "internet-news-reader"},
+ {PK_GROUP_ENUM_PUBLISHING, "accessories-dictionary"},
{PK_GROUP_ENUM_SERVERS, "network-server"},
{PK_GROUP_ENUM_FONTS, "preferences-desktop-font"},
{PK_GROUP_ENUM_ADMIN_TOOLS, "system-lock-screen"},
@@ -614,7 +614,6 @@
text = _("A system restart is required after this update");
break;
default:
- text = _("A restart of unknown type is required after this update");
pk_warning ("restart unrecognised: %i", restart);
}
return text;
@@ -641,7 +640,6 @@
text = _("You need to restart the application");
break;
default:
- text = _("A restart of unknown type is required after this update");
pk_warning ("restart unrecognised: %i", restart);
}
return text;
@@ -665,7 +663,6 @@
text = _("PackageKit daemon");
break;
default:
- text = _("PackageKit message of unknown type");
pk_warning ("message unrecognised: %i", message);
}
return text;
@@ -734,7 +731,6 @@
text = _("Cancelling");
break;
default:
- text = _("Status unknown");
pk_warning ("status unrecognised: %s", pk_status_enum_to_text (status));
}
return text;
@@ -767,7 +763,6 @@
text = g_strdup_printf (ngettext ("%i enhancement update", "%i enhancement updates", number), number);
break;
default:
- text = g_strdup_printf (ngettext ("%i unknown update", "%i unknown updates", number), number);
pk_warning ("update info unrecognised: %s", pk_info_enum_to_text (info));
}
return text;
@@ -827,7 +822,6 @@
text = _("Obsoleting");
break;
default:
- text = _("Info unknown");
pk_warning ("info unrecognised: %s", pk_info_enum_to_text (info));
}
return text;
@@ -877,6 +871,9 @@
case PK_ROLE_ENUM_INSTALL_PACKAGE:
text = _("Installing");
break;
+ case PK_ROLE_ENUM_INSTALL_FILE:
+ text = _("Installing file");
+ break;
case PK_ROLE_ENUM_REFRESH_CACHE:
text = _("Refreshing package cache");
break;
@@ -901,8 +898,19 @@
case PK_ROLE_ENUM_REPO_SET_DATA:
text = _("Setting repository data");
break;
+ case PK_ROLE_ENUM_RESOLVE:
+ text = _("Resolved");
+ break;
+ case PK_ROLE_ENUM_GET_FILES:
+ text = _("Got file list");
+ break;
+ case PK_ROLE_ENUM_WHAT_PROVIDES:
+ text = _("Got what provides");
+ break;
+ case PK_ROLE_ENUM_SERVICE_PACK:
+ text = _("Service pack");
+ break;
default:
- text = _("Role unknown");
pk_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
}
return text;
@@ -984,8 +992,16 @@
case PK_ROLE_ENUM_REPO_SET_DATA:
text = _("Set repository data");
break;
+ case PK_ROLE_ENUM_RESOLVE:
+ text = _("Resolved");
+ break;
+ case PK_ROLE_ENUM_GET_FILES:
+ text = _("Got file list");
+ break;
+ case PK_ROLE_ENUM_WHAT_PROVIDES:
+ text = _("Got what provides");
+ break;
default:
- text = _("Role unknown");
pk_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
}
return text;
@@ -1087,7 +1103,6 @@
text = _("Unknown group");
break;
default:
- text = _("Invalid group");
pk_warning ("group unrecognised: %i", group);
}
return text;
@@ -1229,6 +1244,8 @@
libst_common_gui (LibSelfTest *test)
{
gchar *text;
+ guint i;
+ const gchar *string;
if (libst_start (test, "PkCommonGui", CLASS_AUTO) == FALSE) {
return;
@@ -1432,6 +1449,184 @@
}
g_free (text);
+ /************************************************************
+ **************** localised enums **************
+ ************************************************************/
+ libst_title (test, "check we convert all the localised past role enums");
+ for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
+ string = pk_role_enum_to_localised_past (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised present role enums");
+ for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
+ string = pk_role_enum_to_localised_present (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the role icon name enums");
+ for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
+ string = pk_role_enum_to_icon_name (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised info enums");
+ for (i=0; i<PK_INFO_ENUM_UNKNOWN; i++) {
+ string = pk_info_enum_to_localised_text (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the info icon names enums");
+ for (i=0; i<PK_INFO_ENUM_UNKNOWN; i++) {
+ string = pk_info_enum_to_icon_name (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised status enums");
+ for (i=0; i<PK_STATUS_ENUM_UNKNOWN; i++) {
+ string = pk_status_enum_to_localised_text (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the status icon names enums");
+ for (i=0; i<PK_STATUS_ENUM_UNKNOWN; i++) {
+ string = pk_status_enum_to_icon_name (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the restart icon names enums");
+ for (i=0; i<PK_RESTART_ENUM_UNKNOWN; i++) {
+ string = pk_restart_enum_to_icon_name (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised error enums");
+ for (i=0; i<PK_ERROR_ENUM_UNKNOWN; i++) {
+ string = pk_error_enum_to_localised_text (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised error enums");
+ for (i=0; i<PK_ERROR_ENUM_UNKNOWN; i++) {
+ string = pk_error_enum_to_localised_message (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised restart enums");
+ for (i=0; i<PK_RESTART_ENUM_UNKNOWN; i++) {
+ string = pk_restart_enum_to_localised_text (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the message icon name enums");
+ for (i=0; i<PK_MESSAGE_ENUM_UNKNOWN; i++) {
+ string = pk_message_enum_to_icon_name (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised message enums");
+ for (i=0; i<PK_MESSAGE_ENUM_UNKNOWN; i++) {
+ string = pk_message_enum_to_localised_text (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised restart future enums");
+ for (i=0; i<PK_RESTART_ENUM_UNKNOWN; i++) {
+ string = pk_restart_enum_to_localised_text_future (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the localised group enums");
+ for (i=0; i<PK_GROUP_ENUM_UNKNOWN; i++) {
+ string = pk_group_enum_to_localised_text (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
+ /************************************************************/
+ libst_title (test, "check we convert all the group icon name enums");
+ for (i=0; i<PK_GROUP_ENUM_UNKNOWN; i++) {
+ string = pk_group_enum_to_icon_name (i);
+ if (string == NULL) {
+ libst_failed (test, "failed to get %i", i);
+ break;
+ }
+ }
+ libst_success (test, NULL);
+
libst_end (test);
}
#endif
Modified: trunk/src/pk-install-file.c
==============================================================================
--- trunk/src/pk-install-file.c (original)
+++ trunk/src/pk-install-file.c Sun Mar 23 23:28:26 2008
@@ -99,6 +99,10 @@
pk_debug_init (verbose);
gtk_init (&argc, &argv);
+ /* add application specific icons to search path */
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ PK_DATA G_DIR_SEPARATOR_S "icons");
+
if (argc < 2) {
g_print (_("You need to specify a file to install\n"));
return 1;
Modified: trunk/src/pk-install-package.c
==============================================================================
--- trunk/src/pk-install-package.c (original)
+++ trunk/src/pk-install-package.c Sun Mar 23 23:28:26 2008
@@ -166,6 +166,10 @@
pk_debug_init (verbose);
gtk_init (&argc, &argv);
+ /* add application specific icons to search path */
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ PK_DATA G_DIR_SEPARATOR_S "icons");
+
if (argc < 2) {
g_print (_("You need to specify a package to install\n"));
return 1;
Modified: trunk/src/pk-progress.c
==============================================================================
--- trunk/src/pk-progress.c (original)
+++ trunk/src/pk-progress.c Sun Mar 23 23:28:26 2008
@@ -196,7 +196,7 @@
pk_debug ("finished");
progress->priv->task_ended = TRUE;
/* wait 5 seconds */
- progress->priv->no_percentage_evt = g_timeout_add (5000, pk_progress_finished_timeout, progress);
+ progress->priv->no_percentage_evt = g_timeout_add_seconds (30, pk_progress_finished_timeout, progress);
}
/**
@@ -416,8 +416,10 @@
gtk_label_set_label (GTK_LABEL (widget), pk_status_enum_to_localised_text (status));
widget = glade_xml_get_widget (progress->priv->glade_xml, "image_status");
+ gtk_widget_show (widget);
icon_name = pk_status_enum_to_icon_name (status);
gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_DIALOG);
+ g_print ("setting icon %s\n", icon_name);
}
/**
@@ -560,7 +562,11 @@
/* Hide window first so that the dialogue resizes itself without redrawing */
gtk_widget_hide (main_window);
- gtk_window_set_icon_name (GTK_WINDOW (main_window), "system-installer");
+ gtk_window_set_icon_name (GTK_WINDOW (main_window), "system-software-installer");
+
+ /* hide icon until we have a status */
+ widget = glade_xml_get_widget (progress->priv->glade_xml, "image_status");
+ gtk_widget_hide (widget);
/* Get the main window quit */
g_signal_connect (main_window, "delete_event",
Modified: trunk/src/pk-update-viewer.c
==============================================================================
--- trunk/src/pk-update-viewer.c (original)
+++ trunk/src/pk-update-viewer.c Sun Mar 23 23:28:26 2008
@@ -50,7 +50,7 @@
static GtkListStore *list_store_description = NULL;
static PkClient *client = NULL;
static PkTaskList *tlist = NULL;
-static gchar *package = NULL;
+static gchar *cached_package_id = NULL;
/* for the preview throbber */
static void pk_updates_add_preview_item (PkClient *client, const gchar *icon, const gchar *message, gboolean clear);
@@ -686,6 +686,7 @@
ident = pk_package_id_new_from_string (package_id);
/* translators: this is the repository the package has come from */
pk_updates_add_description_item (_("Repository"), ident->data, NULL);
+ pk_package_id_free (ident);
if (!pk_strzero (update_text)) {
/* translators: this is the package description */
@@ -881,28 +882,34 @@
gchar *package_id;
GtkWidget *widget;
- /* hide the widgets until we have data */
widget = glade_xml_get_widget (glade_xml, "scrolledwindow_description");
- gtk_list_store_clear (list_store_description);
- pk_updates_description_animation_start ();
-
- widget = glade_xml_get_widget (glade_xml, "hbox_reboot");
- gtk_widget_hide (widget);
-
/* This will only work in single or browse selection mode! */
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- g_free (package);
gtk_tree_model_get (model, &iter,
PACKAGES_COLUMN_ID, &package_id, -1);
+ if (cached_package_id && package_id &&
+ strcmp (cached_package_id, package_id) == 0) {
+ g_free (package_id);
+ return;
+ }
+ g_free (cached_package_id);
/* make back into package ID */
- package = g_strdup (package_id);
+ cached_package_id = g_strdup (package_id);
g_free (package_id);
- pk_debug ("selected row is: %s", package);
+
+ /* clear and display animation until new details come in */
+ gtk_list_store_clear (list_store_description);
+ pk_updates_description_animation_start ();
+
+ widget = glade_xml_get_widget (glade_xml, "hbox_reboot");
+ gtk_widget_hide (widget);
+
+ pk_debug ("selected row is: %s", cached_package_id);
/* get the decription */
pk_client_reset (client, NULL);
- pk_client_get_update_detail (client, package, NULL);
+ pk_client_get_update_detail (client, cached_package_id, NULL);
} else {
pk_debug ("no row selected");
}
@@ -1007,6 +1014,12 @@
return TRUE;
}
+static void
+pk_updates_restart_cb (GtkWidget *widget, gpointer data)
+{
+ pk_restart_system ();
+}
+
/**
* pk_updates_finished_cb:
**/
@@ -1064,6 +1077,8 @@
gtk_widget_show (widget);
widget = glade_xml_get_widget (glade_xml, "button_restart");
gtk_widget_show (widget);
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (pk_updates_restart_cb), NULL);
}
/* set correct view */
@@ -1185,8 +1200,8 @@
GtkWidget *widget;
widget = glade_xml_get_widget (glade_xml, "progressbar_percent");
- if (subpercentage != PK_CLIENT_PERCENTAGE_INVALID) {
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), (gfloat) subpercentage / 100.0);
+ if (percentage != PK_CLIENT_PERCENTAGE_INVALID) {
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), (gfloat) percentage / 100.0);
}
}
@@ -1523,7 +1538,7 @@
g_object_unref (client);
g_object_unref (pconnection);
g_object_unref (role_list);
- g_free (package);
+ g_free (cached_package_id);
return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
