aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-10-11 20:58:58 +0000
committerJason Woodward2005-10-11 20:58:58 +0000
commit4e1baf64db659c68c343e05d3a1cca34e71d6615 (patch)
tree6d0b69d4e0fe2caaf9c25df8436b992d207e8af5
parent304512eb56b53c8b469d7f437d7b72c9383fc3b3 (diff)
downloadgslapt-4e1baf64db659c68c343e05d3a1cca34e71d6615.tar.gz
cleaned up some dialog boxes, fixed hardcoded mirror setting in PACKAGES.TXT regression, changed unmark all shortcut to ctrl-z, updated dialog for packages with unmet dependencies to offer option to install/upgrade/reinstall/downgrade anyway, and fixed bug when unmarking packages selected for reinstallation
-rw-r--r--ChangeLog8
-rw-r--r--configure.in2
-rw-r--r--gslapt.glade369
-rw-r--r--src/callbacks.c134
-rw-r--r--src/interface.c305
5 files changed, 623 insertions, 195 deletions
diff --git a/ChangeLog b/ChangeLog
index 77260c0..55aae92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
+0.3.9 Oct 11, 2005
+ * cleaned up some dialog boxes
+ * fixed hardcoded mirror setting in PACKAGES.TXT regression
+ * changed unmark all shortcut to ctrl-z
+ * updated dialog for packages with unmet dependencies to offer option to
+ install/upgrade/reinstall/downgrade anyway
+ * fixed bug when unmarking packages selected for reinstallation
+
0.3.8 Sept 28, 2005
* updated for new libslapt (0.9.10d)
* added Brazillian translation authored by Frederico Henrique Gonçalves Lima
diff --git a/configure.in b/configure.in
index 012e9f1..782b8df 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gslapt, 0.3.8)
+AM_INIT_AUTOMAKE(gslapt, 0.3.9)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff --git a/gslapt.glade b/gslapt.glade
index 1f05767..0d14b1a 100644
--- a/gslapt.glade
+++ b/gslapt.glade
@@ -830,7 +830,7 @@
<accelerator key="y" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1243">
+ <widget class="GtkImage" id="image1286">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -853,7 +853,7 @@
<accelerator key="a" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1244">
+ <widget class="GtkImage" id="image1287">
<property name="visible">True</property>
<property name="stock">gtk-go-up</property>
<property name="icon_size">1</property>
@@ -876,7 +876,7 @@
<accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1245">
+ <widget class="GtkImage" id="image1288">
<property name="visible">True</property>
<property name="stock">gtk-apply</property>
<property name="icon_size">1</property>
@@ -922,12 +922,12 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Unmark All</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="unmark_all_activate" last_modification_time="Fri, 05 Aug 2005 16:40:24 GMT"/>
<signal name="activate" handler="unmark_all_activate" last_modification_time="Fri, 05 Aug 2005 16:42:40 GMT"/>
- <accelerator key="m" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <signal name="activate" handler="unmark_all_activate" last_modification_time="Fri, 05 Aug 2005 16:40:24 GMT"/>
+ <accelerator key="z" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1246">
+ <widget class="GtkImage" id="image1289">
<property name="visible">True</property>
<property name="stock">gtk-undo</property>
<property name="icon_size">1</property>
@@ -955,7 +955,7 @@
<accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1247">
+ <widget class="GtkImage" id="image1290">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -990,7 +990,7 @@
<accelerator key="n" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1248">
+ <widget class="GtkImage" id="image1291">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_available.png</property>
<property name="xalign">0.5</property>
@@ -1011,7 +1011,7 @@
<accelerator key="i" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1249">
+ <widget class="GtkImage" id="image1292">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_install.png</property>
<property name="xalign">0.5</property>
@@ -1032,7 +1032,7 @@
<accelerator key="e" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1250">
+ <widget class="GtkImage" id="image1293">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_reinstall.png</property>
<property name="xalign">0.5</property>
@@ -1053,7 +1053,7 @@
<accelerator key="u" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1251">
+ <widget class="GtkImage" id="image1294">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_upgrade.png</property>
<property name="xalign">0.5</property>
@@ -1074,7 +1074,7 @@
<accelerator key="d" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1252">
+ <widget class="GtkImage" id="image1295">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_downgrade.png</property>
<property name="xalign">0.5</property>
@@ -1095,7 +1095,7 @@
<accelerator key="r" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1253">
+ <widget class="GtkImage" id="image1296">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_remove.png</property>
<property name="xalign">0.5</property>
@@ -1128,7 +1128,7 @@
<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="image1254">
+ <widget class="GtkImage" id="image1297">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">1</property>
@@ -1149,7 +1149,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="image1255">
+ <widget class="GtkImage" id="image1298">
<property name="visible">True</property>
<property name="stock">gtk-about</property>
<property name="icon_size">1</property>
@@ -3151,22 +3151,52 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
</child>
<child>
- <widget class="GtkLabel" id="notification_label">
+ <widget class="GtkHBox" id="hbox112">
<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">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>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkImage" id="image1260">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-info</property>
+ <property name="icon_size">6</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.20000000298</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="notification_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">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">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">2</property>
@@ -4185,7 +4215,7 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
<widget class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area6">
@@ -4193,16 +4223,154 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="closebutton3">
+ <widget class="GtkButton" id="dep_error_cancel_button">
<property name="visible">True</property>
<property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-close</property>
- <property name="use_stock">True</property>
+ <property name="has_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-7</property>
- <signal name="clicked" handler="gtk_widget_destroy" object="dep_error_dialog" last_modification_time="Thu, 25 Aug 2005 04:11:02 GMT"/>
+
+ <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>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="dep_error_install_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">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>
</widget>
</child>
</widget>
@@ -4215,65 +4383,120 @@ http://software.jaos.org/#gslapt&lt;/span&gt;</property>
</child>
<child>
- <widget class="GtkVBox" id="vbox71">
+ <widget class="GtkHBox" id="hbox113">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="dep_error_label">
+ <widget class="GtkImage" id="image1261">
<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">False</property>
- <property name="selectable">False</property>
+ <property name="stock">gtk-dialog-error</property>
+ <property name="icon_size">6</property>
<property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
+ <property name="yalign">0.20000000298</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>
+ <property name="padding">6</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow22">
- <property name="border_width">2</property>
+ <widget class="GtkVBox" id="vbox72">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkTextView" id="dep_error_text">
+ <widget class="GtkLabel" id="dep_error_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">6</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow22">
<property name="border_width">2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTextView" id="dep_error_text">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="overwrite">False</property>
+ <property name="accepts_tab">False</property>
+ <property name="justification">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap_mode">GTK_WRAP_NONE</property>
+ <property name="cursor_visible">False</property>
+ <property name="pixels_above_lines">0</property>
+ <property name="pixels_below_lines">0</property>
+ <property name="pixels_inside_wrap">0</property>
+ <property name="left_margin">0</property>
+ <property name="right_margin">0</property>
+ <property name="indent">0</property>
+ <property name="text" translatable="yes"></property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">True</property>
+ <property name="fill">True</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">6</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
<packing>
diff --git a/src/callbacks.c b/src/callbacks.c
index 1455f2a..af99abb 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -71,7 +71,9 @@ 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 (const char *msg,guint m, guint c);
+static void display_dep_error_dialog (slapt_pkg_info_t *pkg,guint m, guint c,enum slapt_action e);
+static void exclude_dep_error_callback (GtkObject *object, gpointer user_data);
+static void install_dep_error_callback (GtkObject *object, gpointer user_data);
void on_gslapt_destroy (GtkObject *object, gpointer user_data)
{
@@ -289,10 +291,7 @@ void add_pkg_for_install (GtkWidget *gslapt, gpointer user_data)
}
}else{
- gchar *msg = g_strdup_printf("Excluding %s due to dependency failure\n",pkg->name);
- display_dep_error_dialog(msg,missing_count,conflict_count);
- slapt_add_exclude_to_transaction(trans,pkg);
- g_free(msg);
+ display_dep_error_dialog(pkg,missing_count,conflict_count,INSTALL);
}
}else{ /* else we upgrade or reinstall */
@@ -366,10 +365,7 @@ void add_pkg_for_install (GtkWidget *gslapt, gpointer user_data)
}
}else{
- gchar *msg = g_strdup_printf("Excluding %s due to dependency failure\n",pkg->name);
- display_dep_error_dialog(msg,missing_count,conflict_count);
- slapt_add_exclude_to_transaction(trans,pkg);
- g_free(msg);
+ display_dep_error_dialog(pkg,missing_count,conflict_count,UPGRADE);
}
}
@@ -1071,7 +1067,11 @@ static void get_package_data (void)
/* put these into our new package list */
for (pkg_i = 0; pkg_i < available_pkgs->pkg_count; ++pkg_i) {
- available_pkgs->pkgs[pkg_i]->mirror = strdup(global_config->sources->url[i]);
+ /* honor the mirror if it was set in the PACKAGES.TXT */
+ if (available_pkgs->pkgs[pkg_i]->mirror == NULL ||
+ strlen(available_pkgs->pkgs[pkg_i]->mirror) == 0) {
+ available_pkgs->pkgs[pkg_i]->mirror = strdup(global_config->sources->url[i]);
+ }
slapt_add_pkg_to_pkg_list(new_pkgs,available_pkgs->pkgs[pkg_i]);
}
@@ -1089,7 +1089,11 @@ static void get_package_data (void)
/* put these into our new package list */
for (pkg_i = 0; pkg_i < patch_pkgs->pkg_count; ++pkg_i) {
- patch_pkgs->pkgs[pkg_i]->mirror = strdup(global_config->sources->url[i]);
+ /* honor the mirror if it was set in the PACKAGES.TXT */
+ if (patch_pkgs->pkgs[pkg_i]->mirror == NULL ||
+ strlen(patch_pkgs->pkgs[pkg_i]->mirror) == 0) {
+ patch_pkgs->pkgs[pkg_i]->mirror = strdup(global_config->sources->url[i]);
+ }
slapt_add_pkg_to_pkg_list(new_pkgs,patch_pkgs->pkgs[pkg_i]);
}
@@ -2367,22 +2371,25 @@ void unmark_package(GtkWidget *gslapt, gpointer user_data)
/* clear the installed version as well if this was an upgrade */
for (i = 0; i < trans->upgrade_pkgs->pkg_count; ++i) {
if (strcmp(trans->upgrade_pkgs->pkgs[i]->installed->name,pkg->name) == 0) {
- slapt_pkg_info_t *avail_pkg = slapt_get_exact_pkg(installed,
- trans->upgrade_pkgs->pkgs[i]->installed->name,
- trans->upgrade_pkgs->pkgs[i]->installed->version
- );
+ slapt_pkg_info_t *installed_pkg = trans->upgrade_pkgs->pkgs[i]->installed;
+ slapt_pkg_info_t *upgrade_pkg = trans->upgrade_pkgs->pkgs[i]->upgrade;
- if (avail_pkg == NULL)
+ if (installed_pkg == NULL)
continue;
- if (set_iter_to_pkg(model,&actual_iter,avail_pkg)) {
- gchar *istatus = g_strdup_printf("i%s",avail_pkg->name);
+ if (set_iter_to_pkg(model,&actual_iter,installed_pkg)) {
+ gchar *istatus = g_strdup_printf("i%s",installed_pkg->name);
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_installed.png"),-1);
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,istatus,-1);
g_free(istatus);
} else {
fprintf(stderr,"failed to find iter for installed package %s-%s to unmark\n",trans->upgrade_pkgs->pkgs[i]->installed->name,trans->upgrade_pkgs->pkgs[i]->installed->version);
}
+
+ if (upgrade_pkg != NULL) {
+ trans = slapt_remove_from_transaction(trans,upgrade_pkg);
+ }
+
}
}
@@ -2430,7 +2437,8 @@ static int ladd_deps_to_trans (slapt_transaction_t *tran, struct slapt_pkg_list
if ( (dep_return == -1) && (global_config->ignore_dep == FALSE) &&
(slapt_get_exact_pkg(tran->exclude_pkgs,pkg->name,pkg->version) == NULL)
) {
- slapt_add_exclude_to_transaction(tran,pkg);
+ /* don't add exclude here... later we offer an option to install anyway */
+ /* slapt_add_exclude_to_transaction(tran,pkg); */
slapt_free_pkg_list(deps);
return -1;
}
@@ -2945,14 +2953,20 @@ static gboolean toggle_source_status (GtkTreeView *treeview, gpointer data)
return FALSE;
}
-static void display_dep_error_dialog (const char *msg,guint m, guint c)
+static void display_dep_error_dialog (slapt_pkg_info_t *pkg,guint m, guint c,enum slapt_action e)
{
GtkWidget *w = create_dep_error_dialog();
GtkTextBuffer *error_buf = NULL;
guint i;
+ gchar *msg = g_strdup_printf("Excluding %s due to dependency failure\n",pkg->name);
- gtk_window_set_title (GTK_WINDOW(w),_("Error"));
+ gtk_window_set_title (GTK_WINDOW(w),(char *)_("Error"));
gtk_label_set_text(GTK_LABEL(lookup_widget(w,"dep_error_label")),msg);
+ g_free(msg);
+
+ gtk_label_set_text(GTK_LABEL(lookup_widget(w,"dep_error_install_anyway_warning_label")),
+ "warning here about installing a package with missing deps");
+
gtk_label_set_use_markup (GTK_LABEL(lookup_widget(w,"dep_error_label")),
TRUE);
error_buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(lookup_widget(w,"dep_error_text")));
@@ -2989,6 +3003,84 @@ static void display_dep_error_dialog (const char *msg,guint m, guint c)
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",
+ G_CALLBACK(install_dep_error_callback),pkg);
+
gtk_widget_show(w);
}
+static void exclude_dep_error_callback (GtkObject *object, gpointer user_data)
+{
+ GtkWidget *dep_error_dialog = lookup_widget(GTK_WIDGET(object),"dep_error_dialog");
+ slapt_pkg_info_t *pkg = (slapt_pkg_info_t *)user_data;
+
+ slapt_add_exclude_to_transaction(trans,pkg);
+ rebuild_package_action_menu();
+ gtk_widget_destroy(dep_error_dialog);
+}
+
+static void install_dep_error_callback (GtkObject *object, gpointer user_data)
+{
+ GtkTreeView *treeview;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreeModelFilter *filter_model;
+ 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) {
+ gchar *status = g_strdup_printf("i%s",pkg->name);
+
+ slapt_add_install_to_transaction(trans,pkg);
+
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_install.png"),-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_COLUMN,status,-1);
+ g_free(status);
+
+ set_execute_active();
+ } else if (strstr(action_label,"Upgrade") != NULL) {
+ 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);
+
+ }
+
+ set_execute_active();
+
+ }
+
+ rebuild_package_action_menu();
+ gtk_widget_destroy(dep_error_dialog);
+}
diff --git a/src/interface.c b/src/interface.c
index fbd49ae..da1cf31 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -444,40 +444,40 @@ create_gslapt (void)
GtkWidget *actions2;
GtkWidget *actions2_menu;
GtkWidget *update1;
- GtkWidget *image1243;
+ GtkWidget *image1286;
GtkWidget *mark_all_upgrades2;
- GtkWidget *image1244;
+ GtkWidget *image1287;
GtkWidget *execute1;
- GtkWidget *image1245;
+ GtkWidget *image1288;
GtkWidget *separator2;
GtkWidget *quit;
GtkWidget *edit1;
GtkWidget *edit1_menu;
GtkWidget *unmark_all1;
- GtkWidget *image1246;
+ GtkWidget *image1289;
GtkWidget *separator1;
GtkWidget *preferences2;
- GtkWidget *image1247;
+ GtkWidget *image1290;
GtkWidget *package1;
GtkWidget *package1_menu;
GtkWidget *unmark1;
- GtkWidget *image1248;
+ GtkWidget *image1291;
GtkWidget *install1;
- GtkWidget *image1249;
+ GtkWidget *image1292;
GtkWidget *re_install1;
- GtkWidget *image1250;
+ GtkWidget *image1293;
GtkWidget *upgrade1;
- GtkWidget *image1251;
+ GtkWidget *image1294;
GtkWidget *downgrade1;
- GtkWidget *image1252;
+ GtkWidget *image1295;
GtkWidget *remove1;
- GtkWidget *image1253;
+ GtkWidget *image1296;
GtkWidget *help3;
GtkWidget *help3_menu;
GtkWidget *icon_legend1;
- GtkWidget *image1254;
+ GtkWidget *image1297;
GtkWidget *about3;
- GtkWidget *image1255;
+ GtkWidget *image1298;
GtkWidget *action_toolbar;
GtkIconSize tmp_toolbar_icon_size;
GtkWidget *tmp_image;
@@ -588,10 +588,10 @@ create_gslapt (void)
GDK_y, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1243 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1243, "image1243");
- gtk_widget_show (image1243);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (update1), image1243);
+ image1286 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1286, "image1286");
+ gtk_widget_show (image1286);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (update1), image1286);
mark_all_upgrades2 = gtk_image_menu_item_new_with_mnemonic (_("Mark All Upgrades"));
gtk_widget_set_name (mark_all_upgrades2, "mark_all_upgrades2");
@@ -602,10 +602,10 @@ create_gslapt (void)
GDK_a, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1244 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1244, "image1244");
- gtk_widget_show (image1244);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mark_all_upgrades2), image1244);
+ image1287 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1287, "image1287");
+ gtk_widget_show (image1287);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mark_all_upgrades2), image1287);
execute1 = gtk_image_menu_item_new_with_mnemonic (_("Execute"));
gtk_widget_set_name (execute1, "execute1");
@@ -616,10 +616,10 @@ create_gslapt (void)
GDK_Return, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1245 = gtk_image_new_from_stock ("gtk-apply", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1245, "image1245");
- gtk_widget_show (image1245);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (execute1), image1245);
+ image1288 = gtk_image_new_from_stock ("gtk-apply", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1288, "image1288");
+ gtk_widget_show (image1288);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (execute1), image1288);
separator2 = gtk_separator_menu_item_new ();
gtk_widget_set_name (separator2, "separator2");
@@ -646,13 +646,13 @@ create_gslapt (void)
gtk_widget_show (unmark_all1);
gtk_container_add (GTK_CONTAINER (edit1_menu), unmark_all1);
gtk_widget_add_accelerator (unmark_all1, "activate", accel_group,
- GDK_m, (GdkModifierType) GDK_CONTROL_MASK,
+ GDK_z, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1246 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1246, "image1246");
- gtk_widget_show (image1246);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark_all1), image1246);
+ image1289 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1289, "image1289");
+ gtk_widget_show (image1289);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark_all1), image1289);
separator1 = gtk_separator_menu_item_new ();
gtk_widget_set_name (separator1, "separator1");
@@ -668,10 +668,10 @@ create_gslapt (void)
GDK_p, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1247 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1247, "image1247");
- gtk_widget_show (image1247);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences2), image1247);
+ image1290 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1290, "image1290");
+ gtk_widget_show (image1290);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences2), image1290);
package1 = gtk_menu_item_new_with_mnemonic (_("P_ackage"));
gtk_widget_set_name (package1, "package1");
@@ -691,10 +691,10 @@ create_gslapt (void)
GDK_n, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1248 = create_pixmap (gslapt, "pkg_action_available.png");
- gtk_widget_set_name (image1248, "image1248");
- gtk_widget_show (image1248);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark1), image1248);
+ image1291 = create_pixmap (gslapt, "pkg_action_available.png");
+ gtk_widget_set_name (image1291, "image1291");
+ gtk_widget_show (image1291);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark1), image1291);
install1 = gtk_image_menu_item_new_with_mnemonic (_("Install"));
gtk_widget_set_name (install1, "install1");
@@ -705,10 +705,10 @@ create_gslapt (void)
GDK_i, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1249 = create_pixmap (gslapt, "pkg_action_install.png");
- gtk_widget_set_name (image1249, "image1249");
- gtk_widget_show (image1249);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (install1), image1249);
+ image1292 = create_pixmap (gslapt, "pkg_action_install.png");
+ gtk_widget_set_name (image1292, "image1292");
+ gtk_widget_show (image1292);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (install1), image1292);
re_install1 = gtk_image_menu_item_new_with_mnemonic (_("Re-Install"));
gtk_widget_set_name (re_install1, "re_install1");
@@ -719,10 +719,10 @@ create_gslapt (void)
GDK_e, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1250 = create_pixmap (gslapt, "pkg_action_reinstall.png");
- gtk_widget_set_name (image1250, "image1250");
- gtk_widget_show (image1250);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (re_install1), image1250);
+ image1293 = create_pixmap (gslapt, "pkg_action_reinstall.png");
+ gtk_widget_set_name (image1293, "image1293");
+ gtk_widget_show (image1293);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (re_install1), image1293);
upgrade1 = gtk_image_menu_item_new_with_mnemonic (_("Upgrade"));
gtk_widget_set_name (upgrade1, "upgrade1");
@@ -733,10 +733,10 @@ create_gslapt (void)
GDK_u, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1251 = create_pixmap (gslapt, "pkg_action_upgrade.png");
- gtk_widget_set_name (image1251, "image1251");
- gtk_widget_show (image1251);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (upgrade1), image1251);
+ image1294 = create_pixmap (gslapt, "pkg_action_upgrade.png");
+ gtk_widget_set_name (image1294, "image1294");
+ gtk_widget_show (image1294);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (upgrade1), image1294);
downgrade1 = gtk_image_menu_item_new_with_mnemonic (_("Downgrade"));
gtk_widget_set_name (downgrade1, "downgrade1");
@@ -747,10 +747,10 @@ create_gslapt (void)
GDK_d, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1252 = create_pixmap (gslapt, "pkg_action_downgrade.png");
- gtk_widget_set_name (image1252, "image1252");
- gtk_widget_show (image1252);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (downgrade1), image1252);
+ image1295 = create_pixmap (gslapt, "pkg_action_downgrade.png");
+ gtk_widget_set_name (image1295, "image1295");
+ gtk_widget_show (image1295);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (downgrade1), image1295);
remove1 = gtk_image_menu_item_new_with_mnemonic (_("Remove"));
gtk_widget_set_name (remove1, "remove1");
@@ -761,10 +761,10 @@ create_gslapt (void)
GDK_r, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1253 = create_pixmap (gslapt, "pkg_action_remove.png");
- gtk_widget_set_name (image1253, "image1253");
- gtk_widget_show (image1253);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image1253);
+ image1296 = create_pixmap (gslapt, "pkg_action_remove.png");
+ gtk_widget_set_name (image1296, "image1296");
+ gtk_widget_show (image1296);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image1296);
help3 = gtk_menu_item_new_with_mnemonic (_("_Help"));
gtk_widget_set_name (help3, "help3");
@@ -780,20 +780,20 @@ create_gslapt (void)
gtk_widget_show (icon_legend1);
gtk_container_add (GTK_CONTAINER (help3_menu), icon_legend1);
- image1254 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1254, "image1254");
- gtk_widget_show (image1254);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (icon_legend1), image1254);
+ image1297 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1297, "image1297");
+ gtk_widget_show (image1297);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (icon_legend1), image1297);
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);
- image1255 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1255, "image1255");
- gtk_widget_show (image1255);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about3), image1255);
+ image1298 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1298, "image1298");
+ gtk_widget_show (image1298);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about3), image1298);
action_toolbar = gtk_toolbar_new ();
gtk_widget_set_name (action_toolbar, "action_toolbar");
@@ -1304,40 +1304,40 @@ create_gslapt (void)
GLADE_HOOKUP_OBJECT (gslapt, actions2, "actions2");
GLADE_HOOKUP_OBJECT (gslapt, actions2_menu, "actions2_menu");
GLADE_HOOKUP_OBJECT (gslapt, update1, "update1");
- GLADE_HOOKUP_OBJECT (gslapt, image1243, "image1243");
+ GLADE_HOOKUP_OBJECT (gslapt, image1286, "image1286");
GLADE_HOOKUP_OBJECT (gslapt, mark_all_upgrades2, "mark_all_upgrades2");
- GLADE_HOOKUP_OBJECT (gslapt, image1244, "image1244");
+ GLADE_HOOKUP_OBJECT (gslapt, image1287, "image1287");
GLADE_HOOKUP_OBJECT (gslapt, execute1, "execute1");
- GLADE_HOOKUP_OBJECT (gslapt, image1245, "image1245");
+ GLADE_HOOKUP_OBJECT (gslapt, image1288, "image1288");
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, image1246, "image1246");
+ GLADE_HOOKUP_OBJECT (gslapt, image1289, "image1289");
GLADE_HOOKUP_OBJECT (gslapt, separator1, "separator1");
GLADE_HOOKUP_OBJECT (gslapt, preferences2, "preferences2");
- GLADE_HOOKUP_OBJECT (gslapt, image1247, "image1247");
+ GLADE_HOOKUP_OBJECT (gslapt, image1290, "image1290");
GLADE_HOOKUP_OBJECT (gslapt, package1, "package1");
GLADE_HOOKUP_OBJECT (gslapt, package1_menu, "package1_menu");
GLADE_HOOKUP_OBJECT (gslapt, unmark1, "unmark1");
- GLADE_HOOKUP_OBJECT (gslapt, image1248, "image1248");
+ GLADE_HOOKUP_OBJECT (gslapt, image1291, "image1291");
GLADE_HOOKUP_OBJECT (gslapt, install1, "install1");
- GLADE_HOOKUP_OBJECT (gslapt, image1249, "image1249");
+ GLADE_HOOKUP_OBJECT (gslapt, image1292, "image1292");
GLADE_HOOKUP_OBJECT (gslapt, re_install1, "re_install1");
- GLADE_HOOKUP_OBJECT (gslapt, image1250, "image1250");
+ GLADE_HOOKUP_OBJECT (gslapt, image1293, "image1293");
GLADE_HOOKUP_OBJECT (gslapt, upgrade1, "upgrade1");
- GLADE_HOOKUP_OBJECT (gslapt, image1251, "image1251");
+ GLADE_HOOKUP_OBJECT (gslapt, image1294, "image1294");
GLADE_HOOKUP_OBJECT (gslapt, downgrade1, "downgrade1");
- GLADE_HOOKUP_OBJECT (gslapt, image1252, "image1252");
+ GLADE_HOOKUP_OBJECT (gslapt, image1295, "image1295");
GLADE_HOOKUP_OBJECT (gslapt, remove1, "remove1");
- GLADE_HOOKUP_OBJECT (gslapt, image1253, "image1253");
+ GLADE_HOOKUP_OBJECT (gslapt, image1296, "image1296");
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, image1254, "image1254");
+ GLADE_HOOKUP_OBJECT (gslapt, image1297, "image1297");
GLADE_HOOKUP_OBJECT (gslapt, about3, "about3");
- GLADE_HOOKUP_OBJECT (gslapt, image1255, "image1255");
+ GLADE_HOOKUP_OBJECT (gslapt, image1298, "image1298");
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");
@@ -1796,6 +1796,8 @@ create_notification (void)
GtkWidget *notification;
GdkPixbuf *notification_icon_pixbuf;
GtkWidget *dialog_vbox3;
+ GtkWidget *hbox112;
+ GtkWidget *image1260;
GtkWidget *notification_label;
GtkWidget *dialog_action_area3;
GtkWidget *okbutton2;
@@ -1818,10 +1820,21 @@ create_notification (void)
gtk_widget_set_name (dialog_vbox3, "dialog_vbox3");
gtk_widget_show (dialog_vbox3);
+ hbox112 = gtk_hbox_new (FALSE, 6);
+ gtk_widget_set_name (hbox112, "hbox112");
+ gtk_widget_show (hbox112);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox3), hbox112, TRUE, TRUE, 2);
+
+ image1260 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_DIALOG);
+ gtk_widget_set_name (image1260, "image1260");
+ gtk_widget_show (image1260);
+ gtk_box_pack_start (GTK_BOX (hbox112), image1260, FALSE, TRUE, 6);
+ gtk_misc_set_alignment (GTK_MISC (image1260), 0.5, 0.2);
+
notification_label = gtk_label_new ("");
gtk_widget_set_name (notification_label, "notification_label");
gtk_widget_show (notification_label);
- gtk_box_pack_start (GTK_BOX (dialog_vbox3), notification_label, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (hbox112), notification_label, TRUE, TRUE, 6);
gtk_label_set_use_markup (GTK_LABEL (notification_label), TRUE);
dialog_action_area3 = GTK_DIALOG (notification)->action_area;
@@ -1842,6 +1855,8 @@ create_notification (void)
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (notification, notification, "notification");
GLADE_HOOKUP_OBJECT_NO_REF (notification, dialog_vbox3, "dialog_vbox3");
+ GLADE_HOOKUP_OBJECT (notification, hbox112, "hbox112");
+ GLADE_HOOKUP_OBJECT (notification, image1260, "image1260");
GLADE_HOOKUP_OBJECT (notification, notification_label, "notification_label");
GLADE_HOOKUP_OBJECT_NO_REF (notification, dialog_action_area3, "dialog_action_area3");
GLADE_HOOKUP_OBJECT (notification, okbutton2, "okbutton2");
@@ -2318,12 +2333,24 @@ create_dep_error_dialog (void)
GtkWidget *dep_error_dialog;
GdkPixbuf *dep_error_dialog_icon_pixbuf;
GtkWidget *dialog_vbox6;
- GtkWidget *vbox71;
+ GtkWidget *hbox113;
+ GtkWidget *image1261;
+ GtkWidget *vbox72;
GtkWidget *dep_error_label;
GtkWidget *scrolledwindow22;
GtkWidget *dep_error_text;
+ GtkWidget *dep_error_install_anyway_warning_label;
GtkWidget *dialog_action_area6;
- GtkWidget *closebutton3;
+ 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");
@@ -2343,21 +2370,34 @@ create_dep_error_dialog (void)
gtk_widget_set_name (dialog_vbox6, "dialog_vbox6");
gtk_widget_show (dialog_vbox6);
- vbox71 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox71, "vbox71");
- gtk_widget_show (vbox71);
- gtk_box_pack_start (GTK_BOX (dialog_vbox6), vbox71, TRUE, TRUE, 0);
+ hbox113 = gtk_hbox_new (FALSE, 6);
+ gtk_widget_set_name (hbox113, "hbox113");
+ gtk_widget_show (hbox113);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox6), hbox113, TRUE, TRUE, 0);
+
+ image1261 = gtk_image_new_from_stock ("gtk-dialog-error", GTK_ICON_SIZE_DIALOG);
+ gtk_widget_set_name (image1261, "image1261");
+ gtk_widget_show (image1261);
+ gtk_box_pack_start (GTK_BOX (hbox113), image1261, TRUE, TRUE, 6);
+ gtk_misc_set_alignment (GTK_MISC (image1261), 0.5, 0.2);
+
+ vbox72 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_set_name (vbox72, "vbox72");
+ gtk_widget_show (vbox72);
+ gtk_box_pack_start (GTK_BOX (hbox113), vbox72, TRUE, TRUE, 0);
dep_error_label = gtk_label_new ("");
gtk_widget_set_name (dep_error_label, "dep_error_label");
gtk_widget_show (dep_error_label);
- gtk_box_pack_start (GTK_BOX (vbox71), dep_error_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox72), dep_error_label, TRUE, TRUE, 6);
gtk_label_set_use_markup (GTK_LABEL (dep_error_label), TRUE);
+ gtk_label_set_line_wrap (GTK_LABEL (dep_error_label), TRUE);
+ gtk_misc_set_alignment (GTK_MISC (dep_error_label), 0, 0);
scrolledwindow22 = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_name (scrolledwindow22, "scrolledwindow22");
gtk_widget_show (scrolledwindow22);
- gtk_box_pack_start (GTK_BOX (vbox71), scrolledwindow22, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox72), scrolledwindow22, TRUE, TRUE, 6);
gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow22), 2);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow22), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -2366,33 +2406,98 @@ create_dep_error_dialog (void)
gtk_widget_show (dep_error_text);
gtk_container_add (GTK_CONTAINER (scrolledwindow22), dep_error_text);
gtk_container_set_border_width (GTK_CONTAINER (dep_error_text), 2);
+ 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);
+ 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, TRUE, TRUE, 6);
+ 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);
+
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);
- closebutton3 = gtk_button_new_from_stock ("gtk-close");
- gtk_widget_set_name (closebutton3, "closebutton3");
- gtk_widget_show (closebutton3);
- gtk_dialog_add_action_widget (GTK_DIALOG (dep_error_dialog), closebutton3, GTK_RESPONSE_CLOSE);
- GTK_WIDGET_SET_FLAGS (closebutton3, GTK_CAN_DEFAULT);
-
- g_signal_connect_swapped ((gpointer) closebutton3, "clicked",
- G_CALLBACK (gtk_widget_destroy),
- GTK_OBJECT (dep_error_dialog));
+ dep_error_cancel_button = gtk_button_new ();
+ 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_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 ();
+ 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_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, vbox71, "vbox71");
+ 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, dep_error_label, "dep_error_label");
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, dep_error_install_anyway_warning_label, "dep_error_install_anyway_warning_label");
GLADE_HOOKUP_OBJECT_NO_REF (dep_error_dialog, dialog_action_area6, "dialog_action_area6");
- GLADE_HOOKUP_OBJECT (dep_error_dialog, closebutton3, "closebutton3");
-
+ 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);
return dep_error_dialog;
}