November 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r53757 - in /trunk/gtk: VERSION package/yast2-gtk.changes
by coolo＠svn.opensuse.org 30 Nov '08

30 Nov '08

Author: coolo Date: Sun Nov 30 20:56:09 2008 New Revision: 53757 URL: http://svn.opensuse.org/viewcvs/yast?rev=53757&view=rev Log: autobuild Modified: trunk/gtk/VERSION trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=53757&r1=53756&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Sun Nov 30 20:56:09 2008 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sun Nov 30 20:56:09 2008 @@ -3,6 +3,7 @@ * fixes to cope with Arabic and other languages of a right-to-left writing style. + * 2.17.8 ------------------------------------------------------------------- Wed Nov 21 10:25:17 CET 2008 - coolo(a)suse.de -- 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] r53756 - /trunk/gtk/package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 30 Nov '08

30 Nov '08

Author: rpmcruz Date: Sun Nov 30 20:49:33 2008 New Revision: 53756 URL: http://svn.opensuse.org/viewcvs/yast?rev=53756&view=rev Log: Package line. Modified: trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Sun Nov 30 20:49:33 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 01 10:25:17 CET 2008 - coolo(a)suse.de + + * fixes to cope with Arabic and other languages of + a right-to-left writing style. + +------------------------------------------------------------------- Wed Nov 21 10:25:17 CET 2008 - coolo(a)suse.de * fixed online update (bnc#446352) -- 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] r53755 - in /trunk/gtk: ChangeLog src/ygtkwizard.c
by rpmcruz＠svn.opensuse.org 30 Nov '08

30 Nov '08

Author: rpmcruz Date: Sun Nov 30 05:18:57 2008 New Revision: 53755 URL: http://svn.opensuse.org/viewcvs/yast?rev=53755&view=rev Log: * src/ygtkwizard.c: ensure header text is black to contrast with the white background (independent of style). Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53755&r1=53754… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Nov 30 05:18:57 2008 @@ -1,3 +1,8 @@ +2008-11-30 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkwizard.c: ensure header text is black to contrast with the + white background (independent of style). + 2008-11-28 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGBarGraph.cc (YPartitionSplitter): fix for arabic: tell GTK Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=53755&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Sun Nov 30 05:18:57 2008 @@ -373,10 +373,13 @@ gtk_misc_set_alignment (GTK_MISC (header->title), 0, 0.5); ygutils_setWidgetFont (header->title, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_X_LARGE); + GdkColor black = { 0, 0, 0, 0 }; // set text to black cause of some style colors + gtk_widget_modify_fg (header->title, GTK_STATE_NORMAL, &black); header->description = ygtk_link_label_new ("", _("more")); g_signal_connect (G_OBJECT (header->description), "link-clicked", G_CALLBACK (description_link_clicked_cb), header); + gtk_widget_modify_fg (header->description, GTK_STATE_NORMAL, &black); header->icon = gtk_image_new(); @@ -401,6 +404,8 @@ static void ygtk_wizard_header_class_init (YGtkWizardHeaderClass *klass) { + ygtk_wizard_header_parent_class = g_type_class_peek_parent (klass); + more_clicked_signal = g_signal_new ("more-clicked", G_TYPE_FROM_CLASS (G_OBJECT_CLASS (klass)), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (YGtkWizardHeaderClass, more_clicked), NULL, NULL, -- 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] r53754 - in /branches/tmp/coolo/update_yast_repo: last_rev_yast last_rev_zypp
by coolo＠svn.opensuse.org 29 Nov '08

29 Nov '08

Author: coolo Date: Sat Nov 29 10:35:37 2008 New Revision: 53754 URL: http://svn.opensuse.org/viewcvs/yast?rev=53754&view=rev Log: this didn't ran in a while Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast branches/tmp/coolo/update_yast_repo/last_rev_zypp Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Sat Nov 29 10:35:37 2008 @@ -1 +1 @@ -52455 +53754 Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_zypp (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_zypp Sat Nov 29 10:35:37 2008 @@ -1 +1 @@ -11775 +11836 -- 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] r53753 - in /trunk/gtk: ChangeLog src/YGComboBox.cc src/YGLayout.cc src/YGPushButton.cc src/YGUtils.cc
by rpmcruz＠svn.opensuse.org 29 Nov '08

29 Nov '08

Author: rpmcruz Date: Sat Nov 29 02:07:23 2008 New Revision: 53753 URL: http://svn.opensuse.org/viewcvs/yast?rev=53753&view=rev Log: * src/YGLayout.cc, src/YGPushButton.cc & src/YGComboBox.cc: realize doesn't seem very reliable, so was using timeouts. Those can get trigger while the widget is destroyed though which can mean trouble. Use expose then disconnect. Also moved stock button stuff from YGLayout.cc to YGPushButton.cc. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGComboBox.cc trunk/gtk/src/YGLayout.cc trunk/gtk/src/YGPushButton.cc trunk/gtk/src/YGUtils.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53753&r1=53752… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sat Nov 29 02:07:23 2008 @@ -48,6 +48,12 @@ * src/YGLayout.cc: bug fix 446524: disable those orphan icon buttons in the middle of a box. + * src/YGLayout.cc, src/YGPushButton.cc & src/YGComboBox.cc: realize + doesn't seem very reliable, so was using timeouts. Those can get + trigger while the widget is destroyed though which can mean trouble. + Use expose then disconnect. Also moved stock button stuff from + YGLayout.cc to YGPushButton.cc. + 2008-11-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkwizard.c: don't show "more" link on help line if the rest Modified: trunk/gtk/src/YGComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGComboBox.cc?rev=53753&… ============================================================================== --- trunk/gtk/src/YGComboBox.cc (original) +++ trunk/gtk/src/YGComboBox.cc Sat Nov 29 02:07:23 2008 @@ -37,8 +37,9 @@ connect (getWidget(), "changed", G_CALLBACK (selected_changed_cb), this); - // realize doesn't seem to work, so... - g_timeout_add_full (G_PRIORITY_LOW, 500, realize_cb, this, NULL); + // realize doesn't seem reliable -- expose then disconnect + g_signal_connect (G_OBJECT (getWidget()), "expose-event", + G_CALLBACK (realize_cb), this); } inline GtkComboBox *getComboBox() @@ -130,15 +131,16 @@ YGLABEL_WIDGET_IMPL_SET_LABEL_CHAIN (YComboBox) YGSELECTION_WIDGET_IMPL_ALL (YComboBox) - static gboolean realize_cb (gpointer pData) + static gboolean realize_cb (GtkWidget *widget, GdkEventExpose *event, + YGComboBox *pThis) { // some combo boxes have too many items -- wrap the thing in columns - YGComboBox *pThis = (YGComboBox *) pData; int rows; pThis->getMaxDepth (&rows); - int cols = MIN (rows / 20, 3) + 1; + int cols = MIN (rows / 20, 5) + 1; if (cols > 1) // this changes the popup width, so only set it for cols > 1 gtk_combo_box_set_wrap_width (pThis->getComboBox(), cols); + g_signal_handlers_disconnect_by_func (widget, (gpointer) realize_cb, pThis); return FALSE; } }; Modified: trunk/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=53753&r1… ============================================================================== --- trunk/gtk/src/YGLayout.cc (original) +++ trunk/gtk/src/YGLayout.cc Sat Nov 29 02:07:23 2008 @@ -78,9 +78,6 @@ { setBorder (0); YGLAYOUT_INIT - if (dim == YD_HORIZ) - // realize doesn't seem to work, so... - g_timeout_add_full (G_PRIORITY_LOW, 50, treat_button_icons_cb, this, NULL); } virtual void addChild (YWidget *ychild) @@ -93,26 +90,6 @@ YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) YGLAYOUT_PREFERRED_SIZE_IMPL (YLayoutBox) YGLAYOUT_SET_SIZE_IMPL (YLayoutBox) - - static gboolean treat_button_icons_cb (gpointer pData) - { - YGLayoutBox *pThis = (YGLayoutBox *) pData; - // only set stock icons if all to the left have them - bool enable = true; - for (YWidgetListConstIterator it = pThis->childrenBegin(); - it != pThis->childrenEnd(); it++) { - YPushButton *ybutton = dynamic_cast <YPushButton *> (*it); - if (ybutton) { - GtkWidget *button = YGWidget::get (ybutton)->getWidget(); - GtkWidget *icon = gtk_button_get_image (GTK_BUTTON (button)); - if (enable) - enable = icon != NULL; - else if (icon) - gtk_widget_hide (icon); - } - } - return FALSE; - } }; YLayoutBox *YGWidgetFactory::createLayoutBox (YWidget *parent, YUIDimension dimension) Modified: trunk/gtk/src/YGPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPushButton.cc?rev=5375… ============================================================================== --- trunk/gtk/src/YGPushButton.cc (original) +++ trunk/gtk/src/YGPushButton.cc Sat Nov 29 02:07:23 2008 @@ -4,10 +4,12 @@ #include <config.h> #include <YGUI.h> -#include "YPushButton.h" +#include <YPushButton.h> #include "YGUtils.h" #include "YGWidget.h" +#include <YLayoutBox.h> + class YGPushButton : public YPushButton, public YGWidget { bool m_customIcon, m_labelIcon; @@ -21,7 +23,9 @@ m_customIcon = m_labelIcon = false; gtk_button_set_use_underline (GTK_BUTTON (getWidget()), TRUE); setLabel (label); - connect (getWidget (), "clicked", G_CALLBACK (clicked_cb), this); + connect (getWidget(), "clicked", G_CALLBACK (clicked_cb), this); + g_signal_connect (G_OBJECT (getWidget()), "expose-event", + G_CALLBACK (treat_icon_cb), this); } void setStockIcon (const std::string &label) @@ -125,6 +129,33 @@ } } + static gboolean treat_icon_cb (GtkWidget *widget, GdkEventExpose *event, + YGPushButton *pThis) + { + // only set stock icons if all to the left have them + YLayoutBox *ybox = dynamic_cast <YLayoutBox *> (pThis->parent()); + if (ybox && ybox->primary() == YD_HORIZ && !pThis->m_customIcon) { + YWidget *ylast = 0; + for (YWidgetListConstIterator it = ybox->childrenBegin(); + it != ybox->childrenEnd(); it++) { + if ((YWidget *) pThis == *it) { + if (ylast) { + GtkWidget *button = YGWidget::get (ylast)->getWidget(); + GtkWidget *icon = gtk_button_get_image (GTK_BUTTON (button)); + if (!icon || !GTK_WIDGET_VISIBLE (icon)) + pThis->setIcon (""); + } + break; + } + ylast = *it; + if (!dynamic_cast <YPushButton *> (ylast)) + ylast = NULL; + } + } + g_signal_handlers_disconnect_by_func (widget, (gpointer) treat_icon_cb, pThis); + return FALSE; + } + // Events static void clicked_cb (GtkButton *button, YGPushButton *pThis) { pThis->emitEvent (YEvent::Activated, IGNORE_NOTIFY_EVENT); } Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=53753&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Sat Nov 29 02:07:23 2008 @@ -331,6 +331,7 @@ // we want to use GtkImage stock mode so it honors sensitive GtkWidget *image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), image); + gtk_widget_show (image); } } else { -- 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] r53752 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGLayout.cc src/ygtkwizard.c tests/StockButtons.ycp tests/StockIcons.ycp
by rpmcruz＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: rpmcruz Date: Fri Nov 28 23:45:56 2008 New Revision: 53752 URL: http://svn.opensuse.org/viewcvs/yast?rev=53752&view=rev Log: * src/YGLayout.cc: bug fix 446524: disable those orphan icon buttons in the middle of a box. Added: trunk/gtk/tests/StockButtons.ycp Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGLayout.cc trunk/gtk/src/ygtkwizard.c trunk/gtk/tests/StockIcons.ycp Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53752&r1=53751… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Nov 28 23:45:56 2008 @@ -45,6 +45,9 @@ * src/ygtkwizard.c: bug fix 449194: update the window title on map (when the wizard is swapped in). + * src/YGLayout.cc: bug fix 446524: disable those orphan icon buttons + in the middle of a box. + 2008-11-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkwizard.c: don't show "more" link on help line if the rest Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=53752&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Fri Nov 28 23:45:56 2008 @@ -523,13 +523,11 @@ void YGDialog::setTitle (const std::string &title, bool sticky) { + if (title.empty()) + return; if (!m_stickyTitle || sticky) { GtkWindow *window = GTK_WINDOW (m_window->getWidget()); - gchar *str; - if (title.empty()) - str = g_strdup ("YaST"); - else - str = g_strdup_printf ("%s - YaST", title.c_str()); + gchar *str = g_strdup_printf ("%s - YaST", title.c_str()); gtk_window_set_title (window, str); g_free (str); m_stickyTitle = sticky; Modified: trunk/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=53752&r1… ============================================================================== --- trunk/gtk/src/YGLayout.cc (original) +++ trunk/gtk/src/YGLayout.cc Fri Nov 28 23:45:56 2008 @@ -78,6 +78,9 @@ { setBorder (0); YGLAYOUT_INIT + if (dim == YD_HORIZ) + // realize doesn't seem to work, so... + g_timeout_add_full (G_PRIORITY_LOW, 50, treat_button_icons_cb, this, NULL); } virtual void addChild (YWidget *ychild) @@ -90,6 +93,26 @@ YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) YGLAYOUT_PREFERRED_SIZE_IMPL (YLayoutBox) YGLAYOUT_SET_SIZE_IMPL (YLayoutBox) + + static gboolean treat_button_icons_cb (gpointer pData) + { + YGLayoutBox *pThis = (YGLayoutBox *) pData; + // only set stock icons if all to the left have them + bool enable = true; + for (YWidgetListConstIterator it = pThis->childrenBegin(); + it != pThis->childrenEnd(); it++) { + YPushButton *ybutton = dynamic_cast <YPushButton *> (*it); + if (ybutton) { + GtkWidget *button = YGWidget::get (ybutton)->getWidget(); + GtkWidget *icon = gtk_button_get_image (GTK_BUTTON (button)); + if (enable) + enable = icon != NULL; + else if (icon) + gtk_widget_hide (icon); + } + } + return FALSE; + } }; YLayoutBox *YGWidgetFactory::createLayoutBox (YWidget *parent, YUIDimension dimension) Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=53752&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Fri Nov 28 23:45:56 2008 @@ -711,7 +711,7 @@ YGtkWizard *wizard = YGTK_WIZARD (widget); YGtkWizardHeader *header = YGTK_WIZARD_HEADER (wizard->m_title); const gchar *title = gtk_label_get_text (GTK_LABEL (header->title)); - ygdialog_setTitle (title, FALSE); + ygdialog_setTitle (strcmp (title, "YaST") ? title : "", FALSE); } static gboolean clear_hash_cb (gpointer key, gpointer value, gpointer data) Added: trunk/gtk/tests/StockButtons.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/StockButtons.ycp?rev=5… ============================================================================== --- trunk/gtk/tests/StockButtons.ycp (added) +++ trunk/gtk/tests/StockButtons.ycp Fri Nov 28 23:45:56 2008 @@ -0,0 +1,14 @@ +{ + UI::OpenDialog( + `HBox( + `PushButton ("&Add"), + `PushButton ("&Edit"), + `PushButton ("&Resize"), + `PushButton ("&Remove") + ) + ); + + UI::UserInput(); + UI::CloseDialog(); +} + Modified: trunk/gtk/tests/StockIcons.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/StockIcons.ycp?rev=537… ============================================================================== --- trunk/gtk/tests/StockIcons.ycp (original) +++ trunk/gtk/tests/StockIcons.ycp Fri Nov 28 23:45:56 2008 @@ -2,23 +2,23 @@ { list stock_icons = [ - "ok", - "cancel", - "abort", - "apply", - "about", - "connect", - "disconnect", - "edit", - "open", - "close", - "new", - "quit", - "print", - "save", - "save-as", - "yes", - "no", + "Ok", + "Cancel", + "Abort", + "Apply", + "About", + "Connect", + "Disconnect", + "Edit", + "Open", + "Close", + "New", + "Quit", + "Print", + "Save", + "Save As", + "Yes", + "No", ]; integer i = 0; -- 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] r53751 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/ygtklinklabel.c src/ygtkwizard.c
by rpmcruz＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: rpmcruz Date: Fri Nov 28 21:38:52 2008 New Revision: 53751 URL: http://svn.opensuse.org/viewcvs/yast?rev=53751&view=rev Log: * src/YGDialog.cc: export setTitle() to C code. * src/ygtklinklabel.c: bug fix 449194: "more" link was disapearing on unmap. Not sure why but showing it on map was causing glitches. Just force a resize. * src/ygtkwizard.c: bug fix 449194: update the window title on map (when the wizard is swapped in). Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/ygtklinklabel.c trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53751&r1=53750… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Nov 28 21:38:52 2008 @@ -38,6 +38,13 @@ Arabic in a paragraph per paragraph basis. Work around it so the entire text, including the English parts, are aligned to the right. + * src/YGDialog.cc: export setTitle() to C code. + * src/ygtklinklabel.c: bug fix 449194: "more" link was disapearing on unmap. + Not sure why but showing it on map was causing glitches. + Just force a resize. + * src/ygtkwizard.c: bug fix 449194: update the window title on map (when the + wizard is swapped in). + 2008-11-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkwizard.c: don't show "more" link on help line if the rest Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=53751&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Fri Nov 28 21:38:52 2008 @@ -537,6 +537,15 @@ present(); } +extern "C" { + void ygdialog_setTitle (const gchar *title, gboolean sticky); +}; + +void ygdialog_setTitle (const gchar *title, gboolean sticky) +{ + YGDialog::currentDialog()->setTitle (title, sticky); +} + void YGDialog::setIcon (const std::string &icon) { GtkWindow *window = GTK_WINDOW (m_window->getWidget()); Modified: trunk/gtk/src/ygtklinklabel.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtklinklabel.c?rev=5375… ============================================================================== --- trunk/gtk/src/ygtklinklabel.c (original) +++ trunk/gtk/src/ygtklinklabel.c Fri Nov 28 21:38:52 2008 @@ -55,6 +55,14 @@ GTK_WIDGET_CLASS (ygtk_link_label_parent_class)->unrealize (widget); } +static void ygtk_link_label_map (GtkWidget *widget) +{ + // "more" hides on unmap and for some reason showing it clears the + // text... + gtk_widget_queue_resize (widget); + GTK_WIDGET_CLASS (ygtk_link_label_parent_class)->map (widget); +} + static void ygtk_link_label_clear_layout (YGtkLinkLabel *label) { if (label->layout) { @@ -210,6 +218,7 @@ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); widget_class->realize = ygtk_link_label_realize; widget_class->unrealize = ygtk_link_label_unrealize; + widget_class->map = ygtk_link_label_map; widget_class->size_request = ygtk_link_label_size_request; widget_class->size_allocate = ygtk_link_label_size_allocate; widget_class->expose_event = ygtk_link_label_expose_event; Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=53751&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Fri Nov 28 21:38:52 2008 @@ -30,6 +30,7 @@ extern gboolean ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon); extern GdkPixbuf *ygutils_setOpacity (const GdkPixbuf *src, int opacity, gboolean alpha); +extern void ygdialog_setTitle (const gchar *title, gboolean sticky); //** YGtkHelpDialog @@ -703,6 +704,16 @@ gtk_widget_grab_focus (wizard->next_button); } +static void ygtk_wizard_map (GtkWidget *widget) +{ + GTK_WIDGET_CLASS (ygtk_wizard_parent_class)->map (widget); + // since wizards can swap the window, we need to update the title on map + YGtkWizard *wizard = YGTK_WIZARD (widget); + YGtkWizardHeader *header = YGTK_WIZARD_HEADER (wizard->m_title); + const gchar *title = gtk_label_get_text (GTK_LABEL (header->title)); + ygdialog_setTitle (title, FALSE); +} + static gboolean clear_hash_cb (gpointer key, gpointer value, gpointer data) { return TRUE; } static void clear_hash (GHashTable *hash_table) @@ -1116,6 +1127,7 @@ GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass); widget_class->realize = ygtk_wizard_realize; + widget_class->map = ygtk_wizard_map; GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass); gtkobject_class->destroy = ygtk_wizard_destroy; -- 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] r53750 - /tags/stable-2_17_59/storage/
by aschnell＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: aschnell Date: Fri Nov 28 21:21:30 2008 New Revision: 53750 URL: http://svn.opensuse.org/viewcvs/yast?rev=53750&view=rev Log: Created tag stable-2_17_59 for storage Added: tags/stable-2_17_59/storage/ - copied from r53749, trunk/storage/ -- 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] r53749 - /tags/stable-2_17_59/storage/
by aschnell＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: aschnell Date: Fri Nov 28 21:21:28 2008 New Revision: 53749 URL: http://svn.opensuse.org/viewcvs/yast?rev=53749&view=rev Log: Removed tag stable-2_17_59 for storage Removed: tags/stable-2_17_59/storage/ -- 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] r53748 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: aschnell Date: Fri Nov 28 21:19:37 2008 New Revision: 53748 URL: http://svn.opensuse.org/viewcvs/yast?rev=53748&view=rev Log: - added some debug output Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri Nov 28 21:19:37 2008 @@ -5481,14 +5481,17 @@ const char * files[] = { "boot.ini", "msdos.sys", "io.sys", "config.sys", "MSDOS.SYS", "IO.SYS", "bootmgr", "$Boot" }; - string f; unsigned i=0; while( !win && i<lengthof(files) ) + { + string f = mp + "/" + files[i]; + if (access(f.c_str(), R_OK) == 0) { - f = mp + "/" + files[i]; - win = access( f.c_str(), R_OK )==0; - i++; + y2mil("found windows file " << quote(f)); + win = true; } + i++; + } efi = vol->getFs()==VFAT && checkDir( mp + "/efi" ); if( efi ) win = false; -- 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] r53747 - /trunk/storage/storage/src/include/ep-hd-dialogs.ycp
by aschnell＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: aschnell Date: Fri Nov 28 21:01:55 2008 New Revision: 53747 URL: http://svn.opensuse.org/viewcvs/yast?rev=53747&view=rev Log: - removed unknown widget option Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Fri Nov 28 21:01:55 2008 @@ -124,12 +124,10 @@ // radio button text `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), - `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 1, cyl_count, - Region::Start(region))), - `MinWidth(10, `IntField(`id(`end_cyl), `opt(`shrinkable), - _("End Cylinder"), 1, cyl_count, - Region::End(region))) + `MinWidth(10, `IntField(`id(`start_cyl), _("Start Cylinder"), + 1, cyl_count, Region::Start(region))), + `MinWidth(10, `IntField(`id(`end_cyl), _("End Cylinder"), + 1, cyl_count, Region::End(region))) )) ) ) -- 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] r53746 - in /trunk/gtk: ChangeLog src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: rpmcruz Date: Fri Nov 28 20:56:24 2008 New Revision: 53746 URL: http://svn.opensuse.org/viewcvs/yast?rev=53746&view=rev Log: * src/ygtkrichtext.c: arabic fix (bug fix 449600): GtkTextView only detects Arabic in a paragraph per paragraph basis. Work around it so the entire text, including the English parts, are aligned to the right. Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=53746&r1=53745… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Nov 28 20:56:24 2008 @@ -34,6 +34,10 @@ * src/YGPackageSelector.cc (ListView): arabic fix: because of our previous hack, status column is now 1: adjust tooltips. + * src/ygtkrichtext.c: arabic fix (bug fix 449600): GtkTextView only detects + Arabic in a paragraph per paragraph basis. Work around it so the entire + text, including the English parts, are aligned to the right. + 2008-11-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkwizard.c: don't show "more" link on help line if the rest Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=53746… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Fri Nov 28 20:56:24 2008 @@ -358,6 +358,7 @@ void ygtk_rich_text_init (YGtkRichText *rtext) { + GtkWidget *widget = GTK_WIDGET (rtext); GtkTextView *tview = GTK_TEXT_VIEW (rtext); gtk_text_view_set_wrap_mode (tview, GTK_WRAP_WORD_CHAR); gtk_text_view_set_editable (tview, FALSE); @@ -366,12 +367,12 @@ gtk_text_view_set_left_margin (tview, 4); // Init link support - GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (rtext)); + GdkDisplay *display = gtk_widget_get_display (widget); rtext->hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND2); gdk_cursor_ref (rtext->hand_cursor); #if GTK_CHECK_VERSION(2,10,0) - gtk_widget_style_get (GTK_WIDGET (rtext), "link_color", &link_color, NULL); + gtk_widget_style_get (widget, "link_color", &link_color, NULL); #endif g_signal_connect (tview, "event-after", @@ -379,11 +380,12 @@ // Create a few tags like 'h3', 'b', 'i'. others need to be created as we parse GtkTextBuffer *buffer = gtk_text_view_get_buffer (tview); - PangoFontDescription *font_desc = GTK_WIDGET (rtext)->style->font_desc; + PangoFontDescription *font_desc = widget->style->font_desc; int size = pango_font_description_get_size (font_desc); if (pango_font_description_get_size_is_absolute (font_desc)) size /= PANGO_SCALE; + gtk_text_buffer_create_tag (buffer, "body", NULL); gtk_text_buffer_create_tag (buffer, "h1", "weight", PANGO_WEIGHT_HEAVY, "size", (int)(size * PANGO_SCALE_XX_LARGE), "pixels-below-lines", 16, "foreground", "#5c5c5c", NULL); @@ -410,6 +412,7 @@ gtk_text_buffer_create_tag (buffer, "i", "style", PANGO_STYLE_ITALIC, NULL); gtk_text_buffer_create_tag (buffer, "u", "underline", PANGO_UNDERLINE_SINGLE, NULL); gtk_text_buffer_create_tag (buffer, "center", "justification", GTK_JUSTIFY_CENTER, NULL); + gtk_text_buffer_create_tag (buffer, "right", "justification", GTK_JUSTIFY_RIGHT, NULL); // helpers gtk_text_buffer_create_tag (buffer, "keyword", "background", "yellow", NULL); } @@ -592,9 +595,6 @@ gpointer user_data, GError **error) { // Called for open tags <foo bar="baz"> - if (!g_ascii_strcasecmp (element_name, "body")) - return; - GRTParseState *state = (GRTParseState*) user_data; GRTPTag *tag = g_malloc (sizeof (GRTPTag)); GtkTextIter iter; @@ -712,9 +712,6 @@ gpointer user_data, GError **error) { // Called for close tags </foo> - if (!g_ascii_strcasecmp (element_name, "body")) - return; - GRTParseState *state = (GRTParseState*) user_data; if (g_list_length (state->htags) == 0) { @@ -835,6 +832,26 @@ return g_object_new (YGTK_TYPE_RICH_TEXT, NULL); } +static void ygtk_rich_text_set_rtl (YGtkRichText *rtext) +{ + GtkTextView *view = GTK_TEXT_VIEW (rtext); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (view); + GtkTextIter iter; + gtk_text_buffer_get_start_iter (buffer, &iter); + do { + GtkTextIter end = iter; + if (!gtk_text_iter_forward_line (&end)) + gtk_text_buffer_get_end_iter (buffer, &end); + + gchar *text = gtk_text_iter_get_text (&iter, &end); + PangoDirection dir = pango_find_base_dir (text, -1); + if (dir == PANGO_DIRECTION_LTR) + gtk_text_buffer_apply_tag_by_name (buffer, "right", &iter, &end); + + iter = end; + } while (!gtk_text_iter_is_end (&iter)); +} + void ygtk_rich_text_set_text (YGtkRichText* rtext, const gchar* text, gboolean plain_mode) { GtkTextBuffer *buffer; @@ -871,6 +888,11 @@ if (gtk_text_iter_backward_char (&before_end_it) && gtk_text_iter_get_char (&before_end_it) == '\n') gtk_text_buffer_delete (buffer, &before_end_it, &end_it); + + // GtkTextView does LTR and RTL depending on the paragraph; we want + // to change that behavior so it's RTL to the all thing for Arabic + if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) + ygtk_rich_text_set_rtl (rtext); } /* gtk_text_iter_forward_search() is case-sensitive so we roll our own. -- 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] r53745 - /tags/stable-2_17_50/packager/
by lslezak＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: lslezak Date: Fri Nov 28 18:25:32 2008 New Revision: 53745 URL: http://svn.opensuse.org/viewcvs/yast?rev=53745&view=rev Log: Created tag stable-2_17_50 for packager Added: tags/stable-2_17_50/packager/ - copied from r53744, trunk/packager/ -- 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] r53744 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: lslezak Date: Fri Nov 28 18:23:35 2008 New Revision: 53744 URL: http://svn.opensuse.org/viewcvs/yast?rev=53744&view=rev Log: - fixed changing status of the repositories belonging to a service (bnc#444366) - 2.17.50 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=53744&r1=53… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Nov 28 18:23:35 2008 @@ -1 +1 @@ -2.17.49 +2.17.50 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Nov 28 18:23:35 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 28 18:15:42 CET 2008 - lslezak(a)suse.cz + +- fixed changing status of the repositories belonging to a service + (bnc#444366) +- 2.17.50 + +------------------------------------------------------------------- Fri Nov 28 12:17:59 CET 2008 - locilka(a)suse.cz - DefaultDesktop module now returns desktop name translated using Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Fri Nov 28 18:23:35 2008 @@ -442,8 +442,53 @@ } boolean Write() { - y2milestone("New config: %1", sourceStatesOut); - boolean success = Pkg::SourceEditSet( sourceStatesOut ); + boolean success = true; + + // evaluate removed and new services + list<string> deleted_services = newServices(serviceStatesOut, serviceStatesIn); + y2milestone("Deleted services: %1", deleted_services); + list<string> added_services = newServices(serviceStatesIn, serviceStatesOut); + y2milestone("Added services: %1", added_services); + + foreach(string alias, deleted_services, + { + y2milestone("Removing service %1", alias); + success = success && Pkg::ServiceDelete(alias); + } + ); + + y2milestone("New service config: %1", sourceStatesOut); + foreach(map<string,any> s, serviceStatesOut, + { + string alias = s["alias"]:""; + + if (contains(added_services, alias)) + { + y2milestone("Adding service %1", alias); + string new_url = s["url"]:""; + + if (new_url != "") + { + y2milestone("aliases: %1", Pkg::ServiceAliases()); + success = success && Pkg::ServiceAdd(alias, new_url); + // set enabled and autorefresh flags + success = success && Pkg::ServiceSet(alias, s); + } + else + { + y2error("Empty URL for service %1", alias); + } + } + else + { + y2milestone("Modifying service %1", alias); + success = success && Pkg::ServiceSet(alias, s); + } + } + ); + + y2milestone("New repo config: %1", sourceStatesOut); + success = success && Pkg::SourceEditSet( sourceStatesOut ); // we must sync before the repositories are deleted from zypp // otherwise we will not get their details @@ -488,48 +533,6 @@ } ); - // evaluate removed and new services - list<string> deleted_services = newServices(serviceStatesOut, serviceStatesIn); - y2milestone("Deleted services: %1", deleted_services); - list<string> added_services = newServices(serviceStatesIn, serviceStatesOut); - y2milestone("Added services: %1", added_services); - - foreach(string alias, deleted_services, - { - y2milestone("Removing service %1", alias); - success = success && Pkg::ServiceDelete(alias); - } - ); - - foreach(map<string,any> s, serviceStatesOut, - { - string alias = s["alias"]:""; - - if (contains(added_services, alias)) - { - y2milestone("Adding service %1", alias); - string new_url = s["url"]:""; - - if (new_url != "") - { - y2milestone("aliases: %1", Pkg::ServiceAliases()); - success = success && Pkg::ServiceAdd(alias, new_url); - // set enabled and autorefresh flags - success = success && Pkg::ServiceSet(alias, s); - } - else - { - y2error("Empty URL for service %1", alias); - } - } - else - { - y2milestone("Modifying service %1", alias); - success = success && Pkg::ServiceSet(alias, s); - } - } - ); - success = success && KeyManager::Write(); // store repositories and services in the persistent libzypp storage -- 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] r53743 - /tags/stable-2_17_4/apparmor/
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 18:02:59 2008 New Revision: 53743 URL: http://svn.opensuse.org/viewcvs/yast?rev=53743&view=rev Log: Created tag stable-2_17_4 for apparmor Added: tags/stable-2_17_4/apparmor/ - copied from r53742, 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] r53742 - in /trunk/apparmor: VERSION package/yast2-apparmor.changes
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 18:01:34 2008 New Revision: 53742 URL: http://svn.opensuse.org/viewcvs/yast?rev=53742&view=rev Log: version 2.17.4 Modified: trunk/apparmor/VERSION trunk/apparmor/package/yast2-apparmor.changes Modified: trunk/apparmor/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/VERSION?rev=53742&r1=53… ============================================================================== --- trunk/apparmor/VERSION (original) +++ trunk/apparmor/VERSION Fri Nov 28 18:01:34 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 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 Fri Nov 28 18:01:34 2008 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Nov 28 17:53:44 CET 2008 - kmachalkova(a)suse.cz + +- Removed source of UI syntax error - invalid items listing + (bnc#441510) +- Integrated jjohansen's patch for bnc#258079 (e-mail address + validation) +- Make translatable strings from Perl agents really translated (and + correctly encoded) (bnc#448390) +- 2.17.4 + +------------------------------------------------------------------- Sat Oct 18 10:04:31 CEST 2008 - aschnell(a)suse.de - Fixed help text (bnc #436491) -- 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] r53741 - /trunk/apparmor/src/agents/ag_reports_sched
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 18:00:14 2008 New Revision: 53741 URL: http://svn.opensuse.org/viewcvs/yast?rev=53741&view=rev Log: Perl prints warning if the variable does not exist yet Modified: trunk/apparmor/src/agents/ag_reports_sched Modified: trunk/apparmor/src/agents/ag_reports_sched URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_s… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_sched (original) +++ trunk/apparmor/src/agents/ag_reports_sched Fri Nov 28 18:00:14 2008 @@ -636,7 +636,7 @@ my $db = undef; - if ( $args->{'name'} =~ /Edit\s+(\w.+)\s+Sched/ ) { + if ( defined( $args->{'name'}) && $args->{'name'} =~ /Edit\s+(\w.+)\s+Sched/ ) { $args->{'name'} = $1; } -- 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] r53740 - in /trunk/apparmor/src/agents: ag_genprof ag_logparse ag_reports_confined ag_reports_sched
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 17:50:49 2008 New Revision: 53740 URL: http://svn.opensuse.org/viewcvs/yast?rev=53740&view=rev Log: Make translatable strings from agents really translated (and correctly encoded) (#448390) Modified: trunk/apparmor/src/agents/ag_genprof trunk/apparmor/src/agents/ag_logparse trunk/apparmor/src/agents/ag_reports_confined trunk/apparmor/src/agents/ag_reports_sched Modified: trunk/apparmor/src/agents/ag_genprof URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_genprof?r… ============================================================================== --- trunk/apparmor/src/agents/ag_genprof (original) +++ trunk/apparmor/src/agents/ag_genprof Fri Nov 28 17:50:49 2008 @@ -15,14 +15,19 @@ use warnings; use strict; use Data::Dumper; +use Encode; use Getopt::Long; use Locale::gettext; use POSIX; use Immunix::SubDomain; -# initialize the local poo +# !hack hack hack! +# Can't use YaST _macro for marking strings +# for translation, so we need to do it Perl-way setlocale(LC_MESSAGES, ""); +my $dom = Locale::gettext->domain("yast2-apparmor"); +$dom->dir("/usr/share/YaST2/locale"); textdomain("yast2-apparmor"); setup_yast(); @@ -40,17 +45,16 @@ # tell 'em how to use it... &usage && exit if $help; - my $sd_mountpoint = check_for_subdomain(); unless($sd_mountpoint) { - fatal_error(gettext("SubDomain does not appear to be started. Please enable SubDomain and try again.")); + fatal_error( decode("utf8", gettext("SubDomain does not appear to be started. Please enable SubDomain and try again."))); } # let's convert it to full path... $profiledir = get_full_path($profiledir); unless(-d $profiledir) { - fatal_error(sprintf(gettext("Can't find subdomain profiles in %s."), $profiledir)); + fatal_error( decode("utf8", sprintf(gettext("Can't find subdomain profiles in %s."), $profiledir))); } # what are we profiling? @@ -62,18 +66,18 @@ my $f = { description => -gettext("This wizard will help you create a new AppArmor security +decode( "utf8", gettext("This wizard will help you create a new AppArmor security profile for an application, or you can use it to enhance an existing profile by allowing AppArmor to learn new application behavior. Please enter the application name for which you would like to create a profile, or select Browse to find the -application on your system."), - file_label => gettext("&Application to Profile"), - okay_label => gettext("&Create"), - cancel_label => gettext("&Abort"), - browse_desc => gettext("Select Program to Profile"), +application on your system.") ), + file_label => decode("utf8", gettext("&Application to Profile")), + okay_label => decode("utf8", gettext("&Create")), + cancel_label => decode ("utf8", gettext("&Abort")), + browse_desc => decode("utf8", gettext("Select Program to Profile")), }; my $profiling = UI_GetFile( $f ); @@ -92,18 +96,18 @@ chomp($fqdbin); unless(-x $fqdbin) { - UI_Important(gettext("The specified file is not executable. + UI_Important( decode("utf8", gettext("The specified file is not executable. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } elsif(-d $profiling) { - UI_Important(gettext("The specified pathname is a directory. + UI_Important( decode("utf8", gettext("The specified pathname is a directory. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } else { if($profiling !~ /\//) { my $which = which($profiling); @@ -113,22 +117,22 @@ } unless(-f $fqdbin) { - UI_Important(gettext("The specified file does not exist. + UI_Important( decode("utf8", gettext("The specified file does not exist. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } } else { # they hit okay without entering anything - UI_Important(gettext("You have not entered or selected an + UI_Important( decode("utf8", gettext("You have not entered or selected an application to profile. Please enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard."))); } } until($fqdbin && -x $fqdbin); @@ -170,8 +174,8 @@ } my $q = { }; - $q->{headers} = [ gettext("Profiling"), $fqdbin ]; - $q->{explanation} = gettext("Please start the application to be profiled in + $q->{headers} = [ decode("utf8", gettext("Profiling")), $fqdbin ]; + $q->{explanation} = decode("utf8", gettext("Please start the application to be profiled in another window and exercise its functionality now. Once completed, select the 'Scan' option below in @@ -179,7 +183,7 @@ For each AppArmor event, you will be given the opportunity to choose whether the access should be -allowed or denied."); +allowed or denied.")); $q->{functions} = [ "CMD_SCAN", "CMD_FINISHED" ]; $q->{default} = "CMD_SCAN"; @@ -195,7 +199,7 @@ } else { # make them confirm the exit command - my $ans = UI_YesNo(gettext("Are you sure you want to exit?"), "n"); + my $ans = UI_YesNo( decode("utf8", gettext("Are you sure you want to exit?")), "n"); if($ans eq "y") { $done_profiling = 1; } @@ -218,8 +222,8 @@ } } -UI_Info(gettext("Reloaded SubDomain profiles in enforce mode.")); -UI_Info(sprintf(gettext('Finished generating profile for %s.'), $fqdbin)); +UI_Info(decode("utf8", gettext("Reloaded SubDomain profiles in enforce mode."))); +UI_Info(decode("utf8", sprintf(gettext('Finished generating profile for %s.'), $fqdbin))); shutdown_yast(); Modified: trunk/apparmor/src/agents/ag_logparse URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_logparse?… ============================================================================== --- trunk/apparmor/src/agents/ag_logparse (original) +++ trunk/apparmor/src/agents/ag_logparse Fri Nov 28 17:50:49 2008 @@ -39,6 +39,9 @@ use Immunix::Reports; +#FIXME: I don't know whether localizable strings +#from this agent are visible somewhere in UI, so possibly +#gettext include could be removed setlocale(LC_MESSAGES, ""); textdomain("yast2-apparmor"); Modified: trunk/apparmor/src/agents/ag_reports_confined URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_c… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_confined (original) +++ trunk/apparmor/src/agents/ag_reports_confined Fri Nov 28 17:50:49 2008 @@ -14,6 +14,9 @@ use POSIX; use ycp; +#FIXME: I don't know whether localizable strings +#from this agent are visible somewhere in UI, so possibly +#gettext include could be removed setlocale(LC_MESSAGES, ""); textdomain("yast2-apparmor"); Modified: trunk/apparmor/src/agents/ag_reports_sched URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_s… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_sched (original) +++ trunk/apparmor/src/agents/ag_reports_sched Fri Nov 28 17:50:49 2008 @@ -42,6 +42,9 @@ use Immunix::Reports; +#FIXME:gettext is used in this agent but could be as well dropped +#as the translatable messages go into y2log only, so it does +#not hurt if they are not localized setlocale(LC_MESSAGES, ""); textdomain("yast2-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] r53739 - in /trunk/qt-pkg/src: YQPkgChangesDialog.cc YQPkgChangesDialog.h
by dmacvicar＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: dmacvicar Date: Fri Nov 28 17:40:35 2008 New Revision: 53739 URL: http://svn.opensuse.org/viewcvs/yast?rev=53739&view=rev Log: - of course, we can research what is new in Qt 4.x and stop making mappings between gui and data, when one has a nice way to store user data as QVariants. Something that the whole Qt UI could benefit from. Strange that findData() function does not seem to work with our custom type, however a normal loop, works. Modified: trunk/qt-pkg/src/YQPkgChangesDialog.cc trunk/qt-pkg/src/YQPkgChangesDialog.h Modified: trunk/qt-pkg/src/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgChangesDialog.cc… ============================================================================== --- trunk/qt-pkg/src/YQPkgChangesDialog.cc (original) +++ trunk/qt-pkg/src/YQPkgChangesDialog.cc Fri Nov 28 17:40:35 2008 @@ -89,13 +89,12 @@ _filter = new QComboBox(this); // add the items. - _filter->addItems( QStringList() << _("All") - << _("Selected by the user") - << _("Automatic Changes") ); + _filter->addItem(_("All"), QVariant::fromValue(Filters(FilterAll))); + _filter->addItem(_("Selected by the user"), QVariant::fromValue(Filters(FilterUser))); + _filter->addItem(_("Automatic Changes"), QVariant::fromValue(Filters(FilterAutomatic))); _filter->setCurrentIndex(0); - layout->addWidget(_filter); connect( _filter, SIGNAL(currentIndexChanged(int)), SLOT(slotFilterChanged(int))); @@ -142,42 +141,6 @@ } } -YQPkgChangesDialog::Filters -YQPkgChangesDialog::indexToFilter( int i ) const -{ - switch (i) - { - case FilterIndexUser: - return FilterUser; - case FilterIndexAutomatic: - return FilterAutomatic; - case FilterIndexAll: - default: - return FilterAll; - } - return FilterAll; -} - -int -YQPkgChangesDialog::filterToIndex( Filters f ) const -{ - switch (f) - { - case FilterAll: - return FilterIndexAll; - case FilterUser: - return FilterIndexUser; - case FilterAutomatic: - return FilterIndexAutomatic; - default: - return FilterIndexAll; - } - - return FilterIndexAll; -} - - - void YQPkgChangesDialog::filter( Filters f ) { @@ -188,8 +151,18 @@ YQPkgChangesDialog::slotFilterChanged( int index ) { yuiMilestone() << "filter index changed to: " << index << endl; - Filters f = indexToFilter(index); - filter(f); + QVariant v = _filter->itemData(index); + + if ( v.isValid() && v.canConvert<Filters>() ) + { + Filters f = v.value<Filters>(); + filter(f); + } + else + { + yuiError() << "Can't find filter for index " << index << endl; + } + } void @@ -201,16 +174,34 @@ void YQPkgChangesDialog::setFilter( const QRegExp &regexp, Filters f ) { - int index = filterToIndex(f); - yuiMilestone() << "filter changed to: " << f << ", index: " << index << endl; - // so we dont get called again - _filter->blockSignals(true); - - // try to set the widget - _filter->setCurrentIndex(f); + yuiMilestone() << "filter changed to: " << f << endl; - _filter->blockSignals(false); - filter(regexp, f); + int index = -1; + for ( int k = 0; k < _filter->count(); ++k ) + { + QVariant v = _filter->itemData(k); + if ( v.isValid() && v.canConvert<Filters>() ) + { + + Filters setf = v.value<Filters>(); + if ( setf == f ) + index = k; + } + } + + if ( index != -1 ) + { + // so we dont get called again + _filter->blockSignals(true); + // try to set the widget + _filter->setCurrentIndex(f); + _filter->blockSignals(false); + filter(regexp, f); + } + else + { + yuiError() << "Can't find index for filter " << f << endl; + } } Modified: trunk/qt-pkg/src/YQPkgChangesDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgChangesDialog.h?… ============================================================================== --- trunk/qt-pkg/src/YQPkgChangesDialog.h (original) +++ trunk/qt-pkg/src/YQPkgChangesDialog.h Fri Nov 28 17:40:35 2008 @@ -138,16 +138,6 @@ void slotFilterChanged( int index ); protected: - - /** - * convert filter index into a filter combination - */ - Filters indexToFilter( int i ) const; - /** - * Filter to combobox index - */ - int filterToIndex( Filters f ) const; - /** * Constructor: Creates a changes dialog with text 'message' on * top, a list packages with an "auto" status that is not set via selections -- 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] r53738 - in /trunk/apparmor/src/agents: ag_complain ag_logprof ag_sd_config ag_subdomain
by kmachalkova＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: kmachalkova Date: Fri Nov 28 17:35:36 2008 New Revision: 53738 URL: http://svn.opensuse.org/viewcvs/yast?rev=53738&view=rev Log: Dropped Locale::gettext include, as no strings are translated here Modified: trunk/apparmor/src/agents/ag_complain trunk/apparmor/src/agents/ag_logprof trunk/apparmor/src/agents/ag_sd_config trunk/apparmor/src/agents/ag_subdomain Modified: trunk/apparmor/src/agents/ag_complain URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_complain?… ============================================================================== --- trunk/apparmor/src/agents/ag_complain (original) +++ trunk/apparmor/src/agents/ag_complain Fri Nov 28 17:35:36 2008 @@ -31,15 +31,10 @@ ################################################################################ use strict; -use Locale::gettext; -use POSIX; use ycp; use Immunix::SubDomain; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - our $UI_Mode = "yast-agent"; sub getProfPath ($) { Modified: trunk/apparmor/src/agents/ag_logprof URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_logprof?r… ============================================================================== --- trunk/apparmor/src/agents/ag_logprof (original) +++ trunk/apparmor/src/agents/ag_logprof Fri Nov 28 17:35:36 2008 @@ -15,8 +15,6 @@ use strict; use Data::Dumper; use Getopt::Long; -use Locale::gettext; -use POSIX; use Immunix::SubDomain; @@ -25,10 +23,6 @@ exit 0; } -# initialize the local poo -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - setup_yast(); # options variables Modified: trunk/apparmor/src/agents/ag_sd_config URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_sd_config… ============================================================================== --- trunk/apparmor/src/agents/ag_sd_config (original) +++ trunk/apparmor/src/agents/ag_sd_config Fri Nov 28 17:35:36 2008 @@ -17,15 +17,10 @@ use strict; use ycp; use Data::Dumper; -use Locale::gettext; -use POSIX; use Immunix::Notify; use Immunix::Reports; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - # Subroutines ################################################################################ sub setSubdomain { Modified: trunk/apparmor/src/agents/ag_subdomain URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_subdomain… ============================================================================== --- trunk/apparmor/src/agents/ag_subdomain (original) +++ trunk/apparmor/src/agents/ag_subdomain Fri Nov 28 17:35:36 2008 @@ -20,14 +20,9 @@ use strict; use ycp; use Data::Dumper; -use Locale::gettext; -use POSIX; use Immunix::Notify; use Immunix::SubDomain; -setlocale(LC_MESSAGES, ""); -textdomain("yast2-apparmor"); - # Subroutines ################################################################################ -- 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] r53737 - /trunk/pkg-bindings/src/Callbacks.cc
by lslezak＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: lslezak Date: Fri Nov 28 17:33:34 2008 New Revision: 53737 URL: http://svn.opensuse.org/viewcvs/yast?rev=53737&view=rev Log: - decrease callbacks logging Modified: trunk/pkg-bindings/src/Callbacks.cc Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Fri Nov 28 17:33:34 2008 @@ -457,8 +457,7 @@ virtual void start(const zypp::ProgressData &task) { CB callback( ycpcb( YCPCallbacks::CB_ProgressStart ) ); - // TODO: change it to y2debug later - y2milestone("ProgressStart: id:%d, %s", task.numericId(), task.name().c_str()); + y2debug("ProgressStart: id:%d, %s", task.numericId(), task.name().c_str()); if (callback._set) { @@ -477,8 +476,7 @@ virtual bool progress(const zypp::ProgressData &task) { CB callback( ycpcb( YCPCallbacks::CB_ProgressProgress ) ); - // TODO: change it to y2debug later - y2milestone("ProgressProgress: id:%d, %s: %lld%%", task.numericId(), task.name().c_str(), task.reportValue()); + y2debug("ProgressProgress: id:%d, %s: %lld%%", task.numericId(), task.name().c_str(), task.reportValue()); if (callback._set) { @@ -494,8 +492,7 @@ virtual void finish( const zypp::ProgressData &task ) { CB callback( ycpcb( YCPCallbacks::CB_ProgressDone ) ); - // TODO: change it to y2debug later - y2milestone("ProgressFinish: id:%d, %s", task.numericId(), task.name().c_str()); + y2debug("ProgressFinish: id:%d, %s", task.numericId(), task.name().c_str()); if (callback._set) { -- 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] r53736 - /tags/stable-2_17_3/inetd/
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:23:48 2008 New Revision: 53736 URL: http://svn.opensuse.org/viewcvs/yast?rev=53736&view=rev Log: Created tag stable-2_17_3 for inetd Added: tags/stable-2_17_3/inetd/ - copied from r53735, trunk/inetd/ -- 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] r53735 - /trunk/inetd/VERSION
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:23:37 2008 New Revision: 53735 URL: http://svn.opensuse.org/viewcvs/yast?rev=53735&view=rev Log: version Modified: trunk/inetd/VERSION Modified: trunk/inetd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/VERSION?rev=53735&r1=53734… ============================================================================== --- trunk/inetd/VERSION (original) +++ trunk/inetd/VERSION Fri Nov 28 17:23:37 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 -- 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] r53734 - /tags/stable-2_17_53/yast2/
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:21:57 2008 New Revision: 53734 URL: http://svn.opensuse.org/viewcvs/yast?rev=53734&view=rev Log: Created tag stable-2_17_53 for yast2 Added: tags/stable-2_17_53/yast2/ - copied from r53733, trunk/yast2/ -- 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] r53733 - /tags/stable-2_17_53/yast2/
by locilka＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: locilka Date: Fri Nov 28 17:21:47 2008 New Revision: 53733 URL: http://svn.opensuse.org/viewcvs/yast?rev=53733&view=rev Log: Fixed Removed: tags/stable-2_17_53/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0