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

List:       kde-commits
Subject:    [kdepim] ktimetracker: Only the MainWindow,
From:       Thorsten Staerk <thorsten () staerk ! de>
Date:       2011-09-20 11:21:19
Message-ID: 20110920112119.26BA2A607A () git ! kde ! org
[Download RAW message or body]

Git commit 2733d0dc422fff8691a828579db372570741bb21 by Thorsten Staerk.
Committed on 20/09/2011 at 13:20.
Pushed by tstaerk into branch 'master'.

Only the MainWindow, not the kPart should open a TrayIcOn.

M  +0    -7    ktimetracker/ktimetrackerpart.cpp
M  +0    -1    ktimetracker/ktimetrackerpart.h
M  +4    -4    ktimetracker/tray.cpp

http://commits.kde.org/kdepim/2733d0dc422fff8691a828579db372570741bb21

diff --git a/ktimetracker/ktimetrackerpart.cpp b/ktimetracker/ktimetrackerpart.cpp
index f466370..45c856d 100644
--- a/ktimetracker/ktimetrackerpart.cpp
+++ b/ktimetracker/ktimetrackerpart.cpp
@@ -97,8 +97,6 @@ bool ktimetrackerpart::openFile(QString icsfile)
 {
     mMainWidget->openFile(icsfile);
     emit setWindowCaption(icsfile);
-    if ( KTimeTrackerSettings::trayIcon() ) mTray = new TrayIcon( this );
-    else mTray = new TrayIcon( );
 
     // connections
     connect( mMainWidget, SIGNAL(totalTimesChanged(long,long)),
@@ -107,11 +105,6 @@ bool ktimetrackerpart::openFile(QString icsfile)
            this, SLOT(setStatusBar(QString)) );
     connect( mMainWidget, SIGNAL(setCaption(QString)),
            this, SIGNAL(setWindowCaption(QString)) );
-    connect( mTray, SIGNAL(quitSelected()), SLOT(quit()) );
-    connect( mMainWidget, SIGNAL(timersActive()), mTray, SLOT(startClock()) );
-    connect( mMainWidget, SIGNAL(timersInactive()), mTray, SLOT(stopClock()) );
-    connect( mMainWidget, SIGNAL(tasksChanged(QList<Task*>)),
-           mTray, SLOT(updateToolTip(QList<Task*>)));
     return true;
 }
 
diff --git a/ktimetracker/ktimetrackerpart.h b/ktimetracker/ktimetrackerpart.h
index 1b308df..dff0654 100644
--- a/ktimetracker/ktimetrackerpart.h
+++ b/ktimetracker/ktimetrackerpart.h
@@ -44,7 +44,6 @@ class ktimetrackerpart : public KParts::ReadWritePart
 
   private:
     void               makeMenus();
-    TrayIcon          *mTray;
     TimetrackerWidget *mMainWidget;
 
 
diff --git a/ktimetracker/tray.cpp b/ktimetracker/tray.cpp
index 1ff3141..3327981 100644
--- a/ktimetracker/tray.cpp
+++ b/ktimetracker/tray.cpp
@@ -59,10 +59,10 @@ TrayIcon::TrayIcon(MainWindow* parent)
         for (int i=0; i<8; i++)
         {
             QPixmap *icon = new QPixmap();
-        QString name;
-        name.sprintf("active-icon-%d.xpm",i);
-        *icon = UserIcon(name);
-        icons->insert(i,icon);
+            QString name;
+            name.sprintf("active-icon-%d.xpm",i);
+            *icon = UserIcon(name);
+            icons->insert(i,icon);
         }
     }
     TimetrackerWidget *timetrackerWidget = static_cast< TimetrackerWidget * >( \
parent->centralWidget() );


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