diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-03-26 00:43:38 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-03-26 00:54:00 +0100 |
| commit | 1134502d2ba3f5373c48f2e6ac03b250325017ef (patch) | |
| tree | 2eb447a7c1322334e8af604bed56d3c1745efc64 /karm | |
| parent | 1ab2350d42c8222a65de5eae2620fc601b26b074 (diff) | |
| download | tdepim-1134502d2ba3f5373c48f2e6ac03b250325017ef.tar.gz tdepim-1134502d2ba3f5373c48f2e6ac03b250325017ef.zip | |
Add CMake option to build karm with xscreensaver support
(cherry picked from commit c9a29849cb166e6711c7704dafd868159fd6cd58)
Diffstat (limited to 'karm')
| -rw-r--r-- | karm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | karm/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | karm/mainwindow.h | 2 | ||||
| -rw-r--r-- | karm/preferences.cpp | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/karm/CMakeLists.txt b/karm/CMakeLists.txt index 013855c5..5019713c 100644 --- a/karm/CMakeLists.txt +++ b/karm/CMakeLists.txt @@ -55,7 +55,7 @@ tde_add_library( karm SHARED AUTOMOC csvexportdialog.cpp plannerparser.cpp karmdcopiface.skel taskviewwhatsthis.cpp VERSION 0.0.0 - LINK kcal_resourceremote-shared kdeprint-shared + LINK kcal_resourceremote-shared kdeprint-shared ${XSS_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index eb6bd4fa..20f27f16 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -47,7 +47,7 @@ MainWindow::MainWindow( const TQString &icsfile ) setCentralWidget( _taskView ); // status bar - starStatusBar(); + startStatusBar(); // setup PreferenceDialog. _preferences = Preferences::instance(); @@ -208,7 +208,7 @@ void MainWindow::updateStatusBar( ) statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1); } -void MainWindow::starStatusBar() +void MainWindow::startStatusBar() { statusBar()->insertItem( i18n("Session"), 0, 0, true ); statusBar()->insertItem( i18n("Total" ), 1, 0, true ); diff --git a/karm/mainwindow.h b/karm/mainwindow.h index 63479c92..20aaecf1 100644 --- a/karm/mainwindow.h +++ b/karm/mainwindow.h @@ -108,7 +108,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface // void timeLoggingChanged( bool on ); protected: - void starStatusBar(); + void startStatusBar(); virtual void saveProperties( KConfig* ); virtual void readProperties( KConfig* ); void saveGeometry(); diff --git a/karm/preferences.cpp b/karm/preferences.cpp index c242fa6a..6d5d708a 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -145,6 +145,7 @@ void Preferences::makeStoragePage() void Preferences::disableIdleDetection() { _doIdleDetectionW->setEnabled(false); + _idleDetectValueW->setEnabled(false); } |