Author: rpmcruz
Date: Thu Jul 31 15:41:53 2008
New Revision: 49545
URL: http://svn.opensuse.org/viewcvs/yast?rev=49545&view=rev
Log:
* src/YGPackageSelector.cc: online update was broken.
* src/yzyppwrapper.cc: only show relevant patches.
* src/ygtkwizard.h/c: added information background drawing hook.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGPackageSelector.cc
trunk/gtk/src/ygtksteps.c
trunk/gtk/src/ygtkwizard.c
trunk/gtk/src/ygtkwizard.h
trunk/gtk/src/yzyppwrapper.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49545&r1=49544&r2=49545&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Thu Jul 31 15:41:53 2008
@@ -1,3 +1,10 @@
+2008-07-31 Ricardo Cruz
+
+ * src/YGPackageSelector.cc: online update was broken.
+ * src/yzyppwrapper.cc: only show relevant patches.
+
+ * src/ygtkwizard.h/c: added information background drawing hook.
+
2008-07-30 Ricardo Cruz
* src/yzyppwrapper.h/.cc: add attributes arch to Version and url to
Modified: trunk/gtk/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=49545&r1=49544&r2=49545&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelector.cc (original)
+++ trunk/gtk/src/YGPackageSelector.cc Thu Jul 31 15:41:53 2008
@@ -816,6 +816,9 @@
gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
+ ygtk_wizard_set_information_expose_hook (vbox, &vbox->allocation);
+ ygtk_wizard_set_information_expose_hook (m_entries_box, &m_entries_box->allocation);
+
int width = YGUtils::getCharsWidth (vbox, 25);
gtk_widget_set_size_request (vbox, width, -1);
gtk_widget_show_all (vbox);
@@ -1075,15 +1078,17 @@
Categories (Collections::Listener *listener, bool patch_mode)
: StoreView (listener), m_patchMode (patch_mode), m_rpmGroups (false)
{
- GtkWidget *check = gtk_check_button_new_with_label (_("Detailed"));
- YGUtils::setWidgetFont (GTK_BIN (check)->child,
- PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL);
- gtk_widget_set_tooltip_text (check,
- _("Group by the PackageKit-based filter or straight from the actual "
- "RPM information."));
- g_signal_connect (G_OBJECT (check), "toggled",
- G_CALLBACK (rpm_groups_toggled_cb), this);
- gtk_box_pack_start (GTK_BOX (m_box), check, FALSE, TRUE, 0);
+ if (!m_patchMode) {
+ GtkWidget *check = gtk_check_button_new_with_label (_("Detailed"));
+ YGUtils::setWidgetFont (GTK_BIN (check)->child,
+ PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL);
+ gtk_widget_set_tooltip_text (check,
+ _("Group by the PackageKit-based filter or straight from the actual "
+ "RPM information."));
+ g_signal_connect (G_OBJECT (check), "toggled",
+ G_CALLBACK (rpm_groups_toggled_cb), this);
+ gtk_box_pack_start (GTK_BOX (m_box), check, FALSE, TRUE, 0);
+ }
build (m_rpmGroups, !m_rpmGroups, false);
}
@@ -1107,12 +1112,12 @@
Ypp::Node *first_category;
Ypp::Package::Type type =
m_patchMode ? Ypp::Package::PATCH_TYPE : Ypp::Package::PACKAGE_TYPE;
- if (!m_rpmGroups)
+ if (!m_rpmGroups && !m_patchMode)
first_category = Ypp::get()->getFirstCategory2 (type);
else
first_category = Ypp::get()->getFirstCategory (type);
inner::populate (store, NULL, first_category, this);
- if (!m_rpmGroups) {
+ if (!m_rpmGroups && !m_patchMode) {
GtkTreeView *view = GTK_TREE_VIEW (m_view);
GtkTreeIter iter;
gtk_tree_store_append (store, &iter, NULL);
@@ -1142,7 +1147,7 @@
query->setIsSuggested (true);
else {
Ypp::Node *node = (Ypp::Node *) ptr;
- if (m_rpmGroups)
+ if (m_rpmGroups || m_patchMode)
query->addCategory (node);
else
query->addCategory2 (node);
@@ -1474,8 +1479,8 @@
else {
gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Groups"));
gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Patterns"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Repositories"));
}
+ gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Repositories"));
gtk_combo_box_set_active (GTK_COMBO_BOX (m_type), 0);
g_signal_connect_after (G_OBJECT (m_type), "changed",
G_CALLBACK (type_changed_cb), this);
Modified: trunk/gtk/src/ygtksteps.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtksteps.c?rev=49545&r1=49544&r2=49545&view=diff
==============================================================================
--- trunk/gtk/src/ygtksteps.c (original)
+++ trunk/gtk/src/ygtksteps.c Thu Jul 31 15:41:53 2008
@@ -167,25 +167,8 @@
static gboolean ygtk_steps_expose_event (GtkWidget *widget, GdkEventExpose *event)
{
GtkStyle *style = gtk_widget_get_style (widget);
-
- // background
- cairo_t *cr = gdk_cairo_create (widget->window);
-
- int x, y, w, h;
- x = widget->allocation.x; y = widget->allocation.y;
- w = widget->allocation.width; h = widget->allocation.height;
-
- cairo_pattern_t *pattern = cairo_pattern_create_linear (x, y, x, y+h);
- cairo_pattern_add_color_stop_rgba (pattern, 0, 1, 1, 1, 1);
- cairo_pattern_add_color_stop_rgba (pattern, 1, 1, 1, 1, 0);
- cairo_set_source (cr, pattern);
- cairo_rectangle (cr, x, y, w, h);
- cairo_fill (cr);
- cairo_pattern_destroy (pattern);
- cairo_destroy (cr);
-
// content
- x = widget->allocation.x + BORDER; y = widget->allocation.y + BORDER;
+ int x = widget->allocation.x + BORDER, y = widget->allocation.y + BORDER;
YGtkSteps *steps = YGTK_STEPS (widget);
int i;
for (i = 0; i < ygtk_steps_total (steps); i++) {
Modified: trunk/gtk/src/ygtkwizard.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=49545&r1=49544&r2=49545&view=diff
==============================================================================
--- trunk/gtk/src/ygtkwizard.c (original)
+++ trunk/gtk/src/ygtkwizard.c Thu Jul 31 15:41:53 2008
@@ -549,6 +549,28 @@
gtk_paned_pack2 (GTK_PANED (wizard->m_pane), widget, TRUE, TRUE);
}
+static gboolean ygtk_wizard_set_information_expose_cb (GtkWidget *widget, GdkEventExpose *event,
+ GtkAllocation *alloc)
+{
+ cairo_t *cr = gdk_cairo_create (widget->window);
+ int x = alloc->x, y = alloc->y, w = alloc->width, h = alloc->height;
+ cairo_pattern_t *pattern = cairo_pattern_create_linear (x, y, x, y+h);
+ cairo_pattern_add_color_stop_rgba (pattern, 0, 1, 1, 1, 1);
+ cairo_pattern_add_color_stop_rgba (pattern, 1, 1, 1, 1, 0);
+ cairo_set_source (cr, pattern);
+ cairo_rectangle (cr, x, y, w, h);
+ cairo_fill (cr);
+ cairo_pattern_destroy (pattern);
+ cairo_destroy (cr);
+ return FALSE;
+}
+
+void ygtk_wizard_set_information_expose_hook (GtkWidget *widget, GtkAllocation *alloc)
+{
+ g_signal_connect (G_OBJECT (widget), "expose-event",
+ G_CALLBACK (ygtk_wizard_set_information_expose_cb), alloc);
+}
+
void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget)
{
gtk_box_pack_start (GTK_BOX (wizard->m_contents_box), widget, FALSE, TRUE, 0);
@@ -565,6 +587,7 @@
wizard->m_steps = ygtk_steps_new();
gtk_widget_show (wizard->m_steps);
ygtk_wizard_set_information_widget (wizard, wizard->m_steps);
+ ygtk_wizard_set_information_expose_hook (wizard->m_steps, &wizard->m_steps->allocation);
}
void ygtk_wizard_enable_tree (YGtkWizard *wizard)
Modified: trunk/gtk/src/ygtkwizard.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=49545&r1=49544&r2=49545&view=diff
==============================================================================
--- trunk/gtk/src/ygtkwizard.h (original)
+++ trunk/gtk/src/ygtkwizard.h Thu Jul 31 15:41:53 2008
@@ -115,6 +115,7 @@
// the given one (you may pass NULL to just remove current child)
void ygtk_wizard_set_child (YGtkWizard *wizard, GtkWidget *widget);
void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget);
+void ygtk_wizard_set_information_expose_hook (GtkWidget *widget, GtkAllocation *alloc);
void ygtk_wizard_set_control_widget (YGtkWizard *wizard, GtkWidget *widget);
// commands
Modified: trunk/gtk/src/yzyppwrapper.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=49545&r1=49544&r2=49545&view=diff
==============================================================================
--- trunk/gtk/src/yzyppwrapper.cc (original)
+++ trunk/gtk/src/yzyppwrapper.cc Thu Jul 31 15:41:53 2008
@@ -80,7 +80,9 @@
Ypp::Node *getFirst()
{
- return (Ypp::Node *) root->children->data;
+ if (root->children)
+ return (Ypp::Node *) root->children->data;
+ return NULL;
}
Ypp::Node *add (const std::string &tree_str, const char *icon)
@@ -1768,6 +1770,8 @@
ZyppPatch patch = tryCastToZyppPatch (object);
if (!patch)
continue;
+ if ((*it)->candidateObj() && !(*it)->candidateObj().isRelevant())
+ continue;
category = addCategory (type, patch->category());
break;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
