February 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45095 - in /trunk/gtk: ./ src/
by rpmcruz＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: rpmcruz Date: Wed Feb 27 22:13:55 2008 New Revision: 45095 URL: http://svn.opensuse.org/viewcvs/yast?rev=45095&view=rev Log: * src/YGComboBox.cc / YGSelectionModel.cc/h: bug fix: honor select item flag when on editable mode. * src/YGMultiLineEdit.cc (YGRichText): bug fix (#365257): honor default text when on plain text mode. * src/YGMultiLineEdit.cc (YGRichText): libyui sync: support toggle function between plain text and rich text mode. * src/YGPackageSelector.cc: truncate repository combo at the 25th character. * src/yzyppwrapper.cc: added 10.3 zypp compatibility flag. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGComboBox.cc trunk/gtk/src/YGMultiLineEdit.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGSelectionModel.cc trunk/gtk/src/YGSelectionModel.h trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/test.cc trunk/gtk/src/ygtkhtmlwrap.c trunk/gtk/src/ygtkhtmlwrap.h trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/ygtkrichtext.h trunk/gtk/src/ygtkwizard.c trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=45095&r1=45094… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Feb 27 22:13:55 2008 @@ -14,6 +14,34 @@ * src/YGUI.h/cc: sync with libyui changes: moved some methods from YUI to YApplication. + * src/YGComboBox.cc / YGSelectionModel.cc/h: bug fix: honor select item flag + when on editable mode. + + * src/YGMultiLineEdit.cc (YGRichText): bug fix (#365257): honor default text + when on plain text mode. + * src/YGMultiLineEdit.cc (YGRichText): libyui sync: support toggle function + between plain text and rich text mode. + + * src/YGPackageSelector.cc: truncate repository combo at the 25th character. + + * src/yzyppwrapper.cc: added 10.3 zypp compatibility flag. + +2008-02-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/yzyppwrapper.cc: got rid of depreacated warning. + + * src/YGPackageSelector.cc (DiskView): highlight near full disk on table. + + * src/ygtkwizard.c: help-background.png no longer shipped with 11.0. Disable + help dialog background. + + * src/YGIntField.cc (YSlider): don't draw values (that's what the side + int field is for). + + * src/YGLayout.cc: removed label alignment tweak for non-stretchable widgets. + + * src/YGUI.h/cc: sync with libyui changes: moved some methods from YUI to YApplication. + 2008-02-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (DiskView): fixed #363473 and enabled as a Modified: trunk/gtk/src/YGComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGComboBox.cc?rev=45095&… ============================================================================== --- trunk/gtk/src/YGComboBox.cc (original) +++ trunk/gtk/src/YGComboBox.cc Wed Feb 27 22:13:55 2008 @@ -43,6 +43,11 @@ inline GtkComboBox *getComboBox() { return GTK_COMBO_BOX (getWidget()); } + void blockEvents() + { g_signal_handlers_block_by_func (getWidget(), (gpointer) selected_changed_cb, this); } + void unblockEvents() + { g_signal_handlers_unblock_by_func (getWidget(), (gpointer) selected_changed_cb, this); } + GtkEntry *getEntry() { if (!GTK_IS_COMBO_BOX_ENTRY (getWidget())) { @@ -67,23 +72,24 @@ virtual void setText (const string &value) { IMPL + blockEvents(); gtk_entry_set_text (getEntry(), value.c_str()); + unblockEvents(); } // YGSelectionModel - virtual void setFocusItem (GtkTreeIter *iter, bool addingRow) + virtual void setFocusItem (GtkTreeIter *iter) { - // GtkComboBox wants a string on the model, not NULL, when setting it as - // the active row. As, we only set that value after addingRow, we need to - // initialize it here... - if (addingRow) - setCellLabel (iter, YGSelectionModel::LABEL_COLUMN, string()); + blockEvents(); gtk_combo_box_set_active_iter (getComboBox(), iter); + unblockEvents(); } virtual void unsetFocus() { + blockEvents(); gtk_combo_box_set_active (getComboBox(), -1); + unblockEvents(); } virtual YItem *focusItem() 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 Wed Feb 27 22:13:55 2008 @@ -156,40 +156,13 @@ } #include "YRichText.h" - -class YGPlainText : public YRichText, public YGTextView -{ -bool m_autoScrollDown; - -public: - YGPlainText(YWidget *parent, const string &text) - : YRichText (NULL, text) - , YGTextView (this, parent, string(), false) - { - if (shrinkable()) - setMinSizeInChars (0, 0); - } - - // YRichText - virtual void setValue (const string &text) - { - IMPL - YGTextView::setText (text); - if (autoScrollDown()) - scrollToBottom(); - YRichText::setValue (text); - } - - YGWIDGET_IMPL_COMMON -}; - #include "ygtkhtmlwrap.h" -class YGRichText : public YRichText, public YGScrolledWidget +class YGRichText : public YRichText, YGScrolledWidget { public: - YGRichText (YWidget *parent, const string &text) - : YRichText (NULL, text) + YGRichText (YWidget *parent, const string &text, bool plainText) + : YRichText (NULL, text, plainText) , YGScrolledWidget (this, parent, true, ygtk_html_wrap_get_type(), NULL) { IMPL @@ -198,23 +171,56 @@ ygtk_html_wrap_init (getWidget()); ygtk_html_wrap_connect_link_clicked (getWidget(), G_CALLBACK (link_clicked_cb), this); - setValue (text); + setText (text, plainText); } - // YRichText - virtual void setValue (const string &_text) + void setPlainText (const string &text) + { + ygtk_html_wrap_set_text (getWidget(), text.c_str(), TRUE); + } + + void setRichText (const string &_text) { - IMPL string text (_text); std::string productName = YUI::app()->productName(); YGUtils::replace (text, "&product;", 9, productName.c_str()); + ygtk_html_wrap_set_text (getWidget(), text.c_str(), FALSE); + } + + void scrollToBottom() + { + ygtk_html_wrap_scroll (getWidget(), FALSE); + } - ygtk_html_wrap_set_text (getWidget(), text.c_str()); + void setText (const string &text, bool plain_mode) + { + plain_mode ? setPlainText (text) : setRichText (text); if (autoScrollDown()) - ygtk_html_wrap_scroll (getWidget(), FALSE); - YRichText::setValue (_text); + scrollToBottom(); + } + + // YRichText + virtual void setValue (const string &text) + { + IMPL + setText (text, plainTextMode()); + YRichText::setValue (text); } + virtual void setAutoScrollDown (bool on) + { + if (on) scrollToBottom(); + YRichText::setAutoScrollDown (on); + } + + virtual void setPlainTextMode (bool plain_mode) + { + if (plain_mode != plainTextMode()) + setText (value(), plain_mode); + YRichText::setPlainTextMode (plain_mode); + } + + // events static void link_clicked_cb (GtkWidget *widget, const char *url, YGRichText *pThis) { YGUI::ui()->sendEvent (new YMenuEvent (url)); @@ -223,155 +229,10 @@ YGWIDGET_IMPL_COMMON }; + YRichText *YGWidgetFactory::createRichText (YWidget *parent, const string &text, bool plainTextMode) { - if (plainTextMode) - return new YGPlainText (parent, text); - else - return new YGRichText (parent, text); -} - -#if 0 -/* Wrote this code, in order to allow the user to print a package license. - But they are written in HTML, so that was too much for me. Anyway, might - be needed in the future -- it prints text okay. Maybe we could adapt it to - YGtkRichText, so that it just iterates through its tags (its a GtkTextView - afterall), rather than doing html parsing. ugh. Maybe we could somehow re-use - GtkTextView GtkLayouts...*/ - -typedef struct { - gchar *title, *text; - PangoLayout *title_layout, *text_layout; - gint cur_line; -} PrintData; - - -static void free_print_data_cb (gpointer _data, GClosure *closure) -{ - PrintData *data = _data; -fprintf (stderr, "freeing print data '%s'\n", data->title); - g_free (data->title); - g_free (data->text); - if (data->title_layout) - g_object_unref (G_OBJECT (data->title_layout)); - if (data->text_layout) - g_object_unref (G_OBJECT (data->text_layout)); - g_free (data); -} - -static void print_begin_cb (GtkPrintOperation *print, GtkPrintContext *context, PrintData *data) -{ - int width = gtk_print_context_get_width (context); - int height = gtk_print_context_get_height (context); - - PangoFontDescription *desc; - desc = pango_font_description_from_string ("Sans 12"); - - data->text_layout = gtk_print_context_create_pango_layout (context); - pango_layout_set_font_description (data->text_layout, desc); - pango_layout_set_width (data->text_layout, width * PANGO_SCALE); - pango_layout_set_text (data->text_layout, data->text, -1); - - data->title_layout = gtk_print_context_create_pango_layout (context); - pango_layout_set_font_description (data->title_layout, desc); - pango_layout_set_width (data->title_layout, width * PANGO_SCALE); - pango_layout_set_text (data->title_layout, data->title, -1); - - pango_font_description_free (desc); - - int title_height, text_height; - pango_layout_get_pixel_size (data->title_layout, NULL, &title_height); - title_height += 10; - pango_layout_get_pixel_size (data->text_layout, NULL, &text_height); - - int pages_nb, page_height = height - title_height; - pages_nb = text_height / page_height; - if (text_height % page_height != 0) - pages_nb++; - data->cur_line = 0; -fprintf (stderr, "print begin: will use %d pages\n", pages_nb); - gtk_print_operation_set_n_pages (print, pages_nb); -} - -static void print_draw_page_cb (GtkPrintOperation *print, GtkPrintContext *context, - gint page_nb, PrintData *data) -{ - int title_height; - pango_layout_get_pixel_size (data->title_layout, NULL, &title_height); - title_height += 10; - - cairo_t *cr = gtk_print_context_get_cairo_context (context); - cairo_set_source_rgb (cr, 0, 0, 0); - - cairo_move_to (cr, 6, 3); - pango_cairo_show_layout (cr, data->title_layout); - - cairo_move_to (cr, 0, title_height-4); - cairo_line_to (cr, gtk_print_context_get_width (context), title_height-4); - cairo_stroke (cr); - - int y = title_height, page_height = 0; - for (;; data->cur_line++) { -fprintf (stderr, "printing line: %d\n", data->cur_line); - PangoLayoutLine *line = pango_layout_get_line_readonly (data->text_layout, - data->cur_line); - if (!line) -{ -fprintf (stderr, "no more lines\n"); - break; -} - PangoRectangle rect; - pango_layout_line_get_pixel_extents (line, NULL, &rect); -fprintf (stderr, "paragraph rect: %d x %d , %d x %d\n", rect.x, rect.y, rect.width, rect.height); - page_height += rect.height; - if (page_height >= gtk_print_context_get_height (context)) -{ -fprintf (stderr, "end of page: %f x %d\n", gtk_print_context_get_height (context), page_height); - break; -} - - cairo_move_to (cr, rect.x, y + rect.height); - pango_cairo_show_layout_line (cr, line); - y += rect.height; - } -} - -void ygtk_html_print_text (GtkWindow *parent_window, const gchar *title, const gchar *text) -{ - PrintData *data = g_new (PrintData, 1); - data->title = g_strdup (title); - data->text = g_strdup (text); - data->title_layout = data->text_layout = NULL; - - GtkPrintOperation *print = gtk_print_operation_new(); - - static GtkPrintSettings *print_settings = NULL; - if (print_settings) - gtk_print_operation_set_print_settings (print, print_settings); - - g_signal_connect (G_OBJECT (print), "begin-print", G_CALLBACK (print_begin_cb), data); - g_signal_connect_data (G_OBJECT (print), "draw-page", G_CALLBACK (print_draw_page_cb), - data, free_print_data_cb, 0); - - GError *error; - GtkPrintOperationResult res; - res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, - parent_window, &error); - if (res == GTK_PRINT_OPERATION_RESULT_ERROR) { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (parent_window, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - "Print error\n%s", error->message); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - g_error_free (error); - } - if (res == GTK_PRINT_OPERATION_RESULT_APPLY) { - if (print_settings) - g_object_unref (print_settings); - print_settings = g_object_ref (gtk_print_operation_get_print_settings (print)); - } + return new YGRichText (parent, text, plainTextMode); } -#endif 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 Wed Feb 27 22:13:55 2008 @@ -1148,7 +1148,8 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (m_repos), _("All Repositories")); for (int i = 0; Ypp::get()->getRepository (i); i++) { const Ypp::Repository *repo = Ypp::get()->getRepository (i); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_repos), repo->name.c_str()); + string repo_name = YGUtils::truncate (repo->name, 25); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_repos), repo_name.c_str()); } gtk_combo_box_set_active (GTK_COMBO_BOX (m_repos), 0); g_signal_connect (G_OBJECT (m_repos), "changed", @@ -1610,7 +1611,7 @@ else str = "--"; } - ygtk_html_wrap_set_text (rtext, str); + ygtk_html_wrap_set_text (rtext, str, FALSE); ygtk_html_wrap_scroll (rtext, TRUE); } }; @@ -1984,7 +1985,7 @@ GtkWidget *license_view, *license_window; license_view = ygtk_html_wrap_new(); - ygtk_html_wrap_set_text (license_view, license.c_str()); + ygtk_html_wrap_set_text (license_view, license.c_str(), FALSE); license_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (license_window), @@ -2074,13 +2075,6 @@ } return FALSE; } - static void truncate (std::string &str, unsigned int size) - { - if (str.size() > size) { - str.erase (size-3); - str += "..."; - } - } }; // model @@ -2088,20 +2082,20 @@ G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_STRING); for (std::list <Ypp::Problem *>::iterator it = problems.begin(); it != problems.end(); it++) { - inner::truncate ((*it)->details, 800); + string details = YGUtils::truncate ((*it)->details, 800); GtkTreeIter problem_iter; gtk_tree_store_append (store, &problem_iter, NULL); gtk_tree_store_set (store, &problem_iter, SHOW_TOGGLE_COL, FALSE, TEXT_COL, (*it)->description.c_str(), WEIGHT_TEXT_COL, PANGO_WEIGHT_BOLD, APPLY_PTR_COL, NULL, - TOOLTIP_TEXT_COL, (*it)->details.c_str(), -1); + TOOLTIP_TEXT_COL, details.c_str(), -1); for (int i = 0; (*it)->getSolution (i); i++) { Ypp::Problem::Solution *solution = (*it)->getSolution (i); - inner::truncate (solution->details, 800); + string sol_details = YGUtils::truncate (solution->details, 800); GtkTreeIter solution_iter; - const gchar *tooltip_text = solution->details.c_str(); - if (solution->details.empty()) + const gchar *tooltip_text = sol_details.c_str(); + if (sol_details.empty()) tooltip_text = NULL; gtk_tree_store_append (store, &solution_iter, &problem_iter); gtk_tree_store_set (store, &solution_iter, SHOW_TOGGLE_COL, TRUE, Modified: trunk/gtk/src/YGSelectionModel.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGSelectionModel.cc?rev=… ============================================================================== --- trunk/gtk/src/YGSelectionModel.cc (original) +++ trunk/gtk/src/YGSelectionModel.cc Wed Feb 27 22:13:55 2008 @@ -54,11 +54,14 @@ void YGSelectionModel::doAddItem (YItem *item) { GtkTreeIter iter; - addRow (&iter, item); + bool empty = isEmpty(); + addRow (&iter, item, false); setCellLabel (&iter, LABEL_COLUMN, item->label()); setCellIcon (&iter, ICON_COLUMN, item->iconName()); for (YItemIterator it = item->childrenBegin(); it != item->childrenEnd(); it++) doAddItem (*it); + if (empty || item->selected()) + setFocusItem (&iter); } void YGSelectionModel::doDeleteAllItems() @@ -95,7 +98,7 @@ { GtkTreeIter iter; if (getIter (item, &iter)) - setFocusItem (&iter, false); + setFocusItem (&iter); } int YGSelectionModel::getPtrCol() @@ -103,7 +106,7 @@ return gtk_tree_model_get_n_columns (getModel()) - 1; } -void YGSelectionModel::addRow (GtkTreeIter *iter, YItem *item) +void YGSelectionModel::addRow (GtkTreeIter *iter, YItem *item, bool honor_select) { struct inner { static void setItemData (GtkTreeModel *model, GtkTreeIter *iter, YItem *item) @@ -122,8 +125,6 @@ } }; - bool empty = isEmpty(); - if (isTree) { GtkTreeStore *store = getTreeStore(); if (item->parent()) { @@ -147,8 +148,8 @@ inner::setItemData (getModel(), iter, item); } - if (item->selected() || empty) - setFocusItem (iter, true); + if (honor_select && item->selected()) + setFocusItem (iter); } void YGSelectionModel::setCellLabel (GtkTreeIter *iter, int col, const string &label) Modified: trunk/gtk/src/YGSelectionModel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGSelectionModel.h?rev=4… ============================================================================== --- trunk/gtk/src/YGSelectionModel.h (original) +++ trunk/gtk/src/YGSelectionModel.h Wed Feb 27 22:13:55 2008 @@ -30,7 +30,7 @@ void doDeleteAllItems(); virtual YItem *focusItem() = 0; - virtual void setFocusItem (GtkTreeIter *iter, bool addingRow) = 0; + virtual void setFocusItem (GtkTreeIter *iter) = 0; virtual void unsetFocus() = 0; // to be implemented by trees @@ -39,7 +39,7 @@ YItem *getItem (GtkTreeIter *iter); bool getIter (YItem *item, GtkTreeIter *iter); - void addRow (GtkTreeIter *iter, YItem *item); + void addRow (GtkTreeIter *iter, YItem *item, bool honor_select); void setCellLabel (GtkTreeIter *iter, int col, const string &label); void setCellIcon (GtkTreeIter *iter, int col, const string &icon); void setCellToggle (GtkTreeIter *iter, int col, bool selected); Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=45095&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Wed Feb 27 22:13:55 2008 @@ -97,7 +97,7 @@ { gtk_tree_view_set_model (GTK_TREE_VIEW (getWidget()), getModel()); } // YGSelectionModel - virtual void setFocusItem (GtkTreeIter *iter, bool addingRow) + virtual void setFocusItem (GtkTreeIter *iter) { blockEvents(); GtkTreePath *path = gtk_tree_model_get_path (getModel(), iter); @@ -233,7 +233,7 @@ YTableItem *item = dynamic_cast <YTableItem *> (_item); if (item) { GtkTreeIter iter; - addRow (&iter, _item); + addRow (&iter, _item, true); for (int i = 0; i < columns(); i++) setCell (&iter, item->cell (i)); } @@ -339,7 +339,7 @@ virtual void addItem (YItem *item) { GtkTreeIter iter; - addRow (&iter, item); + addRow (&iter, item, false); setCellToggle (&iter, 0, item->selected()); setCellIcon (&iter, 1, item->iconName()); setCellLabel (&iter, 2, item->label()); @@ -371,13 +371,6 @@ virtual void setCurrentItem (YItem *item) { implFocusItem (item); } - virtual void setFocusItem (GtkTreeIter *iter, bool addingRow) - { - // item->selected() doesn't apply to focus, filter them - if (!addingRow) - YGTableView::setFocusItem (iter, addingRow); - } - // Events static void multi_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, YGMultiSelectionBox* pThis) Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=45095&r1=450… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Wed Feb 27 22:13:55 2008 @@ -688,7 +688,7 @@ YRichText *rtext = dynamic_cast <YRichText *> (widget); if (rtext) { std::string text = rtext->text(); - char *xml = ygutils_convert_to_xhmlt_and_subst (text.c_str(), NULL); + char *xml = ygutils_convert_to_xhmlt_and_subst (text.c_str()); GtkWidget *view = gtk_text_view_new(); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD); Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=45095&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Wed Feb 27 22:13:55 2008 @@ -75,6 +75,16 @@ } } +std::string YGUtils::truncate (const std::string &str, unsigned int length) +{ + std::string ret (str); + if (ret.size() > length) { + ret.erase (length-3); + ret += "..."; + } + return ret; +} + void YGUtils::scrollTextViewDown (GtkTextView *text_view) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); @@ -214,10 +224,9 @@ } // We have to: -// + manually substitute the product entity. // + rewrite and <hr> tags // + deal with <a attrib=noquotes> -gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr, const char *product) +gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr) { GString *outp = g_string_new (""); GQueue *tag_queue = g_queue_new(); Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=45095&r1=4… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Wed Feb 27 22:13:55 2008 @@ -32,6 +32,9 @@ /* Replaces every 'mouth' by 'food' in 'str'. */ void replace (std::string &str, const char *mouth, int mouth_len, const char *food); + /* Truncates the text with "..." past the given length. */ + std::string truncate (const std::string &str, unsigned int length); + /* Escapes markup text (eg. changes '<' by '\<'). */ void escapeMarkup (std::string &str); @@ -63,7 +66,7 @@ void ygutils_setFilter (GtkEntry *entry, const char *validChars); /* Convert html to xhtml (or at least try) */ - gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr, const char *product); + gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr); void ygutils_setStockIcon (GtkWidget *button, const char *ycp_str); }; Modified: trunk/gtk/src/test.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/test.cc?rev=45095&r1=450… ============================================================================== --- trunk/gtk/src/test.cc (original) +++ trunk/gtk/src/test.cc Wed Feb 27 22:13:55 2008 @@ -48,9 +48,6 @@ } aTests[] = { // preservation { "foo", "<body>foo</body>" }, -/* // product substitution - { "&product;", "<body>foo</body>" }, - { " &product;", "<body>foo</body>" },*/ // outer tag { "some text", "<body>some text</body>" }, // unquoted attributes @@ -81,7 +78,7 @@ { NULL, NULL } }; for (int i = 0; aTests[i].in; i++) { - gchar *out = ygutils_convert_to_xhmlt_and_subst (aTests[i].in, "foo"); + gchar *out = ygutils_convert_to_xhmlt_and_subst (aTests[i].in); if (strcmp (out, aTests[i].out)) { fprintf (stderr, "Mis-converted entry %d XML '%s' should be '%s'\n", i, out, aTests[i].out); Modified: trunk/gtk/src/ygtkhtmlwrap.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.c?rev=45095… ============================================================================== --- trunk/gtk/src/ygtkhtmlwrap.c (original) +++ trunk/gtk/src/ygtkhtmlwrap.c Wed Feb 27 22:13:55 2008 @@ -84,8 +84,9 @@ G_CALLBACK (gtkhtml_url_requested_cb), NULL); } -void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text) +void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text, gboolean plain_mode) { + // TODO: implement plain_mode GtkHTMLStream *stream = gtk_html_begin (GTK_HTML (widget)); gtk_html_write (GTK_HTML (widget), stream, text, strlen (text)); gtk_html_end (GTK_HTML (widget), stream, GTK_HTML_STREAM_OK); @@ -131,9 +132,9 @@ { } -void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text) +void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text, gboolean plain_mode) { - ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), text, TRUE); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (widget), text, plain_mode); } void ygtk_html_wrap_scroll (GtkWidget *widget, gboolean top) Modified: trunk/gtk/src/ygtkhtmlwrap.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.h?rev=45095… ============================================================================== --- trunk/gtk/src/ygtkhtmlwrap.h (original) +++ trunk/gtk/src/ygtkhtmlwrap.h Wed Feb 27 22:13:55 2008 @@ -19,7 +19,7 @@ GType ygtk_html_wrap_get_type (void); void ygtk_html_wrap_init (GtkWidget *widget); // if you use g_object_new(), call this -void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text); +void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text, gboolean plain_mode); void ygtk_html_wrap_scroll (GtkWidget *widget, gboolean top /* or bottom */); // callback of type: void (GtkWidget *htmlwrap, const gchar *url, gpointer data) Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=45095… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Wed Feb 27 22:13:55 2008 @@ -17,7 +17,7 @@ // 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); +gchar *ygutils_convert_to_xhmlt_and_subst (const char *instr); G_DEFINE_TYPE (YGtkRichText, ygtk_rich_text, GTK_TYPE_TEXT_VIEW) @@ -103,8 +103,6 @@ void ygtk_rich_text_init (YGtkRichText *rtext) { - rtext->prodname = NULL; - GtkTextView *tview = GTK_TEXT_VIEW (rtext); gtk_text_view_set_wrap_mode (tview, GTK_WRAP_WORD_CHAR); gtk_text_view_set_editable (tview, FALSE); @@ -161,19 +159,11 @@ static void ygtk_rich_text_destroy (GtkObject *object) { - 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); - } - - if (rtext->prodname) - g_free (rtext->prodname); - rtext->prodname = NULL; - + // 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); + } GTK_OBJECT_CLASS (ygtk_rich_text_parent_class)->destroy (object); } @@ -575,18 +565,12 @@ return g_string_free (dest, FALSE); } -void ygtk_richttext_set_prodname (YGtkRichText *rtext, const char *prodname) -{ - rtext->prodname = g_strdup (prodname); -} - -void ygtk_rich_text_set_text (YGtkRichText* rtext, const gchar* text, - gboolean rich_text) +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 (!rich_text) { + if (plain_mode) { gtk_text_buffer_set_text (buffer, text, -1); return; } @@ -600,7 +584,7 @@ GMarkupParseContext *ctx; ctx = g_markup_parse_context_new (&rt_parser, (GMarkupParseFlags)0, &state, NULL); - char *xml = ygutils_convert_to_xhmlt_and_subst (text, rtext->prodname); + char *xml = ygutils_convert_to_xhmlt_and_subst (text); GError *error = NULL; if (!g_markup_parse_context_parse (ctx, xml, -1, &error)) { #ifdef PRINT_WARNINGS Modified: trunk/gtk/src/ygtkrichtext.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.h?rev=45095… ============================================================================== --- trunk/gtk/src/ygtkrichtext.h (original) +++ trunk/gtk/src/ygtkrichtext.h Wed Feb 27 22:13:55 2008 @@ -28,8 +28,6 @@ typedef struct _YGtkRichText { GtkTextView parent; - // private: - char *prodname; } YGtkRichText; typedef struct _YGtkRichTextClass @@ -40,15 +38,12 @@ void (*link_clicked) (YGtkRichText *rich_text, const gchar *link); } YGtkRichTextClass; -GtkWidget* ygtk_rich_text_new (void); +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_rich_text_set_text (YGtkRichText* rtext, const gchar* text, - gboolean rich_text); - -void ygtk_richttext_set_prodname (YGtkRichText *rtext, const char *prodname); +void ygtk_rich_text_set_text (YGtkRichText* rtext, const gchar* text, gboolean plain_mode); // To be used together with an entry box to search for text gboolean ygtk_rich_text_mark_text (YGtkRichText *rtext, const gchar *text); Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=45095&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Wed Feb 27 22:13:55 2008 @@ -176,7 +176,7 @@ void ygtk_help_dialog_set_text (YGtkHelpDialog *dialog, const gchar *text) { gtk_editable_delete_text (GTK_EDITABLE (dialog->search_entry), 0, -1); - ygtk_html_wrap_set_text (dialog->help_text, text); + ygtk_html_wrap_set_text (dialog->help_text, text, FALSE); } static void ygtk_help_dialog_class_init (YGtkHelpDialogClass *klass) Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4509… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Wed Feb 27 22:13:55 2008 @@ -24,6 +24,8 @@ #include <glib/gslist.h> #include "YGUtils.h" +//#define OLD_ZYPP + //** Zypp shortcuts typedef zypp::ResPoolProxy ZyppPool; @@ -400,9 +402,15 @@ { std::string text; ZyppObject object = impl->zyppSel->theObj(); +#ifdef OLD_ZYPP + const zypp::CapSet &capSet = object->dep (zypp::Dep::PROVIDES); + for (zypp::CapSet::const_iterator it = capSet.begin(); + it != capSet.end(); it++) { +#else const zypp::Capabilities &capSet = object->dep (zypp::Dep::PROVIDES); for (zypp::Capabilities::const_iterator it = capSet.begin(); it != capSet.end(); it++) { +#endif if (!text.empty()) text += "\n"; text += it->asString(); @@ -414,9 +422,15 @@ { std::string text; ZyppObject object = impl->zyppSel->theObj(); +#ifdef OLD_ZYPP + const zypp::CapSet &capSet = object->dep (zypp::Dep::REQUIRES); + for (zypp::CapSet::const_iterator it = capSet.begin(); + it != capSet.end(); it++) { +#else const zypp::Capabilities &capSet = object->dep (zypp::Dep::REQUIRES); for (zypp::Capabilities::const_iterator it = capSet.begin(); it != capSet.end(); it++) { +#endif if (!text.empty()) text += "\n"; text += it->asString(); @@ -662,7 +676,11 @@ { Ypp::Package::Version *version = new Ypp::Package::Version(); version->number = object->edition().version(); +#ifdef OLD_ZYPP + version->repo = ypp->impl->getRepository (object->repository().info().alias()); +#else version->repo = ypp->impl->getRepository (object->repoInfo().alias()); +#endif version->cmp = 0; version->impl = (void *) get_pointer (object); return version; -- 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] r45094 - /tags/branch-SLE-10-SP2-2_13_17/registration/
by jdsn＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jdsn Date: Wed Feb 27 18:59:46 2008 New Revision: 45094 URL: http://svn.opensuse.org/viewcvs/yast?rev=45094&view=rev Log: Created tag branch-SLE-10-SP2-2_13_17 for registration Added: tags/branch-SLE-10-SP2-2_13_17/registration/ - copied from r45093, branches/SuSE-SLE-10-SP2-Branch/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45093 - in /branches/SuSE-SLE-10-SP2-Branch/registration: ./ package/ src/clients/ src/config/ src/modules/
by jdsn＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: jdsn Date: Wed Feb 27 18:59:36 2008 New Revision: 45093 URL: http://svn.opensuse.org/viewcvs/yast?rev=45093&view=rev Log: renaming YEP to SMT Modified: branches/SuSE-SLE-10-SP2-Branch/registration/VERSION branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/suse_register_auto.ycp branches/SuSE-SLE-10-SP2-Branch/registration/src/config/Makefile.am branches/SuSE-SLE-10-SP2-Branch/registration/src/config/registration.rnc branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/regist… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/VERSION Wed Feb 27 18:59:36 2008 @@ -1 +1 @@ -2.13.16 +2.13.17 Modified: branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/regist… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes Wed Feb 27 18:59:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 27 18:13:45 CET 2008 - jdsn(a)suse.de + +- renaming YEP to SMT +- 2.13.17 + +------------------------------------------------------------------- Mon Feb 4 17:55:20 CET 2008 - jdsn(a)suse.de - fixes to autoyast YEP support Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/regist… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp Wed Feb 27 18:59:36 2008 @@ -38,7 +38,7 @@ symbol confRegSrv = Register::configureRegistrationServer(); if (confRegSrv == `conferror || confRegSrv == `notrust || confRegSrv == `silentskip) { - y2debug("Registration can not be run due to YEP configuration error."); + y2debug("Registration can not be run due to SMT configuration error."); return `auto; } Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/suse_register_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/regist… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/suse_register_auto.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/suse_register_auto.ycp Wed Feb 27 18:59:36 2008 @@ -81,13 +81,13 @@ summary = Summary::CloseList(summary); } - if ( Register::yep_server != "") + if ( Register::smt_server != "") { - summary = Summary::AddHeader (summary, _("YEP Server Settings") ); + summary = Summary::AddHeader (summary, _("SMT Server Settings") ); summary = Summary::OpenList(summary); - summary = Summary::AddListItem (summary, sformat(_("YEP Server: %1"), Register::yep_server) ); - if ( Register::yep_server_cert != "") - summary = Summary::AddListItem (summary, sformat(_("YEP Certificate: %1"), Register::yep_server_cert) ); + summary = Summary::AddListItem (summary, sformat(_("SMT Server: %1"), Register::smt_server) ); + if ( Register::smt_server_cert != "") + summary = Summary::AddListItem (summary, sformat(_("SMT Certificate: %1"), Register::smt_server_cert) ); summary = Summary::CloseList(summary); } @@ -189,18 +189,18 @@ string help_text_para2 = _("Get more information about the registration process with <tt>suse_register -h</tt>."); string help_text_para3 = _("Other information used for registration is shown in Registration Data. Add a new key and value pair by pressing Add and then entering the appropriate values. These parameters are the ones that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with Delete or modify an existing pair with Edit."); - string help_text_para4 = _("If your network deploys a custom YEP server, please set the URL of the YEP Server and the location of the YEP Certificate in YEP Server Settings. Please see your YEP manual for further assistance."); + string help_text_para4 = _("If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in SMT Server Settings. Please see your SMT manual for further assistance."); string help_text = help_text_caption + help_text_para1 + help_text_para2 + help_text_para3 + help_text_para4; - term yepsettings = `VBox( + term smtsettings = `VBox( // Translators: Text for UI Label - capitalized - `Left( `Label(_("YEP Server Settings"))), + `Left( `Label(_("SMT Server Settings"))), // Translators: Text for UI Label - capitalized - `TextEntry(`id(`yepurl), `opt(`hstretch, `notify), _("YEP Server"), ""), + `TextEntry(`id(`smturl), `opt(`hstretch, `notify), _("SMT Server"), ""), // Translators: Text for UI Label - capitalized - `TextEntry(`id(`yepcert), `opt(`hstretch, `notify), _("YEP Certificate"), "") + `TextEntry(`id(`smtcert), `opt(`hstretch, `notify), _("SMT Certificate"), "") ); term regsettings = `VBox( @@ -218,7 +218,7 @@ term contents = `VBox( - `HBox ( regsettings, yepsettings ), + `HBox ( regsettings, smtsettings ), `VBox ( `VSpacing(0.5), // Translators: Text for UI Label - capitalized `Left( `Label( _("Registration Data to Use")) ), @@ -251,8 +251,8 @@ UI::ChangeWidget(`id(`run), `Value, Register::do_registration); UI::ChangeWidget(`id(`sub_hw ), `Value, Register::submit_hwdata); UI::ChangeWidget(`id(`sub_opt), `Value, Register::submit_optional); - UI::ChangeWidget(`id(`yepurl), `Value, Register::yep_server); - UI::ChangeWidget(`id(`yepcert), `Value, Register::yep_server_cert); + UI::ChangeWidget(`id(`smturl), `Value, Register::smt_server); + UI::ChangeWidget(`id(`smtcert), `Value, Register::smt_server_cert); integer items=size(table_items); UI::ChangeWidget(`id(`edit), `Enabled, items > 0); UI::ChangeWidget(`id(`delete), `Enabled, items > 0); @@ -330,29 +330,29 @@ } else if ( ret == `next ) { - string yepServer = (string) UI::QueryWidget(`id(`yepurl), `Value); - string yepServerCert = (string) UI::QueryWidget(`id(`yepcert), `Value); + string smtServer = (string) UI::QueryWidget(`id(`smturl), `Value); + string smtServerCert = (string) UI::QueryWidget(`id(`smtcert), `Value); - if ( (! regexpmatch(yepServer, "^https://.+") && yepServer != "" ) || - ( yepServer == "" && yepServerCert != "" ) + if ( (! regexpmatch(smtServer, "^https://.+") && smtServer != "" ) || + ( smtServer == "" && smtServerCert != "" ) ) { - Popup::Message(_("YEP Server URL must start with https://")); + Popup::Message(_("SMT Server URL must start with https://")); ret = nil; } - if (! regexpmatch(yepServerCert, "^(https?|ftp)://.+") && - ! regexpmatch(yepServerCert, "^floppy/.+") && - ! regexpmatch(yepServerCert, "^/.+") && - ! regexpmatch(yepServerCert, "^(ask|done)$") && - yepServerCert != "" + if (! regexpmatch(smtServerCert, "^(https?|ftp)://.+") && + ! regexpmatch(smtServerCert, "^floppy/.+") && + ! regexpmatch(smtServerCert, "^/.+") && + ! regexpmatch(smtServerCert, "^(ask|done)$") && + smtServerCert != "" ) { - Popup::Message(_("Location of YEP Certificate invalid.\nPlease see your YEP documentation.")); + Popup::Message(_("Location of SMT Certificate invalid.\nPlease see your SMT documentation.")); ret = nil; } - Register::yep_server = yepServer; - Register::yep_server_cert = yepServerCert; + Register::smt_server = smtServer; + Register::smt_server_cert = smtServerCert; } // refresh counter and buttons @@ -379,8 +379,8 @@ y2debug("submit_hwdata: %1", Register::submit_hwdata); y2debug("submit_optional: %1", Register::submit_optional); y2debug("registration_data: %1", Register::registration_data); - y2debug("yep_server: %1", Register::yep_server); - y2debug("yep_server_cert: %1", Register::yep_server_cert); + y2debug("smt_server: %1", Register::smt_server); + y2debug("smt_server_cert: %1", Register::smt_server_cert); } UI::CloseDialog(); Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/regist… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/config/Makefile.am (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/config/Makefile.am Wed Feb 27 18:59:36 2008 @@ -5,6 +5,8 @@ rncdir = $(schemadir)/autoyast/rnc rnc_DATA = registration.rnc -EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) +fillup_DATA = sysconfig.suse_register-yast2-registration + +EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) $(fillup_DATA) include $(top_srcdir)/Makefile.am.common Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/config/registration.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/regist… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/config/registration.rnc (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/config/registration.rnc Wed Feb 27 18:59:36 2008 @@ -2,13 +2,13 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -customer_center = element customer_center { do_registration? & submit_hwdata? & submit_optional? & registration_data? & register_regularly? & yep_server? & yep_server_cert? } +customer_center = element customer_center { do_registration? & submit_hwdata? & submit_optional? & registration_data? & register_regularly? & smt_server? & smt_server_cert? } do_registration = element do_registration { BOOLEAN } submit_hwdata = element submit_hwdata { BOOLEAN } submit_optional = element submit_optional { BOOLEAN } register_regularly = element register_regularly { BOOLEAN } -yep_server = element yep_server { text } -yep_server_cert = element yep_server_cert { text } +smt_server = element smt_server { text } +smt_server_cert = element smt_server_cert { text } registration_data = Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/regist… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp Wed Feb 27 18:59:36 2008 @@ -53,8 +53,8 @@ global boolean use_proxy = false; global string http_proxy = ""; global string https_proxy = ""; -global string yep_server = ""; // (FATE #302966) -global string yep_server_cert = ""; // (FATE #302966) +global string smt_server = ""; // (FATE #302966) +global string smt_server_cert = ""; // (FATE #302966) global map<string, string> registration_data = $[]; @@ -110,7 +110,7 @@ // create mount point directory SCR::Execute(.target.mkdir, mpoint); - y2milestone("Trying to mount %1 as floppy drive to load the YEP certificate file from.", fddevice); + y2milestone("Trying to mount %1 as floppy drive to load the SMT certificate file from.", fddevice); boolean result = (boolean) SCR::Execute(.target.mount, [fddevice, mpoint], "-o ro" ); @@ -136,7 +136,7 @@ /* * certificateError() * - * report error messages if YEP certificate file is not found + * report error messages if SMT certificate file is not found * @return symbol yes, no or retry * */ @@ -153,19 +153,19 @@ if (type == `floppy) { - errorMessage = _("Could not load the YEP certificate file from floppy disk."); + errorMessage = _("Could not load the SMT certificate file from floppy disk."); } else if (type == `url) { - errorMessage = _("Could not download the YEP certificate file from specified URL."); + errorMessage = _("Could not download the SMT certificate file from specified URL."); } else if (type == `file) { - errorMessage = _("Could not find the YEP certificate file in specified path."); + errorMessage = _("Could not find the SMT certificate file in specified path."); } else { - errorMessage = _("Unknown error occurred while retrieving YEP certificate file"); + errorMessage = _("Unknown error occurred while retrieving SMT certificate file"); } errorMessage = errorMessage + "\n\n" + question + "\n\n" + otherwise; @@ -199,12 +199,12 @@ ] ))); - // in case the yep server was already changed do not change it again (to support mobile PCs in different environments) - string mod = (string) SCR::Read(.temporary_suseregister_agent.yepurlmodified); + // in case the smt server was already changed do not change it again (to support mobile PCs in different environments) + string mod = (string) SCR::Read(.temporary_suseregister_agent.smturlmodified); if ( mod == "true" ) { url = nil; - y2milestone("YEP server has already been modified. I will not change it again."); + y2milestone("SMT server has already been modified. I will not change it again."); } cururl = (string) SCR::Read(.temporary_suseregister_agent.url); @@ -214,7 +214,7 @@ { SCR::Write(.temporary_suseregister_agent.url, url); cururl = (string) SCR::Read(.temporary_suseregister_agent.url); - if (url == cururl) SCR::Write(.temporary_suseregister_agent.yepurlmodified, "true"); + if (url == cururl) SCR::Write(.temporary_suseregister_agent.smturlmodified, "true"); } SCR::UnregisterAgent (.temporary_suseregister_agent); @@ -226,14 +226,14 @@ /* * setupRegistrationServer() * - * write YEP server settings to (FATE #302966) + * write SMT server settings to (FATE #302966) * @return symbol that says if we can perform the registration * */ symbol setupRegistrationServer(symbol mode) { - // in case yep_server is undefined nothing needs to be done - if (yep_server == nil || yep_server == "") return `ok; + // in case smt_server is undefined nothing needs to be done + if (smt_server == nil || smt_server == "") return `ok; boolean ay = false; // are we running in autoYaST mode? boolean trust = false; @@ -243,27 +243,27 @@ ay = true; } - // check if yep_server is a valid url - map yep_server_parsed = URL::Parse(yep_server); - if (yep_server_parsed == $[] || yep_server_parsed["host"]:"" == "" || yep_server_parsed["scheme"]:"" != "https" ) + // check if smt_server is a valid url + map smt_server_parsed = URL::Parse(smt_server); + if (smt_server_parsed == $[] || smt_server_parsed["host"]:"" == "" || smt_server_parsed["scheme"]:"" != "https" ) { - y2milestone("The string '%1' could not be parsed and validated as URL to be used as YEP server.", yep_server); + y2milestone("The string '%1' could not be parsed and validated as URL to be used as SMT server.", smt_server); if (ay) return `conferror; - string no_yep_server = sformat( _("The YEP server URL could not be validated as URL. + string no_smt_server = sformat( _("The SMT server URL could not be validated as URL. Registration can not be performed. Please modify /etc/suseRegister.conf and run Registration manually. -The YEP server URL that was configured was -%1"), yep_server); - Popup::Message(no_yep_server); +The SMT server URL that was configured was +%1"), smt_server); + Popup::Message(no_smt_server); return `conferror; } - // write YEP server URL to /etc/suseRegister.conf - if (yep_server == suseRegisterURL(yep_server) ) - { y2milestone("Setup custom YEP server as registration server successful: %1", yep_server); } + // write SMT server URL to /etc/suseRegister.conf + if (smt_server == suseRegisterURL(smt_server) ) + { y2milestone("Setup custom SMT server as registration server successful: %1", smt_server); } else - { y2error("Failed to setup custom YEP server as registration server: %1", yep_server); } + { y2error("Failed to setup custom SMT server as registration server: %1", smt_server); } @@ -271,52 +271,52 @@ symbol certmode = nil; - // never ever load a certificate file for a *.novell.com yep server - if ( regexpmatch(yep_server_parsed["host"]:"", ".+\.novell\.com$")) { certmode = `none; } - else if (yep_server_cert == nil || yep_server_cert == "") { certmode = `url; } - else if ( regexpmatch(yep_server_cert, "^(https?|ftp)://.+") ) { certmode = `url; } - else if ( regexpmatch(yep_server_cert, "^floppy/.+") ) { certmode = `floppy; } - else if ( regexpmatch(yep_server_cert, "^/.+") ) { certmode = `path; } - else if ( regexpmatch(yep_server_cert, "^ask$") ) { certmode = `ask; } - else if ( regexpmatch(yep_server_cert, "^done$") ) { certmode = `done; } + // never ever load a certificate file for a *.novell.com smt server + if ( regexpmatch(smt_server_parsed["host"]:"", ".+\.novell\.com$")) { certmode = `none; } + else if (smt_server_cert == nil || smt_server_cert == "") { certmode = `url; } + else if ( regexpmatch(smt_server_cert, "^(https?|ftp)://.+") ) { certmode = `url; } + else if ( regexpmatch(smt_server_cert, "^floppy/.+") ) { certmode = `floppy; } + else if ( regexpmatch(smt_server_cert, "^/.+") ) { certmode = `path; } + else if ( regexpmatch(smt_server_cert, "^ask$") ) { certmode = `ask; } + else if ( regexpmatch(smt_server_cert, "^done$") ) { certmode = `done; } else { certmode = `none; } if (! contains([`none, `done, `url, `floppy, `ask, `path], certmode) ) { - y2error("No YEP certificate file retrieval-mode found to handle current configuration. This should not happen!"); + y2error("No SMT certificate file retrieval-mode found to handle current configuration. This should not happen!"); return `conferror; } - string certTmpFile = sformat("%1/__tmpYEPcert.crt", SCR::Read(.target.tmpdir)); + string certTmpFile = sformat("%1/__tmpSMTcert.crt", SCR::Read(.target.tmpdir)); if ( certmode == `url ) { - map certParse = URL::Parse(yep_server_cert); + map certParse = URL::Parse(smt_server_cert); - // if no yep_server_cert is passed then we fall back to predefined yep_server_cert - if (yep_server_cert == nil || yep_server_cert == "" || certParse == $[]) + // if no smt_server_cert is passed then we fall back to predefined smt_server_cert + if (smt_server_cert == nil || smt_server_cert == "" || certParse == $[]) { - map certUrl = yep_server_parsed; + map certUrl = smt_server_parsed; certUrl["scheme"] = "http"; certUrl["port"] = "80"; - certUrl["path"] = "/yep.crt"; - yep_server_cert = URL::Build(certUrl); + certUrl["path"] = "/smt.crt"; + smt_server_cert = URL::Build(certUrl); certParse=certUrl; } - y2milestone("Using %1 as URL to download the YEP certificate file.", yep_server_cert); + y2milestone("Using %1 as URL to download the SMT certificate file.", smt_server_cert); // download cert - string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", yep_server_cert, certTmpFile); + string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", smt_server_cert, certTmpFile); if ( SCR::Execute (.target.bash, curlcmd) != 0) { - y2error("Could not download the YEP certificate file from specified URL %1", yep_server_cert); + y2error("Could not download the SMT certificate file from specified URL %1", smt_server_cert); if (ay) return `conferror; // translators: this is a heading for an error message - so no punctuation - string urlError = _("Downloading YEP certificate file failed"); + string urlError = _("Downloading SMT certificate file failed"); symbol errret = certificateError( urlError, `url); certTmpFile = nil; @@ -330,10 +330,10 @@ if (!mf["mounted"]:false) { umountFloppy(mf["mpoint"]:"/dev/fd0"); - y2error("Could not mount floppy disk to copy the YEP certificte file from. The device that was used was %1", mf["device"]:""); + y2error("Could not mount floppy disk to copy the SMT certificte file from. The device that was used was %1", mf["device"]:""); if (ay) { - y2error("No YEP certificate file available. As we are in autoYaST mode Registration will be skipped. Please run it manually."); + y2error("No SMT certificate file available. As we are in autoYaST mode Registration will be skipped. Please run it manually."); return `silentskip; } else @@ -344,12 +344,12 @@ if ( errret == `yes ) { - y2warning("No YEP certificate could be retrieved (floppy mount error). User selected to skip Registration."); + y2warning("No SMT certificate could be retrieved (floppy mount error). User selected to skip Registration."); return `silentskip; } else if ( errret == `no ) { - y2warning("No YEP certificate could be retrieved (floppy mount error). User selected to NOT skip Registration. Most likely Registration will fail now."); + y2warning("No SMT certificate could be retrieved (floppy mount error). User selected to NOT skip Registration. Most likely Registration will fail now."); return `ok; } else { certmode = `ask; } @@ -357,11 +357,11 @@ } else { - string fdpath = regexpsub( yep_server_cert , "^floppy/(.+)$","\\1"); + string fdpath = regexpsub( smt_server_cert , "^floppy/(.+)$","\\1"); string cp2tmp = sformat("/bin/cp -a %1 %2 ", mf["mpoint"]:"/media/floppy" + "/" + fdpath, certTmpFile ); if ( SCR::Execute (.target.bash, cp2tmp) != 0) { - y2error("Could not copy the specified YEP certificate file from floppy disk."); + y2error("Could not copy the specified SMT certificate file from floppy disk."); if (ay) return `silentskip; // translators: this is a heading for an error message - so no punctuation @@ -370,12 +370,12 @@ if ( errret == `yes ) { - y2warning("No YEP certificate could be retrieved (could not copy from floppy). User selected to skip Registration."); + y2warning("No SMT certificate could be retrieved (could not copy from floppy). User selected to skip Registration."); return `silentskip; } else if ( errret == `no ) { - y2warning("No YEP certificate could be retrieved (could not copy from floppy). User selected to NOT skip Registration. Most likely Registration will fail now."); + y2warning("No SMT certificate could be retrieved (could not copy from floppy). User selected to NOT skip Registration. Most likely Registration will fail now."); return `ok; } else { certmode = `ask; } @@ -391,23 +391,23 @@ { // try to copy cert if valid path, else ask // copy - string cp2tmp = sformat("/bin/cp -a %1 %2 ", yep_server_cert, certTmpFile ); + string cp2tmp = sformat("/bin/cp -a %1 %2 ", smt_server_cert, certTmpFile ); if ( SCR::Execute(.target.bash, cp2tmp ) != 0 ) { - y2error("Could not copy local YEP certificate file"); + y2error("Could not copy local SMT certificate file"); if (ay) return `silentskip; // translators: this is a heading for an error message - so no punctuation - string fileCopyError = _("Could find YEP certificate file in local path"); + string fileCopyError = _("Could find SMT certificate file in local path"); symbol errret = certificateError( fileCopyError, `file); if ( errret == `yes ) { - y2warning("No YEP certificate could be retrieved (could not copy local file). User selected to skip Registration."); + y2warning("No SMT certificate could be retrieved (could not copy local file). User selected to skip Registration."); return `silentskip; } else if ( errret == `no ) { - y2warning("No YEP certificate could be retrieved (could not copy local file). User selected to NOT skip Registration. Most likely Registration will fail now."); + y2warning("No SMT certificate could be retrieved (could not copy local file). User selected to NOT skip Registration. Most likely Registration will fail now."); return `ok; } else { certmode = `ask; } @@ -418,13 +418,13 @@ { if (ay) { - y2error("YEP certificate was configured to be asked for. AutoYaST does not support interactive dialogs. Registration will be skipped."); + y2error("SMT certificate was configured to be asked for. AutoYaST does not support interactive dialogs. Registration will be skipped."); return `silentskip; } string basepath = "/tmp"; string certFile = ""; - string selectCertLabel = _("Select YEP certificate file"); + string selectCertLabel = _("Select SMT certificate file"); boolean exitloop = false; do @@ -447,17 +447,17 @@ string cp2tmp = sformat("/bin/cp -a %1 %2 ", certFile , certTmpFile ); if (SCR::Execute(.target.bash, cp2tmp) == 0) { - y2milestone("Found user specified YEP certificate file"); + y2milestone("Found user specified SMT certificate file"); exitloop = true; } else { - y2milestone("Could not copy local file as YEP certificate"); + y2milestone("Could not copy local file as SMT certificate"); string fileErrorHeader = _("Could not copy certificate file"); string fileErrorMsg = _("Do you want to retry?"); if (!Popup::YesNoHeadline(fileErrorHeader, fileErrorMsg)) { - y2milestone("User selected to skip the setup of a YEP certificate"); + y2milestone("User selected to skip the setup of a SMT certificate"); return `conferror; } } @@ -469,15 +469,15 @@ if (certmode == `done) { - y2milestone("User configured to do nothing to retrieve a YEP certificate file."); + y2milestone("User configured to do nothing to retrieve a SMT certificate file."); y2milestone("I hope you know what you do. Registration will be run but may fail due to missing certificate."); return `ok; } if (certmode == `none) { - y2warning("The string that was passed to get the YEP certificate file does not match any handler."); - y2warning("The string was: %1", yep_server_cert); + y2warning("The string that was passed to get the SMT certificate file does not match any handler."); + y2warning("The string was: %1", smt_server_cert); y2warning("No certificate could be retrieved. Registration process will not be run!"); return `conferror; } @@ -489,10 +489,10 @@ // ask user if he trusts the certificate map cP = RegisterCert::parseCertificate(certTmpFile); - y2milestone("YEP certificate file information: %1", cP); + y2milestone("SMT certificate file information: %1", cP); string trustQuestion = _("Do you want to trust this certificate?"); - string trustMessage = _("This certificate will be used to connect to the YEP server.\nYou have to trust this certificate in order to continue with the Registration."); + string trustMessage = _("This certificate will be used to connect to the SMT server.\nYou have to trust this certificate in order to continue with the Registration."); string certInfo = ""; list issueList = (list) cP["ISSUER"]:[]; @@ -544,25 +544,25 @@ if ((symbol)uret == `trust) { - string installCert = sformat("cp -a %1 /etc/ssl/certs/yep.pem && c_rehash /etc/ssl/certs", certTmpFile); - string installCertZMD = sformat("[ -d /etc/zmd/trusted-certs ] && cp -a %1 /etc/zmd/trusted-certs/yep.cer", certTmpFile); + string installCert = sformat("cp -a %1 /etc/ssl/certs/smt.pem && c_rehash /etc/ssl/certs", certTmpFile); + string installCertZMD = sformat("[ -d /etc/zmd/trusted-certs ] && cp -a %1 /etc/zmd/trusted-certs/smt.cer", certTmpFile); integer instret = (integer) SCR::Execute(.target.bash, installCert); integer instretZMD = (integer) SCR::Execute(.target.bash, installCertZMD); if ( instret == 0 && instretZMD == 0) { - y2milestone("Successfully installed YEP certificate. Registration will now proceed."); + y2milestone("Successfully installed SMT certificate. Registration will now proceed."); return `ok; } else { if (instret == 0 ) - y2error("Failed to install YEP certificate to common cert storage. Registration would fail and thus will be skipped."); + y2error("Failed to install SMT certificate to common cert storage. Registration would fail and thus will be skipped."); if (instretZMD == 0) - y2error("Failed to install YEP certificate for ZMD. Registration would fail and thus will be skipped."); + y2error("Failed to install SMT certificate for ZMD. Registration would fail and thus will be skipped."); - if (!ay) Popup::Message(_("Installation of the YEP certificates failed.\nPlease see the logs for further information.")); + if (!ay) Popup::Message(_("Installation of the SMT certificates failed.\nPlease see the logs for further information.")); return `silentskip; } } @@ -587,26 +587,26 @@ /* * configureRegistrationServer() * - * read YEP server settings from install.inf and set them up (FATE #302966) + * read SMT server settings from install.inf and set them up (FATE #302966) * */ global symbol configureRegistrationServer() { - yep_server = Linuxrc::InstallInf("yepurl"); - yep_server_cert = Linuxrc::InstallInf("yepcert"); + smt_server = Linuxrc::InstallInf("smturl"); + smt_server_cert = Linuxrc::InstallInf("smtcert"); - y2milestone("YEP config - yepurl: %1", yep_server); - y2milestone("YEP config - yepcert: %1", yep_server_cert); + y2milestone("SMT config - smturl: %1", smt_server); + y2milestone("SMT config - smtcert: %1", smt_server_cert); -/* yepurl=https:/yep.mybigcompany.com/center/regsvc/ - yepcert=ask open FileDialog - yepcert=done Cert already insalled - do nothing - yepcert=http:/certpool.mybigcompany.com/yep/yep-ca.crt download from there - yepcert=floppy/path/to/file.crt - yepcert=/path/to/local/file.crt copy from there +/* smturl=https:/smt.mybigcompany.com/center/regsvc/ + smtcert=ask open FileDialog + smtcert=done Cert already insalled - do nothing + smtcert=http:/certpool.mybigcompany.com/smt/smt.crt download from there + smtcert=floppy/path/to/file.crt + smtcert=/path/to/local/file.crt copy from there */ - // setup the yep_server settings + // setup the smt_server settings return setupRegistrationServer(nil); } @@ -867,8 +867,8 @@ do_registration = (boolean) settings["do_registration"]:do_registration; register_regularly = (boolean) settings["register_regularly"]:register_regularly; registration_data = (map<string, string>) settings["registration_data"]:$[]; - yep_server = (string) settings["yep_server"]:""; - yep_server_cert = (string) settings["yep_server_cert"]:""; + smt_server = (string) settings["smt_server"]:""; + smt_server_cert = (string) settings["smt_server_cert"]:""; return true; } @@ -900,8 +900,8 @@ "submit_hwdata":submit_hwdata, "do_registration":do_registration, "register_regularly":register_regularly, - "yep_server":yep_server, - "yep_server_cert":yep_server_cert, + "smt_server":smt_server, + "smt_server_cert":smt_server_cert, "registration_data":registration_data ]; } -- 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] r45092 - /trunk/gtk/10_3/src/dummy
by rpmcruz＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: rpmcruz Date: Wed Feb 27 18:01:41 2008 New Revision: 45092 URL: http://svn.opensuse.org/viewcvs/yast?rev=45092&view=rev Log: Removing compile result. Removed: trunk/gtk/10_3/src/dummy -- 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] r45091 - /trunk/gtk/10_3/src/dummy
by rpmcruz＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: rpmcruz Date: Wed Feb 27 18:01:32 2008 New Revision: 45091 URL: http://svn.opensuse.org/viewcvs/yast?rev=45091&view=rev Log: Removing compile result. Modified: trunk/gtk/10_3/src/dummy Modified: trunk/gtk/10_3/src/dummy URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/10_3/src/dummy?rev=45091&r1=… ============================================================================== --- trunk/gtk/10_3/src/dummy (original) +++ trunk/gtk/10_3/src/dummy Wed Feb 27 18:01:32 2008 @@ -32,7 +32,7 @@ # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -relink_command="(cd /home/rick2/Documents/yast/gtk/10_3/src; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/opt/kde3/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin:/usr/lib/qt3/bin\"; export PATH; g++ -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DY2LOG=\\\"ui-gtk\\\" -DTHEMEDIR=\\\"/usr/share/YaST2/theme/current\\\" -g -O2 -Wall -Wformat=2 -o \$progdir/\$file dummy.o ./.libs/libpy2gtk.so -L/usr/lib/YaST2/plugin /usr/lib/YaST2/plugin/libpy2UI.so -L/usr/lib /usr/lib/libycp.so /usr/lib/libxcrypt.so /usr/lib/libycpvalues.so /usr/lib/liby2.so /usr/lib/liby2util.so -lcrypto /usr/lib/libxml2.so -lssl -lutil -lblocxx /usr/lib/libgtk-x11-2.0.so /usr/lib/libgdk-x11-2.0.so /usr/lib/libatk-1.0.so /usr/lib/libgdk_pixbuf-2.0.so -lpangocairo-1.0 -lpango-1.0 /usr/lib/libcairo.so /usr/lib/libfontconfig.so /usr/lib/libfreetype.so -lexpat /usr/lib/libglitz.so /usr/lib/libpng12.so -lz /usr/lib/libxcb-render-util.so /usr/lib/libxcb-render.so /usr/lib/libXrender.so /usr/lib/libX11.so /usr/lib/libxcb-xlib.so /usr/lib/libxcb.so /usr/lib/libXau.so /usr/lib/libgmodule-2.0.so -ldl /usr/lib/libgthread-2.0.so -lpthread -lrt /usr/lib/libgobject-2.0.so /usr/lib/libglib-2.0.so /usr/lib/libpcre.so -lzypp -Wl,--rpath -Wl,/home/rick2/Documents/yast/gtk/10_3/src/.libs -Wl,--rpath -Wl,/usr/lib/YaST2/plugin -Wl,--rpath -Wl,/usr/lib/YaST2/plugin ) " +relink_command="(cd /home/rick2/Documents/yast/gtk/10_3/src; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib/jvm/jre/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin\"; export PATH; g++ -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DY2LOG=\\\"ui-gtk\\\" -DTHEMEDIR=\\\"/usr/share/YaST2/theme/current\\\" -g -O2 -Wall -Wformat=2 -o \$progdir/\$file dummy.o ./.libs/libpy2gtk.so -L/usr/lib/YaST2/plugin /usr/lib/YaST2/plugin/libpy2UI.so -L/usr/lib /usr/lib/libycp.so /usr/lib/libxcrypt.so /usr/lib/libycpvalues.so /usr/lib/liby2.so /usr/lib/liby2util.so -lcrypto /usr/lib/libxml2.so -lssl -lutil -lblocxx /usr/lib/libpcre.so /usr/lib/libgtk-x11-2.0.so /usr/lib/libgdk-x11-2.0.so /usr/lib/libatk-1.0.so /usr/lib/libgdk_pixbuf-2.0.so -lpangocairo-1.0 -lpango-1.0 /usr/lib/libcairo.so /usr/lib/libfontconfig.so /usr/lib/libfreetype.so -lexpat /usr/lib/libglitz.so /usr/lib/libpng12.so -lz /usr/lib/libxcb-render-util.so /usr/lib/libxcb-render.so /usr/lib/libXrender.so /usr/lib/libX11.so /usr/lib/libxcb-xlib.so /usr/lib/libxcb.so /usr/lib/libXau.so /usr/lib/libgmodule-2.0.so -ldl /usr/lib/libgthread-2.0.so -lpthread -lrt /usr/lib/libgobject-2.0.so /usr/lib/libglib-2.0.so -lzypp -Wl,--rpath -Wl,/home/rick2/Documents/yast/gtk/10_3/src/.libs -Wl,--rpath -Wl,/usr/lib/YaST2/plugin -Wl,--rpath -Wl,/usr/lib/YaST2/plugin ) " # This environment variable determines our operation mode. if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then -- 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] r45090 - in /branches/tmp/bubli/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h
by kmachalkova＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: kmachalkova Date: Wed Feb 27 17:44:03 2008 New Revision: 45090 URL: http://svn.opensuse.org/viewcvs/yast?rev=45090&view=rev Log: moved Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc Wed Feb 27 17:44:03 2008 @@ -151,11 +151,6 @@ , patchpkgsItem( 0 ) , pkgversionsItem( 0 ) , etcMenu( 0 ) - , depsItem( 0 ) - , showdepsItem( 0 ) - , autodepsItem( 0 ) - , noautodepsItem( 0 ) - , verifyItem( 0 ) , allpksItem( 0 ) , exportItem( 0 ) , importItem( 0 ) @@ -550,9 +545,6 @@ if ( (event.selection == exportItem) || (event.selection == importItem) ) // import/export file list retVal = FileHandler( event ); - else - // check package dependencies - retVal = DependencyHandler( event ); } else if ( event.selection->label().substr(0,4) == "pkg:" ) // handle hyper links @@ -1725,74 +1717,6 @@ /////////////////////////////////////////////////////////////////// // -// Dependency Handler -// -// -bool NCPackageSelector::DependencyHandler( const NCursesEvent& event ) -{ - if ( !event.selection ) - { - return false; - } - - NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), "", - _( "All package dependencies are OK." ), - NCPkgNames::OKLabel() ); - info->setNiceSize( 35, 5 ); - - if ( event.selection == showdepsItem ) - { - bool ok = false; - - if ( depsPopup ) - { - NCMIL << "Checking dependencies" << endl; - depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, &ok ); - } - - if ( ok ) - { - info->showInfoPopup(); - YDialog::deleteTopmostDialog(); - } - - // update the package list and the disk space info - updatePackageList(); - showDiskSpace(); - } - else if ( event.selection == verifyItem ) - { - verifyPackageDependencies(); - updatePackageList(); - showDiskSpace(); - } - else if ( event.selection == autodepsItem ) - { - etcMenu->deleteAllItems(); - - autoCheck = false; // reset autoCheck and create new items - createEtcMenu(); - } - else if ( event.selection == noautodepsItem ) - { - etcMenu->deleteAllItems(); - - autoCheck = true; // set autoCheck and create new items - createEtcMenu(); - } - - NCPkgTable * packageList = PackageList(); - - if ( packageList ) - { - packageList->setKeyboardFocus(); - } - - return true; -} - -/////////////////////////////////////////////////////////////////// -// // FilterHandler // // Opens the popup with rpm group tree, selections ... and display the @@ -2531,49 +2455,6 @@ return cancel; } -bool NCPackageSelector::verifyPackageDependencies () -{ - bool ok = false; - bool cancel = false; - - NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), - "", - _( "System dependencies verify OK." ), - NCPkgNames::OKLabel() - ); - info->setNiceSize( 30, 5 ); - - NCMIL << "Verifying system" << endl; - - if ( depsPopup ) - { - saveState(); - //call the solver (with S_Verify it displays no popup) - //cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); - cancel = verifySystem ( &ok ); - - //display the popup with automatic changes - NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), this ); - NCursesEvent input = autoChangePopup->showInfoPopup(); - - if ( input == NCursesEvent::cancel ) - { - // user clicked on Cancel - restoreState(); - cancel = true; - } - if ( ok && input == NCursesEvent::button ) - { - // dependencies OK, no automatic changes/the user has accepted the changes - info->showInfoPopup(); - } - } - - YDialog::deleteTopmostDialog(); // delete NCPopupInfo dialog - - return cancel; -} - /////////////////////////////////////////////////////////////////// // // showDependencies Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h Wed Feb 27 17:44:03 2008 @@ -342,13 +342,6 @@ */ bool SearchHandler ( const NCursesEvent& event ); - /** - * Handler function for menu selection "Etc./Check dependencies" - * @param event The Ncurses event - * @return bool - */ - bool DependencyHandler( const NCursesEvent& event ); - /** * Handler function for the "Information" menu * @param event The Ncurses event @@ -419,11 +412,6 @@ bool showPackageDependencies ( bool doit ); /** - * Verifies and shows the dependencies - */ - bool verifyPackageDependencies (); - - /** * Checks and shows the selectiondependencies */ void showSelectionDependencies ( ); -- 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] r45089 - in /trunk/autoinstallation/src: dialogs/ask.ycp include/conftree.ycp
by ug＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: ug Date: Wed Feb 27 17:38:25 2008 New Revision: 45089 URL: http://svn.opensuse.org/viewcvs/yast?rev=45089&view=rev Log: minor Modified: trunk/autoinstallation/src/dialogs/ask.ycp trunk/autoinstallation/src/include/conftree.ycp Modified: trunk/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask… ============================================================================== --- trunk/autoinstallation/src/dialogs/ask.ycp (original) +++ trunk/autoinstallation/src/dialogs/ask.ycp Wed Feb 27 17:38:25 2008 @@ -54,7 +54,7 @@ integer jumpToDialog = -2; if( SCR::Read(.target.size, "/tmp/next_dialog") > 0 ) { string s = (string)(SCR::Read(.target.string, "/tmp/next_dialog")); - s = filterchars( s, "0123456789" ); + s = filterchars( s, "-0123456789" ); jumpToDialog = tointeger(s); SCR::Execute(.target.remove, "/tmp/next_dialog"); y2milestone("next_dialog file found. Set dialog to %1",jumpToDialog); @@ -226,7 +226,7 @@ feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" ); } if( size(feedback) > 0 ) { - Popup::LongText("", `RichText(`opt(`plainText), feedback), 50, 20 ); + Popup::LongText("", `RichText(`opt(`plainText), feedback), 40, 15 ); } if( SCR::Read(.target.size, "/tmp/next_dialog") > 0 ) { string s = (string)(SCR::Read(.target.string, "/tmp/next_dialog")); Modified: trunk/autoinstallation/src/include/conftree.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/con… ============================================================================== --- trunk/autoinstallation/src/include/conftree.ycp (original) +++ trunk/autoinstallation/src/include/conftree.ycp Wed Feb 27 17:38:25 2008 @@ -539,7 +539,7 @@ if ( Profile::Save( AutoinstConfig::currentFile )) { Popup::Message(sformat(_("File %1 was saved successfully."), AutoinstConfig::currentFile)); - Profile::checkProfile(); + //Profile::checkProfile(); Profile::changed = false; } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45088 - in /branches/tmp/bubli/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgMenuDeps.cc NCPkgMenuDeps.h NCPkgPopupTable.h
by kmachalkova＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: kmachalkova Date: Wed Feb 27 17:35:45 2008 New Revision: 45088 URL: http://svn.opensuse.org/viewcvs/yast?rev=45088&view=rev Log: 'check deps now' and 'verify system' moved Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuDeps.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuDeps.h branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTable.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc Wed Feb 27 17:35:45 2008 @@ -33,7 +33,7 @@ #include "NCPkgPopupRepo.h" #include "NCPkgPopupDeps.h" #include "NCPkgPopupDiskspace.h" -#include "NCPkgPopupTable.h" +//#include "NCPkgPopupTable.h" #include "NCPkgPopupDescr.h" #include "NCPackageSelector.h" #include "NCLayoutBox.h" @@ -523,7 +523,11 @@ retVal = OkButtonHandler( event ); else if ( event.widget == cancelButton ) retVal = CancelHandler( event ); - + else if ( event.widget == filterPopup ) + { + retVal = true; + NCINT << "porn.bat" << endl; + } } else if ( event == NCursesEvent::menu ) { @@ -2545,7 +2549,8 @@ { saveState(); //call the solver (with S_Verify it displays no popup) - cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); + //cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); + cancel = verifySystem ( &ok ); //display the popup with automatic changes NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), this ); Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h Wed Feb 27 17:35:45 2008 @@ -42,7 +42,8 @@ #include "NCPkgMenuView.h" #include "NCPkgMenuExtras.h" #include "NCPkgMenuHelp.h" -#include "NCPkgMenuAction.h" +#include "NCPkgMenuAction.h" +#include "NCPkgPopupDeps.h" #include "NCPkgFilterMain.h" #include "NCPkgSelMapper.h" @@ -231,6 +232,11 @@ // returns the package table widget NCPkgTable * PackageList(); + NCPkgPopupDeps *DepsPopup() {return depsPopup; } + + bool checkNow( bool *ok ) { return depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, ok ); } + + bool verifySystem( bool *ok ) { return depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, ok ); } /** * Fills the package table Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuDeps.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuDeps.cc Wed Feb 27 17:35:45 2008 @@ -58,11 +58,11 @@ return false; if (event.selection == checkNow ) - NCINT << "checkNow" << endl; + return checkDependencies(); else if (event.selection == autoCheckDeps) return setAutoCheck(); else if (event.selection == verifySystem) - NCINT << "verify" << endl; + return verify(); else if (event.selection == testCase) return generateTestcase(); return true; @@ -70,7 +70,29 @@ bool NCPkgMenuDeps::checkDependencies() { - NCINT << "Zatim nic" << endl; + NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), "", + _( "All package dependencies are OK." ), + NCPkgNames::OKLabel() ); + info->setNiceSize( 35, 5 ); + + bool ok = false; + + if ( pkg->DepsPopup() ) + { + NCMIL << "Checking dependencies" << endl; + pkg->checkNow ( &ok ); + } + + if ( ok ) + { + info->showInfoPopup(); + YDialog::deleteTopmostDialog(); + } + + // update the package list and the disk space info + pkg->updatePackageList(); + pkg->showDiskSpace(); + return true; } @@ -111,8 +133,52 @@ pkg->AutoCheck( true ); } - //setItems( items ); - return true; } +bool NCPkgMenuDeps::verify() +{ + bool ok = false; + bool cancel = false; + + + NCMIL << "Verifying system" << endl; + + if ( pkg->DepsPopup() ) + { + pkg->saveState(); + //call the solver (with S_Verify it displays no popup) + //cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); + cancel = pkg->verifySystem ( &ok ); + + //display the popup with automatic changes + NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), pkg ); + NCursesEvent input = autoChangePopup->showInfoPopup(); + + if ( input == NCursesEvent::cancel ) + { + // user clicked on Cancel + pkg->restoreState(); + cancel = true; + } + if ( ok && input == NCursesEvent::button ) + { + // dependencies OK, no automatic changes/the user has accepted the changes + NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), + "", + _( "System dependencies verify OK." ), + NCPkgNames::OKLabel() + ); + info->setNiceSize( 35, 5 ); + info->showInfoPopup(); + YDialog::deleteTopmostDialog(); + } + } + + YDialog::deleteTopmostDialog(); // delete NCPopupInfo dialog + + pkg->updatePackageList(); + pkg->showDiskSpace(); + + return true; +} Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuDeps.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuDeps.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuDeps.h Wed Feb 27 17:35:45 2008 @@ -25,6 +25,7 @@ #include "NCMenuButton.h" #include "NCPackageSelector.h" #include "NCPopupInfo.h" +#include "NCPkgPopupTable.h" #include "NCZypp.h" @@ -56,6 +57,8 @@ bool generateTestcase(); bool setAutoCheck(); + + bool verify(); }; #endif Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTable.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTable.h Wed Feb 27 17:35:45 2008 @@ -16,7 +16,7 @@ Maintainer: Michael Andres <ma(a)suse.de> /-*/ -#ifndef NCPkgPopupTablek_h +#ifndef NCPkgPopupTable_h #define NCPkgPopupTable_h #include <iosfwd> -- 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] r45087 - in /branches/tmp/bubli/ncurses-pkg/src: NCPkgPopupTree.cc NCPkgPopupTree.h
by kmachalkova＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: kmachalkova Date: Wed Feb 27 17:35:13 2008 New Revision: 45087 URL: http://svn.opensuse.org/viewcvs/yast?rev=45087&view=rev Log: event handling Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc Wed Feb 27 17:35:13 2008 @@ -88,6 +88,7 @@ // create the layout (the NCTree) //createLayout( NCPkgNames::RpmTreeLabel() ); + setNotify(true); if ( pkg->rpmGroupsTree() ) { // clone the tree (fill the NCTree) @@ -256,13 +257,13 @@ //// //// DESCRIPTION : //// -//NCursesEvent NCPkgPopupTree::wHandleInput( wint_t ch ) -//{ -// if ( ch == 27 ) // ESC -// return NCursesEvent::cancel; -// -// return NCDialog::wHandleInput( ch ); -//} +NCursesEvent NCPkgPopupTree::wHandleInput( wint_t ch ) +{ + if ( ch == 27 ) // ESC + return NCursesEvent::cancel; + + return NCTree::wHandleInput( ch ); +} // ///////////////////////////////////////////////////////////////////// //// Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.h Wed Feb 27 17:35:13 2008 @@ -63,7 +63,7 @@ //virtual bool postAgain(); - //virtual NCursesEvent wHandleInput( wint_t ch ); + virtual NCursesEvent wHandleInput( wint_t ch ); public: -- 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] r45086 - in /branches/tmp/aschnell/part-redesign/storage/src/include: ep-dialogs.ycp ep-hd.ycp
by aschnell＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: aschnell Date: Wed Feb 27 16:34:03 2008 New Revision: 45086 URL: http://svn.opensuse.org/viewcvs/yast?rev=45086&view=rev Log: - use RichText widget Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Wed Feb 27 16:34:03 2008 @@ -74,6 +74,9 @@ // TODO: symbols here and resulting content should be identical to the once // used in MakePartitionList + // + // TODO: we could use RichText formatting capabilities (but table is only + // supported by qt) term MakeInfo(map data, list<symbol> rows) { string ret = ""; @@ -115,7 +118,7 @@ ret = ret + "UUID: " + data["uuid"]:"" + "\n"; }); - return `Left(`Label(ret)); + return `Left(`RichText(`opt(`plainText), ret)); } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Wed Feb 27 16:34:03 2008 @@ -48,7 +48,7 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - MakeInfo(disk, [ `device, `vendor, `model, `size, `newline, `bus, `udev_path ]), + MakeInfo(disk, [ `device, `vendor, `model, `size, `newline, `bus, `udev_path, `udev_id ]), `VStretch(), `HBox( `PushButton(`id(`smart), "Smart..." ), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0