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

List:       kde-commits
Subject:    playground/base/nepomuk-kde/backupsync3/gui
From:       Vishesh Handa <handa.vish () gmail ! com>
Date:       2010-11-11 12:48:16
Message-ID: 20101111124816.41C3EAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195525 by vhanda:

* Combine the common gui static library and backup ( Too much of a hassel of keep it \
                seperate right now )
* Improved IdentifierModel 


 M  +21 -3     backup/CMakeLists.txt  
 M  +2 -2      backup/backupwizardpages.cpp  
 A             backup/filesystemtree.h   common/filesystemtree.h#1195314 [License: \
GPL (v3+)]  A             backup/identifiermodel.cpp   \
common/identifiermodel.cpp#1195314 [License: GPL (v3+)]  A             \
backup/identifiermodel.h   common/identifiermodel.h#1195314 [License: GPL (v3+)]  A   \
backup/identifiermodeltree.cpp   common/identifiermodeltree.cpp#1195314 [License: GPL \
(v3+)]  A             backup/identifiermodeltree.h   \
common/identifiermodeltree.h#1195314 [License: GPL (v3+)]  A             \
backup/identifierwidget.cpp   common/identifierwidget.cpp#1195314 [License: GPL \
(v3+)]  A             backup/identifierwidget.h   common/identifierwidget.h#1195314 \
[License: GPL (v3+)]  A             backup/mergermodel.cpp   \
common/mergermodel.cpp#1195314 [License: GPL (v3+)]  A             \
backup/mergermodel.h   common/mergermodel.h#1195314 [License: GPL (v3+)]  A           \
backup/mergerwidget.cpp   common/mergerwidget.cpp#1195314 [License: GPL (v3+)]  A     \
backup/mergerwidget.h   common/mergerwidget.h#1195314 [License: GPL (v3+)]  A         \
backup/mergerwidget.ui   common/mergerwidget.ui#1195314  A             \
backup/resolutiondialog.cpp   common/resolutiondialog.cpp#1195314 [License: GPL \
(v3+)]  A             backup/resolutiondialog.h   common/resolutiondialog.h#1195314 \
[License: GPL (v3+)]  D             common/filesystemtree.h  
 D             common/identifiermodel.cpp  
 D             common/identifiermodel.h  
 D             common/identifiermodeltree.cpp  
 D             common/identifiermodeltree.h  
 D             common/identifierwidget.cpp  
 D             common/identifierwidget.h  
 D             common/mergermodel.cpp  
 D             common/mergermodel.h  
 D             common/mergerwidget.cpp  
 D             common/mergerwidget.h  
 D             common/mergerwidget.ui  
 D             common/resolutiondialog.cpp  
 D             common/resolutiondialog.h  


--- trunk/playground/base/nepomuk-kde/backupsync3/gui/backup/CMakeLists.txt \
#1195524:1195525 @@ -12,8 +12,6 @@
   ${SOPRANO_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}
   ${NEPOMUK_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/../common/
-  ${CMAKE_BUILD_DIR}/../common/
   ${libnepomuksync_SOURCE_DIR}
   ${CMAKE_CURRENT_BUILD_DIR}
   )
@@ -25,9 +23,30 @@
   mergeconflictdelegate.cpp
   mergeconflictmodel.cpp
   main.cpp
+    identifiermodel.cpp
+    identifiermodeltree.cpp
+    identifierwidget.cpp
+    mergermodel.cpp
+    mergerwidget.cpp
+    resolutiondialog.cpp
   ../../service/dbusoperators.cpp
   )
 
+set_source_files_properties(
+  ../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.identifier.xml
+  PROPERTIES INCLUDE "../../service/dbusoperators.h")
+
+qt4_add_dbus_interface( NepomukBackup_GUI_SRCS
+                        \
../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.identifier.xml +          \
identifierinterface ) +qt4_add_dbus_interface( NepomukBackup_GUI_SRCS
+                        \
../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.merger.xml +              \
mergerinterface ) +
+kde4_add_ui_files( NepomukBackup_GUI_SRCS
+  mergerwidget.ui)
+  
+
 #----- DBus interfaces --------
 
 set_source_files_properties(
@@ -64,7 +83,6 @@
   ${KDE4_KIO_LIBS}
   ${NEPOMUK_LIBRARIES}
   ${SOPRANO_LIBRARIES}
-  NepomukBackupSyncGuiCommon
   )
 
 install(TARGETS nepomukbackup
--- trunk/playground/base/nepomuk-kde/backupsync3/gui/backup/backupwizardpages.cpp \
#1195524:1195525 @@ -20,8 +20,8 @@
 #include "backupwizardpages.h"
 #include "backupwizard.h"
 
-#include "../common/identifierwidget.h"
-#include "../common/mergerwidget.h"
+#include "identifierwidget.h"
+#include "mergerwidget.h"
 
 #include <KDebug>
 #include <KLineEdit>


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