Author: dmacvicar Date: Thu Dec 18 16:44:13 2008 New Revision: 54276 URL: http://svn.opensuse.org/viewcvs/yast?rev=54276&view=rev Log: - remove the delegate until we create our own without the kcm stuff - add a kcm module Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/CMakeLists.txt branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.destop branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.h Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt?rev=54276&r1=54275&r2=54276&view=diff ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt Thu Dec 18 16:44:13 2008 @@ -15,12 +15,12 @@ main.cpp main_window.cpp kcategorizedview.cpp - menuitem.cpp + # menuitem.cpp kcategorydrawer.cpp kcategorizedsortfilterproxymodel.cpp - kcmodulemodel.cpp - moduleiconitem.cpp - kcmoduleinfo.cpp + # kcmodulemodel.cpp + # moduleiconitem.cpp + # kcmoduleinfo.cpp yqdesktopfilesmodel.cpp yqmodulegroupsmodel.cpp @@ -35,12 +35,12 @@ SET(yast2-control-center_HDRS main_window.h kcategorizedview.h - menuitem.h - kcmodulemodel.h + # menuitem.h + # kcmodulemodel.h kcategorydrawer.h kcategorizedsortfilterproxymodel.h - moduleiconitem.h - kcmoduleinfo.h + # moduleiconitem.h + # kcmoduleinfo.h kcategorizedview_p.h yqdesktopfilesmodel.h @@ -71,6 +71,12 @@ yqmodulegroupsmodel.cpp yqmodulesmodel.cpp ) + QT4_AUTOMOC(${MODELS_TEST_SRCS}) ADD_EXECUTABLE(models_test ${MODELS_TEST_SRCS}) -TARGET_LINK_LIBRARIES(models_test ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(models_test ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES}) + +FIND_PACKAGE(KDE4) +IF ( KDE4_FOUND ) + ADD_SUBDIRECTORY(kde) +ENDIF ( KDE4_FOUND ) Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/CMakeLists.txt?rev=54276&view=auto ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/CMakeLists.txt (added) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/CMakeLists.txt Thu Dec 18 16:44:13 2008 @@ -0,0 +1,13 @@ + +set(kcmyast_SRCS kcmyast.cpp) + +include_directories(${KDE4_INCLUDES}) + +kde4_add_plugin(kcm_yast ${kcmyast_SRCS}) +target_link_libraries(kcm_yast ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KUTILS_LIBRARY}) + +install(TARGETS kcm_yast DESTINATION ${PLUGIN_INSTALL_DIR} ) + +########### install files ############### +install( FILES kcmyast.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES emoticons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.cpp?rev=54276&view=auto ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.cpp (added) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.cpp Thu Dec 18 16:44:13 2008 @@ -0,0 +1,43 @@ + +#include <KAboutData> + +#include +#include + + +#include "kcmyast.h" + +K_PLUGIN_FACTORY(YaSTFactory, registerPlugin<KCMYaST>();) +K_EXPORT_PLUGIN(YaSTFactory("yast", "kcm_yast")) + +KCMYaST::KCMYaST(QWidget *parent, const QVariantList &args) + : KCModule(YaSTFactory::componentData(), parent, args) +{ + KAboutData *about = new KAboutData("kcm_yast", 0, ki18n("YaST"), "1.0"); + setAboutData(about); +// setButtons(Apply | Help); +} + +KCMYaST::~KCMYaST() +{ +} + +bool caseInsensitiveLessThan(const QString &s1, const QString &s2) +{ + return (QString::localeAwareCompare(s1, s2) < 0); +} + +void KCMYaST::load() +{ + emit changed(false); +} + +void KCMYaST::save() +{ +} + +void KCMYaST::defaults() +{ +// emit changed(true); + emit changed(false); +} Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.destop URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.destop?rev=54276&view=auto ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.destop (added) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.destop Thu Dec 18 16:44:13 2008 @@ -0,0 +1,13 @@ +[Desktop Entry] +Exec=kcmshell4 kcm_yast +Icon=yast +Type=Service +X-DocPath=kcontrol/emoticons/index.html + +X-KDE-ServiceTypes=KCModule,KCModuleInit +X-KDE-Library=kcm_yast +X-KDE-ParentApp=kcontrol +X-KDE-System-Settings-Parent-Category=computer-administration +X-KDE-Weight=110 + +Name=Advanced Administration (YaST) Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.h?rev=54276&view=auto ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.h (added) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kde/kcmyast.h Thu Dec 18 16:44:13 2008 @@ -0,0 +1,42 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ _____ _____ | +| \ \ / / / ___|_ _| | +| \ V /__ _\ `--. | | | +| \ // _` |`--. \ | | | +| | | (_| /\__/ / | | | +| \_/\__,_\____/ \_/ | +| | +\---------------------------------------------------------------------*/ + +#ifndef KCMYAST_H +#define KCMYAST_H + +#include <QStringList> + +#include + +/** + * Embeds the YaST main module list into + * a KDE KCM module + * + * @author Duncan Mac-Vicar P. + */ +class KCMYaST : public KCModule +{ + Q_OBJECT + +public: + /** + * reimplemented from KCModule + */ + KCMYaST(QWidget *parent, const QVariantList &args); + ~KCMYaST(); + virtual void load(); + virtual void save(); + virtual void defaults(); +}; + +#endif + + Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp?rev=54276&r1=54275&r2=54276&view=diff ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp Thu Dec 18 16:44:13 2008 @@ -28,7 +28,7 @@ #include "yqmodulesmodel.h" #include "yqmodulegroupsmodel.h" -#include "moduleiconitem.h" +//#include "moduleiconitem.h" class MainWindow::Private { @@ -89,7 +89,7 @@ // tv->setSpacing(KDialog::spacingHint()); d->modview->setCategoryDrawer( drawer ); d->modview->setViewMode( QListView::IconMode ); - d->modview->setItemDelegate( new ModuleIconItemDelegate( this ) ); + //d->modview->setItemDelegate( new ModuleIconItemDelegate( this ) ); d->modview->setMouseTracking( true ); d->modview->viewport()->setAttribute( Qt::WA_Hover ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org