[yast-commit] r44446 - in /branches/tmp/coolo/split_qt_pkg: qt-pkg/src/ qt/ qt/src/ qt/src/icons/ qt/src/pkg/

Author: coolo Date: Thu Feb 14 14:11:18 2008 New Revision: 44446 URL: http://svn.opensuse.org/viewcvs/yast?rev=44446&view=rev Log: trying to get yast2-qt on the knees Added: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/ (props changed) - copied from r44444, branches/tmp/coolo/split_qt_pkg/qt/src/pkg/ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelectorPlugin.cc - copied unchanged from r44445, trunk/qt/src/YQPackageSelectorPlugin.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelectorPlugin.h - copied unchanged from r44445, trunk/qt/src/YQPackageSelectorPlugin.h branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginIf.h - copied, changed from r44445, trunk/ncurses/src/NCPackageSelectorPluginIf.h branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.cc - copied, changed from r44445, trunk/ncurses/src/NCPackageSelectorPluginStub.cc branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.h - copied, changed from r44445, trunk/ncurses/src/NCPackageSelectorPluginStub.h branches/tmp/coolo/split_qt_pkg/qt/src/icons/ - copied from r44444, trunk/qt/src/pkg/icons/ Removed: branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPlugin.cc branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPlugin.h branches/tmp/coolo/split_qt_pkg/qt/src/pkg/ Modified: branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt branches/tmp/coolo/split_qt_pkg/qt/src/QY2HelpDialog.cc branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.cc branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.h branches/tmp/coolo/split_qt_pkg/qt/src/YQIconPool.cc branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.cc branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.h branches/tmp/coolo/split_qt_pkg/qt/src/YQTable.h branches/tmp/coolo/split_qt_pkg/qt/src/YQTimezoneSelector.cc branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.cc branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.h branches/tmp/coolo/split_qt_pkg/qt/yast2-qt.spec.in Modified: branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt Thu Feb 14 14:11:18 2008 @@ -47,7 +47,7 @@ YQMultiProgressMeter.cc YQMultiSelectionBox.cc YQOptionalWidgetFactory.cc - YQPackageSelectorPlugin.cc + YQPackageSelectorPluginStub.cc YQPartitionSplitter.cc YQProgressBar.cc YQPushButton.cc @@ -95,7 +95,5 @@ INSTALL(FILES lang_fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/share/YaST2/data ) -ADD_SUBDIRECTORY(pkg) - #SET_TARGET_PROPERTIES( y2lang_qt PROPERTIES PREFIX "" ) Modified: branches/tmp/coolo/split_qt_pkg/qt/src/QY2HelpDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/QY2HelpDialog.cc?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/QY2HelpDialog.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/QY2HelpDialog.cc Thu Feb 14 14:11:18 2008 @@ -3,7 +3,7 @@ #include <QDebug> #include <QTextObject> -#include "pkg/icons/viewmag.xpm" +#include "icons/viewmag.xpm" QY2HelpDialog::QY2HelpDialog( const QString& helpText, QWidget *parent ) : QDialog( parent ) Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.cc?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.cc Thu Feb 14 14:11:18 2008 @@ -36,7 +36,7 @@ #include "YQi18n.h" #include "YQApplication.h" -#include "YQPackageSelectorPlugin.h" +#include "YQPackageSelectorPluginStub.h" YQApplication::YQApplication() @@ -526,61 +526,42 @@ } -YQPackageSelectorPlugin * -YQApplication::packageSelectorPlugin() -{ - static YQPackageSelectorPlugin * plugin = 0; - - if ( ! plugin ) - { - plugin = new YQPackageSelectorPlugin(); - - // This is a deliberate memory leak: If an application requires a - // PackageSelector, it is a package selection application by - // definition. In this case, the qt_pkg plugin is intentionally kept - // open to avoid repeated start-up cost of the plugin and libzypp. - } - - return plugin; -} - - -int +int YQApplication::displayWidth() { return qApp->desktop()->width(); } -int +int YQApplication::displayHeight() { return qApp->desktop()->height(); } -int +int YQApplication::displayDepth() { return qApp->desktop()->depth(); } -long +long YQApplication::displayColors() { return 1L << qApp->desktop()->depth(); } -int +int YQApplication::defaultWidth() { return YQUI::ui()->defaultSize( YD_HORIZ ); } -int +int YQApplication::defaultHeight() { return YQUI::ui()->defaultSize( YD_VERT ); Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.h?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQApplication.h Thu Feb 14 14:11:18 2008 @@ -202,19 +202,13 @@ const QString & headline ); /** - * Return the package selector plugin singleton or creates it - * (including loading the plugin lib) if it does not exist yet. - **/ - static YQPackageSelectorPlugin * packageSelectorPlugin(); - - /** * A mouse click with the wrong mouse button was detected - e.g., a right * click on a push button. The user might be left-handed, but his mouse * might not (yet) be configured for left-handed use - e.g., during * installation. Ask him if he would like his mouse temporarily configured * as a left-handed mouse. * - * This status can be queried with YQApplication::leftHandedMouse(). + * This status can be queried with YQApplication::leftHandedMouse(). **/ void maybeLeftHandedUser(); @@ -236,21 +230,21 @@ /** * Change the (mouse) cursor to indicate busy status. - * + * * Reimplemented from YApplication. **/ virtual void busyCursor(); /** * Change the (mouse) cursor back from busy status to normal. - * + * * Reimplemented from YApplication. **/ virtual void normalCursor(); /** * Make a screen shot and save it to the specified file. - * + * * Reimplemented from YApplication. **/ virtual void makeScreenShot( const string & fileName ); @@ -331,14 +325,14 @@ // // Misc // - + bool _autoFonts; int _autoNormalFontSize; int _autoHeadingFontSize; bool _leftHandedMouse; bool _askedForLeftHandedMouse; - + }; Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQIconPool.cc?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQIconPool.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQIconPool.cc Thu Feb 14 14:11:18 2008 @@ -22,48 +22,48 @@ #include "YQIconPool.h" -#include "pkg/icons/autodel.xpm" -#include "pkg/icons/autodel_disabled.xpm" -#include "pkg/icons/autoinstall.xpm" -#include "pkg/icons/autoinstall_disabled.xpm" -#include "pkg/icons/autoupdate.xpm" -#include "pkg/icons/autoupdate_disabled.xpm" -#include "pkg/icons/del.xpm" -#include "pkg/icons/del_disabled.xpm" -#include "pkg/icons/install.xpm" -#include "pkg/icons/install_disabled.xpm" -#include "pkg/icons/keepinstalled.xpm" -#include "pkg/icons/keepinstalled_disabled.xpm" -#include "pkg/icons/noinst.xpm" -#include "pkg/icons/noinst_disabled.xpm" -#include "pkg/icons/protected.xpm" -#include "pkg/icons/protected_disabled.xpm" -#include "pkg/icons/sel_autodel.xpm" -#include "pkg/icons/sel_autodel_disabled.xpm" -#include "pkg/icons/sel_autoinstall.xpm" -#include "pkg/icons/sel_autoinstall_disabled.xpm" -#include "pkg/icons/sel_autoupdate.xpm" -#include "pkg/icons/sel_autoupdate_disabled.xpm" -#include "pkg/icons/taboo.xpm" -#include "pkg/icons/taboo_disabled.xpm" -#include "pkg/icons/update.xpm" -#include "pkg/icons/update_disabled.xpm" -#include "pkg/icons/tree_plus.xpm" -#include "pkg/icons/tree_minus.xpm" -#include "pkg/icons/warning_sign.xpm" -#include "pkg/icons/satisfied.xpm" - -#include "pkg/icons/normal_conflict.xpm" -#include "pkg/icons/select_conflict.xpm" -#include "pkg/icons/delete_conflict.xpm" -#include "pkg/icons/unresolvable_conflict.xpm" - -#include "pkg/icons/checklist_off.xpm" -#include "pkg/icons/checklist_on.xpm" - -#include "pkg/icons/step_current.xpm" -#include "pkg/icons/step_todo.xpm" -#include "pkg/icons/step_done.xpm" +#include "icons/autodel.xpm" +#include "icons/autodel_disabled.xpm" +#include "icons/autoinstall.xpm" +#include "icons/autoinstall_disabled.xpm" +#include "icons/autoupdate.xpm" +#include "icons/autoupdate_disabled.xpm" +#include "icons/del.xpm" +#include "icons/del_disabled.xpm" +#include "icons/install.xpm" +#include "icons/install_disabled.xpm" +#include "icons/keepinstalled.xpm" +#include "icons/keepinstalled_disabled.xpm" +#include "icons/noinst.xpm" +#include "icons/noinst_disabled.xpm" +#include "icons/protected.xpm" +#include "icons/protected_disabled.xpm" +#include "icons/sel_autodel.xpm" +#include "icons/sel_autodel_disabled.xpm" +#include "icons/sel_autoinstall.xpm" +#include "icons/sel_autoinstall_disabled.xpm" +#include "icons/sel_autoupdate.xpm" +#include "icons/sel_autoupdate_disabled.xpm" +#include "icons/taboo.xpm" +#include "icons/taboo_disabled.xpm" +#include "icons/update.xpm" +#include "icons/update_disabled.xpm" +#include "icons/tree_plus.xpm" +#include "icons/tree_minus.xpm" +#include "icons/warning_sign.xpm" +#include "icons/satisfied.xpm" + +#include "icons/normal_conflict.xpm" +#include "icons/select_conflict.xpm" +#include "icons/delete_conflict.xpm" +#include "icons/unresolvable_conflict.xpm" + +#include "icons/checklist_off.xpm" +#include "icons/checklist_on.xpm" + +#include "icons/step_current.xpm" +#include "icons/step_todo.xpm" +#include "icons/step_done.xpm" //Added by qt3to4: #include Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.cc?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.cc Thu Feb 14 14:11:18 2008 @@ -19,7 +19,7 @@ #include "YQOptionalWidgetFactory.h" #include "YQApplication.h" #include "YUIException.h" -#include "YQPackageSelectorPlugin.h" +#include "YQPackageSelectorPluginStub.h" #include "YQWizard.h" #include "YQTimezoneSelector.h" @@ -155,16 +155,6 @@ return true; } -YQPatternSelector * -YQOptionalWidgetFactory::createPatternSelector( YWidget * parent, long modeFlags ) -{ - YQPackageSelectorPlugin * plugin = YQApplication::packageSelectorPlugin(); - - if ( plugin ) - return plugin->createPatternSelector( parent, modeFlags ); - else - return 0; -} @@ -173,18 +163,6 @@ return true; } -YQSimplePatchSelector * -YQOptionalWidgetFactory::createSimplePatchSelector( YWidget * parent, long modeFlags ) -{ - YQPackageSelectorPlugin * plugin = YQApplication::packageSelectorPlugin(); - - if ( plugin ) - return plugin->createSimplePatchSelector( parent, modeFlags ); - else - return 0; -} - - bool YQOptionalWidgetFactory::hasMultiProgressMeter() { Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.h?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQOptionalWidgetFactory.h Thu Feb 14 14:11:18 2008 @@ -28,8 +28,6 @@ #include "YQDumbTab.h" #include "YQMultiProgressMeter.h" #include "YQPartitionSplitter.h" -#include "pkg/YQPatternSelector.h" -#include "pkg/YQSimplePatchSelector.h" #include "YQSlider.h" #include "YQTimeField.h" @@ -83,10 +81,10 @@ virtual YQBarGraph * createBarGraph ( YWidget * parent ); virtual bool hasPatternSelector(); - virtual YQPatternSelector * createPatternSelector ( YWidget * parent, long modeFlags = 0 ); + virtual YWidget * createPatternSelector ( YWidget * parent, long modeFlags = 0 ); virtual bool hasSimplePatchSelector(); - virtual YQSimplePatchSelector * createSimplePatchSelector( YWidget * parent, long modeFlags = 0 ); + virtual YWidget * createSimplePatchSelector( YWidget * parent, long modeFlags = 0 ); virtual bool hasMultiProgressMeter(); virtual YQMultiProgressMeter * createMultiProgressMeter( YWidget * parent, YUIDimension dim, const vector<float> & maxValues ); @@ -112,7 +110,7 @@ virtual bool hasTimezoneSelector(); virtual YTimezoneSelector * createTimezoneSelector( YWidget * parent, - const string & pixmap, + const string & pixmap, const map & timezones ); protected: Copied: branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginIf.h (from r44445, trunk/ncurses/src/NCPackageSelectorPluginIf.h) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginIf.h?p2=branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginIf.h&p1=trunk/ncurses/src/NCPackageSelectorPluginIf.h&r1=44445&r2=44446&rev=44446&view=diff ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPluginIf.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginIf.h Thu Feb 14 14:11:18 2008 @@ -10,26 +10,26 @@ | (c) SuSE Linux AG | \----------------------------------------------------------------------/ - File: NCPackageSelectorPluginIf.h + File: YQPackageSelectorPluginIf.h Author: Hedgehog Painter /-*/ -#ifndef NCPackageSelectorPluginIf_h -#define NCPackageSelectorPluginIf_h +#ifndef YQPackageSelectorPluginIf_h +#define YQPackageSelectorPluginIf_h #include #include #include -class NCPackageSelectorPluginIf +class YQPackageSelectorPluginIf { public: - virtual ~NCPackageSelectorPluginIf() = 0; + virtual ~YQPackageSelectorPluginIf() = 0; virtual YPackageSelector *createPackageSelector( YWidget *parent, long modeFlags ) = 0 ; @@ -37,5 +37,9 @@ virtual YWidget *createPkgSpecial (YWidget *parent, const string &subwidget ) = 0; + virtual YWidget *createPatternSelector( YWidget * parent, long modeFlags ) = 0; + + virtual YWidget *createSimplePatchSelector( YWidget * parent, long modeFlags ) = 0; + }; #endif Copied: branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.cc (from r44445, trunk/ncurses/src/NCPackageSelectorPluginStub.cc) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.cc?p2=branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.cc&p1=trunk/ncurses/src/NCPackageSelectorPluginStub.cc&r1=44445&r2=44446&rev=44446&view=diff ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPluginStub.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.cc Thu Feb 14 14:11:18 2008 @@ -12,26 +12,19 @@ File: NCPackageSelectorPluginStub.cc - Author: Hedgehog Painter + Author: Hedgehog Painter /-*/ -#include "NCPackageSelectorPluginStub.h" +#include "YQPackageSelectorPluginStub.h" -#define YUILogComponent "ncurses-ui" +#define YUILogComponent "qt-ui" #include "YUILog.h" -#include "NCWidget.h" -#include "NCLabel.h" -#include "NCDialog.h" -#include "NCPackageSelectorPluginIf.h" -//#include "NCPackageSelectorStart.h" -//#include "NCPkgTable.h" -#include "YNCursesUI.h" // NCtoY2Event -#define PLUGIN_BASE_NAME "ncurses_pkg" +#define PLUGIN_BASE_NAME "qt_pkg" -NCPackageSelectorPluginStub::NCPackageSelectorPluginStub() +YQPackageSelectorPluginStub::YQPackageSelectorPluginStub() : YPackageSelectorPlugin( PLUGIN_BASE_NAME ) { if ( success() ) @@ -42,11 +35,11 @@ } - impl = (NCPackageSelectorPluginIf*) locateSymbol("PSP"); + impl = (YQPackageSelectorPluginIf*) locateSymbol("PSP"); } -NCPackageSelectorPluginStub::~NCPackageSelectorPluginStub() +YQPackageSelectorPluginStub::~YQPackageSelectorPluginStub() { // NOP } @@ -54,29 +47,29 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPackageSelectorPluginStub::createPackageSelector +// METHOD NAME : YQPackageSelectorPluginStub::createPackageSelector // METHOD TYPE : YWidget // -// DESCRIPTION : Create NCPackageSelectorStart which reads the layout +// DESCRIPTION : Create YQPackageSelectorStart which reads the layout // term of the package selection dialog, creates the widget -// tree and creates the NCPackageSelector. +// tree and creates the YQPackageSelector. // -YPackageSelector * NCPackageSelectorPluginStub::createPackageSelector( YWidget * parent, +YPackageSelector * YQPackageSelectorPluginStub::createPackageSelector( YWidget * parent, long modeFlags ) { - return impl->createPackageSelector( parent, modeFlags ); + return impl->createPackageSelector( parent, modeFlags ); } /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPackageSelectorPluign::createPkgSpecial +// METHOD NAME : YQPackageSelectorPluign::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 * NCPackageSelectorPluginStub::createPkgSpecial( YWidget *parent, const string &subwidget ) +YWidget * YQPackageSelectorPluginStub::createPkgSpecial( YWidget *parent, const string &subwidget ) { return impl->createPkgSpecial( parent, subwidget ); } @@ -84,15 +77,15 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPackageSelectorPLugin::runPkgSelection +// METHOD NAME : YQPackageSelectorPLugin::runPkgSelection // METHOD TYPE : YEvent * // // DESCRIPTION : Implementation of UI builtin RunPkgSelection() which // has to be called after OpenDialog( `PackageSelector() ). // -YEvent * NCPackageSelectorPluginStub::runPkgSelection( YDialog * dialog, +YEvent * YQPackageSelectorPluginStub::runPkgSelection( YDialog * dialog, YWidget * selector ) { - return impl->runPkgSelection( dialog, selector ); + return impl->runPkgSelection( dialog, selector ); } Copied: branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.h (from r44445, trunk/ncurses/src/NCPackageSelectorPluginStub.h) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.h?p2=branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.h&p1=trunk/ncurses/src/NCPackageSelectorPluginStub.h&r1=44445&r2=44446&rev=44446&view=diff ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPluginStub.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.h Thu Feb 14 14:11:18 2008 @@ -10,7 +10,7 @@ | (c) SuSE Linux AG | \----------------------------------------------------------------------/ - File: NCPackageSelectorPluginStub.h + File: YQPackageSelectorPluginStub.h Author: Hedgehog Painter @@ -18,44 +18,44 @@ // -*- c++ -*- -#ifndef NCPackageSelectorPluginStub_h -#define NCPackageSelectorPluginStub_h +#ifndef YQPackageSelectorPluginStub_h +#define YQPackageSelectorPluginStub_h #include #include #include #include -#include "NCPackageSelectorPluginIf.h" +#include "YQPackageSelectorPluginIf.h" /** * Simplified access to the ncurses UI's package selector plugin. **/ -class NCPackageSelectorPluginIf; +class YQPackageSelectorPluginIf; -class NCPackageSelectorPluginStub: public YPackageSelectorPlugin +class YQPackageSelectorPluginStub: public YPackageSelectorPlugin { public: /** - * Constructor: Load the plugin library for the NCurses package selector. + * Constructor: Load the plugin library for the YQurses package selector. **/ - NCPackageSelectorPluginStub(); + YQPackageSelectorPluginStub(); /** * 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 ~NCPackageSelectorPluginStub(); + virtual ~YQPackageSelectorPluginStub(); /** * 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. + * appropriate symbol could not be located in the plugin lib. **/ virtual YPackageSelector * createPackageSelector( YWidget * parent, long modeFlags ); @@ -72,8 +72,8 @@ virtual YWidget * createPkgSpecial( YWidget *parent, const string &subwidget ); - NCPackageSelectorPluginIf *impl ; + YQPackageSelectorPluginIf *impl ; }; -#endif // NCPackageSelectorPluginStub_h +#endif // YQPackageSelectorPluginStub_h Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQTable.h?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQTable.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQTable.h Thu Feb 14 14:11:18 2008 @@ -20,6 +20,7 @@ #define YQTable_h #include <QFrame> +#include "QY2ListView.h" #include "YTable.h" Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQTimezoneSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQTimezoneSelector.cc?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQTimezoneSelector.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQTimezoneSelector.cc Thu Feb 14 14:11:18 2008 @@ -34,7 +34,7 @@ #include <QDebug> #include <QToolTip> -#include "pkg/icons/zoom-in.xpm" +#include "icons/zoom-in.xpm" class YQTimezoneSelectorPrivate { Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.cc?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.cc Thu Feb 14 14:11:18 2008 @@ -23,7 +23,7 @@ #include "YQWidgetFactory.h" #include "YQApplication.h" #include "YUIException.h" -#include "YQPackageSelectorPlugin.h" +#include "YQPackageSelectorPluginStub.h" #include "YQMainWinDock.h" #include <string> @@ -291,18 +291,6 @@ -YQPackageSelector * -YQWidgetFactory::createPackageSelector( YWidget * parent, long modeFlags ) -{ - YQPackageSelectorPlugin * plugin = YQApplication::packageSelectorPlugin(); - - if ( plugin ) - return plugin->createPackageSelector( parent, modeFlags ); - else - return 0; -} - - YWidget * YQWidgetFactory::createPkgSpecial( YWidget * , const string & ) { Modified: branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.h?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt/src/YQWidgetFactory.h Thu Feb 14 14:11:18 2008 @@ -38,7 +38,6 @@ #include "YQMenuButton.h" #include "YQMultiLineEdit.h" #include "YQMultiSelectionBox.h" -#include "pkg/YQPackageSelector.h" #include "YQProgressBar.h" #include "YQPushButton.h" #include "YQRadioButton.h" @@ -64,7 +63,7 @@ public: // Note: Using covariant return types for all createSomeWidget() methods // (returning YQSomeWidget where the base class declares virtual methods that - // return YSomeWidget) + // return YSomeWidget) // @@ -107,7 +106,7 @@ virtual YQLogView * createLogView ( YWidget * parent, const string & label, int visibleLines, int storedLines = 0 ); virtual YQMultiSelectionBox *createMultiSelectionBox( YWidget * parent, const string & label ); - virtual YQPackageSelector * createPackageSelector ( YWidget * parent, long modeFlags = 0 ); + virtual YPackageSelector * createPackageSelector ( YWidget * parent, long modeFlags = 0 ); virtual YWidget * createPkgSpecial ( YWidget * parent, const string & name ); // NCurses only, will throw exception in the Qt UI // Modified: branches/tmp/coolo/split_qt_pkg/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/yast2-qt.spec.in?rev=44446&r1=44445&r2=44446&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt/yast2-qt.spec.in (original) +++ branches/tmp/coolo/split_qt_pkg/qt/yast2-qt.spec.in Thu Feb 14 14:11:18 2008 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: libzypp-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer libqt4-devel sgml-skel update-desktop-files +BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer libqt4-devel sgml-skel update-desktop-files Summary: - BuildRequires: yast2-devtools >= 2.16.3 @@ -21,6 +21,14 @@ %description - +%package devel +Summary: - +Group: +Requires: yast2-qt = %{version} + +%description devel +- + %prep %setup @@ -55,8 +63,9 @@ %defattr (-, root, root) %_libdir/YaST2/plugin/libpy2qt.so.* %_libdir/YaST2/plugin/libpy2qt.so -%_libdir/YaST2/plugin/libpy2qt_pkg.so.* -%_libdir/YaST2/plugin/libpy2qt_pkg.so %_prefix/share/YaST2/data/lang_fonts +%files devel +%_includedir/* + %changelog -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org