gnome-packagekit r158 - in trunk: data src
- From: rhughes svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-packagekit r158 - in trunk: data src
- Date: Fri, 11 Apr 2008 04:08:22 +0100 (BST)
Author: rhughes
Date: Fri Apr 11 04:08:22 2008
New Revision: 158
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=158&view=rev
Log:
from git
Modified:
trunk/data/gnome-packagekit.schemas.in
trunk/data/gpk-backend-status.glade
trunk/data/gpk-install-file.glade
trunk/data/gpk-repo.glade
trunk/src/Makefile.am
trunk/src/gpk-application.c
trunk/src/gpk-backend-status.c
trunk/src/gpk-common.c
trunk/src/gpk-common.h
trunk/src/gpk-install-file.c
trunk/src/gpk-install-package.c
trunk/src/gpk-notify.c
trunk/src/gpk-repo.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 Fri Apr 11 04:08:22 2008
@@ -193,6 +193,18 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/gnome-packagekit/repo/show_details</key>
+ <applyto>/apps/gnome-packagekit/repo/show_details</applyto>
+ <owner>gnome-packagekit</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>If we should show all repositories in the software source viewer</short>
+ <long>If we should show all repositories in the software source viewer</long>
+ </locale>
+ </schema>
+
</schemalist>
</gconfschemafile>
Modified: trunk/data/gpk-backend-status.glade
==============================================================================
--- trunk/data/gpk-backend-status.glade (original)
+++ trunk/data/gpk-backend-status.glade Fri Apr 11 04:08:22 2008
@@ -36,14 +36,22 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label_author">
+ <widget class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">Richard Hughes</property>
+ <property name="label" translatable="yes">Backend Name:</property>
+ </widget>
+ <packing>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="xalign">0</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>
@@ -64,28 +72,20 @@
</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>
<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,237 +125,237 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<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>
</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="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_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="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_search_group">
+ <widget class="GtkLabel" id="label27">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</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_details">
+ <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="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">6</property>
+ <property name="bottom_attach">7</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_name">
+ <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">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="GtkImage" id="image_system_update">
+ <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">2</property>
- <property name="bottom_attach">3</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_refresh_cache">
+ <widget class="GtkImage" id="image_system_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">1</property>
- <property name="bottom_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>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_updates">
+ <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">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="label28">
+ <widget class="GtkImage" id="image_search_details">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">SearchFile:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <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"></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>
+ <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="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="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="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="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>
@@ -370,240 +370,240 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<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>
<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_file_install">
+ <widget class="GtkLabel" id="label32">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</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="label44">
+ <widget class="GtkLabel" id="label29">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">InstallFile:</property>
+ <property name="label" translatable="yes">GetDepends:</property>
</widget>
<packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</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="label38">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetDescription:</property>
+ <property name="label" translatable="yes">GetRequires:</property>
</widget>
<packing>
- <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"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_description">
+ <widget class="GtkLabel" id="label31">
<property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">GetUpdate Detail:</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">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_get_update_detail">
+ <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">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_get_requires">
+ <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">4</property>
- <property name="bottom_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>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_get_depends">
+ <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">3</property>
- <property name="bottom_attach">4</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_package_remove">
+ <widget class="GtkImage" id="image_get_depends">
<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">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="GtkImage" id="image_package_install">
+ <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">1</property>
- <property name="bottom_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_package_update">
+ <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">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="GtkLabel" id="label31">
+ <widget class="GtkImage" id="image_get_description">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">GetUpdate Detail:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</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="label30">
+ <widget class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetRequires:</property>
+ <property name="label" translatable="yes">GetDescription:</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</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="GtkLabel" id="label29">
+ <widget class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">GetDepends:</property>
+ <property name="label" translatable="yes">InstallFile:</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</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="label32">
+ <widget class="GtkImage" id="image_file_install">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">RemovePackage:</property>
+ <property name="icon_name">gtk-dialog-error</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</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="label33">
+ <widget class="GtkLabel" id="label49">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">InstallPackage:</property>
+ <property name="label" translatable="yes">GetFiles:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkImage" id="image_get_files">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">UpdatePackage:</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">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>
</widget>
@@ -614,61 +614,72 @@
<child>
<widget class="GtkTable" id="table7">
<property name="visible">True</property>
- <property name="n_rows">4</property>
+ <property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkImage" id="image_what_provides">
+ <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">
<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="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_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="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>
@@ -686,42 +697,58 @@
</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>
- <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="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="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">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -768,90 +795,99 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label7">
+ <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">
<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="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="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="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="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="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="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>
@@ -871,100 +907,91 @@
</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>
<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_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="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_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="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_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>
- </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>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
Modified: trunk/data/gpk-install-file.glade
==============================================================================
--- trunk/data/gpk-install-file.glade (original)
+++ trunk/data/gpk-install-file.glade Fri Apr 11 04:08:22 2008
@@ -70,6 +70,7 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button_help3">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-help</property>
@@ -81,6 +82,19 @@
</packing>
</child>
<child>
+ <widget class="GtkButton" id="button_cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkButton" id="button_close">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -90,7 +104,7 @@
<property name="response_id">0</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -158,6 +172,7 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button_help4">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-help</property>
@@ -318,6 +333,7 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button_help5">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-help</property>
Modified: trunk/data/gpk-repo.glade
==============================================================================
--- trunk/data/gpk-repo.glade (original)
+++ trunk/data/gpk-repo.glade Fri Apr 11 04:08:22 2008
@@ -16,7 +16,7 @@
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="border_width">10</property>
- <property name="spacing">5</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow_repo">
<property name="visible">True</property>
@@ -32,6 +32,21 @@
</widget>
</child>
<child>
+ <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 and -debuginfo repos">_Show detailed information</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">5</property>
@@ -66,7 +81,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Fri Apr 11 04:08:22 2008
@@ -121,6 +121,8 @@
gpk-application.h \
gpk-statusbar.c \
gpk-statusbar.h \
+ gpk-client.c \
+ gpk-client.h \
gpk-common.c \
gpk-common.h \
$(NULL)
@@ -183,6 +185,7 @@
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(LIBGLADE_LIBS) \
+ $(GCONF_LIBS) \
$(GTK_LIBS) \
$(PACKAGEKIT_LIBS) \
$(POLKIT_GNOME_LIBS) \
Modified: trunk/src/gpk-application.c
==============================================================================
--- trunk/src/gpk-application.c (original)
+++ trunk/src/gpk-application.c Fri Apr 11 04:08:22 2008
@@ -45,6 +45,7 @@
#include <locale.h>
#include "gpk-statusbar.h"
+#include "gpk-client.h"
#include "gpk-common.h"
#include "gpk-application.h"
@@ -88,7 +89,7 @@
PkEnumList *role_list;
PkEnumList *filter_list;
PkEnumList *group_list;
- PkEnumList *current_filter;
+ PkFilterEnum filters;
gboolean has_package; /* if we got a package in the search */
PkSearchType search_type;
PkSearchMode search_mode;
@@ -181,12 +182,20 @@
{
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);
+ g_object_unref (gclient);
+
+ return ret;
+
ret = pk_client_reset (application->priv->client_action, &error);
if (!ret) {
pk_warning ("failed to reset client: %s", error->message);
@@ -380,7 +389,7 @@
/* do the requires */
pk_debug ("getting requires for %s", application->priv->package);
- ret = pk_client_get_requires (client, "installed", application->priv->package, TRUE, &error);
+ ret = pk_client_get_requires (client, PK_FILTER_ENUM_INSTALLED, application->priv->package, TRUE, &error);
if (!ret) {
pk_warning ("failed to get requires: %s", error->message);
g_error_free (error);
@@ -725,7 +734,6 @@
{
GtkWidget *widget;
const gchar *package;
- gchar *filter_all;
GError *error = NULL;
gboolean ret;
@@ -748,10 +756,6 @@
}
pk_debug ("find %s", package);
- /* make a valid filter string */
- filter_all = pk_enum_list_to_string (application->priv->current_filter);
- pk_debug ("filter = %s", filter_all);
-
/* reset */
ret = pk_client_reset (application->priv->client_search, &error);
if (!ret) {
@@ -762,11 +766,11 @@
/* do the search */
if (application->priv->search_type == PK_SEARCH_NAME) {
- ret = pk_client_search_name (application->priv->client_search, filter_all, package, &error);
+ ret = pk_client_search_name (application->priv->client_search, application->priv->filters, package, &error);
} else if (application->priv->search_type == PK_SEARCH_DETAILS) {
- ret = pk_client_search_details (application->priv->client_search, filter_all, package, &error);
+ ret = pk_client_search_details (application->priv->client_search, application->priv->filters, package, &error);
} else if (application->priv->search_type == PK_SEARCH_FILE) {
- ret = pk_client_search_file (application->priv->client_search, filter_all, package, &error);
+ ret = pk_client_search_file (application->priv->client_search, application->priv->filters, package, &error);
} else {
pk_warning ("invalid search type");
return FALSE;
@@ -795,7 +799,6 @@
gtk_widget_show (widget);
}
- g_free (filter_all);
return TRUE;
}
@@ -806,17 +809,12 @@
gpk_application_perform_search_group (GpkApplication *application)
{
GtkWidget *widget;
- gchar *filter;
gboolean ret;
GError *error = NULL;
g_return_val_if_fail (PK_IS_APPLICATION (application), FALSE);
g_return_val_if_fail (application->priv->group != NULL, FALSE);
- /* make a valid filter string */
- filter = pk_enum_list_to_string (application->priv->current_filter);
- pk_debug ("filter = %s", filter);
-
/* cancel this, we don't care about old results that are pending */
ret = pk_client_reset (application->priv->client_search, &error);
if (!ret) {
@@ -828,8 +826,7 @@
/* refresh the search as the items may have changed */
gtk_list_store_clear (application->priv->packages_store);
- ret = pk_client_search_group (application->priv->client_search, filter, application->priv->group, &error);
- g_free (filter);
+ ret = pk_client_search_group (application->priv->client_search, application->priv->filters, application->priv->group, &error);
/* ick, we failed so pretend we didn't do the action */
if (ret) {
/* switch around buttons */
@@ -1137,7 +1134,7 @@
return FALSE;
}
/* get the depends */
- ret = pk_client_get_depends (application->priv->client_files, "none",
+ ret = pk_client_get_depends (application->priv->client_files, PK_FILTER_ENUM_NONE,
application->priv->package, FALSE, &error);
if (!ret) {
@@ -1164,7 +1161,7 @@
return FALSE;
}
/* get the requires */
- ret = pk_client_get_requires (application->priv->client_files, "none",
+ ret = pk_client_get_requires (application->priv->client_files, PK_FILTER_ENUM_NONE,
application->priv->package, TRUE, &error);
if (!ret) {
@@ -1667,14 +1664,14 @@
/* set new filter */
if (g_str_has_suffix (name, "_yes")) {
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_INSTALLED);
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NOT_INSTALLED);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_INSTALLED);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NOT_INSTALLED);
} else if (g_str_has_suffix (name, "_no")) {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_INSTALLED);
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_NOT_INSTALLED);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_INSTALLED);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_NOT_INSTALLED);
} else {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_INSTALLED);
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NOT_INSTALLED);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_INSTALLED);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NOT_INSTALLED);
}
/* refresh the search results */
@@ -1701,14 +1698,14 @@
/* set new filter */
if (g_str_has_suffix (name, "_yes")) {
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_DEVELOPMENT);
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NOT_DEVELOPMENT);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_DEVELOPMENT);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NOT_DEVELOPMENT);
} else if (g_str_has_suffix (name, "_no")) {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_DEVELOPMENT);
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_NOT_DEVELOPMENT);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_DEVELOPMENT);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_NOT_DEVELOPMENT);
} else {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_DEVELOPMENT);
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NOT_DEVELOPMENT);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_DEVELOPMENT);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NOT_DEVELOPMENT);
}
/* refresh the search results */
@@ -1735,14 +1732,14 @@
/* set new filter */
if (g_str_has_suffix (name, "_yes")) {
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_GUI);
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NOT_GUI);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_GUI);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NOT_GUI);
} else if (g_str_has_suffix (name, "_no")) {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_GUI);
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_NOT_GUI);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_GUI);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_NOT_GUI);
} else {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_GUI);
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NOT_GUI);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_GUI);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NOT_GUI);
}
/* refresh the search results */
@@ -1769,14 +1766,14 @@
/* set new filter */
if (g_str_has_suffix (name, "_yes")) {
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_FREE);
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NOT_FREE);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_FREE);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NOT_FREE);
} else if (g_str_has_suffix (name, "_no")) {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_FREE);
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_NOT_FREE);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_FREE);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_NOT_FREE);
} else {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_FREE);
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NOT_FREE);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_FREE);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NOT_FREE);
}
/* refresh the search results */
@@ -1791,7 +1788,6 @@
gpk_application_menu_filter_basename_cb (GtkWidget *widget, GpkApplication *application)
{
gboolean enabled;
- gchar *filter;
g_return_if_fail (PK_IS_APPLICATION (application));
@@ -1802,15 +1798,11 @@
/* change the filter */
if (enabled) {
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_BASENAME);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_BASENAME);
} else {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_BASENAME);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_BASENAME);
}
- filter = pk_enum_list_to_string (application->priv->current_filter);
- pk_debug ("filter now = %s", filter);
- g_free (filter);
-
/* refresh the search results */
gpk_application_perform_search (application);
}
@@ -1823,7 +1815,6 @@
gpk_application_menu_filter_newest_cb (GtkWidget *widget, GpkApplication *application)
{
gboolean enabled;
- gchar *filter;
g_return_if_fail (PK_IS_APPLICATION (application));
@@ -1834,15 +1825,11 @@
/* change the filter */
if (enabled) {
- pk_enum_list_append (application->priv->current_filter, PK_FILTER_ENUM_NEWEST);
+ pk_enums_add (application->priv->filters, PK_FILTER_ENUM_NEWEST);
} else {
- pk_enum_list_remove (application->priv->current_filter, PK_FILTER_ENUM_NEWEST);
+ pk_enums_remove (application->priv->filters, PK_FILTER_ENUM_NEWEST);
}
- filter = pk_enum_list_to_string (application->priv->current_filter);
- pk_debug ("filter now = %s", filter);
- g_free (filter);
-
/* refresh the search results */
gpk_application_perform_search (application);
}
@@ -1940,8 +1927,7 @@
application->priv->search_type = PK_SEARCH_UNKNOWN;
application->priv->search_mode = PK_MODE_UNKNOWN;
- application->priv->current_filter = pk_enum_list_new ();
- pk_enum_list_set_type (application->priv->current_filter, PK_ENUM_LIST_TYPE_FILTER);
+ application->priv->filters = PK_FILTER_ENUM_NONE;
/* add application specific icons to search path */
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
@@ -2427,7 +2413,6 @@
g_object_unref (application->priv->filter_list);
g_object_unref (application->priv->group_list);
g_object_unref (application->priv->role_list);
- g_object_unref (application->priv->current_filter);
g_object_unref (application->priv->statusbar);
g_object_unref (application->priv->extra);
g_object_unref (application->priv->gconf_client);
Modified: trunk/src/gpk-backend-status.c
==============================================================================
--- trunk/src/gpk-backend-status.c (original)
+++ trunk/src/gpk-backend-status.c Fri Apr 11 04:08:22 2008
@@ -219,6 +219,10 @@
widget = glade_xml_get_widget (glade_xml, "image_what_provides");
gtk_image_set_from_icon_name (GTK_IMAGE (widget), "gtk-apply", GTK_ICON_SIZE_MENU);
}
+ if (pk_enum_list_contains (role_list, PK_ROLE_ENUM_GET_PACKAGES)) {
+ widget = glade_xml_get_widget (glade_xml, "image_get_packages");
+ gtk_image_set_from_icon_name (GTK_IMAGE (widget), "gtk-apply", GTK_ICON_SIZE_MENU);
+ }
/* repos */
if (pk_enum_list_contains (role_list, PK_ROLE_ENUM_GET_REPO_LIST)) {
Modified: trunk/src/gpk-common.c
==============================================================================
--- trunk/src/gpk-common.c (original)
+++ trunk/src/gpk-common.c Fri Apr 11 04:08:22 2008
@@ -106,6 +106,7 @@
{PK_ROLE_ENUM_REPO_ENABLE, "emblem-system"},
{PK_ROLE_ENUM_REPO_SET_DATA, "emblem-system"},
{PK_ROLE_ENUM_INSTALL_SIGNATURE, "emblem-system"},
+ {PK_ROLE_ENUM_GET_PACKAGES, "pk-package-search"},
{0, NULL}
};
@@ -1095,6 +1096,9 @@
case PK_ROLE_ENUM_INSTALL_SIGNATURE:
text = _("Installing signature");
break;
+ case PK_ROLE_ENUM_GET_PACKAGES:
+ text = _("Getting package lists");
+ break;
default:
pk_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
}
@@ -1189,6 +1193,9 @@
case PK_ROLE_ENUM_INSTALL_SIGNATURE:
text = _("Installed signature");
break;
+ case PK_ROLE_ENUM_GET_PACKAGES:
+ text = _("Got package lists");
+ break;
default:
pk_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
}
@@ -1639,7 +1646,7 @@
**************** localised enums **************
************************************************************/
libst_title (test, "check we convert all the localised past role enums");
- for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
+ for (i=1; i<PK_ROLE_ENUM_UNKNOWN; i*=2) {
string = gpk_role_enum_to_localised_past (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
@@ -1650,7 +1657,7 @@
/************************************************************/
libst_title (test, "check we convert all the localised present role enums");
- for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
+ for (i=1; i<PK_ROLE_ENUM_UNKNOWN; i*=2) {
string = gpk_role_enum_to_localised_present (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
@@ -1661,7 +1668,7 @@
/************************************************************/
libst_title (test, "check we convert all the role icon name enums");
- for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
+ for (i=1; i<PK_ROLE_ENUM_UNKNOWN; i*=2) {
string = gpk_role_enum_to_icon_name (i);
if (string == NULL) {
libst_failed (test, "failed to get %i", i);
Modified: trunk/src/gpk-common.h
==============================================================================
--- trunk/src/gpk-common.h (original)
+++ trunk/src/gpk-common.h Fri Apr 11 04:08:22 2008
@@ -44,6 +44,7 @@
#define GPK_CONF_FREQUENCY_REFRESH_CACHE "/apps/gnome-packagekit/frequency_refresh_cache"
#define GPK_CONF_AUTO_UPDATE "/apps/gnome-packagekit/auto_update"
#define GPK_CONF_UPDATE_BATTERY "/apps/gnome-packagekit/update_battery"
+#define GPK_CONF_REPO_SHOW_DETAILS "/apps/gnome-packagekit/repo/show_details"
#define GPK_CONF_APPLICATION_FILTER_BASENAME "/apps/gnome-packagekit/application/filter_basename"
#define GPK_CONF_APPLICATION_FILTER_NEWEST "/apps/gnome-packagekit/application/filter_newest"
Modified: trunk/src/gpk-install-file.c
==============================================================================
--- trunk/src/gpk-install-file.c (original)
+++ trunk/src/gpk-install-file.c Fri Apr 11 04:08:22 2008
@@ -81,7 +81,7 @@
error = NULL;
gclient = gpk_client_new ();
- ret = gpk_client_install_file (gclient, argv[1]);
+ ret = gpk_client_install_local_file (gclient, argv[1]);
g_object_unref (gclient);
return !ret;
Modified: trunk/src/gpk-install-package.c
==============================================================================
--- trunk/src/gpk-install-package.c (original)
+++ trunk/src/gpk-install-package.c Fri Apr 11 04:08:22 2008
@@ -81,7 +81,7 @@
error = NULL;
gclient = gpk_client_new ();
- ret = gpk_client_install_package (gclient, argv[1]);
+ ret = gpk_client_install_package_name (gclient, argv[1]);
g_object_unref (gclient);
return !ret;
Modified: trunk/src/gpk-notify.c
==============================================================================
--- trunk/src/gpk-notify.c (original)
+++ trunk/src/gpk-notify.c Fri Apr 11 04:08:22 2008
@@ -879,7 +879,7 @@
pk_client_set_use_buffer (client, TRUE, NULL);
/* get updates */
- ret = pk_client_get_updates (client, "basename", &error);
+ ret = pk_client_get_updates (client, PK_FILTER_ENUM_BASENAME, &error);
if (!ret) {
pk_warning ("failed to get updates: %s", error->message);
g_error_free (error);
Modified: trunk/src/gpk-repo.c
==============================================================================
--- trunk/src/gpk-repo.c (original)
+++ trunk/src/gpk-repo.c Fri Apr 11 04:08:22 2008
@@ -30,6 +30,7 @@
#include <math.h>
#include <string.h>
#include <dbus/dbus-glib.h>
+#include <gconf/gconf-client.h>
#include <pk-debug.h>
#include <pk-client.h>
@@ -44,6 +45,8 @@
static PkClient *client = NULL;
static PkEnumList *role_list;
static GpkStatusbar *statusbar;
+static GConfClient *gconf_client;
+static gboolean show_details;
enum
{
@@ -237,13 +240,14 @@
}
/**
- * pk_repo_repo_list_changed_cb:
+ * pk_repo_repo_list_refresh:
**/
static void
-pk_repo_repo_list_changed_cb (PkControl *control, gpointer data)
+pk_repo_repo_list_refresh (void)
{
gboolean ret;
GError *error = NULL;
+ PkFilterEnum filter;
pk_debug ("refreshing list");
gtk_list_store_clear (list_store);
@@ -254,7 +258,12 @@
return;
}
- ret = pk_client_get_repo_list (client, "none", &error);
+ if (!show_details) {
+ filter = PK_FILTER_ENUM_NOT_DEVELOPMENT;
+ } else {
+ filter = PK_FILTER_ENUM_NONE;
+ }
+ ret = pk_client_get_repo_list (client, filter, &error);
if (!ret) {
pk_warning ("failed to get repo list: %s", error->message);
g_error_free (error);
@@ -262,27 +271,43 @@
}
/**
+ * pk_repo_repo_list_changed_cb:
+ **/
+static void
+pk_repo_repo_list_changed_cb (PkControl *control, gpointer data)
+{
+ pk_repo_repo_list_refresh ();
+}
+
+/**
+ * pk_repo_checkbutton_details:
+ **/
+static void
+pk_repo_checkbutton_details (GtkWidget *widget, gpointer data)
+{
+ show_details = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+ pk_debug ("Changing %s to %i", GPK_CONF_REPO_SHOW_DETAILS, show_details);
+ gconf_client_set_bool (gconf_client, GPK_CONF_REPO_SHOW_DETAILS, show_details, NULL);
+ pk_repo_repo_list_refresh ();
+}
+
+/**
* main:
**/
int
main (int argc, char *argv[])
{
GMainLoop *loop;
- gboolean ret;
gboolean verbose = FALSE;
- gboolean program_version = FALSE;
GOptionContext *context;
GtkWidget *main_window;
GtkWidget *widget;
GtkTreeSelection *selection;
- GError *error = NULL;
PkControl *control;
const GOptionEntry options[] = {
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
N_("Show extra debugging information"), NULL },
- { "version", '\0', 0, G_OPTION_ARG_NONE, &program_version,
- N_("Show the program version and exit"), NULL },
{ NULL}
};
@@ -304,16 +329,13 @@
g_option_context_parse (context, &argc, &argv, NULL);
g_option_context_free (context);
- if (program_version) {
- g_print (VERSION "\n");
- return 0;
- }
-
pk_debug_init (verbose);
gtk_init (&argc, &argv);
loop = g_main_loop_new (NULL, FALSE);
+ gconf_client = gconf_client_get_default ();
+
client = pk_client_new ();
g_signal_connect (client, "repo-detail",
G_CALLBACK (pk_repo_detail_cb), NULL);
@@ -344,6 +366,12 @@
g_signal_connect (widget, "clicked",
G_CALLBACK (pk_button_help_cb), NULL);
+ widget = glade_xml_get_widget (glade_xml, "checkbutton_detail");
+ show_details = gconf_client_get_bool (gconf_client, GPK_CONF_REPO_SHOW_DETAILS, NULL);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), show_details);
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (pk_repo_checkbutton_details), NULL);
+
gtk_widget_set_size_request (main_window, 500, 300);
/* create list stores */
@@ -370,16 +398,14 @@
if (pk_enum_list_contains (role_list, PK_ROLE_ENUM_GET_REPO_LIST)) {
/* get the update list */
- ret = pk_client_get_repo_list (client, "none", &error);
- if (!ret) {
- pk_warning ("failed to get repo list: %s", error->message);
- g_error_free (error);
- }
+ pk_repo_repo_list_refresh ();
} else {
pk_repo_detail_cb (client, "default",
_("Getting repository 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");
+ gtk_widget_set_sensitive (widget, FALSE);
}
g_main_loop_run (loop);
@@ -387,6 +413,7 @@
g_object_unref (glade_xml);
g_object_unref (list_store);
+ g_object_unref (gconf_client);
g_object_unref (client);
g_object_unref (control);
g_object_unref (role_list);
Modified: trunk/src/gpk-update-viewer.c
==============================================================================
--- trunk/src/gpk-update-viewer.c (original)
+++ trunk/src/gpk-update-viewer.c Fri Apr 11 04:08:22 2008
@@ -646,7 +646,7 @@
}
/* TODO: we don't actually need to re-request the data, but we've
* nuked the preview window with the spinner */
- ret = pk_client_get_updates (client_query, "basename", &error);
+ ret = pk_client_get_updates (client_query, PK_FILTER_ENUM_BASENAME, &error);
if (!ret) {
pk_warning ("failed to get updates: %s", error->message);
g_error_free (error);
@@ -1287,7 +1287,8 @@
}
/* hide the cancel */
- if (role == PK_ROLE_ENUM_UPDATE_SYSTEM) {
+ if (role == PK_ROLE_ENUM_UPDATE_SYSTEM ||
+ role == PK_ROLE_ENUM_UPDATE_PACKAGES) {
widget = glade_xml_get_widget (glade_xml, "button_cancel");
gtk_widget_hide (widget);
@@ -1309,15 +1310,6 @@
}
}
- /* we don't need to do anything here */
- if (role == PK_ROLE_ENUM_UPDATE_PACKAGES) {
-
- /* set correct view */
- pk_updates_set_page (PAGE_CONFIRM);
-
- return;
- }
-
populate_preview ();
}
@@ -1340,7 +1332,7 @@
g_error_free (error);
return;
}
- ret = pk_client_get_updates (client_query, "basename", &error);
+ ret = pk_client_get_updates (client_query, PK_FILTER_ENUM_BASENAME, &error);
if (!ret) {
pk_warning ("failed to get updates: %s", error->message);
g_error_free (error);
@@ -1538,7 +1530,7 @@
g_error_free (error);
return;
}
- ret = pk_client_get_updates (client_query, "basename", &error);
+ ret = pk_client_get_updates (client_query, PK_FILTER_ENUM_BASENAME, &error);
if (!ret) {
pk_warning ("failed to get new list: %s", error->message);
g_error_free (error);
@@ -2036,7 +2028,7 @@
pk_updates_task_list_changed_cb (tlist, NULL);
/* get the update list */
- ret = pk_client_get_updates (client_query, "basename", NULL);
+ ret = pk_client_get_updates (client_query, PK_FILTER_ENUM_BASENAME, NULL);
if (ret) {
/* only show this if we succeeded */
pk_updates_preview_animation_start ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
