- YaST Commits

[yast-commit] r38208 - in /trunk/yast2/library/network/src: refresh-srv-def-by-pkgs-trans.sh yast2-services-translations.ycp
by locilka＠svn.opensuse.org 30 May '07

30 May '07

Author: locilka Date: Wed May 30 15:24:17 2007 New Revision: 38208 URL: http://svn.opensuse.org/viewcvs/yast?rev=38208&view=rev Log: Script for getting strings for translations from firewall sysconfig service files has been adjusted to recognize wrong entries (those default ones left from template service). Modified: trunk/yast2/library/network/src/refresh-srv-def-by-pkgs-trans.sh trunk/yast2/library/network/src/yast2-services-translations.ycp Modified: trunk/yast2/library/network/src/refresh-srv-def-by-pkgs-trans.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/refres… ============================================================================== --- trunk/yast2/library/network/src/refresh-srv-def-by-pkgs-trans.sh (original) +++ trunk/yast2/library/network/src/refresh-srv-def-by-pkgs-trans.sh Wed May 30 15:24:17 2007 @@ -103,7 +103,9 @@ # ... ## Name: TAG_NAME=`grep -i ".*##[\t ]*Name:[\t ]*" $FILENAME | sed 's/^.*##[\t ]*[Nn][Aa][Mm][Ee]:[\t ]//' | sed 's/"/\\"/'` if [ "$TAG_NAME" == "" ]; then - echo "Something is wrong with file "$FILENAME", no 'Name:' tag found!" + echo "Something is wrong with file '"$FILENAME"', no 'Name:' tag found!" + elif [ "$TAG_NAME" == "template service" ]; then + echo "'Name:' not adjusted correctly in the '"$FILENAME"' file!" else echo " // TRANSLATORS: Name of Service (rpm: "$FILENAME"), can be used as check box, item in multiple selection box..." >> $Y2_NEWYCPFILE echo " tmpstring = _(\""$TAG_NAME"\");" >> $Y2_NEWYCPFILE @@ -113,7 +115,9 @@ # ... ## Description: TAG_DESCRIPTION=`grep -i ".*##[\t ]*Description:[\t ]*" $FILENAME | sed 's/^.*##[\t ]*[Dd][Ee][Ss][Cc][Rr][Ii][Pp][Tt][Ii][Oo][Nn]:[\t ]//' | sed 's/"/\\"/'` if [ "$TAG_DESCRIPTION" == "" ]; then - echo "Something is wrong with file "$FILENAME", no 'Description:' tag found!" + echo "Something is wrong with file '"$FILENAME"', no 'Description:' tag found!" + elif [ "$TAG_DESCRIPTION" == "opens ports for foo in order to allow bar" ]; then + echo "'Description:' not adjusted correctly in the '"$FILENAME"' file!" else echo " // TRANSLATORS: Description of a Service (rpm: "$FILENAME"), used as a common label or an item in table" >> $Y2_NEWYCPFILE echo " tmpstring = _(\""$TAG_DESCRIPTION"\");" >> $Y2_NEWYCPFILE Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/yast2-… ============================================================================== --- trunk/yast2/library/network/src/yast2-services-translations.ycp (original) +++ trunk/yast2/library/network/src/yast2-services-translations.ycp Wed May 30 15:24:17 2007 @@ -61,18 +61,6 @@ // TRANSLATORS: Description of a Service (rpm: dnsmasq-dns), used as a common label or an item in table tmpstring = _("Open ports for the dnsmasq DNS/DHCP server"); - // TRANSLATORS: Name of Service (rpm: iceccd), can be used as check box, item in multiple selection box... - tmpstring = _("template service"); - - // TRANSLATORS: Description of a Service (rpm: iceccd), used as a common label or an item in table - tmpstring = _("opens ports for foo in order to allow bar"); - - // TRANSLATORS: Name of Service (rpm: icecream-scheduler), can be used as check box, item in multiple selection box... - tmpstring = _("template service"); - - // TRANSLATORS: Description of a Service (rpm: icecream-scheduler), used as a common label or an item in table - tmpstring = _("opens ports for foo in order to allow bar"); - // TRANSLATORS: Name of Service (rpm: iscsitarget), can be used as check box, item in multiple selection box... tmpstring = _("iSCSI Target Daemon"); -- 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] r38207 - in /trunk/ncurses/src: NCPackageSelectorPlugin.cc NCPackageSelectorPlugin.h
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:58:15 2007 New Revision: 38207 URL: http://svn.opensuse.org/viewcvs/yast?rev=38207&view=rev Log: add NCPackageSelectorPlugin Added: trunk/ncurses/src/NCPackageSelectorPlugin.cc trunk/ncurses/src/NCPackageSelectorPlugin.h Added: trunk/ncurses/src/NCPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPackageSelectorPlu… ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPlugin.cc (added) +++ trunk/ncurses/src/NCPackageSelectorPlugin.cc Wed May 30 14:58:15 2007 @@ -0,0 +1,187 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: NCPackageSelectorPlugin.cc + + Author: Gabriele Mohr <gs(a)suse.de> + + +/-*/ + +#include "NCPackageSelectorPlugin.h" + +#include <ycp/y2log.h> +#include "NCPackageSelectorStart.h" +#include "NCPkgTable.h" + +#define y2log_component "ncurses-ui" + +#define PLUGIN_BASE_NAME "ncurses_pkg" + + +NCPackageSelectorPlugin::NCPackageSelectorPlugin() + : YPackageSelectorPlugin( PLUGIN_BASE_NAME ) +{ + if ( success() ) + { + y2milestone( "Loaded %s plugin successfully from %s", + PLUGIN_BASE_NAME, pluginLibFullPath().c_str() ); + } +} + + +NCPackageSelectorPlugin::~NCPackageSelectorPlugin() +{ + // NOP +} + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPackageSelectorPlugin::createPackageSelector +// METHOD TYPE : YWidget +// +// DESCRIPTION : Create NCPackageSelectorStart which reads the layout +// term of the package selection dialog, creates the widget +// tree and creates the NCPackageSelector. +// +YWidget * NCPackageSelectorPlugin::createPackageSelector( YWidget * parent, + YWidgetOpt & opt ) +{ + YWidget * w = 0; + try + { + w = new NCPackageSelectorStart ( dynamic_cast<NCWidget *>(parent), opt, + YD_HORIZ ); + } + catch (const std::exception & e) + { + UIERR << "Caught a std::exception: " << e.what () << endl; + } + catch (...) + { + UIERR << "Caught an unspecified exception" << endl; + } + return w; +} + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPackageSelectorPluign::createPkgSpecial +// METHOD TYPE : YWidget +// +// DESCRIPTION : creates special widgets used for the package selection +// dialog (which do not have a corresponding widget in qt-ui) +// +YWidget * NCPackageSelectorPlugin::createPkgSpecial( YWidget *parent, + YWidgetOpt &opt, + const YCPString &subwidget ) +{ + YCPString pkgTable( "pkgTable" ); + + YWidget * w = 0; + if ( subwidget->compare( pkgTable ) == YO_EQUAL ) + { + NCDBG << "Creating a NCPkgTable" << endl; + try + { + w = new NCPkgTable( dynamic_cast<NCWidget *>( parent ), opt ); + } + catch (const std::exception & e) + { + UIERR << "Caught a std::exception: " << e.what () << endl; + } + catch (...) + { + UIERR << "Caught an unspecified exception" << endl; + } + } + else + { + NCERR << "PkgSpecial( " << subwidget->toString() << " ) not found - take default `Label" << endl; + w = new NCLabel( dynamic_cast<NCWidget *>( parent ), opt, subwidget ); + } + + return w; +} + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPackageSelectorPLugin::runPkgSelection +// METHOD TYPE : void +// +// DESCRIPTION : Implementation of UI builtin RunPkgSelection() which +// has to be called after OpenDialog( `PackageSelector() ). +// +YCPValue NCPackageSelectorPlugin::runPkgSelection( YDialog * dialog, + YWidget * selector ) +{ + NCPackageSelectorStart * ncSelector = 0; + + if ( !dialog ) + { + UIERR << "ERROR package selection: No dialog existing." << endl; + return YCPVoid(); + } + if ( !selector ) + { + UIERR << "ERROR package selection: No package selector existing." << endl; + return YCPVoid(); + } + + ncSelector = dynamic_cast<NCPackageSelectorStart *>( selector ); + + bool result = true; + + // start event loop + NCursesEvent event = NCursesEvent::cancel; + + if ( ncSelector ) + { + try + { + ncSelector->showDefaultList(); + NCDialog * ncd = static_cast<NCDialog *>( dialog ); + + do + { + event = ncd->userInput(); + result = ncSelector->handleEvent( event ); + NCDBG << "Result: " << (result?"true":"false") << endl; + } + while ( event != NCursesEvent::cancel && result == true ); + } + catch (const std::exception & e) + { + UIERR << "Caught a std::exception: " << e.what () << endl; + } + catch (...) + { + UIERR << "Caught an unspecified exception" << endl; + } + } + else + { + UIERR << "No NCPackageSelectorStart existing" << endl; + } + + if ( !event.result.isNull() ) + { + UIMIL << "Return value: " << event.result->toString() << endl; + return event.result; + } + else + return YCPVoid(); +} + Added: trunk/ncurses/src/NCPackageSelectorPlugin.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPackageSelectorPlu… ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPlugin.h (added) +++ trunk/ncurses/src/NCPackageSelectorPlugin.h Wed May 30 14:58:15 2007 @@ -0,0 +1,74 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: NCPackageSelectorPlugin.h + + Author: Gabriele Mohr <gs(a)suse.de> + +/-*/ + +// -*- c++ -*- + +#ifndef NCPackageSelectorPlugin_h +#define NCPackageSelectorPlugin_h + +#include <YPackageSelectorPlugin.h> +#include <YDialog.h> + +#include <ycp/YCPString.h> + + +/** + * Simplified access to the ncurses UI's package selector plugin. + **/ +class NCPackageSelectorPlugin: public YPackageSelectorPlugin +{ +public: + + /** + * Constructor: Load the plugin library for the Qt package selector. + **/ + NCPackageSelectorPlugin(); + + /** + * Destructor. Calls dlclose() which will unload the plugin library if it + * is no longer used, i.e. if the reference count dlopen() uses reaches 0. + **/ + virtual ~NCPackageSelectorPlugin(); + + /** + * Create a package selector. + * Implemented from YPackageSelectorPlugin. + * + * This might return 0 if the plugin lib could not be loaded or if the + * appropriate symbol could not be located in the plugin lib. + **/ + virtual YWidget * createPackageSelector( YWidget * parent, + YWidgetOpt & opt ); + + /** + * Fills the PackageSelector widget (runs the package selection). + */ + virtual YCPValue runPkgSelection( YDialog *currentDialog, + YWidget * packageSelector ); + + /** + * Create a special widget + */ + virtual YWidget * createPkgSpecial( YWidget *parent, + YWidgetOpt &opt, + const YCPString &subwidget ); +}; + + + +#endif // NCPackageSelectorPlugin_h -- 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] r38206 - in /trunk/ncurses/src: ./ pkg/
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:57:31 2007 New Revision: 38206 URL: http://svn.opensuse.org/viewcvs/yast?rev=38206&view=rev Log: move NCPkgTable and NCPackageSelectorStart to src directory, adapt Makefiles, use NCPackageSelectorPlugin Added: trunk/ncurses/src/NCPackageSelectorStart.cc - copied unchanged from r38203, trunk/ncurses/src/pkg/NCPackageSelectorStart.cc trunk/ncurses/src/NCPackageSelectorStart.h - copied unchanged from r38203, trunk/ncurses/src/pkg/NCPackageSelectorStart.h trunk/ncurses/src/NCPkgTable.cc - copied unchanged from r38201, trunk/ncurses/src/pkg/NCPkgTable.cc trunk/ncurses/src/NCPkgTable.h - copied unchanged from r38201, trunk/ncurses/src/pkg/NCPkgTable.h Removed: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc trunk/ncurses/src/pkg/NCPackageSelectorStart.h trunk/ncurses/src/pkg/NCPkgTable.cc trunk/ncurses/src/pkg/NCPkgTable.h Modified: trunk/ncurses/src/Makefile.am trunk/ncurses/src/YNCursesUI.cc trunk/ncurses/src/YNCursesUI.h trunk/ncurses/src/pkg/Makefile.am Modified: trunk/ncurses/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/Makefile.am?rev=3820… ============================================================================== --- trunk/ncurses/src/Makefile.am (original) +++ trunk/ncurses/src/Makefile.am Wed May 30 14:57:31 2007 @@ -16,84 +16,154 @@ libpy2ncurses_la_LIBADD = \ -L$(libdir) \ - -Lpkg -lpy2ncurses_pkg \ -lyui \ -lncursesw -lpanelw + +#libpy2ncurses_la_LIBADD = \ +# -L$(libdir) \ +# -Lpkg -lpy2ncurses_pkg \ +# -lyui \ +# -lncursesw -lpanelw #liby2ncurses_la_LIBADD = $(libpy2ncurses_la_LIBADD) -libpy2ncurses_la_SOURCES = \ - stdutil.h \ - NCi18n.h \ - Y2Log.h Y2Log.cc \ - tnode.h position.h position.cc \ - YNCursesUI.cc YNCursesUI.h \ - NCtext.h NCtext.cc \ - NCstring.h NCstring.cc \ - stringutil.h stringutil.cc \ - lang2encoding.tab lang2encoding.cc \ - ncursesw.h ncursesw.cc \ - ncursesp.h ncursesp.cc \ - NCtypes.h NCtypes.cc \ - NCurses.h NCurses.cc \ - NCstyle.h NCstyle.cc \ - NCStyleDef.h NCStyleDef.cc \ - NCTableItem.h NCTableItem.cc \ - NCPad.h NCPad.cc \ - NCTreePad.h NCTreePad.cc \ - NCTablePad.h NCTablePad.cc \ - NCTextPad.h NCTextPad.cc \ - NCWidget.h NCWidget.cc \ - NCDialog.h NCDialog.cc \ - NCEmpty.h NCEmpty.cc \ - NCSpacing.h NCSpacing.cc \ - NCSquash.h NCSquash.cc \ - NCAlignment.h NCAlignment.cc \ - NCFrame.h NCFrame.cc \ - NCCheckBoxFrame.h NCCheckBoxFrame.cc \ - NCSplit.h NCSplit.cc \ - NCReplacePoint.h NCReplacePoint.cc \ - NCRadioButtonGroup.h NCRadioButtonGroup.cc \ - \ - NCImage.h NCImage.cc \ - NCCheckBox.h NCCheckBox.cc \ - NCLabel.h NCLabel.cc \ - NCProgressBar.h NCProgressBar.cc \ - NCMenuButton.h NCMenuButton.cc \ - NCPushButton.h NCPushButton.cc \ - NCRadioButton.h NCRadioButton.cc \ - NCTextEntry.h NCTextEntry.cc \ - NCIntField.h NCIntField.cc \ - NCComboBox.h NCComboBox.cc \ - NCPadWidget.h NCPadWidget.cc \ - NCRichText.h NCRichText.cc \ - NCSelectionBox.h NCSelectionBox.cc \ - NCMultiSelectionBox.h NCMultiSelectionBox.cc \ - NCTable.h NCTable.cc \ - NCTree.h NCTree.cc \ - NCLogView.h NCLogView.cc \ - NCMultiLineEdit.h NCMultiLineEdit.cc \ - NCFileSelection.h NCFileSelection.cc \ - NCAskForDirectory.h NCAskForDirectory.cc \ - NCAskForFile.h NCAskForFile.cc \ - \ - NCPopup.h NCPopup.cc \ - NCPopupTable.h NCPopupTable.cc \ - NCPopupList.h NCPopupList.cc \ - NCPopupMenu.h NCPopupMenu.cc \ - NCPopupTextEntry.h NCPopupTextEntry.cc \ - NCPopupInfo.h NCPopupInfo.cc \ - \ - NCstyle.braille.h NCstyle.mono.h \ - NCstyle.linux.h NCstyle.xterm.h \ - \ - Y2CCNCursesUI.cc Y2CCNCursesUI.h \ +noinst_HEADERS = \ + stdutil.h \ + NCi18n.h \ + Y2Log.h \ + tnode.h \ + position.h \ + YNCursesUI.h \ + NCPackageSelectorPlugin.h \ + NCPackageSelectorStart.h \ + NCPkgTable.h \ + NCtext.h \ + NCstring.h \ + stringutil.h \ + ncursesw.h \ + ncursesp.h \ + NCtypes.h \ + NCurses.h \ + NCstyle.h \ + NCStyleDef.h \ + NCTableItem.h \ + NCPad.h \ + NCTreePad.h \ + NCTablePad.h \ + NCTextPad.h \ + NCWidget.h \ + NCDialog.h \ + NCEmpty.h \ + NCSpacing.h \ + NCSquash.h \ + NCAlignment.h \ + NCFrame.h \ + NCCheckBoxFrame.h \ + NCSplit.h \ + NCReplacePoint.h \ + NCRadioButtonGroup.h \ + NCImage.h \ + NCCheckBox.h \ + NCLabel.h \ + NCProgressBar.h \ + NCMenuButton.h \ + NCPushButton.h \ + NCRadioButton.h \ + NCTextEntry.h \ + NCIntField.h \ + NCComboBox.h \ + NCPadWidget.h \ + NCRichText.h \ + NCSelectionBox.h \ + NCMultiSelectionBox.h \ + NCTable.h \ + NCTree.h \ + NCLogView.h \ + NCMultiLineEdit.h \ + NCFileSelection.h \ + NCAskForDirectory.h \ + NCAskForFile.h \ + NCPopup.h \ + NCPopupTable.h \ + NCPopupList.h \ + NCPopupMenu.h \ + NCPopupTextEntry.h \ + NCPopupInfo.h \ + NCstyle.braille.h NCstyle.mono.h \ + NCstyle.linux.h NCstyle.xterm.h \ + Y2CCNCursesUI.h \ YNCursesComponent.h +libpy2ncurses_la_SOURCES = \ + Y2Log.cc \ + position.cc \ + YNCursesUI.cc \ + \ + NCPackageSelectorPlugin.cc \ + NCPackageSelectorStart.cc \ + NCPkgTable.cc \ + \ + NCtext.cc \ + NCstring.cc \ + stringutil.cc \ + lang2encoding.tab lang2encoding.cc \ + ncursesw.cc \ + ncursesp.cc \ + NCtypes.cc \ + NCurses.cc \ + NCstyle.cc \ + NCStyleDef.cc \ + NCTableItem.cc \ + NCPad.cc \ + NCTreePad.cc \ + NCTablePad.cc \ + NCTextPad.cc \ + NCWidget.cc \ + NCDialog.cc \ + NCEmpty.cc \ + NCSpacing.cc \ + NCSquash.cc \ + NCAlignment.cc \ + NCFrame.cc \ + NCCheckBoxFrame.cc \ + NCSplit.cc \ + NCReplacePoint.cc \ + NCRadioButtonGroup.cc \ + NCImage.cc \ + NCCheckBox.cc \ + NCLabel.cc \ + NCProgressBar.cc \ + NCMenuButton.cc \ + NCPushButton.cc \ + NCRadioButton.cc \ + NCTextEntry.cc \ + NCIntField.cc \ + NCComboBox.cc \ + NCPadWidget.cc \ + NCRichText.cc \ + NCSelectionBox.cc \ + NCMultiSelectionBox.cc \ + NCTable.cc \ + NCTree.cc \ + NCLogView.cc \ + NCMultiLineEdit.cc \ + NCFileSelection.cc \ + NCAskForDirectory.cc \ + NCAskForFile.cc \ + \ + NCPopup.cc \ + NCPopupTable.cc \ + NCPopupList.cc \ + NCPopupMenu.cc \ + NCPopupTextEntry.cc \ + NCPopupInfo.cc \ + \ + Y2CCNCursesUI.cc + #libpy2ncurses_la_SOURCES = $(liby2ncurses_la_SOURCES) \ # Y2CCNCursesUI.cc Y2CCNCursesUI.h \ # YNCursesComponent.h -INCLUDES = -I$(srcdir)/pkg -I$(includedir) -I$(includedir)/yui -I$(includedir)/y2util/qt ${ZYPP_CFLAGS} +INCLUDES = -I$(srcdir)/pkg -I$(includedir) -I$(includedir)/yui -I$(includedir)/y2util/qt lang2encoding.cc: lang2encoding.tab ./lang2encoding.tab > lang2encoding.cc Modified: trunk/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.cc?rev=38… ============================================================================== --- trunk/ncurses/src/YNCursesUI.cc (original) +++ trunk/ncurses/src/YNCursesUI.cc Wed May 30 14:57:31 2007 @@ -59,8 +59,8 @@ #include "NCTree.h" #include "NCLogView.h" #include "NCMultiLineEdit.h" +#include "NCPackageSelectorPlugin.h" #include "NCPackageSelectorStart.h" -#include "NCPkgTable.h" #include "NCAskForDirectory.h" #include "NCAskForFile.h" #include "NCstring.h" @@ -573,106 +573,54 @@ // /////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : YNCursesUI::createPackageSelector -// METHOD TYPE : YWidget +// METHOD NAME : YNCursesUI::packageSelectorPlugin() +// METHOD TYPE : NCPackageSelectorPlugin // -// DESCRIPTION : Reads the layout term of the package selection dialog -// and creates the widget tree. +// DESCRIPTION : Create the package selector plugin // -YWidget * YNCursesUI::createPackageSelector( YWidget * parent, - YWidgetOpt & opt, - const YCPString & floppyDevice ) +NCPackageSelectorPlugin * YNCursesUI::packageSelectorPlugin() { - ONCREATE; - YWidget * w = 0; - try - { - w = new NCPackageSelectorStart (this, dynamic_cast<NCWidget *>(parent), opt, - YD_HORIZ, floppyDevice->value() ); - } - catch (const std::exception & e) - { - UIERR << "Caught a std::exception: " << e.what () << endl; - } - catch (...) + static NCPackageSelectorPlugin * plugin = 0; + + if ( ! plugin ) { - UIERR << "Caught an unspecified exception" << endl; + plugin = new NCPackageSelectorPlugin(); + + // This is a deliberate memory leak: If an application requires a + // PackageSelector, it is a package selection application by + // definition. In this case, the ncurses_pkg plugin is intentionally + // kept open to avoid repeated start-up cost of the plugin and libzypp. } - return w; + + return plugin; } /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : YNCursesUI::runPkgSelection -// METHOD TYPE : void +// METHOD NAME : YNCursesUI::createPackageSelector +// METHOD TYPE : YWidget // -// DESCRIPTION : Implementation of UI builtin RunPkgSelection() which -// has to be called after OpenDialog( `PackageSelector() ). +// DESCRIPTION : Calls NCPackageSelectorPlugin::createPackageSelector // -YCPValue YNCursesUI::runPkgSelection( YWidget * selector ) +YWidget * YNCursesUI::createPackageSelector( YWidget * parent, + YWidgetOpt & opt, + const YCPString & floppyDevice ) { - NCPackageSelectorStart * ncSelector = 0; - - YDialog *dialog = currentDialog(); - - if (!dialog) - { - UIERR << "ERROR package selection: No dialog existing." << endl; - } - else - { - ncSelector = dynamic_cast<NCPackageSelectorStart *>( selector ); - - // debug: dump the widget tree - dialog->dumpDialogWidgetTree(); - } - - bool result = true; - - // start event loop - NCursesEvent event = NCursesEvent::cancel; + ONCREATE; + YWidget * w = 0; - if ( ncSelector ) - { - try - { - ncSelector->showDefaultList(); - NCDialog * ncd = static_cast<NCDialog *>( dialog ); + NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); - do - { - event = ncd->userInput(); - result = ncSelector->handleEvent( event ); - NCDBG << "Result: " << (result?"true":"false") << endl; - } - while ( event != NCursesEvent::cancel && result == true ); - } - catch (const std::exception & e) - { - UIERR << "Caught a std::exception: " << e.what () << endl; - } - catch (...) - { - UIERR << "Caught an unspecified exception" << endl; - } - } - else + if ( plugin ) { - UIERR << "No NCPackageSelector existing" << endl; + w = plugin->createPackageSelector( parent, opt ); } - if ( !event.result.isNull() ) - { - UIMIL << "Return value: " << event.result->toString() << endl; - return event.result; - } - else - return YCPVoid(); + return w; } /////////////////////////////////////////////////////////////////// @@ -687,35 +635,57 @@ YWidget * YNCursesUI::createPkgSpecial( YWidget *parent, YWidgetOpt &opt, const YCPString &subwidget ) { ONCREATE; + YWidget * w = 0; + + NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); - YCPString pkgTable( "pkgTable" ); + if ( plugin ) + { + w = plugin->createPkgSpecial( parent, opt, subwidget ); + } + + return w; +} - YWidget * w = 0; - if ( subwidget->compare( pkgTable ) == YO_EQUAL ) +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : YNCursesUI::runPkgSelection +// METHOD TYPE : YCPValue +// +// DESCRIPTION : Implementation of UI builtin RunPkgSelection() which +// has to be called after OpenDialog( `PackageSelector() ). +// +YCPValue YNCursesUI::runPkgSelection( YWidget * selector ) +{ + YCPValue result = YCPVoid(); + + YDialog *dialog = YUI::currentDialog(); + NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); + + if ( !dialog ) { - NCDBG << "Creating a NCPkgTable" << endl; - try - { - w = new NCPkgTable( dynamic_cast<NCWidget *>( parent ), opt ); - } - catch (const std::exception & e) - { - UIERR << "Caught a std::exception: " << e.what () << endl; - } - catch (...) - { - UIERR << "Caught an unspecified exception" << endl; - } + UIERR << "ERROR package selection: No dialog rexisting." << endl; + return YCPVoid(); } - else + if ( !selector ) + { + UIERR << "ERROR package selection: No package selector existing." << endl; + return YCPVoid(); + } + + // debug: dump the widget tree + dialog->dumpDialogWidgetTree(); + if ( plugin ) { - NCERR << "PkgSpecial( " << subwidget->toString() << " ) not found - take default `Label" << endl; - w = new NCLabel( dynamic_cast<NCWidget *>( parent ), opt, subwidget ); + result = plugin->runPkgSelection( dialog, selector ); } - return w; + + return result; } + /////////////////////////////////////////////////////////////////// // // Modified: trunk/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.h?rev=382… ============================================================================== --- trunk/ncurses/src/YNCursesUI.h (original) +++ trunk/ncurses/src/YNCursesUI.h Wed May 30 14:57:31 2007 @@ -29,6 +29,7 @@ class YUI; class NCDialog; +class NCPackageSelectorPlugin; /** * @short YaST2 Component: NCursesUI user interface @@ -406,7 +407,12 @@ virtual YCPValue askForSaveFileName ( const YCPString & startWith, const YCPString & filter, const YCPString & headline ); - + + /** + * Returns the package selector plugin singleton of this UI or creates it + * (including loading the plugin lib) if it does not exist yet. + **/ + NCPackageSelectorPlugin * packageSelectorPlugin(); /** * UI-specific redrawScreen method. Modified: trunk/ncurses/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/Makefile.am?rev=… ============================================================================== --- trunk/ncurses/src/pkg/Makefile.am (original) +++ trunk/ncurses/src/pkg/Makefile.am Wed May 30 14:57:31 2007 @@ -17,24 +17,32 @@ -L$(libdir) -lyui \ ${ZYPP_LIBS} -noinst_HEADERS = $(wildcard *.h) +noinst_HEADERS = $(wildcard *.h) \ + NCPackageSelector.h \ + NCPkgSelMapper.h \ + NCPkgStatusStrategy.h \ + NCPkgPopupDeps.h \ + NCPkgPopupDiskspace.h \ + NCPkgPopupDescr.h \ + NCPkgPopupTable.h \ + NCPkgPopupSearch.h \ + NCPkgPopupSelection.h \ + NCPkgPopupTree.h \ + NCPkgNames.h \ + NCZypp.h libpy2ncurses_pkg_la_SOURCES = \ - NCPackageSelector.h NCPackageSelector.cc \ - NCPackageSelectorStart.h NCPackageSelectorStart.cc \ - \ - NCPkgSelMapper.h NCPkgSelMapper.cc \ - NCPkgStatusStrategy.h NCPkgStatusStrategy.cc \ - NCPkgPopupDeps.h NCPkgPopupDeps.cc \ - NCPkgPopupDiskspace.h NCPkgPopupDiskspace.cc \ - NCPkgPopupDescr.h NCPkgPopupDescr.cc \ - NCPkgPopupTable.h NCPkgPopupTable.cc \ - NCPkgPopupSearch.h NCPkgPopupSearch.cc \ - NCPkgPopupSelection.h NCPkgPopupSelection.cc \ - NCPkgPopupTree.h NCPkgPopupTree.cc \ - NCPkgTable.h NCPkgTable.cc \ - NCPkgNames.h NCPkgNames.cc \ - NCZypp.h + NCPackageSelector.cc \ + NCPkgSelMapper.cc \ + NCPkgStatusStrategy.cc \ + NCPkgPopupDeps.cc \ + NCPkgPopupDiskspace.cc \ + NCPkgPopupDescr.cc \ + NCPkgPopupTable.cc \ + NCPkgPopupSearch.cc \ + NCPkgPopupSelection.cc \ + NCPkgPopupTree.cc \ + NCPkgNames.cc INCLUDES = -I$(srcdir)/.. -I$(includedir) -I$(includedir)/yui ${ZYPP_CFLAGS} -- 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] r38205 - in /trunk/devtools: VERSION devtools/bin/check-textdomain devtools/bin/gettextdomains package/yast2-devtools.changes
by mvidner＠svn.opensuse.org 30 May '07

30 May '07

Author: mvidner Date: Wed May 30 14:56:56 2007 New Revision: 38205 URL: http://svn.opensuse.org/viewcvs/yast?rev=38205&view=rev Log: check-textdomain: Fixed --help and issues with empty lines in POTFILES (#278784). Modified: trunk/devtools/VERSION trunk/devtools/devtools/bin/check-textdomain trunk/devtools/devtools/bin/gettextdomains trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=38205&r1=38… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Wed May 30 14:56:56 2007 @@ -1 +1 @@ -2.15.0 +2.15.1 Modified: trunk/devtools/devtools/bin/check-textdomain URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/check-text… ============================================================================== --- trunk/devtools/devtools/bin/check-textdomain (original) +++ trunk/devtools/devtools/bin/check-textdomain Wed May 30 14:56:56 2007 @@ -5,8 +5,8 @@ . $CWD/gettextdomains -if [ -z $1 ]; then - echo "check-textdomain: no source-directory" +if ! [ -d "$1" ]; then + echo "Usage: check-textdomain source-directory" exit 1 else SRCDIR=$1 Modified: trunk/devtools/devtools/bin/gettextdomains URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/gettextdom… ============================================================================== --- trunk/devtools/devtools/bin/gettextdomains (original) +++ trunk/devtools/devtools/bin/gettextdomains Wed May 30 14:56:56 2007 @@ -44,7 +44,7 @@ done # we can specify additional files to .pot creation - POTFILES=`test -e $SRCDIR/POTFILES && sed "s,^,$SRCDIR/," < $SRCDIR/POTFILES` + POTFILES=`test -e $SRCDIR/POTFILES && grep -v '^$' $SRCDIR/POTFILES | sed "s,^,$SRCDIR/," ` DOMAINS="" ; for F in $TR_FILES $POTFILES; do Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Wed May 30 14:56:56 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 14:56:36 CEST 2007 - mvidner(a)suse.cz + +- check-textdomain: Fixed --help and issues with empty lines + in POTFILES (#278784). +- 2.15.1 + +------------------------------------------------------------------- Thu May 17 12:45:20 CEST 2007 - locilka(a)suse.cz - Added more words into the YaST dictionary. -- 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] r38204 - in /trunk/ncurses/src/pkg: NCPackageSelector.cc NCPackageSelector.h
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:53:52 2007 New Revision: 38204 URL: http://svn.opensuse.org/viewcvs/yast?rev=38204&view=rev Log: remove floppy device from params Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPackageSelector.h Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed May 30 14:53:52 2007 @@ -96,7 +96,7 @@ // // Constructor // -NCPackageSelector::NCPackageSelector( YNCursesUI * ui, const YWidgetOpt & opt, string floppyDevice ) +NCPackageSelector::NCPackageSelector( YNCursesUI * ui, const YWidgetOpt & opt ) : y2ui( ui ) , visibleInfo( YCPNull() ) , filterPopup( 0 ) Modified: trunk/ncurses/src/pkg/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.h Wed May 30 14:53:52 2007 @@ -118,9 +118,8 @@ * data needed for the package selection. * @param ui The NCurses UI * @param opt The widget options - * @param floppyDevice The floppy device */ - NCPackageSelector( YNCursesUI * ui, const YWidgetOpt & opt, string floppyDevice ); + NCPackageSelector( YNCursesUI * ui, const YWidgetOpt & opt ); /** * Destructor -- 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] r38203 - in /trunk/ncurses/src/pkg: NCPackageSelectorStart.cc NCPackageSelectorStart.h
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:53:16 2007 New Revision: 38203 URL: http://svn.opensuse.org/viewcvs/yast?rev=38203&view=rev Log: remove YNCursesUI from params Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc trunk/ncurses/src/pkg/NCPackageSelectorStart.h Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelectorStart.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelectorStart.cc Wed May 30 14:53:16 2007 @@ -40,16 +40,17 @@ // // DESCRIPTION : // -NCPackageSelectorStart::NCPackageSelectorStart( YNCursesUI *ui, - NCWidget * parent, - const YWidgetOpt & opt, YUIDimension dimension, - string floppyDevice ) +NCPackageSelectorStart::NCPackageSelectorStart( NCWidget * parent, + const YWidgetOpt & opt, + YUIDimension dimension ) : NCSplit( parent, opt, dimension ) , widgetRoot( 0 ) , packager( 0 ) , youMode ( false ) , updateMode ( false ) { + YNCursesUI * ui = YNCursesUI::ui(); + // set the textdomain setTextdomain( "packages" ); @@ -64,14 +65,14 @@ YCPTerm pkgLayout = YCPNull(); if ( youMode ) { - pkgLayout = readLayoutFile( ui, "/usr/share/YaST2/data/you_layout.ycp" ); + pkgLayout = readLayoutFile( "/usr/share/YaST2/data/you_layout.ycp" ); } else { - pkgLayout = readLayoutFile( ui, "/usr/share/YaST2/data/pkg_layout.ycp" ); + pkgLayout = readLayoutFile( "/usr/share/YaST2/data/pkg_layout.ycp" ); } - if ( ! pkgLayout.isNull() ) + if ( ! pkgLayout.isNull() && ui ) { YWidgetOpt childrenOpt( opt ); widgetRoot = (YContainerWidget *)ui->createWidgetTree( dynamic_cast<YWidget *>(parent), @@ -80,7 +81,7 @@ // create the PackageSelector (creation with 'new' is required because initialization // in the list of member variables causes problems with untranslated messages) - packager = new NCPackageSelector( ui, opt, floppyDevice ); + packager = new NCPackageSelector( ui, opt ); if ( widgetRoot ) { @@ -226,8 +227,7 @@ // // Read a layout file (containing a YCPTerm) // -YCPTerm NCPackageSelectorStart::readLayoutFile( YNCursesUI *ui, - const char * layoutFilename ) +YCPTerm NCPackageSelectorStart::readLayoutFile( const char * layoutFilename ) { YCPTerm pkgLayout = YCPNull(); Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelectorStart.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelectorStart.h Wed May 30 14:53:16 2007 @@ -67,9 +67,8 @@ * Constructor * creates the widget tree of the package selector */ - NCPackageSelectorStart( YNCursesUI *ui, NCWidget * parent, - const YWidgetOpt & opt, YUIDimension dimension, - string floppyDevice ); + NCPackageSelectorStart( NCWidget * parent, + const YWidgetOpt & opt, YUIDimension dimension ); /** * Destructor @@ -105,7 +104,7 @@ * @param layoutFilename The filename * @return YCPTerm */ - YCPTerm readLayoutFile( YNCursesUI *ui, const char * layoutFilename ); + YCPTerm readLayoutFile( const char * layoutFilename ); }; -- 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] r38202 - in /trunk/packager: package/yast2-packager.changes src/modules/SlideShow.ycp
by lslezak＠svn.opensuse.org 30 May '07

30 May '07

Author: lslezak Date: Wed May 30 14:38:23 2007 New Revision: 38202 URL: http://svn.opensuse.org/viewcvs/yast?rev=38202&view=rev Log: - do not show an installation source in the package installation dialog (slideshow) when there is no package to install (#277148) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SlideShow.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed May 30 14:38:23 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 30 14:16:09 CEST 2007 - lslezak(a)suse.cz + +- do not show an installation source in the package installation + dialog (slideshow) when there is no package to install (#277148) + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/packager/src/modules/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShow.y… ============================================================================== --- trunk/packager/src/modules/SlideShow.ycp (original) +++ trunk/packager/src/modules/SlideShow.ycp Wed May 30 14:38:23 2007 @@ -993,8 +993,7 @@ foreach ( list<integer> inst_src, remaining_sizes_per_cd_per_src, ``{ y2milestone( "src #%1: %2", src_no, inst_src ); - if ( ListSum( inst_src ) > 0 // Ignore sources from where there is nothing is to install - || src_no+1 == current_src_no ) // or if this happens to be the current source + if (ListSum(inst_src) > 0) // Ignore sources from where there is nothing is to install { if ( size( total_sizes_per_cd_per_src ) > 1 ) // Multiple sources? { -- 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] r38201 - in /trunk/yast2: package/yast2.changes scripts/save_y2logs
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:49:50 2007 New Revision: 38201 URL: http://svn.opensuse.org/viewcvs/yast?rev=38201&view=rev Log: Fixed bug #278790: save_y2logs complains about missing RPM DB Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/save_y2logs Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed May 30 13:49:50 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 30 13:48:27 CEST 2007 - sh(a)suse.de + +- Fixed bug #278790: save_y2logs complains about missing RPM DB + +------------------------------------------------------------------- Tue May 29 15:53:15 CEST 2007 - lslezak(a)suse.cz - updated metadata in the sysconfig file (#278612) Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=38… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Wed May 30 13:49:50 2007 @@ -51,9 +51,8 @@ fi RPM_LIST="rpm-qa" -# #270321, there is no rpmdb in inst-sys if [ -f /var/lib/rpm/Packages ]; then - rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' | sort >/var/log/$RPM_LIST + rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' 2>/dev/null | sort >/var/log/$RPM_LIST fi if [ -f /var/log/$RPM_LIST ]; then -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38200 - /tags/branch-SLE-10-SP1-2_13_3/product-creator/
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:48:51 2007 New Revision: 38200 URL: http://svn.opensuse.org/viewcvs/yast?rev=38200&view=rev Log: Created tag branch-SLE-10-SP1-2_13_3 for product-creator Added: tags/branch-SLE-10-SP1-2_13_3/product-creator/ - copied from r38199, 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] r38199 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi.ycp
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:48:43 2007 New Revision: 38199 URL: http://svn.opensuse.org/viewcvs/yast?rev=38199&view=rev Log: - select the boot image automaticaly, according to the base product (#270881) - 2.13.3 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp 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 Wed May 30 13:48:43 2007 @@ -1 +1 @@ -2.13.2 +2.13.3 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 Wed May 30 13:48:43 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 13:28:51 CEST 2007 - jsuchome(a)suse.cz + +- select the boot image automaticaly, according to the base product + (#270881) +- 2.13.3 + +------------------------------------------------------------------- Tue May 29 14:18:19 CEST 2007 - lslezak(a)suse.cz - 2.13.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Wed May 30 13:48:43 2007 @@ -157,7 +157,6 @@ string sw_selection = KiwiConfig["sw_selection"]:"image"; list items = [ `item (`id ("image"), _("Image"), sw_selection == "image"), -// `item (`id ("boot"), _("Boot"), sw_selection == "boot"), ]; if (kiwi_task == "xen") items = add (items, `item (`id ("xen"), _("XEN specific" ), sw_selection == "xen")); @@ -500,8 +499,6 @@ return dir; } - - /** * handler for 'root' directory browse */ @@ -667,7 +664,19 @@ if (Kiwi::PrepareAndCreate ()) { string dir = Kiwi::MoveOutput (KiwiConfig["iso-directory"]:""); - Popup::Message (sformat (success[kiwi_task]:"", dir)); + if (kiwi_task == "usb" && false) + { + // additional question (yes/no) + if (Popup::YesNo (sformat (success[kiwi_task]:"", dir) + _(" +Save the image to the stick now?"))) + { + NotImplementedHandler ("", $[ "ID" : ""]); + } + } + else + { + Popup::Message (sformat (success[kiwi_task]:"", dir)); + } ret = true; } } @@ -720,7 +729,6 @@ if (FileUtils::Exists (kiwi_configuration + "/root")) { -// KiwiConfig["root_dir"] = kiwi_configuration + "/root"; // read all entries from root_dir and save to list map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 -d %1/root/* 2>/dev/null", kiwi_configuration)); @@ -728,15 +736,10 @@ } if (FileUtils::Exists (kiwi_configuration + "/config")) { -// KiwiConfig["config_dir"] = kiwi_configuration + "/config"; map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 -d %1/config/* 2>/dev/null", kiwi_configuration)); KiwiConfig["config_dir"] = filter (string f, splitstring(out["stdout"]:"", "\n"),``(f!="")); } - /* - if (FileUtils::Exists (kiwi_configuration + "/images.sh")) - KiwiConfig["images_path"] = kiwi_configuration + "/images.sh"; - */ foreach (string file, [ "images.sh", "config.sh" ], { string file_path = kiwi_configuration + "/" + file; @@ -753,63 +756,43 @@ "openSUSE 10.2" : "suse-10.2", "openSUSE 10.3" : "suse-10.3", "SUSE Linux 10.1" : "suse-10.1", - "SUSE Linux Enterprise Server 10" : "sles10" + "SUSE Linux Enterprise Server 10" : "suse-SLES10", + "SUSE Linux Enterprise Desktop 10" : "suse-SLED10" ]; - string type = KiwiConfig["type",kiwi_task,"boot"]:""; - list l = splitstring (type, ","); - if (issubstring (type, "isoboot/") && kiwi_task == "iso") - { - KiwiConfig["isoboot"] = substring (l[0]:"", search (l[0]:"","isoboot/") + 8); - } - else if (issubstring (type, "xenboot/")) - { - KiwiConfig["xenboot"] = substring (l[0]:"", search (l[0]:"","xenboot/") + 8); - } - else if (issubstring (type, "usbboot/")) - { - KiwiConfig["usbboot"] = substring (l[0]:"", search (l[0]:"","usbboot/") + 8); - } - else if (issubstring (type, "vmxboot/")) - { - KiwiConfig["vmxboot"] = substring (l[0]:"", search (l[0]:"","vmxboot/") + 8); - } + map distproduct2boot = $[ + "openSUSE-10.2-CD-download" : "suse-10.2", + "openSUSE-10.2-dvd5-download" : "suse-10.2", + "openSUSE-10.3-dvd5-download" : "suse-10.3", + "openSUSE-10.3-CD-download" : "suse-10.3", + "SUSE-Linux-10.1-CD-download-x86" : "suse-10.1", + "SUSE-Linux-Enterprise-Server-i386" : "suse-SLES10", + "SUSE-Linux-Enterprise-Desktop-i386" : "suse-SLED10", + "SUSE-Linux-Enterprise-Server-SP1" : "suse-SLES10-SP1", + "SUSE-Linux-Enterprise-Desktop-SP1" : "suse-SLED10-SP1" + ]; + string boot_image = label2boot[content["LABEL"]:""]:""; + if (boot_image == "") + boot_image = distproduct2boot[content["DISTPRODUCT"]:""]:""; // guess some default boot image value - if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && content["LABEL"]:"" != "") + if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "") { -// FIXME label2boot mapping is not used because we are reading default configuration -// but could we ALWAYS replace the default string??? - KiwiConfig["isoboot"] = label2boot[content["LABEL"]:""]:""; + KiwiConfig["isoboot"] = boot_image; } else if (kiwi_task == "usb") { - if (!haskey (KiwiConfig, "usbboot") && content["LABEL"]:"" != "") - KiwiConfig["usbboot"] = label2boot[content["LABEL"]:""]:""; - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + if (!haskey (KiwiConfig, "usbboot") && boot_image != "") + KiwiConfig["usbboot"] = boot_image; } else if (kiwi_task == "vmx") { - if (!haskey (KiwiConfig, "vmxboot") && content["LABEL"]:"" != "") - KiwiConfig["vmxboot"] = label2boot[content["LABEL"]:""]:""; - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + if (!haskey (KiwiConfig, "vmxboot") && boot_image != "") + KiwiConfig["vmxboot"] = boot_image; } else if (kiwi_task == "xen") { - /* FIXME still no other image/xenboot image than suse-10.2... if (!haskey (KiwiConfig, "xenboot")) - KiwiConfig["xenboot"] = label2boot[content["LABEL"]:""]:""; - */ - // adapt the default buildhost-suse-10.1 for xen usage - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + KiwiConfig["xenboot"] = boot_image; } string name = KiwiConfig["name"]:""; if (!haskey (KiwiConfig, "specification")) @@ -833,6 +816,7 @@ "contents" : `HBox (`HSpacing(1), `VBox ( `VSpacing (0.2), + /* `HBox ( `HWeight (1, `HBox ( boot_image_widget () @@ -840,6 +824,7 @@ )), `HWeight (1, `VBox (`Label (""), `Left ("compressed"))) ), + */ `VSpacing (0.2), `HBox ( `HWeight (1, "version"), @@ -848,46 +833,18 @@ "sw_selection", `HBox ( `HWeight (1, `VBox ( -// `Left (`Label (_("Software for image"))), "rt_sw", `Right ("configure_sw") `Left (`Label (_("Installed software"))), "rt_sw", `Right ("configure_sw") )), `HWeight (1, "ignore") - /* - `VBox ( - `Left (`Label (_("Packages to ignore"))), - "rt_sw_ignore", - `Right ("configure_sw_ignore") - ) - */ - /* - `VBox ( - `Left (`Label (_("Software for build"))), - "rt_sw_boot", - `Right ("configure_sw_boot") - ) - */ ), - /* - `HBox ( - "output_dir", - `VBox (`Label (""), "browse_output_dir") - ), - */ `VSpacing (0.2) ), `HSpacing(1)), "widget_names" : [ -// "isoboot", - boot_image_widget (), -// "configure_boot", - "compressed", "version", "size", "sizeunit", "sw_selection", "rt_sw", "configure_sw", "ignore", -// "rt_sw_ignore", "configure_sw_ignore", -// "rt_sw_boot", "configure_sw_boot", -// "output_dir", "browse_output_dir", ], ], "description" : $[ @@ -930,27 +887,12 @@ `VBox ( "general_scripts", `VSpacing (0.2), - /* - `HBox ( - "autoyast_path", - `VBox (`Label (""), "browse_autoyast") - ), - */ - /* - `HBox ( - "images_path", - `VBox (`Label (""), "browse_images_path") - ), - */ `HBox ("config.sh", `Bottom ("import_config.sh")), `HBox ("images.sh", `Bottom ("import_images.sh")), `VSpacing (0.2) ), `HSpacing (1)), "widget_names" : [ "general_scripts", -// "root_dir", "browse_root_dir", "config_dir", "browse_config_dir", -// "autoyast_path", "browse_autoyast", -// "images_path", "browse_images_path", "config.sh", "import_config.sh", "images.sh", "import_images.sh", ], @@ -962,12 +904,6 @@ `VBox ( "general_directories", `VSpacing (0.2), - /* - `HBox ( - "root_dir", - `VBox (`Label (""), "browse_root_dir") - ), - */ "root_dir_table", `VSpacing (0.2), `HBox ("root_dir_add", `Left ("root_dir_delete")), @@ -976,26 +912,12 @@ `VSpacing (0.2), `HBox ("config_dir_add", `Left ("config_dir_delete")), `VSpacing (0.2), - /* - `HBox ( - "config_dir", - `VBox (`Label (""), "browse_config_dir") - ), - */ - /* - `HBox ( - "autoyast_path", - `VBox (`Label (""), "browse_autoyast") - ), - */ `VSpacing (0.2) ), `HSpacing (1)), "widget_names" : [ "general_directories", -// "root_dir", "browse_root_dir", "root_dir_table", "root_dir_add", "root_dir_delete", "config_dir_table", "config_dir_add", "config_dir_delete", -// "config_dir", "browse_config_dir", ], ], ]; @@ -1247,7 +1169,6 @@ "no_help" : true, "handle" : HandleDeleteFromConfigDir, ], - "config.sh" : $[ "widget" : `multi_line_edit, // textentry label @@ -1293,24 +1214,6 @@ "help" : "", "handle" : HandleBrowseAutoYaSTFile ], - /* - "images_path" : $[ - "widget" : `textentry, - // textentry label - "label" : _("Pat&h to cleanup script"), - "help" : _("<p>Choose the path to optional <b>cleanup script</b> (<tt>images.sh</tt>). This script is called at the beginning of the image creation process.</p>"), - "init" : InitDescription, - "store" : StoreDescription, - "handle" : HandleDescription, - ], - "browse_images_path": $[ - "widget" : `push_button, - // push button label - "label" : _("Brows&e..."), - "help" : "", - "handle" : HandleBrowseImagesFile - ], - */ "images.sh" : $[ "widget" : `multi_line_edit, // textentry label @@ -1436,7 +1339,7 @@ // dialog caption "usb" : _("USB stick Image Configuration"), // button label - "vmx" : _("Virtual Disk Image Image"), + "vmx" : _("Virtual Disk Image"), ]; map next_button = $[ // button label -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0