Index: branches/work/kpilot/port-to-trunk/kpilot/dbFlagsEditor_base.ui.h
===================================================================
--- branches/work/kpilot/port-to-trunk/kpilot/dbFlagsEditor_base.ui.h	(revision 660700)
+++ branches/work/kpilot/port-to-trunk/kpilot/dbFlagsEditor_base.ui.h	(nonexistent)
@@ -1,15 +0,0 @@
-/****************************************************************************
-** ui.h extension file, included from the uic-generated form implementation.
-**
-** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
-** init() function in place of a constructor, and a destroy() function in
-** place of a destructor.
-*****************************************************************************/
-#include <ktimewidget.h>
-class KTimeWidget : public QWidget
-{
-public:
-	KTimeWidget(QWidget *p, const char *n) : QWidget(p,n) {};
-} ;
-

Property changes on: branches/work/kpilot/port-to-trunk/kpilot/dbFlagsEditor_base.ui.h
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/x-chdr
\ No newline at end of property
Index: branches/work/kpilot/port-to-trunk/kpilot/CMakeLists.txt
===================================================================
--- branches/work/kpilot/port-to-trunk/kpilot/CMakeLists.txt	(revision 660700)
+++ branches/work/kpilot/port-to-trunk/kpilot/CMakeLists.txt	(revision 660701)
@@ -1,161 +1,161 @@
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(
 	${CMAKE_BINARY_DIR}/lib
 	${CMAKE_SOURCE_DIR}/lib
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 add_subdirectory(icons)
 
 ###
 #
 # Settings (KConfigXT) shared between various parts of KPilot
 #
 set(settings_SRC
 	kpilotConfig.cc
 )
 
 kde4_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
 
 ###
 #
 # The KCM for KPilot, used by the config dialog and the embedding in Kontact
 #
 set(kcmpilot_SRCS
 	${settings_SRC}
 	kpilotConfigWizard.cc
 	dbSelectionDialog.cc
 	kpilotConfigDialog.cc
 	conduitConfigDialog.cc
 	kpilotProbeDialog.cc
 )
 
 set(kcmpilot_KCFGS
 	kpilotConfigWizard_address.kcfgc
 	#kpilotConfigWizard_notes.kcfgc
 	kpilotConfigWizard_vcal.kcfgc
 )
 
 set(kcmpilot_UIS
 	kpilotConfigDialog_device.ui
 	kpilotConfigDialog_sync.ui
 	kpilotConfigDialog_startup.ui
 	kpilotConfigDialog_viewers.ui
 	kpilotConfigDialog_backup.ui
 	kpilotConfigWizard_user.ui
 	kpilotConfigWizard_app.ui
 	dbSelection_base.ui
 )
 
 kde4_add_ui3_files(kcmpilot_SRCS ${kcmpilot_UIS})
 kde4_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS} )
 
 QT4_ADD_DBUS_INTERFACE(kcmpilot_SRCS org.kde.kpilot.daemon.xml kpilot_daemon_interface)
 
 
 kde4_automoc(${kcmpilot_SRCS})
 kde4_add_plugin(kcm_kpilot ${kcmpilot_SRCS})
 target_link_libraries(kcm_kpilot  kpilot ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS})
 
 
 ###
 #
 # Most simple daemon-like application: kpilotTest, which
 # runs whatever the command-line tells it to.
 #
 set(kpilotTest_SRCS
 	${settings_SRC}
 	hotSync.cc
 	logWidget.cc
 	pilotComponent.cc
 	main-test.cc
 )
 # Acts as a receiver for DCOP log messages
 qt4_add_dbus_adaptor(kpilotTest_SRCS org.kde.kpilot.logger.xml logFile.h LogFile  )
 
 #kde4_automoc(${kpilotTest_SRCS})
 
 #kde4_add_executable(kpilotTest ${kpilotTest_SRCS})
 #target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
 
 ###
 #
 # The real KPilot daemon.
 #
 set(kpilotDaemon_SRCS
 	${settings_SRC}
 	hotSync.cc
 	fileInstaller.cc
 	internalEditorAction.cc
 	logFile.cc
 	pilotDaemon.cc
 )
 
 qt4_add_dbus_adaptor( kpilotDaemon_SRCS org.kde.kpilot.logger.xml logFile.h LogFile  )
 qt4_add_dbus_adaptor( kpilotDaemon_SRCS org.kde.kpilot.daemon.xml pilotDaemon.h PilotDaemon  )
 QT4_ADD_DBUS_INTERFACE(kpilotDaemon_SRCS org.kde.kpilot.logger.xml logfile_interface)
 QT4_ADD_DBUS_INTERFACE(kpilotDaemon_SRCS org.kde.kpilot.kpilot.xml kpilot_interface)
 
 #kde4_automoc(${kpilotDaemon_SRCS})
 #kde4_add_executable(kpilotDaemon ${kpilotDaemon_SRCS})
 #target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
 
 ###
 #
 # The KPilot executable (viewer / editor / configuration).
 #
 set(kpilot_bin_SRCS
 	${settings_SRC}
 	logWidget.cc
 	kpilot.cc
 	dbviewerWidget.cc
 	dbFlagsEditor.cc
 	dbRecordEditor.cc
 	dbAppInfoEditor.cc
 	pilotComponent.cc
 	memoWidget.cc
 	addressWidget.cc
 	addressEditor.cc
 	datebookWidget.cc
 	todoWidget.cc
 	todoEditor.cc
 	fileInstaller.cc
 	fileInstallWidget.cc
 	listItems.cc
 )
 
 set(kpilot_UIS
-	#dbFlagsEditor_base.ui
+	dbFlagsEditor_base.ui
 	todoEditor_base.ui
 )
 
 kde4_add_ui3_files(kpilot_bin_SRCS ${kpilot_UIS})
 kde4_automoc(${kpilot_bin_SRCS})
 
 # Talks to the daemon. Listens as itself.
 qt4_add_dbus_adaptor( kpilot_bin_SRCS org.kde.kpilot.logger.xml logFile.h LogFile  )
 qt4_add_dbus_adaptor( kpilot_bin_SRCS org.kde.kpilot.kpilot.xml kpilot.h KPilotInstaller  )
 QT4_ADD_DBUS_INTERFACE(kpilot_bin_SRCS org.kde.kpilot.daemon.xml daemon_interface)
 
 kde4_add_executable(kpilot_bin ${kpilot_bin_SRCS})
 target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
 set_target_properties(kpilot_bin PROPERTIES OUTPUT_NAME kpilot)
 
 ######################### INSTALL STUFF #######################################
 
 #install(TARGETS kcm_kpilot  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 #install(TARGETS kpilot_bin kpilotDaemon  DESTINATION ${BIN_INSTALL_DIR})
 
 install( FILES kpilotui.rc DESTINATION ${DATA_INSTALL_DIR}/kpilot)
 
 install(FILES kpilot.desktop kpilotdaemon.desktop DESTINATION ${XDG_APPS_DIR})
 
 install(FILES kpilotconduit.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 install(FILES kpilot_config.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 install ( FILES kpilot.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
 
 install(FILES kpilot.kcfg DESTINATION ${KCFG_INSTALL_DIR})
Index: branches/work/kpilot/port-to-trunk/kpilot/dbFlagsEditor_base.ui
===================================================================
--- branches/work/kpilot/port-to-trunk/kpilot/dbFlagsEditor_base.ui	(revision 660700)
+++ branches/work/kpilot/port-to-trunk/kpilot/dbFlagsEditor_base.ui	(revision 660701)
@@ -1,376 +1,375 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>DBFlagsEditorWidget</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>DBFlagsEditorWidget</cstring>
     </property>
     <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
             <width>465</width>
             <height>353</height>
         </rect>
     </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>fDBNameLabel</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
                     <hsizetype>4</hsizetype>
                     <vsizetype>5</vsizetype>
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
             <property name="text">
                 <string>Database &amp;name:</string>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>fDBName</cstring>
             </property>
         </widget>
         <widget class="QLabel" row="1" column="3">
             <property name="name">
                 <cstring>fCreatorLabel</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
                     <hsizetype>4</hsizetype>
                     <vsizetype>5</vsizetype>
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
             <property name="text">
                 <string>&amp;Creator:</string>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>fCreator</cstring>
             </property>
         </widget>
         <widget class="QLabel" row="1" column="0">
             <property name="name">
                 <cstring>fTypeLabel</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
                     <hsizetype>4</hsizetype>
                     <vsizetype>5</vsizetype>
                     <horstretch>0</horstretch>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
             <property name="text">
                 <string>&amp;Type:</string>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>fType</cstring>
             </property>
         </widget>
         <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>fType</cstring>
             </property>
             <property name="maxLength">
                 <number>4</number>
             </property>
         </widget>
         <widget class="QLineEdit" row="1" column="4" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>fCreator</cstring>
             </property>
             <property name="maxLength">
                 <number>4</number>
             </property>
         </widget>
         <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>fDBFlagsGroup</cstring>
             </property>
             <property name="title">
                 <string>Database Flags</string>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>fRessourceDB</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Ressource database</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>fReadOnly</cstring>
                     </property>
                     <property name="text">
                         <string>Rea&amp;d-only</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>fBackupDB</cstring>
                     </property>
                     <property name="text">
                         <string>Database is &amp;backed up</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox" row="3" column="0">
                     <property name="name">
                         <cstring>fCopyProtect</cstring>
                     </property>
                     <property name="text">
                         <string>Copy &amp;protected</string>
                     </property>
                 </widget>
                 <spacer row="4" column="0">
                     <property name="name">
                         <cstring>spacer4</cstring>
                     </property>
                     <property name="orientation">
                         <enum>Vertical</enum>
                     </property>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
                     <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
             </grid>
         </widget>
         <widget class="QButtonGroup" row="2" column="5" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>fMiscFlagsGroup</cstring>
             </property>
             <property name="title">
                 <string>Misc Flags</string>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <spacer row="2" column="0">
                     <property name="name">
                         <cstring>spacer3</cstring>
                     </property>
                     <property name="orientation">
                         <enum>Vertical</enum>
                     </property>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
                     <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>60</height>
                         </size>
                     </property>
                 </spacer>
                 <widget class="QCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>fReset</cstring>
                     </property>
                     <property name="text">
                         <string>Reset after &amp;installation</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>fExcludeDB</cstring>
                     </property>
                     <property name="text">
                         <string>E&amp;xclude from sync</string>
                     </property>
                 </widget>
             </grid>
         </widget>
         <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="7">
             <property name="name">
                 <cstring>fTimeStampGroup</cstring>
             </property>
             <property name="title">
                 <string>Time Stamps</string>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <widget class="QLabel" row="0" column="0">
                     <property name="name">
                         <cstring>fCreationLabel</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
                             <hsizetype>4</hsizetype>
                             <vsizetype>5</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
                     <property name="text">
                         <string>Cr&amp;eation time:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>fCreationDate</cstring>
                     </property>
                 </widget>
                 <widget class="QLabel" row="1" column="0">
                     <property name="name">
                         <cstring>fModificationlabel</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Modification time:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>fModificationDate</cstring>
                     </property>
                 </widget>
                 <widget class="QLabel" row="2" column="0">
                     <property name="name">
                         <cstring>fBackupLabel</cstring>
                     </property>
                     <property name="text">
                         <string>Back&amp;up time:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>fBackupDate</cstring>
                     </property>
                 </widget>
-                <widget class="KTimeWidget" row="0" column="2">
+                <widget class="QTimeEdit" row="0" column="2">
                     <property name="name">
                         <cstring>fCreationTime</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
                             <hsizetype>4</hsizetype>
                             <vsizetype>5</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
                     <property name="focusPolicy">
                         <enum>StrongFocus</enum>
                     </property>
                 </widget>
-                <widget class="KTimeWidget" row="1" column="2">
+                <widget class="QTimeEdit" row="1" column="2">
                     <property name="name">
                         <cstring>fModificationTime</cstring>
                     </property>
                     <property name="focusPolicy">
                         <enum>StrongFocus</enum>
                     </property>
                 </widget>
-                <widget class="KTimeWidget" row="2" column="2">
+                <widget class="QTimeEdit" row="2" column="2">
                     <property name="name">
                         <cstring>fBackupTime</cstring>
                     </property>
                     <property name="focusPolicy">
                         <enum>StrongFocus</enum>
                     </property>
                 </widget>
                 <widget class="KDateWidget" row="2" column="1">
                     <property name="name">
                         <cstring>fBackupDate</cstring>
                     </property>
                     <property name="focusPolicy">
                         <enum>StrongFocus</enum>
                     </property>
                 </widget>
                 <widget class="KDateWidget" row="1" column="1">
                     <property name="name">
                         <cstring>fModificationDate</cstring>
                     </property>
                     <property name="focusPolicy">
                         <enum>StrongFocus</enum>
                     </property>
                 </widget>
                 <widget class="KDateWidget" row="0" column="1">
                     <property name="name">
                         <cstring>fCreationDate</cstring>
                     </property>
                     <property name="focusPolicy">
                         <enum>StrongFocus</enum>
                     </property>
                 </widget>
             </grid>
         </widget>
         <spacer row="1" column="6">
             <property name="name">
                 <cstring>spacer1</cstring>
             </property>
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
             <property name="sizeHint">
                 <size>
                     <width>180</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
         <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>fDBName</cstring>
             </property>
             <property name="maxLength">
                 <number>34</number>
             </property>
         </widget>
         <spacer row="4" column="5">
             <property name="name">
                 <cstring>spacer2</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
             <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>70</height>
                 </size>
             </property>
         </spacer>
     </grid>
 </widget>
 <tabstops>
     <tabstop>fDBName</tabstop>
     <tabstop>fType</tabstop>
     <tabstop>fCreator</tabstop>
     <tabstop>fRessourceDB</tabstop>
     <tabstop>fReadOnly</tabstop>
     <tabstop>fBackupDB</tabstop>
     <tabstop>fCopyProtect</tabstop>
     <tabstop>fReset</tabstop>
     <tabstop>fExcludeDB</tabstop>
     <tabstop>fCreationDate</tabstop>
     <tabstop>fCreationTime</tabstop>
     <tabstop>fModificationDate</tabstop>
     <tabstop>fModificationTime</tabstop>
     <tabstop>fBackupDate</tabstop>
     <tabstop>fBackupTime</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">dbFlagsEditor_base.ui.h</include>
     <include location="system" impldecl="in implementation">kdatewidget.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>