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

List:       kde-commits
Subject:    Re: KDE/kdepim/ktimetracker
From:       Thorsten Staerk <Thorsten () staerk ! de>
Date:       2009-03-10 8:44:09
Message-ID: 200903100944.09781.Thorsten () staerk ! de
[Download RAW message or body]

Laurent!

I have tried to achieve this since months, today I tested your commit and it 
works! 

thanks a lot!
 
Thorsten

On Monday 09 March 2009 23:23:56 Laurent Montel wrote:
> SVN commit 937555 by mlaurent:
>
> Now we can configure it in kontact
>
>
>  M  +18 -3     CMakeLists.txt
>  D             kcmconfigs (directory)
>  A             ktimetracker_config_behavior.desktop
>  A             ktimetracker_config_display.desktop
>  A             ktimetracker_config_storage.desktop
>  A             ktimetrackerconfigdialog.cpp   [License: GPL (v2+)]
>  A             ktimetrackerconfigdialog.h   [License: GPL (v2+)]
>  M  +3 -25     timetrackerwidget.cpp
>
>
> --- trunk/KDE/kdepim/ktimetracker/CMakeLists.txt #937554:937555
> @@ -7,7 +7,6 @@
>  endif(X11_Xscreensaver_FOUND)
>  configure_file(config-karm.h.cmake
> ${CMAKE_CURRENT_BINARY_DIR}/config-karm.h )
>
> -add_subdirectory( kcmconfigs )
>  add_subdirectory( support )
>  add_subdirectory( pics )
>  add_subdirectory( test )
> @@ -16,7 +15,7 @@
>
>
>  ########### next target ###############
> -set(ktimetracker_shared_SRCS
> +set(ktimetracker_shared_SRCS ktimetrackerconfigdialog.cpp
>  	desktoptracker.cpp
>  	edittaskdialog.cpp idletimedetector.cpp
>  	timekard.cpp ktimetrackerutility.cpp ktimewidget.cpp
> @@ -70,13 +69,28 @@
>  install( TARGETS ktimetracker  ${INSTALL_TARGETS_DEFAULT_ARGS} )
>
>
> +###########
> +
> +set(kcm_ktimetracker_PART_SRCS ktimetrackerconfigdialog.cpp )
> +
> +
> +kde4_add_kcfg_files( kcm_ktimetracker_PART_SRCS ktimetracker.kcfgc )
> +
> +kde4_add_plugin(kcm_ktimetracker ${kcm_ktimetracker_PART_SRCS} )
> +
> +target_link_libraries(kcm_ktimetracker   ${KDE4_KIO_LIBS}
> ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS}) +
> +install(TARGETS kcm_ktimetracker DESTINATION ${PLUGIN_INSTALL_DIR})
> +
> +
> +
>  ########### next target ###############
>
>  set(ktimetrackerpart_PART_SRCS ktimetrackerpart.cpp
> ${ktimetracker_shared_SRCS})
>
>  kde4_add_plugin(ktimetrackerpart ${ktimetrackerpart_PART_SRCS})
>
> -target_link_libraries(ktimetrackerpart  ${KDE4_KCAL_LIBS} 
> ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} kdepim kcal_resourceremote
> ${X11_X11_LIB}) +target_link_libraries(ktimetrackerpart 
${KDE4_KUTILS_LIBS}
>  ${KDE4_KCAL_LIBS}  ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} kdepim
> kcal_resourceremote ${X11_X11_LIB}) if(X11_Xscreensaver_LIB)
>  	target_link_libraries(ktimetrackerpart  ${X11_Xscreensaver_LIB})
>  endif(X11_Xscreensaver_LIB)
> @@ -86,6 +100,7 @@
>
>
>  ########### install files ###############
> +install( FILES ktimetracker_config_behavior.desktop 
> ktimetracker_config_display.desktop  ktimetracker_config_storage.desktop
> DESTINATION ${SERVICES_INSTALL_DIR})
>
>  install( FILES ktimetrackerpart.desktop  DESTINATION
> ${SERVICES_INSTALL_DIR} ) install( FILES ktimetrackerui.rc  DESTINATION
> ${DATA_INSTALL_DIR}/ktimetracker ) ---
> trunk/KDE/kdepim/ktimetracker/timetrackerwidget.cpp #937554:937555 @@ 
-20,6
> +20,7 @@
>   */
>
>  #include "timetrackerwidget.h"
> +#include "ktimetrackerconfigdialog.h"
>
>  #include <QDBusConnection>
>  #include <QFileInfo>
> @@ -57,9 +58,6 @@
>  #include "task.h"
>  #include "taskview.h"
>  #include "version.h"
> -#include "ui_cfgbehavior.h"
> -#include "ui_cfgdisplay.h"
> -#include "ui_cfgstorage.h"
>
>  //@cond PRIVATE
>  class TimetrackerWidget::Private {
> @@ -670,30 +668,10 @@
>       is not visible the application quits after accepting the settings
> dialog. */
>    window()->show();
> -
> -  KConfigDialog *dialog = new KConfigDialog(
> -    this, "settings", KTimeTrackerSettings::self() );
> -
> -  Ui::BehaviorPage *behaviorUi = new Ui::BehaviorPage;
> -  QWidget *behaviorPage = new QWidget;
> -  behaviorUi->setupUi( behaviorPage );
> -  dialog->addPage( behaviorPage, i18n( "Behavior" ), "preferences-other"
> ); -
> -  Ui::DisplayPage *displayUi = new Ui::DisplayPage;
> -  QWidget *displayPage = new QWidget;
> -  displayUi->setupUi( displayPage );
> -  dialog->addPage( displayPage,
> -                   i18nc( "settings page for customizing user interface",
> -                          "Appearance" ),
> -                          "preferences-desktop-theme" );
> -
> -  Ui::StoragePage *storageUi = new Ui::StoragePage;
> -  QWidget *storagePage = new QWidget;
> -  storageUi->setupUi( storagePage );
> -  dialog->addPage( storagePage, i18n( "Storage" ), "system-file-manager"
> ); -
> +  KTimeTrackerConfigDialog *dialog = new KTimeTrackerConfigDialog( i18n(
> "Settings" ), this); dialog->exec();
>    delete dialog;
> +
>    showSearchBar( !KTimeTrackerSettings::configPDA() );
>    reconfigureFiles();
>  }

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