[yast-commit] r44480 - in /trunk/qt: ./ package/ src/ src/icons/ src/pkg/

Author: coolo Date: Fri Feb 15 08:35:48 2008 New Revision: 44480 URL: http://svn.opensuse.org/viewcvs/yast?rev=44480&view=rev Log: split out yast2-qt-devel and yast2-qt-pkg Added: trunk/qt/src/YQPackageSelectorPluginIf.h - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginIf.h trunk/qt/src/YQPackageSelectorPluginStub.cc - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.cc trunk/qt/src/YQPackageSelectorPluginStub.h - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/YQPackageSelectorPluginStub.h trunk/qt/src/icons/ (props changed) - copied from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/ trunk/qt/src/icons/autodel.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/autodel.xpm trunk/qt/src/icons/autodel_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/autodel_disabled.xpm trunk/qt/src/icons/autoinstall.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/autoinstall.xpm trunk/qt/src/icons/autoinstall_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/autoinstall_disabled.xpm trunk/qt/src/icons/autoupdate.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/autoupdate.xpm trunk/qt/src/icons/autoupdate_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/autoupdate_disabled.xpm trunk/qt/src/icons/checklist_off.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/checklist_off.xpm trunk/qt/src/icons/checklist_on.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/checklist_on.xpm trunk/qt/src/icons/del.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/del.xpm trunk/qt/src/icons/del_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/del_disabled.xpm trunk/qt/src/icons/delete_conflict.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/delete_conflict.xpm trunk/qt/src/icons/install.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/install.xpm trunk/qt/src/icons/install_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/install_disabled.xpm trunk/qt/src/icons/keepinstalled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/keepinstalled.xpm trunk/qt/src/icons/keepinstalled_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/keepinstalled_disabled.xpm trunk/qt/src/icons/noinst.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/noinst.xpm trunk/qt/src/icons/noinst_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/noinst_disabled.xpm trunk/qt/src/icons/normal_conflict.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/normal_conflict.xpm trunk/qt/src/icons/protected.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/protected.xpm trunk/qt/src/icons/protected_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/protected_disabled.xpm trunk/qt/src/icons/satisfied.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/satisfied.xpm trunk/qt/src/icons/sel_autodel.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/sel_autodel.xpm trunk/qt/src/icons/sel_autodel_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/sel_autodel_disabled.xpm trunk/qt/src/icons/sel_autoinstall.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/sel_autoinstall.xpm trunk/qt/src/icons/sel_autoinstall_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/sel_autoinstall_disabled.xpm trunk/qt/src/icons/sel_autoupdate.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/sel_autoupdate.xpm trunk/qt/src/icons/sel_autoupdate_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/sel_autoupdate_disabled.xpm trunk/qt/src/icons/select_conflict.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/select_conflict.xpm trunk/qt/src/icons/step_current.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/step_current.xpm trunk/qt/src/icons/step_done.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/step_done.xpm trunk/qt/src/icons/step_todo.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/step_todo.xpm trunk/qt/src/icons/stop.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/stop.xpm trunk/qt/src/icons/taboo.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/taboo.xpm trunk/qt/src/icons/taboo_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/taboo_disabled.xpm trunk/qt/src/icons/tree_minus.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/tree_minus.xpm trunk/qt/src/icons/tree_plus.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/tree_plus.xpm trunk/qt/src/icons/unresolvable_conflict.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/unresolvable_conflict.xpm trunk/qt/src/icons/update.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/update.xpm trunk/qt/src/icons/update_disabled.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/update_disabled.xpm trunk/qt/src/icons/viewmag.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/viewmag.xpm trunk/qt/src/icons/warning_sign.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/warning_sign.xpm trunk/qt/src/icons/zoom-in.xpm - copied unchanged from r44477, branches/tmp/coolo/split_qt_pkg/qt/src/icons/zoom-in.xpm Removed: trunk/qt/src/YQPackageSelectorPlugin.cc trunk/qt/src/YQPackageSelectorPlugin.h trunk/qt/src/pkg/ Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/CMakeLists.txt trunk/qt/src/QY2HelpDialog.cc trunk/qt/src/YQApplication.cc trunk/qt/src/YQApplication.h trunk/qt/src/YQIconPool.cc trunk/qt/src/YQOptionalWidgetFactory.cc trunk/qt/src/YQOptionalWidgetFactory.h trunk/qt/src/YQTable.h trunk/qt/src/YQTimezoneSelector.cc trunk/qt/src/YQWidgetFactory.cc trunk/qt/src/YQWidgetFactory.h trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Fri Feb 15 08:35:48 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "25") +SET(VERSION_PATCH "26") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Fri Feb 15 08:35:48 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 15 08:35:48 CET 2008 - coolo@suse.de + +- split out yast2-qt-pkg + +------------------------------------------------------------------- Fri Feb 8 17:26:17 CET 2008 - tgoettlicher@suse.de - Made popup dialogs modal Modified: trunk/qt/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/CMakeLists.txt?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/CMakeLists.txt (original) +++ trunk/qt/src/CMakeLists.txt Fri Feb 15 08:35:48 2008 @@ -47,7 +47,7 @@ YQMultiProgressMeter.cc YQMultiSelectionBox.cc YQOptionalWidgetFactory.cc - YQPackageSelectorPlugin.cc + YQPackageSelectorPluginStub.cc YQPartitionSplitter.cc YQProgressBar.cc YQPushButton.cc @@ -74,6 +74,73 @@ YQBusyIndicator.cc ) +SET( yast_qt_HEADERS + QY2CharValidator.h + QY2ComboTabWidget.h + QY2DiskUsageList.h + QY2HelpDialog.h + QY2ListView.h + QY2Settings.h + QY2Styler.h + utf8.h + Y2CCQt.h + YFrameBuffer.h + YQAlignment.h + YQApplication.h + YQBarGraph.h + YQBusyIndicator.h + YQCheckBoxFrame.h + YQCheckBox.h + YQComboBox.h + YQDateField.h + YQDialog.h + YQDownloadProgress.h + YQDumbTab.h + YQEmpty.h + YQFrame.h + YQGenericButton.h + YQi18n.h + YQIconPool.h + YQImage.h + YQInputField.h + YQIntField.h + YQLabel.h + YQLayoutBox.h + YQLogView.h + YQMainWinDock.h + YQMenuButton.h + YQMultiLineEdit.h + YQMultiProgressMeter.h + YQMultiSelectionBox.h + YQOptionalWidgetFactory.h + YQPackageSelectorPluginIf.h + YQPackageSelectorPluginStub.h + YQPartitionSplitter.h + YQProgressBar.h + YQPushButton.h + YQRadioButtonGroup.h + YQRadioButton.h + YQReplacePoint.h + YQRichText.h + YQSelectionBox.h + YQSignalBlocker.h + YQSlider.h + YQSpacing.h + YQSquash.h + YQTable.h + YQTimeField.h + YQTimezoneSelector.h + YQTree.h + YQUIComponent.h + YQUI.h + YQWidgetCaption.h + YQWidgetFactory.h + YQWizardButton.h + YQWizard.h +) + +INSTALL( FILES ${yast_qt_HEADERS} DESTINATION "${YAST_INCLUDE_DIR}/yast2-qt" ) + QT4_AUTOMOC(${qt_yast_plugin_SRCS}) QT4_WRAP_UI(qt_yast_plugin_SRCS QHelpDialog.ui) @@ -85,17 +152,18 @@ ADD_LIBRARY( py2qt SHARED ${qt_yast_plugin_SRCS}) TARGET_LINK_LIBRARIES( py2qt ${YAST_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt ${YAST_YUI_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt ${YAST_YCP_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt ${QT_QTCORE_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt ${QT_QTGUI_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt ${YAST_PLUGIN_UI_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt dl X11 ) SET_TARGET_PROPERTIES( py2qt PROPERTIES SOVERSION 2 ) +#SET_TARGET_PROPERTIES( py2qt PROPERTIES LINK_FLAGS -Wl,--no-undefined ) INSTALL(TARGETS py2qt LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) INSTALL(FILES lang_fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/share/YaST2/data ) -ADD_SUBDIRECTORY(pkg) - #SET_TARGET_PROPERTIES( y2lang_qt PROPERTIES PREFIX "" ) Modified: trunk/qt/src/QY2HelpDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2HelpDialog.cc?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/QY2HelpDialog.cc (original) +++ trunk/qt/src/QY2HelpDialog.cc Fri Feb 15 08:35:48 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: trunk/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQApplication.cc (original) +++ trunk/qt/src/YQApplication.cc Fri Feb 15 08:35:48 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 ); @@ -678,5 +659,23 @@ YQUI::ui()->makeScreenShot( fileName ); } +YQPackageSelectorPluginStub * YQApplication::packageSelectorPlugin() +{ + static YQPackageSelectorPluginStub * plugin = 0; + + if ( ! plugin ) + { + plugin = new YQPackageSelectorPluginStub(); + + // 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 plugin; +} + + #include "YQApplication.moc" Modified: trunk/qt/src/YQApplication.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.h?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQApplication.h (original) +++ trunk/qt/src/YQApplication.h Fri Feb 15 08:35:48 2008 @@ -24,6 +24,7 @@ #include #include +#include "YQPackageSelectorPluginStub.h" #include "QY2Settings.h" #include "YApplication.h" @@ -205,7 +206,7 @@ * Return the package selector plugin singleton or creates it * (including loading the plugin lib) if it does not exist yet. **/ - static YQPackageSelectorPlugin * packageSelectorPlugin(); + static YQPackageSelectorPluginStub * packageSelectorPlugin(); /** * A mouse click with the wrong mouse button was detected - e.g., a right @@ -214,7 +215,7 @@ * 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 +237,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 +332,14 @@ // // Misc // - + bool _autoFonts; int _autoNormalFontSize; int _autoHeadingFontSize; bool _leftHandedMouse; bool _askedForLeftHandedMouse; - + }; Modified: trunk/qt/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQIconPool.cc?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQIconPool.cc (original) +++ trunk/qt/src/YQIconPool.cc Fri Feb 15 08:35:48 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: trunk/qt/src/YQOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQOptionalWidgetFactory.cc?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQOptionalWidgetFactory.cc (original) +++ trunk/qt/src/YQOptionalWidgetFactory.cc Fri Feb 15 08:35:48 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() { @@ -271,4 +249,24 @@ return new YQTimezoneSelector( parent, pixmap, timezones ); } +YWidget * +YQOptionalWidgetFactory::createPatternSelector(YWidget* parent, long modeFlags) +{ + YQPackageSelectorPluginStub * plugin = YQApplication::packageSelectorPlugin(); + + if ( plugin ) + return plugin->createPatternSelector( parent, modeFlags ); + else + return 0; +} +YWidget * +YQOptionalWidgetFactory::createSimplePatchSelector(YWidget* parent, long modeFlags) +{ + YQPackageSelectorPluginStub * plugin = YQApplication::packageSelectorPlugin(); + + if ( plugin ) + return plugin->createSimplePatchSelector( parent, modeFlags ); + else + return 0; +} Modified: trunk/qt/src/YQOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQOptionalWidgetFactory.h?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQOptionalWidgetFactory.h (original) +++ trunk/qt/src/YQOptionalWidgetFactory.h Fri Feb 15 08:35:48 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: Modified: trunk/qt/src/YQTable.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.h?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQTable.h (original) +++ trunk/qt/src/YQTable.h Fri Feb 15 08:35:48 2008 @@ -20,6 +20,7 @@ #define YQTable_h #include <QFrame> +#include "QY2ListView.h" #include "YTable.h" Modified: trunk/qt/src/YQTimezoneSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTimezoneSelector.cc?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQTimezoneSelector.cc (original) +++ trunk/qt/src/YQTimezoneSelector.cc Fri Feb 15 08:35:48 2008 @@ -34,7 +34,7 @@ #include <QDebug> #include <QToolTip> -#include "pkg/icons/zoom-in.xpm" +#include "icons/zoom-in.xpm" class YQTimezoneSelectorPrivate { Modified: trunk/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWidgetFactory.cc?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQWidgetFactory.cc (original) +++ trunk/qt/src/YQWidgetFactory.cc Fri Feb 15 08:35:48 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> @@ -289,20 +289,17 @@ return multiSelectionBox; } - - -YQPackageSelector * -YQWidgetFactory::createPackageSelector( YWidget * parent, long modeFlags ) +YPackageSelector* +YQWidgetFactory::createPackageSelector(YWidget* parent, long modeFlags) { - YQPackageSelectorPlugin * plugin = YQApplication::packageSelectorPlugin(); + YQPackageSelectorPluginStub * plugin = YQApplication::packageSelectorPlugin(); if ( plugin ) - return plugin->createPackageSelector( parent, modeFlags ); + return plugin->createPackageSelector( parent, modeFlags ); else - return 0; + return 0; } - YWidget * YQWidgetFactory::createPkgSpecial( YWidget * , const string & ) { Modified: trunk/qt/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWidgetFactory.h?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/src/YQWidgetFactory.h (original) +++ trunk/qt/src/YQWidgetFactory.h Fri Feb 15 08:35:48 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: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=44480&r1=44479&r2=44480&view=diff ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Fri Feb 15 08:35:48 2008 @@ -2,7 +2,8 @@ @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 +BuildRequires: cmake Summary: - BuildRequires: yast2-devtools >= 2.16.3 @@ -21,6 +22,14 @@ %description - +%package devel +Summary: - +Group: Development/Libraries +Requires: yast2-qt = %{version} + +%description devel +- + %prep %setup @@ -55,8 +64,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