[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kleopatra
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-11-02 16:05:29
Message-ID: 20101102160529.4BE2DAC8A6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192327 by mutz:

MainWindow: add a mobile variant

 M  +7 -3      CMakeLists.txt  
 M  +11 -0     main.cpp  
 M  +4 -4      mainwindow.h  
 A             mainwindow_mobile.cpp   [License: GPL (v2+) (+Qt exception)]
 A             mainwindow_mobile.h   mainwindow.h#1192326 [License: GPL (v2+) (+Qt exception)]


--- trunk/KDE/kdepim/kleopatra/CMakeLists.txt #1192326:1192327
@@ -24,6 +24,7 @@
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/libkleo
   ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/mobile/lib
   ${Boost_INCLUDE_DIR}
   ${QGPGME_INCLUDES}
   ${GPGME_INCLUDES} )
@@ -324,9 +325,12 @@
   set( _kleopatra_libkdepim_LIBS kdepim )
 endif(KDEPIM_ONLY_KLEO)
 
-set( _kleopatra_mainwindow_SRCS
-     mainwindow_desktop.cpp 
-)
+if (KDEPIM_MOBILE_UI)
+   set( _kleopatra_uiserver_extra_libs ${_kleopatra_uiserver_extra_libs} kdepimmobileui )
+   set( _kleopatra_mainwindow_SRCS mainwindow_mobile.cpp )
+else(KDEPIM_MOBILE_UI)
+   set( _kleopatra_mainwindow_SRCS mainwindow_desktop.cpp )
+endif(KDEPIM_MOBILE_UI)
 
 add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
 
--- trunk/KDE/kdepim/kleopatra/main.cpp #1192326:1192327
@@ -68,6 +68,10 @@
 
 #include <kleo/checksumdefinition.h>
 
+#ifdef KDEPIM_MOBILE_UI
+# include <kdeclarativeapplication.h>
+#endif
+
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -205,11 +209,18 @@
 
   KCmdLineArgs::init(argc, argv, &aboutData);
 
+#ifdef KDEPIM_MOBILE_UI
+  KDeclarativeApplication::preApplicationSetup( KleopatraApplication::commandLineOptions() );
+#else
   KCmdLineArgs::addCmdLineOptions( KleopatraApplication::commandLineOptions() );
+#endif
 
   qDebug() << "Statup timing:" << timer.elapsed() << "ms elapsed: Command line args created";
 
   KleopatraApplication app;
+#ifdef KDEPIM_MOBILE_UI
+  KDeclarativeApplication::postApplicationSetup();
+#endif
 
   qDebug() << "Startup timing:" << timer.elapsed() << "ms elapsed: Application created";
 
--- trunk/KDE/kdepim/kleopatra/mainwindow.h #1192326:1192327
@@ -33,10 +33,10 @@
 #ifndef __KLEOPATRA_MAINWINDOW_H__
 #define __KLEOPATRA_MAINWINDOW_H__
 
-//#ifdef KDEPIM_MOBILE_UI
-//# include "mainwindow_mobile.h"
-//#else
+#ifdef KDEPIM_MOBILE_UI
+# include "mainwindow_mobile.h"
+#else
 # include "mainwindow_desktop.h"
-//#endif
+#endif
 
 #endif /* __KLEOPATRA_MAINWINDOW_H__ */
[prev in list] [next in list] [prev in thread] [next in thread]