Mailinglist Archive: yast-commit (1056 mails)

[tgoettlicher@xxxxxxxxxxxxxxxx]

Author: tgoettlicher
Date: Thu Feb  7 15:43:39 2008
New Revision: 44239

URL: http://svn.opensuse.org/viewcvs/yast?rev=44239&view=rev
Log:
without kde libs

Modified:
    branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/CMakeLists.txt
    branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp
    branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmoduleproxy.cpp
    branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp
    branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp

Modified: 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/CMakeLists.txt?rev=44239&r1=44238&r2=44239&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/CMakeLists.txt 
(original)
+++ branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/CMakeLists.txt 
Thu Feb  7 15:43:39 2008
@@ -1,5 +1,6 @@
+INCLUDE(${QT_USE_FILE})
 
-#ADD_SUBDIRECTORY( categories ) 
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 ########### next target ###############
 
@@ -14,21 +15,27 @@
    kcategorydrawer.cpp
    yservice.cpp
    kcmoduleproxy.cpp
+   kcmoduleinfo.cpp
+kcategorizedsortfilterproxymodel.cpp
    )
 
+QT4_AUTOMOC(${systemsettings_SRCS})
 
-KDE4_ADD_EXECUTABLE(systemsettings ${systemsettings_SRCS})
+#KDE4_ADD_EXECUTABLE(systemsettings ${systemsettings_SRCS})
+ADD_EXECUTABLE(systemsettings ${systemsettings_SRCS})
 
 # Uses KIO for KRun and KUtils for KCModuleInfo
-TARGET_LINK_LIBRARIES(systemsettings ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} )
+#TARGET_LINK_LIBRARIES(systemsettings ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} )
+TARGET_LINK_LIBRARIES(systemsettings ${QT_LIBRARIES} )
 
-INSTALL( TARGETS systemsettings DESTINATION ${BIN_INSTALL_DIR})
+#INSTALL( TARGETS systemsettings DESTINATION ${BIN_INSTALL_DIR})
+INSTALL( TARGETS systemsettings DESTINATION bin)
 
 
 ########### install files ###############
 
-install( FILES systemsettings.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR} )
-install( FILES systemsettingsui.rc DESTINATION 
${DATA_INSTALL_DIR}/systemsettings )
+#install( FILES systemsettings.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+#install( FILES systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR} )
+#install( FILES systemsettingsui.rc DESTINATION 
${DATA_INSTALL_DIR}/systemsettings )
 
 

Modified: 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp?rev=44239&r1=44238&r2=44239&view=diff
==============================================================================
--- 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp 
(original)
+++ 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmodulemodel.cpp 
Thu Feb  7 15:43:39 2008
@@ -220,3 +220,4 @@
     return QAbstractItemModel::headerData( section, orientation, role );
 }
 
+#include "kcmodulemodel.moc"

Modified: 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmoduleproxy.cpp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmoduleproxy.cpp?rev=44239&r1=44238&r2=44239&view=diff
==============================================================================
--- 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmoduleproxy.cpp 
(original)
+++ 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmoduleproxy.cpp 
Thu Feb  7 15:43:39 2008
@@ -50,7 +50,7 @@
 
 //#include <kvbox.h>
 
-#include "kcmoduleloader.h"
+//#include "kcmoduleloader.h"
 
 #ifdef tg
 #include "ksettingswidgetadaptor.h"
@@ -126,7 +126,7 @@
 KCModuleProxy::~KCModuleProxy()
 {
        deleteClient();
-       KCModuleLoader::unloadModule(moduleInfo());
+//tg   KCModuleLoader::unloadModule(moduleInfo());
 
        delete d_ptr;
 }
@@ -220,19 +220,21 @@
 
 KCModule::Buttons KCModuleProxy::buttons() const
 {
+/*tg
        if( realModule() )
                return realModule()->buttons();
        return KCModule::Buttons( KCModule::Help | KCModule::Default | 
KCModule::Apply );
+*/
 }
 
 QString KCModuleProxy::rootOnlyMessage() const
 {
-       return realModule() ? realModule()->rootOnlyMessage() : QString();
+//tg   return realModule() ? realModule()->rootOnlyMessage() : QString();
 }
 
 bool KCModuleProxy::useRootOnlyMessage() const
 {
-       return realModule() ? realModule()->useRootOnlyMessage() : true;
+//tg   return realModule() ? realModule()->useRootOnlyMessage() : true;
 }
 
 //KComponentData KCModuleProxy::componentData() const
@@ -273,3 +275,4 @@
 #include "kcmoduleproxy.moc"
 
 // vim: ts=4
+

Modified: 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp?rev=44239&r1=44238&r2=44239&view=diff
==============================================================================
--- 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp 
(original)
+++ 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/kcmultiwidget.cpp 
Thu Feb  7 15:43:39 2008
@@ -62,7 +62,7 @@
     : QDialog( parent ),
     d( new KCMultiWidgetPrivate )
 {
-    InitKIconDialog(i18n("Configure"), modality);
+//tg    InitKIconDialog(i18n("Configure"), modality);
     init();
 }
 
@@ -223,11 +223,11 @@
         //kWarning() << "Not authorised to load module" ;
         return;
     }
-#endif
 
     if(moduleinfo.service()->noDisplay()) {
         return;
     }
+#endif
     KCModuleProxy * module;
     QScrollArea * moduleScrollArea;
 #ifdef tg
@@ -256,10 +256,10 @@
         moduleScrollArea->setFrameStyle( QFrame::NoFrame );
         moduleScrollArea->viewport()->setAutoFillBackground(false);
         module->setAutoFillBackground(false);
-        QStringList parentComponents = moduleinfo.service()->property(
-                "X-KDE-System-Settings-Parent-Category" ).toStringList();
-        moduleParentComponents.insert( module,
-                parentComponents );
+//tg check        QStringList parentComponents = 
moduleinfo.service()->property(
+//tg check                "X-KDE-System-Settings-Parent-Category" 
).toStringList();
+//tg check        moduleParentComponents.insert( module,
+//tg check                parentComponents );
 
         connect(module, SIGNAL(changed(bool)), this, 
SLOT(clientChanged(bool)));
 #ifdef tg

Modified: 
branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp?rev=44239&r1=44238&r2=44239&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp 
(original)
+++ branches/tmp/tgoettlicher/yast2_2nd_rewrite/systemsettings/mainwindow.cpp 
Thu Feb  7 15:43:39 2008
@@ -453,6 +453,7 @@
 }
 
 void MainWindow::updateModuleHelp( KCModuleProxy *currentModule ) {
+#ifdef tg
        if ( currentModule->aboutData() ) {
                aboutModuleAction->setText(i18nc("Help menu->about 
<modulename>", "About %1",
                                                             
currentModule->moduleInfo().moduleName().replace("&","&&")));
@@ -462,12 +463,15 @@
        else {
                resetModuleHelp();
        }
+#endif
 }
 
 void MainWindow::resetModuleHelp() {
+#ifdef tg
        aboutModuleAction->setText(i18n("About Current Module"));
        aboutModuleAction->setIcon(QIcon());
        aboutModuleAction->setEnabled(false);
+#endif
 }
 
 void MainWindow::widgetChange() {
@@ -534,11 +538,13 @@
        } else {
 
                if(length>=1) {
-                       generalHitLabel->setText(i18np("%1 hit in General","%1 
hits in General",hitList[0]));
+//tg FIXME                     generalHitLabel->setText(i18np("%1 hit in 
General","%1 hits in General",hitList[0]));
+                       generalHitLabel->setText("hit in General");
                }
 
                if(length>=2) {
-                       advancedHitLabel->setText(i18np("%1 hit in 
Advanced","%1 hits in Advanced",hitList[1]));
+//tg FIXME                     advancedHitLabel->setText(i18np("%1 hit in 
Advanced","%1 hits in Advanced",hitList[1]));
+                       advancedHitLabel->setText("hit in Advanced");
                }
 
        }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx