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

List:       kde-commits
Subject:    KDE/kdepim
From:       Thorsten Staerk <dev () staerk ! de>
Date:       2008-06-08 8:49:55
Message-ID: 1212914995.628648.4387.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 818294 by tstaerk:

Allow the user to name a task as he likes.

 M  +3 -15     kontact/plugins/ktimetracker/ktimetracker_plugin.cpp  
 M  +2 -0      ktimetracker/kcmconfigs/kcmktimetrackerconfig.cpp  
 M  +1 -0      ktimetracker/kcmconfigs/kcmktimetrackerconfig.h  
 M  +1 -1      ktimetracker/kcmconfigs/ktimetrackerconfig.desktop  
 M  +0 -25     ktimetracker/kcmconfigs/ktimetrackerconfigwidget.cpp  
 M  +1 -11     ktimetracker/kcmconfigs/ktimetrackerconfigwidget.h  
 M  +1 -0      ktimetracker/org.kde.ktimetracker.ktimetracker.xml  


--- trunk/KDE/kdepim/kontact/plugins/ktimetracker/ktimetracker_plugin.cpp #818293:818294
@@ -38,7 +38,7 @@
 #include <kicon.h>
 #include <kparts/componentfactory.h>
 
-EXPORT_KONTACT_PLUGIN( KarmPlugin, karm )
+EXPORT_KONTACT_PLUGIN( KarmPlugin, ktimetracker )
 
 KarmPlugin::KarmPlugin( Kontact::Core *core, const QVariantList & )
   : Kontact::Plugin( core, core, "ktimetracker" ), mInterface( 0 )
@@ -109,7 +109,7 @@
 void KarmPlugin::newTask()
 {
   core()->selectPlugin( this );
-  interface()->addTask( i18n( "New Task" ) );
+  interface()->newTask();
 }
 
 void KarmUniqueAppHandler::loadCommandLineOptions()
@@ -123,19 +123,7 @@
   kDebug();
   // Ensure part is loaded
   (void)plugin()->part();
-  org::kde::ktimetracker::ktimetracker ktimetracker(
-    "org.kde.ktimetracker", "/KTimeTracker", QDBusConnection::sessionBus() );
-  // TODO:
-  // QDBusReply<bool> reply = ktimetracker.doSomethingUseful();
-  //
-  // if ( reply.isValid() ) {
-  //   bool handled = reply;
-  //   kDebug() << "handled=" << handled;
-  //   if ( !handled ) { // no args -> simply bring plugin to front
-        return Kontact::UniqueAppHandler::newInstance();
-  //  }
-  // }
-  // return 0;
+  return Kontact::UniqueAppHandler::newInstance();
 }
 
 #include "ktimetracker_plugin.moc"
--- trunk/KDE/kdepim/ktimetracker/kcmconfigs/kcmktimetrackerconfig.cpp #818293:818294
@@ -1,6 +1,7 @@
 /*
     This file is part of ktimetracker.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+    Copyright (c) 2008 Thorsten Staerk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -54,6 +55,7 @@
                                       ki18n( "(c), 2003 - 2008 Tobias Koenig" ) );
 
   about->addAuthor( ki18n("Tobias Koenig"), KLocalizedString(), "tokoe@kde.org" );
+  about->addAuthor( ki18n("Thorsten Staerk"), KLocalizedString(), "kde@staerk.de" );
   setAboutData( about );
 }
 
--- trunk/KDE/kdepim/ktimetracker/kcmconfigs/kcmktimetrackerconfig.h #818293:818294
@@ -1,6 +1,7 @@
 /*
     This file is part of ktimetracker.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+    Copyright (c) 2008 Thorsten Staerk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- trunk/KDE/kdepim/ktimetracker/kcmconfigs/ktimetrackerconfig.desktop #818293:818294
@@ -2,7 +2,7 @@
 Icon=ktimetracker
 Type=Service
 X-KDE-ServiceTypes=KCModule
-X-DocPath=kaddressbook/index.html
+X-DocPath=ktimetracker/index.html
 
 X-KDE-Library=kcm_ktimetrackerconfig
 X-KDE-ParentApp=ktimetracker
--- trunk/KDE/kdepim/ktimetracker/kcmconfigs/ktimetrackerconfigwidget.cpp #818293:818294
@@ -21,18 +21,6 @@
     without including the source code for Qt in the source distribution.
 */
 
-#include <QCheckBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTabWidget>
-
-#include <QComboBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
-#include <QBoxLayout>
-
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
@@ -45,8 +33,6 @@
   : QWidget( parent )
 {
 
-  QTabWidget *tabWidget = new QTabWidget( this );
-
 }
 
 void KTimeTrackerConfigWidget::restoreSettings()
@@ -54,12 +40,8 @@
   bool blocked = signalsBlocked();
   blockSignals( true );
 
-  mLocationMapURL->lineEdit()->setCursorPosition( 0 );
-
   KConfig _config("ktimetrackerrc", KConfig::NoGlobals);
   KConfigGroup config(&_config, "General" );
-  mTradeAsFamilyName->setChecked( config.readEntry( "TradeAsFamilyName", true ) );
-  mLimitContactDisplay->setChecked( config.readEntry( "LimitContactDisplay", true ) );
 
   blockSignals( blocked );
 
@@ -68,21 +50,14 @@
 
 void KTimeTrackerConfigWidget::saveSettings()
 {
-
   KConfig _config("ktimetrackerrc", KConfig::NoGlobals);
   KConfigGroup config(&_config, "General" );
-  config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
-  config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );
 
   emit changed( false );
 }
 
 void KTimeTrackerConfigWidget::defaults()
 {
-  mNameParsing->setChecked( true );
-  mViewsSingleClickBox->setChecked( false );
-  mEditorCombo->setCurrentIndex( 0 );
-  mLimitContactDisplay->setChecked( true );
 
   emit changed( true );
 }
--- trunk/KDE/kdepim/ktimetracker/kcmconfigs/ktimetrackerconfigwidget.h #818293:818294
@@ -1,6 +1,7 @@
 /*
     This file is part of ktimetracker.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+    Copyright (c) 2008 Thorsten Staerk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -48,17 +49,6 @@
   public slots:
     void modified();
 
-  private:
-    QCheckBox *mNameParsing;
-    QCheckBox *mViewsSingleClickBox;
-    QCheckBox *mTradeAsFamilyName;
-    QComboBox *mEditorCombo;
-    QLineEdit *mPhoneHook;
-    QLineEdit *mFaxHook;
-    QLineEdit *mSMSHook;
-    QCheckBox *mLimitContactDisplay;
-    QComboBox *mLocationMapURL;
-
 };
 
 #endif
--- trunk/KDE/kdepim/ktimetracker/org.kde.ktimetracker.ktimetracker.xml #818293:818294
@@ -10,6 +10,7 @@
       <arg name="taskName" type="s" direction="in"/>
       <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringList" />
     </method>
+    <method name="newTask" />
     <method name="addTask">
       <arg name="taskName" type="s" direction="in"/>
     </method>
[prev in list] [next in list] [prev in thread] [next in thread]