October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41577 - /tags/branch-SLE-10-SP1-2_13_95/storage/
by fehr＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: fehr Date: Thu Oct 25 17:58:29 2007 New Revision: 41577 URL: http://svn.opensuse.org/viewcvs/yast?rev=41577&view=rev Log: Created tag branch-SLE-10-SP1-2_13_95 for storage Added: tags/branch-SLE-10-SP1-2_13_95/storage/ - copied from r41576, branches/SuSE-SLE-10-SP1-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41576 - /tags/branch-SLE-10-SP1-2_13_95/storage/
by fehr＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: fehr Date: Thu Oct 25 17:58:26 2007 New Revision: 41576 URL: http://svn.opensuse.org/viewcvs/yast?rev=41576&view=rev Log: update Removed: tags/branch-SLE-10-SP1-2_13_95/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41575 - in /branches/SuSE-SLE-10-SP1-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: fehr Date: Thu Oct 25 17:57:45 2007 New Revision: 41575 URL: http://svn.opensuse.org/viewcvs/yast?rev=41575&view=rev Log: - fix problem when more than one device name translation could be applied (#332520) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 25 17:57:45 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 25 17:55:57 CEST 2007 - fehr(a)suse.de + +- fix problem when more than one device name translation could be + applied (#332520) +- version 2.13.95 + +------------------------------------------------------------------- Thu Oct 11 13:08:33 CEST 2007 - fehr(a)suse.de - add support for online resize of ext3 (feature #301943) @@ -12,7 +19,6 @@ - fix missing initialisation of tmpcrypt (#307219) - fix case of nonzero passno for encrypted fstab entries (#307221) - fix problem with resizing encrypted volumes (#307219) -- version 2.13.95 ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Thu Oct 25 17:57:45 2007 @@ -5032,16 +5032,16 @@ map dm = BuildDiskmap( oldv ); if( size(dm)>0 ) { - ret = maplist( string n, names, ``(HdDiskMap( n, dm ))); + ret = maplist( string n, ret, ``(HdDiskMap( n, dm ))); } if( (oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0==0)) && Arch::board_iseries () ) { - ret = maplist( string n, names, ``(HdToIseries( n ))); + ret = maplist( string n, ret, ``(HdToIseries( n ))); } if( oldv["major"]:0==9 ) { - ret = maplist( string n, names, ``(SLES9PersistentDevNames( n ))); + ret = maplist( string n, ret, ``(SLES9PersistentDevNames( n ))); } y2milestone( "GetTranslatedDevices ret %1", ret ); return( ret ); -- 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] r41574 - in /trunk/gtk: ChangeLog src/YGDumbTab.cc src/YGPackageSelector.cc src/YGProgressBar.cc src/YGWidget.cc src/YGWidget.h src/ygtkratiobox.c src/ygtkratiobox.h tests/MultiProgressMeterHuge.ycp
by rpmcruz＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: rpmcruz Date: Thu Oct 25 17:06:52 2007 New Revision: 41574 URL: http://svn.opensuse.org/viewcvs/yast?rev=41574&view=rev Log: * src/ygtkratiobox.h/c, YGProgressBar.cc, YGWidget.cc: bug fix 309049. A ratio box can request for a very big size when using weights so that its children are all visible. Added a max_width/height property to YGtkMinSize and renamed it to YGtkAdjSize. Set it for MultiProgressMeter. * tests/MultiProgressMeterHuge.ycp: test case. Added: trunk/gtk/tests/MultiProgressMeterHuge.ycp Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDumbTab.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGProgressBar.cc trunk/gtk/src/YGWidget.cc trunk/gtk/src/YGWidget.h trunk/gtk/src/ygtkratiobox.c trunk/gtk/src/ygtkratiobox.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41574&r1=41573… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Oct 25 17:06:52 2007 @@ -1,3 +1,12 @@ +2007-10-25 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkratiobox.h/c, YGProgressBar.cc, YGWidget.cc: bug + fix 309049. A ratio box can request for a very big size when using weights + so that its children are all visible. Added a max_width/height property + to YGtkMinSize and renamed it to YGtkAdjSize. Set it for MultiProgressMeter. + + * tests/MultiProgressMeterHuge.ycp: test case. + 2007-10-23 JP Rosevear <jpr(a)novell.com> * src/YGPackageSelector.cc (class YGPatchSelector): Use the more Modified: trunk/gtk/src/YGDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDumbTab.cc?rev=41574&r… ============================================================================== --- trunk/gtk/src/YGDumbTab.cc (original) +++ trunk/gtk/src/YGDumbTab.cc Thu Oct 25 17:06:52 2007 @@ -32,7 +32,7 @@ // GTK+ keeps the notebook size set to the biggset page. We can't // do this since this is dynamic, but at least don't let the notebook // reduce its size. - ygtk_min_size_set_only_expand (YGTK_MIN_SIZE (m_min_size), TRUE); + ygtk_adj_size_set_only_expand (YGTK_ADJ_SIZE (m_adj_size), TRUE); g_signal_connect (G_OBJECT (getWidget()), "switch-page", G_CALLBACK (changed_tab_cb), this); 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 25 17:06:52 2007 @@ -1144,9 +1144,9 @@ *remove_button; selection_buttons_vbox = gtk_vbox_new (TRUE, 80); // to avoid re-labeling glitches, let it only grow - buttons_minsize = ygtk_min_size_new (0, 0); + buttons_minsize = ygtk_adj_size_new(); gtk_container_add (GTK_CONTAINER (buttons_minsize), selection_buttons_vbox); - ygtk_min_size_set_only_expand (YGTK_MIN_SIZE (buttons_minsize), TRUE); + ygtk_adj_size_set_only_expand (YGTK_ADJ_SIZE (buttons_minsize), TRUE); install_button = createArrowButton (_("_install"), GTK_ARROW_RIGHT, &m_install_label); remove_button = createArrowButton (_("_remove"), GTK_ARROW_LEFT, &m_remove_label); Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=415… ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Thu Oct 25 17:06:52 2007 @@ -137,6 +137,8 @@ maxValue (i), TRUE, TRUE, 0); } + ygtk_adj_size_set_max (YGTK_ADJ_SIZE (m_adj_size), horizontal ? 200 : 0, + horizontal ? 0 : 200); gtk_widget_show_all (getWidget()); } Modified: trunk/gtk/src/YGWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.cc?rev=41574&r1… ============================================================================== --- trunk/gtk/src/YGWidget.cc (original) +++ trunk/gtk/src/YGWidget.cc Thu Oct 25 17:06:52 2007 @@ -30,12 +30,12 @@ m_widget = GTK_WIDGET (g_object_new_valist (type, property_name, args)); if (type == GTK_TYPE_WINDOW) - m_min_size = m_widget; + m_adj_size = m_widget; else { - m_min_size = ygtk_min_size_new (0, 0); - g_object_ref_sink (G_OBJECT (m_min_size)); - gtk_widget_show (m_min_size); - gtk_container_add (GTK_CONTAINER (m_min_size), m_widget); + m_adj_size = ygtk_adj_size_new(); + g_object_ref_sink (G_OBJECT (m_adj_size)); + gtk_widget_show (m_adj_size); + gtk_container_add (GTK_CONTAINER (m_adj_size), m_widget); } y_widget->setWidgetRep ((void *) this); @@ -56,8 +56,8 @@ YGWidget::~YGWidget() { IMPL - gtk_widget_destroy (m_min_size); - g_object_unref (G_OBJECT (m_min_size)); + gtk_widget_destroy (m_adj_size); + g_object_unref (G_OBJECT (m_adj_size)); } void YGWidget::show() @@ -121,16 +121,13 @@ void YGWidget::setBorder (unsigned int border) { IMPL - gtk_container_set_border_width (GTK_CONTAINER (m_min_size), border); + gtk_container_set_border_width (GTK_CONTAINER (m_adj_size), border); } void YGWidget::setMinSize (unsigned int width, unsigned int height) { IMPL - if (width) - ygtk_min_size_set_width (YGTK_MIN_SIZE (m_min_size), width); - if (height) - ygtk_min_size_set_height (YGTK_MIN_SIZE (m_min_size), height); + ygtk_adj_size_set_min (YGTK_ADJ_SIZE (m_adj_size), width, height); } void YGWidget::setMinSizeInChars (unsigned int width, unsigned int height) Modified: trunk/gtk/src/YGWidget.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.h?rev=41574&r1=… ============================================================================== --- trunk/gtk/src/YGWidget.h (original) +++ trunk/gtk/src/YGWidget.h Thu Oct 25 17:06:52 2007 @@ -28,7 +28,7 @@ void show(); // containers should use this call rather than getWidget() - GtkWidget *getLayout() { return m_min_size; } + GtkWidget *getLayout() { return m_adj_size; } // Get the YGWidget associated with a YWidget static YGWidget *get (YWidget *y_widget); @@ -41,7 +41,7 @@ void emitEvent(YEvent::EventReason reason, bool if_notify = true, bool if_not_pending = false, bool immediate = true); - // Aesthicts + // Aesthetics void setBorder (unsigned int border); // in pixels void setMinSize (unsigned int min_width, unsigned int min_height); void setMinSizeInChars (unsigned int min_width, unsigned int min_height); @@ -57,14 +57,11 @@ protected: GtkWidget *m_widget; // associated GtkWidget -- use getWidget() YWidget *m_y_widget; // associated YWidget - GtkWidget *m_min_size; // installed on m_widget, allows setting a min size + GtkWidget *m_adj_size; // installed on m_widget, allows better size constrains void construct (YWidget *y_widget, YGWidget *parent, bool show, GType type, const char *property_name, va_list args); - - // parameters to set the layout prettier - int m_min_width, m_min_height; }; /* Modified: trunk/gtk/src/ygtkratiobox.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.c?rev=41574… ============================================================================== --- trunk/gtk/src/ygtkratiobox.c (original) +++ trunk/gtk/src/ygtkratiobox.c Thu Oct 25 17:06:52 2007 @@ -433,17 +433,17 @@ widget_class->size_allocate = ygtk_ratio_vbox_size_allocate; } -//** YGtkMinSize +//** YGtkAdjSize -G_DEFINE_TYPE (YGtkMinSize, ygtk_min_size, GTK_TYPE_BIN) +G_DEFINE_TYPE (YGtkAdjSize, ygtk_adj_size, GTK_TYPE_BIN) -static void ygtk_min_size_init (YGtkMinSize *min_size) +static void ygtk_adj_size_init (YGtkAdjSize *adj_size) { - GTK_WIDGET_SET_FLAGS (min_size, GTK_NO_WINDOW); - gtk_widget_set_redraw_on_allocate (GTK_WIDGET (min_size), FALSE); + GTK_WIDGET_SET_FLAGS (adj_size, GTK_NO_WINDOW); + gtk_widget_set_redraw_on_allocate (GTK_WIDGET (adj_size), FALSE); } -static void ygtk_min_size_size_request (GtkWidget *widget, +static void ygtk_adj_size_size_request (GtkWidget *widget, GtkRequisition *requisition) { GtkWidget *child = GTK_BIN (widget)->child; @@ -454,18 +454,23 @@ requisition->width += border * 2; requisition->height += border * 2; - YGtkMinSize *min_size = YGTK_MIN_SIZE (widget); - requisition->width = MAX (requisition->width, min_size->min_width); - requisition->height = MAX (requisition->height, min_size->min_height); - - if (min_size->only_expand) { - min_size->min_width = requisition->width; - min_size->min_height = requisition->height; + YGtkAdjSize *adj_size = YGTK_ADJ_SIZE (widget); + requisition->width = MAX (requisition->width, adj_size->min_width); + requisition->height = MAX (requisition->height, adj_size->min_height); + + if (adj_size->max_width) + requisition->width = MIN (requisition->width, adj_size->max_width); + if (adj_size->max_height) + requisition->height = MIN (requisition->height, adj_size->max_height); + + if (adj_size->only_expand) { + adj_size->min_width = requisition->width; + adj_size->min_height = requisition->height; } } } -static void ygtk_min_size_size_allocate (GtkWidget *widget, +static void ygtk_adj_size_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { GtkWidget *child = GTK_BIN (widget)->child; @@ -478,39 +483,38 @@ child_alloc.height -= border * 2; gtk_widget_size_allocate (child, &child_alloc); } - GTK_WIDGET_CLASS (ygtk_min_size_parent_class)->size_allocate (widget, allocation); + GTK_WIDGET_CLASS (ygtk_adj_size_parent_class)->size_allocate (widget, allocation); } -GtkWidget* ygtk_min_size_new(guint min_width, guint min_height) +GtkWidget* ygtk_adj_size_new (void) { - YGtkMinSize *min_size = g_object_new (YGTK_TYPE_MIN_SIZE, NULL); - ygtk_min_size_set_width (min_size, min_width); - ygtk_min_size_set_height (min_size, min_height); - return GTK_WIDGET (min_size); + return GTK_WIDGET (g_object_new (YGTK_TYPE_ADJ_SIZE, NULL)); } -void ygtk_min_size_set_width (YGtkMinSize *min_size, guint min_width) +void ygtk_adj_size_set_min (YGtkAdjSize *adj_size, guint min_width, guint min_height) { - min_size->min_width = min_width; + adj_size->min_width = min_width; + adj_size->min_height = min_height; } -void ygtk_min_size_set_height (YGtkMinSize *min_size, guint min_height) +void ygtk_adj_size_set_max (YGtkAdjSize *adj_size, guint max_width, guint max_height) { - min_size->min_height = min_height; + adj_size->max_width = max_width; + adj_size->max_height = max_height; } -void ygtk_min_size_set_only_expand (YGtkMinSize *min_size, gboolean only_expand) +void ygtk_adj_size_set_only_expand (YGtkAdjSize *adj_size, gboolean only_expand) { - min_size->only_expand = only_expand; + adj_size->only_expand = only_expand; } -static void ygtk_min_size_class_init (YGtkMinSizeClass *klass) +static void ygtk_adj_size_class_init (YGtkAdjSizeClass *klass) { - ygtk_min_size_parent_class = g_type_class_peek_parent (klass); + ygtk_adj_size_parent_class = g_type_class_peek_parent (klass); GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass); - widget_class->size_request = ygtk_min_size_size_request; - widget_class->size_allocate = ygtk_min_size_size_allocate; + widget_class->size_request = ygtk_adj_size_size_request; + widget_class->size_allocate = ygtk_adj_size_size_allocate; } //** YGtkScrolledWindow Modified: trunk/gtk/src/ygtkratiobox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.h?rev=41574… ============================================================================== --- trunk/gtk/src/ygtkratiobox.h (original) +++ trunk/gtk/src/ygtkratiobox.h Thu Oct 25 17:06:52 2007 @@ -153,50 +153,49 @@ G_END_DECLS #endif /* YGTK_RATIO_BOX_H */ -/* YGtkMinSize is container where a widget may be installed so that one can - set a minimum size to it. */ -#ifndef YGTK_MIN_SIZE_H -#define YGTK_MIN_SIZE_H +/* YGtkAdjSize container allows for better fine grained size constrains. */ +#ifndef YGTK_ADJ_SIZE_H +#define YGTK_ADJ_SIZE_H #include <gtk/gtkbin.h> G_BEGIN_DECLS -#define YGTK_TYPE_MIN_SIZE (ygtk_min_size_get_type ()) -#define YGTK_MIN_SIZE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - YGTK_TYPE_MIN_SIZE, YGtkMinSize)) -#define YGTK_MIN_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ - YGTK_TYPE_MIN_SIZE, YGtkMinSizeClass)) -#define YGTK_IS_MIN_SIZE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - YGTK_TYPE_MIN_SIZE)) -#define YGTK_IS_MIN_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - YGTK_TYPE_MIN_SIZE)) -#define YGTK_MIN_SIZE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - YGTK_TYPE_MIN_SIZE, YGtkMinSizeClass)) +#define YGTK_TYPE_ADJ_SIZE (ygtk_adj_size_get_type ()) +#define YGTK_ADJ_SIZE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_ADJ_SIZE, YGtkAdjSize)) +#define YGTK_ADJ_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_ADJ_SIZE, YGtkAdjSizeClass)) +#define YGTK_IS_ADJ_SIZE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_ADJ_SIZE)) +#define YGTK_IS_ADJ_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_ADJ_SIZE)) +#define YGTK_ADJ_SIZE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_ADJ_SIZE, YGtkAdjSizeClass)) -typedef struct _YGtkMinSize +typedef struct _YGtkAdjSize { GtkBin parent; // members - guint min_width, min_height; + guint min_width, min_height, max_width, max_height; gboolean only_expand; -} YGtkMinSize; +} YGtkAdjSize; -typedef struct _YGtkMinSizeClass +typedef struct _YGtkAdjSizeClass { GtkBinClass parent_class; -} YGtkMinSizeClass; +} YGtkAdjSizeClass; -GType ygtk_min_size_get_type (void) G_GNUC_CONST; -GtkWidget* ygtk_min_size_new (guint min_width, guint min_height); +GType ygtk_adj_size_get_type (void) G_GNUC_CONST; +GtkWidget* ygtk_adj_size_new (void); -void ygtk_min_size_set_width (YGtkMinSize *min_size, guint min_width); -void ygtk_min_size_set_height (YGtkMinSize *min_size, guint min_height); +void ygtk_adj_size_set_min (YGtkAdjSize *adj_size, guint min_width, guint min_height); +void ygtk_adj_size_set_max (YGtkAdjSize *adj_size, guint max_width, guint max_height); /* Only allow the child to grow (ie. to ask for bigger sizes). */ -void ygtk_min_size_set_only_expand (YGtkMinSize *min_size, gboolean only_expand); +void ygtk_adj_size_set_only_expand (YGtkAdjSize *adj_size, gboolean only_expand); G_END_DECLS -#endif /*YGTK_MIN_SIZE_H*/ +#endif /*YGTK_ADJ_SIZE_H*/ /* YGtkScrolledWindow gives some a more fine-grained automatic scroll policy. It allows the user to specify from which size scrolling should be applied. */ Added: trunk/gtk/tests/MultiProgressMeterHuge.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/MultiProgressMeterHuge… ============================================================================== --- trunk/gtk/tests/MultiProgressMeterHuge.ycp (added) +++ trunk/gtk/tests/MultiProgressMeterHuge.ycp Thu Oct 25 17:06:52 2007 @@ -0,0 +1,39 @@ +// Simple example for MultiProgressMeter +{ + if ( ! UI::HasSpecialWidget(`HMultiProgressMeter ) ) + { + UI::OpenDialog( + `VBox( + `Label("Error: This UI doesn't support the MultiProgressMeter widget!"), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); + + return; + } + + + UI::OpenDialog( + `VBox( + `HMultiProgressMeter(`id(`prog), [ 10000, 200, 500, 20, 100 ] ), + `PushButton(`opt(`default), "&Ok" ) + ) + ); + + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 800, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 500, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 200, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 200, 500, 20, 100 ] ); UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 0, 100, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 20, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 500, 20, 100 ] ); UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 0, 0, 400, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 300, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 200, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 100, 20, 100 ] ); UI::UserInput(); +} -- 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] r41573 - in /branches/tmp/sh/mod-ui: core/libyui/src/ qt/src/
by sh-sh-sh＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: sh-sh-sh Date: Thu Oct 25 16:21:39 2007 New Revision: 41573 URL: http://svn.opensuse.org/viewcvs/yast?rev=41573&view=rev Log: YTable now uses YTableHeader object in constructor so column headers and alignment are known right away in the constructor (bubli's request) Added: branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.cc branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.h branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc branches/tmp/sh/mod-ui/core/libyui/src/YTable.h branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h branches/tmp/sh/mod-ui/qt/src/YQTable.cc branches/tmp/sh/mod-ui/qt/src/YQTable.h branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Thu Oct 25 16:21:39 2007 @@ -384,3 +384,11 @@ a custom pointer to some other class. Look at YQMenuButton for a sample implementation. + + +2007-10-25 17:00 sh(a)suse.de + +* Changed YTable header handling (bubli's request): + - Constructor now gets YTableHeader object + - no more setHeader() and setAlignment functions - get rid of them + - use columns(), header(), alignment() in the constructor to set up columns Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Thu Oct 25 16:21:39 2007 @@ -27,6 +27,7 @@ YItem.cc \ YTreeItem.cc \ YTableItem.cc \ + YTableHeader.cc \ YProperty.cc \ YUIComponent.cc \ YUIException.cc \ @@ -117,6 +118,7 @@ YMenuItem.h \ YTreeItem.h \ YTableItem.h \ + YTableHeader.h \ YOptionalWidgetFactory.h \ YPackageSelectorPlugin.h \ YProperty.h \ Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h Thu Oct 25 16:21:39 2007 @@ -59,6 +59,7 @@ * Return the alignment in the specified dimension. **/ YAlignmentType alignment( YUIDimension dim ) const; + /** * Return the left margin in pixels, the distance between the left edge of * this alignment and the left edge of the child widget. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Thu Oct 25 16:21:39 2007 @@ -2080,6 +2080,7 @@ return 0; } + // Parse options bool immediate = false; @@ -2093,36 +2094,50 @@ } YCPTerm headerTerm = term->value( argnr )->asTerm(); - int columns = headerTerm->size(); - - YTable * table = YUI::widgetFactory()->createTable( parent, columns ); - + + YTable * table = YUI::widgetFactory()->createTable( parent, parseTableHeader( headerTerm ) ); + if ( keepSorting ) table->setKeepSorting( true ); if ( immediate ) table->setImmediateMode( true ); + + if ( numArgs >= 2 ) // Fill table with items, if item list is specified + { + YCPList itemList = term->value( argnr+1 )->asList(); + table->addItems( YCPTableItemParser::parseTableItemList( itemList ) ); + } + + return table; +} - // - // Parse header term - // + +YTableHeader * +YCPDialogParser::parseTableHeader( const YCPTerm & headerTerm ) +{ + YTableHeader * header = new YTableHeader(); + YUI_CHECK_NEW( header ); + for ( int i=0; i < headerTerm->size(); i++ ) { YCPValue colHeader = headerTerm->value( i ); if ( colHeader->isString() ) { - table->setHeader( i, colHeader->asString()->value() ); + header->addColumn( colHeader->asString()->value() ); } else if ( colHeader->isTerm() ) { - YCPTerm colHeaderTerm = colHeader->asTerm(); - - if ( colHeaderTerm->name() == YUISymbol_Left ) table->setAlignment( i, YTable::Left ); - else if ( colHeaderTerm->name() == YUISymbol_Right ) table->setAlignment( i, YTable::Right ); - else if ( colHeaderTerm->name() == YUISymbol_Center ) table->setAlignment( i, YTable::Center ); + string headerText; + YAlignmentType alignment = YAlignBegin; + YCPTerm colHeaderTerm = colHeader->asTerm(); + + if ( colHeaderTerm->name() == YUISymbol_Left ) alignment = YAlignBegin; + else if ( colHeaderTerm->name() == YUISymbol_Right ) alignment = YAlignEnd; + else if ( colHeaderTerm->name() == YUISymbol_Center ) alignment = YAlignCenter; else { string msg = string( "Unknown table header alignment: " ) @@ -2134,7 +2149,7 @@ if ( colHeaderTerm->size() > 0 ) { if ( colHeaderTerm->value(0)->isString() ) - table->setHeader( i, colHeaderTerm->value(0)->asString()->value() ); + headerText = colHeaderTerm->value(0)->asString()->value(); else { string msg = string( "Expected string for table header, not " ) @@ -2153,16 +2168,12 @@ ycperror( "%s", msg.c_str() ); } } - } - } - if ( numArgs >= 2 ) // Fill table with items, if item list is specified - { - YCPList itemList = term->value( argnr+1 )->asList(); - table->addItems( YCPTableItemParser::parseTableItemList( itemList ) ); + header->addColumn( headerText, alignment ); + } } - - return table; + + return header; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.h Thu Oct 25 16:21:39 2007 @@ -31,6 +31,7 @@ class YWidget; class YMenu; class YMenuButton; +class YTableHeader; /** @@ -216,6 +217,8 @@ static YWidget * parseTable( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); + static YTableHeader * parseTableHeader( const YCPTerm & headerTerm ); + static YWidget * parseProgressBar( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc Thu Oct 25 16:21:39 2007 @@ -17,11 +17,6 @@ /-*/ -#include <ycp/YCPSymbol.h> -#include <ycp/YCPBoolean.h> -#include <ycp/YCPVoid.h> -#include <ycp/YCPTerm.h> -#include <ycp/YCPInteger.h> #define y2log_component "ui" #include <ycp/y2log.h> @@ -33,32 +28,29 @@ struct YTablePrivate { - YTablePrivate( int col ) - : columns( col ) + YTablePrivate( YTableHeader * header ) + : header( header ) , keepSorting( false ) , immediateMode( false ) { - headers.resize( columns ); // Fill with empty strings (from default constructor) - alignments.resize( columns, YTable::Left ); } - int columns; - bool keepSorting; - bool immediateMode; - vector<string> headers; - vector<YTable::Alignment> alignments; + YTableHeader * header; + bool keepSorting; + bool immediateMode; }; -YTable::YTable( YWidget * parent, int columns ) +YTable::YTable( YWidget * parent, YTableHeader * header ) : YSelectionWidget( parent, "", // label true ) // enforceSingleSelection - , priv( new YTablePrivate( columns ) ) + , priv( new YTablePrivate( header ) ) { - YUI_CHECK_NEW( priv ); + YUI_CHECK_PTR( header ); + YUI_CHECK_NEW( priv ); setDefaultStretchable( YD_HORIZ, true ); setDefaultStretchable( YD_VERT, true ); @@ -67,57 +59,36 @@ YTable::~YTable() { - // NOP + if ( priv->header ) + delete priv->header; } int YTable::columns() const { - return priv->columns; + return priv->header->columns(); } bool YTable::hasColumn( int column ) const { - return column >= 0 && column <= priv->columns; -} - - -void -YTable::setHeader( int column, const string & text ) -{ - if ( hasColumn( column ) ) - priv->headers[ column ] = text; + return priv->header->hasColumn( column ); } string YTable::header( int column ) const { - if ( hasColumn( column ) ) - return priv->headers[ column ]; - else - return ""; + return priv->header->header( column ); } -void -YTable::setAlignment( int column, YTable::Alignment alignment ) -{ - if ( hasColumn( column ) ) - priv->alignments[ column ] = alignment; -} - - -YTable::Alignment +YAlignmentType YTable::alignment( int column ) const { - if ( hasColumn( column ) ) - return priv->alignments[ column ]; - else - return YTable::Left; + return priv->header->alignment( column ); } @@ -227,4 +198,3 @@ macroRecorder->recordWidgetProperty( this, YUIProperty_CurrentItem ); } - Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTable.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.h Thu Oct 25 16:21:39 2007 @@ -19,9 +19,10 @@ #ifndef YTable_h #define YTable_h +#include "YTypes.h" #include "YSelectionWidget.h" #include "YTableItem.h" - +#include "YTableHeader.h" class YMacroRecorder; class YTablePrivate; @@ -51,9 +52,14 @@ { protected: /** - * Constructor. 'columns' is the number of columns to be created. + * Constructor. + * + * 'header' describes the table's headers: Number of columns, column + * headings, and column alignment. The widget assumes ownership of this + * object and will delete it when appropriate. The header cannot be changed + * after creating the widget. **/ - YTable( YWidget * parent, int columns ); + YTable( YWidget * parent, YTableHeader * header ); public: @@ -69,56 +75,32 @@ virtual const char * widgetClass() const { return "YTable"; } /** - * Return the number of coluns of this table. - * Note that this can only be set in the constructor. + * Return the number of columns of this table. **/ int columns() const; /** - * Return 'true' if this table has 'column' columns. + * Return 'true' if this table has a column no. 'column' + * (counting from 0 on). **/ bool hasColumn( int column ) const; /** - * Set the header text for the specified column (counting from 0 on). - * - * Derived classes can overwrite this function, but they should call this - * base class function in the new implementation. - **/ - virtual void setHeader( int column, const string & text ); - - /** * Return the header text for the specified column. **/ string header( int column ) const; - enum Alignment - { - Left, - Center, - Right - }; - - /** - * Set the alignment for the specified column (counting from 0 on): - * YTable::Left, YTable::Center, YTable::Right - * - * Derived classes can overwrite this function, but they should call this - * base class function in the new implementation. - **/ - virtual void setAlignment( int column, YTable::Alignment alignment ); - /** * Return the alignment for the specified column. **/ - YTable::Alignment alignment( int column ) const; + YAlignmentType alignment( int column ) const; /** * Deliver even more events than with notify() set. * * With "notify" alone, a table widget sends an ActivatedEvent when the - * user double-clicks an item or presses the "space" key on it. It does not - * send an event when the user just sends another item. + * user double-clicks an item or presses the "space" key on it. It does + * not send an event when the user just sends another item. * * With "immediate", it also sends a SelectionChangedEvent when the user * selects another item. "immediate" implicitly includes "notify". Added: branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.cc (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.cc Thu Oct 25 16:21:39 2007 @@ -0,0 +1,94 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YTableHeader.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + + +#include <vector> +#define y2log_component "ui" +#include <ycp/y2log.h> +#include "YTableHeader.h" +#include "YUIException.h" + +using std::vector; + + +struct YTableHeaderPrivate +{ + YTableHeaderPrivate() + {} + + vector<string> headers; + vector<YAlignmentType> alignments; +}; + + + + +YTableHeader::YTableHeader() + : priv( new YTableHeaderPrivate ) +{ + YUI_CHECK_NEW( priv ); +} + + +YTableHeader::~YTableHeader() +{ + // NOP +} + + +void +YTableHeader::addColumn( const string & header, YAlignmentType alignment ) +{ + priv->headers.push_back( header ); + priv->alignments.push_back( alignment ); +} + + +int +YTableHeader::columns() const +{ + return (int) priv->headers.size(); +} + + +bool +YTableHeader::hasColumn( int column ) const +{ + return column >= 0 && column < (int) priv->headers.size(); +} + + +string +YTableHeader::header( int column ) const +{ + if ( column >= 0 && column < (int) priv->headers.size() ) + return priv->headers[ column ]; + else + return ""; +} + + +YAlignmentType +YTableHeader::alignment( int column ) const +{ + if ( column >= 0 && column < (int) priv->alignments.size() ) + return priv->alignments[ column ]; + else + return YAlignBegin; +} + Added: branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.h Thu Oct 25 16:21:39 2007 @@ -0,0 +1,85 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YTableHeader.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YTableHeader_h +#define YTableHeader_h + +#include <string> +#include "ImplPtr.h" +#include "YTypes.h" + +using std::string; + + +class YTableHeaderPrivate; + +/** + * Helper class for YTable for table column properties: + * + * - number of columns + * - header for each column + * - alignment for each column + **/ +class YTableHeader +{ +public: + /** + * Constructor. + **/ + YTableHeader(); + + /** + * Destructor. + **/ + virtual ~YTableHeader(); + + /** + * Add a column with the specified colum header text and alignment. + **/ + void addColumn( const string & header, + YAlignmentType alignment = YAlignBegin ); + + /** + * Return the number of columns. + **/ + int columns() const; + + /** + * Return 'true' if this table header has a column no. 'column' + * (counting from 0 on). + **/ + bool hasColumn( int column ) const; + + /** + * Return the header text for the specified column. + **/ + string header( int column ) const; + + /** + * Return the alignment for the specified column. + **/ + YAlignmentType alignment( int column ) const; + + +private: + + ImplPtr<YTableHeaderPrivate> priv; +}; + + +#endif // YTableHeader_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h Thu Oct 25 16:21:39 2007 @@ -52,6 +52,4 @@ }; - - #endif // YTypes_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h Thu Oct 25 16:21:39 2007 @@ -53,6 +53,7 @@ class YSpacing; class YSquash; class YTable; +class YTableHeader; class YTimeField; class YTree; @@ -97,7 +98,7 @@ virtual YComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ) = 0; virtual YSelectionBox * createSelectionBox ( YWidget * parent, const string & label ) = 0; virtual YTree * createTree ( YWidget * parent, const string & label ) = 0; - virtual YTable * createTable ( YWidget * parent, int columns ) = 0; + virtual YTable * createTable ( YWidget * parent, YTableHeader * header ) = 0; virtual YProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ) = 0; virtual YRichText * createRichText ( YWidget * parent, const string & text, bool plainTextMode = false ) = 0; Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.cc Thu Oct 25 16:21:39 2007 @@ -30,21 +30,45 @@ #include "YQTable.h" -YQTable::YQTable( YWidget * parent, - int columns ) +YQTable::YQTable( YWidget * parent, YTableHeader * tableHeader ) : QVBox( (QWidget *) parent->widgetRep() ) - , YTable( parent, columns ) + , YTable( parent, tableHeader ) { setWidgetRep( this ); setMargin( YQWidgetMargin ); _qt_listView = new QY2ListView( this ); YUI_CHECK_NEW( _qt_listView ); + _qt_listView->setAllColumnsShowFocus( true ); - for ( int i=0; i < columns; i++ ) - _qt_listView->addColumn( "" ); // Headers are not known yet - _qt_listView->setAllColumnsShowFocus( true ); + // + // Add columns + // + + for ( int i=0; i < columns(); i++ ) + { + _qt_listView->addColumn( fromUTF8( header( i ) ) ); + + int qt_alignment = Qt::Left; + + switch ( alignment( i ) ) + { + case YAlignBegin: qt_alignment = Qt::AlignLeft; break; + case YAlignCenter: qt_alignment = Qt::AlignCenter; break; + case YAlignEnd: qt_alignment = Qt::AlignRight; break; + + case YAlignUnchanged: break; + } + + _qt_listView->setColumnAlignment( i, qt_alignment ); + // _qt_listView->adjustColumn( column ); + } + + + // + // Connect signals and slots + // connect( _qt_listView, SIGNAL( doubleClicked ( QListViewItem * ) ), this, SLOT ( slotActivated ( QListViewItem * ) ) ); @@ -64,40 +88,6 @@ void -YQTable::setHeader( int column, const string & text ) -{ - YTable::setHeader( column, text ); - - if ( hasColumn( column ) ) - { - _qt_listView->header()->setLabel( column, fromUTF8( text ) ); - _qt_listView->adjustColumn( column ); - } -} - - -void -YQTable::setAlignment( int column, YTable::Alignment alignment ) -{ - YTable::setAlignment( column, alignment ); - - if ( hasColumn( column ) ) - { - int qt_alignment = Qt::Left; - - switch ( alignment ) - { - case YTable::Left: qt_alignment = Qt::AlignLeft; break; - case YTable::Center: qt_alignment = Qt::AlignCenter; break; - case YTable::Right: qt_alignment = Qt::AlignRight; break; - } - - _qt_listView->setColumnAlignment( column, qt_alignment ); - } -} - - -void YQTable::setKeepSorting( bool keepSorting ) { YTable::setKeepSorting( keepSorting ); @@ -110,9 +100,9 @@ { YTableItem * item = dynamic_cast<YTableItem *> (yitem); YUI_CHECK_PTR( item ); - + YTable::addItem( item ); - + YQTableListViewItem * clone = new YQTableListViewItem( this, _qt_listView, item ); YUI_CHECK_NEW( clone ); @@ -131,7 +121,7 @@ YTableItem * item = dynamic_cast<YTableItem *> (yitem); YUI_CHECK_PTR( item ); - + YQTableListViewItem * clone = (YQTableListViewItem *) item->data(); YUI_CHECK_PTR( clone ); @@ -151,7 +141,7 @@ YQTable::deselectAllItems() { YQSignalBlocker sigBlocker( _qt_listView ); - + YTable::deselectAllItems(); _qt_listView->clearSelection(); } @@ -195,7 +185,7 @@ YQTable::slotSelected( QListViewItem * listViewItem ) { selectOrigItem( listViewItem ); - + if ( immediateMode() ) { if ( ! YQUI::ui()->eventPendingFor( this ) ) @@ -212,7 +202,7 @@ YQTable::slotActivated( QListViewItem * listViewItem ) { selectOrigItem( listViewItem ); - + if ( notify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::Activated ) ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.h Thu Oct 25 16:21:39 2007 @@ -38,7 +38,7 @@ /** * Constructor. **/ - YQTable( YWidget * parent, int columns ); + YQTable( YWidget * parent, YTableHeader * header ); /** * Destructor. @@ -46,21 +46,6 @@ virtual ~YQTable(); /** - * Set the header text for the specified column (counting from 0 on). - * - * Reimplemented from YTableWidget. - **/ - virtual void setHeader( int column, const string & text ); - - /** - * Set the alignment for the specified column (counting from 0 on): - * YTable::Left, YTable::Center, YTable::Right - * - * Reimplemented from YTableWidget. - **/ - virtual void setAlignment( int column, YTable::Alignment alignment ); - - /** * Switch between sorting by item insertion order (keepSorting: true) or * allowing the user to sort by an arbitrary column (by clicking on the * column header). Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc Thu Oct 25 16:21:39 2007 @@ -181,9 +181,9 @@ YQTable * -YQWidgetFactory::createTable( YWidget * parent, int columns ) +YQWidgetFactory::createTable( YWidget * parent, YTableHeader * header ) { - YQTable * table = new YQTable( parent, columns ); + YQTable * table = new YQTable( parent, header ); YUI_CHECK_NEW( table ); return table; Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h Thu Oct 25 16:21:39 2007 @@ -91,7 +91,7 @@ virtual YQComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ); virtual YQSelectionBox * createSelectionBox ( YWidget * parent, const string & label ); virtual YQTree * createTree ( YWidget * parent, const string & label ); - virtual YQTable * createTable ( YWidget * parent, int columns ); + virtual YQTable * createTable ( YWidget * parent, YTableHeader * header ); virtual YQProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ); virtual YQRichText * createRichText ( YWidget * parent, const string & text, bool plainTextMode = 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] r41572 - /branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp
by sh-sh-sh＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: sh-sh-sh Date: Thu Oct 25 16:20:18 2007 New Revision: 41572 URL: http://svn.opensuse.org/viewcvs/yast?rev=41572&view=rev Log: New example Added: branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp Added: branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp (added) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp Thu Oct 25 16:20:18 2007 @@ -0,0 +1,48 @@ +// Advanced ComboBox / SelecionBox example: +// Dialog with a ComboBox and a SelectionBox +// where selecting an item in one will also select it in the other +{ + list items = + [ + `item(`id( "Napoli" ), "Napoli" ), + `item(`id( "Funghi" ), "Funghi", true ), + `item(`id( "Salami" ), "Salami" ) + ]; + + UI::OpenDialog( + `VBox( + `MinSize( 30, 5, + `HBox( + `Top( + `ComboBox(`id(`pizzaComboBox), `opt(`notify), "Pizza:", items ) + ), + `SelectionBox (`id(`pizzaSelBox ), `opt(`notify), "Pizza:", items ) + ) + ), + `Right(`PushButton(`id(`cancel), "&Close") ) + ) + ); + + symbol widget = nil; + + repeat + { + widget = (symbol) UI::UserInput(); + // y2debug( "Event widget: %1", widget ); + + if ( widget == `pizzaComboBox || widget == `pizzaSelBox ) + { + string pizza = (string) UI::QueryWidget( widget, `Value ); + y2debug( "Pizza: %1", pizza ); + + UI::ChangeWidget( widget == `pizzaComboBox ? + `pizzaSelBox : `pizzaComboBox, + `Value, pizza ); + + y2debug( "ComboBox: %1", UI::QueryWidget(`pizzaComboBox, `Items ) ); + y2debug( "SelBox : %1", UI::QueryWidget(`pizzaSelBox, `Items ) ); + } + } until ( widget == `cancel ); + + UI::CloseDialog(); +} -- 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] r41571 - /tags/stable-2_16_1/product-creator/
by jsuchome＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: jsuchome Date: Thu Oct 25 16:04:04 2007 New Revision: 41571 URL: http://svn.opensuse.org/viewcvs/yast?rev=41571&view=rev Log: Created tag stable-2_16_1 for product-creator Added: tags/stable-2_16_1/product-creator/ - copied from r41570, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41570 - in /trunk/product-creator: ./ agents/ package/ src/ src/data/ src/data/kiwi_templates/iso/root/etc/init.d/
by jsuchome＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: jsuchome Date: Thu Oct 25 16:01:56 2007 New Revision: 41570 URL: http://svn.opensuse.org/viewcvs/yast?rev=41570&view=rev Log: - adapted for the API change of StorageDevices.ycp - merged features done in SLE10SP version 2.13.17, mostly the SLEPOS requirements (F302370, F302371) and related bugfixes: - allow more characters in the image name - fix modifying of repository (#334208) - check for duplicates in the list of boot images (#332581) - disable Delete button when there's nothing to delete (#334255) - update defaultroot only for new configurations (#327057) - check for absolute paths in boot image entry - fix initializing when going Back (#332581) - fix adding CD/DVD/SLP repositories (#333106) - show correct list of repositories when going back (#332253) - use system repositories when none is specified (#332253) - menubutton for adding system repositories (#332253) - added SUPPORTED_BOOT_IMAGES to /etc/sysconfig/product-creator: possibility to limit list of offered boot images (#331733) - append image name to defaultdestination and defaultroot (#327057) - copy whole content of imported kiwi config directory (#330052) - save defaultroot value to config.xml (#330059) - don't ignore 'inherit' tag (#330079) - added support for "this://" in repository paths (#330095) - destination directory specified in sysconfig file (#327055) - tell zypper to ignore zypp lock (#310581) - remove 'prepare' directory before calling kiwi (#325664) - added /etc/sysconfig/product-creator config file - 2.16.1 Added: trunk/product-creator/agents/cfg_product-creator.scr trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/create_xconf (with props) trunk/product-creator/src/data/sysconfig.product-creator trunk/product-creator/src/image-creator.desktop - copied, changed from r41191, trunk/product-creator/src/kiwi.desktop trunk/product-creator/src/image-creator.ycp (with props) Removed: trunk/product-creator/src/kiwi.desktop Modified: trunk/product-creator/VERSION trunk/product-creator/agents/Makefile.am trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/Makefile.am trunk/product-creator/src/ProductCreator.ycp trunk/product-creator/src/complex.ycp trunk/product-creator/src/data/Makefile.am trunk/product-creator/src/dialogs.ycp trunk/product-creator/src/kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/wizards.ycp trunk/product-creator/yast2-product-creator.spec.in Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=4157… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Thu Oct 25 16:01:56 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/product-creator/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/agents/Makefile.… ============================================================================== --- trunk/product-creator/agents/Makefile.am (original) +++ trunk/product-creator/agents/Makefile.am Thu Oct 25 16:01:56 2007 @@ -4,6 +4,6 @@ agent_SCRIPTS = -scrconf_DATA = +scrconf_DATA = cfg_product-creator.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: trunk/product-creator/agents/cfg_product-creator.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/agents/cfg_produ… ============================================================================== --- trunk/product-creator/agents/cfg_product-creator.scr (added) +++ trunk/product-creator/agents/cfg_product-creator.scr Thu Oct 25 16:01:56 2007 @@ -0,0 +1,17 @@ +/** + * File: + * cfg_product-creator.scr + * Summary: + * SCR Agent for reading/writing /etc/sysconfig/product-creator + * using the sysconfig-agent + * + * $Id: cfg_product-creator.scr 13009 2003-12-10 13:59:07Z jsuchome $ + * + * Read/Sets the values defined in <tt>/etc/sysconfig/product-creator</tt> + * in an easy manner. + */ +.sysconfig.product-creator + +`ag_ini( + `SysConfigFile("/etc/sysconfig/product-creator") +) Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Thu Oct 25 16:01:56 2007 @@ -1,4 +1,34 @@ ------------------------------------------------------------------- +Thu Oct 25 15:12:09 CEST 2007 - jsuchome(a)suse.cz + +- adapted for the API change of StorageDevices.ycp +- merged features done in SLE10SP version 2.13.17, mostly the + SLEPOS requirements (F302370, F302371) and related bugfixes: + - allow more characters in the image name + - fix modifying of repository (#334208) + - check for duplicates in the list of boot images (#332581) + - disable Delete button when there's nothing to delete (#334255) + - update defaultroot only for new configurations (#327057) + - check for absolute paths in boot image entry + - fix initializing when going Back (#332581) + - fix adding CD/DVD/SLP repositories (#333106) + - show correct list of repositories when going back (#332253) + - use system repositories when none is specified (#332253) + - menubutton for adding system repositories (#332253) + - added SUPPORTED_BOOT_IMAGES to /etc/sysconfig/product-creator: + possibility to limit list of offered boot images (#331733) + - append image name to defaultdestination and defaultroot (#327057) + - copy whole content of imported kiwi config directory (#330052) + - save defaultroot value to config.xml (#330059) + - don't ignore 'inherit' tag (#330079) + - added support for "this://" in repository paths (#330095) + - destination directory specified in sysconfig file (#327055) + - tell zypper to ignore zypp lock (#310581) + - remove 'prepare' directory before calling kiwi (#325664) + - added /etc/sysconfig/product-creator config file +- 2.16.1 + +------------------------------------------------------------------- Thu Oct 4 09:50:06 CEST 2007 - jsuchome(a)suse.cz - add a default user to the iso template (#328145) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Thu Oct 25 16:01:56 2007 @@ -24,18 +24,40 @@ string encryption_method = nil; + // temporary directory, where kiwi is working global string tmp_dir = ""; - global string images_dir = Directory::vardir + "/product-creator/images"; + // directory for saving image configurations + global string images_dir = Directory::vardir + "/product-creator/images"; + + // bug 331733 + global string supported_boot_images = ""; + + // directories with user-made templated + global list<string> templates_dirs = []; global string default_packagemanager = "smart"; - // all repositories of current configuration list<map> all_sources = []; + // repositories used for current configuration + global map <string,map> current_repositories = $[]; + + // initial system repositories + global map <string,map> initial_repositories = $[]; + // where the kiwi configuration files are stored string config_dir = ""; + // chroot directory for creating the physical extend + string chroot_dir = ""; + + // What we want to create with kiwi + global string kiwi_task = "iso"; + + // map with image templates (to base new projects on) + global map<string,map> Templates = $[]; + /** * crypt given user password with current encryption algorithm */ @@ -71,6 +93,32 @@ */ map get_source_value (string source, map config) { + map ret = $[]; + // first check if we weren't importing this source: + foreach (string url, map repo, current_repositories, { + if (url == source && repo["org"]:$[] != $[]) + { + ret = $[ + "__key" : "repository", + "type" : repo["org","type"]:"", + "__children": [ + $[ + "__key" : "source", + "path" : repo["org","source",0,"path"]:"", + ] + ] + ]; + if (repo["org","status"]:"" != "") + ret["status"] = repo["org","status"]:""; + } + }); + if (ret != $[]) + { + y2milestone ("imported source: %1", source); + return ret; + } + + // ... otherwise, we must ask zypp: string type = "yast2"; string source_path = adapt_source_path (source); @@ -86,7 +134,7 @@ type = "rpm-md"; } }); - map ret = $[ + ret = $[ "__key" : "repository", "type" : type, "__children": [ @@ -96,7 +144,7 @@ ] ] ]; - return ret; // FIXME add status? + return ret; } /** @@ -111,9 +159,9 @@ */ map get_type_value (map config, string task) { - string boot_image = sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2"); + string boot_image = sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2"); if (config["type",task,"boot"]:"" != "") - boot_image = config["type",task,"boot"]:""; + boot_image = config["type",task,"boot"]:""; map ret = $[ "__key" : "type", "__value" : task, @@ -123,7 +171,7 @@ if (task != "iso") ret["filesystem"] = config["type",task,"filesystem"]:"ext3"; if (config["type",task,"flags"]:"" != "") - ret["flags"] = config["type",task,"flags"]:""; + ret["flags"] = config["type",task,"flags"]:""; return ret; } @@ -224,6 +272,12 @@ ret["packages"] = maplist (map p, (list<map>)packages["image","package"]:[], ``(p["name"]:"")); + if (haskey (packages, "delete")) + { + ret["delete_packages"] = maplist (map p, + (list<map>)packages["delete", "package"]:[], ``(p["name"]:"")); + } + if (packages["image","patternType"]:"" != "") ret["image_patternType"] = packages["image","patternType"]:""; if (packages["xen","disk"]:"" != "") @@ -232,8 +286,8 @@ ret["xen_memory"] = tointeger (packages["xen","memory"]:"512"); foreach (string key, [ "author", "contact", "specification", "packagemanager", "version", "rpm-check-signatures", "rpm-force", - "sizeunit", "type", "name", "repository", "defaultdestination", - "schemeversion"], + "sizeunit", "type", "name", "repository", "defaultdestination", + "schemeversion", "defaultroot", "inherit"], { if (config[key]:nil != nil) ret[key] = config[key]:nil; @@ -241,7 +295,7 @@ if (haskey (config, "size")) ret["size"] = tointeger (config["size"]:"2700"); if (haskey (config, "defaultdestination")) - ret["iso-directory"] = config["defaultdestination"]:""; + ret["iso-directory"] = config["defaultdestination"]:""; foreach (string user, map usermap, (map<string,map>) config["users"]:$[], { if (!haskey (ret, "users")) ret["users"] = $[]; @@ -258,11 +312,19 @@ /** * Write currect configuration to new config.xml */ - global boolean WriteConfigXML (map KiwiConfig, string kiwi_task) { + global boolean WriteConfigXML (map KiwiConfig, string task) { all_sources = Pkg::SourceEditGet(); tmp_dir = Directory::tmpdir; + chroot_dir = tmp_dir + "/myphysical"; + if (KiwiConfig["defaultroot"]:"" != "") + { + chroot_dir = KiwiConfig["defaultroot"]:""; + if (KiwiConfig["new_configuration"]:false) + chroot_dir = chroot_dir + "/" + KiwiConfig["name"]:""; + KiwiConfig["defaultroot"] = chroot_dir; + } list packages_list = []; list patterns_list = []; @@ -328,33 +390,17 @@ ]); }); - list write_list = [ $[ - "__key" : "image", - "name" : KiwiConfig["name"]:"", - "schemeversion" : KiwiConfig["schemeversion"]:"1.4", - "__children" : [ - $[ - "__key" : "description", - "type" : "system", - "__children" : [ - $[ - "__key" : "author", - "__value" : KiwiConfig["author"]:"", - ], - $[ - "__key" : "contact", - "__value" : KiwiConfig["contact"]:"", - ], - $[ - "__key" : "specification", - "__value" : KiwiConfig["specification"]:"", - ], - ], - ], - $[ + list packages_delete_list = maplist (string package, + KiwiConfig["delete_packages"]:[], ``($[ + "__key" : "package", + "name" : package, + ]) + ); + + map preferences = $[ "__key" : "preferences", "__children" : [ - get_type_value (KiwiConfig, kiwi_task), + get_type_value (KiwiConfig, task), $[ "__key" : "version", "__value" : KiwiConfig["version"]:"1", @@ -381,9 +427,44 @@ "__value" : KiwiConfig["iso-directory"]:"", ], ], + ]; + if (KiwiConfig["defaultroot"]:"" != "") + { + preferences["__children"] = add (preferences["__children"]:[], $[ + "__key" : "defaultroot", + "__value" : KiwiConfig["defaultroot"]:"", + ]); + } + + + list write_list = [ $[ + "__key" : "image", + "name" : KiwiConfig["name"]:"", + "schemeversion" : KiwiConfig["schemeversion"]:"1.4", + "__children" : [ + $[ + "__key" : "description", + "type" : "system", + "__children" : [ + $[ + "__key" : "author", + "__value" : KiwiConfig["author"]:"", + ], + $[ + "__key" : "contact", + "__value" : KiwiConfig["contact"]:"", + ], + $[ + "__key" : "specification", + "__value" : KiwiConfig["specification"]:"", + ], + ], ], + preferences, ], ]]; + if (KiwiConfig["inherit"]:"" != "") + write_list[0,"inherit"] = KiwiConfig["inherit"]:""; if (haskey (KiwiConfig, "users")) { write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ @@ -414,7 +495,7 @@ "__children": union (union (packages_boot_list, patterns_boot_list), ignored_boot_list) ], ]); - if (kiwi_task == "xen") + if (task == "xen") { write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ "__key" : "packages", @@ -426,14 +507,22 @@ ]); } + if (packages_delete_list != []) + { + write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ + "__key" : "packages", + "type" : "delete", + "__children": packages_delete_list + ]); + } + string write_string = Map2XML (write_list[0]:$[], 0); - config_dir = tmp_dir + "/" + - get_config_dir (KiwiConfig["name"]:"", kiwi_task); + config_dir = tmp_dir + "/" + KiwiConfig["name"]:""; SCR::Execute (.target.mkdir, config_dir); SCR::Write (.target.string, config_dir + "/config.xml", write_string); foreach (string dir, ["root_dir", "config_dir"], { foreach (string val, KiwiConfig[dir]:[], { - string realdir = config_dir + "/" + substring (dir, 0, find (dir, "_")); + string realdir = config_dir + "/" + substring (dir, 0, search (dir, "_")); boolean created = false; if (val != "" && FileUtils::Exists (val)) { @@ -471,9 +560,10 @@ return false; } - if (FileUtils::Exists (tmp_dir + "/myphysical")) + if (FileUtils::Exists (chroot_dir)) { - SCR::Execute (.target.bash, sformat ("rm -rf %1/myphysical", tmp_dir)); + y2milestone ("%1 directory is present, removing...", chroot_dir); + SCR::Execute (.target.bash, sformat ("rm -rf %1", chroot_dir)); } // construct the dialog @@ -500,13 +590,10 @@ void update_output () { // read the output line from irw: list<string> out = (list<string>)SCR::Read(.background.newout); - /* foreach (string line, out, { line = String::Replace (line, "\r", "\n"); UI::ChangeWidget (`id(`log), `LastLine, line + "\n"); }); - */ - UI::ChangeWidget (`id(`log), `LastLine, mergestring (out, "\n") + "\n"); list<string> err = (list<string>) SCR::Read(.background.newerr); foreach (string line, err, { @@ -515,7 +602,7 @@ }); } - string cmd = sformat ("kiwi --root %1/myphysical --prepare %2 --logfile terminal", tmp_dir, config_dir); + string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); y2milestone ("calling '%1'", cmd); @@ -523,26 +610,17 @@ symbol ret = nil; boolean creating = false; - boolean first_lines = false; - integer lines_show = 0; - integer times_read = 0; do { ret = (symbol) UI::PollInput(); if ((boolean) SCR::Read(.background.output_open) && - (integer) SCR::Read(.background.newlines) > lines_show) + (integer) SCR::Read(.background.newlines)>0) { - if (times_read > 10) - lines_show = 50; - else - times_read = times_read + 1; update_output (); } else if (!(boolean)SCR::Read(.background.isrunning)) { update_output (); - lines_show = 0; - times_read = 0; integer status = (integer) SCR::Read (.background.status); if (status != 0) @@ -562,8 +640,7 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("kiwi --create %1/myphysical -d %2 --logfile terminal", - tmp_dir, out_dir); + cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); @@ -597,13 +674,118 @@ /** * save the image configuration to the kiwi images directory */ - global string SaveConfiguration (map KiwiConfig, string kiwi_task) { + global string SaveConfiguration (map KiwiConfig, string task) { if (config_dir == "" || !FileUtils::Exists (config_dir)) return nil; if (!FileUtils::Exists (images_dir)) SCR::Execute (.target.mkdir, images_dir); SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", config_dir, images_dir)); - return (images_dir + get_config_dir (KiwiConfig["name"]:"", kiwi_task)); + return (images_dir + KiwiConfig["name"]:""); + } + + /** + * Import repositories from given kiwi image configuration + * @patam Config configuration map, as read from config.xml + * @param dir path to directory containing this config.xml + */ + global map <string,map> ImportImageRepositories (map Config, string dir) { + + current_repositories = $[]; + foreach (map repo, (list<map>) Config["repository"]:[], { + string source = repo["source",0,"path"]:""; + if (source != "") + { + string url = ""; + if (substring (source, 0, 7) == "this://") + { + string source_path = substring (source, 7); + source = dir + "/" + source_path; + } + if (substring (source, 0, 1) == "/") + url = "dir://"; + url = url + source; + current_repositories [url] = $[ + "url" : url, + "plaindir" : repo["type"]:"" == "rpm-dir", + "org" : repo, + ]; + } + }); + return current_repositories; + } + + /** + * Initialize the list of current repositories + */ + global map <string,map> InitCurrentRepositories () { + + Pkg::SourceRestore (); + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; + current_repositories[url] = $[ + "url" : url, + "plaindir" : data["type"]:"" == "Plaindir" + ]; + }); + return current_repositories; + } + + /** + * Read the templates on which the images can be based + */ + global boolean ReadImageTemplates () { + + string dirs = (string)SCR::Read(.sysconfig.product-creator.IMAGE_TEMPLATES); + map name_version = $[]; + foreach (string line, splitstring (dirs, "\t "), { + if (line == "" || substring (line, 0, 1) == "#") + return; + templates_dirs = add (templates_dirs, line); + if (!FileUtils::IsDirectory (line)) + { + y2warning ("%1 is not a directory", line); + return; + } + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 %1", line)); + foreach (string d, splitstring(out["stdout"]:"", "\n"), { + if (d == "") return; + map config = Kiwi::ReadConfigXML (line + "/" + d); + // index by full path, there may be same names + // (templates could be provided by different vendors) + if (config != nil && config != $[]) + { + string name = config["name"]:""; + string ver = config["version"]:""; + if (name_version[name]:"" == ver) + y2warning ("template %1,%2 already imported", name, ver); + else + { + name_version[name] = ver; + Templates[line + "/" + d] = config; + } + } + }); + }); + return true; + } + + /** + * REad the confgiuration stuff for image creator + */ + global boolean Read () { + + string dir = + (string) SCR::Read (.sysconfig.product-creator.IMAGE_CONFIGURATIONS); + if (dir != nil && dir != "") + images_dir = dir; + supported_boot_images = + (string) SCR::Read (.sysconfig.product-creator.SUPPORTED_BOOT_IMAGES); + if (supported_boot_images == nil) + supported_boot_images = ""; + return ReadImageTemplates (); } } Modified: trunk/product-creator/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Makefile.am?… ============================================================================== --- trunk/product-creator/src/Makefile.am (original) +++ trunk/product-creator/src/Makefile.am Thu Oct 25 16:01:56 2007 @@ -9,6 +9,7 @@ client_DATA = \ product-creator.ycp \ + image-creator.ycp \ kiwi.ycp ynclude_DATA = \ @@ -22,7 +23,7 @@ desktop_DATA = \ product-creator.desktop \ - kiwi.desktop + image-creator.desktop module_DATA = \ ProductCreator.ycp \ Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Thu Oct 25 16:01:56 2007 @@ -62,7 +62,7 @@ global boolean profile_parsed = false; -global integer max_size_mb = 999 * 1024; +global integer max_size_mb = 999 * 1024; /* Configuration Map */ global map<string, any> Config = $[]; @@ -91,9 +91,6 @@ global boolean proposal_valid = false; -// What we want to create with kiwi -global string kiwi_task = "iso"; - // if the YaST sources should be enabled when opening package selector global boolean enable_sources = true; @@ -129,6 +126,8 @@ global boolean isCode10Source() { boolean code10 = false; + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; foreach (string url , ProductCreator::Config["sources"]:[], { integer i = SourceManager::getSourceId(url); @@ -145,7 +144,7 @@ { list<string> items = splitstring(dir_listing, "\n"); - code10 = code10 || contains(items, Arch::architecture() + "/"); + code10 = code10 || contains(items, arch + "/"); } } }); @@ -562,7 +561,9 @@ } else { - bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", Arch::architecture()); + string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; + bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); list<integer> srcids = [checkProductDependency()]; @@ -1045,6 +1046,7 @@ integer sles_src = 0; string descr_dir = ""; string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; y2milestone("Config: %1", Config); @@ -1783,6 +1785,7 @@ string cpCmd = ""; string arch = Arch::architecture(); + if (arch == "s390_64") arch = "s390x"; y2debug("isolinux.cfg: %1", Config["bootconfig"]:"" ); if (Config["bootconfig"]:"" != "") { Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Thu Oct 25 16:01:56 2007 @@ -11,18 +11,19 @@ textdomain "product-creator"; - import "Wizard"; - import "Popup"; - import "Wizard_hw"; - import "Report"; import "Arch"; - import "String"; - - import "ProductCreator"; - + import "CommandLine"; + import "Directory"; + import "FileUtils"; + import "Kiwi"; import "Label"; import "Mode"; - import "CommandLine"; + import "Popup"; + import "ProductCreator"; + import "Report"; + import "String"; + import "Wizard"; + import "Wizard_hw"; include "product-creator/helps.ycp"; include "product-creator/dialogs.ycp"; @@ -172,7 +173,7 @@ Package::InstallAll (["kiwi", "kiwi-desc-isoboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; - ProductCreator::kiwi_task = "iso"; + Kiwi::kiwi_task = "iso"; ret = `kiwi; break; } @@ -180,7 +181,7 @@ Package::InstallAll (["kiwi", "kiwi-desc-xenboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; - ProductCreator::kiwi_task = "xen"; + Kiwi::kiwi_task = "xen"; ret = `kiwi; break; } @@ -188,7 +189,7 @@ Package::InstallAll (["kiwi", "kiwi-desc-usbboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; - ProductCreator::kiwi_task = "usb"; + Kiwi::kiwi_task = "usb"; ret = `kiwi; break; } @@ -196,7 +197,7 @@ Package::InstallAll (["kiwi", "kiwi-desc-vmxboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; - ProductCreator::kiwi_task = "vmx"; + Kiwi::kiwi_task = "vmx"; ret = `kiwi; break; } @@ -343,8 +344,10 @@ { Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while")); } + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; - string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? Arch::architecture() : "")); + string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? arch : "")); y2milestone("command: %1", command); SCR::Execute (.target.bash, command, $["CD_PUBLISHER": pub, "CD_PREPARER": prep ]); @@ -527,6 +530,176 @@ return `next; } +/** + * overview dialog with image configurations + */ +define symbol ImagesOverviewDialog() { + + list overview = []; + map Configurations = $[]; + + string images_dir = Kiwi::images_dir; + if (!FileUtils::Exists (images_dir)) + SCR::Execute (.target.mkdir, images_dir); + + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 %1", images_dir)); + if (out != $[]) + { + foreach (string d, splitstring(out["stdout"]:"", "\n"), { + if (d == "") return; + if (FileUtils::Exists (images_dir + "/" + d + "/config.xml")) + { + map config = Kiwi::ReadConfigXML (images_dir + "/" + d); + string task = "iso"; + // FIXME duplicated in kiwi_dialogs + foreach (string type, map data, config["type"]:$[], { + task = type; + if (data["primary"]:"" == "true") + break; + }); + + config["kiwi_configuration_" + task] = images_dir + "/" + d; + config["current_task"] = task; + + string name = config["name"]:d; + Configurations[name] = config; + overview = add (overview, `item ( + `id (name), name, + config["version"]:"1", config["size"]:0 + )); + } + }); + } + + // help text + string help_text = _("Start the creating of new image configuration with Add.") + + + // help text + _("Use Edit to change selected image configuration or create the image.") + + + // help text + _("Delete the directory with selected configuration using Delete.") + + + // help text, %1 is directory + sformat (_("All image configurations are saved in <tt>%1</tt> directory."), images_dir); + + // main dialog caption + string caption = _("Image Creator Configuration Overview"); + + term contents = `VBox ( + `VWeight (3, `Table (`id (`table), `opt (`notify, `immediate), + `header (_("Name"), _("Version"), _("Size")), + overview + )), + `VWeight (1, `RichText (`id (`descr), "")), + `HBox ( + `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), + `PushButton (`id (`delete), `opt (`key_F5), Label::DeleteButton ()), + `PushButton (`id (`edit), `opt (`key_F4), Label::EditButton ()), + `HStretch () + ) + ); + + contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0); + + Wizard::SetContentsButtons(caption, contents, help_text, + Label::BackButton(), Label::CloseButton()); + Wizard::HideBackButton(); + Wizard::HideAbortButton(); + + UI::ChangeWidget (`id (`edit), `Enabled, size (overview) > 0); + if (size (overview) > 0) + { + string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); + string val = Configurations[current,"specification"]:""; + UI::ChangeWidget (`id (`descr), `Value, + mergestring (splitstring(String::EscapeTags (val), "\n"), " ")); + } + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + string current = (string) UI::QueryWidget(`id(`table), `CurrentItem ); + + if(ret == `abort || ret == `cancel) { + if(ProductCreator::ReallyAbort()) break; + else continue; + } + else if (ret == `table) + { + UI::ChangeWidget (`id (`descr), `Value, + Configurations[current,"specification"]:""); + } + else if (ret == `add) + { + ProductCreator::Config = $[]; + ret = `kiwi; + break; + } + else if(ret == `delete) + { + if (Popup::YesNo ( +// yes/no popup +sformat (_("Delete configutation %1 now?"), current))) + { + map config = Configurations[current]:$[]; + string dir = + config["kiwi_configuration_"+ config["current_task"]:""]:""; + // TODO at the end? (solve possible new config with same name..) + if (dir != "" && issubstring (dir, Kiwi::images_dir)) + SCR::Execute (.target.bash, "rm -rf " + dir); + Configurations = remove (Configurations, current); + overview = filter (term it, (list<term>) overview, + ``(it[0,0]:"" != current)); + UI::ChangeWidget (`id (`table), `Items, overview); + } + } + else if (ret == `edit) + { + ProductCreator::Config = Configurations[current]:$[]; + string task = ProductCreator::Config["current_task"]:""; + list<string> to_install = [ "kiwi" ]; + if (contains ([ "iso", "xen", "vmx", "usb" ], task)) + { + string bootdir = ProductCreator::Config["type",task,"boot"]:""; + if (bootdir == "" || + (!FileUtils::Exists ("/usr/share/kiwi/image/" + bootdir) && + !FileUtils::Exists (bootdir)) + ) + { + to_install = add (to_install, sformat("kiwi-desc-%1boot", task)); + } + } + if (Package::InstallAll (to_install)) + { + string dir = + ProductCreator::Config["kiwi_configuration_" + task]:""; + Kiwi::ImportImageRepositories (ProductCreator::Config, dir); + Kiwi::kiwi_task = task; + ret = `kiwi; + break; + } + continue; + } + else if (ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + if (ret == `kiwi) + { + // we do import own sources... + ProductCreator::enable_sources = false; + // ask on abort... + ProductCreator::modified = true; + } + return (symbol)ret; +} /* EOF */ } Modified: trunk/product-creator/src/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/Makefil… ============================================================================== --- trunk/product-creator/src/data/Makefile.am (original) +++ trunk/product-creator/src/data/Makefile.am Thu Oct 25 16:01:56 2007 @@ -1,7 +1,7 @@ # # Makefile.am for devtools/devtools/skeletons/config/agents # -SUBDIRS = kiwi_templates +SUBDIRS = kiwi_templates ydatadir = @ydatadir@/product-creator @@ -11,5 +11,8 @@ message \ options.msg +fillup_DATA = sysconfig.product-creator -EXTRA_DIST = $(ydata_DATA) +fillupdir = /var/adm/fillup-templates + +EXTRA_DIST = $(ydata_DATA) $(fillup_DATA) Added: trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/create_xconf URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_te… ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/create_xconf (added) +++ trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/create_xconf Thu Oct 25 16:01:56 2007 @@ -0,0 +1,68 @@ +#! /bin/sh +# Copyright (c) 1995-2003 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +### BEGIN INIT INFO +# Provides: create_xconf +# Required-Start: $local_fs +# Required-Stop: +# Default-Start: 5 +# Default-Stop: +# X-Start-Before: earlyxdm +# Description: Call sax +### END INIT INFO + +# First reset status of this service +. /etc/rc.status +rc_reset + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - insufficient privilege +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running + +case "$1" in + start) + echo -n "Creating X Config" + # create config file if not yet done + if [ ! -f /etc/X11/xorg.conf ];then + /usr/sbin/sax2 -c 0 -a -i &>/dev/null + fi + rc_status -v + ;; + stop) + ;; + try-restart) + rc_status + ;; + restart) + rc_status + ;; + try-restart-iburst) + rc_status + ;; + force-reload) + # Does not support signalling to reload + $0 try-restart + rc_status + ;; + reload) + rc_status -v + ;; + status) + rc_status -v + ;; + probe) + rc_failed 3 + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|try-restart-iburst|force-reload|reload|probe|ntptimeset}" + exit 1 + ;; +esac +rc_exit Added: trunk/product-creator/src/data/sysconfig.product-creator URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/sysconf… ============================================================================== --- trunk/product-creator/src/data/sysconfig.product-creator (added) +++ trunk/product-creator/src/data/sysconfig.product-creator Thu Oct 25 16:01:56 2007 @@ -0,0 +1,32 @@ +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string +## Default: none +# +# List of full paths to directories storing the image configuration templates. +# Items are separated by spaces. +# +# +IMAGE_TEMPLATES="/var/lib/YaST2/product-creator/templates" + +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string +## Default: "/var/lib/YaST2/product-creator/images" +# +# Path to the directory storing image configurations for Image Creator. +# +# +IMAGE_CONFIGURATIONS="/var/lib/YaST2/product-creator/images" + +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string(template) +## Default: none +# +# Which boot images are offered for configuration. Use comma separated list +# of image types (like "iso,xen,usb") or special value "template" for +# supporting only image types found in imported configurations. +# +# +SUPPORTED_BOOT_IMAGES="" Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Thu Oct 25 16:01:56 2007 @@ -19,13 +19,13 @@ import "StorageDevices"; import "Arch"; import "Label"; - import "Package"; import "Popup"; import "URL"; import "GPG"; import "GPGWidgets"; import "CWM"; import "String"; + import "Package"; include "product-creator/helps.ycp"; @@ -495,8 +495,8 @@ ret = UI::UserInput(); if (ret == `table) { - integer ID = (integer)UI::QueryWidget(`id(`table),`CurrentItem); - ret = contains (selected_items, ID) ? `remove : `select; + integer ID = (integer)UI::QueryWidget(`id(`table),`CurrentItem); + ret = contains (selected_items, ID) ? `remove : `select; } /* abort? */ if(ret == `abort || ret == `cancel) { @@ -509,6 +509,9 @@ map general_info = Pkg::SourceGeneralData(SrcID); boolean found_architecture = false; + string arch = Arch::architecture (); + if (arch == "s390_64") arch = "s390x"; + // architecture check is possible only for YaST sources if (general_info["type"]:"" == "YaST") { @@ -518,7 +521,7 @@ foreach(string key, string value, read_content, { - if (key == "ARCH." + Arch::architecture()) + if (key == "ARCH." + arch) { found_architecture = true; break; @@ -532,7 +535,7 @@ found_architecture = true; } - y2milestone("Architecture %1 is supported: %2", Arch::architecture(), found_architecture); + y2milestone("Architecture %1 is supported: %2", arch, found_architecture); if (true) { @@ -547,7 +550,7 @@ { Report::Error(sformat(_("The source does not support the architecture of this machine (%1). Select another source. -"), Arch::architecture())); +"), arch)); } } else if (ret == `remove) @@ -785,8 +788,8 @@ // while the package manager is initialized UI::ReplaceWidget(`rep, mode == nil ? - `PackageSelector(`id(`packages ), StorageDevices::FloppyDevice ) : - `PackageSelector(`id(`packages ), `opt(mode), StorageDevices::FloppyDevice ) + `PackageSelector(`id(`packages ), StorageDevices::FloppyDevice ()) : + `PackageSelector(`id(`packages ), `opt(mode), StorageDevices::FloppyDevice ()) ); symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) ); Copied: trunk/product-creator/src/image-creator.desktop (from r41191, trunk/product-creator/src/kiwi.desktop) URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/image-creato… ============================================================================== --- trunk/product-creator/src/kiwi.desktop (original) +++ trunk/product-creator/src/image-creator.desktop Thu Oct 25 16:01:56 2007 @@ -6,7 +6,7 @@ X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 -X-SuSE-YaST-Call=kiwi +X-SuSE-YaST-Call=image-creator X-SuSE-YaST-Group=Misc X-SuSE-YaST-Argument= @@ -16,7 +16,7 @@ X-SuSE-YaST-SortKey= Icon=yast-kiwi -Exec=/sbin/yast2 kiwi +Exec=/sbin/yast2 image-creator Name=Image Creator GenericName=Create the Live CD, USB or XEN image Added: trunk/product-creator/src/image-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/image-creato… ============================================================================== --- trunk/product-creator/src/image-creator.ycp (added) +++ trunk/product-creator/src/image-creator.ycp Thu Oct 25 16:01:56 2007 @@ -0,0 +1,65 @@ +/** + * $Id$ + * + */ + +{ + +textdomain "product-creator"; + +import "CommandLine"; +import "Confirm"; +import "FileUtils"; +import "Kiwi"; +import "Label"; +import "ProductCreator"; +import "Sequencer"; +import "Wizard"; +import "Wizard_hw"; + +include "product-creator/wizards.ycp"; + + + +// TODO merge with main product-creator sequence? +define boolean ICSequence() { + + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("cd-creator"); + + if (!Confirm::MustBeRoot ()) + { + UI::CloseDialog (); + return false; + } + + if (!Package::InstallAll (["kiwi", "yast2-instserver"])) + { + Popup::Error(_("Installation of required packages +failed.")); + UI::CloseDialog (); + return false; + } + + symbol ret = ImageCreatorSequence (); + + UI::CloseDialog(); + return ret == `next; +} + +map cmdline_description = $[ + "id" : "image-creator", + // transltors: command line help text for the Xproduct-creator module + "help" : _("Configuration of Image creator"), + "guihandler" : ICSequence, +]; + + +/* start the module */ +any ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +return ret; + +/* EOF */ +} Modified: trunk/product-creator/src/kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/kiwi.ycp (original) +++ trunk/product-creator/src/kiwi.ycp Thu Oct 25 16:01:56 2007 @@ -13,6 +13,7 @@ textdomain "product-creator"; include "product-creator/kiwi_dialogs.ycp"; +include "product-creator/wizards.ycp"; import "CommandLine"; import "Confirm"; @@ -23,7 +24,7 @@ * configuration workflow for kiwi * @return sequence result */ -define boolean KiwiSequence() { +define boolean ShortKiwiSequence() { map aliases = $[ "prepare" : ``( PrepareDialog() ), @@ -60,6 +61,7 @@ return false; } + InitRepositories (); PackageCallbacksInit::InitPackageCallbacks(); symbol ret = Sequencer::Run(aliases, sequence); @@ -71,7 +73,7 @@ "id" : "kiwi", // command line help text for the kiwi module "help" : _("Configuration of Kiwi"), - "guihandler" : KiwiSequence, + "guihandler" : ShortKiwiSequence, "actions" : $[], ]; Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Thu Oct 25 16:01:56 2007 @@ -16,15 +16,17 @@ import "FileUtils"; import "Label"; import "Kiwi"; + import "PackageSystem"; import "Popup"; import "SourceDialogs"; + import "SourceManager"; import "Summary"; import "URL"; import "Wizard"; include "product-creator/dialogs.ycp"; - // map of current Live ISO configuration + // map of current image configuration map<string,any> KiwiConfig = $[]; // what are we configuring now ("iso"/"xen"/...) @@ -39,7 +41,7 @@ list<term> GetAvailableImages (string subdir) { list<term> ret = []; - string dir = "/usr/share/kiwi/image/"; + string dir = "/usr/share/kiwi/image/"; map out = (map) SCR::Execute (.target.bash_output, sformat ("ls %1/%2", dir, subdir)); if (out["exit"]:0 != 0) @@ -78,6 +80,23 @@ return nil; } + /** + * Initialize the widget with packages intended for deletion + */ + define void InitSWDelete (string id) { + UI::ChangeWidget (`id (id), `Value, mergestring (KiwiConfig["delete_packages"]:[], "\n")); + } + + define void StoreSWDelete (string key, map event) { + string ignore_key = "delete_packages"; + KiwiConfig[ignore_key] = filter (string p, + splitstring ((string) UI::QueryWidget(`id(key), `Value), "\n"), ``(p != "")); + } + + define symbol HandleSWDelete (string key, map event) { + if (event["ID"]:nil == `next) StoreSWDelete (key, event); + return nil; + } /** * Initialize the contents of richtext with selected software @@ -115,10 +134,10 @@ { string sw_selection = KiwiConfig["sw_selection"]:"image"; - integer mbytes = (integer) UI::QueryWidget (`id ("size"), `Value); - if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G") - mbytes = mbytes * 1024; - ProductCreator::max_size_mb = mbytes; + integer mbytes = (integer) UI::QueryWidget (`id ("size"), `Value); + if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G") + mbytes = mbytes * 1024; + ProductCreator::max_size_mb = mbytes; if (sw_selection == "image" && packageSelector () != `cancel) { KiwiConfig["addons"] = ProductCreator::Config["addons"]:[]; @@ -218,7 +237,7 @@ * initialize the value of compress checkbox */ define void InitCompressCheckBox (string id) { - UI::ChangeWidget (`id (id), `Enabled, false);// FIXME squashfs not available? + UI::ChangeWidget (`id (id), `Enabled, false); UI::ChangeWidget (`id (id), `Value, KiwiConfig["compressed"]:false); } @@ -661,7 +680,8 @@ ]; Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); - if (Popup::YesNo (question[kiwi_task]:"")) + // default question + if (Popup::YesNo (question[kiwi_task]:_("Create image now?"))) { if (true) { @@ -679,7 +699,10 @@ } else { - Popup::Message (sformat (success[kiwi_task]:"", out_dir)); + // default popup message, %1 is a dir + Popup::Message (sformat (success[kiwi_task]:_("Image successfully created in +%1 +directory."), out_dir)); } } else @@ -702,8 +725,8 @@ */ define void InitImageConfiguration () { - kiwi_task = ProductCreator::kiwi_task; - string kiwi_dir = "/usr/share/kiwi/image/"; + kiwi_task = Kiwi::kiwi_task; + string kiwi_dir = "/usr/share/kiwi/image/"; // read the information from the base product integer src_id = ProductCreator::checkProductDependency (); @@ -711,7 +734,7 @@ KiwiConfig = ProductCreator::Config; // busy popup - Popup::ShowFeedback (_("Reading current live image configuration..."), _("Please wait...")); + Popup::ShowFeedback (_("Reading current image configuration..."), _("Please wait...")); map default_dirmap = $[ "iso" : sformat ("%1/kwliveDVD-suse-10.3", kiwi_dir), @@ -723,7 +746,6 @@ // path to current config directory string default_dir = default_dirmap[kiwi_task]:""; string kiwi_configuration = KiwiConfig["kiwi_configuration_" + kiwi_task]:default_dir; - if (!FileUtils::Exists (kiwi_configuration)) { // use local template if default dir does not exist (bug #289552) @@ -760,20 +782,21 @@ } }); // take care of the rest in the input directory (#330052) - list import_files = []; + list import_files = []; map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 -d %1/* 2>/dev/null", kiwi_configuration)); foreach (string line, splitstring (out["stdout"]:"", "\n"), { if (line == "") return; - string last = substring (line, findlastof (line, "/") + 1); + string last = substring (line, findlastof (line, "/") + 1); if (contains (["images.sh", "config.sh", "config.xml", "root","config"], last)) return; - import_files = add (import_files, line); + import_files = add (import_files, line); }); - KiwiConfig["import_files"] = import_files; + KiwiConfig["import_files"] = import_files; + - map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); + map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) { KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); @@ -788,9 +811,10 @@ y2milestone ("imported configuration..."); // ignore options already set earlier... foreach (string key, any val, read_config, { - if (!contains (["name", "iso-directory", "sources"], key)) + if (!contains (["name", "iso-directory", "sources", "version", + "type"],key)) { - KiwiConfig[key] = val; + KiwiConfig[key] = val; } }); // "sources" are already there... @@ -863,16 +887,6 @@ "contents" : `HBox (`HSpacing(1), `VBox ( `VSpacing (0.2), - /* - `HBox ( - `HWeight (1, `HBox ( - boot_image_widget () -// `VBox (`Label (""), "configure_boot") - )), - `HWeight (1, `VBox (`Label (""), `Left ("compressed"))) - ), - */ - `VSpacing (0.2), `HBox ( `HWeight (1, "version"), `HWeight (1, `HBox ("size", "sizeunit")) @@ -882,7 +896,7 @@ `HWeight (1, `VBox ( `Left (`Label (_("Installed Software"))), "rt_sw", `Right ("configure_sw") )), - `HWeight (1, "ignore") + `HWeight (1, `VBox ("ignore", "delete_sw")) ), `VSpacing (0.2) ), `HSpacing(1)), @@ -891,7 +905,7 @@ "size", "sizeunit", "sw_selection", "rt_sw", "configure_sw", - "ignore", + "ignore", "delete_sw" ], ], "description" : $[ @@ -979,6 +993,73 @@ "validate_function" : CreateImage, "no_help" : true, ], + // widgets for config.xml tab + /* + "isoboot" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("C&D Boot Image"), + // help text for "C&D Boot Image", %1/%2 is path (on extra line) + "help" : sformat (_("Choose one CD Boot Image from the +<tt>%1/%2</tt> +directory. +"), + Kiwi::kiwi_dir, boot_image_widget ()), + "items" : [], + "init" : InitBootCombo, + "store" : StoreBootCombo, + "handle" : HandleBootCombo, + ], + "xenboot" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("&Xen Boot Image"), + // help text for "XEN Boot Image" + "help" : sformat (_("Choose one Xen Boot Image from the +<tt>%1/%2</tt> +directory. +"), + Kiwi::kiwi_dir, boot_image_widget ()), + "items" : [], + "init" : InitBootCombo, + "store" : StoreBootCombo, + "handle" : HandleBootCombo, + ], + "usbboot" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("&USB Stick Boot Image"), + // help text for "XEN Boot Image" + "help" : sformat (_("Choose one USB stick Boot Image from the +<tt>%1/%2</tt> +directory. +"), + Kiwi::kiwi_dir, boot_image_widget ()), + "items" : [], + "init" : InitBootCombo, + "store" : StoreBootCombo, + "handle" : HandleBootCombo, + ], + "vmxboot" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("&Virtual Disk Boot Image"), + // help text for "XEN Boot Image" + "help" : sformat (_("Choose one Virtual Disk Boot Image from the +<tt>%1/%2</tt> +directory. +"), + Kiwi::kiwi_dir, boot_image_widget ()), + "items" : [], + "init" : InitBootCombo, + "store" : StoreBootCombo, + "handle" : HandleBootCombo, + ], + */ "configure_boot" : $[ "widget" : `push_button, // pusbutton label @@ -1033,6 +1114,16 @@ // help text for "&Ignored software" "help" : _("For ignored software, enter each entry (like 'smtp_daemon') on new line"), ], + "delete_sw" : $[ + "widget" : `multi_line_edit, + // label + "label" : _("Packages to &Delete"), + "init" : InitSWDelete, + "store" : StoreSWDelete, + "handle" : HandleSWDelete, + // help text for "&Ignored software" + "help" : _("Each entry of Packages to Delete is one package name to be uninstalled from the target image."), + ], "output_dir" : $[ "widget" : `textentry, // textentry label @@ -1297,77 +1388,88 @@ /** * Main dialog for Kiwi image configuration */ - define symbol KiwiDialog () { - - InitImageConfiguration (); +define symbol KiwiDialog () { - map<string, map> widget_descr = get_widget_description (); - widget_descr["tab"] = CWMTab::CreateWidget($[ - "tab_order" : ["config.xml", "description", "users", "scripts", "directories"], - "tabs" : tabs_descr (), - "widget_descr" : widget_descr, - "initial_tab" : "config.xml", - ]); - Wizard::SetContentsButtons("", `VBox (), "", Label::BackButton(), Label::NextButton()); +InitImageConfiguration (); - term contents = `VBox ( - `Left (`Label (KiwiConfig["name"]:"")), - "tab", - `VSpacing (0.3), - "global" - ); +map<string, map> widget_descr = get_widget_description (); +widget_descr["tab"] = CWMTab::CreateWidget($[ + "tab_order" : [ + "config.xml", "description", "users", "scripts", "directories" + ], + "tabs" : tabs_descr (), + "widget_descr" : widget_descr, + "initial_tab" : "config.xml", +]); +Wizard::SetContentsButtons("", `VBox (), "", Label::BackButton(), Label::NextButton()); +term contents = `VBox ( + `Left (`Label (KiwiConfig["name"]:"")), + "tab", + `VSpacing (0.3), + "global" +); - map caption = $[ - // dialog caption - "iso" : _("Live CD Configuration"), - // dialog caption - "xen" : _("Xen Image Configuration"), - // dialog caption - "usb" : _("USB Stick Image Configuration"), - // button label - "vmx" : _("Virtual Disk Image"), - ]; - map next_button = $[ - // button label - "iso" : _("&Create ISO"), - // button label - "xen" : _("&Create Xen Image"), - // button label - "usb" : _("&Create USB Stick Image"), - // button label - "vmx" : _("&Create Virtual Disk Image"), - ]; - symbol ret = CWM::ShowAndRun ($[ - "widget_names" : [ "global", "tab" ], - "widget_descr" : widget_descr, - "contents" : contents, - "caption" : caption[kiwi_task]:"", - "back_button" : Label::BackButton (), +map caption = $[ + // dialog caption + "iso" : _("Live CD Configuration"), + // dialog caption + "xen" : _("Xen Image Configuration"), + // dialog caption + "usb" : _("USB Stick Image Configuration"), + // button label + "vmx" : _("Virtual Disk Image"), +]; +map next_button = $[ + // button label + "iso" : _("&Create ISO"), + // button label + "xen" : _("&Create Xen Image"), + // button label + "usb" : _("&Create USB Stick Image"), + // button label + "vmx" : _("&Create Virtual Disk Image"), +]; +symbol ret = CWM::ShowAndRun ($[ + "widget_names" : [ "global", "tab" ], + "widget_descr" : widget_descr, + "contents" : contents, + // default dialog caption + "caption" : caption[kiwi_task]:_("Image Configuration"), + "back_button" : Label::BackButton (), // "next_button" : next_button[kiwi_task]:Label::NextButton (), - "next_button" : Label::FinishButton (), - ]); - y2milestone("Returning %1", ret); - return ret; - } + "next_button" : Label::FinishButton (), + "fallback_functions" : $[ + `abort : ProductCreator::ReallyAbort + ], +]); +y2milestone("Returning %1", ret); +return ret; +} /** - * Prepare dialog: define kiwi data without cd-creator + * Prepare dialog: define kiwi data without product-creator */ define symbol PrepareDialog () { + kiwi_task = Kiwi::kiwi_task; if (kiwi_task == "") kiwi_task = "iso"; - map<string,any> Config = KiwiConfig; + map<string,any> Config = ProductCreator::Config; string kiwi_configuration = Config["kiwi_configuration_" + kiwi_task]:""; string name = Config["name"]:""; string out_dir = Config["iso-directory"]:""; - map <integer,string> repositories = $[]; - // originally enabled list of sources - list<map> enabled_sources = []; + map <string,map> repositories = Kiwi::current_repositories; + boolean new_configuration = (Config == $[]); + boolean append_name = false; + + string help = (new_configuration ? + // help text for kiwi UI preparation + _("Enter the name of your image configuration. Base new configuration on template from the list or on the directory with the existing configuration.") + : "") + // help text for kiwi UI preparation - string help = _("Enter the name of your image configuration or Import the directory with the existing one.") + + (new_configuration ? sformat (_("Place custom configuration templates under <tt>%1</tt> directory."), Kiwi::templates_dirs[0]:"") : "") + // help text for kiwi UI preparation, cont. _("Choose the Image Type which should be created.") + @@ -1376,120 +1478,181 @@ _("Select Output Directory for the created image.") + // help text for kiwi UI preparation, cont. - _("Modify the list of Package Repositories that will be used for creating the image. If the list is empty, current system repositories will be used.") + + _("Modify the list of Package Repositories that will be used for creating the image. Use Add From System to add one of current system repository.") + // help text for kiwi UI preparation, cont. _("Use Next to continue with the configuration."); - // on start, show the default YaST sources - if (Config == $[]) + list basic_type_items = [ + // combo box item + `item (`id ("iso"), _("Live ISO Image"), kiwi_task == "iso"), + // combo box item + `item (`id ("xen"), _("Xen Image"), kiwi_task == "xen"), + // combo box item + `item (`id ("usb"), _("USB Stick Image"), kiwi_task == "usb"), + // combo box item + `item (`id ("vmx"), _("Virtual Disk Image"), kiwi_task == "vmx") + ]; + map task2label = $[ + // combo box item + "pxe" : _("Network Boot Image"), + // combo box item + "iso" : _("Live ISO Image"), + // combo box item + "xen" : _("Xen Image"), + // combo box item + "usb" : _("USB Stick Image"), + // combo box item + "vmx" : _("Virtual Disk Image") + ]; + + list type_items = basic_type_items; + list default_type_items = basic_type_items; + + string supported_images = Kiwi::supported_boot_images; + if (supported_images != "" && supported_images != "template") + { + type_items = []; // will be read from template..., or: + foreach (string type, splitstring (supported_images,","), + { + if (haskey (task2label, type)) + { + type_items = add (type_items, + `item (`id (type), task2label[type]:type)); + } + }); + default_type_items = type_items; + } + else if (supported_images == "template" && !new_configuration) { - Pkg::SourceRestore (); - Pkg::SourceLoad(); - Config["sources"] = maplist (map source, Pkg::SourceEditGet (), { - integer srcid = source["SrcId"]:-1; - map data = Pkg::SourceGeneralData (srcid); - string url = data["url"]:""; - repositories[srcid] = url; - return url; + list type_its = []; + //solve `back here (=no import) + foreach (string type, map data, Config["type"]:$[], { + type_its = add (type_its, + `item (`id (type), task2label[type]:type)); }); + if (type_its != []) + type_items = type_its; } - else if (Config["sources"]:[] != []) + list present_types = maplist ( + term it, (list<term>)type_items, ``(it[0,0]:"")); + if (!contains (["iso", "xen", "usb", "vmx"], kiwi_task) && + !contains (present_types, kiwi_task)) + { + type_items = add (type_items, + `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task, true)); + present_types = add (present_types, kiwi_task); + } + + // on start, show the default YaST sources + if (Config["sources"]:[] != [] && repositories == $[]) { - list sources = Config["sources"]:[]; - list<map> all_sources = Pkg::SourceEditGet(); - foreach (map source, all_sources, { - integer srcid = source["SrcId"]:-1; - map data = Pkg::SourceGeneralData (srcid); - string url = data["url"]:""; - string stripped = url; - if (substring (url, 0, 6) == "dir://") - stripped = substring (url, 6); - if (contains(sources, url) || contains (sources, stripped)) - repositories[srcid] = url; + foreach (string src, Config["sources"]:[], { + repositories[src] = $[ + "url" : src, + ]; }); } + list system_repo_items = maplist (string url, map repo, + Kiwi::initial_repositories, { + return `item (`id (url), url); + }); + void update_repo_table () { + UI::ChangeWidget (`id (`repositories), `Items, maplist ( + string url, map repo, repositories, ``( + `item (`id (url), url)) + )); + UI::ChangeWidget (`id (`delete), `Enabled, size (repositories) > 0); + } // read the new configuration and update UI accordingly - void update_config (string dir) { - - // 1. delete previous sources (were in repositories list) - foreach (map source, Pkg::SourceEditGet (), { - integer srcid = source["SrcId"]:-1; - if (haskey (repositories, srcid)) - Pkg::SourceDelete (srcid); - }); + // (no need to read config if it is provided as argument) + void update_config (string dir, map config) { kiwi_configuration = dir; - Config = eval (Kiwi::ReadConfigXML (kiwi_configuration)); - name = Config["name"]:""; + Config = + (config == $[] ? Kiwi::ReadConfigXML (kiwi_configuration) : config); + // busy popup + Popup::ShowFeedback (_("Importing repositories..."), _("Please wait...")); + repositories = Kiwi::ImportImageRepositories (Config, dir); + Popup::ClearFeedback (); + if (!new_configuration) + { + name = Config["name"]:""; + UI::ChangeWidget (`id (`config), `Value, name); + } + else + { + Config["version"] = "1.0.0"; + } if (Config["iso-directory"]:"" != "") - UI::ChangeWidget (`id (`out_dir),`Value,Config["iso-directory"]:""); - repositories = $[]; - foreach (map repo, (list<map>) Config["repository"]:[], { - string source = repo["source",0,"path"]:""; - if (source != "") - { - integer id = -1; - string url = ""; - if (substring (source, 0, 1) == "/") - url = "dir://"; - if (repo["type"]:"" == "rpm-dir") - { - id = Pkg::SourceCreateType (url + source, "", "Plaindir"); - } - else - id = Pkg::SourceCreate (url + source, ""); - if (id != -1) - repositories[id] = url + source; - } - }); - UI::ChangeWidget (`id (`config), `Value, name); - UI::ChangeWidget (`id (`repositories), `Items, - maplist (integer id, string repo, repositories, ``( - `item (`id (id), repo))) - ); + UI::ChangeWidget(`id(`out_dir), `Value, Config["iso-directory"]:""); + update_repo_table (); + list type_its = supported_images != "template" ? default_type_items: []; + boolean primary = false; foreach (string type, map data, Config["type"]:$[], { - kiwi_task = type; + if (!primary) + kiwi_task = type; if (data["primary"]:"" == "true") - break; + primary = true; + if ((supported_images == "" && !contains (present_types, type)) || + supported_images == "template") + { + type_its = add (type_its, + `item (`id (type), task2label[type]:type)); + present_types = union (present_types, [type]); + } }); + UI::ChangeWidget (`id (`type), `Items, type_its); UI::ChangeWidget (`id (`type), `Value, kiwi_task); } - void update_repo_table () { - UI::ChangeWidget (`id (`repositories), `Items, maplist ( - integer id, string repo, repositories, ``(`item (`id (id), repo)) - )); - } + list template_items = maplist (string dir, map template, Kiwi::Templates, { + return `item (`id (dir), sformat ( + // combo box item, %1 is name, %2 version + _("%1, version %2"), template["name"]:"", template["version"]:"") + ); + }); term contents = `VBox ( - `HBox ( + new_configuration ? + `VBox ( // text entry label `TextEntry (`id (`config), _("&Kiwi configuration"), name), - // push button label - `VBox (`Label (""), `PushButton (`id (`import), _("&Import"))) - ), - // frame label - `Frame (_("Image Type"), - `RadioButtonGroup (`id (`type), `HBox (`HSpacing (), `VBox ( - `VSpacing (0.2), - `Left (`RadioButton (`id ("iso"), `opt (`notify), - // radio button label - _("&Live ISO Image"), kiwi_task == "iso")), - `Left (`RadioButton (`id ("xen"), `opt (`notify), - // radio button label - _("&Xen Image"), kiwi_task == "xen")), - `Left (`RadioButton (`id ("usb"), `opt (`notify), - // radio button label - _("&USB Stick Image"), kiwi_task == "usb")), - // radio button label - `Left (`RadioButton (`id ("vmx"), `opt (`notify), - _("&Virtual Disk Image"), kiwi_task == "vmx")), - `VSpacing (0.2) - ))) - ), + `RadioButtonGroup (`id (`imp), `HBox (`HSpacing (), `VBox ( + `VSpacing (0.2), + `Left (`RadioButton (`id ("rb_new"), `opt (`notify), + // radio button label + _("Create from beginning"), true) + ), + template_items == [] ? `VSpacing (0) : + `Left (`RadioButton (`id ("rb_template"), `opt (`notify), + // radio button label + _("Base on Template")) + ), + template_items == [] ? `VSpacing (0) : + `HBox ( + `HSpacing (2.5), + `ComboBox (`id (`template), `opt (`notify, `hstretch), "", + template_items) + ), + `Left (`RadioButton (`id ("rb_dir"), `opt (`notify), + // radio button label + _("Base on Existing Configuration")) + ), + `HBox ( + `HSpacing (2.5), + `Label (`id (`import_dir),`opt (`outputField,`hstretch),""), + // push button label + `PushButton (`id (`import), _("&Choose...")) + ) + ))) + ) : + `Left (`Label (`id (`config), name)), + // combo box label + `ComboBox (`id (`type), `opt (`notify, `hstretch), _("I&mage Type"), + type_items), `HBox ( // text entry label `TextEntry (`id (`out_dir), _("&Output directory"), out_dir), @@ -1505,6 +1668,9 @@ ), `HBox ( `PushButton (`id (`add), Label::AddButton ()), + // menu butto label + `MenuButton (`id (`addsystem), _("A&dd From System"), + system_repo_items), `PushButton (`id (`edit), Label::EditButton ()), `PushButton (`id (`delete), Label::DeleteButton ()), `HStretch () @@ -1513,24 +1679,53 @@ // dialog caption Wizard::SetContentsButtons (_("Image preparation"), contents, help, Label::BackButton(), Label::NextButton()); + Wizard::RestoreBackButton(); + Wizard::RestoreAbortButton(); - if (Config == $[] && kiwi_configuration != "") + if (new_configuration && kiwi_configuration != "") { - update_config (kiwi_configuration); + update_config (kiwi_configuration, $[]); } else update_repo_table (); - UI::SetFocus (`id (`config)); + if (new_configuration) + { + UI::SetFocus (`id (`config)); + if (template_items != []) + UI::ChangeWidget (`id (`template), `Enabled, false); + UI::ChangeWidget (`id (`import), `Enabled, false); + UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum () + "-_"); + } any ret = nil; while (true) { ret = UI::UserInput(); if (ret == `abort || ret == `cancel || ret == `back) { - break; + if(ProductCreator::ReallyAbort()) break; + else continue; + } + else if (ret == "rb_dir") + { + if (template_items != []) + UI::ChangeWidget (`id (`template), `Enabled, false); + UI::ChangeWidget (`id (`import), `Enabled, true); + if (kiwi_configuration == "") + ret = `import; } - else if (ret == `import) + else if (ret == "rb_template") + { + UI::ChangeWidget (`id (`template), `Enabled, true); + UI::ChangeWidget (`id (`import), `Enabled, false); + ret = `template; + } + else if (ret == "rb_new") + { + UI::ChangeWidget (`id (`template), `Enabled, false); + UI::ChangeWidget (`id (`import), `Enabled, false); + } + if (ret == `import) { string dir = UI::AskForExistingDirectory ( kiwi_configuration== "" ? Kiwi::images_dir : kiwi_configuration, @@ -1538,54 +1733,87 @@ _("Directory to Import")); if (dir!= nil) { - update_config (dir); + UI::ChangeWidget (`id (`import_dir), `Value, dir); + update_config (dir, $[]); } } + else if (ret == `template) + { + string dir = (string) UI::QueryWidget (`id (`template), `Value); + update_config (dir, Kiwi::Templates[dir]:$[]); + } + else if (is (ret, string)) // system repository selected + { + map system_repo = Kiwi::initial_repositories[(string)ret]:$[]; + if (!haskey (repositories, (string)ret)) + repositories[(string)ret] = system_repo; + + update_repo_table (); + } else if (ret == `add) { Wizard::CreateDialog (); - string url = ""; - if (SourceDialogs::TypeDialog () == `next && - SourceDialogs::EditDialog () == `next) + string url = ""; + symbol type_ret = SourceDialogs::TypeDialog (); + + if ((type_ret == `next || type_ret == `finish)) { - url = SourceDialogs::GetURL (); + if (type_ret == `finish && SourceDialogs::GetURL () == "slp://") + { + string required_package = "yast2-slp"; + boolean installed_before = PackageSystem::Installed (required_package); + if (! installed_before) + { + if (!PackageSystem::CheckAndInstallPackagesInteractive ([required_package])) + { + Report::Error (sformat ( + // popup error message, %1 is the package name + _("Cannot search for SLP repositories +without having %1 package installed"), + required_package + )); + y2warning ("Not searching for SLP repositories"); + } + else + { + SCR::RegisterAgent(.slp, `ag_slp(`SlpAgent())); + } + } + string service = (string) WFM::call("select_slp_source"); + if (service != nil) + url = service; + } + else + { + if (SourceDialogs::EditDialog () == `next) + url = SourceDialogs::GetURL (); + } } Wizard::CloseDialog (); if (url != "") { - boolean present = false; - foreach (integer id, string repo, repositories, { - if (repo == url) - present = true; - }); - if (present) break; + if (haskey (repositories, url)) + continue; - integer id = -1; map parsed = URL::Parse(url); if (parsed["scheme"]:"" == "pkg") { parsed["scheme"] = "dir"; url = URL::Build (parsed); - id = Pkg::SourceCreateType (url, "", "Plaindir"); - } - else - id = Pkg::SourceCreate (url, ""); - - if (id != -1) - { - repositories[id] = url; - update_repo_table (); } + repositories[url] = $[ + "url" : url, + "plaindir" : parsed["scheme"]:"" == "dir" + ]; + update_repo_table (); } } else if (ret == `edit) { - integer selected = (integer) + string url = (string) UI::QueryWidget (`id (`repositories), `CurrentItem); - map generalData = Pkg::SourceGeneralData (selected); - string url = generalData["url"]:""; - string url_selected = url; - boolean plaindir = generalData["type"]:"YaST" == "Plaindir"; + string selected_url = url; + boolean plaindir = repositories[url,"plaindir"]:false; // change schema if the source type is plaindir // to show the right popup dialog if (plaindir) @@ -1595,29 +1823,28 @@ url = URL::Build (parsed); } url = SourceDialogs::EditPopup (url); - if (url == "" || url == nil || url == generalData["url"]:"") + if (url == "" || url == nil || url == selected_url) continue; // remove current url + add new one - Pkg::SourceDelete (selected); - repositories = remove (repositories, selected); - integer id = -1; + repositories = remove (repositories, selected_url); map parsed = URL::Parse(url); if (parsed["scheme"]:"" == "pkg") { parsed["scheme"] = "dir"; url = URL::Build (parsed); - id = Pkg::SourceCreateType (url, "", "Plaindir"); } - else - id = Pkg::SourceCreate (url, ""); - repositories[id] = url; + repositories[url] = $[ + "url" : url, + "plaindir" : parsed["scheme"]:"" == "dir" + ]; update_repo_table (); } else if (ret == `delete) { - integer selected = (integer) + string selected = (string) UI::QueryWidget (`id (`repositories), `CurrentItem); - Pkg::SourceDelete (selected); + if (selected == nil) + continue; repositories = remove (repositories, selected); update_repo_table (); } @@ -1641,6 +1868,15 @@ UI::SetFocus (`id (`config)); continue; } + if (new_configuration && + FileUtils::Exists (Kiwi::images_dir + "/" + name)) + { + // error popup + Popup::Error (sformat (_("Configuration with name \"%1\" already exists. +Choose a different one."), name)); + UI::SetFocus (`id (`config)); + continue; + } out_dir = (string) UI::QueryWidget (`id (`out_dir), `Value); if (out_dir == "") { @@ -1649,6 +1885,14 @@ UI::SetFocus (`id (`out_dir)); continue; } + if (repositories == $[]) + { + // error popup + Popup::Error(_("Specify at least one package repository.")); + UI::SetFocus (`id (`repositories)); + continue; + } + kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); break; } @@ -1656,26 +1900,52 @@ string boot = Config["type",kiwi_task,"boot"]:""; if (boot != "" && issubstring (boot, "/")) { - Config[kiwi_task + "boot"] = substring (boot, search (boot, "/") + 1); + string prefix = kiwi_task == "pxe" ? "net" : kiwi_task; + Config[prefix + "boot"] = substring (boot, search (boot, "/") + 1); } if (ret == `next) { - Config["name"] = name; Config["kiwi_configuration_" + kiwi_task] = kiwi_configuration; Config["_imported"] = true; - Config["iso-directory"] = out_dir; + Config["iso-directory"] = out_dir + + (new_configuration ? "/" + name : ""); + Config["name"] = name; Config["sources"] = maplist ( - integer id, string repo, repositories, ``(repo)); + string url, map repo, repositories, ``(url)); + Config["new_configuration"] = new_configuration; if (Config["sources"]:[] != []) - ProductCreator::enable_sources = false; - else { - // reenable original sources - Pkg::SourceRestore (); + ProductCreator::enable_sources = false; + map<string,integer> current_sources = $[]; + // delete current repos, that won't be used in config + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; + current_sources[url] = srcid; + }); + // initialize new repos now + foreach (string url, map repo, repositories, { + if (substring (url, 0, 1) == "/") + url = "dir://" + url; + if (haskey (current_sources, url)) + { + current_sources = remove (current_sources, url); + return; + } + if (repo["plaindir"]:false) + Pkg::SourceCreateType (url, "", "Plaindir"); + else + Pkg::SourceCreate (url, ""); + }); + foreach (string url, integer srcid, current_sources, { + Pkg::SourceDelete (srcid); + }); Pkg::SourceLoad(); } ProductCreator::Config = Config; - ProductCreator::kiwi_task = kiwi_task; + Kiwi::current_repositories = repositories; + Kiwi::kiwi_task = kiwi_task; } y2milestone("Returning %1", ret); return (symbol) ret; Modified: trunk/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/wizards.ycp?… ============================================================================== --- trunk/product-creator/src/wizards.ycp (original) +++ trunk/product-creator/src/wizards.ycp Thu Oct 25 16:01:56 2007 @@ -11,9 +11,11 @@ textdomain "product-creator"; +import "Kiwi"; import "Wizard"; import "Popup"; import "Package"; +import "PackageCallbacksInit"; import "Sequencer"; include "product-creator/complex.ycp"; @@ -135,12 +137,26 @@ } /** + * Initialize the list of current repositories (before any other handling): + * we need to know their id's so it is possible to delete them when new + * kiwi config is imported (and its repos should be added) + */ +symbol InitRepositories () { + + Kiwi::initial_repositories = Kiwi::InitCurrentRepositories (); + Kiwi::Read (); + return `next; +} + +/** */ define symbol KiwiSequence() ``{ map aliases = $[ "init_sources" : [ ``( InitSources () ), true ], "kiwi" : ``( KiwiDialog () ), "summary" : ``( CommitConfig() ), + + // FIXME check if it was only kiwi config... "write" : ``( WriteDialog() ), ]; @@ -148,6 +164,7 @@ "ws_start" : "init_sources", "init_sources" : $[ `next : "kiwi", + `prepare : "prepare" ], "kiwi": $[ `abort : `abort, @@ -164,6 +181,40 @@ return Sequencer::Run( aliases, sequence ); } +define symbol ImageCreatorSequence() { + + map aliases = $[ + "init_repositories" : [ ``( InitRepositories () ), true ], + "images_overview" : ``( ImagesOverviewDialog() ), + "kiwi_prepare" : ``( PrepareDialog() ), + "kiwi" : ``( KiwiDialog () ), + ]; + map sequence = $[ + "ws_start" : "init_repositories", + "init_repositories" : $[ + `next : "images_overview" + ], + "images_overview" : $[ + `abort : `abort, + `kiwi : "kiwi_prepare", + `next : `next, + ], + "kiwi_prepare" : $[ + `abort : `abort, + `next : "kiwi" + ], + "kiwi": $[ + `abort : `abort, + `next : "images_overview", + ], + ]; + + PackageCallbacksInit::InitPackageCallbacks(); + + symbol ret = Sequencer::Run(aliases, sequence); + return ret; +} + /** * Main workflow of the product-creator configuration * @return sequence result Modified: trunk/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/yast2-product-cr… ============================================================================== --- trunk/product-creator/yast2-product-creator.spec.in (original) +++ trunk/product-creator/yast2-product-creator.spec.in Thu Oct 25 16:01:56 2007 @@ -2,6 +2,9 @@ @HEADER@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager autoyast2-installation yast2-security + +PreReq: %fillup_prereq + Requires: yast2-packager autoyast2-installation yast2-security # GPG.ycp and GPGWidgets.ycp @@ -24,17 +27,20 @@ install -d $RPM_BUILD_ROOT/var/lib/YaST2/product-creator @CLEAN@ +%post +%{fillup_only -n product-creator} %files %defattr(-,root,root) %dir @yncludedir@/product-creator @yncludedir@/product-creator/* @clientdir@/product-creator.ycp +@clientdir@/image-creator.ycp @clientdir@/kiwi.ycp @moduledir@/*.ycp @moduledir@/*.ybc @desktopdir@/product-creator.desktop -@desktopdir@/kiwi.desktop +@desktopdir@/image-creator.desktop @ybindir@/y2mkiso %doc @docdir@ %dir @ydatadir@/product-creator @@ -42,3 +48,4 @@ #%dir /etc/YaST2/product-creator @scrconfdir@/*.scr @agentdir@/ag_* +/var/adm/fillup-templates/sysconfig.product-creator -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41569 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: fehr Date: Thu Oct 25 15:08:49 2007 New Revision: 41569 URL: http://svn.opensuse.org/viewcvs/yast?rev=41569&view=rev Log: - force "partitions" in DEVICE line of mdadm.conf duing update if device names changed (#331604) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Oct 25 15:08:49 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 15:07:31 CEST 2007 - fehr(a)suse.de + +- force "partitions" in DEVICE line of mdadm.conf duing update if + device names changed (#331604) + +------------------------------------------------------------------- Tue Oct 23 12:50:10 CEST 2007 - fehr(a)suse.de - make StorageDevice initializion delayed (#335582) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Oct 25 15:08:49 2007 @@ -5149,7 +5149,7 @@ global define void UpdateFstabDiskmap( map diskmap ) ``{ - y2milestone( "UpdateFstabdiskmap map %1", diskmap ); + y2milestone( "UpdateFstabDiskmap map %1", diskmap ); string tabpath = PathToDestdir( "/etc/fstab" ); map fstab = Partitions::GetFstab( tabpath ); integer line = 0; @@ -5181,6 +5181,30 @@ AsciiFile::RewriteFile( crtab, tabpath ); } +global define void UpdateMdadm() + ``{ + y2milestone( "UpdateMdadm" ); + string cpath = PathToDestdir( "/etc/mdadm.conf" ); + map file = $[]; + AsciiFile::SetComment( file, "^[ \t]*#" ); + AsciiFile::ReadFile( file, cpath ); + integer line = 0; + boolean changed = false; + while( line<=AsciiFile::NumLines( file ) ) + { + if( search( file["l",line,"line"]:"", "DEVICE" )!=nil && + search( file["l",line,"line"]:"", "/dev/" )!=nil ) + { + changed = true; + file["l",line,"line"] = "DEVICE partitions"; + y2milestone( "UpdateMdadm %1", file["l",line]:$[] ); + } + line = line+1; + } + if( changed ) + AsciiFile::RewriteFile( file, cpath ); + } + global define void UpdateCryptoType() ``{ y2milestone( "UpdateCryptoType" ); @@ -5327,6 +5351,7 @@ if( size(dm)>0 ) { UpdateFstabDiskmap( dm ); + UpdateMdadm(); } if( oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0<=2)) { -- 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] r41568 - /tags/branch-SLE-10-SP1-2_13_17/product-creator/
by jsuchome＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: jsuchome Date: Thu Oct 25 14:11:56 2007 New Revision: 41568 URL: http://svn.opensuse.org/viewcvs/yast?rev=41568&view=rev Log: Created tag branch-SLE-10-SP1-2_13_17 for product-creator Added: tags/branch-SLE-10-SP1-2_13_17/product-creator/ - copied from r41567, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41567 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: jsuchome Date: Thu Oct 25 14:11:46 2007 New Revision: 41567 URL: http://svn.opensuse.org/viewcvs/yast?rev=41567&view=rev Log: - allow more characters in the image name - 2.13.17 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Thu Oct 25 14:11:46 2007 @@ -1 +1 @@ -2.13.16 +2.13.17 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Thu Oct 25 14:11:46 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 14:05:48 CEST 2007 - jsuchome(a)suse.cz + +- allow more characters in the image name +- 2.13.17 + +------------------------------------------------------------------- Tue Oct 16 23:37:05 CEST 2007 - jsuchome(a)suse.cz - fix modifying of repository (#334208) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Thu Oct 25 14:11:46 2007 @@ -1694,7 +1694,7 @@ if (template_items != []) UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, false); - UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()); + UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum () + "-_"); } any ret = nil; while (true) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41566 - in /trunk/update: package/yast2-update.changes src/clients/update_proposal.ycp src/modules/RootPart.ycp
by locilka＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: locilka Date: Thu Oct 25 14:03:32 2007 New Revision: 41566 URL: http://svn.opensuse.org/viewcvs/yast?rev=41566&view=rev Log: - Never list duplicate entries in "upgrade based on products" in upgrade proposal (#331560). Will be fixed in yast2-update-2.16.0 Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/update_proposal.ycp trunk/update/src/modules/RootPart.ycp Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Thu Oct 25 14:03:32 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 14:00:51 CEST 2007 - locilka(a)suse.cz + +- Never list duplicate entries in "upgrade based on products" in + upgrade proposal (#331560). + +------------------------------------------------------------------- Tue Aug 28 12:35:29 CEST 2007 - locilka(a)suse.cz - Update proposal doesn't use recommended Kernel if the package is Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Thu Oct 25 14:03:32 2007 @@ -494,10 +494,20 @@ string summary_text = ""; list <string> products = Update::SelectedProducts (); + list <string> already_printed = []; + if (products != nil) { foreach (string one_product, products, { + // never print duplicates, bugzilla #331560 + // 'toset' could be used but we want to keep sorting + if (contains (already_printed, one_product)) { + return; + } else { + already_printed = add (already_printed, one_product); + } + // TRANSLATORS: proposal summary item, %1 is a product name - summary_text = summary_text + "<li>" + sformat (_("Update to %1"), one_product) + "</li>\n"; + summary_text = summary_text + "<li>" + sformat (_("Update to %1"), one_product) + "</li>\n"; }); } Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Thu Oct 25 14:03:32 2007 @@ -571,7 +571,7 @@ * @param mountpoint string a mount point to find * @return string the found partition */ -define string FindPartitionInFstab (list<map> fstab, string mountpoint) { +define string FindPartitionInFstab (list <map> & fstab, string mountpoint) { if (substring (mountpoint, size (mountpoint) - 1, 1) == "/") mountpoint = substring (mountpoint, 0, size (mountpoint) - 1); @@ -609,7 +609,7 @@ if (cmd["exit"]:nil != nil) { list <string> files = splitstring (cmd["stdout"]:"", "\n"); integer files_count = size (files); - if (files_count == nil || files_count <= 3) { + if (files_count == nil || files_count <= 2) { y2error ("There are only %1 files in /var/lib/hardware/, translation needn't work!", files_count); } else { y2milestone ("There are %1 files in /var/lib/hardware/", files_count); @@ -726,10 +726,19 @@ } } + boolean FstabHasSeparateVar (list <map> & fstab) { + string var_device_fstab = FindPartitionInFstab (fstab, "/var"); + y2milestone ("/var partition is %1", var_device_fstab); + + return (var_device_fstab != nil); + } + + define string MountVarIfRequired (list <map> fstab, string root_device_current); + /** * */ - define boolean read_fstab_and_cryptotab (list <map>& fstab, list <map>& crtab) + define boolean read_fstab_and_cryptotab (list <map>& fstab, list <map>& crtab, string root_device_current) { integer default_scr = WFM::SCRGetDefault (); integer new_scr = nil; @@ -748,6 +757,15 @@ Update::GetProductName(); + boolean fstab_has_separate_var = FstabHasSeparateVar (fstab); + // mount /var + if (fstab_has_separate_var) { + y2warning ("Separate /var partition!"); + MountVarIfRequired (fstab, root_device_current); + } else { + y2milestone ("No separate /var partition found"); + } + y2milestone ("fstab: %1", fstab); fstab = TranslateFsOrCryptoTab (fstab, "spec", "spec_old"); y2milestone ("fstab: (translated) %1", fstab); @@ -756,6 +774,11 @@ crtab = TranslateFsOrCryptoTab (crtab, "file", "file_old"); y2milestone ("crtab: (translated) %1", crtab); + // umount /var + if (fstab_has_separate_var) { + SCR::Execute (.target.umount, Installation::destdir + "/var"); + } + return true; } @@ -1089,7 +1112,7 @@ string err_message = nil; if (mount_err != nil) { - y2error ("failed to mount /var"); + y2error (-1, "failed to mount /var"); err_message = sformat ( // error message _("The /var partition %1 could not be mounted.\n"), @@ -1107,8 +1130,12 @@ define string MountVarIfRequired (list <map> fstab, string root_device_current) { string var_device_fstab = FindPartitionInFstab (fstab, "/var"); - if (var_device_fstab == nil) + + // No need to mount "/var", it's not separate == already mounted with "/" + if (var_device_fstab == nil) { + y2milestone ("Not a separate /var..."); return nil; + } if (!Storage::DeviceRealDisk (var_device_fstab)) return MountVarPartition (var_device_fstab); @@ -1185,7 +1212,7 @@ // typing passwords for encrypted partitions Keyboard::CheckKeyboardDuringUpdate (Installation::destdir); - read_fstab_and_cryptotab (fstab, crtab); + read_fstab_and_cryptotab (fstab, crtab, root_device_current); if (size (fstab) == 0) { @@ -1365,7 +1392,7 @@ list <map> fstab = []; list <map> crtab = []; - read_fstab_and_cryptotab (fstab, crtab); + read_fstab_and_cryptotab (fstab, crtab, p_dev); fstab = filter (map p, fstab, ``(p["file"]:""=="/")); -- 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] r41565 - /tags/stable-2_16_1/repair/
by jsuchome＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: jsuchome Date: Thu Oct 25 13:38:56 2007 New Revision: 41565 URL: http://svn.opensuse.org/viewcvs/yast?rev=41565&view=rev Log: Created tag stable-2_16_1 for repair Added: tags/stable-2_16_1/repair/ - copied from r41564, trunk/repair/ -- 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] r41564 - in /trunk/repair: VERSION package/yast2-repair.changes src/OSRBoot.ycp src/OSRFloppy.ycp src/OSRFstab.ycp src/OSRPtbl.ycp src/osr_module_init.ycp src/osr_module_partition.ycp
by jsuchome＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: jsuchome Date: Thu Oct 25 13:37:43 2007 New Revision: 41564 URL: http://svn.opensuse.org/viewcvs/yast?rev=41564&view=rev Log: - adapted for the API change in yast2-storage (#335582) (patch from fehr) - 2.16.1 Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRBoot.ycp trunk/repair/src/OSRFloppy.ycp trunk/repair/src/OSRFstab.ycp trunk/repair/src/OSRPtbl.ycp trunk/repair/src/osr_module_init.ycp trunk/repair/src/osr_module_partition.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=41564&r1=4156… ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Thu Oct 25 13:37:43 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Thu Oct 25 13:37:43 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 10:00:20 CEST 2007 - jsuchome(a)suse.cz + +- adapted for the API change in yast2-storage (#335582) +- 2.16.1 + +------------------------------------------------------------------- Wed Oct 3 11:40:11 CEST 2007 - jsuchome(a)suse.cz - adapt for API change in yast2-bootloader (#329702) Modified: trunk/repair/src/OSRBoot.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRBoot.ycp?rev=41564… ============================================================================== --- trunk/repair/src/OSRBoot.ycp (original) +++ trunk/repair/src/OSRBoot.ycp Thu Oct 25 13:37:43 2007 @@ -722,9 +722,9 @@ if(dev_name == "" ) return true; // if device is a floppy - if( StorageDevices::FloppyDrives == [] || StorageDevices::FloppyDrives == nil ) StorageDevices::Probe(false); - y2milestone("FloppyDrives %1", StorageDevices::FloppyDrives ); - map ret = find(map e, StorageDevices::FloppyDrives, ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)); + if( StorageDevices::FloppyDrives() == [] || StorageDevices::FloppyDrives == nil ) StorageDevices::Probe(false); + y2milestone("FloppyDrives %1", StorageDevices::FloppyDrives() ); + map ret = find(map e, StorageDevices::FloppyDrives(), ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)); if ( ret != nil && size( ret ) > 0 ) return true; // if device is a hard disk Modified: trunk/repair/src/OSRFloppy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFloppy.ycp?rev=415… ============================================================================== --- trunk/repair/src/OSRFloppy.ycp (original) +++ trunk/repair/src/OSRFloppy.ycp Thu Oct 25 13:37:43 2007 @@ -41,7 +41,7 @@ /** * Default floppy device */ - global string floppy_device = StorageDevices::FloppyDevice; + global string floppy_device = StorageDevices::FloppyDevice(); /** * Supported file systems @@ -71,7 +71,7 @@ */ define boolean CheckPresent()``{ - if ( ! StorageDevices::FloppyPresent ) + if ( ! StorageDevices::FloppyPresent() ) { // error message string message = _(" Modified: trunk/repair/src/OSRFstab.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFstab.ycp?rev=4156… ============================================================================== --- trunk/repair/src/OSRFstab.ycp (original) +++ trunk/repair/src/OSRFstab.ycp Thu Oct 25 13:37:43 2007 @@ -578,7 +578,7 @@ map ret = StorageDevices::GetCdromEntry( dev_name); if (ret == $[] || ret == nil) { - ret = find(map e, StorageDevices::cddrives, ``(e["linkname"]:"" == dev_name)); + ret = find(map e, StorageDevices::cddrives(), ``(e["linkname"]:"" == dev_name)); // check link if (ret == nil) { @@ -596,15 +596,15 @@ ret = StorageDevices::GetCdromEntry( link); if (ret == $[] || ret == nil) { - //y2milestone(" StorageDevices :: %1 " ,StorageDevices::cddrives); - ret = find(map e, StorageDevices::cddrives, ``(e["linkname"]:"" == link)); + //y2milestone(" StorageDevices :: %1 " ,StorageDevices::cddrives()); + ret = find(map e, StorageDevices::cddrives(), ``(e["linkname"]:"" == link)); } y2milestone(" ret in check link %1", ret); } } if (ret == $[] || ret == nil) { - ret = find(map e, StorageDevices::FloppyDrives, ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)); + ret = find(map e, StorageDevices::FloppyDrives(), ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)); if (ret != $[] && ret != nil) ret["found"] = "floppy"; } else { @@ -613,7 +613,7 @@ if (ret == $[] || ret == nil) { list lret = maplist (string n, map m, - filter (string k, map e, (map<string,map>)StorageDevices::ZipDrives, + filter (string k, map e, StorageDevices::ZipDrives(), ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)), ``(m)); ret = lret[0]:$[]; if (ret != $[] && ret != nil) ret["found"] = "zip"; @@ -974,15 +974,15 @@ ] ); dev2check = (list<string>) union (dev2check, - maplist (map d, StorageDevices::cddrives, + maplist (map d, StorageDevices::cddrives(), ``(d["dev_orig"]:(d["dev_name"]:"")))); dev2check = (list<string>) union (dev2check, - maplist (map d, StorageDevices::FloppyDrives, + maplist (map d, StorageDevices::FloppyDrives(), ``(d["dev_orig"]:(d["dev_name"]:"")))); dev2check = (list<string>) union (dev2check, - maplist (string k, map d, (map<string,map>) StorageDevices::ZipDrives, + maplist (string k, map d, StorageDevices::ZipDrives(), ``(d["dev_orig"]:(d["dev_name"]:"")))); return dev2check; Modified: trunk/repair/src/OSRPtbl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPtbl.ycp?rev=41564… ============================================================================== --- trunk/repair/src/OSRPtbl.ycp (original) +++ trunk/repair/src/OSRPtbl.ycp Thu Oct 25 13:37:43 2007 @@ -116,7 +116,7 @@ global define void OSRPtbl()``{ - if (! StorageDevices::FloppyPresent ) + if (! StorageDevices::FloppyPresent() ) { // filter floppy repair methode y2milestone("filter floppy repair methode. No floppy found"); Modified: trunk/repair/src/osr_module_init.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_init.ycp?r… ============================================================================== --- trunk/repair/src/osr_module_init.ycp (original) +++ trunk/repair/src/osr_module_init.ycp Thu Oct 25 13:37:43 2007 @@ -43,7 +43,7 @@ // ///////////////////////////////////////////////////////////////////////// - if ( size( StorageDevices::FloppyDrives) == 1 ) + if ( size( StorageDevices::FloppyDrives()) == 1 ) { // summary text, %1 is floppy device OSRSummary::DetectOK("",sformat(_("Floppy device found on %1"), @@ -51,10 +51,10 @@ OSRCommon::ProvideBoolean("has_floppy", true); } - else if ( size( StorageDevices::FloppyDrives) > 1 ) + else if ( size( StorageDevices::FloppyDrives()) > 1 ) { list<string> drives = (list<string>) maplist ( - map floppy, StorageDevices::FloppyDrives, ``{ + map floppy, StorageDevices::FloppyDrives(), ``{ return floppy["dev_name"]:""; }); Modified: trunk/repair/src/osr_module_partition.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_partition.… ============================================================================== --- trunk/repair/src/osr_module_partition.ycp (original) +++ trunk/repair/src/osr_module_partition.ycp Thu Oct 25 13:37:43 2007 @@ -1275,7 +1275,7 @@ UI::NormalCursor(); - if (!StorageDevices::FloppyPresent) + if (!StorageDevices::FloppyPresent()) { // message popup (no floppy drive was detected) Report::Message(_(" -- 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] r41563 - in /branches/SuSE-SLE-10-SP2-Branch/installation: package/yast2-installation.changes src/modules/AddOnProduct.ycp
by locilka＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: locilka Date: Thu Oct 25 13:07:10 2007 New Revision: 41563 URL: http://svn.opensuse.org/viewcvs/yast?rev=41563&view=rev Log: - Added fonctionality for merging texts from different control files (including different textdomains) (#271608). Modified: branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes Thu Oct 25 13:07:10 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 12:53:59 CEST 2007 - locilka(a)suse.cz + +- Added fonctionality for merging texts from different control + files (including different textdomains) (#271608). + +------------------------------------------------------------------- Mon Oct 22 09:30:30 CEST 2007 - locilka(a)suse.cz - Calling inst_suse_register instead of suse_register client in Modified: branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp Thu Oct 25 13:07:10 2007 @@ -851,6 +851,7 @@ sm[w["stage"]:"", w["mode"]:""] = true; return [w["stage"]:"", w["mode"]:""]; }); + y2milestone ("Existing replace workflows: %1", sm); y2milestone ("Workflows before filtering: %1", size (ProductControl::workflows)); ProductControl::workflows = filter (map w, ProductControl::workflows, { @@ -858,6 +859,7 @@ }); y2milestone ("Workflows after filtering: %1", size (ProductControl::workflows)); ProductControl::workflows = (list<map>)merge (ProductControl::workflows, workflows); + return true; } @@ -867,16 +869,49 @@ * @return boolean true on success */ boolean UpdateProductInfo(map update_file) { - foreach (string section, ["globals", "software", "partitioning", "network"], + foreach (string section, ["globals", "software", "partitioning", "network", "texts"], { map<string,any> sect = ProductFeatures::GetSection(section); map<string,any> addon = update_file[section]:$[]; sect = (map<string,any>)union (sect, addon); ProductFeatures::SetSection(section, sect); }); + + // merging 'clone_modules' list<string> addon_clone = update_file["clone_modules"]:[]; ProductControl::clone_modules = (list<string>)merge (ProductControl::clone_modules, addon_clone); + + // merging texts + + /** + * @struct $[ + * "congratulate" : $[ + * "label" : "some text", + * ], + * "congratulate2" : $[ + * "label" : "some other text", + * "textdomain" : "control-2", // (optionally) + * ], + * ]; + */ + map <string, any> controlfile_texts = ProductFeatures::GetSection ("texts"); + map <string, map <string, string> > update_file_texts = update_file["texts"]:$[]; + string update_file_textdomain = update_file["textdomain"]:""; + + // if textdomain is different to the base one + // we have to put it into the map + if (update_file_textdomain != nil && update_file_textdomain != "") { + update_file_texts = mapmap (string text_ident, map <string, string> text_def, update_file_texts, { + text_def["textdomain"] = update_file_textdomain; + + return $[ text_ident : text_def ]; + }); + } + + controlfile_texts = (map <string, any>) union (controlfile_texts, update_file_texts); + ProductFeatures::SetSection ("texts", controlfile_texts); + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41562 - in /branches/SuSE-SLE-10-SP2-Branch/yast2: library/control/src/ProductControl.ycp package/yast2.changes
by locilka＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: locilka Date: Thu Oct 25 11:52:49 2007 New Revision: 41562 URL: http://svn.opensuse.org/viewcvs/yast?rev=41562&view=rev Log: - Evaluate also textdomain of a merged control file when searching for translated text (#271608). Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/yast2/library/control/src/ProductControl.ycp Thu Oct 25 11:52:49 2007 @@ -743,14 +743,16 @@ } global string GetTranslatedText (string key) { - map<string,string> text = texts[key]:$[]; + map <string, any> controlfile_texts = ProductFeatures::GetSection ("texts"); + map <string,string> text = (map <string,string>) controlfile_texts[key]:$[]; + string label = text["label"]:""; if (label == "") { y2error ("The requested label %1 does not exist", key); return ""; } - string domain = text["textdomain"]:""; + string domain = text["textdomain"]:productControl["textdomain"]:"control"; if (domain == "") { y2error ("The text domain for label %1 not set", key); Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes Thu Oct 25 11:52:49 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 11:50:28 CEST 2007 - locilka(a)suse.cz + +- Evaluate also textdomain of a merged control file when searching + for translated text (#271608). + +------------------------------------------------------------------- Wed Apr 11 10:14:42 CEST 2007 - lslezak(a)suse.cz - properly detect PV/FV Xen machine (#255217) -- 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] r41561 - /trunk/gtk/mockups/package-selector/christian-package-selector.png
by rpmcruz＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: rpmcruz Date: Thu Oct 25 01:14:00 2007 New Revision: 41561 URL: http://svn.opensuse.org/viewcvs/yast?rev=41561&view=rev Log: Forgot to remove this one. Removed: trunk/gtk/mockups/package-selector/christian-package-selector.png -- 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] r41560 - in /trunk/gtk/mockups/package-selector: christian-package-selector-1.png christian-package-selector-2.png ricado-split-use-cases.svg
by rpmcruz＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: rpmcruz Date: Thu Oct 25 01:13:49 2007 New Revision: 41560 URL: http://svn.opensuse.org/viewcvs/yast?rev=41560&view=rev Log: Added a mockup of mine, and another from Christian (just a slight touch up). Added: trunk/gtk/mockups/package-selector/christian-package-selector-1.png (with props) trunk/gtk/mockups/package-selector/christian-package-selector-2.png (with props) trunk/gtk/mockups/package-selector/ricado-split-use-cases.svg Added: trunk/gtk/mockups/package-selector/christian-package-selector-1.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/package-selector/chr… ============================================================================== Binary file - no diff available. Added: trunk/gtk/mockups/package-selector/christian-package-selector-2.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/package-selector/chr… ============================================================================== Binary file - no diff available. Added: trunk/gtk/mockups/package-selector/ricado-split-use-cases.svg URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/package-selector/ric… ============================================================================== --- trunk/gtk/mockups/package-selector/ricado-split-use-cases.svg (added) +++ trunk/gtk/mockups/package-selector/ricado-split-use-cases.svg Thu Oct 25 01:13:49 2007 @@ -0,0 +1,634 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.45.1" + width="720" + height="410" + sodipodi:docbase="/home/rick2/Documents/yast/gtk/mockups/package-selector" + sodipodi:docname="ricado-split-use-cases.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0"> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs5" /> + <sodipodi:namedview + inkscape:window-height="777" + inkscape:window-width="939" + inkscape:pageshadow="2" + inkscape:pageopacity="1" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="1" + inkscape:cx="372.04724" + inkscape:cy="228.70418" + inkscape:window-x="334" + inkscape:window-y="42" + inkscape:current-layer="svg2" + showgrid="false" + width="720px" + height="410px" /> + <rect + style="fill:#fff966;fill-opacity:1;stroke:none;stroke-width:1.59800005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8339" + width="718" + height="409" + x="2" + y="1" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="267" + y="41.362183" + id="text7070"><tspan + sodipodi:role="line" + id="tspan7072" + x="267" + y="41.362183">Action:</tspan></text> + <path + sodipodi:type="arc" + id="path7074" + sodipodi:cx="167" + sodipodi:cy="74.862183" + sodipodi:rx="19" + sodipodi:ry="16.5" + d="M 186 74.862183 A 19 16.5 0 1 1 148,74.862183 A 19 16.5 0 1 1 186 74.862183 z" + transform="matrix(0.6614424,0,0,0.7616609,239.03913,-22.157412)" + style="fill:#ffffff;stroke:#000000;stroke-width:2.76719594;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" /> + <path + sodipodi:type="arc" + style="fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path8045" + sodipodi:cx="128" + sodipodi:cy="161.36218" + sodipodi:rx="10" + sodipodi:ry="9" + d="M 138 161.36218 A 10 9 0 1 1 118,161.36218 A 10 9 0 1 1 138 161.36218 z" + transform="matrix(0.85,0,0,1,240.7,-127)" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="369" + y="41.362183" + id="text8047"><tspan + sodipodi:role="line" + id="tspan8049" + x="369" + y="41.362183">Install</tspan></text> + <path + sodipodi:type="arc" + id="path8053" + sodipodi:cx="167" + sodipodi:cy="74.862183" + sodipodi:rx="19" + sodipodi:ry="16.5" + d="M 186 74.862183 A 19 16.5 0 1 1 148,74.862183 A 19 16.5 0 1 1 186 74.862183 z" + transform="matrix(0.6614424,0,0,0.7616609,339.53912,-20.657415)" + style="fill:#ffffff;stroke:#000000;stroke-width:2.76719594;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="471" + y="41.362183" + id="text8059"><tspan + sodipodi:role="line" + id="tspan8061" + x="471" + y="41.362183">Remove</tspan></text> + <path + sodipodi:type="arc" + id="path8063" + sodipodi:cx="167" + sodipodi:cy="74.862183" + sodipodi:rx="19" + sodipodi:ry="16.5" + d="M 186 74.862183 A 19 16.5 0 1 1 148,74.862183 A 19 16.5 0 1 1 186 74.862183 z" + transform="matrix(0.6614424,0,0,0.7616609,464.53912,-20.657415)" + style="fill:#ffffff;stroke:#000000;stroke-width:2.76719594;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="595" + y="42.362183" + id="text8065"><tspan + sodipodi:role="line" + id="tspan8067" + x="595" + y="42.362183">Upgrade</tspan></text> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.56370759;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8069" + width="132.43629" + height="269.43628" + x="263.78186" + y="77.144043" /> + <g + id="g8078" + transform="matrix(0.7085094,0,0,0.8192639,-8.44843,-87.77487)"> + <rect + y="212.26196" + x="393.89227" + height="37.200428" + width="46.215443" + id="rect8071" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.79179287;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" /> + <a + id="a8075"> + <rect + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1.58312905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8073" + width="44.19965" + height="13.608962" + x="395.26849" + y="213.00041" /> + </a> + </g> + <path + sodipodi:type="star" + style="fill:#cfcfff;fill-opacity:1;stroke:#000000;stroke-width:0.6525771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="path8087" + sodipodi:sides="4" + sodipodi:cx="207" + sodipodi:cy="178.36218" + sodipodi:r1="30.413813" + sodipodi:r2="21.505814" + sodipodi:arg1="0.76214654" + sodipodi:arg2="1.5475447" + inkscape:flatsided="true" + inkscape:rounded="0.07" + inkscape:randomized="0" + d="M 229,199.36218 C 226.92111,201.54007 188.17789,202.44108 186,200.36218 C 183.82211,198.28329 182.92111,159.54007 185,157.36218 C 187.07889,155.18429 225.82211,154.28329 228,156.36218 C 230.17789,158.44108 231.07889,197.18429 229,199.36218 z " + transform="matrix(2.6971042,0,0,0.9494303,-87.80056,-41.980263)" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="422" + y="133.36218" + id="text8089"><tspan + sodipodi:role="line" + id="tspan8091" + x="422" + y="133.36218">Install</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="314" + y="103.36218" + id="text8093"><tspan + sodipodi:role="line" + id="tspan8095" + x="314" + y="103.36218">Emacs</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="323" + y="152.36218" + id="text8097"><tspan + sodipodi:role="line" + id="tspan8099" + x="323" + y="152.36218">Yast</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="322" + y="192.36218" + id="text8101"><tspan + sodipodi:role="line" + id="tspan8103" + x="322" + y="192.36218">Gnome</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="333" + y="229.36218" + id="text8105"><tspan + sodipodi:role="line" + id="tspan8107" + x="333" + y="229.36218">. . .</tspan></text> + <g + id="g8109" + transform="matrix(0.7085094,0,0,0.8192639,-7.44842,-45.774865)"> + <rect + y="212.26196" + x="393.89227" + height="37.200428" + width="46.215443" + id="rect8111" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.79179287;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" /> + <a + id="a8113"> + <rect + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1.58312905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8115" + width="44.19965" + height="13.608962" + x="395.26849" + y="213.00041" /> + </a> + </g> + <g + id="g8117" + transform="matrix(0.7085094,0,0,0.8192639,-6.44842,-4.774865)"> + <rect + y="212.26196" + x="393.89227" + height="37.200428" + width="46.215443" + id="rect8119" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.79179287;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" /> + <a + id="a8121"> + <rect + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1.58312905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8123" + width="44.19965" + height="13.608962" + x="395.26849" + y="213.00041" /> + </a> + </g> + <g + id="g8125" + transform="matrix(0.7085094,0,0,0.8192639,-6.44842,33.225135)"> + <rect + y="212.26196" + x="393.89227" + height="37.200428" + width="46.215443" + id="rect8127" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.79179287;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" /> + <a + id="a8129"> + <rect + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1.58312905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8131" + width="44.19965" + height="13.608962" + x="395.26849" + y="213.00041" /> + </a> + </g> + <g + id="g8133" + transform="matrix(0.7085094,0,0,0.8192639,-5.44842,70.225135)"> + <rect + y="212.26196" + x="393.89227" + height="37.200428" + width="46.215443" + id="rect8135" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.79179287;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" /> + <a + id="a8137"> + <rect + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1.58312905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8139" + width="44.19965" + height="13.608962" + x="395.26849" + y="213.00041" /> + </a> + </g> + <g + id="g8141" + transform="matrix(0.7085094,0,0,0.8192639,-4.44842,110.22514)"> + <rect + y="212.26196" + x="393.89227" + height="37.200428" + width="46.215443" + id="rect8143" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.79179287;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" /> + <a + id="a8145"> + <rect + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1.58312905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8147" + width="44.19965" + height="13.608962" + x="395.26849" + y="213.00041" /> + </a> + </g> + <path + sodipodi:type="star" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.59800005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="path8149" + sodipodi:sides="3" + sodipodi:cx="257" + sodipodi:cy="206.36218" + sodipodi:r1="38.897301" + sodipodi:r2="27.504545" + sodipodi:arg1="0.80357798" + sodipodi:arg2="1.8507755" + inkscape:flatsided="true" + inkscape:rounded="0.07" + inkscape:randomized="0" + d="M 284,234.36218 C 280.60518,237.63576 220.38888,220.32166 219.25129,215.74487 C 218.1137,211.16808 263.2163,167.67628 267.74871,168.9795 C 272.28112,170.28271 287.39482,231.08861 284,234.36218 z " + transform="matrix(-0.5046744,-9.1938879e-2,0.1000384,-0.2995076,614.5839,212.26209)" /> + <path + sodipodi:type="star" + style="fill:#cfcfff;fill-opacity:1;stroke:#000000;stroke-width:0.6525771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="path8151" + sodipodi:sides="4" + sodipodi:cx="207" + sodipodi:cy="178.36218" + sodipodi:r1="30.413813" + sodipodi:r2="21.505814" + sodipodi:arg1="0.76214654" + sodipodi:arg2="1.5475447" + inkscape:flatsided="true" + inkscape:rounded="0.07" + inkscape:randomized="0" + d="M 229,199.36218 C 226.92111,201.54007 188.17789,202.44108 186,200.36218 C 183.82211,198.28329 182.92111,159.54007 185,157.36218 C 187.07889,155.18429 225.82211,154.28329 228,156.36218 C 230.17789,158.44108 231.07889,197.18429 229,199.36218 z " + transform="matrix(-2.6971042,0,0,0.9494303,1029.3006,29.019722)" /> + <path + sodipodi:type="star" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.59800005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="path8157" + sodipodi:sides="3" + sodipodi:cx="257" + sodipodi:cy="206.36218" + sodipodi:r1="38.897301" + sodipodi:r2="27.504545" + sodipodi:arg1="0.80357798" + sodipodi:arg2="1.8507755" + inkscape:flatsided="true" + inkscape:rounded="0.07" + inkscape:randomized="0" + d="M 284,234.36218 C 280.60518,237.63576 220.38888,220.32166 219.25129,215.74487 C 218.1137,211.16808 263.2163,167.67628 267.74871,168.9795 C 272.28112,170.28271 287.39482,231.08861 284,234.36218 z " + transform="matrix(0.5046744,-9.1938879e-2,-0.1000384,-0.2995076,329.17835,283.26208)" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="459" + y="203.36218" + id="text8159"><tspan + sodipodi:role="line" + id="tspan8161" + x="459" + y="203.36218">Undo</tspan></text> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.56370759;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8163" + width="132.43629" + height="269.43628" + x="552.78186" + y="76.644043" /> + <g + id="g8169" + transform="matrix(0.7085094,0,0,0.8192639,280.55158,-85.77486)"> + <rect + y="212.26196" + x="393.89227" + height="37.200428" + width="46.215443" + id="rect8171" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.79179287;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" /> + <a + id="a8173"> + <rect + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1.58312905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8175" + width="44.19965" + height="13.608962" + x="395.26849" + y="213.00041" /> + </a> + </g> + <g + id="g8177" + transform="matrix(0.7085094,0,0,0.8192639,280.55158,-45.774865)"> + <rect + y="212.26196" + x="393.89227" + height="37.200428" + width="46.215443" + id="rect8179" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.79179287;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" /> + <a + id="a8181"> + <rect + style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1.58312905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8183" + width="44.19965" + height="13.608962" + x="395.26849" + y="213.00041" /> + </a> + </g> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="606" + y="110.36218" + id="text8189"><tspan + sodipodi:role="line" + id="tspan8191" + x="606" + y="110.36218">VIM</tspan></text> + <text + xml:space="preserve" + style="font-size:12.81681156px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="655.58746" + y="135.82359" + id="text8193" + transform="scale(0.9154865,1.0923154)"><tspan + sodipodi:role="line" + id="tspan8195" + x="655.58746" + y="135.82359">Dependency 1</tspan></text> + <path + sodipodi:type="star" + style="fill:#cfcfff;fill-opacity:1;stroke:#000000;stroke-width:0.6525771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="path8278" + sodipodi:sides="4" + sodipodi:cx="207" + sodipodi:cy="178.36218" + sodipodi:r1="30.413813" + sodipodi:r2="21.505814" + sodipodi:arg1="0.76214654" + sodipodi:arg2="1.5475447" + inkscape:flatsided="true" + inkscape:rounded="0.07" + inkscape:randomized="0" + d="M 229,199.36218 C 226.92111,201.54007 188.17789,202.44108 186,200.36218 C 183.82211,198.28329 182.92111,159.54007 185,157.36218 C 187.07889,155.18429 225.82211,154.28329 228,156.36218 C 230.17789,158.44108 231.07889,197.18429 229,199.36218 z " + transform="matrix(-2.8494521,1.1259094e-2,4.9738035e-3,0.7992946,1200.4495,232.96761)" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.59565759;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 662.75191,371.04823 L 656.66967,388.11409 L 648.24809,368.61027 L 657.13753,388.11409 L 662.75191,371.04823 z " + id="path8268" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="553" + y="385.36218" + id="text8281"><tspan + sodipodi:role="line" + id="tspan8283" + x="553" + y="385.36218">Packages</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="487.1709" + y="384.49109" + id="text8285"><tspan + sodipodi:role="line" + id="tspan8287" + x="487.1709" + y="384.49109">Type:</tspan></text> + <rect + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.03835428;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8222" + width="169.29662" + height="289.12125" + x="43.576736" + y="92.37149" /> + <path + style="fill:#ffffdb;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 30,25.862183 L 138,23.862183 L 238,67.862183 L 240,397.86218 L 21,398.86218 L 20,25.862183 L 30,25.862183 z " + id="path8224" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="34" + y="52.862183" + id="text8230"><tspan + sodipodi:role="line" + id="tspan8232" + x="34" + y="52.862183">Filters</tspan></text> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.29615057;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8234" + width="182.30185" + height="24.301849" + x="35.849075" + y="68.711258" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.76469111px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 41.459552,88.95369 L 50.117654,88.95369 L 44.922793,89.96676 L 44.922793,72.744533 L 48.963241,72.744533 L 40.882346,73.7576 L 45.5,72.744533 L 46.654414,72.744533 L 44.345586,72.744533 L 44.345586,90.97983 L 41.459552,88.95369 z " + id="path8240" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.79200006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 41.759684,107.70843 L 62.153755,114.1277 L 38.846245,123.01593 L 62.153755,113.63391 L 41.759684,107.70843 z " + id="path8242" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="72" + y="120.86218" + id="text8244"><tspan + sodipodi:role="line" + id="tspan8246" + x="72" + y="120.86218">Categories</tspan></text> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.79200006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.4;stroke-opacity:1" + id="rect8248" + width="180" + height="158" + x="39" + y="135.86218" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 52,152.86218 L 51,276.86218 L 92,275.86218 L 51,275.86218 L 52,171.86218 L 86,171.86218 L 85,253.86218 L 125,252.86218 L 84,253.86218 L 86,209.86218 L 123,209.86218 L 85,209.86218 L 86,172.86218 L 52,172.86218 L 52,152.86218 z " + id="path8250" + sodipodi:nodetypes="ccccccccccccccc" /> + <text + xml:space="preserve" + style="font-size:18px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="95" + y="179.86218" + id="text8252"><tspan + sodipodi:role="line" + id="tspan8254" + x="95" + y="179.86218">Office</tspan></text> + <text + xml:space="preserve" + style="font-size:13.26576328px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="155.67979" + y="177.31532" + id="text8256" + transform="scale(0.8291102,1.2061123)"><tspan + sodipodi:role="line" + id="tspan8258" + x="155.67979" + y="177.31532">Word Processors</tspan></text> + <text + xml:space="preserve" + style="font-size:14.71323204px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="141.53064" + y="238.04373" + id="text8260" + transform="scale(0.919577,1.0874565)"><tspan + sodipodi:role="line" + id="tspan8262" + x="141.53064" + y="238.04373">Spreedsheets</tspan></text> + <text + xml:space="preserve" + style="font-size:18px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="99" + y="280.86218" + id="text8264"><tspan + sodipodi:role="line" + id="tspan8266" + x="99" + y="280.86218">Multimedia</tspan></text> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.79200006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 60.74032,314.20843 L 40.34625,320.6277 L 63.65375,329.51593 L 40.34625,320.13391 L 60.74032,314.20843 z " + id="path8333" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="79.5625" + y="328.03308" + id="text8270"><tspan + sodipodi:role="line" + id="tspan8272" + x="79.5625" + y="328.03308">Repositories</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="49" + y="361.86218" + id="text8274"><tspan + sodipodi:role="line" + id="tspan8276" + x="49" + y="361.86218">. . .</tspan></text> +</svg> -- 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] r41559 - in /trunk/firstboot: package/yast2-firstboot.changes src/Makefile.am src/firstboot_bootloader_reconfigure.ycp
by jsrain＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: jsrain Date: Wed Oct 24 17:52:06 2007 New Revision: 41559 URL: http://svn.opensuse.org/viewcvs/yast?rev=41559&view=rev Log: added firstboot_bootloader to recreate bootloader configuration Added: trunk/firstboot/src/firstboot_bootloader_reconfigure.ycp Modified: trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/Makefile.am Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Wed Oct 24 17:52:06 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 24 17:43:40 CEST 2007 - jsrain(a)suse.cz + +- added firstboot_bootloader to recreate bootloader configuration + +------------------------------------------------------------------- Tue Oct 23 15:53:31 CEST 2007 - jsrain(a)suse.cz - initialize package callbacks, since some of the modules run Modified: trunk/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/Makefile.am?rev=41… ============================================================================== --- trunk/firstboot/src/Makefile.am (original) +++ trunk/firstboot/src/Makefile.am Wed Oct 24 17:52:06 2007 @@ -14,7 +14,8 @@ firstboot_keyboard.ycp \ firstboot.ycp \ firstboot_license_novell.ycp \ - firstboot_network_write.ycp + firstboot_network_write.ycp \ + firstboot_bootloader_reconfigure.ycp ynclude_DATA = \ routines.ycp Added: trunk/firstboot/src/firstboot_bootloader_reconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_bootload… ============================================================================== --- trunk/firstboot/src/firstboot_bootloader_reconfigure.ycp (added) +++ trunk/firstboot/src/firstboot_bootloader_reconfigure.ycp Wed Oct 24 17:52:06 2007 @@ -0,0 +1,71 @@ +/** + */ +{ +import "Arch"; +import "BootCommon"; +import "Bootloader"; +import "GetInstArgs"; +import "Kernel"; +import "Mode"; + + + void SetVGAKernelParam () { + string cmldline = (string) WFM::Read (.local.string, "/proc/cmdline"); + + if (cmldline == nil) { + y2error ("No cmdline!"); + return; + } + + list <string> cmdline_args = splitstring (cmldline, " \t\n"); + + string just_parsing = ""; + + foreach (string cmdline_arg, cmdline_args, { + if (regexpmatch (cmdline_arg, "[vV][gG][aA]=.*")) { + just_parsing = cmdline_arg; + cmdline_arg = regexpsub (cmdline_arg, "[vV][gG][aA]=(.*)", "\\1"); + + if (cmdline_arg == nil || cmdline_arg == "") { + y2error ("Incorrect vga param %1", just_parsing); + break; + } else { + y2milestone ("Adjusting Kernel cmdline vga=%1", cmdline_arg); + Kernel::SetVgaType (cmdline_arg); + break; + } + } + }); + } + + +if (GetInstArgs::going_back()) + return `auto; + +Bootloader::Reset (); +if (Arch::i386 () || Arch::x86_64 ()) +{ + SetVGAKernelParam (); + y2milestone ("Setting VGA parameter to %1", Kernel::GetVgaType ()); +} + +// pretend installation +string mode = Mode::mode (); +Mode::SetMode ("installation"); + +Bootloader::Propose (); +Mode::SetMode (mode); + +if (Arch::i386 () || Arch::x86_64 ()) +{ + BootCommon::selected_location = "mbr"; + BootCommon::loader_device = BootCommon::GetBootloaderDevice (); + BootCommon::location_changed = true; + BootCommon::changed = true; +} +y2milestone ("Loader type: %1", Bootloader::getLoaderType ()); +y2milestone ("Summary: %1", Bootloader::Summary ()); +Bootloader::Write (); + +return `next; +} -- 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] r41558 - /tags/branch-SLE-10-SP1-2_13_10/firstboot/
by jsrain＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: jsrain Date: Wed Oct 24 17:49:31 2007 New Revision: 41558 URL: http://svn.opensuse.org/viewcvs/yast?rev=41558&view=rev Log: Created tag branch-SLE-10-SP1-2_13_10 for firstboot Added: tags/branch-SLE-10-SP1-2_13_10/firstboot/ - copied from r41557, branches/SuSE-SLE-10-SP1-Branch/firstboot/ -- 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] r41557 - in /branches/SuSE-SLE-10-SP1-Branch/firstboot: VERSION package/yast2-firstboot.changes src/Makefile.am src/firstboot_bootloader_reconfigure.ycp
by jsrain＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: jsrain Date: Wed Oct 24 17:49:01 2007 New Revision: 41557 URL: http://svn.opensuse.org/viewcvs/yast?rev=41557&view=rev Log: added firstboot_bootloader to recreate bootloader configuration Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_bootloader_reconfigure.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION Wed Oct 24 17:49:01 2007 @@ -1 +1 @@ -2.13.9 +2.13.10 Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes Wed Oct 24 17:49:01 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 24 17:43:40 CEST 2007 - jsrain(a)suse.cz + +- added firstboot_bootloader to recreate bootloader configuration +- 2.13.10 + +------------------------------------------------------------------- Tue Oct 23 15:53:31 CEST 2007 - jsrain(a)suse.cz - initialize package callbacks, since some of the modules run Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/Makefile.am Wed Oct 24 17:49:01 2007 @@ -14,7 +14,8 @@ firstboot_keyboard.ycp \ firstboot.ycp \ firstboot_license_novell.ycp \ - firstboot_network_write.ycp + firstboot_network_write.ycp \ + firstboot_bootloader_reconfigure.ycp ynclude_DATA = \ routines.ycp Added: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_bootloader_reconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_bootloader_reconfigure.ycp (added) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot_bootloader_reconfigure.ycp Wed Oct 24 17:49:01 2007 @@ -0,0 +1,71 @@ +/** + */ +{ +import "Arch"; +import "BootCommon"; +import "Bootloader"; +import "GetInstArgs"; +import "Kernel"; +import "Mode"; + + + void SetVGAKernelParam () { + string cmldline = (string) WFM::Read (.local.string, "/proc/cmdline"); + + if (cmldline == nil) { + y2error ("No cmdline!"); + return; + } + + list <string> cmdline_args = splitstring (cmldline, " \t\n"); + + string just_parsing = ""; + + foreach (string cmdline_arg, cmdline_args, { + if (regexpmatch (cmdline_arg, "[vV][gG][aA]=.*")) { + just_parsing = cmdline_arg; + cmdline_arg = regexpsub (cmdline_arg, "[vV][gG][aA]=(.*)", "\\1"); + + if (cmdline_arg == nil || cmdline_arg == "") { + y2error ("Incorrect vga param %1", just_parsing); + break; + } else { + y2milestone ("Adjusting Kernel cmdline vga=%1", cmdline_arg); + Kernel::SetVgaType (cmdline_arg); + break; + } + } + }); + } + + +if (GetInstArgs::going_back()) + return `auto; + +Bootloader::Reset (); +if (Arch::i386 () || Arch::x86_64 ()) +{ + SetVGAKernelParam (); + y2milestone ("Setting VGA parameter to %1", Kernel::GetVgaType ()); +} + +// pretend installation +string mode = Mode::mode (); +Mode::SetMode ("installation"); + +Bootloader::Propose (); +Mode::SetMode (mode); + +if (Arch::i386 () || Arch::x86_64 ()) +{ + BootCommon::selected_location = "mbr"; + BootCommon::loader_device = BootCommon::GetBootloaderDevice (); + BootCommon::location_changed = true; + BootCommon::changed = true; +} +y2milestone ("Loader type: %1", Bootloader::getLoaderType ()); +y2milestone ("Summary: %1", Bootloader::Summary ()); +Bootloader::Write (); + +return `next; +} -- 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] r41556 - /tags/stable-2_16_1/autoinstallation/
by ug＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: ug Date: Wed Oct 24 16:54:10 2007 New Revision: 41556 URL: http://svn.opensuse.org/viewcvs/yast?rev=41556&view=rev Log: Created tag stable-2_16_1 for autoinstallation Added: tags/stable-2_16_1/autoinstallation/ - copied from r41555, trunk/autoinstallation/ -- 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] r41555 - in /trunk/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: ug Date: Wed Oct 24 16:49:01 2007 New Revision: 41555 URL: http://svn.opensuse.org/viewcvs/yast?rev=41555&view=rev Log: 2.16.1 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=415… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Oct 24 16:49:01 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Oct 24 16:49:01 2007 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Oct 24 16:38:40 CEST 2007 - ug(a)suse.de -- API Call to Storage fixed +- API Call to Storage fixed (#335582) +- 2.16.1 ------------------------------------------------------------------- Tue Oct 2 16:34:15 CEST 2007 - ug(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41554 - /tags/stable-2_16_0/add-on/
by locilka＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: locilka Date: Wed Oct 24 16:45:24 2007 New Revision: 41554 URL: http://svn.opensuse.org/viewcvs/yast?rev=41554&view=rev Log: Created tag stable-2_16_0 for add-on Added: tags/stable-2_16_0/add-on/ - copied from r41553, trunk/add-on/ -- 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] r41553 - in /trunk/autoinstallation: package/autoyast2.changes src/include/io.ycp
by ug＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: ug Date: Wed Oct 24 16:39:10 2007 New Revision: 41553 URL: http://svn.opensuse.org/viewcvs/yast?rev=41553&view=rev Log: API Call to Storage fixed Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Oct 24 16:39:10 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 24 16:38:40 CEST 2007 - ug(a)suse.de + +- API Call to Storage fixed + +------------------------------------------------------------------- Tue Oct 2 16:34:15 CEST 2007 - ug(a)suse.de - partitioning documentation fixed Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Wed Oct 24 16:39:10 2007 @@ -197,7 +197,7 @@ { if (StorageDevices::FloppyReady() && Scheme == "floppy") { - WFM::Execute(.local.mount, [StorageDevices::FloppyDevice, mount_point]); + WFM::Execute(.local.mount, [StorageDevices::FloppyDevice(), mount_point]); if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0