October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52354 - in /trunk/printer: package/yast2-printer.changes src/overview.ycp
by mzugec＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: mzugec Date: Mon Oct 20 10:42:46 2008 New Revision: 52354 URL: http://svn.opensuse.org/viewcvs/yast?rev=52354&view=rev Log: fixed popup typo (bnc#436097) Modified: trunk/printer/package/yast2-printer.changes trunk/printer/src/overview.ycp Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Mon Oct 20 10:42:46 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 20 10:42:02 CEST 2008 - mzugec(a)suse.cz + +- fixed popup typo (bnc#436097) + +------------------------------------------------------------------- Thu Oct 16 12:12:23 CEST 2008 - jsrain(a)suse.cz - fixed printer proposal (bnc #431559) Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=523… ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Mon Oct 20 10:42:46 2008 @@ -323,7 +323,7 @@ } Popup::TimedMessage( // Popup message // where %1 will be replaced by the queue name. - sformat( _("Sent testpage to %1. Is should start to print soon."), queue_name ), + sformat( _("Sent testpage to %1. It should start to print soon."), queue_name ), 60 ); return nil; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52353 - /tags/stable-2_17_3/apparmor/
by kmachalkova＠svn.opensuse.org 20 Oct '08

20 Oct '08

Author: kmachalkova Date: Mon Oct 20 10:36:44 2008 New Revision: 52353 URL: http://svn.opensuse.org/viewcvs/yast?rev=52353&view=rev Log: Created tag stable-2_17_3 for apparmor Added: tags/stable-2_17_3/apparmor/ - copied from r52352, trunk/apparmor/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52352 - /trunk/gtk/src/ygtkwizard.c
by rpmcruz＠svn.opensuse.org 19 Oct '08

19 Oct '08

Author: rpmcruz Date: Sun Oct 19 21:01:40 2008 New Revision: 52352 URL: http://svn.opensuse.org/viewcvs/yast?rev=52352&view=rev Log: Mem leak. Modified: trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=52352&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Sun Oct 19 21:01:40 2008 @@ -271,6 +271,8 @@ } help->history = g_list_prepend (help->history, pair); #else + if (help->text) + g_free (help->text); help->text = g_strdup (text); #endif if (help->dialog) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52351 - in /trunk/gtk/src: ygtkwizard.c ygtkwizard.h
by rpmcruz＠svn.opensuse.org 19 Oct '08

19 Oct '08

Author: rpmcruz Date: Sun Oct 19 20:11:36 2008 New Revision: 52351 URL: http://svn.opensuse.org/viewcvs/yast?rev=52351&view=rev Log: Disabled history feature. Modified: trunk/gtk/src/ygtkwizard.c trunk/gtk/src/ygtkwizard.h Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=52351&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Sun Oct 19 20:11:36 2008 @@ -24,9 +24,6 @@ #define HELP_IMG_BG "yelp-icon-big" -// test feature: history on help dialog -#define SET_HELP_HISTORY - // YGUtils bridge extern void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); @@ -119,6 +116,9 @@ #ifdef SET_HELP_HISTORY dialog->history_combo = gtk_combo_box_new_text(); + GList *cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (dialog->history_combo)); + g_object_set (G_OBJECT (cells->data), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + g_list_free (cells); #endif // glue it @@ -191,15 +191,18 @@ gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "close", 0); } +#ifdef SET_HELP_HISTORY typedef struct TitleTextPair { gchar *title, *text; } TitleTextPair; +#endif YGtkHelpText *ygtk_help_text_new (void) { return g_new0 (YGtkHelpText, 1); } void ygtk_help_text_destroy (YGtkHelpText *help) { +#ifdef SET_HELP_HISTORY if (help->history) { GList *i; for (i = help->history; i; i = i->next) { @@ -211,21 +214,30 @@ g_list_free (help->history); help->history = 0; } +#else + if (help->text) { + g_free (help->text); + help->text = 0; + } +#endif if (help->dialog) { gtk_widget_destroy (help->dialog); help->dialog = 0; } } +#ifdef SET_HELP_HISTORY static gint compare_links (gconstpointer pa, gconstpointer pb) { const TitleTextPair *a = pa, *b = pb; return strcmp (a->text, b->text); } +#endif void ygtk_help_text_set (YGtkHelpText *help, const gchar *title, const gchar *text) { if (!*text) return; +#ifdef SET_HELP_HISTORY TitleTextPair *pair = g_new (TitleTextPair, 1); if (title) pair->title = g_strdup (title); @@ -258,16 +270,23 @@ help->history = g_list_delete_link (help->history, i); } help->history = g_list_prepend (help->history, pair); +#else + help->text = g_strdup (text); +#endif if (help->dialog) ygtk_help_text_sync (help, NULL); } const gchar *ygtk_help_text_get (YGtkHelpText *help, gint n) { +#ifdef SET_HELP_HISTORY TitleTextPair *pair = g_list_nth_data (help->history, n); if (pair) return pair->text; return NULL; +#else + return help->text; +#endif } #ifdef SET_HELP_HISTORY Modified: trunk/gtk/src/ygtkwizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=52351&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.h (original) +++ trunk/gtk/src/ygtkwizard.h Sun Oct 19 20:11:36 2008 @@ -15,8 +15,15 @@ #include <gtk/gtkvbox.h> G_BEGIN_DECLS +// test feature: history on help dialog +//#define SET_HELP_HISTORY + typedef struct YGtkHelpText { +#ifdef SET_HELP_HISTORY GList *history; +#else + gchar *text; +#endif GtkWidget *dialog; } YGtkHelpText; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52350 - in /trunk/gtk: ChangeLog src/YGBarGraph.cc src/ygtkbargraph.c src/ygtkbargraph.h src/ygtkratiobox.c src/ygtkwizard.c src/ygtkwizard.h
by rpmcruz＠svn.opensuse.org 19 Oct '08

19 Oct '08

Author: rpmcruz Date: Sun Oct 19 19:23:17 2008 New Revision: 52350 URL: http://svn.opensuse.org/viewcvs/yast?rev=52350&view=rev Log: * src/ygtkbargraph.h/cc: moved color customization out of setup routine. * src/YGBarGraph.cc (YGBarGraph): honor textColor(). * src/ygtkratiobox.cc (used by YGtkBarGraph): was allocating the widget at the window position x=0. * src/YGBarGraph.cc (YGPartitionSplitter): bug fix: the widget was broken. Aligned labels correctly as well. * src/ygtkwizard.h/cc: added history combo box to the help dialog. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGBarGraph.cc trunk/gtk/src/ygtkbargraph.c trunk/gtk/src/ygtkbargraph.h trunk/gtk/src/ygtkratiobox.c trunk/gtk/src/ygtkwizard.c trunk/gtk/src/ygtkwizard.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52350&r1=52349… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Oct 19 19:23:17 2008 @@ -1,3 +1,16 @@ +2008-10-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkbargraph.h/cc: moved color customization out of setup routine. + * src/YGBarGraph.cc (YGBarGraph): honor textColor(). + + * src/ygtkratiobox.cc (used by YGtkBarGraph): was allocating the widget + at the window position x=0. + + * src/YGBarGraph.cc (YGPartitionSplitter): bug fix: the widget was + broken. Aligned labels correctly as well. + + * src/ygtkwizard.h/cc: added history combo box to the help dialog. + 2008-10-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGUtils.h/cc: added PangoStyle (for italic) option to Modified: trunk/gtk/src/YGBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGBarGraph.cc?rev=52350&… ============================================================================== --- trunk/gtk/src/YGBarGraph.cc (original) +++ trunk/gtk/src/YGBarGraph.cc Sun Oct 19 19:23:17 2008 @@ -20,22 +20,26 @@ // YBarGraph virtual void doUpdate() { - GdkColor clr; - ygtk_bar_graph_create_entries (YGTK_BAR_GRAPH (getWidget()), segments()); + YGtkBarGraph *graph = YGTK_BAR_GRAPH (getWidget()); + ygtk_bar_graph_create_entries (graph, segments()); for (int i = 0; i < segments(); i++) { const YBarGraphSegment &s = segment (i); - GdkColor *c = 0; + ygtk_bar_graph_setup_entry (graph, i, s.label().c_str(), s.value()); if (s.hasSegmentColor()) { - const YColor &color = s.segmentColor(); - clr.red = color.red(); - clr.green = color.green(); - clr.blue = color.blue(); - c = &clr; + GdkColor color = ycolorToGdk (s.segmentColor()); + ygtk_bar_graph_customize_bg (graph, i, &color); + } + if (s.hasTextColor()) { + GdkColor color = ycolorToGdk (s.textColor()); + ygtk_bar_graph_customize_fg (graph, i, &color); } - ygtk_bar_graph_setup_entry (YGTK_BAR_GRAPH (getWidget()), i, - s.label().c_str(), s.value(), c); } - // FIXME: new libyui colors segments ... We probably should honor that + } + + static GdkColor ycolorToGdk (const YColor &ycolor) + { + GdkColor color = { 0, ycolor.red() << 8, ycolor.green() << 8, ycolor.blue() << 8 }; + return color; } YGWIDGET_IMPL_COMMON @@ -70,15 +74,15 @@ GtkWidget *graph = ygtk_bar_graph_new(); m_barGraph = YGTK_BAR_GRAPH (graph); ygtk_bar_graph_create_entries (m_barGraph, 3); - ygtk_bar_graph_setup_entry (m_barGraph, 0, usedLabel.c_str(), usedSize, NULL); + ygtk_bar_graph_setup_entry (m_barGraph, 0, usedLabel.c_str(), usedSize); /* Labels over the slider */ - GtkWidget *labels_box, *free_label, *new_part_label; - labels_box = gtk_hbox_new (FALSE, 0); - free_label = gtk_label_new (freeFieldLabel.c_str()); - new_part_label = gtk_label_new (newPartFieldLabel.c_str()); - gtk_box_pack_start (GTK_BOX (labels_box), free_label, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (labels_box), new_part_label, FALSE, FALSE, 0); + GtkWidget *labels_box = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (labels_box), + gtk_label_new (freeFieldLabel.c_str()), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (labels_box), gtk_label_new (NULL), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (labels_box), + gtk_label_new (newPartFieldLabel.c_str()), FALSE, TRUE, 0); /* Slider and the spinners */ GtkWidget *slider_box = gtk_hbox_new (FALSE, 0); @@ -101,7 +105,7 @@ G_CALLBACK (new_spin_changed_cb), this); /* Main layout */ - gtk_box_pack_start (GTK_BOX (getWidget()), graph, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (getWidget()), graph, TRUE, TRUE, 6); gtk_box_pack_start (GTK_BOX (getWidget()), labels_box, FALSE, TRUE, 2); gtk_box_pack_start (GTK_BOX (getWidget()), slider_box, FALSE, TRUE, 2); @@ -118,10 +122,8 @@ virtual void setValue (int newValue) { IMPL - ygtk_bar_graph_setup_entry (m_barGraph, 1, freeLabel().c_str(), - freeSize(), NULL); - ygtk_bar_graph_setup_entry (m_barGraph, 2, newPartLabel().c_str(), - newPartSize(), NULL); + ygtk_bar_graph_setup_entry (m_barGraph, 1, freeLabel().c_str(), freeSize()); + ygtk_bar_graph_setup_entry (m_barGraph, 2, newPartLabel().c_str(), newPartSize()); // block connections g_signal_handlers_block_by_func (m_scale, @@ -131,9 +133,13 @@ g_signal_handlers_block_by_func (m_new_spin, (gpointer) new_spin_changed_cb, this); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_free_spin), freeSize()); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_new_spin), newPartSize()); - gtk_range_set_value (GTK_RANGE (m_scale), freeSize()); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_new_spin), newValue); + int freeSize = totalFreeSize() - newValue; + gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_free_spin), freeSize); + gtk_range_set_value (GTK_RANGE (m_scale), freeSize); + + gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_free_spin), freeSize); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_new_spin), newValue); // unblock connections g_signal_handlers_unblock_by_func (m_scale, Modified: trunk/gtk/src/ygtkbargraph.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkbargraph.c?rev=52350… ============================================================================== --- trunk/gtk/src/ygtkbargraph.c (original) +++ trunk/gtk/src/ygtkbargraph.c Sun Oct 19 19:23:17 2008 @@ -54,15 +54,18 @@ } } -void ygtk_bar_graph_setup_entry (YGtkBarGraph *bar, int index, const gchar *label_entry, - int value, GdkColor *color) +static GtkWidget *ygtk_bar_graph_get_label (YGtkBarGraph *bar, int index, GtkWidget **b) { - YGtkRatioBoxChild *box_child = (YGtkRatioBoxChild *) - g_list_nth_data (YGTK_RATIO_BOX (bar)->children, index); + GtkWidget *box = ((YGtkRatioBoxChild *) g_list_nth_data ( + YGTK_RATIO_BOX (bar)->children, index))->widget; + if (b) *b = box; + return gtk_bin_get_child (GTK_BIN (box)); +} - g_return_if_fail (box_child); - GtkWidget *box = box_child->widget; - GtkWidget *label = gtk_bin_get_child (GTK_BIN (box)); +void ygtk_bar_graph_setup_entry (YGtkBarGraph *bar, int index, const gchar *label_entry, int value) +{ + GtkWidget *box, *label; + label = ygtk_bar_graph_get_label (bar, index, &box); if (value < 0) value = 0; @@ -84,10 +87,11 @@ // tooltip for the labels -- useful if the bar entry gets too small gtk_widget_set_tooltip_text (box, label_text->str); + g_string_free (label_text, TRUE); } // Set proportion - gtk_widget_set_size_request (box, 10, -1); // for homogeneous... + gtk_widget_set_size_request (box, 0, -1); ygtk_ratio_box_set_child_packing (YGTK_RATIO_BOX (bar), box, MAX (value, 1)); // Set background color @@ -123,13 +127,21 @@ }; YGtkColoredLabel *color_label = YGTK_COLORED_LABEL (label); + const guint *color = palette [index % G_N_ELEMENTS (palette)]; + GdkColor gcolor = { 0, color[0] << 8, color[1] << 8, color[2] << 8 }; + ygtk_colored_label_set_background (color_label, &gcolor); +} - if (color) - ygtk_colored_label_set_background (color_label, color->red, color->green, color->blue); - else { - const guint *color = palette [index % G_N_ELEMENTS (palette)]; - ygtk_colored_label_set_background (color_label, color[0], color[1], color[2]); - } +void ygtk_bar_graph_customize_bg (YGtkBarGraph *bar, int index, GdkColor *color) +{ + GtkWidget *label = ygtk_bar_graph_get_label (bar, index, NULL); + ygtk_colored_label_set_background (YGTK_COLORED_LABEL (label), color); +} + +void ygtk_bar_graph_customize_fg (YGtkBarGraph *bar, int index, GdkColor *color) +{ + GtkWidget *label = ygtk_bar_graph_get_label (bar, index, NULL); + ygtk_colored_label_set_foreground (YGTK_COLORED_LABEL (label), color); } static void ygtk_bar_graph_class_init (YGtkBarGraphClass *klass) @@ -164,19 +176,11 @@ GtkWidget *ygtk_colored_label_new (void) { return g_object_new (YGTK_TYPE_COLORED_LABEL, NULL); } -void ygtk_colored_label_set_foreground (YGtkColoredLabel *label, guint red, - guint green, guint blue) -{ - GdkColor color = { 0, red << 8, green << 8, blue << 8 }; - gtk_widget_modify_fg (GTK_WIDGET (label), GTK_STATE_NORMAL, &color); -} +void ygtk_colored_label_set_background (YGtkColoredLabel *label, GdkColor *color) +{ gtk_widget_modify_bg (GTK_WIDGET (label), GTK_STATE_NORMAL, color); } -void ygtk_colored_label_set_background (YGtkColoredLabel *label, guint red, - guint green, guint blue) -{ - GdkColor color = { 0, red << 8, green << 8, blue << 8 }; - gtk_widget_modify_bg (GTK_WIDGET (label), GTK_STATE_NORMAL, &color); -} +void ygtk_colored_label_set_foreground (YGtkColoredLabel *label, GdkColor *color) +{ gtk_widget_modify_fg (GTK_WIDGET (label), GTK_STATE_NORMAL, color); } void ygtk_colored_label_set_shadow_type (YGtkColoredLabel *label, GtkShadowType type) { Modified: trunk/gtk/src/ygtkbargraph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkbargraph.h?rev=52350… ============================================================================== --- trunk/gtk/src/ygtkbargraph.h (original) +++ trunk/gtk/src/ygtkbargraph.h Sun Oct 19 19:23:17 2008 @@ -41,8 +41,10 @@ GType ygtk_bar_graph_get_type (void) G_GNUC_CONST; void ygtk_bar_graph_create_entries (YGtkBarGraph *bar, guint entries); -void ygtk_bar_graph_setup_entry (YGtkBarGraph *bar, int index, - const gchar *label_entry, int value, GdkColor *color); +void ygtk_bar_graph_setup_entry (YGtkBarGraph *bar, int index, const gchar *label_entry, int value); + +void ygtk_bar_graph_customize_bg (YGtkBarGraph *bar, int index, GdkColor *color); +void ygtk_bar_graph_customize_fg (YGtkBarGraph *bar, int index, GdkColor *color); G_END_DECLS #endif /*YGTK_BAR_GRAPH_H*/ @@ -86,12 +88,11 @@ // A convenience function (you may use gtk_widget_modify_fg() and // gtk_widget_modify_bg() instead), where colors range is [0, 255] -void ygtk_colored_label_set_foreground (YGtkColoredLabel *label, guint red, - guint green, guint blue); -void ygtk_colored_label_set_background (YGtkColoredLabel *label, guint red, - guint green, guint blue); +void ygtk_colored_label_set_foreground (YGtkColoredLabel *label, GdkColor *color); +void ygtk_colored_label_set_background (YGtkColoredLabel *label, GdkColor *color); void ygtk_colored_label_set_shadow_type (YGtkColoredLabel *label, GtkShadowType type); G_END_DECLS #endif /*YGTK_COLORED_LABEL*/ + Modified: trunk/gtk/src/ygtkratiobox.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.c?rev=52350… ============================================================================== --- trunk/gtk/src/ygtkratiobox.c (original) +++ trunk/gtk/src/ygtkratiobox.c Sun Oct 19 19:23:17 2008 @@ -163,14 +163,14 @@ GtkAllocation child_alloc; if (orientation == GTK_ORIENTATION_HORIZONTAL) { - child_alloc.x = child_pos; + child_alloc.x = allocation->x + child_pos; child_alloc.y = allocation->y; child_alloc.width = child_length; child_alloc.height = allocation->height; } else { // GTK_ORIENTATION_VERTICAL child_alloc.x = allocation->x; - child_alloc.y = child_pos; + child_alloc.y = allocation->y + child_pos; child_alloc.width = allocation->width; child_alloc.height = child_length; } @@ -215,20 +215,15 @@ G_DEFINE_TYPE (YGtkRatioHBox, ygtk_ratio_hbox, YGTK_TYPE_RATIO_BOX) static void ygtk_ratio_hbox_init (YGtkRatioHBox *box) -{ -} +{ } static void ygtk_ratio_hbox_size_request (GtkWidget *widget, GtkRequisition *requisition) -{ - ygtk_ratio_box_size_request (widget, requisition, GTK_ORIENTATION_HORIZONTAL); -} +{ ygtk_ratio_box_size_request (widget, requisition, GTK_ORIENTATION_HORIZONTAL); } static void ygtk_ratio_hbox_size_allocate (GtkWidget *widget, GtkAllocation *allocation) -{ - ygtk_ratio_box_size_allocate (widget, allocation, GTK_ORIENTATION_HORIZONTAL); -} +{ ygtk_ratio_box_size_allocate (widget, allocation, GTK_ORIENTATION_HORIZONTAL); } GtkWidget* ygtk_ratio_hbox_new (gint spacing) { @@ -251,20 +246,15 @@ G_DEFINE_TYPE (YGtkRatioVBox, ygtk_ratio_vbox, YGTK_TYPE_RATIO_BOX) static void ygtk_ratio_vbox_init (YGtkRatioVBox *box) -{ -} +{ } static void ygtk_ratio_vbox_size_request (GtkWidget *widget, GtkRequisition *requisition) -{ - ygtk_ratio_box_size_request (widget, requisition, GTK_ORIENTATION_VERTICAL); -} +{ ygtk_ratio_box_size_request (widget, requisition, GTK_ORIENTATION_VERTICAL); } static void ygtk_ratio_vbox_size_allocate (GtkWidget *widget, GtkAllocation *allocation) -{ - ygtk_ratio_box_size_allocate (widget, allocation, GTK_ORIENTATION_VERTICAL); -} +{ ygtk_ratio_box_size_allocate (widget, allocation, GTK_ORIENTATION_VERTICAL); } GtkWidget* ygtk_ratio_vbox_new (gint spacing) { Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=52350&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Sun Oct 19 19:23:17 2008 @@ -24,6 +24,9 @@ #define HELP_IMG_BG "yelp-icon-big" +// test feature: history on help dialog +#define SET_HELP_HISTORY + // YGUtils bridge extern void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); @@ -60,6 +63,7 @@ } static void search_entry_activated_cb (GtkEntry *entry, YGtkHelpDialog *dialog) { ygtk_help_dialog_find_next (dialog); } + static void close_button_clicked_cb (GtkButton *button, YGtkHelpDialog *dialog) { gtk_widget_hide (GTK_WIDGET (dialog)); } @@ -113,10 +117,20 @@ g_signal_connect (G_OBJECT (dialog->search_entry), "activate", G_CALLBACK (search_entry_activated_cb), dialog); +#ifdef SET_HELP_HISTORY + dialog->history_combo = gtk_combo_box_new_text(); +#endif + // glue it dialog->vbox = gtk_vbox_new (FALSE, 12); +#ifdef SET_HELP_HISTORY + GtkWidget *hbox = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (hbox), gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), dialog->history_combo, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (dialog->vbox), hbox, FALSE, TRUE, 0); +#endif gtk_box_pack_start (GTK_BOX (dialog->vbox), dialog->help_box, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (dialog->vbox), bottom_box, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (dialog->vbox), bottom_box, FALSE, TRUE, 0); gtk_container_add (GTK_CONTAINER (dialog), dialog->vbox); gtk_widget_show_all (dialog->vbox); @@ -151,6 +165,7 @@ { gtk_editable_delete_text (GTK_EDITABLE (dialog->search_entry), 0, -1); ygtk_html_wrap_set_text (dialog->help_text, text, FALSE); + ygtk_html_wrap_scroll (dialog->help_text, TRUE); } static void ygtk_help_dialog_class_init (YGtkHelpDialogClass *klass) @@ -176,6 +191,125 @@ gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "close", 0); } +typedef struct TitleTextPair { + gchar *title, *text; +} TitleTextPair; + +YGtkHelpText *ygtk_help_text_new (void) +{ return g_new0 (YGtkHelpText, 1); } + +void ygtk_help_text_destroy (YGtkHelpText *help) +{ + if (help->history) { + GList *i; + for (i = help->history; i; i = i->next) { + TitleTextPair *pair = i->data; + g_free (pair->title); + g_free (pair->text); + g_free (pair); + } + g_list_free (help->history); + help->history = 0; + } + if (help->dialog) { + gtk_widget_destroy (help->dialog); + help->dialog = 0; + } +} + +static gint compare_links (gconstpointer pa, gconstpointer pb) +{ + const TitleTextPair *a = pa, *b = pb; + return strcmp (a->text, b->text); +} + +void ygtk_help_text_set (YGtkHelpText *help, const gchar *title, const gchar *text) +{ + if (!*text) return; + TitleTextPair *pair = g_new (TitleTextPair, 1); + if (title) + pair->title = g_strdup (title); + else { + gboolean in_tag = FALSE; + GString *str = g_string_new (""); + const gchar *i; + for (i = text; *i; i++) { + if (*i == '<') + in_tag = TRUE; + else if (*i == '>') + in_tag = FALSE; + else if (*i == '\n') { + if (str->len) + break; + } + else if (!in_tag) + str = g_string_append_c (str, *i); + } + pair->title = g_string_free (str, FALSE); + } + pair->text = g_strdup (text); + + GList *i = g_list_find_custom (help->history, pair, (GCompareFunc) compare_links); + if (i) { + TitleTextPair *p = i->data; + g_free (p->text); + g_free (p->title); + g_free (p); + help->history = g_list_delete_link (help->history, i); + } + help->history = g_list_prepend (help->history, pair); + if (help->dialog) + ygtk_help_text_sync (help, NULL); +} + +const gchar *ygtk_help_text_get (YGtkHelpText *help, gint n) +{ + TitleTextPair *pair = g_list_nth_data (help->history, n); + if (pair) + return pair->text; + return NULL; +} + +#ifdef SET_HELP_HISTORY +static void history_changed_cb (GtkComboBox *combo, YGtkHelpText *text) +{ + YGtkHelpDialog *dialog = YGTK_HELP_DIALOG (text->dialog); + gint active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->history_combo)); + ygtk_help_dialog_set_text (dialog, ygtk_help_text_get (text, active)); +} +#endif + +void ygtk_help_text_sync (YGtkHelpText *help, GtkWidget *widget) +{ + YGtkHelpDialog *dialog; + if (!help->dialog) { + if (!widget) + return; +#ifdef SET_HELP_HISTORY + dialog = YGTK_HELP_DIALOG (widget); + g_signal_connect (G_OBJECT (dialog->history_combo), "changed", + G_CALLBACK (history_changed_cb), help); +#endif + help->dialog = widget; + } + dialog = YGTK_HELP_DIALOG (help->dialog); + ygtk_help_dialog_set_text (dialog, ygtk_help_text_get (help, 0)); + +#ifdef SET_HELP_HISTORY + g_signal_handlers_block_by_func (dialog->history_combo, history_changed_cb, help); + GtkListStore *store = GTK_LIST_STORE (gtk_combo_box_get_model ( + GTK_COMBO_BOX (dialog->history_combo))); + gtk_list_store_clear (store); + GList *i; + for (i = help->history; i; i = i->next) { + TitleTextPair *pair = i->data; + gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->history_combo), pair->title); + } + gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->history_combo), 0); + g_signal_handlers_unblock_by_func (dialog->history_combo, history_changed_cb, help); +#endif +} + //** Header typedef struct _YGtkWizardHeader @@ -263,6 +397,9 @@ static void ygtk_wizard_header_set_title (YGtkWizardHeader *header, const gchar *text) { gtk_label_set_text (GTK_LABEL (header->title), text); } +static const gchar *ygtk_wizard_header_get_title (YGtkWizardHeader *header) +{ return gtk_label_get_text (GTK_LABEL (header->title)); } + static void ygtk_wizard_header_set_description (YGtkWizardHeader *header, const gchar *text) { GString *str = g_string_new (""); @@ -405,11 +542,12 @@ { if (gtk_toggle_button_get_active (button)) ygtk_wizard_popup_help (wizard); - else if (wizard->m_help_dialog) - gtk_widget_hide (wizard->m_help_dialog); + else if (wizard->m_help->dialog) + gtk_widget_hide (wizard->m_help->dialog); } static void help_button_silent_set_active (YGtkWizard *wizard, gboolean active) { + if (!wizard->help_button) return; // unmap may be issued at destroy GtkToggleButton *button = GTK_TOGGLE_BUTTON (wizard->help_button); g_signal_handlers_block_by_func (button, (gpointer) help_button_toggled_cb, wizard); @@ -422,17 +560,16 @@ static void ygtk_wizard_popup_help (YGtkWizard *wizard) { - if (!wizard->m_help_dialog) { + if (!wizard->m_help->dialog) { GtkWindow *window = (GtkWindow *) gtk_widget_get_ancestor ( GTK_WIDGET (wizard), GTK_TYPE_WINDOW); - wizard->m_help_dialog = ygtk_help_dialog_new (window); - ygtk_help_dialog_set_text (YGTK_HELP_DIALOG (wizard->m_help_dialog), - wizard->m_help); - g_signal_connect (G_OBJECT (wizard->m_help_dialog), "unmap", + GtkWidget *dialog = ygtk_help_dialog_new (window); + g_signal_connect (G_OBJECT (dialog), "unmap", G_CALLBACK (help_dialog_unmap_cb), wizard); + ygtk_help_text_sync (wizard->m_help, dialog); } help_button_silent_set_active (wizard, TRUE); - gtk_window_present (GTK_WINDOW (wizard->m_help_dialog)); + gtk_window_present (GTK_WINDOW (wizard->m_help->dialog)); } static void more_clicked_cb (YGtkWizardHeader *header, YGtkWizard *wizard) @@ -554,18 +691,14 @@ GTK_OBJECT_CLASS (ygtk_wizard_parent_class)->destroy (object); YGtkWizard *wizard = YGTK_WIZARD (object); + wizard->help_button = NULL; // dialog unmap will try to access this destroy_hash (&wizard->menu_ids, FALSE); destroy_hash (&wizard->tree_ids, TRUE); destroy_hash (&wizard->steps_ids, FALSE); - if (wizard->m_help) { - g_free (wizard->m_help); + ygtk_help_text_destroy (wizard->m_help); wizard->m_help = NULL; } - if (wizard->m_help_dialog) { - gtk_widget_destroy (wizard->m_help_dialog); - wizard->m_help_dialog = NULL; - } } GtkWidget *ygtk_wizard_new (void) @@ -672,11 +805,12 @@ void ygtk_wizard_set_help_text (YGtkWizard *wizard, const gchar *text) { - if (wizard->m_help) - g_free (wizard->m_help); - wizard->m_help = g_strdup (text); - if (wizard->m_help_dialog) - ygtk_help_dialog_set_text (YGTK_HELP_DIALOG (wizard->m_help_dialog), text); + if (!wizard->m_help) + wizard->m_help = ygtk_help_text_new(); + const gchar *title = ygtk_wizard_header_get_title (YGTK_WIZARD_HEADER (wizard->m_title)); + if (!strcmp (title, "YaST")) + title = 0; + ygtk_help_text_set (wizard->m_help, title, text); ygtk_wizard_header_set_description (YGTK_WIZARD_HEADER (wizard->m_title), text); ENABLE_WIDGET_STR (text, wizard->help_button); } Modified: trunk/gtk/src/ygtkwizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=52350&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.h (original) +++ trunk/gtk/src/ygtkwizard.h Sun Oct 19 19:23:17 2008 @@ -15,6 +15,17 @@ #include <gtk/gtkvbox.h> G_BEGIN_DECLS +typedef struct YGtkHelpText { + GList *history; + GtkWidget *dialog; +} YGtkHelpText; + +YGtkHelpText *ygtk_help_text_new (void); +void ygtk_help_text_destroy (YGtkHelpText *help); +void ygtk_help_text_set (YGtkHelpText *help, const gchar *title, const gchar *text); +const gchar *ygtk_help_text_get (YGtkHelpText *help, gint n); +void ygtk_help_text_sync (YGtkHelpText *help, GtkWidget *dialog); + // YGtkHelpDialog (for showing help text) /* Shows help text. It is GtkWindow-inherited, rather than GtkDialog, because we want to place a search entry next to the buttons. */ @@ -35,10 +46,10 @@ { GtkWindow parent; - // parent: + // members: GtkWidget *title_box, *title_label, *title_image; GtkWidget *help_box, *help_text; - GtkWidget *search_entry, *close_button; + GtkWidget *search_entry, *close_button, *history_combo; GtkWidget *vbox; } YGtkHelpDialog; @@ -54,7 +65,7 @@ GtkWidget *ygtk_help_dialog_new (GtkWindow *parent); GType ygtk_help_dialog_get_type (void) G_GNUC_CONST; -void ygtk_help_dialog_set_text (YGtkHelpDialog *dialog, const char *text); +void ygtk_help_dialog_set_text (YGtkHelpDialog *dialog, const gchar *text); // YGtkWizard @@ -90,8 +101,7 @@ *release_notes_button; /* The help text. */ - gchar *m_help; - GtkWidget *m_help_dialog; + YGtkHelpText *m_help; } YGtkWizard; typedef struct _YGtkWizardClass @@ -158,3 +168,4 @@ G_END_DECLS #endif /* YGTK_WIZARD_H */ + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52349 - in /trunk/gtk: ChangeLog src/YGFrame.cc src/YGLabel.cc src/YGPackageSelector.cc src/YGUI.cc src/YGUtils.cc src/YGUtils.h src/YGWidget.cc src/ygtkwizard.c
by rpmcruz＠svn.opensuse.org 18 Oct '08

18 Oct '08

Author: rpmcruz Date: Sun Oct 19 00:23:18 2008 New Revision: 52349 URL: http://svn.opensuse.org/viewcvs/yast?rev=52349&view=rev Log: * src/YGUtils.h/cc: added PangoStyle (for italic) option to setWidgetFont() utility. * src/YGLabel.cc: do italic for outputField. And set selectable for multi-line labels. * src/YGUI.cc: enhancement fix for bug 335492: the person found difficult to nagivate to / from the GTK file selector dialog. Adding / to the side pane, in case it's not there. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGFrame.cc trunk/gtk/src/YGLabel.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/YGWidget.cc trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52349&r1=52348… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Oct 19 00:23:18 2008 @@ -1,3 +1,15 @@ +2008-10-18 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGUtils.h/cc: added PangoStyle (for italic) option to + setWidgetFont() utility. + + * src/YGLabel.cc: do italic for outputField. And set selectable for + multi-line labels. + + * src/YGUI.cc: enhancement fix for bug 335492: the person found + difficult to nagivate to / from the GTK file selector dialog. + Adding / to the side pane, in case it's not there. + 2008-10-16 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (PackagesView): support non-edit mode. Modified: trunk/gtk/src/YGFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGFrame.cc?rev=52349&r1=… ============================================================================== --- trunk/gtk/src/YGFrame.cc (original) +++ trunk/gtk/src/YGFrame.cc Sun Oct 19 00:23:18 2008 @@ -77,8 +77,8 @@ g_signal_connect (G_OBJECT (label_widget), "mnemonic_activate", G_CALLBACK (frame_label_mnemonic_activate), getWidget()); - YGUtils::setWidgetFont (GTK_WIDGET (label_widget), PANGO_WEIGHT_BOLD, - PANGO_SCALE_MEDIUM); + YGUtils::setWidgetFont (GTK_WIDGET (label_widget), PANGO_STYLE_NORMAL, + PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); gtk_widget_show (label_widget); gtk_frame_set_label_widget (GTK_FRAME (getWidget()), label_widget); setLabel (label); @@ -123,8 +123,8 @@ { IMPL GtkWidget *button = gtk_check_button_new_with_mnemonic(""); - YGUtils::setWidgetFont (gtk_bin_get_child (GTK_BIN (button)), PANGO_WEIGHT_BOLD, - PANGO_SCALE_MEDIUM); + YGUtils::setWidgetFont (gtk_bin_get_child (GTK_BIN (button)), PANGO_STYLE_NORMAL, + PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); gtk_widget_show_all (button); gtk_frame_set_label_widget (GTK_FRAME (getWidget()), button); Modified: trunk/gtk/src/YGLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLabel.cc?rev=52349&r1=… ============================================================================== --- trunk/gtk/src/YGLabel.cc (original) +++ trunk/gtk/src/YGLabel.cc Sun Oct 19 00:23:18 2008 @@ -21,9 +21,12 @@ if (outputField) { gtk_label_set_selectable (GTK_LABEL (getWidget()), TRUE); gtk_label_set_single_line_mode (GTK_LABEL (getWidget()), TRUE); + YGUtils::setWidgetFont (getWidget(), PANGO_STYLE_ITALIC, PANGO_WEIGHT_NORMAL, + PANGO_SCALE_MEDIUM); } if (heading) - YGUtils::setWidgetFont (getWidget(), PANGO_WEIGHT_BOLD, PANGO_SCALE_LARGE); + YGUtils::setWidgetFont (getWidget(), PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, + PANGO_SCALE_LARGE); setLabel (text); } @@ -31,6 +34,15 @@ { YLabel::setText (label); gtk_label_set_label (GTK_LABEL (getWidget()), label.c_str()); + std::string::size_type i = label.find ('\n', 0); + if (isOutputField()) { // must not have a breakline + if (i != std::string::npos) { + std::string l (label, 0, i); + gtk_label_set_label (GTK_LABEL (getWidget()), l.c_str()); + } + } + else + gtk_label_set_selectable (GTK_LABEL (getWidget()), i != std::string::npos); } YGWIDGET_IMPL_COMMON Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Sun Oct 19 00:23:18 2008 @@ -814,7 +814,7 @@ : m_entries (NULL), m_wizard (wizard) { GtkWidget *heading = gtk_label_new (_("Changes:")); - YGUtils::setWidgetFont (heading, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + YGUtils::setWidgetFont (heading, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); gtk_misc_set_alignment (GTK_MISC (heading), 0, 0.5); m_entries_box = gtk_vbox_new (FALSE, 4); @@ -1093,7 +1093,7 @@ if (!m_patchMode) { GtkWidget *check = gtk_check_button_new_with_label (_("Detailed")); YGUtils::setWidgetFont (GTK_BIN (check)->child, - PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); + PANGO_STYLE_NORMAL, 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.")); @@ -1183,7 +1183,7 @@ GtkWidget *align, *button, *box, *image, *label; image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); label = gtk_label_new (_("Edit...")); - YGUtils::setWidgetFont (label, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); + YGUtils::setWidgetFont (label, PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); box = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (box), image, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); @@ -1927,7 +1927,7 @@ static GtkWidget *createBoldLabel (const char *text) { GtkWidget *label = gtk_label_new (text); - YGUtils::setWidgetFont (label, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + YGUtils::setWidgetFont (label, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); return label; } Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=52349&r1=523… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Sun Oct 19 00:23:18 2008 @@ -448,8 +448,9 @@ YGDialog::currentWindow(), action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, action == GTK_FILE_CHOOSER_ACTION_SAVE ? GTK_STOCK_SAVE : GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), TRUE); - gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); + GtkFileChooser *fileChooser = GTK_FILE_CHOOSER (dialog); + gtk_file_chooser_set_local_only (fileChooser, TRUE); + gtk_file_chooser_set_do_overwrite_confirmation (fileChooser, TRUE); // filepath can be a dir or a file path, split that up string dirname, filename; @@ -470,9 +471,9 @@ } if (!dirname.empty()) - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname.c_str()); + gtk_file_chooser_set_current_folder (fileChooser, dirname.c_str()); if (!filename.empty()) - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename.c_str()); + gtk_file_chooser_set_current_name (fileChooser, filename.c_str()); if (!filter.empty() && filter != "*") { GtkFileFilter *gtk_filter = gtk_file_filter_new(); @@ -486,12 +487,16 @@ str.erase (str.size()-1); gtk_file_filter_add_pattern (gtk_filter, str.c_str()); } - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), gtk_filter); + gtk_file_chooser_add_filter (fileChooser, gtk_filter); } + // bug 335492: because "/" gets hidden as a an arrow at the top, make sure + // there is a root shortcut at the side pane (will not add if already exists) + gtk_file_chooser_add_shortcut_folder (fileChooser, "/", NULL); + std::string ret; if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - char* filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + gchar *filename = gtk_file_chooser_get_filename (fileChooser); ret = filename; g_free (filename); } Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=52349&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Sun Oct 19 00:23:18 2008 @@ -197,19 +197,21 @@ return PANGO_PIXELS (height) * chars_nb; } -void YGUtils::setWidgetFont (GtkWidget *widget, PangoWeight weight, double scale) +void YGUtils::setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, + double scale) { PangoFontDescription *font_desc = widget->style->font_desc; int size = pango_font_description_get_size (font_desc); PangoFontDescription* font = pango_font_description_new(); pango_font_description_set_weight (font, weight); pango_font_description_set_size (font, (int)(size * scale)); + pango_font_description_set_style (font, style); gtk_widget_modify_font (widget, font); pango_font_description_free (font); } -void ygutils_setWidgetFont (GtkWidget *widget, PangoWeight weight, double scale) -{ YGUtils::setWidgetFont (widget, weight, scale); } +void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale) +{ YGUtils::setWidgetFont (widget, style, weight, scale); } GdkPixbuf *YGUtils::loadPixbuf (const string &filename) { Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=52349&r1=5… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Sun Oct 19 00:23:18 2008 @@ -39,7 +39,7 @@ int getCharsHeight (GtkWidget *widget, int chars_nb); /* Sets some widget font proprities. */ - void setWidgetFont (GtkWidget *widget, PangoWeight weight, double scale); + void setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); /* Saves some code and standardizes the error. Returns NULL if failed. Don't forget to g_object_unref it! */ @@ -54,7 +54,7 @@ }; extern "C" { - void ygutils_setWidgetFont (GtkWidget *widget, PangoWeight weight, double scale); + void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); void ygutils_setFilter (GtkEntry *entry, const char *validChars); Modified: trunk/gtk/src/YGWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.cc?rev=52349&r1… ============================================================================== --- trunk/gtk/src/YGWidget.cc (original) +++ trunk/gtk/src/YGWidget.cc Sun Oct 19 00:23:18 2008 @@ -97,7 +97,7 @@ void YGWidget::doSetUseBoldFont (bool useBold) { PangoWeight weight = useBold ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL; - YGUtils::setWidgetFont (getWidget(), weight, PANGO_SCALE_MEDIUM); + YGUtils::setWidgetFont (getWidget(), PANGO_STYLE_NORMAL, weight, PANGO_SCALE_MEDIUM); } void YGWidget::doAddChild (YWidget *ychild, GtkWidget *container) Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=52349&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Sun Oct 19 00:23:18 2008 @@ -25,8 +25,8 @@ #define HELP_IMG_BG "yelp-icon-big" // YGUtils bridge -extern void ygutils_setWidgetFont (GtkWidget *widget, PangoWeight weight, - double scale); +extern void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, + PangoWeight weight, double scale); extern gboolean ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon); extern GdkPixbuf *ygutils_setOpacity (const GdkPixbuf *src, int opacity); @@ -224,7 +224,8 @@ header->title = gtk_label_new ("YaST"); gtk_label_set_ellipsize (GTK_LABEL (header->title), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment (GTK_MISC (header->title), 0, 0.5); - ygutils_setWidgetFont (header->title, PANGO_WEIGHT_BOLD, PANGO_SCALE_X_LARGE); + ygutils_setWidgetFont (header->title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, + PANGO_SCALE_X_LARGE); header->description = ygtk_link_label_new ("", _("more")); g_signal_connect (G_OBJECT (header->description), "link-clicked", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52348 - in /trunk/apparmor: VERSION package/yast2-apparmor.changes src/include/subdomain/report_helptext.ycp
by aschnell＠svn.opensuse.org 18 Oct '08

18 Oct '08

Author: aschnell Date: Sat Oct 18 10:05:33 2008 New Revision: 52348 URL: http://svn.opensuse.org/viewcvs/yast?rev=52348&view=rev Log: - Fixed help text (bnc #436491) Modified: trunk/apparmor/VERSION trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/src/include/subdomain/report_helptext.ycp Modified: trunk/apparmor/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/VERSION?rev=52348&r1=52… ============================================================================== --- trunk/apparmor/VERSION (original) +++ trunk/apparmor/VERSION Sat Oct 18 10:05:33 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Sat Oct 18 10:05:33 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Oct 18 10:04:31 CEST 2008 - aschnell(a)suse.de + +- Fixed help text (bnc #436491) +- 2.17.3 + +------------------------------------------------------------------- Mon Oct 13 10:27:37 CEST 2008 - locilka(a)suse.cz - Fixed help texts (bnc#430521). Modified: trunk/apparmor/src/include/subdomain/report_helptext.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/r… ============================================================================== --- trunk/apparmor/src/include/subdomain/report_helptext.ycp (original) +++ trunk/apparmor/src/include/subdomain/report_helptext.ycp Sat Oct 18 10:05:33 2008 @@ -15,7 +15,7 @@ string setArchHelp = _("The Report Configuration dialog enables you to filter the archived report selected in the previous screen. To filter by Date Range: <ol> <li>Click Filter By Date Range. The fields become active. <li>Enter the start and end dates that delineate the scope of the report. <li>Enter other filtering parameters. See below for definitions of parameters. </ol> The following definitions help you to enter the filtering parameters in the Report Configuration Dialog: Program Name Pattern: When you enter a program name or pattern that matches the name of the binary executable of the program of interest, the report will display security events that have occurred for a specific program. Profile Name Pattern: When you enter the name of the profile, the report will display the security events that are generated for the specified profile. You can use this to see what is being confined by a specific profile. PID Number: Process ID number is a number that uniquely identifies one specific process or running program (this number is valid only during the lifetime of that process). Severity Level: Select the lowest severity level for security events that you would like to be included in the report. The selected severity level, and above, will be included in the reports. Detail: A source to which the profile has denied access. This includes capabilities and files. You can use this field to report the resources are not allowed to be accessed by profiles. Mode: The Mode is the permission that the profile grants to the program or process to which it is applied. The options are: r (read) w (write) l (link) x (execute) Access Type: The access type describes what is actually happening with the security event. The options are: PERMITTING, REJECTING, or AUDITING. CSV or HTML: Enables you to export a CSV (comma separated values) or html file. The CSV file separates pieces of data in the log entries with commas using a standard data format for importing into table-oriented applications. You can enter a pathname for your exported report by typing in the full pathname in the field provided."); -string runHelp = _("The AppArmor On-Demand Report screen displays an instantly generated version of one of the following reports. Executive Security Summary: A combined report, consisting of one or more Security incident reports from one or more machines. This report provides a single view of security events on multiple machines. Applications Audit Report: An auditing tool that reports which application servers are running and whether the applications are confined by AppArmor. Application servers are applications that accept incoming network connections. Security Incident Report: A report that displays application security for a single host. It reports policy violations for locally confined applications during a specific time period. You can edit and customize this report, or add new versions.</p"); +string runHelp = _("The AppArmor On-Demand Report screen displays an instantly generated version of one of the following reports. Executive Security Summary: A combined report, consisting of one or more Security incident reports from one or more machines. This report provides a single view of security events on multiple machines. Applications Audit Report: An auditing tool that reports which application servers are running and whether the applications are confined by AppArmor. Application servers are applications that accept incoming network connections. Security Incident Report: A report that displays application security for a single host. It reports policy violations for locally confined applications during a specific time period. You can edit and customize this report, or add new versions."); string filterCfHelp1 = _("The Report Configuration dialog enables you to filter the report selected in the previous screen. To filter by Date Range: <ol> <li>Click Filter By Date Range. The fields become active. <li>Enter the start and end dates that delineate the scope of the report. <li>Enter other filtering parameters. See below for definitions of parameters. </ol> The following definitions help you to enter the filtering parameters in the Report Configuration Dialog: Program Name Pattern: When you enter a program name or pattern that matches the name of the executable process of interest, the report will display security events that have occurred for a specific program. Profile Name Pattern: When you enter the name of the security profile that is applied to the process, the report will display the security events that are generated for the specified profile. You can use this to see what is being confined by a specific profile. PID Number: Process ID number is a number that uniquely identifies one specific process or running program (this number is valid only during the lifetime of that process). Severity Level: Select the lowest severity level for security events that you would like to be included in the report. The selected severity level, and above, will be included in the reports. Detail: A source to which the profile has denied access. This includes capabilities and files. You can use this field to report the resources are not allowed to be accessed by profiles. Mode: The Mode is the permission that the profile grants to the program or process to which it is applied. The options are: r (read) w (write) l (link) x (execute) Access Type: The access type describes what is actually happening with the security event. The options are: PERMITTING, REJECTING, or AUDITING. CSV or HTML: Enables you to export a CSV (comma separated values) or HTML file. The CSV file separates pieces of data in the log entries with commas using a standard data format for importing into table-oriented applications. You can enter a pathname for your exported report by typing in the full pathname in the field provided."); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52347 - /tags/stable-2_17_7/registration/
by jdsn＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: jdsn Date: Fri Oct 17 21:14:37 2008 New Revision: 52347 URL: http://svn.opensuse.org/viewcvs/yast?rev=52347&view=rev Log: Created tag stable-2_17_7 for registration Added: tags/stable-2_17_7/registration/ - copied from r52346, trunk/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52346 - in /trunk/registration: VERSION package/yast2-registration.changes src/modules/Register.ycp yast2-registration.spec.in
by jdsn＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: jdsn Date: Fri Oct 17 21:14:26 2008 New Revision: 52346 URL: http://svn.opensuse.org/viewcvs/yast?rev=52346&view=rev Log: - changing repos and services only via pkg-bindings (bnc#435669) - 2.17.7 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/modules/Register.ycp trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52346&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Fri Oct 17 21:14:26 2008 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri Oct 17 21:14:26 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 17 19:22:24 CEST 2008 - jdsn(a)suse.de + +- changing repos and services only via pkg-bindings (bnc#435669) +- 2.17.7 + +------------------------------------------------------------------- Fri Oct 17 18:03:34 CEST 2008 - jdsn(a)suse.de - fix to display correct text in manual interaction (bnc#435869) Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Registe… ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Fri Oct 17 21:14:26 2008 @@ -900,8 +900,8 @@ global list<string> checkCatalogs(map<string, any> taskList, string service) { list<string> cSummary = []; - map<string, list<string> > catalogToEnable = $[]; - map<string, list<string> > catalogToDisable = $[]; + list<string> catalogToEnable = []; + list<string> catalogToDisable = []; foreach (string catalog, any pAny, taskList, { if ( ! is(pAny, map) ) @@ -937,13 +937,13 @@ else if ( catDetail["TASK"]:"" == "a" ) { y2milestone("According to SuseRegister a catalog has to be enabled: %1 (%2)", catalog, service); - catalogToEnable[service] = add(catalogToEnable[service]:[], catalog); + catalogToEnable = add(catalogToEnable, catalog); cSummary = add(cSummary, sformat(_("Enabled catalog: %1 (%2)"), catalog, service) ); } else if ( catDetail["TASK"]:"" == "d" ) { y2milestone("According to SuseRegister a service has to be disabled: %1 (%2)", catalog, service); - catalogToDisable[service] = add(catalogToDisable[service]:[], catalog); + catalogToDisable = add(catalogToDisable, catalog); cSummary = add(cSummary, sformat(_("Disabled catalog: %1 (%2)"), catalog, service) ); } else @@ -955,41 +955,23 @@ } }); - // FIXME: this should be done via the Pkg API - but these function is not available yet - so do it manually for now - foreach (string fService, list<string> fCatalogs, catalogToDisable, { - string toDisableString = "\"" + mergestring(fCatalogs, "\" \"") + "\""; - integer retval = (integer) SCR::Execute(.target.bash, sformat(" [ -f /etc/zypp/services.d/%1.service ] && cat >> /etc/zypp/services.d/%2.service <<THISISTHEENDOFTHEFILE -repostodisable = %3 -THISISTHEENDOFTHEFILE", service, service, toDisableString )); - - if ( retval == 0 ) - { - y2milestone("According to SuseRegister these catalogs were disabled: %1 (%2)", toDisableString, service); - } - else - { - y2error("Catalogs returned by SuseRegister could not be disabled: %1 (%2)", toDisableString, service); - repoUpdateSuccessful = false; - } - }); - - // FIXME: this should be done via the Pkg API - but these function is not available yet - so do it manually for now - foreach (string fService, list<string> fCatalogs, catalogToEnable, { - string toEnableString = "\"" + mergestring(fCatalogs, "\" \"") + "\""; - integer retval = (integer) SCR::Execute(.target.bash, sformat(" [ -f /etc/zypp/services.d/%1.service ] && cat >> /etc/zypp/services.d/%2.service <<THISISTHEENDOFTHEFILE -repostoenable = %3 -THISISTHEENDOFTHEFILE", service, service, toEnableString )); - - if ( retval == 0 ) - { - y2milestone("According to SuseRegister these catalogs were enabled: %1 (%2)", toEnableString, service); - } - else - { - y2error("Catalogs returned by SuseRegister could not be enabled: %1 (%2)", toEnableString, service); - repoUpdateSuccessful = false; - } - }); + map<string, any> serviceDetails = $[]; + serviceDetails = (map<string, any>) Pkg::ServiceGet(service); + serviceDetails["repos_to_enable"] = catalogToEnable; + serviceDetails["repos_to_disable"] = catalogToDisable; + + if ( Pkg::ServiceSet(service, serviceDetails) ) + { + y2milestone("Successfully updated the catalog settings of service: %1", service); + y2milestone("Set repostoenable: %1 (%2)", catalogToEnable, service); + y2milestone("Set repostodisable: %1 (%2)", catalogToDisable, service); + // saving the service is (resp. has to be) done after calling checkCatalogs() + } + else + { + y2error("Could not update the catalog settings of service: %1", service); + repoUpdateSuccessful = false; + } return cSummary; } @@ -1144,14 +1126,25 @@ repoUpdateSuccessful = false; } - // we may have changed something - so lets refresh now - if ( Pkg::ServiceRefresh(pService) ) + // we may have changed something - so lets save and refresh now + // because the Pkg bindings do not operate on the system directly we need to save them before we can continue + if ( Pkg::ServiceSave(pService) ) { - y2milestone("Successfully refreshed service: %1", pService); + y2milestone("Successfully saved service: %1.", pService); + + if ( Pkg::ServiceRefresh(pService) ) + { + y2milestone("Successfully refreshed service: %1", pService); + } + else + { + y2error("Could not refresh service: %1", pService); + } } else { - y2error("Could not refresh service: %1", pService); + y2error("Could not save a service to the system: %1", pService); + repoUpdateSuccessful = false; } } @@ -1175,27 +1168,26 @@ y2milestone("Now checking the catalogs of the service: %1", pService); summary = add(summary, sformat(_("Added Service: %1"), pService )); + // then iterate over catalogs + any catalogsMap = ((map) pAny)["CATALOGS"]:$[]; + if ( is( catalogsMap , map) && catalogsMap != $[] ) + { + y2milestone("A new service returned by SuseRegister has catalogs that will be checked now."); + list<string> cSummary = checkCatalogs( (map<string, any>) catalogsMap, pService ); + summary = (list<string>) merge(summary, cSummary); + } + else + { + y2error("A new service returned by SuseRegister did not contain any catalogs."); + repoUpdateSuccessful = false; + } + + // we may have changed something - so lets save and refresh now // because the Pkg bindings do not operate on the system directly we need to save them before we can continue -// if ( Pkg::ServiceSave(pService) ) // function not yet available - if ( Pkg::SourceSaveAll() ) + if ( Pkg::ServiceSave(pService) ) { y2milestone("Successfully saved service: %1.", pService); - // then iterate over catalogs - any catalogsMap = ((map) pAny)["CATALOGS"]:$[]; - if ( is( catalogsMap , map) && catalogsMap != $[] ) - { - y2milestone("A new service returned by SuseRegister has catalogs that will be checked now."); - list<string> cSummary = checkCatalogs( (map<string, any>) catalogsMap, pService ); - summary = (list<string>) merge(summary, cSummary); - } - else - { - y2error("A new service returned by SuseRegister did not contain any catalogs."); - repoUpdateSuccessful = false; - } - - // we may have changed something - so lets refresh now if ( Pkg::ServiceRefresh(pService) ) { y2milestone("Successfully refreshed service: %1", pService); @@ -1207,7 +1199,7 @@ } else { - y2error("Could not save services to the system."); + y2error("Could not save a service to the system: %1", pService); repoUpdateSuccessful = false; } } @@ -1259,11 +1251,19 @@ // we can not refresh in autoYaST mode as it may require manual interaction to import keys if ( doRefresh ) { - list<integer> currentSources = Pkg::SourceGetCurrent( true ); - foreach (integer srcID, currentSources, { + y2milestone("Changes to the repositories and services were successful. Now refreshing all of them."); + + list<integer> currentNewSources = Pkg::SourceGetCurrent( true ); + foreach (integer srcID, currentNewSources, { y2milestone("Refreshing source with ID: %1", srcID); Pkg::SourceForceRefreshNow(srcID); }); + + list<string> currentNewServices = Pkg::ServiceAliases(); + foreach ( string serviceAlias, currentNewServices, { + y2milestone("Refreshing service with Alias: %1", serviceAlias); + Pkg::ServiceRefresh(serviceAlias); + }); } } @@ -1289,6 +1289,8 @@ global integer suseRegister(symbol parameter) { list<integer> allCurrentSources = []; + list<string> allCurrentServices = []; + map<string, any> contextData = $[ "debug" : 0, "nooptional" : (submit_optional ? 0:1), @@ -1296,6 +1298,7 @@ "forceregistration" : (force_registration ? 1:0), "norefresh" : 1, "yastcall" : 1, + "restoreRepos" : 1, // (#309231) "logfile" : "/root/.suse_register.log" ]; y2milestone("Basic initialization data for SuseRegister (custom registration data is suppressed for security reasons): %1", contextData); @@ -1327,12 +1330,19 @@ y2milestone("Successfully initialized the target."); isInitializedTarget = true; - // refresh all sources/services _once_ before interacting with SuseRegister + // refresh all sources _once_ before interacting with SuseRegister allCurrentSources = Pkg::SourceStartCache(true); foreach ( integer srcID, allCurrentSources, { y2milestone("Refreshing source with ID: %1", srcID); Pkg::SourceForceRefreshNow(srcID); }); + + // refresh all services _once_ before interacting with SuseRegister + allCurrentServices = Pkg::ServiceAliases(); + foreach ( string serviceAlias, allCurrentServices, { + y2milestone("Refreshing service with Alias: %1", serviceAlias); + Pkg::ServiceRefresh(serviceAlias); + }); } // initialize SuseRegister Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.… ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Fri Oct 17 21:14:26 2008 @@ -6,13 +6,14 @@ Requires: suseRegister Requires: mozilla-xulrunner190 Requires: perl-TimeDate limal limal-perl limal-ca-mgm-perl -Requires: yast2-pkg-bindings +Requires: yast2-pkg-bindings >= 2.17.20 PreReq: %fillup_prereq BuildRequires: yast2 >= 2.17.0 BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager BuildRequires: perl-TimeDate limal limal-perl limal-ca-mgm-perl +BuildRequires: yast2-pkg-bindings >= 2.17.20 BuildRequires: suseRegister sles-release BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52345 - /tags/stable-2_17_6/registration/
by jdsn＠svn.opensuse.org 17 Oct '08

17 Oct '08

Author: jdsn Date: Fri Oct 17 18:40:41 2008 New Revision: 52345 URL: http://svn.opensuse.org/viewcvs/yast?rev=52345&view=rev Log: Created tag stable-2_17_6 for registration Added: tags/stable-2_17_6/registration/ - copied from r52344, trunk/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0