diff options
| -rw-r--r-- | gui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gui/Desktop/CMakeLists.txt | 11 | ||||
| -rwxr-xr-x | gui/Settings/PkSettings.cpp | 12 |
3 files changed, 13 insertions, 11 deletions
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index d1e9d8d..5830de3 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -13,5 +13,6 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${ add_subdirectory( AddRm ) add_subdirectory( Settings ) add_subdirectory( Updater ) +add_subdirectory( KPackageKit ) add_subdirectory( KPackageKitD ) add_subdirectory( Desktop ) diff --git a/gui/Desktop/CMakeLists.txt b/gui/Desktop/CMakeLists.txt index d623c05..eee5644 100644 --- a/gui/Desktop/CMakeLists.txt +++ b/gui/Desktop/CMakeLists.txt @@ -1,5 +1,6 @@ -install( FILES settings-add-and-remove-software.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kpk_addrm.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kpk_settings.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kpk_update.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kpackagekitd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
\ No newline at end of file + +install( FILES kpk_addrm.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kpk_settings.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kpk_update.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kpackagekit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kpackagekitd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) diff --git a/gui/Settings/PkSettings.cpp b/gui/Settings/PkSettings.cpp index d0ed21b..6cdbaa6 100755 --- a/gui/Settings/PkSettings.cpp +++ b/gui/Settings/PkSettings.cpp @@ -60,10 +60,10 @@ void PkSettings::checkChanges(int) KConfigGroup smartIconGroup( &config, "SmartIcon" ); KConfigGroup checkUpdateGroup( &config, "CheckUpdate" ); if ( notifyUpdatesCB->checkState() != - (Qt::CheckState) smartIconGroup.readEntry( "notifyUpdatesCB", (int) Qt::Checked) + (Qt::CheckState) smartIconGroup.readEntry( "notifyUpdates", (int) Qt::Checked) || notifyLongTasksCB->checkState() != - (Qt::CheckState) smartIconGroup.readEntry( "notifyLongTasksCB", (int) Qt::Checked) + (Qt::CheckState) smartIconGroup.readEntry( "notifyLongTasks", (int) Qt::Checked) || intervalCB->itemData( intervalCB->currentIndex() ).toUInt() != (uint) checkUpdateGroup.readEntry( "interval", DAILY ) ) @@ -76,9 +76,9 @@ void PkSettings::load() { KConfig config("KPackageKit"); KConfigGroup smartIconGroup( &config, "SmartIcon" ); - notifyUpdatesCB->setCheckState( (Qt::CheckState) smartIconGroup.readEntry( "notifyUpdatesCB", + notifyUpdatesCB->setCheckState( (Qt::CheckState) smartIconGroup.readEntry( "notifyUpdates", (int) Qt::Checked) ); - notifyLongTasksCB->setCheckState( (Qt::CheckState) smartIconGroup.readEntry( "notifyLongTasksCB", + notifyLongTasksCB->setCheckState( (Qt::CheckState) smartIconGroup.readEntry( "notifyLongTasks", (int) Qt::Checked) ); KConfigGroup checkUpdateGroup( &config, "CheckUpdate" ); uint interval = checkUpdateGroup.readEntry( "interval", DAILY ); @@ -96,8 +96,8 @@ void PkSettings::save() { KConfig config("KPackageKit"); KConfigGroup smartIconGroup( &config, "SmartIcon" ); - smartIconGroup.writeEntry( "notifyUpdatesCB", (int) notifyUpdatesCB->checkState() ); - smartIconGroup.writeEntry( "notifyLongTasksCB", (int) notifyLongTasksCB->checkState() ); + smartIconGroup.writeEntry( "notifyUpdates", (int) notifyUpdatesCB->checkState() ); + smartIconGroup.writeEntry( "notifyLongTasks", (int) notifyLongTasksCB->checkState() ); KConfigGroup checkUpdateGroup( &config, "CheckUpdate" ); checkUpdateGroup.writeEntry( "interval", intervalCB->itemData( intervalCB->currentIndex() ).toUInt() ); } |