October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51804 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGDialog.h src/YGPackageSelector.cc src/YGUI.cc
by rpmcruz＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: rpmcruz Date: Thu Oct 2 21:05:52 2008 New Revision: 51804 URL: http://svn.opensuse.org/viewcvs/yast?rev=51804&view=rev Log: * src/YGDialog.cc: for bug 428965, set instead a higher default height. Already has big as qt: ycp progs should cope. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGUI.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=51804&r1=51803… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Oct 2 21:05:52 2008 @@ -12,6 +12,9 @@ * src/YGUtils.cc: bug fix 428193: set stock icon only if it exists. * src/ygtkwizard.c: bug fix 428193: idem. + * src/YGDialog.cc: for bug 428965, set instead a higher default + height. Already has big as qt: ycp progs should cope. + 2008-09-30 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkbargraph.h/.c: replaced usage of deprecated GtkTooltips API Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=51804&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Thu Oct 2 21:05:52 2008 @@ -22,7 +22,7 @@ */ #define DEFAULT_WIDTH 650 -#define DEFAULT_HEIGHT 550 +#define DEFAULT_HEIGHT 600 class YGWindow; static YGWindow *main_window = 0; @@ -410,23 +410,39 @@ GtkWidget *window = m_window->getWidget(); if (GTK_WIDGET_REALIZED (window)) { gtk_widget_queue_resize (window); +#if 0 bool resize = false; if (isMainDialog()) { width = MIN (0.95 * YUI::app()->displayWidth(), width); height = MIN (0.95 * YUI::app()->displayWidth(), width); if (window->allocation.width < width || window->allocation.height < height) { - width = MAX (width, window->allocation.width), - height = MAX (height, window->allocation.height); + width = MAX (width-100, window->allocation.width), + height = MAX (height-60, window->allocation.height); resize = true; } } else resize = true; if (resize) +#else + if (!isMainDialog()) +#endif gtk_window_resize (GTK_WINDOW (window), width, height); } } +void YGDialog::setMinSize (int width, int height) +{ + GtkWidget *window = m_window->getWidget(); + width = MIN (0.95 * YUI::app()->displayWidth(), width); + height = MIN (0.95 * YUI::app()->displayWidth(), width); + if (window->allocation.width < width || window->allocation.height < height) { + width = MAX (width, window->allocation.width), + height = MAX (height, window->allocation.height); + } + gtk_window_resize (GTK_WINDOW (window), width, height); +} + void YGDialog::highlight (YWidget *ywidget) { struct inner { Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=51804&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Thu Oct 2 21:05:52 2008 @@ -29,9 +29,8 @@ static GtkWindow *currentWindow(); virtual void setSize (int width, int height); + void setMinSize (int width, int height); // used internally by YGPackageSelector.cc virtual void setEnabled (bool enabled); -// virtual int preferredWidth() { return 0; } -// virtual int preferredHeight() { return 0; } virtual void openInternal(); virtual void activate(); 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 Thu Oct 2 21:05:52 2008 @@ -2493,7 +2493,7 @@ YGWidget (this, parent, true, YGTK_TYPE_WIZARD, NULL) { setBorder (0); - YGDialog::currentDialog()->setSize (650, 600); // enlarge + YGDialog::currentDialog()->setMinSize (650, 600); // enlarge YGtkWizard *wizard = YGTK_WIZARD (getWidget()); ygtk_wizard_set_header_icon (wizard, Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=51804&r1=518… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Thu Oct 2 21:05:52 2008 @@ -566,11 +566,10 @@ long YGApplication::displayColors() { return 1L << displayDepth(); /*from yast-qt*/ } -// YCP writers use getDefaultWidth/Height() to do space saving if needed, -// so just tell me the displayWidth/Height(). If that size is decent, let's -// us deal with it. -int YGApplication::defaultWidth() { return getDisplayWidth(); } -int YGApplication::defaultHeight() { return getDisplayHeight(); } +// YCP uses defaultWidth/Height() to use their smaller YWizard impl, so we fool +// them since we want to use a smaller default size than qt +int YGApplication::defaultWidth() { return 1000; } +int YGApplication::defaultHeight() { return 1000; } YWidgetFactory *YGUI::createWidgetFactory() { return new YGWidgetFactory; } -- 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] r51803 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGPackageSelector.cc src/YGUI.cc src/YGUtils.cc src/ygtkwizard.c src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: rpmcruz Date: Thu Oct 2 20:15:29 2008 New Revision: 51803 URL: http://svn.opensuse.org/viewcvs/yast?rev=51803&view=rev Log: * src/yzyppwrapper.cc: must update pools only after running the solver, on finishTransactions(). * src/YGUI.cc: use libyui log system for all logs from gtk. * src/ygtkwizard.c: reduced the size of the header font. * src/YGDialog.cc: bug fix 428965: resize the window if too small. * src/YGUtils.cc: bug fix 428193: set stock icon only if it exists. * src/ygtkwizard.c: bug fix 428193: idem. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUtils.cc 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=51803&r1=51802… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Oct 2 20:15:29 2008 @@ -1,3 +1,17 @@ +2008-10-02 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/yzyppwrapper.cc: must update pools only after running the solver, + on finishTransactions(). + + * src/YGUI.cc: use libyui log system for all logs from gtk. + + * src/ygtkwizard.c: reduced the size of the header font. + + * src/YGDialog.cc: bug fix 428965: resize the window if too small. + + * src/YGUtils.cc: bug fix 428193: set stock icon only if it exists. + * src/ygtkwizard.c: bug fix 428193: idem. + 2008-09-30 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkbargraph.h/.c: replaced usage of deprecated GtkTooltips API Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=51803&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Thu Oct 2 20:15:29 2008 @@ -410,7 +410,19 @@ GtkWidget *window = m_window->getWidget(); if (GTK_WIDGET_REALIZED (window)) { gtk_widget_queue_resize (window); - if (!isMainDialog()) + bool resize = false; + if (isMainDialog()) { + width = MIN (0.95 * YUI::app()->displayWidth(), width); + height = MIN (0.95 * YUI::app()->displayWidth(), width); + if (window->allocation.width < width || window->allocation.height < height) { + width = MAX (width, window->allocation.width), + height = MAX (height, window->allocation.height); + resize = true; + } + } + else + resize = true; + if (resize) gtk_window_resize (GTK_WINDOW (window), width, height); } } 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 Thu Oct 2 20:15:29 2008 @@ -2493,12 +2493,7 @@ YGWidget (this, parent, true, YGTK_TYPE_WIZARD, NULL) { setBorder (0); - GtkWindow *window = YGDialog::currentWindow(); - int enlarge_width = MIN (0.95 * YUI::app()->displayWidth(), 650); - int enlarge_height = MIN (0.95 * YUI::app()->displayHeight(), 600); - gtk_window_resize (window, - MAX (enlarge_width, GTK_WIDGET (window)->allocation.width), - MAX (enlarge_height, GTK_WIDGET (window)->allocation.height)); + YGDialog::currentDialog()->setSize (650, 600); // enlarge YGtkWizard *wizard = YGTK_WIZARD (getWidget()); ygtk_wizard_set_header_icon (wizard, Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=51803&r1=518… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Thu Oct 2 20:15:29 2008 @@ -79,7 +79,7 @@ default: break; } - YUILog::instance()->log (ylevel, domain ? domain : "yast2-gtk", "", 0, "") << message; + YUILog::instance()->log (ylevel, domain ? domain : "yast2-gtk", "yast2-gtk", 0, "") << message; } void YGUI::checkInit() @@ -131,11 +131,8 @@ gtk_init (&argc, &argv); - // send logs to libyui logs - g_log_set_handler ("Gtk", G_LOG_LEVEL_MASK, print_log, NULL); - g_log_set_handler ("Pango", G_LOG_LEVEL_MASK, print_log, NULL); - g_log_set_handler (NULL, G_LOG_LEVEL_MASK, print_log, NULL); -#if 0 // to crash right away to get a stack trace + g_log_set_default_handler (print_log, NULL); // send gtk logs to libyui system +#if 0 // to crash right away in order to get a stack trace g_log_set_always_fatal (GLogLevelFlags (G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL| G_LOG_LEVEL_WARNING| G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG)); #endif Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=51803&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Thu Oct 2 20:15:29 2008 @@ -451,7 +451,6 @@ PangoFontDescription* font = pango_font_description_new(); pango_font_description_set_weight (font, weight); pango_font_description_set_size (font, (int)(size * scale)); - gtk_widget_modify_font (widget, font); pango_font_description_free (font); } @@ -535,8 +534,12 @@ else if (id.size() < 22) icon = fallbackIcon; if (icon) { - GtkWidget *image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); + GdkPixbuf *pixbuf = gtk_widget_render_icon (button, icon, GTK_ICON_SIZE_BUTTON, NULL); + if (pixbuf) { + GtkWidget *image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + gtk_button_set_image (GTK_BUTTON (button), image); + } } else { GtkWidget *image = gtk_button_get_image (GTK_BUTTON (button)); Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=51803&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Thu Oct 2 20:15:29 2008 @@ -207,7 +207,7 @@ header->title = gtk_label_new (NULL); gtk_label_set_ellipsize (GTK_LABEL (header->title), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment (GTK_MISC (header->title), 0, 0.5); - ygutils_setWidgetFont (header->title, PANGO_WEIGHT_BOLD, PANGO_SCALE_XX_LARGE); + ygutils_setWidgetFont (header->title, PANGO_WEIGHT_BOLD, PANGO_SCALE_X_LARGE); header->description = ygtk_link_label_new ("", _("more")); g_signal_connect (G_OBJECT (header->description), "link-clicked", @@ -215,7 +215,7 @@ header->icon = gtk_image_new(); - GtkWidget *text_box = gtk_vbox_new (FALSE, 1); + GtkWidget *text_box = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (text_box), header->title, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (text_box), header->description, FALSE, TRUE, 0); @@ -369,12 +369,16 @@ static GtkWidget *create_help_button() { - GtkWidget *button, *image; - image = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON); + GtkWidget *button, *image = 0; button = gtk_toggle_button_new(); gtk_button_set_label (GTK_BUTTON (button), _("Help")); - gtk_button_set_image (GTK_BUTTON (button), image); gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); + GdkPixbuf *pixbuf = gtk_widget_render_icon (button, GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON, NULL); + if (pixbuf) { + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + gtk_button_set_image (GTK_BUTTON (button), image); + } return button; } Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5180… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Thu Oct 2 20:15:29 2008 @@ -1994,10 +1994,6 @@ void Ypp::Impl::packageModified (Ypp::Package *package) { - // notify listeners of package change - for (GSList *i = pkg_listeners; i; i = i->next) - ((Pool::Impl *) i->data)->packageModified (package); - if (!g_slist_find (transactions, package)) /* could be a result of undo */ transactions = g_slist_append (transactions, package); if (!inTransaction) @@ -2013,7 +2009,6 @@ { inTransaction = true; bool cancel = (resolveProblems() == false); - // check if any package was modified from a restricted repo if (!cancel && ypp->favoriteRepository()) { const Repository *repo = ypp->favoriteRepository(); -- 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] r51802 - in /trunk/installation: control/control.SLED.xml control/control.SLES.xml control/control.openSUSE.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: locilka Date: Thu Oct 2 19:15:11 2008 New Revision: 51802 URL: http://svn.opensuse.org/viewcvs/yast?rev=51802&view=rev Log: - Adjusted presentation_order for SLES and SLED installation proposals - software has to be proposed as almost the last one (bnc #431580). Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Thu Oct 2 19:15:11 2008 @@ -265,18 +265,52 @@ <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> + <proposal_modules config:type="list"> - <proposal_module>hwinfo</proposal_module> - <proposal_module>keyboard</proposal_module> - <proposal_module>mouse</proposal_module> - <proposal_module>partitions</proposal_module> - <proposal_module>add-on</proposal_module> - <proposal_module>software</proposal_module> - <proposal_module>bootloader</proposal_module> - <proposal_module>timezone</proposal_module> - <proposal_module>language</proposal_module> - <proposal_module>runlevel</proposal_module> + <proposal_module> + <name>hwinfo</name> + <presentation_order>10</presentation_order> + </proposal_module> + <proposal_module> + <name>keyboard</name> + <presentation_order>15</presentation_order> + </proposal_module> + <proposal_module> + <name>mouse</name> + <presentation_order>20</presentation_order> + </proposal_module> + <proposal_module> + <name>partitions</name> + <presentation_order>25</presentation_order> + </proposal_module> + <proposal_module> + <name>add-on</name> + <presentation_order>30</presentation_order> + </proposal_module> + <proposal_module> + <name>bootloader</name> + <presentation_order>40</presentation_order> + </proposal_module> + <proposal_module> + <name>language</name> + <presentation_order>50</presentation_order> + </proposal_module> + <proposal_module> + <name>timezone</name> + <presentation_order>45</presentation_order> + </proposal_module> +  + <proposal_module> + <name>software</name> + <presentation_order>35</presentation_order> + </proposal_module> +  + <proposal_module> + <name>runlevel</name> + <presentation_order>55</presentation_order> + </proposal_module> </proposal_modules> + <proposal_tabs config:type="list"> <proposal_tab> <label>Overview</label> @@ -327,9 +361,6 @@ <proposal_modules config:type="list"> <proposal_module>hwinfo</proposal_module> <proposal_module>media</proposal_module> - <proposal_module>update</proposal_module> <proposal_module>add-on</proposal_module> <proposal_module>packages</proposal_module> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Thu Oct 2 19:15:11 2008 @@ -265,18 +265,54 @@ <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> + <proposal_modules config:type="list"> - <proposal_module>hwinfo</proposal_module> - <proposal_module>keyboard</proposal_module> - <proposal_module>mouse</proposal_module> - <proposal_module>partitions</proposal_module> - <proposal_module>add-on</proposal_module> - <proposal_module>software</proposal_module> - <proposal_module>bootloader</proposal_module> - <proposal_module>timezone</proposal_module> - <proposal_module>language</proposal_module> - <proposal_module>runlevel</proposal_module> - <proposal_module>kdump</proposal_module> + <proposal_module> + <name>hwinfo</name> + <presentation_order>10</presentation_order> + </proposal_module> + <proposal_module> + <name>keyboard</name> + <presentation_order>15</presentation_order> + </proposal_module> + <proposal_module> + <name>mouse</name> + <presentation_order>20</presentation_order> + </proposal_module> + <proposal_module> + <name>partitions</name> + <presentation_order>25</presentation_order> + </proposal_module> + <proposal_module> + <name>add-on</name> + <presentation_order>30</presentation_order> + </proposal_module> + <proposal_module> + <name>bootloader</name> + <presentation_order>40</presentation_order> + </proposal_module> + <proposal_module> + <name>kdump</name> + <presentation_order>60</presentation_order> + </proposal_module> + <proposal_module> + <name>language</name> + <presentation_order>50</presentation_order> + </proposal_module> + <proposal_module> + <name>timezone</name> + <presentation_order>45</presentation_order> + </proposal_module> +  + <proposal_module> + <name>software</name> + <presentation_order>35</presentation_order> + </proposal_module> +  + <proposal_module> + <name>runlevel</name> + <presentation_order>55</presentation_order> + </proposal_module> </proposal_modules> <proposal_tabs config:type="list"> @@ -308,6 +344,7 @@ </proposal_tab> </proposal_tabs> </proposal> + <proposal> <archs>s390</archs> <label>Installation Settings</label> @@ -315,19 +352,56 @@ <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> + <proposal_modules config:type="list"> - <proposal_module>hwinfo</proposal_module> - <proposal_module>mouse</proposal_module> - <proposal_module>partitions</proposal_module> - <proposal_module>add-on</proposal_module> - <proposal_module>software</proposal_module> - <proposal_module>bootloader</proposal_module> - <proposal_module>timezone</proposal_module> - <proposal_module>language</proposal_module> - <proposal_module>runlevel</proposal_module> - <proposal_module>dasd</proposal_module> - <proposal_module>zfcp</proposal_module> + <proposal_module> + <name>hwinfo</name> + <presentation_order>10</presentation_order> + </proposal_module> + <proposal_module> + <name>mouse</name> + <presentation_order>15</presentation_order> + </proposal_module> + <proposal_module> + <name>partitions</name> + <presentation_order>20</presentation_order> + </proposal_module> + <proposal_module> + <name>add-on</name> + <presentation_order>25</presentation_order> + </proposal_module> + <proposal_module> + <name>bootloader</name> + <presentation_order>35</presentation_order> + </proposal_module> + <proposal_module> + <name>language</name> + <presentation_order>45</presentation_order> + </proposal_module> + <proposal_module> + <name>timezone</name> + <presentation_order>40</presentation_order> + </proposal_module> + <proposal_module> + <name>dasd</name> + <presentation_order>55</presentation_order> + </proposal_module> + <proposal_module> + <name>zfcp</name> + <presentation_order>60</presentation_order> + </proposal_module> +  + <proposal_module> + <name>software</name> + <presentation_order>30</presentation_order> + </proposal_module> +  + <proposal_module> + <name>runlevel</name> + <presentation_order>50</presentation_order> + </proposal_module> </proposal_modules> + <proposal_tabs config:type="list"> <proposal_tab> <label>Overview</label> @@ -375,18 +449,16 @@ <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> + <proposal_modules config:type="list"> <proposal_module>hwinfo</proposal_module> <proposal_module>media</proposal_module> - - <proposal_module>update</proposal_module> + <proposal_module>update</proposal_module> <proposal_module>add-on</proposal_module> - <proposal_module>packages</proposal_module> - <proposal_module>backup</proposal_module> - <proposal_module>language</proposal_module> - <proposal_module>keyboard</proposal_module> + <proposal_module>packages</proposal_module> + <proposal_module>backup</proposal_module> + <proposal_module>language</proposal_module> + <proposal_module>keyboard</proposal_module> </proposal_modules> </proposal> @@ -399,16 +471,13 @@ <enable_skip>no</enable_skip> <proposal_modules config:type="list"> <proposal_module>hwinfo</proposal_module> - <proposal_module>update</proposal_module> <proposal_module>add-on</proposal_module> + <proposal_module>dasd</proposal_module> + <proposal_module>zfcp</proposal_module> <proposal_module>packages</proposal_module> <proposal_module>backup</proposal_module> <proposal_module>language</proposal_module> - <proposal_module>dasd</proposal_module> - <proposal_module>zfcp</proposal_module> </proposal_modules> </proposal> Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Thu Oct 2 19:15:11 2008 @@ -497,9 +497,6 @@ <proposal_modules config:type="list"> <proposal_module>hwinfo</proposal_module> <proposal_module>media</proposal_module> - <proposal_module>update</proposal_module> <proposal_module>packages</proposal_module> <proposal_module>backup</proposal_module> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Oct 2 19:15:11 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 2 19:13:07 CEST 2008 - locilka(a)suse.cz + +- Adjusted presentation_order for SLES and SLED installation + proposals - software has to be proposed as almost the last one + (bnc #431580). + +------------------------------------------------------------------- Thu Oct 2 14:00:49 CEST 2008 - locilka(a)suse.cz - Added 'default_ntp_setup' into control files (SLES/D: false, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51801 - /trunk/packager/src/modules/Packages.ycp
by locilka＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: locilka Date: Thu Oct 2 18:16:25 2008 New Revision: 51801 URL: http://svn.opensuse.org/viewcvs/yast?rev=51801&view=rev Log: Some more debugs Modified: trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Thu Oct 2 18:16:25 2008 @@ -868,16 +868,25 @@ } else { + y2milestone ("Storage packages: %1", storage_packages); install_list = (list<string>) union (install_list, storage_packages); } - if (size (additional_packages) > 0) + if (size (additional_packages) > 0) { y2warning ("Additional packages are still in use, please, change it to use PackagesProposal API"); - install_list = (list<string>) union (install_list, additional_packages); + y2milestone ("Additional packages: %1", additional_packages); + install_list = (list<string>) union (install_list, additional_packages); + } // bnc #431580 - // New API for packages selected by - install_list = (list<string>) union (install_list, PackagesProposal::GetAllResolvables (`package)); + // New API for packages selected by other modules + list <string> packages_proposal_all_packages = PackagesProposal::GetAllResolvables (`package); + if (size (packages_proposal_all_packages) > 0) { + y2milestone ("PackagesProposal::GetAllResolvables returned: %1", packages_proposal_all_packages); + install_list = (list<string>) union (install_list, packages_proposal_all_packages); + } else { + y2milestone ("No packages required by PackagesProposal"); + } // Kernel is added in autoinstPackages () if autoinst is enabled if (!Mode::update () || !Mode::autoinst ()) -- 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] r51800 - /trunk/packager/src/modules/PackagesProposal.ycp
by locilka＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: locilka Date: Thu Oct 2 17:42:10 2008 New Revision: 51800 URL: http://svn.opensuse.org/viewcvs/yast?rev=51800&view=rev Log: Added some more documentation Modified: trunk/packager/src/modules/PackagesProposal.ycp Modified: trunk/packager/src/modules/PackagesProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackagesPro… ============================================================================== --- trunk/packager/src/modules/PackagesProposal.ycp (original) +++ trunk/packager/src/modules/PackagesProposal.ycp Thu Oct 2 17:42:10 2008 @@ -8,6 +8,37 @@ */ { + /*** + * + * This module provides API for packages that want software + * proposal to select some packages for installation. + * + * // No packages selected initially + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + * // Adding packages for ID_1 + * PackagesProposal::AddResolvables ("ID_1", `package, ["aa", "bb", "cc"]); + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + * // Adding packages for ID_2 + * // 'cc' is shared with ID_1 + * PackagesProposal::AddResolvables ("ID_2", `package, ["cc", "dd", "ee"]); + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + * // Get all packages required by ID_1 + * list <string> required_packages = PackagesProposal::GetResolvables ("ID_1", `package); + * y2internal ("Packages required by ID_1: %1", required_packages); + * + * // Removing all packages required by ID_1 + * PackagesProposal::RemoveResolvables ("ID_1", `package, required_packages); + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + * // Removing some packages required by ID_2 + * PackagesProposal::RemoveResolvables ("ID_2", `package, ["cc", "dd"]); + * y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package)); + * + */ + module "PackagesProposal"; textdomain "packager"; @@ -150,6 +181,19 @@ return resolvables_to_install[unique_ID, type]:[]; } + /** + * Returns list of selected resolvables of a given type + * + * @param symbol resolvable type + * @return list <string> list of resolvables + * + * @example + * GetAllResolvables (`package) -> ["list", "of", "packages"] + * // not a supported resolvable type + * GetAllResolvables (`unknown) -> nil + * + * @see supported_resolvables + */ global list <string> GetAllResolvables (symbol type) { if (! IsSupportedResolvableType (type)) { y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); -- 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] r51799 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp src/modules/PackagesProposal.ycp
by locilka＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: locilka Date: Thu Oct 2 17:30:46 2008 New Revision: 51799 URL: http://svn.opensuse.org/viewcvs/yast?rev=51799&view=rev Log: - Added new PackagesProposal module which provides unified API for YaST modules in installation that want to select resolvables for installation (bnc #431580). - 2.17.24 Added: trunk/packager/src/modules/PackagesProposal.ycp Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=51799&r1=51… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Oct 2 17:30:46 2008 @@ -1 +1 @@ -2.17.23 +2.17.24 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Oct 2 17:30:46 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Oct 2 17:26:05 CEST 2008 - locilka(a)suse.cz + +- Added new PackagesProposal module which provides unified API for + YaST modules in installation that want to select resolvables for + installation (bnc #431580). +- 2.17.24 + +------------------------------------------------------------------- Thu Oct 2 13:42:19 CEST 2008 - locilka(a)suse.cz - Handling new tag in 'desktops' in control file: Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Thu Oct 2 17:30:46 2008 @@ -40,6 +40,7 @@ import "PackageCallbacks"; import "Installation"; import "URL"; +import "PackagesProposal"; include "packager/load_release_notes.ycp"; @@ -589,11 +590,14 @@ /** * Add a package to list to be selected before proposal * Can be called only before the installation proposal, later doesn't - * have any effect + * have any effect. + * OBSOLETE! Please, use PackagesProposal::AddResolvables() instead. + * * @param package string package to be selected */ global void addAdditionalPackage(string package) { + y2warning ("OBSOLETE! Please, use PackagesProposal::AddResolvables() instead"); additional_packages = add (additional_packages, package); } @@ -867,8 +871,14 @@ install_list = (list<string>) union (install_list, storage_packages); } + if (size (additional_packages) > 0) + y2warning ("Additional packages are still in use, please, change it to use PackagesProposal API"); install_list = (list<string>) union (install_list, additional_packages); + // bnc #431580 + // New API for packages selected by + install_list = (list<string>) union (install_list, PackagesProposal::GetAllResolvables (`package)); + // Kernel is added in autoinstPackages () if autoinst is enabled if (!Mode::update () || !Mode::autoinst ()) { Added: trunk/packager/src/modules/PackagesProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackagesPro… ============================================================================== --- trunk/packager/src/modules/PackagesProposal.ycp (added) +++ trunk/packager/src/modules/PackagesProposal.ycp Thu Oct 2 17:30:46 2008 @@ -0,0 +1,186 @@ +/** + * File: PackagesProposal.ycp + * Package: Packages installation + * Summary: API for selecting or de-selecting packages for installation + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * $Id$ + */ + +{ + module "PackagesProposal"; + + textdomain "packager"; + + /** + * @struct $[ + * "unique_ID" : $[ + * `package : [ "list", "of", "packages", "to", "install" ], + * `pattern : [ "list", "of", "patterns", "to", "install" ], + * ] + * ] + */ + map <string, map <symbol, list <string> > > resolvables_to_install = $[]; + + /** + * List of currently supported types of resolvables + */ + list <symbol> supported_resolvables = [`package]; + + boolean IsSupportedResolvableType (symbol type) { + if (type == nil) { + y2error ("Wrong type: %1", type); + return false; + } + + return contains (supported_resolvables, type); + } + + /** + * Adds list of packages to pool that is then used by software proposal + * to propose a selection of resolvables to install. + * + * @param string unique_ID + * @param symbol resolvable type + * @param list <string> of resolvables to add for installation + * @return boolean whether successful + * + * @example + * AddResolvables ("y2_kdump", `package, ["yast2-kdump", "kdump"]) -> true + * // `not_supported is definitely not a supported resolvable + * AddResolvables ("test", `not_supported, ["bash"]) -> false + * + * @see supported_resolvables + * @see RemoveResolvables() + */ + global boolean AddResolvables (string unique_ID, symbol type, list <string> resolvables) { + if (unique_ID == nil || unique_ID == "") { + y2error ("Unique ID cannot be: %1", unique_ID); + return false; + } + + if (! IsSupportedResolvableType (type)) { + y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); + return false; + } + + if (! haskey (resolvables_to_install, unique_ID)) { + y2debug ("Creating '%1' key in resolvables_to_install", unique_ID); + resolvables_to_install[unique_ID] = $[]; + } + + if (! haskey (resolvables_to_install[unique_ID]:$[], type)) { + y2debug ("Creating '%1' key in resolvables_to_install[%2]", type, unique_ID); + resolvables_to_install[unique_ID, type] = []; + } + + y2milestone ("Adding resolvables %1 type %2 for %3", resolvables, type, unique_ID); + resolvables_to_install[unique_ID, type] = + (list <string>) union (resolvables_to_install[unique_ID, type]:[], resolvables); + + return true; + } + + /** + * Removes list of packages from pool that is then used by software proposal + * to propose a selection of resolvables to install. + * + * @param string unique_ID + * @param symbol resolvable type + * @param list <string> of resolvables to remove from list selected for installation + * @return boolean whether successful + * + * @example + * RemoveResolvables ("y2_kdump", `package, ["kdump"]) -> true + * + * @see supported_resolvables + * @see AddResolvables() + */ + global boolean RemoveResolvables (string unique_ID, symbol type, list <string> resolvables) { + if (unique_ID == nil || unique_ID == "") { + y2error ("Unique ID cannot be: %1", unique_ID); + return false; + } + + if (! IsSupportedResolvableType (type)) { + y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); + return false; + } + + if (! haskey (resolvables_to_install, unique_ID)) { + y2debug ("Creating '%1' key in resolvables_to_install", unique_ID); + resolvables_to_install[unique_ID] = $[]; + } + + if (! haskey (resolvables_to_install[unique_ID]:$[], type)) { + y2debug ("Creating '%1' key in resolvables_to_install[%2]", type, unique_ID); + resolvables_to_install[unique_ID, type] = []; + } + + y2milestone ("Removing resolvables %1 type %2 for %3", resolvables, type, unique_ID); + resolvables_to_install[unique_ID, type] = filter (string one_resolvable, resolvables_to_install[unique_ID, type]:[], { + return ! contains (resolvables, one_resolvable); + }); + y2milestone ("Resolvables left: %1", resolvables_to_install[unique_ID, type]:[]); + + return true; + } + + /** + * Returns all resolvables selected for installation. + * + * @param string unique_ID + * @param symbol resolvable type + * @return list <string> of resolvables + * + * @example + * GetResolvables ("y2_kdump", `package) -> ["yast2-kdump", "kdump"] + */ + global list <string> GetResolvables (string unique_ID, symbol type) { + if (unique_ID == nil || unique_ID == "") { + y2error ("Unique ID cannot be: %1", unique_ID); + return nil; + } + + if (! IsSupportedResolvableType (type)) { + y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); + return nil; + } + + return resolvables_to_install[unique_ID, type]:[]; + } + + global list <string> GetAllResolvables (symbol type) { + if (! IsSupportedResolvableType (type)) { + y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables); + return nil; + } + + list <string> ret = []; + + foreach (string unique_ID, map <symbol, list <string> > resolvables, resolvables_to_install, { + if (haskey (resolvables, type)) { + ret = (list <string>) union (ret, resolvables[type]:[]); + } + }); + + return ret; + } + + /** + * Return whether a unique ID is already in use. + * + * @param string unique_ID to check + * @return boolean whether the ID is not in use yet + */ + global boolean IsUniqueID (string unique_ID) { + if (unique_ID == nil || unique_ID == "") { + y2error ("Unique ID cannot be: %1", unique_ID); + return nil; + } + + return ! haskey (resolvables_to_install, unique_ID); + } + +/* EOF */ +} -- 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] r51798 - /tags/stable-2_17_3/schema/
by jsrain＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: jsrain Date: Thu Oct 2 17:25:23 2008 New Revision: 51798 URL: http://svn.opensuse.org/viewcvs/yast?rev=51798&view=rev Log: Created tag stable-2_17_3 for schema Added: tags/stable-2_17_3/schema/ - copied from r51797, trunk/schema/ -- 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] r51797 - in /trunk/schema: VERSION package/yast2-schema.changes yast2-schema.spec.in
by jsrain＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: jsrain Date: Thu Oct 2 17:25:15 2008 New Revision: 51797 URL: http://svn.opensuse.org/viewcvs/yast?rev=51797&view=rev Log: added yast2-core to BuildRequires to build the package Modified: trunk/schema/VERSION trunk/schema/package/yast2-schema.changes trunk/schema/yast2-schema.spec.in Modified: trunk/schema/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/VERSION?rev=51797&r1=5179… ============================================================================== --- trunk/schema/VERSION (original) +++ trunk/schema/VERSION Thu Oct 2 17:25:15 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/schema/package/yast2-schema.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/package/yast2-schema.chan… ============================================================================== --- trunk/schema/package/yast2-schema.changes (original) +++ trunk/schema/package/yast2-schema.changes Thu Oct 2 17:25:15 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 2 16:32:35 CEST 2008 - jsrain(a)suse.cz + +- added yast2-core to BuildRequires to build the package +- 2.17.3 + +------------------------------------------------------------------- Tue Sep 30 13:57:11 CEST 2008 - locilka(a)suse.cz - Added some more BuildIgnores to build the package. Modified: trunk/schema/yast2-schema.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/yast2-schema.spec.in?rev=… ============================================================================== --- trunk/schema/yast2-schema.spec.in (original) +++ trunk/schema/yast2-schema.spec.in Thu Oct 2 17:25:15 2008 @@ -4,7 +4,9 @@ @HEADER@ -BuildRequires: java2-devel-packages trang yast2-all-packages +BuildRequires: java2-devel-packages trang yast2-all-packages +# yast2-core omited from some reason in buildservice, adding explicitly +BuildRequires: yast2-core #!BuildIgnore: yast2-build-test yast2-online-update # optimization suggested by AJ: -- 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] r51796 - /trunk/packager/src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: lslezak Date: Thu Oct 2 15:43:21 2008 New Revision: 51796 URL: http://svn.opensuse.org/viewcvs/yast?rev=51796&view=rev Log: - removed obsoleted Pkg:: calls Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Thu Oct 2 15:43:21 2008 @@ -470,11 +470,9 @@ success = success && KeyManager::Write(); - // store in the persistent libzypp storage + // store repositories and services in the persistent libzypp storage success = success && Pkg::SourceSaveAll(); // #176013 - success = success && Pkg::ServicesSave(); - return success; } @@ -1349,10 +1347,8 @@ PackageCallbacks::InitPackageCallbacks (); } - // read repositories + // read repositories & services boolean restore = (!full_mode) ? Pkg::SourceRestore() : true; - // read services - restore = restore && Pkg::ServicesLoad(); y2internal("Known services: %1", Pkg::ServiceAliases()); -- 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] r51795 - /trunk/pkg-bindings/src/Source_Load.cc
by lslezak＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: lslezak Date: Thu Oct 2 15:39:41 2008 New Revision: 51795 URL: http://svn.opensuse.org/viewcvs/yast?rev=51795&view=rev Log: - autorefresh enabled services when loading repositories Modified: trunk/pkg-bindings/src/Source_Load.cc Modified: trunk/pkg-bindings/src/Source_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Source_Load.cc (original) +++ trunk/pkg-bindings/src/Source_Load.cc Thu Oct 2 15:39:41 2008 @@ -74,6 +74,42 @@ try { service_manager.LoadServices(repomanager); + + if (!service_manager.empty()) + { + // refresh services at first + ServiceManager::Services services(service_manager.GetServices()); + bool network_is_running = NetworkDetected(); + + for_(srv_it, services.begin(), services.end()) + { + try + { + if (srv_it->enabled() && srv_it->autorefresh()) + { + zypp::Url url(srv_it->url()); + + if (!network_is_running && remoteRepo(url)) + { + y2warning("No network connection, skipping autorefresh of remote service %s (%s)", + srv_it->alias().c_str(), url.asString().c_str()); + } + else + { + y2milestone("Autorefreshing service %s (%s)...", srv_it->alias().c_str(), url.asString().c_str()); + service_manager.RefreshService(srv_it->alias(), repomanager); + } + } + } + catch (const zypp::Exception& excpt) + { + // service refresh is not fatal, let's continue + y2error ("Error in service refresh: %s", excpt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(excpt)); + success = false; + } + } + } } catch (const zypp::Exception& excpt) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0