October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41442 - in /trunk/gtk: ./ src/ tests/
by rpmcruz＠svn.opensuse.org 16 Oct '07

16 Oct '07

Author: rpmcruz Date: Tue Oct 16 16:47:05 2007 New Revision: 41442 URL: http://svn.opensuse.org/viewcvs/yast?rev=41442&view=rev Log: * src/ygtkhtmlwrapper.h/c (added): to be used instead of YGtkRichText directly. At the moment, it wraps YGtkRichText and GtkHTML, YGtkRichText being the one used (for now, at least). * src/YGUtils.cc: fixed a small memory leak when a html comment, and disabled the removal of whitespaces (as needed by <pre>). * src/ygtkrichtext.c: moved block and block&ident tags to common code. For block tags, I am simply using two break lines, instead of spacing. This could still use more polishing... * src/YGRichText.cc: removed, moved to YGMultiLineEdit.cc, made the factory constructing another object for plainText. * configure.in.in: added GtkHtml check (uncommented as I dunno how to make it optional; and either way, needs to be discussed what we want here). Modified: trunk/gtk/ChangeLog trunk/gtk/configure.in.in trunk/gtk/src/Makefile.am trunk/gtk/src/YGMultiLineEdit.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGRichText.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/ygtkrichtext.h trunk/gtk/src/ygtkwizard.c trunk/gtk/tests/RichText2.ycp Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41442&r1=41441… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 16 16:47:05 2007 @@ -1,9 +1,41 @@ +2007-10-16 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkhtmlwrapper.h/c (added): to be used instead of YGtkRichText directly. + At the moment, it wraps YGtkRichText and GtkHTML, YGtkRichText being the + one used (for now, at least). + + * src/YGUtils.cc: fixed a small memory leak when a html comment, and + disabled the removal of whitespaces (as needed by <pre>). + * src/ygtkrichtext.c: moved block and block&ident tags to common code. + For block tags, I am simply using two break lines, instead of spacing. + This could still use more polishing... + + * src/YGRichText.cc: removed, moved to YGMultiLineEdit.cc, made the factory + constructing another object for plainText. + + * configure.in.in: added GtkHtml check (uncommented as I dunno how to + make it optional; and either way, needs to be discussed what we want here). + 2007-10-12 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygdkmngloader.h/c / src/YGImage.cc: added support for inline MNG images. Fixed ticks per second. * tests/YGImage.ycp: added a bunch of MNGs I found... + * src/ygtkhtmltext.h/c: added wrapper around our YGtkRichText and GtkHtml. + -> Automake stuff needs works (it will just error if GtkHtml is not found...) + * src/YGRichText.cc & src/YGPackageSelector.cc: bug fix #326207: use + ygtkhtmltext code. + + Doing our own renderer was fun, but it won't ever support tables, and still + has some corner cases where GMarkup complains, and inline/blocks tags are + problematic at times. And I already saw comments of people doing tables and + using HTML extensively on yast (like for a startup screen). + With a wrapper we can easily port the code to another HTML widget out there, + until gtk+ adopts one into the API. GtkHTML API is a bit sucky, but its + used by Evolution (including on the composer), so its robust, and it seems + fairly slim (certainely when compared to mozdev :P). + 2007-10-11 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: speed up Patterns view. Modified: trunk/gtk/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/configure.in.in?rev=41442&r1… ============================================================================== --- trunk/gtk/configure.in.in (original) +++ trunk/gtk/configure.in.in Tue Oct 16 16:47:05 2007 @@ -47,6 +47,17 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +# TODO: we may want to check if GtkHtml is installed and set its flag +#dnl Check if GtkHtml is installed +#AC_MSG_CHECKING([for gtkhtml]) +#PKG_CHECK_MODULES( GTKHTML, libgtkhtml-3.14 ) +#AC_SUBST(GTKHTML_CFLAGS) +#AC_SUBST(GTKHTML_LIBS) +#AC_DEFINE(USE_GTKHTML, 1, [will use GtkHtml as the HTML renderer]) + +PKG_CHECK_MODULES( ZYPP, libzypp ) +AC_SUBST(ZYPP_LIBS) + verstxt=`pkg-config --modversion yast2-core` yast_vers=`echo "$verstxt" | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` AC_DEFINE_UNQUOTED(YAST2_VERSION, $yast_vers, [yast version for compile conditionals]) Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=41442&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Tue Oct 16 16:47:05 2007 @@ -13,7 +13,8 @@ plugin_LTLIBRARIES = libpy2gtk.la libpy2gtk_la_LDFLAGS = -version-info 2:0 -libpy2gtk_la_LIBADD = -L$(plugindir) $(PYUI_LIBS) -L$(libdir) -lycp -ly2 $(GTK_LIBS) $(ZYPP_LIBS) +libpy2gtk_la_LIBADD = -L$(plugindir) $(PYUI_LIBS) -L$(libdir) -lycp -ly2 \ + $(GTK_LIBS) $(ZYPP_LIBS) $(GTKHTML_LIBS) libpy2gtk_la_SOURCES = \ Y2CCGtk.cc \ YGUtils.cc \ @@ -26,7 +27,6 @@ YGProgressBar.cc \ YGTextEntry.cc \ YGMultiLineEdit.cc \ - YGRichText.cc \ YGIntField.cc \ YGRadioButton.cc \ YGImage.cc \ @@ -42,14 +42,16 @@ YGPackageSelector.cc \ ygtkratiobox.c \ ygtkbargraph.c \ - ygtkrichtext.c \ ygtksteps.c \ ygtkfieldentry.c \ ygtkmenubutton.c \ ygtkwizard.c \ ygtkcellrendererarrow.c \ ygtkfindentry.c \ - ygdkmngloader.c + ygdkmngloader.c \ + ygtkhtmlwrap.c \ + ygtkrichtext.c +# should only append ygtkrichtext.c if USE_GTKHTML is set dummy_SOURCES = dummy.cc dummy_LDADD = libpy2gtk.la @@ -62,4 +64,5 @@ INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/yui $(ZYPP_CFLAGS) -EXTRA_DIST = computer.xpm +EXTRA_DIST = + Modified: trunk/gtk/src/YGMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGMultiLineEdit.cc?rev=4… ============================================================================== --- trunk/gtk/src/YGMultiLineEdit.cc (original) +++ trunk/gtk/src/YGMultiLineEdit.cc Tue Oct 16 16:47:05 2007 @@ -15,7 +15,7 @@ public: YGTextView (YWidget *y_widget, YGWidget *parent, const YWidgetOpt &opt, - const YCPString &label, const YCPString &text) + const YCPString &label, const YCPString &text, bool editable) : YGScrolledWidget (y_widget, parent, label, YD_VERT, true, GTK_TYPE_TEXT_VIEW, "wrap-mode", GTK_WRAP_WORD, NULL) { @@ -27,12 +27,16 @@ maxChars = -1; setText (text); + if (!editable) + { + gtk_text_view_set_editable (GTK_TEXT_VIEW (getWidget()), FALSE); + gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (getWidget()), FALSE); + } + g_signal_connect (G_OBJECT (getBuffer()), "changed", G_CALLBACK (text_changed_cb), this); } - virtual ~YGTextView() {} - GtkTextBuffer* getBuffer() { return gtk_text_view_get_buffer (GTK_TEXT_VIEW (getWidget())); } @@ -80,6 +84,11 @@ return str; } + void scrollToBottom() + { + YGUtils::scrollTextViewDown (GTK_TEXT_VIEW (getWidget())); + } + // Event callbacks static void text_changed_cb (GtkTextBuffer *buffer, YGTextView *pThis) { @@ -99,11 +108,9 @@ YGMultiLineEdit (const YWidgetOpt &opt, YGWidget *parent, const YCPString &label, const YCPString &text) : YMultiLineEdit (opt, label) - , YGTextView (this, parent, opt, label, text) + , YGTextView (this, parent, opt, label, text, true) { } - virtual ~YGMultiLineEdit() {} - // YMultiLineEdit virtual void setText (const YCPString &text) { YGTextView::setText (text); } @@ -133,20 +140,16 @@ YGLogView (const YWidgetOpt &opt, YGWidget *parent, const YCPString &label, int visibleLines, int maxLines) : YLogView (opt, label, visibleLines, maxLines) - , YGTextView (this, parent, opt, label, YCPString("")) + , YGTextView (this, parent, opt, label, YCPString(""), false) { setMinSizeInChars (0, visibleLines); - gtk_text_view_set_editable (GTK_TEXT_VIEW (getWidget()), FALSE); - gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (getWidget()), FALSE); } - virtual ~YGLogView() {} - // YLogView virtual void setLogText (const YCPString &text) { setText (text); - YGUtils::scrollTextViewDown (GTK_TEXT_VIEW (getWidget())); + scrollToBottom(); } YGWIDGET_IMPL_COMMON @@ -161,3 +164,84 @@ return new YGLogView (opt, YGWidget::get (parent), label, visibleLines, maxLines); } + +#include "YRichText.h" + +class YGPlainText : public YRichText, public YGTextView +{ +bool m_autoScrollDown; + +public: + YGPlainText(const YWidgetOpt &opt, YGWidget *parent, const YCPString &text) + : YRichText (opt, text) + , YGTextView (this, parent, opt, YCPString(""), text, false) + { + IMPL + m_autoScrollDown = opt.autoScrollDown.value(); + } + + // YRichText + virtual void setText (const YCPString &text) + { + IMPL + YGTextView::setText (text); + if (m_autoScrollDown) + scrollToBottom(); + YRichText::setText (text); + } + + YGWIDGET_IMPL_COMMON +}; + +#include "ygtkhtmlwrap.h" + +class YGRichText : public YRichText, public YGScrolledWidget +{ +bool m_autoScrollDown; + +public: + YGRichText(const YWidgetOpt &opt, YGWidget *parent, const YCPString &text) + : YRichText (opt, text) + , YGScrolledWidget (this, parent, true, ygtk_html_wrap_get_type(), NULL) + { + IMPL + if (!opt.isShrinkable.value()) + setMinSizeInChars (20, 8); + m_autoScrollDown = opt.autoScrollDown.value(); + + ygtk_html_wrap_init (getWidget()); + ygtk_html_wrap_connect_link_clicked (getWidget(), G_CALLBACK (link_clicked_cb), this); + + setText (text); + } + + // YRichText + virtual void setText (const YCPString &_text) + { + IMPL + string text (_text->value()); + YGUtils::replace (text, "&product;", 9, YUI::ui()->productName().c_str()); + + ygtk_html_wrap_set_text (getWidget(), text.c_str()); + if (m_autoScrollDown) + ygtk_html_wrap_scroll (getWidget(), FALSE); + YRichText::setText (_text); + } + + static void link_clicked_cb (GtkWidget *widget, const char *url, YGRichText *pThis) + { + YGUI::ui()->sendEvent (new YMenuEvent (YCPString (url))); + } + + YGWIDGET_IMPL_COMMON +}; + +YWidget * +YGUI::createRichText (YWidget *parent, YWidgetOpt &opt, const YCPString &text) +{ + if (opt.plainTextMode.value()) + return new YGPlainText (opt, YGWidget::get (parent), text); + else + return new YGRichText (opt, YGWidget::get (parent), text); +} + 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 Tue Oct 16 16:47:05 2007 @@ -13,7 +13,7 @@ #include "YGi18n.h" #include "YGDialog.h" #include "YPackageSelector.h" -#include "ygtkrichtext.h" +#include "ygtkhtmlwrap.h" #include "ygtkwizard.h" #include "ygtkcellrendererarrow.h" #include "ygtkratiobox.h" @@ -44,7 +44,7 @@ /* We should consider linking to libgnome and use gnome_url_show(url) here, or at least do some path finding. */ -#define FILEMANAGER_EXEC "/opt/gnome/bin/nautilus" +#define FILEMANAGER_EXEC "/usr/bin/nautilus" inline bool FILEMANAGER_PRESENT() { return g_file_test (FILEMANAGER_EXEC, G_FILE_TEST_IS_EXECUTABLE); } inline void FILEMANAGER_LAUNCH (const char *path) @@ -103,15 +103,9 @@ _("_Reject"), GTK_RESPONSE_REJECT, _("_Accept"), GTK_RESPONSE_ACCEPT, NULL); GtkWidget *license_view, *license_window; -#ifdef PLAIN_TEXT - GtkTextBuffer *buffer = gtk_text_buffer_new (NULL); - gtk_text_buffer_set_text (buffer, license.c_str(), -1); - license_view = gtk_text_view_new_with_buffer (buffer); -#else - /* FIXME: can we detect rich text vs. non - does it matter ? */ - license_view = ygtk_richtext_new(); - ygtk_richtext_set_text (YGTK_RICHTEXT (license_view), license.c_str(), true); -#endif + + license_view = ygtk_html_wrap_new(); + ygtk_html_wrap_set_text (license_view, license.c_str()); license_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (license_window), @@ -351,7 +345,7 @@ { GtkWidget *m_widget, *m_notebook; // Information text - GtkWidget *m_about_text, *m_authors_text, *m_filelist_text, *m_history_text; + GtkWidget *m_about_text, *m_authors_text, *m_filelist_text, *m_changelog_text; bool m_use_filemanager; public: @@ -364,10 +358,10 @@ GtkWidget *about_win = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (about_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - m_about_text = gtk_text_view_new(); + m_about_text = ygtk_html_wrap_new(); gtk_container_add (GTK_CONTAINER (about_win), m_about_text); gtk_container_add (GTK_CONTAINER (m_widget), about_win); - m_authors_text = m_filelist_text = m_history_text = NULL; + m_authors_text = m_filelist_text = m_changelog_text = NULL; m_notebook = NULL; } else { @@ -378,9 +372,9 @@ m_about_text = add_text_tab (m_notebook, _("Description")); m_filelist_text = add_text_tab (m_notebook, _("File List")); if ((m_use_filemanager = FILEMANAGER_PRESENT())) - g_signal_connect (G_OBJECT (m_filelist_text), "link-pressed", - G_CALLBACK (dir_pressed_cb), NULL); - m_history_text = add_text_tab (m_notebook, _("History")); + ygtk_html_wrap_connect_link_clicked (m_filelist_text, + G_CALLBACK (dir_pressed_cb), NULL); + m_changelog_text = add_text_tab (m_notebook, _("Change Log")); m_authors_text = add_text_tab (m_notebook, _("Authors")); } gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (m_widget)), @@ -397,8 +391,8 @@ set_text (m_about_text, ""); if (m_filelist_text) set_text (m_filelist_text, ""); - if (m_history_text) - set_text (m_history_text, ""); + if (m_changelog_text) + set_text (m_changelog_text, ""); if (m_authors_text) set_text (m_authors_text, ""); gtk_expander_set_expanded (GTK_EXPANDER (m_widget), FALSE); @@ -414,15 +408,13 @@ ZyppPackage package = tryCastToZyppPkg (object); if (m_about_text) { - string description = YGUtils::escape_markup (object->description()); + string description = YGUtils::escape_markup (object->description(), true); // cut authors, since they have their own section string::size_type pos = description.find ("Authors:"); if (pos != string::npos) description.erase (pos, string::npos); - description = YGUtils::escape_break_lines (description, true); - string str; if (package) { description += " "; @@ -458,6 +450,9 @@ for (std::list <string>::const_iterator it = filenames.begin(); it != filenames.end(); it++) { string file (*it); + // don't show created dirs + if (g_file_test (file.c_str(), G_FILE_TEST_IS_DIR)) + continue; // set the path as a link if (m_use_filemanager) { string::size_type pos = file.find_last_of ('/'); @@ -471,22 +466,21 @@ } set_text (m_filelist_text, filelist); } - if (m_history_text) { - string history; + if (m_changelog_text) { + string text; const std::list <zypp::ChangelogEntry> &changelog = package->changelog(); for (std::list <zypp::ChangelogEntry>::const_iterator it = changelog.begin(); it != changelog.end(); it++) { - string text = "<blockquote>" + YGUtils::escape_markup (it->text()) + + string t = "<blockquote>" + YGUtils::escape_markup (it->text(), true) + "</blockquote>"; - text = YGUtils::escape_break_lines (text, false); - history += "" + YGUtils::escape_markup (it->date().asString()) + - " " + YGUtils::escape_markup (it->author()) + ": " + - text + ""; + text += "" + it->date().asString() + "" + + YGUtils::escape_markup (it->author()) + ": " + + t + ""; } - set_text (m_history_text, history); + set_text (m_changelog_text, text); } if (m_authors_text) { - string packager (package->packager()), authors; + string packager (YGUtils::escape_markup (package->packager())), authors; const std::list <string> &authors_list = package->authors(); if (!authors_list.empty()) { @@ -497,13 +491,13 @@ else { /* authors() should be the proper way to get authors, but it seems to be rarely used, instead packagers list them on the description. */ - string description = YGUtils::escape_markup (object->description()); + string description (object->description()); string::size_type pos = description.find ("Authors:"); if (pos != string::npos) { pos = description.find_first_not_of ( '-', pos + sizeof ("Authors:") + 1); authors = string (description, pos, string::npos); - authors = YGUtils::escape_break_lines (authors, false); + authors = YGUtils::escape_markup (authors, true); } } @@ -523,8 +517,8 @@ else { if (m_filelist_text) set_text (m_filelist_text, ""); - if (m_history_text) - set_text (m_history_text, ""); + if (m_changelog_text) + set_text (m_changelog_text, ""); if (m_authors_text) set_text (m_authors_text, ""); } @@ -538,7 +532,7 @@ scroll_win = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - widget = ygtk_richtext_new(); + widget = ygtk_html_wrap_new(); gtk_container_add (GTK_CONTAINER (scroll_win), widget); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scroll_win, @@ -551,17 +545,12 @@ const char *str = _("(not available)"); if (!text.empty()) str = text.c_str(); - ygtk_richtext_set_text (YGTK_RICHTEXT (widget), str, TRUE); - - // scroll to the start - GtkTextIter iter; - gtk_text_buffer_get_start_iter (gtk_text_view_get_buffer ( - GTK_TEXT_VIEW (widget)), &iter); - gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (widget), &iter, 0, TRUE, 0, 0); + ygtk_html_wrap_set_text (widget, str); + ygtk_html_wrap_scroll (widget, TRUE); // scroll to the start } /* When a directory is pressed on the file list. */ - static void dir_pressed_cb (YGtkRichText *rich_text, const gchar *link) + static void dir_pressed_cb (GtkWidget *text, const gchar *link) { FILEMANAGER_LAUNCH (link); } }; Modified: trunk/gtk/src/YGRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGRichText.cc?rev=41442&… ============================================================================== --- trunk/gtk/src/YGRichText.cc (original) +++ trunk/gtk/src/YGRichText.cc Tue Oct 16 16:47:05 2007 @@ -8,27 +8,24 @@ #include "YGUtils.h" #include "YGWidget.h" #include "YRichText.h" -#include "ygtkrichtext.h" +#include "ygtkhtmlwrap.h" class YGRichText : public YRichText, public YGScrolledWidget { - bool m_plainText; +bool m_autoScrollDown; public: YGRichText(const YWidgetOpt &opt, YGWidget *parent, const YCPString &text) : YRichText (opt, text), - YGScrolledWidget (this, parent, true, YGTK_TYPE_RICHTEXT, NULL) + YGScrolledWidget (this, parent, true, ygtk_htmlwrap_get_type (opt.plainTextMode.value()), NULL) { IMPL if (!opt.isShrinkable.value()) setMinSizeInChars (20, 8); + m_autoScrollDown = opt.autoScrollDown.value(); - m_plainText = opt.plainTextMode.value(); - ygtk_richttext_set_prodname (YGTK_RICHTEXT (getWidget()), - YUI::ui()->productName().c_str()); - - g_signal_connect (G_OBJECT (getWidget()), "link-pressed", - G_CALLBACK (link_pressed_cb), this); + ygtk_htmlwrap_init (getWidget()); + ygtk_htmlwrap_connect_link_clicked (getWidget(), G_CALLBACK (link_clicked_cb), this); setText (text); } @@ -37,18 +34,19 @@ { } // YRichText - virtual void setText (const YCPString &text) + virtual void setText (const YCPString &_text) { IMPL - ygtk_richtext_set_text (YGTK_RICHTEXT (getWidget()), text->value_cstr(), - !m_plainText); + string text (_text->value()); + YGUtils::replace (text, "&product;", 9, YUI::ui()->productName().c_str()); - if (autoScrollDown) - YGUtils::scrollTextViewDown (GTK_TEXT_VIEW (getWidget())); - YRichText::setText (text); + ygtk_htmlwrap_set (getWidget(), text.c_str()); + if (m_autoScrollDown) + ygtk_htmlwrap_scroll (getWidget(), FALSE); + YRichText::setText (_text); } - static void link_pressed_cb (YGtkRichText *rtext, const char *url, YGRichText *pThis) + static void link_clicked_cb (GtkWidget *widget, const char *url, YGRichText *pThis) { YGUI::ui()->sendEvent (new YMenuEvent (YCPString (url))); } @@ -62,3 +60,4 @@ { return new YGRichText (opt, YGWidget::get (parent), text); } + Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=41442&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Tue Oct 16 16:47:05 2007 @@ -64,6 +64,16 @@ g_free (text); } +void YGUtils::replace (string &str, const char *mouth, int mouth_len, const char *food) +{ + unsigned int i = 0; + while ((i = str.find (mouth, i)) != string::npos) + { + str.erase (i, mouth_len); + str.insert (i, food); + } +} + void YGUtils::scrollTextViewDown(GtkTextView *text_view) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); @@ -77,7 +87,6 @@ gtk_text_buffer_delete_mark (buffer, end_mark); } - /* Strings can ask for not being escape with the comment  */ static bool dont_escape (const string &str) @@ -91,7 +100,7 @@ return true; } -string YGUtils::escape_markup (const string &str) +string YGUtils::escape_markup (const string &str, bool break_lines) { if (dont_escape (str)) return string (str); @@ -110,6 +119,9 @@ case '&': ret += "&"; break; + case '\n': + ret += " "; + break; default: ret += ch; break; @@ -119,6 +131,7 @@ return ret; } +#if 0 string YGUtils::escape_break_lines (const string &str, bool paragraph_mode) { if (dont_escape (str)) @@ -150,6 +163,7 @@ res += ""; return res; } +#endif #define PROD_ENTITY "&product;" @@ -263,12 +277,6 @@ { // Tag foo if (instr[i] == '<') { - gint j; - gboolean is_close = FALSE; - gboolean in_tag; - int tag_len; - GString *tag = g_string_sized_new (20); - // ignore comments if (strncmp (&instr[i], "<!--", 4) == 0) { for (i += 3; instr[i] != '\0'; i++) @@ -279,6 +287,12 @@ continue; } + gint j; + gboolean is_close = FALSE; + gboolean in_tag; + int tag_len; + GString *tag = g_string_sized_new (20); + i++; skipSpace (instr, i); @@ -310,11 +324,13 @@ g_string_append_c (tag, '/'); // Add quoting for un-quoted attributes - for (j = 0; j < (signed) tag->len; j++) { - if (tag->str[j] == '=' && tag->str[j+1] != '"') { - g_string_insert_c (tag, j+1, '"'); - for (j++; !g_ascii_isspace (tag->str[j]) && tag->str[j]; j++); - g_string_insert_c (tag, j, '"'); + for (int j = 0; j < (signed) tag->len; j++) { + if (tag->str[j] == '=') { + if (tag->str[j+1] != '"') { + g_string_insert_c (tag, j+1, '"'); + for (j++; !g_ascii_isspace (tag->str[j]) && tag->str[j]; j++) ; + g_string_insert_c (tag, j, '"'); + } } } @@ -351,7 +367,7 @@ if (is_close || is_open_close) g_string_free (tag, TRUE); } - +/* else if (instr[i] == '&' && !g_ascii_strncasecmp (instr + i, PROD_ENTITY, sizeof (PROD_ENTITY) - 1)) { @@ -359,8 +375,8 @@ g_string_append (outp, product); i += sizeof (PROD_ENTITY) - 2; } +*/ // non-break space entity - else if (instr[i] == '&' && !g_ascii_strncasecmp (instr + i, " ", sizeof (" ") - 1)) { @@ -369,6 +385,7 @@ i += sizeof (" ") - 2; } +#if 0 // removing new-lines chars sure isn't a xhtml conversion // but it's still valid xhtml and GtkTextView appreciates it else if (/*cut_breaklines &&*/ instr[i] == '\n') { @@ -377,6 +394,7 @@ if (i > 0 && instr[i-1] != '>' && !g_ascii_isspace (instr[i-1])) g_string_append_c (outp, ' '); } +#endif else // Normal text g_string_append_c (outp, instr[i]); @@ -388,7 +406,8 @@ if (addOuterTag) g_string_append (outp, "</body>"); - return g_string_free (outp, FALSE); + gchar *ret = g_string_free (outp, FALSE); + return ret; } int YGUtils::getCharsWidth (GtkWidget *widget, int chars_nb) @@ -683,3 +702,4 @@ g_source_remove (id); id = g_timeout_add_full (G_PRIORITY_DEFAULT, SCROLLING_STEP, scroll_timeout, data, g_free); } + Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=41442&r1=4… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Tue Oct 16 16:47:05 2007 @@ -24,17 +24,18 @@ Use the compare string member if you won't to see if there was any change. */ string filterText (const char* text, int length, const char* valid_chars); - /* Convinience call for widgets that implement GtkEditable interface. + /* Convenience call for widgets that implement GtkEditable interface. This function inserts and deletes text, if needed, so you may want to block those signals, if you have them set. */ void filterText (GtkEditable *editable, int pos, int length, const char *valid_chars); - /* Escapes markup text (eg. changes '<' by '\<'). */ - string escape_markup (const string &str); - /* Turns \n into . If paragraph mode, will set around paragraphs - (that is, stuff separated by two \n). */ - string escape_break_lines (const string &str, bool paragraph_mode); + /* Replaces every 'mouth' by 'food' in 'str'. */ + void replace (string &str, const char *mouth, int mouth_len, const char *food); + + /* Escapes markup text (eg. changes '<' by '\<'). + If break_line is true, the break line character will be transformed in */ + string escape_markup (const string &str, bool break_line = false); /* Adds functionality to GtkTextView to scroll to bottom. */ void scrollTextViewDown(GtkTextView *text_view); @@ -89,3 +90,4 @@ }; #endif // YGUTILS_H + Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=41442… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Tue Oct 16 16:47:05 2007 @@ -10,19 +10,20 @@ #include <gtk/gtkversion.h> #include <string.h> -#define LISTS_MARGIN 10 -#define BLOCKQUOTE_MARGIN 20 +#define IDENT_MARGIN 20 #define PARAGRAPH_SPACING 12 +//#define PRINT_WARNINGS + // Sucky - but we mix C & C++ so ... /* Convert html to xhtml (or at least try) */ gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr, const char *product); -G_DEFINE_TYPE (YGtkRichText, ygtk_richtext, GTK_TYPE_TEXT_VIEW) +G_DEFINE_TYPE (YGtkRichText, ygtk_rich_text, GTK_TYPE_TEXT_VIEW) static GdkCursor *hand_cursor, *regular_cursor; static guint ref_cursor = 0; -static guint link_pressed_signal; +static guint link_clicked_signal; static GdkColor link_color = { 0, 0, 0, 0xeeee }; // utilities @@ -75,11 +76,32 @@ const char *link = get_link (GTK_TEXT_VIEW (text_view), x, y); if (link) // report link - g_signal_emit (YGTK_RICHTEXT (text_view), link_pressed_signal, 0, link); + g_signal_emit (YGTK_RICH_TEXT (text_view), link_clicked_signal, 0, link); return FALSE; } -void ygtk_richtext_init (YGtkRichText *rtext) +#include <stdlib.h> +static int mystrcmp(void *a, void *b) +{ return strcmp (*(char **)a, *(char **)b); } + +static gboolean isBlockTag (const char *tag) +{ + static const char *Tags[] = + { "blockquote", "h1", "h2", "h3", "h4", "h5", "li", "p", "pre" }; + void *ret; + ret = bsearch (&tag, Tags, sizeof (Tags)/sizeof(char*), sizeof(char *), (void*)mystrcmp); + return ret != 0; +} +static gboolean isIdentTag (const char *tag) +{ + static const char *Tags[] = + { "blockquote", "ol", "ul" }; + void *ret; + ret = bsearch (&tag, Tags, sizeof (Tags)/sizeof(char*), sizeof(char *), (void*)mystrcmp); + return ret != 0; +} + +void ygtk_rich_text_init (YGtkRichText *rtext) { rtext->prodname = NULL; @@ -104,60 +126,54 @@ g_signal_connect (tview, "event-after", G_CALLBACK (event_after), NULL); - // Init tags + // Create a few tags like 'h3', 'b', 'i'. others need to be created as we parse GtkTextBuffer *buffer = gtk_text_view_get_buffer (tview); - // Create a few tags like 'h3', 'b', 'i' PangoFontDescription *font_desc = GTK_WIDGET (rtext)->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, "h1", "weight", PANGO_WEIGHT_HEAVY, - "size", (int)(size * PANGO_SCALE_XX_LARGE), - "pixels-below-lines", PARAGRAPH_SPACING, NULL); + "size", (int)(size * PANGO_SCALE_XX_LARGE), NULL); gtk_text_buffer_create_tag (buffer, "h2", "weight", PANGO_WEIGHT_ULTRABOLD, - "size", (int)(size * PANGO_SCALE_X_LARGE), - "pixels-below-lines", PARAGRAPH_SPACING, NULL); + "size", (int)(size * PANGO_SCALE_X_LARGE), NULL); gtk_text_buffer_create_tag (buffer, "h3", "weight", PANGO_WEIGHT_BOLD, - "size", (int)(size * PANGO_SCALE_LARGE), - "pixels-below-lines", PARAGRAPH_SPACING, NULL); + "size", (int)(size * PANGO_SCALE_LARGE), NULL); gtk_text_buffer_create_tag (buffer, "h4", "weight", PANGO_WEIGHT_SEMIBOLD, - "size", (int)(size * PANGO_SCALE_LARGE), - "pixels-below-lines", PARAGRAPH_SPACING, NULL); + "size", (int)(size * PANGO_SCALE_LARGE), NULL); gtk_text_buffer_create_tag (buffer, "h5", - "size", (int)(size * PANGO_SCALE_LARGE), - "pixels-below-lines", PARAGRAPH_SPACING, NULL); + "size", (int)(size * PANGO_SCALE_LARGE), NULL); gtk_text_buffer_create_tag (buffer, "big", "size", (int)(size * PANGO_SCALE_LARGE), NULL); gtk_text_buffer_create_tag (buffer, "small", "size", (int)(size * PANGO_SCALE_SMALL), NULL); - gtk_text_buffer_create_tag (buffer, "tt", - "family", "monospace", NULL); + gtk_text_buffer_create_tag (buffer, "tt", "family", "monospace", NULL); + gtk_text_buffer_create_tag (buffer, "pre", "family", "monospace", NULL); gtk_text_buffer_create_tag (buffer, "b", "weight", PANGO_WEIGHT_BOLD, NULL); 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, "pre", "family", "monospace", NULL); - gtk_text_buffer_create_tag (buffer, "p", "pixels-below-lines", PARAGRAPH_SPACING, - NULL); gtk_text_buffer_create_tag (buffer, "center", "justification", GTK_JUSTIFY_CENTER, NULL); + // helpers gtk_text_buffer_create_tag (buffer, "keyword", "background", "yellow", NULL); } -static void ygtk_richtext_destroy (GtkObject *object) +static void ygtk_rich_text_destroy (GtkObject *object) { - // FIXME: if we have multiple richtexts, one will unref too many - if (ref_cursor > 0 && (--ref_cursor == 0)) { - gdk_cursor_unref (hand_cursor); - gdk_cursor_unref (regular_cursor); - } + YGtkRichText *rtext = YGTK_RICH_TEXT (object); + + if (rtext->prodname) + // destroy can be called multiple times, and we must ref only once + if (ref_cursor > 0 && (--ref_cursor == 0)) { + gdk_cursor_unref (hand_cursor); + gdk_cursor_unref (regular_cursor); + } - YGtkRichText *rtext = YGTK_RICHTEXT (object); if (rtext->prodname) g_free (rtext->prodname); rtext->prodname = NULL; - GTK_OBJECT_CLASS (ygtk_richtext_parent_class)->destroy (object); + GTK_OBJECT_CLASS (ygtk_rich_text_parent_class)->destroy (object); } // Change the cursor to the "hands" cursor typically used by web browsers, @@ -180,8 +196,8 @@ } // Update the cursor image if the pointer moved. -static gboolean ygtk_richtext_motion_notify_event (GtkWidget *text_view, - GdkEventMotion *event) +static gboolean ygtk_rich_text_motion_notify_event (GtkWidget *text_view, + GdkEventMotion *event) { gint x, y; gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), @@ -196,8 +212,8 @@ // Also update the cursor image if the window becomes visible // (e.g. when a window covering it got iconified). -static gboolean ygtk_richtext_visibility_notify_event (GtkWidget *text_view, - GdkEventVisibility *event) +static gboolean ygtk_rich_text_visibility_notify_event (GtkWidget *text_view, + GdkEventVisibility *event) { gint wx, wy, bx, by; @@ -289,22 +305,37 @@ if (!g_ascii_strcasecmp (element_name, "pre")) state->pre_mode = TRUE; + // Check if this is a block tag + if (isBlockTag (element_name)) { + // make sure this opens a new paragraph + if (!gtk_text_iter_starts_line (&iter)) + { + gtk_text_buffer_insert (state->buffer, &iter, "\n\n", -1); + gtk_text_buffer_get_end_iter (state->buffer, &iter); + } + } + char *lower = g_ascii_strdown (element_name, -1); tag->tag = gtk_text_tag_table_lookup (state->tags, lower); + // Special tags that must be inserted manually if (!tag->tag) { if (!g_ascii_strcasecmp (element_name, "font")) { - if (!g_ascii_strcasecmp (attribute_names[0], "color")) { + 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; } +#ifdef PRINT_WARNINGS else g_warning ("Unknown font attribute: '%s'", attribute_names[0]); +#endif } else if (!g_ascii_strcasecmp (element_name, "a")) { - if (!g_ascii_strcasecmp (attribute_names[0], "href")) { + 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); @@ -312,8 +343,10 @@ g_object_set (tag->tag, "foreground-gdk", &link_color, NULL); g_object_set_data (G_OBJECT (tag->tag), "link", g_strdup (attribute_values[0])); } +#ifdef PRINT_WARNINGS else - g_warning ("Unknown font attribute: '%s'", attribute_names[0]); + g_warning ("Unknown a attribute: '%s'", attribute_names[0]); +#endif } else if (!g_ascii_strcasecmp (element_name, "li")) { HTMLList *front_list; @@ -332,30 +365,24 @@ // Tags that affect the margin else if (!g_ascii_strcasecmp (element_name, "ul") || !g_ascii_strcasecmp (element_name, "ol")) { - HTMLList *list = g_malloc (sizeof (HTMLList)); HTMLList_init (list, !g_ascii_strcasecmp (element_name, "ol")); state->html_list = g_list_append (state->html_list, list); - state->left_margin += LISTS_MARGIN; - tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, - "left-margin", state->left_margin, NULL); - } - else if (!g_ascii_strcasecmp (element_name, "blockquote")) { - state->left_margin += BLOCKQUOTE_MARGIN; - tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, - "left-margin", state->left_margin, NULL); } else if (!g_ascii_strcasecmp (element_name, "img")) { - if (!g_ascii_strcasecmp (attribute_names[0], "src")) { + 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)); } } +#ifdef PRINT_WARNINGS else g_warning ("Unknown img attribute: '%s'", attribute_names[0]); +#endif } // for tags like , GMarkup will pass them through the end @@ -364,18 +391,20 @@ ; else - g_warning ("Unknown tag '%s'", element_name); + { +#ifdef PRINT_WARNINGS + if (isBlockTag (element_name)) + ; + else + g_warning ("Unknown tag '%s'", element_name); +#endif + } } - // Check if this tag is of paragraph type - if (tag->tag) { - gint spacing; - g_object_get (G_OBJECT (tag->tag), "pixels-below-lines", &spacing, NULL); - if (spacing > 0) { // is paragraph - // make sure this opens a new paragraph - if (!gtk_text_iter_starts_line (&iter)) - gtk_text_buffer_insert (state->buffer, &iter, "\n", -1); - } + if (!tag->tag && isIdentTag (element_name)) { + state->left_margin += IDENT_MARGIN; + tag->tag = gtk_text_buffer_create_tag (state->buffer, NULL, + "left-margin", state->left_margin, NULL); } g_free (lower); @@ -392,8 +421,6 @@ return; GRTParseState *state = (GRTParseState*) user_data; - GtkTextIter start, end; - gtk_text_buffer_get_end_iter (state->buffer, &end); if (g_list_length (state->htags) == 0) { g_warning ("Urgh - empty tag queue closing '%s'", element_name); @@ -404,42 +431,17 @@ GRTPTag *tag = g_list_last (state->htags)->data; state->htags = g_list_remove (state->htags, tag); + GtkTextIter start, end; gtk_text_buffer_get_iter_at_mark (state->buffer, &start, tag->mark); gtk_text_buffer_get_end_iter (state->buffer, &end); - gboolean appendNewline = FALSE; - - // Check if this tag is of paragraph type - if (tag->tag) { - gint spacing; - g_object_get (G_OBJECT (tag->tag), "pixels-below-lines", &spacing, NULL); - if (spacing > 0) { // is paragraph - appendNewline = TRUE; - // if last paragraph didn't set "pixe-below-lines", set "pixels-above-lines" - GtkTextIter last_p = start; - gint offset = gtk_text_iter_get_offset (&last_p) - 1; - if (offset >= 0) { - gtk_text_buffer_get_iter_at_offset (state->buffer, &last_p, offset); - if (!gtk_text_iter_has_tag (&last_p, - gtk_text_tag_table_lookup (state->tags, "p"))) { - GtkTextTag *tag; - tag = gtk_text_buffer_create_tag (state->buffer, NULL, - "pixels-above-lines", PARAGRAPH_SPACING, NULL); - gtk_text_buffer_apply_tag (state->buffer, tag, &start, &end); - } - } - } - } - - if (!g_ascii_strcasecmp (element_name, "li")) - appendNewline = TRUE; + gint appendLines = 0; - else if (!g_ascii_strcasecmp (element_name, "blockquote")) - state->left_margin -= BLOCKQUOTE_MARGIN; - else if (!g_ascii_strcasecmp (element_name, "ul") || - !g_ascii_strcasecmp (element_name, "ol")) { - state->left_margin -= LISTS_MARGIN; + if (isIdentTag (element_name)) + state->left_margin -= IDENT_MARGIN; + if (!g_ascii_strcasecmp (element_name, "ul") || + !g_ascii_strcasecmp (element_name, "ol")) { HTMLList *last_list = g_list_last (state->html_list)->data; state->html_list = g_list_remove (state->html_list, last_list); g_free (last_list); @@ -449,18 +451,28 @@ else if (!g_ascii_strcasecmp (element_name, "pre")) { state->pre_mode = FALSE; +/* + // \n must be inserted as char *txt = gtk_text_buffer_get_text (state->buffer, &start, &end, TRUE); char endc = txt ? txt[strlen(txt) - 1] : '\0'; - appendNewline = endc != '\r' && endc != '\n'; - g_free (txt); + appendLines = (endc != '\r' && endc != '\n') ? 1 : 0; + g_free (txt);*/ } else if (!g_ascii_strcasecmp (element_name, "br")) - appendNewline = TRUE; + appendLines = 1; + + if (isBlockTag (element_name)) + { + appendLines = 2; + if (!g_ascii_strcasecmp (element_name, "li")) + appendLines = 1; + } - if (appendNewline) { - gtk_text_buffer_insert (state->buffer, &end, "\n", -1); + if (appendLines) { + gtk_text_buffer_insert (state->buffer, &end, + appendLines == 1 ? "\n" : "\n\n", -1); gtk_text_buffer_get_iter_at_mark (state->buffer, &start, tag->mark); gtk_text_buffer_get_end_iter (state->buffer, &end); } @@ -519,9 +531,9 @@ rt_error }; -GtkWidget *ygtk_richtext_new (void) +GtkWidget *ygtk_rich_text_new (void) { - return g_object_new (YGTK_TYPE_RICHTEXT, NULL); + return g_object_new (YGTK_TYPE_RICH_TEXT, NULL); } /* String preparation methods. */ @@ -558,8 +570,8 @@ rtext->prodname = g_strdup (prodname); } -void ygtk_richtext_set_text (YGtkRichText* rtext, const gchar* text, - gboolean rich_text) +void ygtk_rich_text_set_text (YGtkRichText* rtext, const gchar* text, + gboolean rich_text) { GtkTextBuffer *buffer; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (rtext)); @@ -580,46 +592,29 @@ char *xml = ygutils_convert_to_xhmlt_and_subst (text, rtext->prodname); GError *error = NULL; - if (!g_markup_parse_context_parse (ctx, xml, -1, &error)) + if (!g_markup_parse_context_parse (ctx, xml, -1, &error)) { +#ifdef PRINT_WARNINGS g_warning ("Markup parse error '%s'", error ? error->message : "Unknown"); +#endif + } g_free (xml); g_markup_parse_context_free (ctx); GRTParseState_free (&state); -} - -void ygtk_richtext_set_background (YGtkRichText *rtext, const char *image) -{ - g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (rtext))); - - GdkWindow *window = gtk_text_view_get_window - (GTK_TEXT_VIEW (rtext), GTK_TEXT_WINDOW_TEXT); - - if (!image) { - gdk_window_clear (window); - return; - } - GError *error = 0; - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (image, &error); - if (!pixbuf) { - g_warning ("ygtkrichtext: could not open background image: '%s'" - " - %s", image, error->message); - return; - } - - GdkPixmap *pixmap; - gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf, - gdk_drawable_get_colormap (GDK_DRAWABLE (window)), &pixmap, NULL, 0); - g_object_unref (G_OBJECT (pixbuf)); - - gdk_window_set_back_pixmap (window, pixmap, FALSE); + // remove last empty line, if any + GtkTextIter end_it, before_end_it; + gtk_text_buffer_get_end_iter (buffer, &end_it); + before_end_it = end_it; + 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); } /* gtk_text_iter_forward_search() is case-sensitive so we roll our own. The idea is to keep use get_text and strstr there, but to be more efficient we check per line. */ -static gboolean ygtk_richtext_forward_search (const GtkTextIter *begin, +static gboolean ygtk_rich_text_forward_search (const GtkTextIter *begin, const GtkTextIter *end, const gchar *_key, GtkTextIter *match_start, GtkTextIter *match_end) { @@ -653,7 +648,7 @@ return FALSE; } -gboolean ygtk_richtext_mark_text (YGtkRichText *rtext, const gchar *text) +gboolean ygtk_rich_text_mark_text (YGtkRichText *rtext, const gchar *text) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (rtext)); GtkTextIter iter, end, match_start, match_end; @@ -666,7 +661,7 @@ return TRUE; gboolean found = FALSE; - while (ygtk_richtext_forward_search (&iter, &end, text, + while (ygtk_rich_text_forward_search (&iter, &end, text, &match_start, &match_end)) { found = TRUE; gtk_text_buffer_apply_tag_by_name (buffer, "keyword", &match_start, &match_end); @@ -676,7 +671,7 @@ return found; } -gboolean ygtk_richtext_forward_mark (YGtkRichText *rtext, const gchar *text) +gboolean ygtk_rich_text_forward_mark (YGtkRichText *rtext, const gchar *text) { GtkTextIter start_iter, end_iter; GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (rtext)); @@ -685,11 +680,11 @@ gtk_text_buffer_get_end_iter (buffer, &end_iter); gboolean found; - found = ygtk_richtext_forward_search (&start_iter, &end_iter, text, + found = ygtk_rich_text_forward_search (&start_iter, &end_iter, text, &start_iter, &end_iter); if (!found) { gtk_text_buffer_get_start_iter (buffer, &start_iter); - found = ygtk_richtext_forward_search (&start_iter, &end_iter, text, + found = ygtk_rich_text_forward_search (&start_iter, &end_iter, text, &start_iter, &end_iter); } @@ -702,17 +697,18 @@ return FALSE; } -void ygtk_richtext_class_init (YGtkRichTextClass *klass) +void ygtk_rich_text_class_init (YGtkRichTextClass *klass) { GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass); - gtkwidget_class->motion_notify_event = ygtk_richtext_motion_notify_event; - gtkwidget_class->visibility_notify_event = ygtk_richtext_visibility_notify_event; + gtkwidget_class->motion_notify_event = ygtk_rich_text_motion_notify_event; + gtkwidget_class->visibility_notify_event = ygtk_rich_text_visibility_notify_event; GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass); - gtkobject_class->destroy = ygtk_richtext_destroy; + gtkobject_class->destroy = ygtk_rich_text_destroy; - link_pressed_signal = g_signal_new ("link-pressed", + link_clicked_signal = g_signal_new ("link-clicked", G_TYPE_FROM_CLASS (G_OBJECT_CLASS (klass)), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (YGtkRichTextClass, link_pressed), NULL, NULL, + G_STRUCT_OFFSET (YGtkRichTextClass, link_clicked), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); } + Modified: trunk/gtk/src/ygtkrichtext.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.h?rev=41442… ============================================================================== --- trunk/gtk/src/ygtkrichtext.h (original) +++ trunk/gtk/src/ygtkrichtext.h Tue Oct 16 16:47:05 2007 @@ -7,23 +7,23 @@ avoid dependencies. */ -#ifndef YGTK_RICHTEXT_H -#define YGTK_RICHTEXT_H +#ifndef YGTK_RICH_TEXT_H +#define YGTK_RICH_TEXT_H #include <gtk/gtktextview.h> G_BEGIN_DECLS -#define YGTK_TYPE_RICHTEXT (ygtk_richtext_get_type ()) -#define YGTK_RICHTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - YGTK_TYPE_RICHTEXT, YGtkRichText)) -#define YGTK_RICHTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ - YGTK_TYPE_RICHTEXT, YGtkRichTextClass)) -#define YGTK_IS_RICHTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - YGTK_TYPE_RICHTEXT)) -#define YGTK_IS_RICHTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - YGTK_TYPE_RICHTEXT)) -#define YGTK_RICHTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - YGTK_TYPE_RICHTEXT, YGtkRichTextClass)) +#define YGTK_TYPE_RICH_TEXT (ygtk_rich_text_get_type ()) +#define YGTK_RICH_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_RICH_TEXT, YGtkRichText)) +#define YGTK_RICH_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_RICH_TEXT, YGtkRichTextClass)) +#define YGTK_IS_RICH_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_RICH_TEXT)) +#define YGTK_IS_RICH_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_RICH_TEXT)) +#define YGTK_RICH_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_RICH_TEXT, YGtkRichTextClass)) typedef struct _YGtkRichText { @@ -37,25 +37,23 @@ GtkTextViewClass parent_class; // signals: - void (*link_pressed) (YGtkRichText *rich_text, const gchar *link); + void (*link_clicked) (YGtkRichText *rich_text, const gchar *link); } YGtkRichTextClass; -GtkWidget* ygtk_richtext_new(); -GType ygtk_richtext_get_type (void) G_GNUC_CONST; +GtkWidget* ygtk_rich_text_new (void); +GType ygtk_rich_text_get_type (void) G_GNUC_CONST; /* Sets some text to YGtkRichText, may be HTML or plain text, as indicated by rich_text. */ -void ygtk_richtext_set_text (YGtkRichText* rtext, const gchar* text, +void ygtk_rich_text_set_text (YGtkRichText* rtext, const gchar* text, gboolean rich_text); void ygtk_richttext_set_prodname (YGtkRichText *rtext, const char *prodname); -// Set a background image -- widget must be realized -void ygtk_richtext_set_background (YGtkRichText *rtext, const char *image); - // To be used together with an entry box to search for text -gboolean ygtk_richtext_mark_text (YGtkRichText *rtext, const gchar *text); -gboolean ygtk_richtext_forward_mark (YGtkRichText *rtext, const gchar *text); // F3 +gboolean ygtk_rich_text_mark_text (YGtkRichText *rtext, const gchar *text); +gboolean ygtk_rich_text_forward_mark (YGtkRichText *rtext, const gchar *text); // F3 G_END_DECLS -#endif /* YGTK_RICHTEXT_H */ +#endif /* YGTK_RICH_TEXT_H */ + Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=41442&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Tue Oct 16 16:47:05 2007 @@ -11,7 +11,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <string.h> -#include "ygtkrichtext.h" +#include "ygtkhtmlwrap.h" #include "ygtksteps.h" #include "ygtkfindentry.h" @@ -31,13 +31,13 @@ static void ygtk_help_dialog_find_next (YGtkHelpDialog *dialog) { const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->search_entry)); - ygtk_richtext_forward_mark (YGTK_RICHTEXT (dialog->help_text), text); + ygtk_html_wrap_search_next (dialog->help_text, text); } static void search_entry_modified_cb (GtkEditable *editable, YGtkHelpDialog *dialog) { gchar *key = gtk_editable_get_chars (editable, 0, -1); - if (!ygtk_richtext_mark_text (YGTK_RICHTEXT (dialog->help_text), key)) { + if (!ygtk_html_wrap_search (dialog->help_text, key)) { GdkColor red = { 0, 255 << 8, 102 << 8, 102 << 8 }, white = { 0, 255 << 8, 255 << 8, 255 << 8 }; gtk_widget_modify_base (dialog->search_entry, GTK_STATE_NORMAL, &red); @@ -48,7 +48,6 @@ gtk_widget_modify_base (dialog->search_entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_text (dialog->search_entry, GTK_STATE_NORMAL, NULL); } - ygtk_richtext_forward_mark (YGTK_RICHTEXT (dialog->help_text), key); g_free (key); } static void search_entry_activated_cb (GtkEntry *entry, YGtkHelpDialog *dialog) @@ -89,7 +88,7 @@ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (dialog->help_box), GTK_SHADOW_IN); - dialog->help_text = ygtk_richtext_new(); + dialog->help_text = ygtk_html_wrap_new(); gtk_container_add (GTK_CONTAINER (dialog->help_box), dialog->help_text); // bottom part (search entry + close button) @@ -129,8 +128,7 @@ // set help text background gtk_widget_realize (dialog->help_text); - ygtk_richtext_set_background (YGTK_RICHTEXT (dialog->help_text), - THEMEDIR "/wizard/help-background.png"); + ygtk_html_wrap_set_background (dialog->help_text, THEMEDIR "/wizard/help-background.png"); // set close as default widget gtk_widget_grab_default (dialog->close_button); @@ -175,7 +173,7 @@ void ygtk_help_dialog_set_text (YGtkHelpDialog *dialog, const gchar *text) { gtk_editable_delete_text (GTK_EDITABLE (dialog->search_entry), 0, -1); - ygtk_richtext_set_text (YGTK_RICHTEXT (dialog->help_text), text, TRUE); + ygtk_html_wrap_set_text (dialog->help_text, text); } static void ygtk_help_dialog_class_init (YGtkHelpDialogClass *klass) @@ -187,7 +185,7 @@ widget_class->expose_event = ygtk_help_dialog_expose_event; widget_class->realize = ygtk_help_dialog_realize; - // key bindings (eg. F3 for next word) + // key bindings (F3 for next word, Esc to close the window) g_signal_new ("find_next", G_TYPE_FROM_CLASS (G_OBJECT_CLASS (klass)), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (YGtkHelpDialogClass, find_next), Modified: trunk/gtk/tests/RichText2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/RichText2.ycp?rev=4144… ============================================================================== --- trunk/gtk/tests/RichText2.ycp (original) +++ trunk/gtk/tests/RichText2.ycp Tue Oct 16 16:47:05 2007 @@ -22,7 +22,7 @@ + "to the rescue</h1></center><a " + "href=http://en.wikipedia.org/wiki/Superman>Super Man</a> is a very " + "estimated super hero in Metropolis, but he is looked down by others " - + "like mad scientists and politiceans. <img src=image.gif>", + + "like mad scientists and politiceans. <img src=\"tests/image.gif\">", // table (from SlideShow) "<table cellspacing=\"10\" cellpadding=\"5\">" -- 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] r41441 - /branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc
by kmachalkova＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: kmachalkova Date: Mon Oct 15 18:33:07 2007 New Revision: 41441 URL: http://svn.opensuse.org/viewcvs/yast?rev=41441&view=rev Log: Use item->setSelected, it is less expensive than calling selectItem Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc Mon Oct 15 18:33:07 2007 @@ -178,10 +178,10 @@ { //deselect old item oldSelectedItem->setSelected( false ); - //and inform parent widget that a new item has been selected + //explicitely set a new item to selected state //(i.e. override initial selection in construction like this: //`item(`id(1),"foo"), `item (`id(2), "bar, true) ) - selectItem( item ); + item->setSelected( true ); } } -- 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] r41440 - in /branches/tmp/sh/mod-ui/ncurses/src: NCComboBox.cc NCComboBox.h NCPopupList.cc NCPopupTable.cc README_mod-ui
by kmachalkova＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: kmachalkova Date: Mon Oct 15 18:19:47 2007 New Revision: 41440 URL: http://svn.opensuse.org/viewcvs/yast?rev=41440&view=rev Log: - Do not add combobox entries twice - Fixed selecting entries - Removed mostly obsoleted stuff (getValue, setValue) - setInputMaxLength adapted Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.h branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc Mon Oct 15 18:19:47 2007 @@ -48,7 +48,7 @@ WIDDBG << endl; setLabel( nlabel ); hotlabel = &label; - setValue( "" ); + setText( "" ); } /////////////////////////////////////////////////////////////////// @@ -161,19 +161,6 @@ NCWidget::wDelete(); } -#if 0 -void NCComboBox::itemAdded( const YCPString & ntext, - int idx, - bool selected ) -{ - deflist.push_back( ntext ); - if ( selected || index == -1 ) { - setValue( ntext ); - index = idx; - } -} -#endif - /////////////////////////////////////////////////////////////////// // // @@ -191,7 +178,7 @@ deflist.push_back( item->label() ); if ( item->selected() || index == -1 ) { - setValue( item->label() ); + setText( item->label() ); index = item->index(); } } @@ -213,7 +200,7 @@ deflist.push_back( label ); if ( selected || index == -1 ) { - setValue( label ); + setText( label ); index = item->index(); } } @@ -253,7 +240,7 @@ string::size_type h = strip.find( '&' ); if ( h != string::npos ) strip.erase( h, 1 ); - setValue( strip ); + setText( strip ); index = idx; break; } @@ -275,26 +262,6 @@ return index; } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCComboBox::setValue -// METHOD TYPE : void -// -// DESCRIPTION : -// -void NCComboBox::setValue( const string & ntext ) -{ - privText = NCstring( ntext ); - buffer = privText.str(); - modified = false; - fldstart = 0; - curpos = mayedit ? buffer.length() : 0; - index = -1; - setDefsze(); - tUpdate(); - Redraw(); -} /////////////////////////////////////////////////////////////////// // @@ -317,33 +284,6 @@ Redraw(); } -#if 0 -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCComboBox::getValue -// METHOD TYPE : YCPString -// -// DESCRIPTION : -// -YCPString NCComboBox::getValue() const -{ - if ( modified ) - return NCstring( buffer ).YCPstr(); - - if ( index != -1 ) { - int idx = 0; - list<YCPString>::const_iterator entry; - for ( entry = deflist.begin(); entry != deflist.end(); ++entry, ++idx ) { - if ( idx == index ) { - return *entry; - } - } - } - - return text.YCPstr(); -} -#endif string NCComboBox::text() { @@ -668,8 +608,6 @@ if (!deflist.empty()) { wpos at( ScreenPos() + wpos( win->height(), -1 ) ); NCPopupList * dialog = new NCPopupList( at, "", deflist, index ); - dialog->createEntries( deflist, index ); - dialog->dumpWidgetTree(); int idx = dialog->post(); if ( idx != -1 ) setCurrentItem( idx ); @@ -691,14 +629,12 @@ void NCComboBox::deleteAllItems() { YComboBox::deleteAllItems(); deflist.clear(); - setValue( "" ); + setText( "" ); } -void NCComboBox::setInputMaxLength( const YCPInteger & numberOfChars) +void NCComboBox::setInputMaxLength( int nr) { - int nr = numberOfChars->asInteger()->value(); - // if there is more text then the maximum number of chars, // truncate the text and update the buffer if ( nr >= 0 && (int)buffer.length() > nr ) { Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.h Mon Oct 15 18:19:47 2007 @@ -60,7 +60,7 @@ NCstring validChars; list<string> deflist; - int index; + int index; void setDefsze(); void tUpdate(); @@ -109,12 +109,6 @@ virtual void setLabel( const string & nlabel ); - // FIXME - internally used? move to private? or obsolete? same as setText() ? - virtual void setValue( const string & ntext ); -#if 0 - virtual YCPString getValue() const; -#endif - virtual void setText( const string & ntext ); virtual string text(); @@ -139,7 +133,7 @@ // limits the input to numberOfChars characters and truncates the text // if appropriate - void setInputMaxLength( const YCPInteger & numberOfChars); + void setInputMaxLength( int nr ); }; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc Mon Oct 15 18:19:47 2007 @@ -61,7 +61,6 @@ createList( row ); for ( list<string>::const_iterator entry = deflist.begin(); entry != deflist.end(); ++entry ) { - //row[0] = (*entry); YItem *item = new YTableItem( (*entry )); addItem( item ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Mon Oct 15 18:19:47 2007 @@ -68,8 +68,6 @@ sellist->SetHotCol( 0 ); sellist->setNotify( true ); - currentDialog()->dumpWidgetTree(); - } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Mon Oct 15 18:19:47 2007 @@ -41,11 +41,6 @@ This leads to segfault when widgets are deleted from YUI at the end! call YDialog::deleteTopmostDialog(); to delete NCPopupList -FIXME: entries are added twice -> see FileSelection examples - check setValue() (not used ???) -TODO: Do something with adding items into NCPopupList, so that -they can be read back. - NCPopupMenu/NCMenuButton ------------------------- -- 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] r41439 - /branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc
by kmachalkova＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: kmachalkova Date: Mon Oct 15 18:10:39 2007 New Revision: 41439 URL: http://svn.opensuse.org/viewcvs/yast?rev=41439&view=rev Log: Fixed explicit selecting other than 1st item e.g (`item(`id(1),"foo"), `item (`id(2), "bar, true) if single selection is enforced Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc Mon Oct 15 18:10:39 2007 @@ -176,7 +176,12 @@ if ( oldSelectedItem && oldSelectedItem != item ) { + //deselect old item oldSelectedItem->setSelected( false ); + //and inform parent widget that a new item has been selected + //(i.e. override initial selection in construction like this: + //`item(`id(1),"foo"), `item (`id(2), "bar, true) ) + selectItem( item ); } } -- 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] r41438 - /tags/branch-SLE-10-SP1-2_13_15/product-creator/
by jsuchome＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: jsuchome Date: Mon Oct 15 18:01:45 2007 New Revision: 41438 URL: http://svn.opensuse.org/viewcvs/yast?rev=41438&view=rev Log: Created tag branch-SLE-10-SP1-2_13_15 for product-creator Added: tags/branch-SLE-10-SP1-2_13_15/product-creator/ - copied from r41437, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r41437 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/complex.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: jsuchome Date: Mon Oct 15 18:01:08 2007 New Revision: 41437 URL: http://svn.opensuse.org/viewcvs/yast?rev=41437&view=rev Log: - update defaultroot only for new configurations (#327057) - check for absolute paths in boot image entry - index repositories by url, not by order - 2.13.15 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Mon Oct 15 18:01:08 2007 @@ -1 +1 @@ -2.13.14 +2.13.15 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon Oct 15 18:01:08 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Oct 15 16:41:48 CEST 2007 - jsuchome(a)suse.cz + +- update defaultroot only for new configurations (#327057) +- check for absolute paths in boot image entry +- index repositories by url, not by order +- 2.13.15 + +------------------------------------------------------------------- Mon Oct 15 13:27:11 CEST 2007 - jsuchome(a)suse.cz - fix initializing when going Back (#332581) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Mon Oct 15 18:01:08 2007 @@ -41,10 +41,10 @@ list<map> all_sources = []; // repositories used for current configuration - global map <integer,map> current_repositories = $[]; + global map <string,map> current_repositories = $[]; // initial system repositories - global map <integer,map> initial_repositories = $[]; + global map <string,map> initial_repositories = $[]; // where the kiwi configuration files are stored string config_dir = ""; @@ -95,8 +95,8 @@ map ret = $[]; // first check if we weren't importing this source: - foreach (integer id, map repo, current_repositories, { - if (repo["url"]:"" == source && repo["org"]:$[] != $[]) + foreach (string url, map repo, current_repositories, { + if (url == source && repo["org"]:$[] != $[]) { ret = $[ "__key" : "repository", @@ -320,8 +320,9 @@ chroot_dir = tmp_dir + "/myphysical"; if (KiwiConfig["defaultroot"]:"" != "") { - chroot_dir = - KiwiConfig["defaultroot"]:"" + "/" + KiwiConfig["name"]:""; + chroot_dir = KiwiConfig["defaultroot"]:""; + if (KiwiConfig["new_configuration"]:false) + chroot_dir = chroot_dir + "/" + KiwiConfig["name"]:""; KiwiConfig["defaultroot"] = chroot_dir; } @@ -687,10 +688,9 @@ * @patam Config configuration map, as read from config.xml * @param dir path to directory containing this config.xml */ - global map <integer,map> ImportImageRepositories (map Config, string dir) { + global map <string,map> ImportImageRepositories (map Config, string dir) { current_repositories = $[]; - integer i = 0; foreach (map repo, (list<map>) Config["repository"]:[], { string source = repo["source",0,"path"]:""; if (source != "") @@ -703,12 +703,12 @@ } if (substring (source, 0, 1) == "/") url = "dir://"; - current_repositories [i] = $[ - "url" : url + source, + url = url + source; + current_repositories [url] = $[ + "url" : url, "plaindir" : repo["type"]:"" == "rpm-dir", "org" : repo, ]; - i = i + 1; } }); return current_repositories; @@ -717,19 +717,17 @@ /** * Initialize the list of current repositories */ - global map <integer,map> InitCurrentRepositories () { + global map <string,map> InitCurrentRepositories () { Pkg::SourceRestore (); - integer i = 0; foreach (map source, Pkg::SourceEditGet (), { integer srcid = source["SrcId"]:-1; map data = Pkg::SourceGeneralData (srcid); string url = data["url"]:""; - current_repositories[i] = $[ + current_repositories[url] = $[ "url" : url, "plaindir" : data["type"]:"" == "Plaindir" ]; - i = i + 1; }); return current_repositories; } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Mon Oct 15 18:01:08 2007 @@ -663,7 +663,9 @@ { string bootdir = ProductCreator::Config["type",task,"boot"]:""; if (bootdir == "" || - !FileUtils::Exists ("/usr/share/kiwi/image/" + bootdir)) + (!FileUtils::Exists ("/usr/share/kiwi/image/" + bootdir) && + !FileUtils::Exists (bootdir)) + ) { to_install = add (to_install, sformat("kiwi-desc-%1boot", task)); } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Mon Oct 15 18:01:08 2007 @@ -1458,7 +1458,7 @@ string kiwi_configuration = Config["kiwi_configuration_" + kiwi_task]:""; string name = Config["name"]:""; string out_dir = Config["iso-directory"]:""; - map <integer,map> repositories = Kiwi::current_repositories; + map <string,map> repositories = Kiwi::current_repositories; boolean new_configuration = (Config == $[]); boolean append_name = false; @@ -1542,23 +1542,21 @@ // on start, show the default YaST sources if (Config["sources"]:[] != [] && repositories == $[]) { - integer i = 0; foreach (string src, Config["sources"]:[], { - repositories[i] = $[ + repositories[src] = $[ "url" : src, ]; - i = i + 1; }); } - list system_repo_items = maplist (integer id, map repo, + list system_repo_items = maplist (string url, map repo, Kiwi::initial_repositories, { - return `item (`id (id), repo["url"]:""); + return `item (`id (url), url); }); void update_repo_table () { UI::ChangeWidget (`id (`repositories), `Items, maplist ( - integer id, map repo, repositories, ``( - `item (`id (id), repo["url"]:"")) + string url, map repo, repositories, ``( + `item (`id (url), url)) )); } @@ -1656,13 +1654,6 @@ `Label (""), `PushButton (`id (`browse), Label::BrowseButton ()) ) - /* - `VBox ( - `Label (""), - // checkbox label - `CheckBox (`id (`append), _("A&ppend Name"), append_name) - ) - */ ), `VSpacing (0.2), `Table (`id(`repositories), `header ( @@ -1745,19 +1736,12 @@ string dir = (string) UI::QueryWidget (`id (`template), `Value); update_config (dir, Kiwi::Templates[dir]:$[]); } - else if (is (ret, integer)) // system repository selected + else if (is (ret, string)) // system repository selected { - map system_repo = Kiwi::initial_repositories[(integer)ret]:$[]; - boolean present = false; - foreach (integer id, map repo, repositories, { - if (repo["url"]:"" == system_repo["url"]:"") - { - present = true; - break; - } - }); - if (present) continue; - repositories[size (repositories)] = system_repo; + map system_repo = Kiwi::initial_repositories[(string)ret]:$[]; + if (!haskey (repositories, (string)ret)) + repositories[(string)ret] = system_repo; + update_repo_table (); } else if (ret == `add) @@ -1786,15 +1770,8 @@ Wizard::CloseDialog (); if (url != "") { - boolean present = false; - foreach (integer id, map repo, repositories, { - if (repo["url"]:"" == url) - { - present = true; - break; - } - }); - if (present) continue; + if (haskey (repositories, url)) + continue; map parsed = URL::Parse(url); if (parsed["scheme"]:"" == "pkg") @@ -1802,7 +1779,7 @@ parsed["scheme"] = "dir"; url = URL::Build (parsed); } - repositories[size (repositories)] = $[ + repositories[url] = $[ "url" : url, "plaindir" : parsed["scheme"]:"" == "dir" ]; @@ -1811,11 +1788,10 @@ } else if (ret == `edit) { - integer selected = (integer) + string url = (string) UI::QueryWidget (`id (`repositories), `CurrentItem); - string url = repositories[selected,"url"]:""; string selected_url = url; - boolean plaindir = repositories[selected,"plaindir"]:false; + boolean plaindir = repositories[url,"plaindir"]:false; // change schema if the source type is plaindir // to show the right popup dialog if (plaindir) @@ -1828,14 +1804,14 @@ if (url == "" || url == nil || url == selected_url); continue; // remove current url + add new one - repositories = remove (repositories, selected); + repositories = remove (repositories, url); map parsed = URL::Parse(url); if (parsed["scheme"]:"" == "pkg") { parsed["scheme"] = "dir"; url = URL::Build (parsed); } - repositories[size (repositories)] = $[ + repositories[url] = $[ "url" : url, "plaindir" : parsed["scheme"]:"" == "dir" ]; @@ -1843,7 +1819,7 @@ } else if (ret == `delete) { - integer selected = (integer) + string selected = (string) UI::QueryWidget (`id (`repositories), `CurrentItem); repositories = remove (repositories, selected); update_repo_table (); @@ -1911,7 +1887,8 @@ (new_configuration ? "/" + name : ""); Config["name"] = name; Config["sources"] = maplist ( - integer id, map repo, repositories, ``(repo["url"]:"")); + string url, map repo, repositories, ``(url)); + Config["new_configuration"] = new_configuration; if (Config["sources"]:[] != []) { ProductCreator::enable_sources = false; @@ -1924,8 +1901,7 @@ current_sources[url] = srcid; }); // initialize new repos now - foreach (integer id, map repo, repositories, { - string url = repo["url"]:""; + foreach (string url, map repo, repositories, { if (substring (url, 0, 1) == "/") url = "dir://" + url; if (haskey (current_sources, url)) -- 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] r41436 - /tags/stable-2_16_0/samba-server/
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 16:58:07 2007 New Revision: 41436 URL: http://svn.opensuse.org/viewcvs/yast?rev=41436&view=rev Log: Created tag stable-2_16_0 for samba-server Added: tags/stable-2_16_0/samba-server/ - copied from r41435, trunk/samba-server/ -- 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] r41435 - /trunk/samba-server/VERSION
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 16:57:13 2007 New Revision: 41435 URL: http://svn.opensuse.org/viewcvs/yast?rev=41435&view=rev Log: 2.16.0 Modified: trunk/samba-server/VERSION Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=41435&r… ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Mon Oct 15 16:57:13 2007 @@ -1 +1 @@ -2.16.1 +2.16.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] r41434 - in /trunk/samba-server: package/yast2-samba-server.changes src/helps.ycp
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 16:56:06 2007 New Revision: 41434 URL: http://svn.opensuse.org/viewcvs/yast?rev=41434&view=rev Log: - Extended help for auth-sources. Modified: trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/helps.ycp Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Oct 15 16:56:06 2007 @@ -4,6 +4,7 @@ - Correctly display user-shares status when adjusting it and switching between different tabs at one YaST run (#332838). - Changing position of dialog buttons to fit the YaST Style Guide. +- Extended help for auth-sources. - 2.16.0 ------------------------------------------------------------------- Modified: trunk/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/helps.ycp?rev=4… ============================================================================== --- trunk/samba-server/src/helps.ycp (original) +++ trunk/samba-server/src/helps.ycp Mon Oct 15 16:56:06 2007 @@ -186,7 +186,8 @@ "passdb_edit" : _("<big>User Authentication Information Back-Ends</big> Here, choose where the Samba server should look for the authentication information. Samba does not support multiple back-ends at once anymore, -only one is allowed. +only one is allowed. To add a new authentication source, delete the old one, +then you can add it. ") + /* passdb backend configuration dialog help 2/7 */ _("smbpasswd file is the file using the same format as -- 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] r41433 - /trunk/samba-server/package/yast2-samba-server.changes
by locilka＠svn.opensuse.org 15 Oct '07

15 Oct '07

Author: locilka Date: Mon Oct 15 16:50:16 2007 New Revision: 41433 URL: http://svn.opensuse.org/viewcvs/yast?rev=41433&view=rev Log: ! 2.16.0 ! Modified: trunk/samba-server/package/yast2-samba-server.changes Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Oct 15 16:50:16 2007 @@ -4,7 +4,7 @@ - Correctly display user-shares status when adjusting it and switching between different tabs at one YaST run (#332838). - Changing position of dialog buttons to fit the YaST Style Guide. -- 2.16.1 +- 2.16.0 ------------------------------------------------------------------- Tue Jun 5 13:32:13 CEST 2007 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0