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=38206&r1=38205&r2=38206&view=diff ============================================================================== --- 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=38206&r1=38205&r2=38206&view=diff ============================================================================== --- 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(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( 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( 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( 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( 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=38206&r1=38205&r2=38206&view=diff ============================================================================== --- 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=38206&r1=38205&r2=38206&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org