aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-08-05 16:58:35 +0000
committerJason Woodward2005-08-05 16:58:35 +0000
commita3715e923ca169ad7b4128fd290eac2b6fd32b87 (patch)
tree33326cbffbe81ed8e22fd1094a7f425e6c46ea70
parent9570a54beb636ac00b9f4a5dbbaf770dac552648 (diff)
downloadgslapt-a3715e923ca169ad7b4128fd290eac2b6fd32b87.tar.gz
cleaned up menus, adding options from the toolbar, moved clean toolbar option into preferences
-rw-r--r--ChangeLog4
-rw-r--r--gslapt.glade159
-rw-r--r--po/de.po11
-rw-r--r--po/en.po13
-rw-r--r--po/es.po13
-rw-r--r--po/gslapt.pot9
-rw-r--r--po/it.po11
-rw-r--r--po/pl.po13
-rw-r--r--po/pt.po13
-rw-r--r--po/sk.po13
-rw-r--r--po/sv.po13
-rw-r--r--po/vi.po13
-rw-r--r--src/callbacks.c24
-rw-r--r--src/callbacks.h19
-rw-r--r--src/interface.c211
15 files changed, 352 insertions, 187 deletions
diff --git a/ChangeLog b/ChangeLog
index a041483..e0f125d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
-0.3.5 Aug 04, 2005
+0.3.5 Aug 05, 2005
+ * cleaned up menus, adding options from the toolbar
+ * moved clean toolbar option into preferences
* translation updates
* use slapt_cmp_pkgs macro
* require libslapt 0.9.10b
diff --git a/gslapt.glade b/gslapt.glade
index 926a16e..49be594 100644
--- a/gslapt.glade
+++ b/gslapt.glade
@@ -132,6 +132,23 @@
<property name="fill">False</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkButton" id="button7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Delete Cached Package Files</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="clean_callback" last_modification_time="Fri, 05 Aug 2005 16:21:38 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -804,6 +821,78 @@
<widget class="GtkMenu" id="actions2_menu">
<child>
+ <widget class="GtkImageMenuItem" id="update1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Update local package cache</property>
+ <property name="label" translatable="yes">Update</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="update_activate" last_modification_time="Fri, 05 Aug 2005 16:40:24 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1171">
+ <property name="visible">True</property>
+ <property name="stock">gtk-refresh</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="mark_all_upgrades2">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Mark all possible upgrades</property>
+ <property name="label" translatable="yes">Mark All Upgrades</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="mark_all_upgrades_activate" last_modification_time="Fri, 05 Aug 2005 16:40:24 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1172">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-up</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="execute1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Execute all scheduled actions in current transaction</property>
+ <property name="label" translatable="yes">Execute</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="execute_activate" last_modification_time="Fri, 05 Aug 2005 16:40:24 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1173">
+ <property name="visible">True</property>
+ <property name="stock">gtk-apply</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator2">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkImageMenuItem" id="quit">
<property name="visible">True</property>
<property name="label">gtk-quit</property>
@@ -826,13 +915,25 @@
<widget class="GtkMenu" id="edit1_menu">
<child>
- <widget class="GtkMenuItem" id="unmark_all1">
+ <widget class="GtkImageMenuItem" id="unmark_all1">
<property name="visible">True</property>
<property name="label" translatable="yes">Unmark All</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_unmark_all1_activate" object="gslapt" last_modification_time="Mon, 06 Jun 2005 19:25:36 GMT"/>
- <signal name="activate" handler="on_unmark_all1_activate" last_modification_time="Mon, 06 Jun 2005 19:24:58 GMT"/>
+ <signal name="activate" handler="unmark_all_activate" last_modification_time="Fri, 05 Aug 2005 16:42:40 GMT"/>
+ <signal name="activate" handler="unmark_all_activate" last_modification_time="Fri, 05 Aug 2005 16:40:24 GMT"/>
<accelerator key="m" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1174">
+ <property name="visible">True</property>
+ <property name="stock">gtk-undo</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
</child>
@@ -851,7 +952,7 @@
<accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image974">
+ <widget class="GtkImage" id="image1175">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -886,7 +987,7 @@
<accelerator key="n" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image975">
+ <widget class="GtkImage" id="image1176">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_available.png</property>
<property name="xalign">0.5</property>
@@ -907,7 +1008,7 @@
<accelerator key="i" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image976">
+ <widget class="GtkImage" id="image1177">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_install.png</property>
<property name="xalign">0.5</property>
@@ -928,7 +1029,7 @@
<accelerator key="e" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image977">
+ <widget class="GtkImage" id="image1178">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_reinstall.png</property>
<property name="xalign">0.5</property>
@@ -949,7 +1050,7 @@
<accelerator key="u" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image978">
+ <widget class="GtkImage" id="image1179">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_upgrade.png</property>
<property name="xalign">0.5</property>
@@ -970,7 +1071,7 @@
<accelerator key="d" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image979">
+ <widget class="GtkImage" id="image1180">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_downgrade.png</property>
<property name="xalign">0.5</property>
@@ -991,7 +1092,7 @@
<accelerator key="r" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image980">
+ <widget class="GtkImage" id="image1181">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_remove.png</property>
<property name="xalign">0.5</property>
@@ -1017,11 +1118,23 @@
<widget class="GtkMenu" id="help3_menu">
<child>
- <widget class="GtkMenuItem" id="icon_legend1">
+ <widget class="GtkImageMenuItem" id="icon_legend1">
<property name="visible">True</property>
<property name="label" translatable="yes">Icon Legend</property>
<property name="use_underline">True</property>
<signal name="activate" handler="open_icon_legend" last_modification_time="Wed, 01 Jun 2005 03:20:34 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image1182">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-info</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
</child>
@@ -1033,7 +1146,7 @@
<signal name="activate" handler="open_about" last_modification_time="Sat, 05 Feb 2005 20:48:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image981">
+ <widget class="GtkImage" id="image1183">
<property name="visible">True</property>
<property name="stock">gtk-about</property>
<property name="icon_size">1</property>
@@ -1086,7 +1199,7 @@
<child>
<widget class="GtkToolButton" id="action_bar_upgrade_button">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Upgrade installed packages</property>
+ <property name="tooltip" translatable="yes">Mark all possible upgrades</property>
<property name="label" translatable="yes">Mark All Upgrades</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-go-up</property>
@@ -1102,24 +1215,6 @@
</child>
<child>
- <widget class="GtkToolButton" id="action_bar_clean_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clean archived packages off filesystem</property>
- <property name="label" translatable="yes">Clean</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-clear</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- <signal name="clicked" handler="clean_callback" last_modification_time="Fri, 11 Feb 2005 21:56:06 GMT"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkSeparatorToolItem" id="separatortoolitem1">
<property name="visible">True</property>
<property name="draw">True</property>
@@ -2828,7 +2923,7 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_transaction_okbutton1_clicked" object="transaction_window" last_modification_time="Mon, 15 Nov 2004 04:23:54 GMT"/>
+ <signal name="clicked" handler="transaction_okbutton_clicked" object="transaction_window" last_modification_time="Fri, 05 Aug 2005 16:43:04 GMT"/>
</widget>
</child>
</widget>
diff --git a/po/de.po b/po/de.po
index 0a6f150..d904e5c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2005-07-30 11:39+1500\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Manfred Mueller <linux@nass-ek.de>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -204,12 +204,6 @@ msgstr "Aktualisiere Paket-Cache"
msgid "Update"
msgstr "Aktualisiere"
-msgid "Upgrade installed packages"
-msgstr "Aktualisierung installierter Pakete"
-
-msgid "Upgrade to newer release"
-msgstr "Aktualisierung auf neue Version"
-
msgid "Upgrade"
msgstr "Aktualisierung"
@@ -454,3 +448,6 @@ msgstr "Empfange Pruefsummen-Liste..."
msgid "Reading Package Lists..."
msgstr "Lese Paket-Liste ein..."
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/po/en.po b/po/en.po
index ed154a9..edfe359 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gslapt 0.3.4\n"
+"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-20 16:24-0500\n"
-"PO-Revision-Date: 2005-07-22 15:07+0500\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -203,12 +203,6 @@ msgstr "Update local package cache"
msgid "Update"
msgstr "Update"
-msgid "Upgrade installed packages"
-msgstr "Upgrade installed packages"
-
-msgid "Upgrade to newer release"
-msgstr "Upgrade to newer release"
-
msgid "Upgrade"
msgstr "Upgrade"
@@ -453,3 +447,6 @@ msgstr "Retrieving checksum list..."
msgid "Reading Package Lists..."
msgstr "Reading Package Lists..."
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/po/es.po b/po/es.po
index fde33a0..4f3f112 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gslapt 0.3.4\n"
+"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2005-07-22 15:07+0500\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Manuel Barallobre (BARA) <bbara@ya.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -203,12 +203,6 @@ msgstr "Actualizar la cache local de paquetes"
msgid "Update"
msgstr "Actualizar"
-msgid "Upgrade installed packages"
-msgstr "Actualizar paquetes instalados"
-
-msgid "Upgrade to newer release"
-msgstr "Actualizar a una nueva version"
-
msgid "Upgrade"
msgstr "Actualizar"
@@ -453,3 +447,6 @@ msgstr "Retrieving checksum list..."
msgid "Reading Package Lists..."
msgstr "Reading Package Lists..."
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/po/gslapt.pot b/po/gslapt.pot
index 127bac7..103a47a 100644
--- a/po/gslapt.pot
+++ b/po/gslapt.pot
@@ -203,9 +203,6 @@ msgstr ""
msgid "Update"
msgstr ""
-msgid "Upgrade installed packages"
-msgstr ""
-
msgid "Upgrade to newer release"
msgstr ""
@@ -451,3 +448,9 @@ msgstr ""
msgid "Reading Package Lists..."
msgstr ""
+msgid "_Delete Cached Package Files"
+msgstr ""
+
+msgid "Mark all possible upgrades"
+msgstr ""
+
diff --git a/po/it.po b/po/it.po
index d998755..2364d9a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-07-28 18:01+0000\n"
-"PO-Revision-Date: 2005-07-28 21:49+0000\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Fabio Varesano <fvaresano@yahoo.it>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -213,12 +213,6 @@ msgstr "Aggiorna"
msgid "Upgrade All"
msgstr "Aggiorna tutto"
-msgid "Upgrade installed packages"
-msgstr "Aggiorna pacchetti installati"
-
-msgid "Upgrade to newer release"
-msgstr "Aggiorna ad una nuova versione"
-
msgid "Upgrade"
msgstr "Aggiorna"
@@ -461,3 +455,6 @@ msgstr "Ricezione lista checksum..."
msgid "Reading Package Lists..."
msgstr "Lettura Liste Pacchetti..."
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/po/pl.po b/po/pl.po
index 66f91b3..74c1b51 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gslapt 0.3.4\n"
+"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-17 14:52-0500\n"
-"PO-Revision-Date: 2005-08-04 09:15+0500\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Piotr Simon <sajmon@tenboard.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -110,12 +110,6 @@ msgstr "Update"
msgid "Update local package cache"
msgstr "Aktualizuj lokalne cache"
-msgid "Upgrade installed packages"
-msgstr "Aktualizuj zainstalowane pakiety"
-
-msgid "Upgrade to newer release"
-msgstr "Aktualizuj do nowszej wersji"
-
msgid "Clean"
msgstr "Wyczy"
@@ -423,3 +417,6 @@ msgstr "<b>Wersja zainstalowana</b>"
msgid "<b>Latest Available Version</b>"
msgstr "<b>Ostatnio dostpna wersja</b>"
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/po/pt.po b/po/pt.po
index bf54f66..0617cd7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gslapt 0.3.4\n"
+"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-05-06 11:10-0500\n"
-"PO-Revision-Date: 2005-07-22 15:07+0500\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Pedro Pinto aka _PN_boy <pedro_nuno_pn@zmail.pt>\n"
"Language-Team: slapt-get devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -202,12 +202,6 @@ msgstr "Actualizar a cache dos pacotes locais"
msgid "Update"
msgstr "Actualizar"
-msgid "Upgrade installed packages"
-msgstr "Upgrade aos pacotes instalados"
-
-msgid "Upgrade to newer release"
-msgstr "Upgrade aos novos pacotes"
-
msgid "Upgrade"
msgstr "Upgrade"
@@ -448,3 +442,6 @@ msgstr "Retrieving checksum list..."
msgid "Reading Package Lists..."
msgstr "Reading Package Lists..."
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/po/sk.po b/po/sk.po
index b5df041..76209ea 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gslapt 0.3.4\n"
+"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-06-23 21:28-0500\n"
-"PO-Revision-Date: 2005-07-22 15:07+0500\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Erik Gyepes <depi@depi.sk>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -203,12 +203,6 @@ msgstr "Aktualizova loklnu cache balkov"
msgid "Update"
msgstr "Aktualizova"
-msgid "Upgrade installed packages"
-msgstr "Upgradnu naintalovan balky"
-
-msgid "Upgrade to newer release"
-msgstr "Upgradnu na novie vydanie"
-
msgid "Upgrade"
msgstr "Upgrade"
@@ -453,3 +447,6 @@ msgstr "Retrieving checksum list..."
msgid "Reading Package Lists..."
msgstr "Reading Package Lists..."
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/po/sv.po b/po/sv.po
index f24341b..223131a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gslapt 0.3.4\n"
+"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2005-07-22 15:07+0500\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Hakan Lindqvist <tfy00hlt@cs.umu.se>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -203,12 +203,6 @@ msgstr "Uppdatera lokal paketdata"
msgid "Update"
msgstr "Uppdatera"
-msgid "Upgrade installed packages"
-msgstr "Uppgradera installerade paket"
-
-msgid "Upgrade to newer release"
-msgstr "Uppgradera till nyare release"
-
msgid "Upgrade"
msgstr "Uppgradera"
@@ -453,3 +447,6 @@ msgstr "Retrieving checksum list..."
msgid "Reading Package Lists..."
msgstr "Reading Package Lists..."
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/po/vi.po b/po/vi.po
index a9ccb81..4d9b679 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gslapt 0.3.4\n"
+"Project-Id-Version: gslapt 0.3.5\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2005-07-22 15:07+0500\n"
+"PO-Revision-Date: 2005-08-05 13:00+0500\n"
"Last-Translator: Nguyễn Văn Vũ <vncasper@yahoo.com>\n"
"Language-Team: gnome-vi <gnomevi-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -203,12 +203,6 @@ msgstr "Cập nhật danh sách gói sao lưu cục bộ"
msgid "Update"
msgstr "Cập nhật"
-msgid "Upgrade installed packages"
-msgstr "Nâng cấp danh sách gói được cài đặt"
-
-msgid "Upgrade to newer release"
-msgstr "Nâng cấp hệ thống lên phiên bản mới hơn"
-
msgid "Upgrade"
msgstr "Nâng cấp"
@@ -453,3 +447,6 @@ msgstr "Retrieving checksum list..."
msgid "Reading Package Lists..."
msgstr "Reading Package Lists..."
+msgid "_Delete Cached Package Files"
+msgstr "_Delete Cached Package Files"
+
diff --git a/src/callbacks.c b/src/callbacks.c
index 3787e1c..671a109 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1040,7 +1040,6 @@ static void lock_toolbar_buttons (void)
gtk_widget_set_sensitive(lookup_widget(gslapt,"action_bar_update_button"),FALSE);
gtk_widget_set_sensitive(lookup_widget(gslapt,"action_bar_upgrade_button"),FALSE);
- gtk_widget_set_sensitive(lookup_widget(gslapt,"action_bar_clean_button"),FALSE);
gtk_widget_set_sensitive(lookup_widget(gslapt,"action_bar_execute_button"),FALSE);
}
@@ -1051,7 +1050,6 @@ static void unlock_toolbar_buttons (void)
gtk_widget_set_sensitive(lookup_widget(gslapt,"action_bar_update_button"),TRUE);
gtk_widget_set_sensitive(lookup_widget(gslapt,"action_bar_upgrade_button"),TRUE);
- gtk_widget_set_sensitive(lookup_widget(gslapt,"action_bar_clean_button"),TRUE);
if (
trans->upgrade_pkgs->pkg_count != 0
@@ -1152,7 +1150,7 @@ static void lhandle_transaction (GtkWidget *w)
}
-void on_transaction_okbutton1_clicked (GtkWidget *w, gpointer user_data)
+void transaction_okbutton_clicked (GtkWidget *w, gpointer user_data)
{
GThread *gdp;
@@ -1712,7 +1710,7 @@ static gboolean install_packages (void)
}
-void clean_callback (GtkMenuItem *menuitem, gpointer user_data)
+void clean_callback (GtkWidget *widget, gpointer user_data)
{
GThread *gpd;
@@ -2633,7 +2631,7 @@ static void rebuild_package_action_menu (void)
}
-void on_unmark_all1_activate (GtkMenuItem *menuitem, gpointer user_data)
+void unmark_all_activate (GtkMenuItem *menuitem, gpointer user_data)
{
GdkCursor *c;
@@ -2703,3 +2701,19 @@ void repositories_changed_callback (GtkWidget *repositories_changed,
"clicked");
}
+
+void update_activate (GtkMenuItem *menuitem, gpointer user_data)
+{
+ return update_callback(NULL,NULL);
+}
+
+void mark_all_upgrades_activate (GtkMenuItem *menuitem, gpointer user_data)
+{
+ return upgrade_callback(NULL,NULL);
+}
+
+void execute_activate (GtkMenuItem *menuitem, gpointer user_data)
+{
+ return execute_callback(NULL,NULL);
+}
+
diff --git a/src/callbacks.h b/src/callbacks.h
index e1aee3e..49637d7 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -36,7 +36,6 @@ void on_gslapt_destroy (GtkObject *object, gpointer user_data);
void update_callback (GtkObject *object, gpointer user_data);
void upgrade_callback (GtkObject *object, gpointer user_data);
void execute_callback (GtkObject *object, gpointer user_data);
-void open_preferences (GtkMenuItem *menuitem, gpointer user_data);
void search_button_clicked (GtkWidget *gslapt, gpointer user_data);
void add_pkg_for_install (GtkWidget *gslapt, gpointer user_data);
void add_pkg_for_reinstall (GtkWidget *gslapt, gpointer user_data);
@@ -52,7 +51,7 @@ void preferences_sources_add (GtkWidget *w, gpointer user_data);
void preferences_sources_remove (GtkWidget *w, gpointer user_data);
void preferences_on_ok_clicked (GtkWidget *w, gpointer user_data);
-void on_transaction_okbutton1_clicked (GtkWidget *w, gpointer user_data);
+void transaction_okbutton_clicked (GtkWidget *w, gpointer user_data);
void preferences_exclude_add (GtkWidget *w, gpointer user_data);
void preferences_exclude_remove (GtkWidget *w, gpointer user_data);
@@ -60,7 +59,6 @@ void clear_button_clicked (GtkWidget *button,gpointer user_data);
int gtk_progress_callback (void *data, double dltotal, double dlnow,
double ultotal, double ulnow);
-void clean_callback (GtkMenuItem *menuitem, gpointer user_data);
void build_package_treeviewlist (GtkWidget *treeview);
void cancel_preferences (GtkWidget *w, gpointer user_data);
@@ -70,14 +68,21 @@ void unmark_package (GtkWidget *gslapt, gpointer user_data);
void build_treeview_columns (GtkWidget *treeview);
-void open_icon_legend (GtkObject *object, gpointer user_data);
-
void on_button_cancel_clicked (GtkButton *button, gpointer user_data);
-void on_unmark_all1_activate (GtkMenuItem *menuitem, gpointer user_data);
-
GtkEntryCompletion *build_search_completions (void);
void repositories_changed_callback (GtkWidget *repositories_changed,
gpointer user_data);
+
+
+/* menu callbacks */
+void clean_callback (GtkWidget *widget, gpointer user_data);
+void open_preferences (GtkMenuItem *menuitem, gpointer user_data);
+void open_icon_legend (GtkObject *object, gpointer user_data);
+void unmark_all_activate (GtkMenuItem *menuitem, gpointer user_data);
+void update_activate (GtkMenuItem *menuitem, gpointer user_data);
+void mark_all_upgrades_activate (GtkMenuItem *menuitem, gpointer user_data);
+void execute_activate (GtkMenuItem *menuitem, gpointer user_data);
+
diff --git a/src/interface.c b/src/interface.c
index a25cfdf..a38cbd6 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -40,6 +40,7 @@ create_window_preferences (void)
GtkWidget *label72;
GtkWidget *vbox12;
GtkWidget *preferences_working_dir_entry;
+ GtkWidget *button7;
GtkWidget *label50;
GtkWidget *preferences_exclude_vbox;
GtkWidget *preferences_exclude_vbox_vbox;
@@ -139,6 +140,11 @@ create_window_preferences (void)
gtk_widget_show (preferences_working_dir_entry);
gtk_box_pack_start (GTK_BOX (vbox12), preferences_working_dir_entry, FALSE, FALSE, 0);
+ button7 = gtk_button_new_with_mnemonic (_("_Delete Cached Package Files"));
+ gtk_widget_set_name (button7, "button7");
+ gtk_widget_show (button7);
+ gtk_box_pack_start (GTK_BOX (vbox12), button7, FALSE, FALSE, 0);
+
label50 = gtk_label_new (_("Working Directory"));
gtk_widget_set_name (label50, "label50");
gtk_widget_show (label50);
@@ -345,6 +351,9 @@ create_window_preferences (void)
g_signal_connect ((gpointer) window_preferences, "destroy_event",
G_CALLBACK (gtk_widget_destroy),
NULL);
+ g_signal_connect ((gpointer) button7, "clicked",
+ G_CALLBACK (clean_callback),
+ NULL);
g_signal_connect_swapped ((gpointer) preferences_remove_exclude_button, "clicked",
G_CALLBACK (preferences_exclude_remove),
GTK_OBJECT (window_preferences));
@@ -387,6 +396,7 @@ create_window_preferences (void)
GLADE_HOOKUP_OBJECT (window_preferences, label72, "label72");
GLADE_HOOKUP_OBJECT (window_preferences, vbox12, "vbox12");
GLADE_HOOKUP_OBJECT (window_preferences, preferences_working_dir_entry, "preferences_working_dir_entry");
+ GLADE_HOOKUP_OBJECT (window_preferences, button7, "button7");
GLADE_HOOKUP_OBJECT (window_preferences, label50, "label50");
GLADE_HOOKUP_OBJECT (window_preferences, preferences_exclude_vbox, "preferences_exclude_vbox");
GLADE_HOOKUP_OBJECT (window_preferences, preferences_exclude_vbox_vbox, "preferences_exclude_vbox_vbox");
@@ -434,38 +444,46 @@ create_gslapt (void)
GtkWidget *top_menubar;
GtkWidget *actions2;
GtkWidget *actions2_menu;
+ GtkWidget *update1;
+ GtkWidget *image1171;
+ GtkWidget *mark_all_upgrades2;
+ GtkWidget *image1172;
+ GtkWidget *execute1;
+ GtkWidget *image1173;
+ GtkWidget *separator2;
GtkWidget *quit;
GtkWidget *edit1;
GtkWidget *edit1_menu;
GtkWidget *unmark_all1;
+ GtkWidget *image1174;
GtkWidget *separator1;
GtkWidget *preferences2;
- GtkWidget *image974;
+ GtkWidget *image1175;
GtkWidget *package1;
GtkWidget *package1_menu;
GtkWidget *unmark1;
- GtkWidget *image975;
+ GtkWidget *image1176;
GtkWidget *install1;
- GtkWidget *image976;
+ GtkWidget *image1177;
GtkWidget *re_install1;
- GtkWidget *image977;
+ GtkWidget *image1178;
GtkWidget *upgrade1;
- GtkWidget *image978;
+ GtkWidget *image1179;
GtkWidget *downgrade1;
- GtkWidget *image979;
+ GtkWidget *image1180;
GtkWidget *remove1;
- GtkWidget *image980;
+ GtkWidget *image1181;
GtkWidget *help3;
GtkWidget *help3_menu;
GtkWidget *icon_legend1;
+ GtkWidget *image1182;
GtkWidget *about3;
- GtkWidget *image981;
+ GtkWidget *image1183;
GtkWidget *action_toolbar;
GtkIconSize tmp_toolbar_icon_size;
GtkWidget *tmp_image;
GtkWidget *action_bar_update_button;
GtkWidget *action_bar_upgrade_button;
- GtkWidget *action_bar_clean_button;
GtkWidget *separatortoolitem1;
GtkWidget *action_bar_execute_button;
GtkWidget *search_vbox;
@@ -570,6 +588,45 @@ create_gslapt (void)
gtk_widget_set_name (actions2_menu, "actions2_menu");
gtk_menu_item_set_submenu (GTK_MENU_ITEM (actions2), actions2_menu);
+ update1 = gtk_image_menu_item_new_with_mnemonic (_("Update"));
+ gtk_widget_set_name (update1, "update1");
+ gtk_widget_show (update1);
+ gtk_container_add (GTK_CONTAINER (actions2_menu), update1);
+ gtk_tooltips_set_tip (tooltips, update1, _("Update local package cache"), NULL);
+
+ image1171 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1171, "image1171");
+ gtk_widget_show (image1171);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (update1), image1171);
+
+ mark_all_upgrades2 = gtk_image_menu_item_new_with_mnemonic (_("Mark All Upgrades"));
+ gtk_widget_set_name (mark_all_upgrades2, "mark_all_upgrades2");
+ gtk_widget_show (mark_all_upgrades2);
+ gtk_container_add (GTK_CONTAINER (actions2_menu), mark_all_upgrades2);
+ gtk_tooltips_set_tip (tooltips, mark_all_upgrades2, _("Mark all possible upgrades"), NULL);
+
+ image1172 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1172, "image1172");
+ gtk_widget_show (image1172);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mark_all_upgrades2), image1172);
+
+ execute1 = gtk_image_menu_item_new_with_mnemonic (_("Execute"));
+ gtk_widget_set_name (execute1, "execute1");
+ gtk_widget_show (execute1);
+ gtk_container_add (GTK_CONTAINER (actions2_menu), execute1);
+ gtk_tooltips_set_tip (tooltips, execute1, _("Execute all scheduled actions in current transaction"), NULL);
+
+ image1173 = gtk_image_new_from_stock ("gtk-apply", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1173, "image1173");
+ gtk_widget_show (image1173);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (execute1), image1173);
+
+ separator2 = gtk_separator_menu_item_new ();
+ gtk_widget_set_name (separator2, "separator2");
+ gtk_widget_show (separator2);
+ gtk_container_add (GTK_CONTAINER (actions2_menu), separator2);
+ gtk_widget_set_sensitive (separator2, FALSE);
+
quit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
gtk_widget_set_name (quit, "quit");
gtk_widget_show (quit);
@@ -584,7 +641,7 @@ create_gslapt (void)
gtk_widget_set_name (edit1_menu, "edit1_menu");
gtk_menu_item_set_submenu (GTK_MENU_ITEM (edit1), edit1_menu);
- unmark_all1 = gtk_menu_item_new_with_mnemonic (_("Unmark All"));
+ unmark_all1 = gtk_image_menu_item_new_with_mnemonic (_("Unmark All"));
gtk_widget_set_name (unmark_all1, "unmark_all1");
gtk_widget_show (unmark_all1);
gtk_container_add (GTK_CONTAINER (edit1_menu), unmark_all1);
@@ -592,6 +649,11 @@ create_gslapt (void)
GDK_m, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
+ image1174 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1174, "image1174");
+ gtk_widget_show (image1174);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark_all1), image1174);
+
separator1 = gtk_separator_menu_item_new ();
gtk_widget_set_name (separator1, "separator1");
gtk_widget_show (separator1);
@@ -606,10 +668,10 @@ create_gslapt (void)
GDK_p, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image974 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image974, "image974");
- gtk_widget_show (image974);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences2), image974);
+ image1175 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1175, "image1175");
+ gtk_widget_show (image1175);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences2), image1175);
package1 = gtk_menu_item_new_with_mnemonic (_("P_ackage"));
gtk_widget_set_name (package1, "package1");
@@ -629,10 +691,10 @@ create_gslapt (void)
GDK_n, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image975 = create_pixmap (gslapt, "pkg_action_available.png");
- gtk_widget_set_name (image975, "image975");
- gtk_widget_show (image975);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark1), image975);
+ image1176 = create_pixmap (gslapt, "pkg_action_available.png");
+ gtk_widget_set_name (image1176, "image1176");
+ gtk_widget_show (image1176);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark1), image1176);
install1 = gtk_image_menu_item_new_with_mnemonic (_("Install"));
gtk_widget_set_name (install1, "install1");
@@ -643,10 +705,10 @@ create_gslapt (void)
GDK_i, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image976 = create_pixmap (gslapt, "pkg_action_install.png");
- gtk_widget_set_name (image976, "image976");
- gtk_widget_show (image976);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (install1), image976);
+ image1177 = create_pixmap (gslapt, "pkg_action_install.png");
+ gtk_widget_set_name (image1177, "image1177");
+ gtk_widget_show (image1177);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (install1), image1177);
re_install1 = gtk_image_menu_item_new_with_mnemonic (_("Re-Install"));
gtk_widget_set_name (re_install1, "re_install1");
@@ -657,10 +719,10 @@ create_gslapt (void)
GDK_e, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image977 = create_pixmap (gslapt, "pkg_action_reinstall.png");
- gtk_widget_set_name (image977, "image977");
- gtk_widget_show (image977);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (re_install1), image977);
+ image1178 = create_pixmap (gslapt, "pkg_action_reinstall.png");
+ gtk_widget_set_name (image1178, "image1178");
+ gtk_widget_show (image1178);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (re_install1), image1178);
upgrade1 = gtk_image_menu_item_new_with_mnemonic (_("Upgrade"));
gtk_widget_set_name (upgrade1, "upgrade1");
@@ -671,10 +733,10 @@ create_gslapt (void)
GDK_u, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image978 = create_pixmap (gslapt, "pkg_action_upgrade.png");
- gtk_widget_set_name (image978, "image978");
- gtk_widget_show (image978);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (upgrade1), image978);
+ image1179 = create_pixmap (gslapt, "pkg_action_upgrade.png");
+ gtk_widget_set_name (image1179, "image1179");
+ gtk_widget_show (image1179);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (upgrade1), image1179);
downgrade1 = gtk_image_menu_item_new_with_mnemonic (_("Downgrade"));
gtk_widget_set_name (downgrade1, "downgrade1");
@@ -685,10 +747,10 @@ create_gslapt (void)
GDK_d, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image979 = create_pixmap (gslapt, "pkg_action_downgrade.png");
- gtk_widget_set_name (image979, "image979");
- gtk_widget_show (image979);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (downgrade1), image979);
+ image1180 = create_pixmap (gslapt, "pkg_action_downgrade.png");
+ gtk_widget_set_name (image1180, "image1180");
+ gtk_widget_show (image1180);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (downgrade1), image1180);
remove1 = gtk_image_menu_item_new_with_mnemonic (_("Remove"));
gtk_widget_set_name (remove1, "remove1");
@@ -699,10 +761,10 @@ create_gslapt (void)
GDK_r, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image980 = create_pixmap (gslapt, "pkg_action_remove.png");
- gtk_widget_set_name (image980, "image980");
- gtk_widget_show (image980);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image980);
+ image1181 = create_pixmap (gslapt, "pkg_action_remove.png");
+ gtk_widget_set_name (image1181, "image1181");
+ gtk_widget_show (image1181);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image1181);
help3 = gtk_menu_item_new_with_mnemonic (_("_Help"));
gtk_widget_set_name (help3, "help3");
@@ -713,20 +775,25 @@ create_gslapt (void)
gtk_widget_set_name (help3_menu, "help3_menu");
gtk_menu_item_set_submenu (GTK_MENU_ITEM (help3), help3_menu);
- icon_legend1 = gtk_menu_item_new_with_mnemonic (_("Icon Legend"));
+ icon_legend1 = gtk_image_menu_item_new_with_mnemonic (_("Icon Legend"));
gtk_widget_set_name (icon_legend1, "icon_legend1");
gtk_widget_show (icon_legend1);
gtk_container_add (GTK_CONTAINER (help3_menu), icon_legend1);
+ image1182 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1182, "image1182");
+ gtk_widget_show (image1182);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (icon_legend1), image1182);
+
about3 = gtk_image_menu_item_new_with_mnemonic (_("About"));
gtk_widget_set_name (about3, "about3");
gtk_widget_show (about3);
gtk_container_add (GTK_CONTAINER (help3_menu), about3);
- image981 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image981, "image981");
- gtk_widget_show (image981);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about3), image981);
+ image1183 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1183, "image1183");
+ gtk_widget_show (image1183);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about3), image1183);
action_toolbar = gtk_toolbar_new ();
gtk_widget_set_name (action_toolbar, "action_toolbar");
@@ -749,15 +816,7 @@ create_gslapt (void)
gtk_widget_set_name (action_bar_upgrade_button, "action_bar_upgrade_button");
gtk_widget_show (action_bar_upgrade_button);
gtk_container_add (GTK_CONTAINER (action_toolbar), action_bar_upgrade_button);
- gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (action_bar_upgrade_button), tooltips, _("Upgrade installed packages"), NULL);
-
- tmp_image = gtk_image_new_from_stock ("gtk-clear", tmp_toolbar_icon_size);
- gtk_widget_show (tmp_image);
- action_bar_clean_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Clean"));
- gtk_widget_set_name (action_bar_clean_button, "action_bar_clean_button");
- gtk_widget_show (action_bar_clean_button);
- gtk_container_add (GTK_CONTAINER (action_toolbar), action_bar_clean_button);
- gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (action_bar_clean_button), tooltips, _("Clean archived packages off filesystem"), NULL);
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (action_bar_upgrade_button), tooltips, _("Mark all possible upgrades"), NULL);
separatortoolitem1 = (GtkWidget*) gtk_separator_tool_item_new ();
gtk_widget_set_name (separatortoolitem1, "separatortoolitem1");
@@ -1257,14 +1316,23 @@ create_gslapt (void)
g_signal_connect ((gpointer) gslapt, "destroy",
G_CALLBACK (on_gslapt_destroy),
NULL);
+ g_signal_connect ((gpointer) update1, "activate",
+ G_CALLBACK (update_activate),
+ NULL);
+ g_signal_connect ((gpointer) mark_all_upgrades2, "activate",
+ G_CALLBACK (mark_all_upgrades_activate),
+ NULL);
+ g_signal_connect ((gpointer) execute1, "activate",
+ G_CALLBACK (execute_activate),
+ NULL);
g_signal_connect ((gpointer) quit, "activate",
G_CALLBACK (on_gslapt_destroy),
NULL);
- g_signal_connect_swapped ((gpointer) unmark_all1, "activate",
- G_CALLBACK (on_unmark_all1_activate),
- GTK_OBJECT (gslapt));
g_signal_connect ((gpointer) unmark_all1, "activate",
- G_CALLBACK (on_unmark_all1_activate),
+ G_CALLBACK (unmark_all_activate),
+ NULL);
+ g_signal_connect ((gpointer) unmark_all1, "activate",
+ G_CALLBACK (unmark_all_activate),
NULL);
g_signal_connect ((gpointer) preferences2, "activate",
G_CALLBACK (open_preferences),
@@ -1281,9 +1349,6 @@ create_gslapt (void)
g_signal_connect_swapped ((gpointer) action_bar_upgrade_button, "clicked",
G_CALLBACK (upgrade_callback),
GTK_OBJECT (gslapt));
- g_signal_connect ((gpointer) action_bar_clean_button, "clicked",
- G_CALLBACK (clean_callback),
- NULL);
g_signal_connect_swapped ((gpointer) action_bar_execute_button, "clicked",
G_CALLBACK (execute_callback),
GTK_OBJECT (gslapt));
@@ -1306,36 +1371,44 @@ create_gslapt (void)
GLADE_HOOKUP_OBJECT (gslapt, top_menubar, "top_menubar");
GLADE_HOOKUP_OBJECT (gslapt, actions2, "actions2");
GLADE_HOOKUP_OBJECT (gslapt, actions2_menu, "actions2_menu");
+ GLADE_HOOKUP_OBJECT (gslapt, update1, "update1");
+ GLADE_HOOKUP_OBJECT (gslapt, image1171, "image1171");
+ GLADE_HOOKUP_OBJECT (gslapt, mark_all_upgrades2, "mark_all_upgrades2");
+ GLADE_HOOKUP_OBJECT (gslapt, image1172, "image1172");
+ GLADE_HOOKUP_OBJECT (gslapt, execute1, "execute1");
+ GLADE_HOOKUP_OBJECT (gslapt, image1173, "image1173");
+ GLADE_HOOKUP_OBJECT (gslapt, separator2, "separator2");
GLADE_HOOKUP_OBJECT (gslapt, quit, "quit");
GLADE_HOOKUP_OBJECT (gslapt, edit1, "edit1");
GLADE_HOOKUP_OBJECT (gslapt, edit1_menu, "edit1_menu");
GLADE_HOOKUP_OBJECT (gslapt, unmark_all1, "unmark_all1");
+ GLADE_HOOKUP_OBJECT (gslapt, image1174, "image1174");
GLADE_HOOKUP_OBJECT (gslapt, separator1, "separator1");
GLADE_HOOKUP_OBJECT (gslapt, preferences2, "preferences2");
- GLADE_HOOKUP_OBJECT (gslapt, image974, "image974");
+ GLADE_HOOKUP_OBJECT (gslapt, image1175, "image1175");
GLADE_HOOKUP_OBJECT (gslapt, package1, "package1");
GLADE_HOOKUP_OBJECT (gslapt, package1_menu, "package1_menu");
GLADE_HOOKUP_OBJECT (gslapt, unmark1, "unmark1");
- GLADE_HOOKUP_OBJECT (gslapt, image975, "image975");
+ GLADE_HOOKUP_OBJECT (gslapt, image1176, "image1176");
GLADE_HOOKUP_OBJECT (gslapt, install1, "install1");
- GLADE_HOOKUP_OBJECT (gslapt, image976, "image976");
+ GLADE_HOOKUP_OBJECT (gslapt, image1177, "image1177");
GLADE_HOOKUP_OBJECT (gslapt, re_install1, "re_install1");
- GLADE_HOOKUP_OBJECT (gslapt, image977, "image977");
+ GLADE_HOOKUP_OBJECT (gslapt, image1178, "image1178");
GLADE_HOOKUP_OBJECT (gslapt, upgrade1, "upgrade1");
- GLADE_HOOKUP_OBJECT (gslapt, image978, "image978");
+ GLADE_HOOKUP_OBJECT (gslapt, image1179, "image1179");
GLADE_HOOKUP_OBJECT (gslapt, downgrade1, "downgrade1");
- GLADE_HOOKUP_OBJECT (gslapt, image979, "image979");
+ GLADE_HOOKUP_OBJECT (gslapt, image1180, "image1180");
GLADE_HOOKUP_OBJECT (gslapt, remove1, "remove1");
- GLADE_HOOKUP_OBJECT (gslapt, image980, "image980");
+ GLADE_HOOKUP_OBJECT (gslapt, image1181, "image1181");
GLADE_HOOKUP_OBJECT (gslapt, help3, "help3");
GLADE_HOOKUP_OBJECT (gslapt, help3_menu, "help3_menu");
GLADE_HOOKUP_OBJECT (gslapt, icon_legend1, "icon_legend1");
+ GLADE_HOOKUP_OBJECT (gslapt, image1182, "image1182");
GLADE_HOOKUP_OBJECT (gslapt, about3, "about3");
- GLADE_HOOKUP_OBJECT (gslapt, image981, "image981");
+ GLADE_HOOKUP_OBJECT (gslapt, image1183, "image1183");
GLADE_HOOKUP_OBJECT (gslapt, action_toolbar, "action_toolbar");
GLADE_HOOKUP_OBJECT (gslapt, action_bar_update_button, "action_bar_update_button");
GLADE_HOOKUP_OBJECT (gslapt, action_bar_upgrade_button, "action_bar_upgrade_button");
- GLADE_HOOKUP_OBJECT (gslapt, action_bar_clean_button, "action_bar_clean_button");
GLADE_HOOKUP_OBJECT (gslapt, separatortoolitem1, "separatortoolitem1");
GLADE_HOOKUP_OBJECT (gslapt, action_bar_execute_button, "action_bar_execute_button");
GLADE_HOOKUP_OBJECT (gslapt, search_vbox, "search_vbox");
@@ -1568,7 +1641,7 @@ create_transaction_window (void)
G_CALLBACK (cancel_transaction),
GTK_OBJECT (transaction_window));
g_signal_connect_swapped ((gpointer) button3, "clicked",
- G_CALLBACK (on_transaction_okbutton1_clicked),
+ G_CALLBACK (transaction_okbutton_clicked),
GTK_OBJECT (transaction_window));
/* Store pointers to all widgets, for use by lookup_widget(). */