February 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60989 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd-lib.ycp storage/src/include/ep-lvm-dialogs.ycp
by aschnell＠svn.opensuse.org 24 Feb '10

24 Feb '10

Author: aschnell Date: Wed Feb 24 10:37:36 2010 New Revision: 60989 URL: http://svn.opensuse.org/viewcvs/yast?rev=60989&view=rev Log: - mark messages for translation (bnc #580871 and bnc #581298) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Feb 24 10:37:36 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 24 10:33:34 CET 2010 - aschnell(a)suse.de + +- mark messages for translation (bnc #580871 and bnc #581298) + +------------------------------------------------------------------- Tue Feb 16 16:31:17 CET 2010 - aschnell(a)suse.de - don't import mount point for installation source (bnc #577560) Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Wed Feb 24 10:37:36 2010 @@ -486,8 +486,8 @@ list <string> mydisks = AvailableTargetDisks(); if (isempty(mydisks)) { - Popup::Error("This disk cannot be cloned. There are no suitable -disks that could have the same partitioning layout."); + Popup::Error(_("This disk cannot be cloned. There are no suitable +disks that could have the same partitioning layout.")); return; } Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Wed Feb 24 10:37:36 2010 @@ -279,7 +279,7 @@ string MiniWorkflowStepResizeVgHelptext() { // helptext - string helptext = "Change the devices that are used for the volume group."; + string helptext = _("Change the devices that are used for the volume group."); return helptext; } -- 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] r60988 - /tags/stable-2_21_12/gtk/
by rpmcruz＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: rpmcruz Date: Tue Feb 23 17:11:53 2010 New Revision: 60988 URL: http://svn.opensuse.org/viewcvs/yast?rev=60988&view=rev Log: Created tag stable-2_21_12 for gtk Added: tags/stable-2_21_12/gtk/ - copied from r60987, trunk/gtk/ -- 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] r60987 - /tags/stable-2_21_12/
by rpmcruz＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: rpmcruz Date: Tue Feb 23 17:11:46 2010 New Revision: 60987 URL: http://svn.opensuse.org/viewcvs/yast?rev=60987&view=rev Log: Created tag stable-2_21_12 Added: tags/stable-2_21_12/ -- 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] r60986 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: rpmcruz Date: Tue Feb 23 17:11:43 2010 New Revision: 60986 URL: http://svn.opensuse.org/viewcvs/yast?rev=60986&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=60986&r1=60985&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Tue Feb 23 17:11:43 2010 @@ -1 +1 @@ -2.21.11 +2.21.12 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=60986&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Tue Feb 23 17:11:43 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "11") +SET(VERSION_PATCH "12") 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 Tue Feb 23 17:11:43 2010 @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Feb 22 17:02:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +Fri Feb 23 16:03:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.12 - html renderer: <li> element and headers ending with colon were -- 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] r60985 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/EtcFstab.cc libstorage/src/Volume.cc libstorage/src/Volume.h package/yast2-storage.changes storage/src/include/ep-dialogs.ycp
by fehr＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: fehr Date: Tue Feb 23 17:07:47 2010 New Revision: 60985 URL: http://svn.opensuse.org/viewcvs/yast?rev=60985&view=rev Log: remove not needed password dialog and fix wrong handling of fstab entry when removing mount point of encrypted device Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.h branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc Tue Feb 23 17:07:47 2010 @@ -731,7 +731,7 @@ line = createTabLine( i->nnew ); cur->append( line ); } - else + else if( !i->nnew.mount.empty() ) { line = (*cur)[lineno]; const list<string> nl = makeStringList(i->nnew); @@ -739,6 +739,10 @@ line = updateLine( ol, nl, line ); (*cur)[lineno] = line; } + else + { + cur->remove(lineno,1); + } if( i->old.crypttab > i->nnew.crypttab && findCrtab( i->old, crypttab, lineno )) crypttab.remove( lineno, 1 ); Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc Tue Feb 23 17:07:47 2010 @@ -2485,6 +2485,11 @@ return( ret ); } +bool Volume::pvEncryption() const + { + return( encryption==ENC_LUKS && getUsedByType()==UB_LVM ); + } + int Volume::doFstabUpdate() { int ret = 0; @@ -2495,7 +2500,7 @@ EtcFstab* fstab = cont->getStorage()->getFstab(); FstabEntry entry; if ((!orig_mp.empty() || orig_encryption != ENC_NONE) && - (deleted() || (mp.empty() && encryption == ENC_NONE)) && + (deleted() || (mp.empty() && !pvEncryption())) && (fstab->findDevice( dev, entry ) || fstab->findDevice( alt_names, entry ) || (cType()==LOOP && fstab->findMount( orig_mp, entry )) || @@ -2510,7 +2515,7 @@ y2milestone( "before removeEntry" ); ret = fstab->removeEntry( entry ); } - else if ((!mp.empty() || encryption != ENC_NONE) && !deleted()) + else if ((!mp.empty() || pvEncryption()) && !deleted()) { string fname; if( fstab->findDevice( dev, entry ) || Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.h Tue Feb 23 17:07:47 2010 @@ -188,6 +188,7 @@ bool inCryptotab() const { return( encryption!=ENC_NONE && encryption!=ENC_LUKS && !optNoauto() ); } + bool pvEncryption() const; bool inCrypttab() const { return( encryption==ENC_LUKS && !optNoauto() ); } virtual void print( std::ostream& s ) const { s << *this; } int getFreeLoop(); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Tue Feb 23 17:07:47 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 23 16:46:19 CET 2010 - fehr(a)suse.de + +- remove not needed password dialog and fix wrong handling of fstab + entry when removing mount point of encrypted device + +------------------------------------------------------------------- Tue Feb 23 15:53:14 CET 2010 - aschnell(a)suse.de - deactivate and reactivate storage systems before rescan devices Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-dialogs.ycp Tue Feb 23 17:07:47 2010 @@ -72,7 +72,7 @@ boolean AskPassword() { boolean ret = NeedPassword(); - if( ret && !do_format && size(data["mount"]:"")>0 ) + if( ret && !do_format /*&& size(data["mount"]:"")>0*/ ) { string key = (data["type"]:`unknown != `loop) ? (data["device"]:"error") : (data["fpath"]:"error"); ret = Storage::NeedCryptPwd(key); -- 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] r60984 - in /branches/SuSE-Code-11-SP1-Branch/gtk: ChangeLog package/yast2-gtk.changes src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: rpmcruz Date: Tue Feb 23 17:04:28 2010 New Revision: 60984 URL: http://svn.opensuse.org/viewcvs/yast?rev=60984&view=rev Log: * src/ygtkrichtext.c: bug fix 581800: <li> element and headers ending with colon were not being given right-to-left treatment for languages like Arabic. Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtkrichtext.c Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/C… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog Tue Feb 23 17:04:28 2010 @@ -1,3 +1,9 @@ +2010-02-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkrichtext.c: bug fix 581800: <li> element + and headers ending with colon were not being given + right-to-left treatment for languages like Arabic. + 2010-02-18 Martin Kudlvasr <mkudlvasr(a)novell.com> * tests/Firewall_bnc567505.ycp: add Ricardo's test for bnc#567505 Modified: branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/p… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/package/yast2-gtk.changes Tue Feb 23 17:04:28 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Feb 23 16:03:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.17.17 +- html renderer: <li> element and headers ending with colon were +not being given right-to-left treatment for languages like Arabic +(bnc#581800). + +------------------------------------------------------------------- Thu Feb 18 17:28:19 CET 2010 - mkudlvasr(a)suse.cz - fix by rpmcruz: crash on firewall tool (bnc#567505) Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtkrichtext.c (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/ygtkrichtext.c Tue Feb 23 17:04:28 2010 @@ -24,13 +24,10 @@ // utilities // Looks at all tags covering the position of iter in the text view, // and returns the link the text points to, in case that text is a link. -static const char *get_link (GtkTextView *text_view, gint x, gint y) +static const char *get_link_at_iter (GtkTextView *text_view, GtkTextIter *iter) { - GtkTextIter iter; - gtk_text_view_get_iter_at_location (text_view, &iter, x, y); - char *link = NULL; - GSList *tags = gtk_text_iter_get_tags (&iter), *tagp; + GSList *tags = gtk_text_iter_get_tags (iter), *tagp; for (tagp = tags; tagp != NULL; tagp = tagp->next) { GtkTextTag *tag = (GtkTextTag*) tagp->data; link = (char*) g_object_get_data (G_OBJECT (tag), "link"); @@ -42,23 +39,27 @@ g_slist_free (tags); return link; } +static const char *get_link (GtkTextView *text_view, gint win_x, gint win_y) +{ + gint buffer_x, buffer_y; + gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), + GTK_TEXT_WINDOW_WIDGET, win_x, win_y, &buffer_x, &buffer_y); + GtkTextIter iter; + gtk_text_view_get_iter_at_location (text_view, &iter, buffer_x, buffer_y); + return get_link_at_iter (text_view, &iter); +} // callbacks // Links can also be activated by clicking. static gboolean event_after (GtkWidget *text_view, GdkEvent *ev) { - GtkTextIter start, end; - GtkTextBuffer *buffer; - GdkEventButton *event; - gint x, y; - if (ev->type != GDK_BUTTON_RELEASE) return FALSE; - - event = (GdkEventButton *)ev; + GtkTextIter start, end; + GtkTextBuffer *buffer; + GdkEventButton *event = (GdkEventButton *) ev; if (event->button != 1) return FALSE; - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)); // We shouldn't follow a link if the user is selecting something. @@ -66,10 +67,7 @@ if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end)) return FALSE; - gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), - GTK_TEXT_WINDOW_WIDGET, (gint) event->x, (gint) event->y, &x, &y); - - const char *link = get_link (GTK_TEXT_VIEW (text_view), x, y); + const char *link = get_link (GTK_TEXT_VIEW (text_view), event->x, event->y); if (link) // report link g_signal_emit (YGTK_RICH_TEXT (text_view), link_clicked_signal, 0, link); return FALSE; @@ -180,12 +178,9 @@ wy >= widget->allocation.height) return; } - gint bx, by; - gtk_text_view_window_to_buffer_coords (view, GTK_TEXT_WINDOW_WIDGET, - wx, wy, &bx, &by); static gboolean hovering_over_link = FALSE; - gboolean hovering = get_link (view, bx, by) != NULL; + gboolean hovering = get_link (view, wx, wy) != NULL; if (hovering != hovering_over_link) { hovering_over_link = hovering; @@ -285,6 +280,25 @@ free_list (state->htags); } +static void insert_li_enumeration (GRTParseState *state, GtkTextIter *iter, gboolean start) +{ + gboolean _start = gtk_widget_get_default_direction() != GTK_TEXT_DIR_RTL; + if (_start != start) return; + + HTMLList *front_list; + if (state->html_list && (front_list = g_list_first (state->html_list)->data) && + (front_list->ordered)) { + const gchar *form = start ? "%d. " : " .%d"; + gchar *str = g_strdup_printf (form, front_list->enumeration++); + gtk_text_buffer_insert (state->buffer, iter, str, -1); + g_free (str); + } + else { // \\u25cf for bigger bullets + const char *str = start ? "\u2022 " : " \u2022"; + gtk_text_buffer_insert (state->buffer, iter, str, -1); + } +} + // Tags to support: and not : // either 'elide' \ns (turn off with <pre> I guess static void @@ -322,22 +336,29 @@ // Special tags that must be inserted manually if (!tag->tag) { if (!g_ascii_strcasecmp (element_name, "font")) { - if (attribute_names[0] && - !g_ascii_strcasecmp (attribute_names[0], "color")) { - tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, - "foreground", attribute_values[0], - NULL); - state->default_color = FALSE; + int i; + for (i = 0; attribute_names[i]; i++) { + const char *attrb = attribute_names[i]; + const char *value = attribute_values[i]; + if (!g_ascii_strcasecmp (attrb, "color")) { + tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, + "foreground", value, NULL); + state->default_color = FALSE; + } + // not from html -- we use this internally + else if (!g_ascii_strcasecmp (attrb, "bgcolor")) { + tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, + "background", value, NULL); + } + else + g_warning ("Unknown font attribute: '%s'", attrb); } - else - g_warning ("Unknown font attribute: '%s'", attribute_names[0]); } else if (!g_ascii_strcasecmp (element_name, "a")) { if (attribute_names[0] && !g_ascii_strcasecmp (attribute_names[0], "href")) { tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, - "underline", PANGO_UNDERLINE_SINGLE, - NULL); + "underline", PANGO_UNDERLINE_SINGLE, NULL); if (state->default_color) g_object_set (tag->tag, "foreground-gdk", &link_color, NULL); g_object_set_data (G_OBJECT (tag->tag), "link", g_strdup (attribute_values[0])); @@ -345,20 +366,8 @@ else g_warning ("Unknown a attribute: '%s'", attribute_names[0]); } - else if (!g_ascii_strcasecmp (element_name, "li")) { - HTMLList *front_list; - - if (state->html_list && - (front_list = g_list_first (state->html_list)->data) && - (front_list->ordered)) {; - gchar *str = g_strdup_printf ("%d. ", front_list->enumeration++); - gtk_text_buffer_insert (state->buffer, &iter, str, -1); - g_free (str); - } - else { // \\u25cf for bigger bullets - gtk_text_buffer_insert (state->buffer, &iter, "\u2022 ", -1); - } - } + else if (!g_ascii_strcasecmp (element_name, "li")) + insert_li_enumeration (state, &iter, TRUE); // Tags that affect the margin else if (!g_ascii_strcasecmp (element_name, "ul") || !g_ascii_strcasecmp (element_name, "ol")) { @@ -366,24 +375,30 @@ HTMLList_init (list, !g_ascii_strcasecmp (element_name, "ol")); state->html_list = g_list_append (state->html_list, list); } - else if (!g_ascii_strcasecmp (element_name, "img")) { if (attribute_names[0] && !g_ascii_strcasecmp (attribute_names[0], "src")) { - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (attribute_values[0], NULL); - if (pixbuf) { - gtk_text_buffer_insert_pixbuf (state->buffer, &iter, pixbuf); - g_object_unref (G_OBJECT (pixbuf)); + const char *filename = attribute_values[0]; + if (filename) { + GdkPixbuf *pixbuf; + if (filename[0] == '/') + pixbuf = gdk_pixbuf_new_from_file (filename, NULL); + else + pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), + filename, 64, 0, NULL); + if (pixbuf) { + gtk_text_buffer_insert_pixbuf (state->buffer, &iter, pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } } } else g_warning ("Unknown img attribute: '%s'", attribute_names[0]); } - - // for tags like , GMarkup will pass them through the end + // tags like , GMarkup will pass them through the end // tag callback too, so we'll deal with them there - else if (!g_ascii_strcasecmp (element_name, "br")) - ; + else if (!g_ascii_strcasecmp (element_name, "br")) ; + else if (!g_ascii_strcasecmp (element_name, "hr")) ; else { @@ -393,6 +408,17 @@ g_warning ("Unknown tag '%s'", element_name); } } + else if (attribute_names[0]) { // tags that may have extra attributes + if (!g_ascii_strcasecmp (element_name, "p")) { + // not from html (basic html only supports background color in + // tables), but we use this internally + if (!g_ascii_strcasecmp (attribute_names[0], "bgcolor")) + tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, + "paragraph-background", attribute_values[0], NULL); + else + g_warning ("Unknown p attribute: '%s'", attribute_names[0]); + } + } if (!tag->tag && isIdentTag (element_name)) { state->left_margin += IDENT_MARGIN; @@ -456,6 +482,8 @@ gtk_text_buffer_apply_tag_by_name (state->buffer, "center", &start, &end); appendLines = 1; } + else if (!g_ascii_strcasecmp (element_name, "li")) + insert_li_enumeration (state, &end, FALSE); if (isBlockTag (element_name) || !g_ascii_strcasecmp (element_name, "br")) { appendLines = 1; @@ -494,12 +522,21 @@ gtk_text_buffer_insert_with_tags (state->buffer, &start, text, text_len, NULL, NULL); else { + gboolean rtl = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL; + int i = 0; if (state->closed_block_tag) { for (; i < text_len; i++) if (!g_ascii_isspace (text[i])) break; } + + // hack: for right-to-left languages, change "Device:" to ":Device" (bug 581800) + if (rtl && text[text_len-1] == ':') { + gtk_text_buffer_insert (state->buffer, &start, ":", 1); + text_len--; + } + gtk_text_buffer_insert (state->buffer, &start, text+i, text_len-i); } gtk_text_buffer_get_end_iter (state->buffer, &end); @@ -555,16 +592,14 @@ void ygtk_rich_text_set_text (YGtkRichText* rtext, const gchar* text, gboolean plain_mode) { - GtkTextBuffer *buffer; - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (rtext)); - if (plain_mode) { + GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (rtext)); gtk_text_buffer_set_text (buffer, text, -1); return; } - // remove any possible existing text - gtk_text_buffer_set_text (buffer, "", 0); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (rtext)); + gtk_text_buffer_set_text (buffer, "", 0); // remove any existing text GRTParseState state; GRTParseState_init (&state, buffer); @@ -691,7 +726,7 @@ g_object_ref (G_OBJECT (pixbuf)); } -void ygtk_rich_text_class_init (YGtkRichTextClass *klass) +static void ygtk_rich_text_class_init (YGtkRichTextClass *klass) { GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass); gtkwidget_class->motion_notify_event = ygtk_rich_text_motion_notify_event; -- 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] r60983 - /trunk/gtk/package/yast2-gtk.changes
by rpmcruz＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: rpmcruz Date: Tue Feb 23 16:59:13 2010 New Revision: 60983 URL: http://svn.opensuse.org/viewcvs/yast?rev=60983&view=rev Log: Release. 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 Tue Feb 23 16:59:13 2010 @@ -1,6 +1,14 @@ ------------------------------------------------------------------- Fri Feb 22 17:02:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt +- 2.21.12 +- html renderer: <li> element and headers ending with colon were +not being given right-to-left treatment for languages like Arabic +(bnc#581800). + +------------------------------------------------------------------- +Fri Feb 22 17:02:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + - 2.21.11 - extend previous fix to groups of packages. -- 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] r60982 - in /trunk/gtk: ChangeLog src/ygtkrichtext.c
by rpmcruz＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: rpmcruz Date: Tue Feb 23 16:58:15 2010 New Revision: 60982 URL: http://svn.opensuse.org/viewcvs/yast?rev=60982&view=rev Log: * src/ygtkrichtext.c: bug fix 581800: <li> element and headers ending with colon were not being given right-to-left treatment for languages like Arabic. Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtkrichtext.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60982&r1=60981… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Feb 23 16:58:15 2010 @@ -1,3 +1,9 @@ +2010-02-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkrichtext.c: bug fix 581800: <li> element + and headers ending with colon were not being given + right-to-left treatment for languages like Arabic. + 2010-02-22 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/yzyppwrapper.h/cc: extend previous commit to Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=60982… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Tue Feb 23 16:58:15 2010 @@ -280,6 +280,25 @@ free_list (state->htags); } +static void insert_li_enumeration (GRTParseState *state, GtkTextIter *iter, gboolean start) +{ + gboolean _start = gtk_widget_get_default_direction() != GTK_TEXT_DIR_RTL; + if (_start != start) return; + + HTMLList *front_list; + if (state->html_list && (front_list = g_list_first (state->html_list)->data) && + (front_list->ordered)) { + const gchar *form = start ? "%d. " : " .%d"; + gchar *str = g_strdup_printf (form, front_list->enumeration++); + gtk_text_buffer_insert (state->buffer, iter, str, -1); + g_free (str); + } + else { // \\u25cf for bigger bullets + const char *str = start ? "\u2022 " : " \u2022"; + gtk_text_buffer_insert (state->buffer, iter, str, -1); + } +} + // Tags to support: and not : // either 'elide' \ns (turn off with <pre> I guess static void @@ -347,20 +366,8 @@ else g_warning ("Unknown a attribute: '%s'", attribute_names[0]); } - else if (!g_ascii_strcasecmp (element_name, "li")) { - HTMLList *front_list; - - if (state->html_list && - (front_list = g_list_first (state->html_list)->data) && - (front_list->ordered)) {; - gchar *str = g_strdup_printf ("%d. ", front_list->enumeration++); - gtk_text_buffer_insert (state->buffer, &iter, str, -1); - g_free (str); - } - else { // \\u25cf for bigger bullets - gtk_text_buffer_insert (state->buffer, &iter, "\u2022 ", -1); - } - } + else if (!g_ascii_strcasecmp (element_name, "li")) + insert_li_enumeration (state, &iter, TRUE); // Tags that affect the margin else if (!g_ascii_strcasecmp (element_name, "ul") || !g_ascii_strcasecmp (element_name, "ol")) { @@ -475,6 +482,8 @@ gtk_text_buffer_apply_tag_by_name (state->buffer, "center", &start, &end); appendLines = 1; } + else if (!g_ascii_strcasecmp (element_name, "li")) + insert_li_enumeration (state, &end, FALSE); if (isBlockTag (element_name) || !g_ascii_strcasecmp (element_name, "br")) { appendLines = 1; @@ -513,12 +522,21 @@ gtk_text_buffer_insert_with_tags (state->buffer, &start, text, text_len, NULL, NULL); else { + gboolean rtl = gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL; + int i = 0; if (state->closed_block_tag) { for (; i < text_len; i++) if (!g_ascii_isspace (text[i])) break; } + + // hack: for right-to-left languages, change "Device:" to ":Device" (bug 581800) + if (rtl && text[text_len-1] == ':') { + gtk_text_buffer_insert (state->buffer, &start, ":", 1); + text_len--; + } + gtk_text_buffer_insert (state->buffer, &start, text+i, text_len-i); } gtk_text_buffer_get_end_iter (state->buffer, &end); -- 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] r60981 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: aschnell Date: Tue Feb 23 16:00:21 2010 New Revision: 60981 URL: http://svn.opensuse.org/viewcvs/yast?rev=60981&view=rev Log: - deactivate and reactivate storage systems before rescan devices (bnc #571828) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Tue Feb 23 16:00:21 2010 @@ -357,6 +357,17 @@ void Storage::rescanEverything() { y2mil("rescan everything"); + + if (instsys()) + { + LvmVg::activate(false); + MdCo::activate(false, tmpDir()); + MdPartCo::activate(false, tmpDir()); + DmraidCo::activate(false); + DmmultipathCo::activate(false); + Dm::activate(false); + } + deleteClist(cont); detectObjects(); } Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Tue Feb 23 16:00:21 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 23 15:53:14 CET 2010 - aschnell(a)suse.de + +- deactivate and reactivate storage systems before rescan devices + (bnc #571828) + +------------------------------------------------------------------- Fri Feb 19 13:52:42 CET 2010 - aschnell(a)suse.de - allow setting of imsm_driver via env.var. (bnc #574270) -- 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] r60980 - /tags/branch-Code-11-SP1-2_17_36/autoinstallation/
by ug＠svn.opensuse.org 23 Feb '10

23 Feb '10

Author: ug Date: Tue Feb 23 13:28:14 2010 New Revision: 60980 URL: http://svn.opensuse.org/viewcvs/yast?rev=60980&view=rev Log: Created tag branch-Code-11-SP1-2_17_36 for autoinstallation Added: tags/branch-Code-11-SP1-2_17_36/autoinstallation/ (props changed) - copied from r60979, branches/SuSE-Code-11-SP1-Branch/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0