summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-10-12 16:35:33 +0000
committerJason Woodward2005-10-12 16:35:33 +0000
commita6d29533e3c723893a41d1094ea35eecc4c5119a (patch)
tree923aab45e21f94fc36bc16c8ed21ecd97e19f766
parent24c4ce4fe39360fe00bcacf592e88621aa6ecfb9 (diff)
downloadgslapt-a6d29533e3c723893a41d1094ea35eecc4c5119a.tar.gz
more updates to the dependency error dialog
-rw-r--r--gslapt.glade250
-rw-r--r--po/de.po12
-rw-r--r--po/en.po12
-rw-r--r--po/es.po12
-rw-r--r--po/gslapt.pot10
-rw-r--r--po/it.po12
-rw-r--r--po/nl.po12
-rw-r--r--po/pl.po12
-rw-r--r--po/pt.po12
-rw-r--r--po/pt_BR.po12
-rw-r--r--po/ru.po12
-rw-r--r--po/sk.po12
-rw-r--r--po/sv.po12
-rw-r--r--po/uk.po12
-rw-r--r--po/vi.po12
-rw-r--r--src/callbacks.c48
-rw-r--r--src/interface.c114
17 files changed, 185 insertions, 393 deletions
diff --git a/gslapt.glade b/gslapt.glade
index 46602ba..ccb92fc 100644
--- a/gslapt.glade
+++ b/gslapt.glade
@@ -4241,73 +4241,11 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
<property name="has_default">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">-7</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox111">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image1259">
- <property name="visible">True</property>
- <property name="stock">gtk-close</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label283">
- <property name="visible">True</property>
- <property name="label">_Exclude</property>
- <property name="use_underline">True</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">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
+ <property name="response_id">-6</property>
</widget>
</child>
@@ -4316,73 +4254,11 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">0</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox110">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image1258">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="dep_error_install_button_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</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">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
+ <property name="response_id">-5</property>
</widget>
</child>
</widget>
@@ -4424,16 +4300,16 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkLabel" id="dep_error_label">
+ <widget class="GtkLabel" id="label285">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
- <property name="use_markup">True</property>
+ <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
+ <property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</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>
@@ -4444,12 +4320,12 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="dep_error_install_anyway_warning_label">
+ <widget class="GtkLabel" id="dep_error_label">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
@@ -4474,31 +4350,6 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
</child>
<child>
- <widget class="GtkLabel" id="label284">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></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</property>
- <property name="yalign">0</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">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkScrolledWindow" id="scrolledwindow22">
<property name="border_width">2</property>
<property name="visible">True</property>
@@ -4535,6 +4386,81 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
<property name="fill">True</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label286">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></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">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="dep_error_install_anyway_warning_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</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">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label284">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></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</property>
+ <property name="yalign">0</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">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
diff --git a/po/de.po b/po/de.po
index f21f284..6a7a2ea 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -363,8 +363,8 @@ msgstr "pkgtools meldete Fehler"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">Nicht genug Speicherplatz</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Schliesse %s wegen Abhaengigkeits-Fehler aus</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Schliesse %s wegen Abhaengigkeits-Fehler aus</b>"
msgid "Unmark"
msgstr "Abwaehlen"
@@ -453,12 +453,6 @@ msgstr "Loschung Cachierte Paket-Akten"
msgid "Enabled"
msgstr "Ermoglicht"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/en.po b/po/en.po
index 23e2f7a..b83d08a 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -362,8 +362,8 @@ msgstr "pkgtools returned an error"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Excluding %s due to dependency failure</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Excluding %s due to dependency failure</b>"
msgid "Unmark"
msgstr "Unmark"
@@ -452,12 +452,6 @@ msgstr "_Delete Cached Package Files"
msgid "Enabled"
msgstr "Enabled"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/es.po b/po/es.po
index 4a45022..3e31193 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -362,8 +362,8 @@ msgstr "pkgtools devolvio un error"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">No tienes suficiente espacio libre</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Excluido %s devido a un fallo de dependencia</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Excluido %s devido a un fallo de dependencia</b>"
msgid "Unmark"
msgstr "Desmarcar"
@@ -452,12 +452,6 @@ msgstr "Archivos _Depositados Cancelacion Del Paquete"
msgid "Enabled"
msgstr "Permitido"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/gslapt.pot b/po/gslapt.pot
index e8c6901..b94928a 100644
--- a/po/gslapt.pot
+++ b/po/gslapt.pot
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -363,7 +363,7 @@ msgstr ""
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr ""
-msgid "<b>Excluding %s due to dependency failure<b>\n"
+msgid "<b>Excluding %s due to dependency failure<b>"
msgstr ""
msgid "Unmark"
@@ -456,12 +456,6 @@ msgstr ""
msgid "Enabled"
msgstr ""
-msgid "_Install Anyway"
-msgstr ""
-
-msgid "_Upgrade Anyway"
-msgstr ""
-
msgid "Do you want to continue without the required packages?"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 6b606c9..c0961d1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -371,8 +371,8 @@ msgstr "pkgtools ha restituito un errore"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">Non hai spazio libero sufficiente</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Esclusione %s per dipendenza non soddisfatta</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Esclusione %s per dipendenza non soddisfatta</b>"
msgid "Unmark"
msgstr "Deseleziona"
@@ -461,12 +461,6 @@ msgstr "Lime _Del Pacchetto Nascoste Cancellazione"
msgid "Enabled"
msgstr "Permesso"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/nl.po b/po/nl.po
index 9cfcade..2f03728 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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: 2005-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -366,8 +366,8 @@ msgstr "pkgtools gaf een foutmelding"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">U hebt niet genoeg vrije ruimte</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>%s wordt wegens onvervulde afhankelijkheid uitgesloten</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>%s wordt wegens onvervulde afhankelijkheid uitgesloten</b>"
msgid "Unmark"
msgstr "Wis markering"
@@ -459,12 +459,6 @@ msgstr "Markeer alle mogelijke opwaarderingen"
msgid "Enabled"
msgstr "Toegelaten"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/pl.po b/po/pl.po
index cc66778..e7e56b8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -338,8 +338,8 @@ msgstr "pkgtools zwrci bd"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">Nie masz wystarczajco wolnego miejsca</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Wyczenie %s dziki niepowodzeniu zalenoci</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Wyczenie %s dziki niepowodzeniu zalenoci</b>"
msgid "Unmark"
msgstr "Odznacz"
@@ -428,12 +428,6 @@ msgstr "Zakoczone"
msgid "Successfully executed all actions."
msgstr "Wszystkie czynnoci zakoczono pomylnie."
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/pt.po b/po/pt.po
index ea60067..be99da4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -358,8 +358,8 @@ msgstr "pkgtools returnou um erro"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">Não tens espaço suficiente</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Excluindo %s por falha na dependencia</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Excluindo %s por falha na dependencia</b>"
msgid "Unmark"
msgstr "Desmarcar"
@@ -448,12 +448,6 @@ msgstr "Limas Cached Supressao _Do Pacote"
msgid "Enabled"
msgstr "Permitido"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0bbea00..98cf80b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -365,8 +365,8 @@ msgstr "pkgtools retornou um erro"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">Voc no tem espao em disco suficiente</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Excluindo %s devido a falha de dependncias</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Excluindo %s devido a falha de dependncias</b>"
msgid "Unmark"
msgstr "Desmarcar"
@@ -458,12 +458,6 @@ msgstr "Marcar todas as atualizaes possveis"
msgid "Enabled"
msgstr "Habilitado"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/ru.po b/po/ru.po
index 7c73d39..f9f4dcc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-09-08 00:54\n"
-"PO-Revision-Date: 2005-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+0500\n"
"Last-Translator: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle team <deep@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -340,8 +340,8 @@ msgstr " pkgtools"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\"> </span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b> %s - </b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b> %s - </b>"
msgid "Unmark"
msgstr " "
@@ -424,12 +424,6 @@ msgstr " "
msgid "Enabled"
msgstr ""
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/sk.po b/po/sk.po
index d034aa5..4c77980 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -362,8 +362,8 @@ msgstr "pkgtools vrtil chybu"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">Nemte dostatok vonho miesta</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Vyluujem %s chybu so zvisloou</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Vyluujem %s chybu so zvisloou</b>"
msgid "Unmark"
msgstr "Odznai"
@@ -452,12 +452,6 @@ msgstr "_Delete Cached Package Files"
msgid "Enabled"
msgstr "Enabled"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/sv.po b/po/sv.po
index e95e746..97c9c78 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -362,8 +362,8 @@ msgstr "pkgtools returned an error"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Excluding %s due to dependency failure</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Excluding %s due to dependency failure</b>"
msgid "Unmark"
msgstr "Unmark"
@@ -452,12 +452,6 @@ msgstr "_Delete Cached Package Files"
msgid "Enabled"
msgstr "Enabled"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/uk.po b/po/uk.po
index 4da1992..8cb3652 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-09-08 00:54\n"
-"PO-Revision-Date: 2005-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+0500\n"
"Last-Translator: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle team <deep@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -340,8 +340,8 @@ msgstr " pkgtools"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\"> צ ͦ</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b> %s ̦ </b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b> %s ̦ </b>"
msgid "Unmark"
msgstr " ¦"
@@ -424,12 +424,6 @@ msgstr " ˦"
msgid "Enabled"
msgstr "צ"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/po/vi.po b/po/vi.po
index a81dae5..fd64207 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gslapt 0.3.9\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-10-11 18:18+0500\n"
+"PO-Revision-Date: 2005-10-12 12:18+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"
@@ -362,8 +362,8 @@ msgstr "pkgtools trả về một lỗi"
msgid "<span weight=\"bold\" size=\"large\">You don't have enough free space</span>"
msgstr "<span weight=\"bold\" size=\"large\">Bạn không có đủ không gian trống</span>"
-msgid "<b>Excluding %s due to dependency failure</b>\n"
-msgstr "<b>Loại bỏ %s do lỗi phụ thuộc</b>\n"
+msgid "<b>Excluding %s due to dependency failure</b>"
+msgstr "<b>Loại bỏ %s do lỗi phụ thuộc</b>"
msgid "Unmark"
msgstr "Không đánh dấu"
@@ -452,12 +452,6 @@ msgstr "_Delete Cached Package Files"
msgid "Enabled"
msgstr "Enabled"
-msgid "_Install Anyway"
-msgstr "_Install Anyway"
-
-msgid "_Upgrade Anyway"
-msgstr "_Upgrade Anyway"
-
msgid "Do you want to continue without the required packages?"
msgstr "Do you want to continue without the required packages?"
diff --git a/src/callbacks.c b/src/callbacks.c
index a9ea6e4..45ff58f 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -71,7 +71,7 @@ static void reset_search_list (void);
static int ladd_deps_to_trans (slapt_transaction_t *tran, struct slapt_pkg_list *avail_pkgs,
struct slapt_pkg_list *installed_pkgs, slapt_pkg_info_t *pkg);
static gboolean toggle_source_status (GtkTreeView *treeview, gpointer data);
-static void display_dep_error_dialog (slapt_pkg_info_t *pkg,guint m, guint c,enum slapt_action e);
+static void display_dep_error_dialog (slapt_pkg_info_t *pkg,guint m, guint c);
static void exclude_dep_error_callback (GtkObject *object, gpointer user_data);
static void install_dep_error_callback (GtkObject *object, gpointer user_data);
@@ -291,7 +291,7 @@ void add_pkg_for_install (GtkWidget *gslapt, gpointer user_data)
}
}else{
- display_dep_error_dialog(pkg,missing_count,conflict_count,INSTALL);
+ display_dep_error_dialog(pkg,missing_count,conflict_count);
}
}else{ /* else we upgrade or reinstall */
@@ -365,7 +365,7 @@ void add_pkg_for_install (GtkWidget *gslapt, gpointer user_data)
}
}else{
- display_dep_error_dialog(pkg,missing_count,conflict_count,UPGRADE);
+ display_dep_error_dialog(pkg,missing_count,conflict_count);
}
}
@@ -2953,12 +2953,12 @@ static gboolean toggle_source_status (GtkTreeView *treeview, gpointer data)
return FALSE;
}
-static void display_dep_error_dialog (slapt_pkg_info_t *pkg,guint m, guint c,enum slapt_action e)
+static void display_dep_error_dialog (slapt_pkg_info_t *pkg,guint m, guint c)
{
GtkWidget *w = create_dep_error_dialog();
GtkTextBuffer *error_buf = NULL;
guint i;
- gchar *msg = g_strdup_printf("<b>Excluding %s due to dependency failure</b>\n",pkg->name);
+ gchar *msg = g_strdup_printf("<b>Excluding %s due to dependency failure</b>",pkg->name);
gtk_window_set_title (GTK_WINDOW(w),(char *)_("Error"));
gtk_label_set_text(GTK_LABEL(lookup_widget(w,"dep_error_label")),msg);
@@ -2969,6 +2969,8 @@ static void display_dep_error_dialog (slapt_pkg_info_t *pkg,guint m, guint c,enu
gtk_label_set_use_markup (GTK_LABEL(lookup_widget(w,"dep_error_label")),
TRUE);
+ gtk_label_set_use_markup (GTK_LABEL(lookup_widget(w,"dep_error_install_anyway_warning_label")),
+ TRUE);
error_buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(lookup_widget(w,"dep_error_text")));
if (m == trans->missing_err->err_count)
@@ -3003,12 +3005,6 @@ static void display_dep_error_dialog (slapt_pkg_info_t *pkg,guint m, guint c,enu
free(err);
}
- if (e == INSTALL) {
- gtk_label_set_markup_with_mnemonic(GTK_LABEL(lookup_widget(w,"dep_error_install_button_label")),(char *)_("_Install Anyway"));
- } else if (e == UPGRADE) {
- gtk_label_set_markup_with_mnemonic(GTK_LABEL(lookup_widget(w,"dep_error_install_button_label")),(char *)_("_Upgrade Anyway"));
- }
-
g_signal_connect(G_OBJECT(lookup_widget(w,"dep_error_cancel_button")),"clicked",
G_CALLBACK(exclude_dep_error_callback),pkg);
g_signal_connect(G_OBJECT(lookup_widget(w,"dep_error_install_button")),"clicked",
@@ -3036,18 +3032,17 @@ static void install_dep_error_callback (GtkObject *object, gpointer user_data)
GtkTreeModelSort *package_model;
GtkWidget *dep_error_dialog = lookup_widget(GTK_WIDGET(object),"dep_error_dialog");
slapt_pkg_info_t *pkg = (slapt_pkg_info_t *)user_data;
- const char *action_label = gtk_label_get_text(GTK_LABEL(lookup_widget(GTK_WIDGET(object),
- "dep_error_install_button_label")));
slapt_pkg_info_t *installed_pkg = slapt_get_newest_pkg(installed,pkg->name);
treeview = GTK_TREE_VIEW(lookup_widget(gslapt,"pkg_listing_treeview"));
package_model = GTK_TREE_MODEL_SORT(gtk_tree_view_get_model(treeview));
filter_model = GTK_TREE_MODEL_FILTER(gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(package_model)));
model = GTK_TREE_MODEL(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(filter_model)));
+
if (!set_iter_to_pkg(model,&iter,pkg))
set_iter_to_pkg(model,&iter,installed_pkg);
- if (strstr(action_label,"Install") != NULL) {
+ if (installed_pkg == NULL) {
gchar *status = g_strdup_printf("i%s",pkg->name);
slapt_add_install_to_transaction(trans,pkg);
@@ -3057,25 +3052,22 @@ static void install_dep_error_callback (GtkObject *object, gpointer user_data)
g_free(status);
set_execute_active();
- } else if (strstr(action_label,"Upgrade") != NULL) {
+
+ } else {
gchar *status = g_strdup_printf("u%s",pkg->name);
int ver_cmp = slapt_cmp_pkgs(installed_pkg,pkg);
- if (installed_pkg != NULL) {
-
- slapt_add_upgrade_to_transaction(trans,installed_pkg,pkg);
-
- if (ver_cmp == 0) {
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_reinstall.png"),-1);
- } else if (ver_cmp > 1) {
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
- } else if (ver_cmp < 1) {
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_downrade.png"),-1);
- }
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_COLUMN,status,-1);
- g_free(status);
+ slapt_add_upgrade_to_transaction(trans,installed_pkg,pkg);
+ if (ver_cmp == 0) {
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_reinstall.png"),-1);
+ } else if (ver_cmp > 1) {
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
+ } else if (ver_cmp < 1) {
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_downgrade.png"),-1);
}
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_COLUMN,status,-1);
+ g_free(status);
set_execute_active();
diff --git a/src/interface.c b/src/interface.c
index cfa86f1..bfb9ee5 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -2336,22 +2336,16 @@ create_dep_error_dialog (void)
GtkWidget *hbox113;
GtkWidget *image1261;
GtkWidget *vbox72;
+ GtkWidget *label285;
GtkWidget *dep_error_label;
- GtkWidget *dep_error_install_anyway_warning_label;
- GtkWidget *label284;
GtkWidget *scrolledwindow22;
GtkWidget *dep_error_text;
+ GtkWidget *label286;
+ GtkWidget *dep_error_install_anyway_warning_label;
+ GtkWidget *label284;
GtkWidget *dialog_action_area6;
GtkWidget *dep_error_cancel_button;
- GtkWidget *alignment2;
- GtkWidget *hbox111;
- GtkWidget *image1259;
- GtkWidget *label283;
GtkWidget *dep_error_install_button;
- GtkWidget *alignment1;
- GtkWidget *hbox110;
- GtkWidget *image1258;
- GtkWidget *dep_error_install_button_label;
dep_error_dialog = gtk_dialog_new ();
gtk_widget_set_name (dep_error_dialog, "dep_error_dialog");
@@ -2387,6 +2381,11 @@ create_dep_error_dialog (void)
gtk_widget_show (vbox72);
gtk_box_pack_start (GTK_BOX (hbox113), vbox72, TRUE, TRUE, 0);
+ label285 = gtk_label_new ("");
+ gtk_widget_set_name (label285, "label285");
+ gtk_widget_show (label285);
+ gtk_box_pack_start (GTK_BOX (vbox72), label285, FALSE, FALSE, 0);
+
dep_error_label = gtk_label_new ("");
gtk_widget_set_name (dep_error_label, "dep_error_label");
gtk_widget_show (dep_error_label);
@@ -2395,20 +2394,6 @@ create_dep_error_dialog (void)
gtk_label_set_line_wrap (GTK_LABEL (dep_error_label), TRUE);
gtk_misc_set_alignment (GTK_MISC (dep_error_label), 0, 0);
- dep_error_install_anyway_warning_label = gtk_label_new ("");
- gtk_widget_set_name (dep_error_install_anyway_warning_label, "dep_error_install_anyway_warning_label");
- gtk_widget_show (dep_error_install_anyway_warning_label);
- gtk_box_pack_start (GTK_BOX (vbox72), dep_error_install_anyway_warning_label, FALSE, TRUE, 0);
- gtk_label_set_use_markup (GTK_LABEL (dep_error_install_anyway_warning_label), TRUE);
- gtk_label_set_line_wrap (GTK_LABEL (dep_error_install_anyway_warning_label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (dep_error_install_anyway_warning_label), 0, 0);
-
- label284 = gtk_label_new ("");
- gtk_widget_set_name (label284, "label284");
- gtk_widget_show (label284);
- gtk_box_pack_start (GTK_BOX (vbox72), label284, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (label284), 0, 0);
-
scrolledwindow22 = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_name (scrolledwindow22, "scrolledwindow22");
gtk_widget_show (scrolledwindow22);
@@ -2424,85 +2409,58 @@ create_dep_error_dialog (void)
gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (dep_error_text), FALSE);
gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (dep_error_text), FALSE);
+ label286 = gtk_label_new ("");
+ gtk_widget_set_name (label286, "label286");
+ gtk_widget_show (label286);
+ gtk_box_pack_start (GTK_BOX (vbox72), label286, FALSE, FALSE, 0);
+
+ dep_error_install_anyway_warning_label = gtk_label_new ("");
+ gtk_widget_set_name (dep_error_install_anyway_warning_label, "dep_error_install_anyway_warning_label");
+ gtk_widget_show (dep_error_install_anyway_warning_label);
+ gtk_box_pack_start (GTK_BOX (vbox72), dep_error_install_anyway_warning_label, FALSE, TRUE, 0);
+ gtk_label_set_use_markup (GTK_LABEL (dep_error_install_anyway_warning_label), TRUE);
+ gtk_label_set_line_wrap (GTK_LABEL (dep_error_install_anyway_warning_label), TRUE);
+ gtk_misc_set_alignment (GTK_MISC (dep_error_install_anyway_warning_label), 0, 0);
+
+ label284 = gtk_label_new ("");
+ gtk_widget_set_name (label284, "label284");
+ gtk_widget_show (label284);
+ gtk_box_pack_start (GTK_BOX (vbox72), label284, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label284), 0, 0);
+
dialog_action_area6 = GTK_DIALOG (dep_error_dialog)->action_area;
gtk_widget_set_name (dialog_action_area6, "dialog_action_area6");
gtk_widget_show (dialog_action_area6);
gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area6), GTK_BUTTONBOX_END);
- dep_error_cancel_button = gtk_button_new ();
+ dep_error_cancel_button = gtk_button_new_from_stock ("gtk-cancel");
gtk_widget_set_name (dep_error_cancel_button, "dep_error_cancel_button");
gtk_widget_show (dep_error_cancel_button);
- gtk_dialog_add_action_widget (GTK_DIALOG (dep_error_dialog), dep_error_cancel_button, GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dep_error_dialog), dep_error_cancel_button, GTK_RESPONSE_CANCEL);
GTK_WIDGET_SET_FLAGS (dep_error_cancel_button, GTK_CAN_DEFAULT);
- alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_set_name (alignment2, "alignment2");
- gtk_widget_show (alignment2);
- gtk_container_add (GTK_CONTAINER (dep_error_cancel_button), alignment2);
-
- hbox111 = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (hbox111, "hbox111");
- gtk_widget_show (hbox111);
- gtk_container_add (GTK_CONTAINER (alignment2), hbox111);
-
- image1259 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_BUTTON);
- gtk_widget_set_name (image1259, "image1259");
- gtk_widget_show (image1259);
- gtk_box_pack_start (GTK_BOX (hbox111), image1259, FALSE, FALSE, 0);
-
- label283 = gtk_label_new_with_mnemonic ("_Exclude");
- gtk_widget_set_name (label283, "label283");
- gtk_widget_show (label283);
- gtk_box_pack_start (GTK_BOX (hbox111), label283, FALSE, FALSE, 0);
-
- dep_error_install_button = gtk_button_new ();
+ dep_error_install_button = gtk_button_new_from_stock ("gtk-ok");
gtk_widget_set_name (dep_error_install_button, "dep_error_install_button");
gtk_widget_show (dep_error_install_button);
- gtk_dialog_add_action_widget (GTK_DIALOG (dep_error_dialog), dep_error_install_button, 0);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dep_error_dialog), dep_error_install_button, GTK_RESPONSE_OK);
GTK_WIDGET_SET_FLAGS (dep_error_install_button, GTK_CAN_DEFAULT);
- alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_set_name (alignment1, "alignment1");
- gtk_widget_show (alignment1);
- gtk_container_add (GTK_CONTAINER (dep_error_install_button), alignment1);
-
- hbox110 = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (hbox110, "hbox110");
- gtk_widget_show (hbox110);
- gtk_container_add (GTK_CONTAINER (alignment1), hbox110);
-
- image1258 = gtk_image_new_from_stock ("gtk-ok", GTK_ICON_SIZE_BUTTON);
- gtk_widget_set_name (image1258, "image1258");
- gtk_widget_show (image1258);
- gtk_box_pack_start (GTK_BOX (hbox110), image1258, FALSE, FALSE, 0);
-
- dep_error_install_button_label = gtk_label_new_with_mnemonic ("");
- gtk_widget_set_name (dep_error_install_button_label, "dep_error_install_button_label");
- gtk_widget_show (dep_error_install_button_label);
- gtk_box_pack_start (GTK_BOX (hbox110), dep_error_install_button_label, FALSE, FALSE, 0);
-
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (dep_error_dialog, dep_error_dialog, "dep_error_dialog");
GLADE_HOOKUP_OBJECT_NO_REF (dep_error_dialog, dialog_vbox6, "dialog_vbox6");
GLADE_HOOKUP_OBJECT (dep_error_dialog, hbox113, "hbox113");
GLADE_HOOKUP_OBJECT (dep_error_dialog, image1261, "image1261");
GLADE_HOOKUP_OBJECT (dep_error_dialog, vbox72, "vbox72");
+ GLADE_HOOKUP_OBJECT (dep_error_dialog, label285, "label285");
GLADE_HOOKUP_OBJECT (dep_error_dialog, dep_error_label, "dep_error_label");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, dep_error_install_anyway_warning_label, "dep_error_install_anyway_warning_label");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, label284, "label284");
GLADE_HOOKUP_OBJECT (dep_error_dialog, scrolledwindow22, "scrolledwindow22");
GLADE_HOOKUP_OBJECT (dep_error_dialog, dep_error_text, "dep_error_text");
+ GLADE_HOOKUP_OBJECT (dep_error_dialog, label286, "label286");
+ GLADE_HOOKUP_OBJECT (dep_error_dialog, dep_error_install_anyway_warning_label, "dep_error_install_anyway_warning_label");
+ GLADE_HOOKUP_OBJECT (dep_error_dialog, label284, "label284");
GLADE_HOOKUP_OBJECT_NO_REF (dep_error_dialog, dialog_action_area6, "dialog_action_area6");
GLADE_HOOKUP_OBJECT (dep_error_dialog, dep_error_cancel_button, "dep_error_cancel_button");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, alignment2, "alignment2");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, hbox111, "hbox111");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, image1259, "image1259");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, label283, "label283");
GLADE_HOOKUP_OBJECT (dep_error_dialog, dep_error_install_button, "dep_error_install_button");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, alignment1, "alignment1");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, hbox110, "hbox110");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, image1258, "image1258");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, dep_error_install_button_label, "dep_error_install_button_label");
gtk_widget_grab_focus (dep_error_cancel_button);
gtk_widget_grab_default (dep_error_cancel_button);