aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2006-11-05 16:26:21 +0000
committerJason Woodward2006-11-05 16:26:21 +0000
commit268f821471b335308406cd65d943caf14a13595d (patch)
tree9d2ccd574ee7a6955066e74c7be6d59a3d6a0f67
parent1d64868e0c0aba943835ff8d26733846d4b53269 (diff)
downloadgslapt-268f821471b335308406cd65d943caf14a13595d.tar.gz
search interface is now simplified
-rw-r--r--ChangeLog3
-rw-r--r--gslapt.glade66
-rw-r--r--po/bg.po7
-rw-r--r--po/de.po12
-rw-r--r--po/en.po7
-rw-r--r--po/es.po7
-rw-r--r--po/fr.po7
-rw-r--r--po/gslapt.pot7
-rw-r--r--po/id.po7
-rw-r--r--po/it.po7
-rw-r--r--po/ja.po7
-rw-r--r--po/nl.po7
-rw-r--r--po/pl.po7
-rw-r--r--po/pt.po7
-rw-r--r--po/pt_BR.po7
-rw-r--r--po/ru.po7
-rw-r--r--po/sk.po7
-rw-r--r--po/sv.po7
-rw-r--r--po/uk.po7
-rw-r--r--po/vi.po7
-rw-r--r--po/zh_CN.po7
-rw-r--r--src/callbacks.c18
-rw-r--r--src/callbacks.h5
-rw-r--r--src/interface.c34
-rw-r--r--src/main.c1
25 files changed, 84 insertions, 181 deletions
diff --git a/ChangeLog b/ChangeLog
index 6732b3f..f053991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-0.3.16 Oct 29, 2006
+0.3.16 Nov 05, 2006
+ * Search interface is now simplified.
* package sources can now be edited
* package sources and exclude expressions are now reorderable by dragging
* improved the preferences code architecture
diff --git a/gslapt.glade b/gslapt.glade
index 478fd1f..9b8ee5f 100644
--- a/gslapt.glade
+++ b/gslapt.glade
@@ -1390,6 +1390,31 @@
<property name="spacing">0</property>
<child>
+ <widget class="GtkLabel" id="label292">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Search</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkEntry" id="search_entry">
<property name="visible">True</property>
<property name="can_default">True</property>
@@ -1403,8 +1428,8 @@
<property name="has_frame">True</property>
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
- <signal name="editing_done" handler="search_button_clicked" object="gslapt" last_modification_time="Thu, 17 Feb 2005 22:00:51 GMT"/>
- <signal name="activate" handler="search_button_clicked" object="gslapt" last_modification_time="Thu, 17 Feb 2005 22:01:02 GMT"/>
+ <signal name="editing_done" handler="search_activated" object="gslapt" last_modification_time="Sun, 05 Nov 2006 08:32:36 GMT"/>
+ <signal name="activate" handler="search_activated" object="gslapt" last_modification_time="Sun, 05 Nov 2006 08:32:46 GMT"/>
<accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="grab_focus"/>
</widget>
<packing>
@@ -1413,43 +1438,6 @@
<property name="fill">True</property>
</packing>
</child>
-
- <child>
- <widget class="GtkButton" id="search_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Search for expression</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Search</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="search_button_clicked" object="gslapt" last_modification_time="Thu, 17 Feb 2005 22:01:42 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="clear_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear search expression</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Clear</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="clear_button_clicked" object="search_entry" last_modification_time="Thu, 17 Feb 2005 22:01:30 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
</child>
</widget>
diff --git a/po/bg.po b/po/bg.po
index 253a490..7539637 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: Victor Keranov <victor_keranov@mail.bg>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -160,9 +160,6 @@ msgstr "Премахване на пакети..."
msgid "Required"
msgstr "Required"
-msgid "Search for expression"
-msgstr "Търсене за фраза"
-
msgid "Search"
msgstr "Търсене"
diff --git a/po/de.po b/po/de.po
index 7d55c15..f1580ed 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,11 +6,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
-"Last-Translator: Manfred Mueller <nekdesk@nekdesk.de>\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
+"Last-Translator: Manfred Mueller <mmueller@nekserve.de>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -334,7 +334,7 @@ msgid "Source download failed"
msgstr "Quell-Download gescheitert"
msgid "Package(s) failed to download"
-msgstr "Nicht geladene(s) Paket(e)"
+msgstr "Konnte kein(e) Paket(e) laden"
msgid "pkgtools returned an error"
msgstr "pkgtools meldete Fehler"
@@ -469,8 +469,8 @@ msgid "View Marked Packages"
msgstr "Nur markierte Pakete anzeigen"
msgid "Mark Obsolete"
-msgstr "Mark Obsolete"
+msgstr "Markiere veraltete Pakete"
msgid "Mark all obsolete packages"
-msgstr "Mark all obsolete packages"
+msgstr "Markiere ALLE veralteten Pakete"
diff --git a/po/en.po b/po/en.po
index 5c14bad..7261d2c 100644
--- a/po/en.po
+++ b/po/en.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -160,9 +160,6 @@ msgstr "Removing packages..."
msgid "Required"
msgstr "Required"
-msgid "Search for expression"
-msgstr "Search for expression"
-
msgid "Search"
msgstr "Search"
diff --git a/po/es.po b/po/es.po
index b8db12b..209155d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -160,9 +160,6 @@ msgstr "Desinstalando paquetes..."
msgid "Required"
msgstr "Necesario"
-msgid "Search for expression"
-msgstr "Buscar expresion"
-
msgid "Search"
msgstr "Buscar"
diff --git a/po/fr.po b/po/fr.po
index 0d37d77..0cd3f63 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.15\n"
+"Project-Id-Version: 0.3.16\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: 2006-10-04 18:35+0200\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: Natim <natim@trunat.fr>\n"
"Language-Team: <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -160,9 +160,6 @@ msgstr "Suppression des packets..."
msgid "Required"
msgstr "Requis"
-msgid "Search for expression"
-msgstr "Recherche de l'expression"
-
msgid "Search"
msgstr "Recherche"
diff --git a/po/gslapt.pot b/po/gslapt.pot
index 6f950f4..2a521bf 100644
--- a/po/gslapt.pot
+++ b/po/gslapt.pot
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -160,9 +160,6 @@ msgstr ""
msgid "Required"
msgstr ""
-msgid "Search for expression"
-msgstr ""
-
msgid "Search"
msgstr ""
diff --git a/po/id.po b/po/id.po
index c6f99f7..3bd0e5b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: Kemas Antonius <kyantonius@kyantonius.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -160,9 +160,6 @@ msgstr "Menghapus paket-paket..."
msgid "Required"
msgstr "Dibutuhkan"
-msgid "Search for expression"
-msgstr "Menelusuri ekspresi"
-
msgid "Search"
msgstr "Telusur"
diff --git a/po/it.po b/po/it.po
index 6430821..402afc7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -168,9 +168,6 @@ msgstr "Rimozione pacchetto..."
msgid "Required"
msgstr "Richiesto"
-msgid "Search for expression"
-msgstr "Cerca per espressione"
-
msgid "Search"
msgstr "Cerca"
diff --git a/po/ja.po b/po/ja.po
index 5ff483e..53b224d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,10 +6,10 @@
# JW <J_W@somewhere.c0.jp>, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2006-03-07 20:26+0900\n"
-"PO-Revision-Date: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: JW <J_W@somewhere.c0.jp>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,9 +162,6 @@ msgstr "パッケージの削除中..."
msgid "Required"
msgstr "要求(Required)"
-msgid "Search for expression"
-msgstr "Search for expression"
-
msgid "Search"
msgstr "検索"
diff --git a/po/nl.po b/po/nl.po
index f61f15e..8cdaaae 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-08-18 23:06+0200\n"
-"PO-Revision-Date: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: Martijn Dekker <martijn@inlv.demon.nl>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -161,9 +161,6 @@ msgstr "Verwijderen pakketten..."
msgid "Required"
msgstr "Vereist"
-msgid "Search for expression"
-msgstr "Zoek naar uitdrukking"
-
msgid "Search"
msgstr "Zoek"
diff --git a/po/pl.po b/po/pl.po
index 607288f..8735923 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -100,9 +100,6 @@ msgstr "Wykonaj wszystkie zaplanowane akcje w biecej transakcji"
msgid "Quit"
msgstr "Opu"
-msgid "Search"
-msgstr "Szukaj"
-
msgid "Search for expression"
msgstr "Szukaj wyraenia"
diff --git a/po/pt.po b/po/pt.po
index e4c72fd..a3f460b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -160,9 +160,6 @@ msgstr "A a apagar pacotes..."
msgid "Required"
msgstr "Necessário"
-msgid "Search for expression"
-msgstr "Procurar por expressão"
-
msgid "Search"
msgstr "Procurar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5321737..6da5ec3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: Frederico Henrique Gonalves Lima <fredhgl@yahoo.com.br>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -160,9 +160,6 @@ msgstr "Removendo pacotes..."
msgid "Required"
msgstr "Necessrio"
-msgid "Search for expression"
-msgstr "Procurar por expresso"
-
msgid "Search"
msgstr "Pesquisar"
diff --git a/po/ru.po b/po/ru.po
index 2147bca..370eb42 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,10 +6,10 @@
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-09-08 00:54\n"
-"PO-Revision-Date: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle team <deep@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -101,9 +101,6 @@ msgstr " "
msgid "Quit"
msgstr ""
-msgid "Search"
-msgstr ""
-
msgid "Search for expression"
msgstr " "
diff --git a/po/sk.po b/po/sk.po
index 0742855..e6ac09d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -160,9 +160,6 @@ msgstr "Vymazvam balky..."
msgid "Required"
msgstr "Potrebn"
-msgid "Search for expression"
-msgstr "Hada vraz"
-
msgid "Search"
msgstr "Hada"
diff --git a/po/sv.po b/po/sv.po
index 4fe86db..33cafad 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -160,9 +160,6 @@ msgstr "Tar bort paket..."
msgid "Required"
msgstr "Obligatorisk"
-msgid "Search for expression"
-msgstr "Sk efter uttrycket"
-
msgid "Search"
msgstr "Sk"
diff --git a/po/uk.po b/po/uk.po
index 36d7f65..70f5868 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,10 +6,10 @@
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-09-08 00:54\n"
-"PO-Revision-Date: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle team <deep@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -101,9 +101,6 @@ msgstr " Ӧ Φ Φ æ"
msgid "Quit"
msgstr "Ȧ"
-msgid "Search"
-msgstr ""
-
msgid "Search for expression"
msgstr " "
diff --git a/po/vi.po b/po/vi.po
index ea659da..216b687 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+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"
@@ -160,9 +160,6 @@ msgstr "Đang gỡ bỏ các gói..."
msgid "Required"
msgstr "Yêu cầu"
-msgid "Search for expression"
-msgstr "Tìm kiếm theo biểu thức"
-
msgid "Search"
msgstr "Tìm kiếm"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e959f2f..5ab015a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.14\n"
+"Project-Id-Version: 0.3.16\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: 2006-07-28 21:45+0500\n"
+"PO-Revision-Date: 2006-11-05 03:34+0500\n"
"Last-Translator: Yang Jinsong <shannleon@gmail.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -160,9 +160,6 @@ msgstr "正在删除软件包..."
msgid "Required"
msgstr "依赖"
-msgid "Search for expression"
-msgstr "Search for expression"
-
msgid "Search"
msgstr "查找"
diff --git a/src/callbacks.c b/src/callbacks.c
index c81395c..e9865f6 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -160,7 +160,7 @@ void open_preferences (GtkMenuItem *menuitem, gpointer user_data)
gtk_widget_show(preferences);
}
-void search_button_clicked (GtkWidget *gslapt, gpointer user_data)
+void search_activated (GtkWidget *gslapt, gpointer user_data)
{
gboolean valid = FALSE, exists = FALSE;
GtkTreeIter iter;
@@ -169,9 +169,6 @@ void search_button_clicked (GtkWidget *gslapt, gpointer user_data)
GtkEntryCompletion *completion = gtk_entry_get_completion(GTK_ENTRY(lookup_widget(gslapt,"search_entry")));
GtkTreeModel *completions = gtk_entry_completion_get_model(completion);
- gtk_widget_set_sensitive( lookup_widget(gslapt,
- "clear_button"), TRUE);
-
build_searched_treeviewlist(GTK_WIDGET(treeview),pattern);
/* add search to completion */
@@ -593,8 +590,8 @@ void build_searched_treeviewlist (GtkWidget *treeview, gchar *pattern)
gboolean view_list_all = FALSE, view_list_installed = FALSE,
view_list_available = FALSE, view_list_marked = FALSE;
- if (pattern == NULL) {
- return;
+ if (pattern == NULL || (strcmp(pattern,"") == 0)) {
+ reset_search_list();
}
package_model = GTK_TREE_MODEL_SORT(gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)));
@@ -1240,7 +1237,6 @@ static void rebuild_treeviews (GtkWidget *current_window,gboolean reload)
if (reload == TRUE) {
gtk_entry_set_text(GTK_ENTRY(lookup_widget(gslapt,"search_entry")),"");
- gtk_widget_set_sensitive(lookup_widget(gslapt,"clear_button"),FALSE);
}
rebuild_package_action_menu();
@@ -1684,14 +1680,6 @@ static int populate_transaction_window (GtkWidget *trans_window)
}
-void clear_button_clicked(GtkWidget *w, gpointer user_data)
-{
- gtk_entry_set_text(GTK_ENTRY(w),"");
- gtk_widget_set_sensitive( lookup_widget((GtkWidget *)user_data,
- "clear_button"), FALSE);
- reset_search_list();
-}
-
static void mark_upgrade_packages (void)
{
GtkTreeIter iter;
diff --git a/src/callbacks.h b/src/callbacks.h
index 5b87aa2..f2a8462 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -38,7 +38,7 @@ 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 search_button_clicked (GtkWidget *gslapt, gpointer user_data);
+void search_activated (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);
void add_pkg_for_removal (GtkWidget *gslapt, gpointer user_data);
@@ -59,8 +59,6 @@ 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);
-void clear_button_clicked (GtkWidget *button,gpointer user_data);
-
int gtk_progress_callback (void *data, double dltotal, double dlnow,
double ultotal, double ulnow);
void build_package_treeviewlist (GtkWidget *treeview);
@@ -101,4 +99,3 @@ void view_marked_packages (GtkMenuItem *menuitem, gpointer user_data);
void mark_obsolete_packages (GtkMenuItem *menuitem, gpointer user_data);
-
diff --git a/src/interface.c b/src/interface.c
index 59be800..3c24842 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -509,9 +509,8 @@ create_gslapt (void)
GtkWidget *search_vbox;
GtkWidget *search_align;
GtkWidget *search_hbox;
+ GtkWidget *label292;
GtkWidget *search_entry;
- GtkWidget *search_button;
- GtkWidget *clear_button;
GtkWidget *pkg_vpaned;
GtkWidget *pkg_list_scrolled;
GtkWidget *pkg_listing_treeview;
@@ -938,6 +937,11 @@ create_gslapt (void)
gtk_widget_show (search_hbox);
gtk_container_add (GTK_CONTAINER (search_align), search_hbox);
+ label292 = gtk_label_new (_("Search"));
+ gtk_widget_set_name (label292, "label292");
+ gtk_widget_show (label292);
+ gtk_box_pack_start (GTK_BOX (search_hbox), label292, FALSE, TRUE, 6);
+
search_entry = gtk_entry_new ();
gtk_widget_set_name (search_entry, "search_entry");
gtk_widget_show (search_entry);
@@ -947,19 +951,6 @@ create_gslapt (void)
GDK_L, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- search_button = gtk_button_new_with_mnemonic (_("Search"));
- gtk_widget_set_name (search_button, "search_button");
- gtk_widget_show (search_button);
- gtk_box_pack_start (GTK_BOX (search_hbox), search_button, FALSE, FALSE, 0);
- GTK_WIDGET_SET_FLAGS (search_button, GTK_CAN_DEFAULT);
- gtk_tooltips_set_tip (tooltips, search_button, _("Search for expression"), NULL);
-
- clear_button = gtk_button_new_with_mnemonic (_("Clear"));
- gtk_widget_set_name (clear_button, "clear_button");
- gtk_widget_show (clear_button);
- gtk_box_pack_start (GTK_BOX (search_hbox), clear_button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, clear_button, _("Clear search expression"), NULL);
-
pkg_vpaned = gtk_vpaned_new ();
gtk_widget_set_name (pkg_vpaned, "pkg_vpaned");
gtk_widget_show (pkg_vpaned);
@@ -1430,17 +1421,11 @@ create_gslapt (void)
G_CALLBACK (execute_callback),
GTK_OBJECT (gslapt));
g_signal_connect_swapped ((gpointer) search_entry, "editing_done",
- G_CALLBACK (search_button_clicked),
+ G_CALLBACK (search_activated),
GTK_OBJECT (gslapt));
g_signal_connect_swapped ((gpointer) search_entry, "activate",
- G_CALLBACK (search_button_clicked),
- GTK_OBJECT (gslapt));
- g_signal_connect_swapped ((gpointer) search_button, "clicked",
- G_CALLBACK (search_button_clicked),
+ G_CALLBACK (search_activated),
GTK_OBJECT (gslapt));
- g_signal_connect_swapped ((gpointer) clear_button, "clicked",
- G_CALLBACK (clear_button_clicked),
- GTK_OBJECT (search_entry));
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (gslapt, gslapt, "gslapt");
@@ -1499,9 +1484,8 @@ create_gslapt (void)
GLADE_HOOKUP_OBJECT (gslapt, search_vbox, "search_vbox");
GLADE_HOOKUP_OBJECT (gslapt, search_align, "search_align");
GLADE_HOOKUP_OBJECT (gslapt, search_hbox, "search_hbox");
+ GLADE_HOOKUP_OBJECT (gslapt, label292, "label292");
GLADE_HOOKUP_OBJECT (gslapt, search_entry, "search_entry");
- GLADE_HOOKUP_OBJECT (gslapt, search_button, "search_button");
- GLADE_HOOKUP_OBJECT (gslapt, clear_button, "clear_button");
GLADE_HOOKUP_OBJECT (gslapt, pkg_vpaned, "pkg_vpaned");
GLADE_HOOKUP_OBJECT (gslapt, pkg_list_scrolled, "pkg_list_scrolled");
GLADE_HOOKUP_OBJECT (gslapt, pkg_listing_treeview, "pkg_listing_treeview");
diff --git a/src/main.c b/src/main.c
index 5b91e3f..1087247 100644
--- a/src/main.c
+++ b/src/main.c
@@ -175,7 +175,6 @@ int main (int argc, char *argv[]) {
gtk_widget_set_sensitive(lookup_widget(gslapt,
"action_bar_execute_button"),FALSE);
- gtk_widget_set_sensitive(lookup_widget(gslapt,"clear_button"),FALSE);
gtk_widget_set_sensitive(lookup_widget(gslapt,"execute1"),FALSE);
gtk_widget_set_sensitive(lookup_widget(gslapt,"unmark_all1"),FALSE);