Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor kamoso cleanup

Browse source
This commit is contained in:
Ivailo Monev 2015-03-04 07:24:01 +00:00
parent 2fd5b4b1af
commit 5c45ccc72d
3 changed files with 7 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kamoso/src/CMakeLists.txt
View file

@ -3,10 +3,6 @@ include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT
add_definitions(-DGST_DISABLE_DEPRECATED)
add_definitions(-fexceptions)
if (NEPOMUK_FOUND)
include_directories(${NEPOMUK_INCLUDE_DIRS})
endif(NEPOMUK_FOUND)
add_subdirectory(plugins)
add_subdirectory(pluginTester)
@ -46,10 +42,6 @@ kde4_add_executable(kamoso ${kamoso_SRCS})
target_link_libraries(kamoso ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS}
${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KUTILS_LIBS} ${KIPI_LIBRARIES} ${SolidControl} ${QTGSTREAMER_LIBRARY} ${QTGSTREAMER_UI_LIBRARY})
if(HAVE_NEPOMUK)
target_link_libraries(kamoso ${NEPOMUK_LIBRARIES})
endif(HAVE_NEPOMUK)
install(TARGETS kamoso ${INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS kamoso.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install(FILES kamosoplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})

25
kamoso/src/kamoso.cpp
View file

@ -39,11 +39,7 @@
#include "kipiaction.h"
#include "webcamdialog.h"
#include "pagewebcamconfigmanager.h"
#if KDE_IS_VERSION(4,5,85)
#include "brightness_interface.h"
#else
#include <solid/control/powermanager.h>
#endif
#include "brightness_interface.h"
#include <QItemSelection>
#include <QLayout>
@ -438,14 +434,9 @@ void Kamoso::takePhoto()
stopCountdown();
if(m_flashEnabled){
#if KDE_IS_VERSION(4,5,85)
org::kde::Solid::PowerManagement power("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", QDBusConnection::sessionBus());
brightBack = power.brightness().value();
power.setBrightness(100);
#else
brightBack = Solid::Control::PowerManager::brightness();
Solid::Control::PowerManager::setBrightness(100);
#endif
org::kde::Solid::PowerManagement power("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", QDBusConnection::sessionBus());
brightBack = power.brightness().value();
power.setBrightness(100);
whiteWidgetManager->showAll();
}
QTimer::singleShot(1000, this, SLOT(restore()));
@ -479,12 +470,8 @@ void Kamoso::restore()
{
whiteWidgetManager->hideAll();
if(m_flashEnabled) {
#if KDE_IS_VERSION(4,5,85)
org::kde::Solid::PowerManagement power("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", QDBusConnection::sessionBus());
power.setBrightness(brightBack);
#else
Solid::Control::PowerManager::setBrightness(brightBack);
#endif
org::kde::Solid::PowerManagement power("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement", QDBusConnection::sessionBus());
power.setBrightness(brightBack);
}
}

7
kamoso/src/kamoso.h
View file

@ -107,12 +107,7 @@ Q_OBJECT
private:
QPointer<QMenu> exportKIPIMenu();
#if KDE_IS_VERSION(4,5,85)
int brightBack;
#else
float brightBack;
#endif
int brightBack;
int m_webcamId;
KDirModel *dirModel;
WhiteWidgetManager *whiteWidgetManager;