Convert dos endings to unix in telldus-gui, closes #160

This commit is contained in:
Micke Prag 2012-02-27 17:43:29 +01:00
parent 9500c4c898
commit aff9b973a8
25 changed files with 1162 additions and 1162 deletions

View file

@ -1,40 +1,40 @@
PROJECT( telldus-gui ) PROJECT( telldus-gui )
CMAKE_MINIMUM_REQUIRED( VERSION 2.4.0 ) CMAKE_MINIMUM_REQUIRED( VERSION 2.4.0 )
if(COMMAND cmake_policy) if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy) endif(COMMAND cmake_policy)
SET(PACKAGE_MAJOR_VERSION 2) SET(PACKAGE_MAJOR_VERSION 2)
SET(PACKAGE_MINOR_VERSION 1) SET(PACKAGE_MINOR_VERSION 1)
SET(PACKAGE_PATCH_VERSION 1) SET(PACKAGE_PATCH_VERSION 1)
SET(PACKAGE_SOVERSION 2) SET(PACKAGE_SOVERSION 2)
SET(PACKAGE_VERSION "${PACKAGE_MAJOR_VERSION}.${PACKAGE_MINOR_VERSION}.${PACKAGE_PATCH_VERSION}") SET(PACKAGE_VERSION "${PACKAGE_MAJOR_VERSION}.${PACKAGE_MINOR_VERSION}.${PACKAGE_PATCH_VERSION}")
SET(DISPLAYED_VERSION "${PACKAGE_VERSION}") SET(DISPLAYED_VERSION "${PACKAGE_VERSION}")
SET(BRANDING "telldus" CACHE STRING "The brand to use") SET(BRANDING "telldus" CACHE STRING "The brand to use")
SET(UPDATE_TRANSLATIONS FALSE CACHE BOOL "Update source translation files (WARNING: make clean will delete the source .ts files! Danger!)") SET(UPDATE_TRANSLATIONS FALSE CACHE BOOL "Update source translation files (WARNING: make clean will delete the source .ts files! Danger!)")
SET(LANGUAGES sv) SET(LANGUAGES sv)
SET(BUILD_LIBTELLDUS-GUI TRUE CACHE BOOL "Build libtelldus-gui") SET(BUILD_LIBTELLDUS-GUI TRUE CACHE BOOL "Build libtelldus-gui")
SET(BUILD_TELLDUS-CENTER TRUE CACHE BOOL "Build TelldusCenter") SET(BUILD_TELLDUS-CENTER TRUE CACHE BOOL "Build TelldusCenter")
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
SET(GENERATE_MAN FALSE CACHE BOOL "Enable generation of man-files") SET(GENERATE_MAN FALSE CACHE BOOL "Enable generation of man-files")
IF(UNIX) IF(UNIX)
SET(PLUGIN_LIB_PATH "lib" CACHE STRING "Relative path to the directory to install TelldusCenter plugin libraries into") SET(PLUGIN_LIB_PATH "lib" CACHE STRING "Relative path to the directory to install TelldusCenter plugin libraries into")
SET(PLUGIN_LIB_FULL_PATH "${PLUGIN_LIB_PATH}/telldus/tellduscenter/plugins") SET(PLUGIN_LIB_FULL_PATH "${PLUGIN_LIB_PATH}/telldus/tellduscenter/plugins")
ENDIF () ENDIF ()
if(BUILD_LIBTELLDUS-GUI) if(BUILD_LIBTELLDUS-GUI)
ADD_SUBDIRECTORY(TelldusGui) ADD_SUBDIRECTORY(TelldusGui)
endif(BUILD_LIBTELLDUS-GUI) endif(BUILD_LIBTELLDUS-GUI)
IF (BUILD_TELLDUS-CENTER) IF (BUILD_TELLDUS-CENTER)
ADD_SUBDIRECTORY(TelldusCenter) ADD_SUBDIRECTORY(TelldusCenter)
ADD_SUBDIRECTORY(Plugins) ADD_SUBDIRECTORY(Plugins)
ENDIF (BUILD_TELLDUS-CENTER) ENDIF (BUILD_TELLDUS-CENTER)

View file

@ -1,70 +1,70 @@
CMAKE_MINIMUM_REQUIRED( VERSION 2.4.0 ) CMAKE_MINIMUM_REQUIRED( VERSION 2.4.0 )
SET(BUILD_PLUGIN_TELLDUS-CORE TRUE CACHE BOOL "Build plugin 'TelldusCore'") SET(BUILD_PLUGIN_TELLDUS-CORE TRUE CACHE BOOL "Build plugin 'TelldusCore'")
IF (BUILD_LIBTELLDUS-GUI) IF (BUILD_LIBTELLDUS-GUI)
SET(BUILD_PLUGIN_DEVICES TRUE CACHE BOOL "Build plugin 'Devices'") SET(BUILD_PLUGIN_DEVICES TRUE CACHE BOOL "Build plugin 'Devices'")
SET(BUILD_PLUGIN_SYSTRAY TRUE CACHE BOOL "Build plugin 'Systray'") SET(BUILD_PLUGIN_SYSTRAY TRUE CACHE BOOL "Build plugin 'Systray'")
ENDIF (BUILD_LIBTELLDUS-GUI) ENDIF (BUILD_LIBTELLDUS-GUI)
SET(BUILD_PLUGIN_CONTROLLERS FALSE CACHE BOOL "Build plugin 'Controllers admin plugin'") SET(BUILD_PLUGIN_CONTROLLERS FALSE CACHE BOOL "Build plugin 'Controllers admin plugin'")
SET(BUILD_PLUGIN_DBUS FALSE CACHE BOOL "Build plugin 'DBus'") SET(BUILD_PLUGIN_DBUS FALSE CACHE BOOL "Build plugin 'DBus'")
SET(BUILD_PLUGIN_LIVE FALSE CACHE BOOL "Build plugin 'Telldus Live!'") SET(BUILD_PLUGIN_LIVE FALSE CACHE BOOL "Build plugin 'Telldus Live!'")
SET(BUILD_PLUGIN_SCHEDULERGUISIMPLE FALSE CACHE BOOL "Build plugin 'Simple Scheduler GUI'") SET(BUILD_PLUGIN_SCHEDULERGUISIMPLE FALSE CACHE BOOL "Build plugin 'Simple Scheduler GUI'")
SET(BUILD_PLUGIN_SENSORS TRUE CACHE BOOL "Build plugin 'Sensors'") SET(BUILD_PLUGIN_SENSORS TRUE CACHE BOOL "Build plugin 'Sensors'")
SET(BUILD_PLUGIN_XPL FALSE CACHE BOOL "Build plugin 'xPL'") SET(BUILD_PLUGIN_XPL FALSE CACHE BOOL "Build plugin 'xPL'")
ADD_SUBDIRECTORY(telldus) ADD_SUBDIRECTORY(telldus)
IF(BUILD_PLUGIN_TELLDUS-CORE) IF(BUILD_PLUGIN_TELLDUS-CORE)
ADD_SUBDIRECTORY(TelldusCore) ADD_SUBDIRECTORY(TelldusCore)
ENDIF(BUILD_PLUGIN_TELLDUS-CORE) ENDIF(BUILD_PLUGIN_TELLDUS-CORE)
IF(BUILD_PLUGIN_DEVICES) IF(BUILD_PLUGIN_DEVICES)
ADD_SUBDIRECTORY(Devices) ADD_SUBDIRECTORY(Devices)
ENDIF(BUILD_PLUGIN_DEVICES) ENDIF(BUILD_PLUGIN_DEVICES)
IF(BUILD_PLUGIN_SYSTRAY) IF(BUILD_PLUGIN_SYSTRAY)
ADD_SUBDIRECTORY(Systray) ADD_SUBDIRECTORY(Systray)
ENDIF(BUILD_PLUGIN_SYSTRAY) ENDIF(BUILD_PLUGIN_SYSTRAY)
IF(BUILD_PLUGIN_CONTROLLERS) IF(BUILD_PLUGIN_CONTROLLERS)
ADD_SUBDIRECTORY(Controllers) ADD_SUBDIRECTORY(Controllers)
ENDIF() ENDIF()
IF(BUILD_PLUGIN_DBUS) IF(BUILD_PLUGIN_DBUS)
ADD_SUBDIRECTORY(DBus) ADD_SUBDIRECTORY(DBus)
ENDIF(BUILD_PLUGIN_DBUS) ENDIF(BUILD_PLUGIN_DBUS)
IF(BUILD_PLUGIN_LIVE) IF(BUILD_PLUGIN_LIVE)
ADD_SUBDIRECTORY(Live) ADD_SUBDIRECTORY(Live)
ENDIF(BUILD_PLUGIN_LIVE) ENDIF(BUILD_PLUGIN_LIVE)
IF(BUILD_PLUGIN_SENSORS) IF(BUILD_PLUGIN_SENSORS)
ADD_SUBDIRECTORY(Sensors) ADD_SUBDIRECTORY(Sensors)
ENDIF() ENDIF()
IF(BUILD_PLUGIN_XPL) IF(BUILD_PLUGIN_XPL)
ADD_SUBDIRECTORY(xPL) ADD_SUBDIRECTORY(xPL)
ENDIF(BUILD_PLUGIN_XPL) ENDIF(BUILD_PLUGIN_XPL)
IF(BUILD_PLUGIN_SCHEDULERGUISIMPLE) IF(BUILD_PLUGIN_SCHEDULERGUISIMPLE)
ADD_SUBDIRECTORY(SchedulerGUISimple) ADD_SUBDIRECTORY(SchedulerGUISimple)
ENDIF(BUILD_PLUGIN_SCHEDULERGUISIMPLE) ENDIF(BUILD_PLUGIN_SCHEDULERGUISIMPLE)
IF(REQUIRE_PLUGIN_SCHEDULER) IF(REQUIRE_PLUGIN_SCHEDULER)
ADD_SUBDIRECTORY(Scheduler) ADD_SUBDIRECTORY(Scheduler)
ENDIF(REQUIRE_PLUGIN_SCHEDULER) ENDIF(REQUIRE_PLUGIN_SCHEDULER)
IF(REQUIRE_PLUGIN_SUNCALCULATOR) IF(REQUIRE_PLUGIN_SUNCALCULATOR)
ADD_SUBDIRECTORY(SunCalculator) ADD_SUBDIRECTORY(SunCalculator)
ENDIF(REQUIRE_PLUGIN_SUNCALCULATOR) ENDIF(REQUIRE_PLUGIN_SUNCALCULATOR)
IF(REQUIRE_PLUGIN_QML) IF(REQUIRE_PLUGIN_QML)
ADD_SUBDIRECTORY(QML) ADD_SUBDIRECTORY(QML)
ENDIF(REQUIRE_PLUGIN_QML) ENDIF(REQUIRE_PLUGIN_QML)
IF(REQUIRE_PLUGIN_SETTINGS) IF(REQUIRE_PLUGIN_SETTINGS)
ADD_SUBDIRECTORY(Settings) ADD_SUBDIRECTORY(Settings)
ENDIF(REQUIRE_PLUGIN_SETTINGS) ENDIF(REQUIRE_PLUGIN_SETTINGS)

View file

@ -1,41 +1,41 @@
SET( Plugin_NAME "Devices" ) SET( Plugin_NAME "Devices" )
SET( Plugin_SRCS SET( Plugin_SRCS
devicesplugin.cpp devicesplugin.cpp
) )
SET( Plugin_HDRS SET( Plugin_HDRS
devicesplugin.h devicesplugin.h
) )
SET( Plugin_MOC_HDRS SET( Plugin_MOC_HDRS
) )
SET( Plugin_PATH "com.telldus.gui" ) SET( Plugin_PATH "com.telldus.gui" )
IF (WIN32) IF (WIN32)
SET( Plugin_LIBRARIES SET( Plugin_LIBRARIES
${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusGui.lib ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusGui.lib
) )
ELSEIF (APPLE) ELSEIF (APPLE)
FIND_PACKAGE(TelldusCore REQUIRED) FIND_PACKAGE(TelldusCore REQUIRED)
SET( Plugin_LIBRARIES SET( Plugin_LIBRARIES
${TELLDUSCORE_LIBRARY} ${TELLDUSCORE_LIBRARY}
TelldusGui TelldusGui
) )
ELSE (WIN32) ELSE (WIN32)
FIND_PACKAGE(TelldusCore REQUIRED) FIND_PACKAGE(TelldusCore REQUIRED)
SET( Plugin_LIBRARIES SET( Plugin_LIBRARIES
${TELLDUSGUI_LIBRARY} ${TELLDUSGUI_LIBRARY}
${CMAKE_BINARY_DIR}/TelldusGui/libtelldus-gui.so ${CMAKE_BINARY_DIR}/TelldusGui/libtelldus-gui.so
) )
ENDIF (WIN32) ENDIF (WIN32)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${TELLDUSCORE_INCLUDE_DIR} ${TELLDUSCORE_INCLUDE_DIR}
) )
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

View file

@ -1,45 +1,45 @@
SET(QT_USE_QTNETWORK TRUE) SET(QT_USE_QTNETWORK TRUE)
SET( Plugin_NAME "TelldusLive" ) SET( Plugin_NAME "TelldusLive" )
SET( Plugin_PATH "com.telldus.live" ) SET( Plugin_PATH "com.telldus.live" )
SET( Plugin_SRCS SET( Plugin_SRCS
LiveMessage.cpp LiveMessage.cpp
LiveMessageToken.cpp LiveMessageToken.cpp
LiveObject.cpp LiveObject.cpp
LivePlugin.cpp LivePlugin.cpp
) )
SET( Plugin_HDRS SET( Plugin_HDRS
LivePlugin.h LivePlugin.h
${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/parsed/config.h ${CMAKE_CURRENT_BINARY_DIR}/parsed/config.h
) )
SET( Plugin_MOC_HDRS SET( Plugin_MOC_HDRS
LiveMessageToken.h LiveMessageToken.h
LiveMessage.h LiveMessage.h
LiveObject.h LiveObject.h
) )
SET( Plugin_RESOURCES SET( Plugin_RESOURCES
Live.qrc Live.qrc
) )
SET( Plugin_EXTRA SET( Plugin_EXTRA
configuration.ui configuration.ui
icon.png icon.png
) )
SET(TELLDUS_LIVE_PUBLIC_KEY "" CACHE STRING "Telldus Live! public key") SET(TELLDUS_LIVE_PUBLIC_KEY "" CACHE STRING "Telldus Live! public key")
SET(TELLDUS_LIVE_PRIVATE_KEY "" CACHE STRING "Telldus Live! private key") SET(TELLDUS_LIVE_PRIVATE_KEY "" CACHE STRING "Telldus Live! private key")
SET(TELLDUS_LIVE_URI "https://api.telldus.com/server/assign" CACHE STRING "Telldus Live! Connection URI") SET(TELLDUS_LIVE_URI "https://api.telldus.com/server/assign" CACHE STRING "Telldus Live! Connection URI")
CONFIGURE_FILE( CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/parsed/config.h ${CMAKE_CURRENT_BINARY_DIR}/parsed/config.h
) )
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/parsed/) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/parsed/)
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

View file

@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1 dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh 7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4 1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
-----END CERTIFICATE----- -----END CERTIFICATE-----

View file

@ -1,5 +1,5 @@
const char *TELLDUS_LIVE_PUBLIC_KEY = "${TELLDUS_LIVE_PUBLIC_KEY}"; const char *TELLDUS_LIVE_PUBLIC_KEY = "${TELLDUS_LIVE_PUBLIC_KEY}";
const char *TELLDUS_LIVE_PRIVATE_KEY = "${TELLDUS_LIVE_PRIVATE_KEY}"; const char *TELLDUS_LIVE_PRIVATE_KEY = "${TELLDUS_LIVE_PRIVATE_KEY}";
const char *TELLDUS_LIVE_URI = "${TELLDUS_LIVE_URI}"; const char *TELLDUS_LIVE_URI = "${TELLDUS_LIVE_URI}";
const char *TELLDUS_CENTER_VERSION = "${DISPLAYED_VERSION}"; const char *TELLDUS_CENTER_VERSION = "${DISPLAYED_VERSION}";

View file

@ -1,4 +1,4 @@
ActionBar 1.0 ActionBar.qml ActionBar 1.0 ActionBar.qml
ActionPoint 1.0 ActionPoint.qml ActionPoint 1.0 ActionPoint.qml
Button 1.0 Button.qml Button 1.0 Button.qml
Dialog 1.0 Dialog.qml Dialog 1.0 Dialog.qml

View file

@ -1,18 +1,18 @@
SET( Plugin_NAME "SystrayIcon" ) SET( Plugin_NAME "SystrayIcon" )
SET( Plugin_SRCS SET( Plugin_SRCS
systrayplugin.cpp systrayplugin.cpp
systrayobject.cpp systrayobject.cpp
) )
SET( Plugin_HDRS SET( Plugin_HDRS
systrayplugin.h systrayplugin.h
) )
SET( Plugin_MOC_HDRS SET( Plugin_MOC_HDRS
systrayobject.h systrayobject.h
) )
SET( Plugin_PATH "com.telldus.systray" ) SET( Plugin_PATH "com.telldus.systray" )
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

View file

@ -1,148 +1,148 @@
FIND_PACKAGE( Qt4 REQUIRED ) FIND_PACKAGE( Qt4 REQUIRED )
SET(QT_USE_QTSCRIPT TRUE) SET(QT_USE_QTSCRIPT TRUE)
INCLUDE( ${QT_USE_FILE} ) INCLUDE( ${QT_USE_FILE} )
FIND_PACKAGE( SignTool REQUIRED ) FIND_PACKAGE( SignTool REQUIRED )
if(COMMAND cmake_policy) if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy) endif(COMMAND cmake_policy)
QT4_WRAP_CPP( Plugin_MOC_SRCS ${Plugin_MOC_HDRS} ) QT4_WRAP_CPP( Plugin_MOC_SRCS ${Plugin_MOC_HDRS} )
QT4_AUTOMOC ( ${Plugin_SRCS} ) QT4_AUTOMOC ( ${Plugin_SRCS} )
IF(Plugin_RESOURCES) IF(Plugin_RESOURCES)
QT4_ADD_RESOURCES(Plugin_RSRCS ${Plugin_RESOURCES}) QT4_ADD_RESOURCES(Plugin_RSRCS ${Plugin_RESOURCES})
ENDIF(Plugin_RESOURCES) ENDIF(Plugin_RESOURCES)
SET( Plugin_LIBRARIES SET( Plugin_LIBRARIES
${Plugin_LIBRARIES} ${Plugin_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(${QT_DEFINITIONS})
ADD_DEFINITIONS(-DQT_PLUGIN) ADD_DEFINITIONS(-DQT_PLUGIN)
ADD_DEFINITIONS(-DQT_NO_DEBUG) ADD_DEFINITIONS(-DQT_NO_DEBUG)
ADD_DEFINITIONS(-DQT_SHARED) ADD_DEFINITIONS(-DQT_SHARED)
#SET( LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH/Plugins} ) #SET( LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH/Plugins} )
FOREACH(lang ${LANGUAGES}) FOREACH(lang ${LANGUAGES})
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/translation_${lang}.ts" OR UPDATE_TRANSLATIONS) IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/translation_${lang}.ts" OR UPDATE_TRANSLATIONS)
LIST(APPEND Plugin_TS "translation_${lang}.ts") LIST(APPEND Plugin_TS "translation_${lang}.ts")
ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/translation_${lang}.ts" OR UPDATE_TRANSLATIONS) ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/translation_${lang}.ts" OR UPDATE_TRANSLATIONS)
ENDFOREACH(lang) ENDFOREACH(lang)
SET(translation_sources ${Plugin_SRCS}) SET(translation_sources ${Plugin_SRCS})
IF(Plugin_PATH) IF(Plugin_PATH)
STRING(REPLACE "." "/" STRING(REPLACE "." "/"
Plugin_PATH_relative ${Plugin_PATH} Plugin_PATH_relative ${Plugin_PATH}
) )
IF (APPLE) IF (APPLE)
SET(Plugin_PATH "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Plugins/script/${Plugin_PATH_relative}") SET(Plugin_PATH "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Plugins/script/${Plugin_PATH_relative}")
ELSEIF (WIN32) ELSEIF (WIN32)
SET(Plugin_PATH "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/Plugins/script/${Plugin_PATH_relative}") SET(Plugin_PATH "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/Plugins/script/${Plugin_PATH_relative}")
ELSE (APPLE) ELSE (APPLE)
SET(Plugin_PATH "${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/script/${Plugin_PATH_relative}") SET(Plugin_PATH "${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/script/${Plugin_PATH_relative}")
ENDIF (APPLE) ENDIF (APPLE)
LIST(APPEND translation_sources LIST(APPEND translation_sources
"${CMAKE_CURRENT_SOURCE_DIR}/__init__.js" "${CMAKE_CURRENT_SOURCE_DIR}/__init__.js"
) )
LIST(APPEND Plugin_FILES "${CMAKE_CURRENT_SOURCE_DIR}/__init__.js") LIST(APPEND Plugin_FILES "${CMAKE_CURRENT_SOURCE_DIR}/__init__.js")
#Add all extra files #Add all extra files
FOREACH(_FILE ${Plugin_EXTRA}) FOREACH(_FILE ${Plugin_EXTRA})
LIST(APPEND Plugin_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${_FILE}") LIST(APPEND Plugin_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${_FILE}")
ENDFOREACH(_FILE) ENDFOREACH(_FILE)
ENDIF(Plugin_PATH) ENDIF(Plugin_PATH)
IF (UPDATE_TRANSLATIONS) IF (UPDATE_TRANSLATIONS)
QT4_CREATE_TRANSLATION( QM_FILES ${Plugin_SRCS} ${translation_sources} ${Plugin_TS} ) QT4_CREATE_TRANSLATION( QM_FILES ${Plugin_SRCS} ${translation_sources} ${Plugin_TS} )
ELSE (UPDATE_TRANSLATIONS) ELSE (UPDATE_TRANSLATIONS)
QT4_ADD_TRANSLATION(Plugin_QM ${Plugin_TS}) QT4_ADD_TRANSLATION(Plugin_QM ${Plugin_TS})
LIST(APPEND Plugin_FILES ${Plugin_QM}) LIST(APPEND Plugin_FILES ${Plugin_QM})
ENDIF (UPDATE_TRANSLATIONS) ENDIF (UPDATE_TRANSLATIONS)
IF(Plugin_PATH) IF(Plugin_PATH)
FOREACH(_FILE ${Plugin_FILES}) FOREACH(_FILE ${Plugin_FILES})
GET_FILENAME_COMPONENT(_FILENAME ${_FILE} NAME) GET_FILENAME_COMPONENT(_FILENAME ${_FILE} NAME)
ADD_CUSTOM_COMMAND( OUTPUT ${Plugin_PATH}/${_FILENAME} ADD_CUSTOM_COMMAND( OUTPUT ${Plugin_PATH}/${_FILENAME}
COMMAND ${CMAKE_COMMAND} -E copy ${_FILE} ${Plugin_PATH}/${_FILENAME} COMMAND ${CMAKE_COMMAND} -E copy ${_FILE} ${Plugin_PATH}/${_FILENAME}
DEPENDS ${_FILE} DEPENDS ${_FILE}
COMMENT "Copy ${_FILENAME} for plugin ${Plugin_NAME}" COMMENT "Copy ${_FILENAME} for plugin ${Plugin_NAME}"
) )
LIST(APPEND Plugin_TARGET_FILES "${Plugin_PATH}/${_FILENAME}") LIST(APPEND Plugin_TARGET_FILES "${Plugin_PATH}/${_FILENAME}")
IF (NOT APPLE) IF (NOT APPLE)
INSTALL(FILES ${_FILE} DESTINATION "${PLUGIN_LIB_FULL_PATH}/script/${Plugin_PATH_relative}") INSTALL(FILES ${_FILE} DESTINATION "${PLUGIN_LIB_FULL_PATH}/script/${Plugin_PATH_relative}")
ENDIF () ENDIF ()
ENDFOREACH(_FILE) ENDFOREACH(_FILE)
ENDIF(Plugin_PATH) ENDIF(Plugin_PATH)
IF(Plugin_SRCS) IF(Plugin_SRCS)
ADD_LIBRARY(${Plugin_NAME} SHARED ADD_LIBRARY(${Plugin_NAME} SHARED
${Plugin_SRCS} ${Plugin_SRCS}
${Plugin_HDRS} ${Plugin_HDRS}
${Plugin_RSRCS} ${Plugin_RSRCS}
${Plugin_MOC_HDRS} ${Plugin_MOC_HDRS}
${Plugin_MOC_SRCS} ${Plugin_MOC_SRCS}
${Plugin_MOC_HDRS} ${Plugin_MOC_HDRS}
${Plugin_FILES} ${Plugin_FILES}
${Plugin_TS} ${Plugin_TS}
${Plugin_QM} ${Plugin_QM}
${Plugin_TARGET_FILES} ${Plugin_TARGET_FILES}
) )
TARGET_LINK_LIBRARIES( ${Plugin_NAME} ${Plugin_LIBRARIES} ) TARGET_LINK_LIBRARIES( ${Plugin_NAME} ${Plugin_LIBRARIES} )
IF (APPLE) IF (APPLE)
SET_TARGET_PROPERTIES(${Plugin_NAME} PROPERTIES SET_TARGET_PROPERTIES(${Plugin_NAME} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Plugins/script LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Plugins/script
PREFIX "../" PREFIX "../"
) )
INSTALL(CODE " INSTALL(CODE "
GET_FILENAME_COMPONENT(DESTDIR \$ENV{DESTDIR} ABSOLUTE) GET_FILENAME_COMPONENT(DESTDIR \$ENV{DESTDIR} ABSOLUTE)
SET(app \"\${DESTDIR}/Applications/TelldusCenter.app\") SET(app \"\${DESTDIR}/Applications/TelldusCenter.app\")
GET_BUNDLE_AND_EXECUTABLE(\"\${app}\" bundle exe valid) GET_BUNDLE_AND_EXECUTABLE(\"\${app}\" bundle exe valid)
GET_FILENAME_COMPONENT(exedir \"\${exe}\" PATH) GET_FILENAME_COMPONENT(exedir \"\${exe}\" PATH)
SET(plugin \"\${bundle}/Contents/Plugins/script/${Plugin_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\") SET(plugin \"\${bundle}/Contents/Plugins/script/${Plugin_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")
GET_ITEM_KEY(\"\${plugin}\" pkey) GET_ITEM_KEY(\"\${plugin}\" pkey)
SET(prereqs \"\") SET(prereqs \"\")
GET_PREREQUISITES(\${plugin} prereqs 1 0 \"\${exe}\" \"\${bundle}/Contents/Frameworks/\") GET_PREREQUISITES(\${plugin} prereqs 1 0 \"\${exe}\" \"\${bundle}/Contents/Frameworks/\")
FOREACH(pr \${prereqs}) FOREACH(pr \${prereqs})
GET_ITEM_KEY(\"\${pr}\" rkey) GET_ITEM_KEY(\"\${pr}\" rkey)
#Don't change the path to TelldusCore #Don't change the path to TelldusCore
IF (NOT \"\${rkey}\" STREQUAL \"TelldusCore\") IF (NOT \"\${rkey}\" STREQUAL \"TelldusCore\")
#Check to see if this is ourself #Check to see if this is ourself
IF (NOT \${pkey} STREQUAL \${rkey}) IF (NOT \${pkey} STREQUAL \${rkey})
SET(kv \"\") SET(kv \"\")
SET_BUNDLE_KEY_VALUES(kv \"\${pr}\" \"\${pr}\" \"\${exedir}\" \"\${bundle}/Contents/Frameworks/\" 1) SET_BUNDLE_KEY_VALUES(kv \"\${pr}\" \"\${pr}\" \"\${exedir}\" \"\${bundle}/Contents/Frameworks/\" 1)
IF (NOT EXISTS \"\${\${kv}_RESOLVED_EMBEDDED_ITEM}\") IF (NOT EXISTS \"\${\${kv}_RESOLVED_EMBEDDED_ITEM}\")
COPY_RESOLVED_FRAMEWORK_INTO_BUNDLE(\"\${\${kv}_RESOLVED_ITEM}\" \"\${\${kv}_RESOLVED_EMBEDDED_ITEM}\") COPY_RESOLVED_FRAMEWORK_INTO_BUNDLE(\"\${\${kv}_RESOLVED_ITEM}\" \"\${\${kv}_RESOLVED_EMBEDDED_ITEM}\")
ENDIF () ENDIF ()
EXECUTE_PROCESS(COMMAND install_name_tool EXECUTE_PROCESS(COMMAND install_name_tool
-change \"\${pr}\" \"\${\${rkey}_EMBEDDED_ITEM}\" \"\${plugin}\" -change \"\${pr}\" \"\${\${rkey}_EMBEDDED_ITEM}\" \"\${plugin}\"
) )
ENDIF () ENDIF ()
ENDIF () ENDIF ()
ENDFOREACH() ENDFOREACH()
") ")
ELSEIF (WIN32) ELSEIF (WIN32)
SET_TARGET_PROPERTIES(${Plugin_NAME} PROPERTIES SET_TARGET_PROPERTIES(${Plugin_NAME} PROPERTIES
PREFIX "Plugins/script/" PREFIX "Plugins/script/"
) )
ELSE (APPLE) ELSE (APPLE)
SET_TARGET_PROPERTIES(${Plugin_NAME} PROPERTIES SET_TARGET_PROPERTIES(${Plugin_NAME} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/script LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/script
) )
INSTALL(TARGETS ${Plugin_NAME} INSTALL(TARGETS ${Plugin_NAME}
LIBRARY DESTINATION "${PLUGIN_LIB_FULL_PATH}/script" LIBRARY DESTINATION "${PLUGIN_LIB_FULL_PATH}/script"
) )
ENDIF (APPLE) ENDIF (APPLE)
SIGN(${Plugin_NAME}) SIGN(${Plugin_NAME})
ELSE(Plugin_SRCS) ELSE(Plugin_SRCS)
ADD_CUSTOM_TARGET(${Plugin_NAME} ALL ADD_CUSTOM_TARGET(${Plugin_NAME} ALL
SOURCES ${Plugin_FILES} ${Plugin_TARGET_FILES} SOURCES ${Plugin_FILES} ${Plugin_TARGET_FILES}
) )
ENDIF(Plugin_SRCS) ENDIF(Plugin_SRCS)

View file

@ -1,25 +1,25 @@
SET( Plugin_NAME "TelldusCorePlugin" ) SET( Plugin_NAME "TelldusCorePlugin" )
SET( Plugin_PATH "com.telldus.core" ) SET( Plugin_PATH "com.telldus.core" )
SET( Plugin_SRCS SET( Plugin_SRCS
tellduscoreplugin.cpp tellduscoreplugin.cpp
tellduscoreobject.cpp tellduscoreobject.cpp
) )
SET( Plugin_HDRS SET( Plugin_HDRS
tellduscoreplugin.h tellduscoreplugin.h
) )
SET( Plugin_MOC_HDRS SET( Plugin_MOC_HDRS
tellduscoreobject.h tellduscoreobject.h
) )
SET( Plugin_EXTRA SET( Plugin_EXTRA
Device.js Device.js
DeviceCommands.js DeviceCommands.js
) )
FIND_PACKAGE(TelldusCore REQUIRED) FIND_PACKAGE(TelldusCore REQUIRED)
SET( Plugin_LIBRARIES ${TELLDUSCORE_LIBRARY} ) SET( Plugin_LIBRARIES ${TELLDUSCORE_LIBRARY} )
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

View file

@ -1,11 +1,11 @@
SET( Plugin_NAME "common" ) SET( Plugin_NAME "common" )
SET( Plugin_PATH "com" ) SET( Plugin_PATH "com" )
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )
SET( Plugin_NAME "telldus" ) SET( Plugin_NAME "telldus" )
SET( Plugin_PATH "com.telldus" ) SET( Plugin_PATH "com.telldus" )
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

View file

@ -1,27 +1,27 @@
SET(QT_USE_QTNETWORK TRUE) SET(QT_USE_QTNETWORK TRUE)
SET( Plugin_NAME "xPLPlugin" ) SET( Plugin_NAME "xPLPlugin" )
SET( Plugin_PATH "com.telldus.xpl" ) SET( Plugin_PATH "com.telldus.xpl" )
SET( Plugin_SRCS SET( Plugin_SRCS
xplplugin.cpp xplplugin.cpp
) )
SET( Plugin_HDRS SET( Plugin_HDRS
xplplugin.h xplplugin.h
) )
FIND_LIBRARY( QTXPL_LIBRARY qtxpl ) FIND_LIBRARY( QTXPL_LIBRARY qtxpl )
SET(QTXPL_INCLUDE_DIR "" CACHE PATH "Path to the directory which contains header files for qtxpl") SET(QTXPL_INCLUDE_DIR "" CACHE PATH "Path to the directory which contains header files for qtxpl")
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QTXPL_INCLUDE_DIR} ${QTXPL_INCLUDE_DIR}
) )
SET( Plugin_LIBRARIES SET( Plugin_LIBRARIES
${QTXPL_LIBRARY} ${QTXPL_LIBRARY}
) )
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

View file

@ -1,213 +1,213 @@
FIND_PACKAGE( Qt4 REQUIRED ) FIND_PACKAGE( Qt4 REQUIRED )
SET(QT_USE_QTSCRIPT TRUE) SET(QT_USE_QTSCRIPT TRUE)
SET(QT_USE_QTNETWORK TRUE) SET(QT_USE_QTNETWORK TRUE)
SET(QT_USE_QTUITOOLS TRUE) SET(QT_USE_QTUITOOLS TRUE)
IF (APPLE) IF (APPLE)
#This is a workaround for plugins that depends on libraries and will not copy these correctly #This is a workaround for plugins that depends on libraries and will not copy these correctly
SET(QT_USE_QTDECLARATIVE TRUE) SET(QT_USE_QTDECLARATIVE TRUE)
ENDIF() ENDIF()
INCLUDE( ${QT_USE_FILE} ) INCLUDE( ${QT_USE_FILE} )
FIND_PACKAGE( SignTool REQUIRED ) FIND_PACKAGE( SignTool REQUIRED )
if(COMMAND cmake_policy) if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
cmake_policy(SET CMP0005 NEW) cmake_policy(SET CMP0005 NEW)
endif(COMMAND cmake_policy) endif(COMMAND cmake_policy)
######## Non configurable options ######## ######## Non configurable options ########
SET( telldus-center_SRCS SET( telldus-center_SRCS
configurationdialog.cpp configurationdialog.cpp
main.cpp main.cpp
mainwindow.cpp mainwindow.cpp
scriptenvironment.cpp scriptenvironment.cpp
tellduscenterapplication.cpp tellduscenterapplication.cpp
AutoUpdater.cpp AutoUpdater.cpp
message.cpp message.cpp
plugintree.cpp plugintree.cpp
) )
SET( telldus-center_HDRS SET( telldus-center_HDRS
AutoUpdater.h AutoUpdater.h
CocoaInitializer.h CocoaInitializer.h
tellduscenterplugin.h tellduscenterplugin.h
plugintree.h plugintree.h
) )
SET( telldus-center_MOC_HDRS SET( telldus-center_MOC_HDRS
configurationdialog.h configurationdialog.h
mainwindow.h mainwindow.h
scriptenvironment.h scriptenvironment.h
tellduscenterapplication.h tellduscenterapplication.h
message.h message.h
) )
SET( telldus-center_RESOURCES SET( telldus-center_RESOURCES
TelldusCenter.icns TelldusCenter.icns
) )
SET( telldus-center_LANGS SET( telldus-center_LANGS
sv sv
) )
QT4_WRAP_CPP( telldus-center_MOC_SRCS ${telldus-center_MOC_HDRS} ) QT4_WRAP_CPP( telldus-center_MOC_SRCS ${telldus-center_MOC_HDRS} )
QT4_AUTOMOC ( ${telldus-center_SRCS} ) QT4_AUTOMOC ( ${telldus-center_SRCS} )
QT4_ADD_RESOURCES (telldus-center_RSRCS resource.qrc ) QT4_ADD_RESOURCES (telldus-center_RSRCS resource.qrc )
SET( telldus-center_LIBRARIES SET( telldus-center_LIBRARIES
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
ADD_DEFINITIONS( -DVERSION=${DISPLAYED_VERSION} ) ADD_DEFINITIONS( -DVERSION=${DISPLAYED_VERSION} )
######## Configurable options for the platform ######## ######## Configurable options for the platform ########
######## Platforms-specific, non configurable ######## ######## Platforms-specific, non configurable ########
SET( telldus-center_TARGET TelldusCenter ) SET( telldus-center_TARGET TelldusCenter )
IF (APPLE) #### Mac OS X #### IF (APPLE) #### Mac OS X ####
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
/usr/include/QtUiTools /usr/include/QtUiTools
) )
CONFIGURE_FILE( CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
${CMAKE_CURRENT_BINARY_DIR}/Info.plist ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
) )
LIST(APPEND telldus-center_SRCS LIST(APPEND telldus-center_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
) )
ELSEIF (WIN32) #### Windows #### ELSEIF (WIN32) #### Windows ####
ADD_DEFINITIONS( -DUNICODE ) ADD_DEFINITIONS( -DUNICODE )
CONFIGURE_FILE( CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/TelldusCenter.rc.in ${CMAKE_CURRENT_SOURCE_DIR}/TelldusCenter.rc.in
${CMAKE_CURRENT_BINARY_DIR}/TelldusCenter.rc ${CMAKE_CURRENT_BINARY_DIR}/TelldusCenter.rc
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${TELLDUSCORE_INCLUDE_DIR} ${TELLDUSCORE_INCLUDE_DIR}
) )
SET(CMAKE_EXE_LINKER_FLAGS SET(CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS" "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS"
) )
SET( telldus-center_LIBRARIES SET( telldus-center_LIBRARIES
${telldus-center_LIBRARIES} ${telldus-center_LIBRARIES}
"${QT_LIBRARY_DIR}/qtmain.lib" "${QT_LIBRARY_DIR}/qtmain.lib"
) )
SET(telldus-center_SRCS SET(telldus-center_SRCS
${telldus-center_SRCS} ${telldus-center_SRCS}
${CMAKE_CURRENT_BINARY_DIR}/TelldusCenter.rc ${CMAKE_CURRENT_BINARY_DIR}/TelldusCenter.rc
) )
ELSE (APPLE) #### Linux #### ELSE (APPLE) #### Linux ####
ADD_DEFINITIONS( -DPLUGIN_LIB_PATH=${CMAKE_INSTALL_PREFIX}/${PLUGIN_LIB_FULL_PATH} ) ADD_DEFINITIONS( -DPLUGIN_LIB_PATH=${CMAKE_INSTALL_PREFIX}/${PLUGIN_LIB_FULL_PATH} )
ENDIF (APPLE) ENDIF (APPLE)
######## QtSingleApplication ######## ######## QtSingleApplication ########
INCLUDE( ../3rdparty/qtsingleapplication.cmake NO_POLICY_SCOPE ) INCLUDE( ../3rdparty/qtsingleapplication.cmake NO_POLICY_SCOPE )
SET( telldus-center_SRCS SET( telldus-center_SRCS
${telldus-center_SRCS} ${telldus-center_SRCS}
${qtsingleapplication_SRCS} ${qtsingleapplication_SRCS}
) )
######## Configuring ######## ######## Configuring ########
####### i18n ######## ####### i18n ########
FOREACH(lang ${LANGUAGES}) FOREACH(lang ${LANGUAGES})
LIST(APPEND telldus-center_TS "${telldus-center_TARGET}_${lang}.ts") LIST(APPEND telldus-center_TS "${telldus-center_TARGET}_${lang}.ts")
ENDFOREACH(lang) ENDFOREACH(lang)
IF (UPDATE_TRANSLATIONS) IF (UPDATE_TRANSLATIONS)
QT4_CREATE_TRANSLATION( QM_FILES ${telldus-center_SRCS} ${telldus-center_TS} ) QT4_CREATE_TRANSLATION( QM_FILES ${telldus-center_SRCS} ${telldus-center_TS} )
ELSE (UPDATE_TRANSLATIONS) ELSE (UPDATE_TRANSLATIONS)
IF (UNIX) IF (UNIX)
SET_SOURCE_FILES_PROPERTIES(${telldus-center_TS} PROPERTIES SET_SOURCE_FILES_PROPERTIES(${telldus-center_TS} PROPERTIES
OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/TelldusCenter OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/TelldusCenter
) )
ENDIF () ENDIF ()
QT4_ADD_TRANSLATION(telldus-center_QM ${telldus-center_TS}) QT4_ADD_TRANSLATION(telldus-center_QM ${telldus-center_TS})
IF (APPLE) IF (APPLE)
INSTALL(FILES ${telldus-center_QM} DESTINATION /Applications/TelldusCenter.app/Contents/Resources) INSTALL(FILES ${telldus-center_QM} DESTINATION /Applications/TelldusCenter.app/Contents/Resources)
ENDIF () ENDIF ()
ENDIF (UPDATE_TRANSLATIONS) ENDIF (UPDATE_TRANSLATIONS)
ADD_EXECUTABLE(${telldus-center_TARGET} MACOSX_BUNDLE ADD_EXECUTABLE(${telldus-center_TARGET} MACOSX_BUNDLE
${telldus-center_SRCS} ${telldus-center_SRCS}
${telldus-center_MOC_SRCS} ${telldus-center_MOC_SRCS}
${telldus-center_RSRCS} ${telldus-center_RSRCS}
${telldus-center_RESOURCES} ${telldus-center_RESOURCES}
${telldus-center_TS} ${telldus-center_TS}
${telldus-center_QM} ${telldus-center_QM}
) )
SET_SOURCE_FILES_PROPERTIES(${telldus-center_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) SET_SOURCE_FILES_PROPERTIES(${telldus-center_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
TARGET_LINK_LIBRARIES( ${telldus-center_TARGET} ${telldus-center_LIBRARIES} ) TARGET_LINK_LIBRARIES( ${telldus-center_TARGET} ${telldus-center_LIBRARIES} )
SET_TARGET_PROPERTIES(${telldus-center_TARGET} PROPERTIES SET_TARGET_PROPERTIES(${telldus-center_TARGET} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
) )
SIGN(${telldus-center_TARGET}) SIGN(${telldus-center_TARGET})
IF (APPLE) IF (APPLE)
SET_TARGET_PROPERTIES(${telldus-center_TARGET} PROPERTIES SET_TARGET_PROPERTIES(${telldus-center_TARGET} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
) )
ADD_CUSTOM_COMMAND( TARGET ${telldus-center_TARGET} ADD_CUSTOM_COMMAND( TARGET ${telldus-center_TARGET}
POST_BUILD POST_BUILD
COMMAND mkdir -p "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Plugins/script/" COMMAND mkdir -p "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Plugins/script/"
) )
ENDIF (APPLE) ENDIF (APPLE)
IF (UNIX) IF (UNIX)
IF (GENERATE_MAN) IF (GENERATE_MAN)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
TARGET ${telldus-center_TARGET} TARGET ${telldus-center_TARGET}
POST_BUILD POST_BUILD
COMMAND xsltproc --nonet --param man.charmap.use.subset "0" /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/tellduscenter.man.xml COMMAND xsltproc --nonet --param man.charmap.use.subset "0" /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/tellduscenter.man.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generating man file TelldusCenter.1" COMMENT "Generating man file TelldusCenter.1"
) )
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelldusCenter.1 DESTINATION share/man/man1) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelldusCenter.1 DESTINATION share/man/man1)
ENDIF (GENERATE_MAN) ENDIF (GENERATE_MAN)
IF (NOT APPLE) IF (NOT APPLE)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/tellduscenter.xpm DESTINATION share/pixmaps) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/tellduscenter.xpm DESTINATION share/pixmaps)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tellduscenter.desktop DESTINATION share/applications) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tellduscenter.desktop DESTINATION share/applications)
ENDIF () ENDIF ()
ENDIF (UNIX) ENDIF (UNIX)
IF (WIN32) IF (WIN32)
ADD_CUSTOM_COMMAND( TARGET ${telldus-center_TARGET} ADD_CUSTOM_COMMAND( TARGET ${telldus-center_TARGET}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${telldus-center_QM} ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR} VERBATIM COMMAND ${CMAKE_COMMAND} -E copy ${telldus-center_QM} ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR} VERBATIM
COMMENT "Copying translation for TelldusCenter" COMMENT "Copying translation for TelldusCenter"
) )
ENDIF() ENDIF()
INSTALL(TARGETS ${telldus-center_TARGET} INSTALL(TARGETS ${telldus-center_TARGET}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
BUNDLE DESTINATION "/Applications" BUNDLE DESTINATION "/Applications"
) )
IF (APPLE) IF (APPLE)
INSTALL( INSTALL(
DIRECTORY ${QT_QTGUI_LIBRARY}/Resources/qt_menu.nib DIRECTORY ${QT_QTGUI_LIBRARY}/Resources/qt_menu.nib
DESTINATION /Applications/TelldusCenter.app/Contents/Resources DESTINATION /Applications/TelldusCenter.app/Contents/Resources
) )
INSTALL( INSTALL(
FILES qt.conf FILES qt.conf
DESTINATION /Applications/TelldusCenter.app/Contents/Resources DESTINATION /Applications/TelldusCenter.app/Contents/Resources
) )
INSTALL(CODE " INSTALL(CODE "
INCLUDE(BundleUtilities) INCLUDE(BundleUtilities)
GET_FILENAME_COMPONENT(DESTDIR \$ENV{DESTDIR} ABSOLUTE) GET_FILENAME_COMPONENT(DESTDIR \$ENV{DESTDIR} ABSOLUTE)
SET(app \"\${DESTDIR}/Applications/TelldusCenter.app\") SET(app \"\${DESTDIR}/Applications/TelldusCenter.app\")
GET_BUNDLE_AND_EXECUTABLE(\"\${app}\" bundle exe valid) GET_BUNDLE_AND_EXECUTABLE(\"\${app}\" bundle exe valid)
FIXUP_BUNDLE(\"\${bundle}\" \"\" \"\") FIXUP_BUNDLE(\"\${bundle}\" \"\" \"\")
") ")
ENDIF () ENDIF ()

View file

@ -1,197 +1,197 @@
FIND_PACKAGE( Qt4 REQUIRED ) FIND_PACKAGE( Qt4 REQUIRED )
INCLUDE( ${QT_USE_FILE} ) INCLUDE( ${QT_USE_FILE} )
FIND_PACKAGE( SignTool REQUIRED ) FIND_PACKAGE( SignTool REQUIRED )
if(COMMAND cmake_policy) if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy) endif(COMMAND cmake_policy)
######## Non configurable options ######## ######## Non configurable options ########
SET( telldus-gui_SRCS SET( telldus-gui_SRCS
telldusgui.cpp telldusgui.cpp
devicewidget.cpp devicewidget.cpp
devicemodel.cpp devicemodel.cpp
device.cpp device.cpp
editdevicedialog.cpp editdevicedialog.cpp
editgroupdialog.cpp editgroupdialog.cpp
filtereddeviceproxymodel.cpp filtereddeviceproxymodel.cpp
vendordevicemodel.cpp vendordevicemodel.cpp
vendordevicetreeitem.cpp vendordevicetreeitem.cpp
devicesettingarctechselflearning.cpp devicesettingarctechselflearning.cpp
devicesettingbrateck.cpp devicesettingbrateck.cpp
devicesettinggao.cpp devicesettinggao.cpp
devicesettingikea.cpp devicesettingikea.cpp
devicesettingnexa.cpp devicesettingnexa.cpp
devicesettingnexabell.cpp devicesettingnexabell.cpp
devicesettingrisingsun.cpp devicesettingrisingsun.cpp
devicesettingsartano.cpp devicesettingsartano.cpp
devicesettingselflearning.cpp devicesettingselflearning.cpp
devicesettingunitcode.cpp devicesettingunitcode.cpp
devicesettingupm.cpp devicesettingupm.cpp
devicesetting.cpp devicesetting.cpp
methodwidget.cpp methodwidget.cpp
deviceview.cpp deviceview.cpp
) )
SET( telldus-gui_HDRS SET( telldus-gui_HDRS
telldusgui.h telldusgui.h
) )
SET( telldus-gui_MOC_HDRS SET( telldus-gui_MOC_HDRS
devicewidget.h devicewidget.h
devicemodel.h devicemodel.h
device.h device.h
editdevicedialog.h editdevicedialog.h
editgroupdialog.h editgroupdialog.h
filtereddeviceproxymodel.h filtereddeviceproxymodel.h
vendordevicemodel.h vendordevicemodel.h
devicesettingarctechselflearning.h devicesettingarctechselflearning.h
devicesettingbrateck.h devicesettingbrateck.h
devicesettinggao.h devicesettinggao.h
devicesettingikea.h devicesettingikea.h
devicesettingnexa.h devicesettingnexa.h
devicesettingnexabell.h devicesettingnexabell.h
devicesettingrisingsun.h devicesettingrisingsun.h
devicesettingsartano.h devicesettingsartano.h
devicesettingselflearning.h devicesettingselflearning.h
devicesettingunitcode.h devicesettingunitcode.h
devicesettingupm.h devicesettingupm.h
devicesetting.h devicesetting.h
methodwidget.h methodwidget.h
deviceview.h deviceview.h
) )
QT4_WRAP_CPP( telldus-gui_MOC_SRCS ${telldus-gui_MOC_HDRS} ) QT4_WRAP_CPP( telldus-gui_MOC_SRCS ${telldus-gui_MOC_HDRS} )
QT4_AUTOMOC ( ${telldus-gui_SRCS} ) QT4_AUTOMOC ( ${telldus-gui_SRCS} )
QT4_ADD_RESOURCES (telldus-gui_RSRCS telldusgui.qrc data/${BRANDING}/resources.qrc ) QT4_ADD_RESOURCES (telldus-gui_RSRCS telldusgui.qrc data/${BRANDING}/resources.qrc )
LIST(APPEND telldus-gui_RSRCS data/${BRANDING}/devices.xml) LIST(APPEND telldus-gui_RSRCS data/${BRANDING}/devices.xml)
SET( telldus-gui_LIBRARIES SET( telldus-gui_LIBRARIES
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
FIND_PACKAGE(TelldusCore REQUIRED) FIND_PACKAGE(TelldusCore REQUIRED)
LIST(APPEND telldus-gui_LIBRARIES ${TELLDUSCORE_LIBRARY} ) LIST(APPEND telldus-gui_LIBRARIES ${TELLDUSCORE_LIBRARY} )
######## Configurable options for the platform ######## ######## Configurable options for the platform ########
######## Platforms-specific, non configurable ######## ######## Platforms-specific, non configurable ########
IF (APPLE) IF (APPLE)
#### Mac OS X #### #### Mac OS X ####
SET( telldus-gui_TARGET TelldusGui ) SET( telldus-gui_TARGET TelldusGui )
ADD_DEFINITIONS( ADD_DEFINITIONS(
-D_MACOSX -D_MACOSX
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
/usr/local/include /usr/local/include
) )
ELSEIF (WIN32) ELSEIF (WIN32)
#### Windows #### #### Windows ####
SET( telldus-gui_TARGET TelldusGui ) SET( telldus-gui_TARGET TelldusGui )
ADD_DEFINITIONS( ADD_DEFINITIONS(
-D_WINDOWS -D_WINDOWS
-DTELLDUSGUI_EXPORTS -DTELLDUSGUI_EXPORTS
) )
ELSE (APPLE) ELSE (APPLE)
#### Linux #### #### Linux ####
SET( telldus-gui_TARGET telldus-gui ) SET( telldus-gui_TARGET telldus-gui )
ADD_DEFINITIONS( ADD_DEFINITIONS(
-D_LINUX -D_LINUX
) )
ENDIF (APPLE) ENDIF (APPLE)
######## Configuring ######## ######## Configuring ########
####### i18n ######## ####### i18n ########
FOREACH(lang ${LANGUAGES}) FOREACH(lang ${LANGUAGES})
LIST(APPEND telldus-gui_TS "TelldusGui_${lang}.ts") LIST(APPEND telldus-gui_TS "TelldusGui_${lang}.ts")
ENDFOREACH(lang) ENDFOREACH(lang)
IF (UPDATE_TRANSLATIONS) IF (UPDATE_TRANSLATIONS)
QT4_CREATE_TRANSLATION( QM_FILES ${telldus-gui_SRCS} ${telldus-gui_TS} ) QT4_CREATE_TRANSLATION( QM_FILES ${telldus-gui_SRCS} ${telldus-gui_TS} )
ELSE (UPDATE_TRANSLATIONS) ELSE (UPDATE_TRANSLATIONS)
IF (APPLE) IF (APPLE)
SET_SOURCE_FILES_PROPERTIES(${telldus-gui_TS} PROPERTIES SET_SOURCE_FILES_PROPERTIES(${telldus-gui_TS} PROPERTIES
OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Resources OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Resources
) )
ELSEIF (UNIX) ELSEIF (UNIX)
SET_SOURCE_FILES_PROPERTIES(${telldus-gui_TS} PROPERTIES SET_SOURCE_FILES_PROPERTIES(${telldus-gui_TS} PROPERTIES
OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/TelldusCenter OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/TelldusCenter
) )
ENDIF (APPLE) ENDIF (APPLE)
QT4_ADD_TRANSLATION(telldus-gui_QM ${telldus-gui_TS}) QT4_ADD_TRANSLATION(telldus-gui_QM ${telldus-gui_TS})
ENDIF (UPDATE_TRANSLATIONS) ENDIF (UPDATE_TRANSLATIONS)
ADD_LIBRARY(${telldus-gui_TARGET} SHARED ADD_LIBRARY(${telldus-gui_TARGET} SHARED
${telldus-gui_SRCS} ${telldus-gui_SRCS}
${telldus-gui_HDRS} ${telldus-gui_HDRS}
${telldus-gui_MOC_SRCS} ${telldus-gui_MOC_SRCS}
${telldus-gui_RSRCS} ${telldus-gui_RSRCS}
${telldus-gui_TS} ${telldus-gui_TS}
${telldus-gui_QM} ${telldus-gui_QM}
) )
ADD_DEPENDENCIES(${telldus-gui_TARGET} TelldusCenter) ADD_DEPENDENCIES(${telldus-gui_TARGET} TelldusCenter)
IF (UNIX) IF (UNIX)
SET_TARGET_PROPERTIES( ${telldus-gui_TARGET} PROPERTIES COMPILE_FLAGS "-fPIC -fvisibility=hidden") SET_TARGET_PROPERTIES( ${telldus-gui_TARGET} PROPERTIES COMPILE_FLAGS "-fPIC -fvisibility=hidden")
ENDIF (UNIX) ENDIF (UNIX)
TARGET_LINK_LIBRARIES( ${telldus-gui_TARGET} ${telldus-gui_LIBRARIES} ) TARGET_LINK_LIBRARIES( ${telldus-gui_TARGET} ${telldus-gui_LIBRARIES} )
SIGN(${telldus-gui_TARGET}) SIGN(${telldus-gui_TARGET})
SET_TARGET_PROPERTIES(${telldus-gui_TARGET} PROPERTIES SET_TARGET_PROPERTIES(${telldus-gui_TARGET} PROPERTIES
FRAMEWORK TRUE FRAMEWORK TRUE
# PUBLIC_HEADER ${telldus-gui_HDRS} # PUBLIC_HEADER ${telldus-gui_HDRS}
VERSION ${PACKAGE_VERSION} VERSION ${PACKAGE_VERSION}
SOVERSION ${PACKAGE_SOVERSION} SOVERSION ${PACKAGE_SOVERSION}
INSTALL_NAME_DIR "/Library/Frameworks" INSTALL_NAME_DIR "/Library/Frameworks"
) )
IF (WIN32) IF (WIN32)
ADD_CUSTOM_COMMAND( TARGET ${telldus-gui_TARGET} ADD_CUSTOM_COMMAND( TARGET ${telldus-gui_TARGET}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${telldus-gui_QM} ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR} VERBATIM COMMAND ${CMAKE_COMMAND} -E copy ${telldus-gui_QM} ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR} VERBATIM
COMMENT "Copying translation for TelldusGUI" COMMENT "Copying translation for TelldusGUI"
) )
ENDIF() ENDIF()
IF (UNIX) IF (UNIX)
INSTALL(TARGETS ${telldus-gui_TARGET} INSTALL(TARGETS ${telldus-gui_TARGET}
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
FRAMEWORK DESTINATION /Applications/TelldusCenter.app/Contents/Frameworks FRAMEWORK DESTINATION /Applications/TelldusCenter.app/Contents/Frameworks
# PUBLIC_HEADER DESTINATION ${HEADER_DIR} # PUBLIC_HEADER DESTINATION ${HEADER_DIR}
) )
IF (APPLE) IF (APPLE)
INSTALL(CODE " INSTALL(CODE "
INCLUDE(BundleUtilities) INCLUDE(BundleUtilities)
GET_FILENAME_COMPONENT(DESTDIR \$ENV{DESTDIR} ABSOLUTE) GET_FILENAME_COMPONENT(DESTDIR \$ENV{DESTDIR} ABSOLUTE)
SET(lib \"\${DESTDIR}/Applications/TelldusCenter.app/Contents/Frameworks/${telldus-gui_TARGET}.framework/${telldus-gui_TARGET}\") SET(lib \"\${DESTDIR}/Applications/TelldusCenter.app/Contents/Frameworks/${telldus-gui_TARGET}.framework/${telldus-gui_TARGET}\")
GET_ITEM_KEY(\"\${lib}\" pkey) GET_ITEM_KEY(\"\${lib}\" pkey)
SET(prereqs \"\") SET(prereqs \"\")
GET_PREREQUISITES(\${lib} prereqs 1 0 \"\${exe}\" \"\${bundle}/Contents/Frameworks/\") GET_PREREQUISITES(\${lib} prereqs 1 0 \"\${exe}\" \"\${bundle}/Contents/Frameworks/\")
FOREACH(pr \${prereqs}) FOREACH(pr \${prereqs})
GET_ITEM_KEY(\"\${pr}\" rkey) GET_ITEM_KEY(\"\${pr}\" rkey)
#Don't change the path to TelldusCore #Don't change the path to TelldusCore
IF (NOT \"\${rkey}\" STREQUAL \"TelldusCore\") IF (NOT \"\${rkey}\" STREQUAL \"TelldusCore\")
#Check to see if this is ourself #Check to see if this is ourself
IF (NOT \${pkey} STREQUAL \${rkey}) IF (NOT \${pkey} STREQUAL \${rkey})
SET(kv \"\") SET(kv \"\")
SET_BUNDLE_KEY_VALUES(kv \"\${pr}\" \"\${pr}\" \"\${exe}\" \"\${bundle}/Contents/Frameworks/\" 0) SET_BUNDLE_KEY_VALUES(kv \"\${pr}\" \"\${pr}\" \"\${exe}\" \"\${bundle}/Contents/Frameworks/\" 0)
EXECUTE_PROCESS(COMMAND install_name_tool EXECUTE_PROCESS(COMMAND install_name_tool
-change \"\${pr}\" \"\${\${rkey}_EMBEDDED_ITEM}\" \"\${lib}\" -change \"\${pr}\" \"\${\${rkey}_EMBEDDED_ITEM}\" \"\${lib}\"
) )
ENDIF () ENDIF ()
ENDIF () ENDIF ()
ENDFOREACH() ENDFOREACH()
") ")
ENDIF () ENDIF ()
ENDIF () ENDIF ()

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf8" ?> <?xml version="1.0" encoding="utf8" ?>
<devices> <devices>
<type name="Remote Switches" expanded="true"> <type name="Remote Switches" expanded="true">
<!--<text></text> --> <!--<text></text> -->
<vendor name="HomeEasy" image="homeeasy"> <vendor name="HomeEasy" image="homeeasy">
<!--<text>http://www.homeeasy.eu/home.php</text>--> <!--<text>http://www.homeeasy.eu/home.php</text>-->
<device model="selflearning-switch:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
</vendor> </vendor>
</devices> </devices>

View file

@ -1,12 +1,12 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file alias="data/devices.xml">devices.xml</file> <file alias="data/devices.xml">devices.xml</file>
<file>../../images/devices/arctech_cs.png</file> <file>../../images/devices/arctech_cs.png</file>
<file>../../images/devices/arctech_sl.png</file> <file>../../images/devices/arctech_sl.png</file>
<file>../../images/devices/bell.png</file> <file>../../images/devices/bell.png</file>
<file>../../images/devices/elro.png</file> <file>../../images/devices/elro.png</file>
<file>../../images/devices/elro-ab600.png</file> <file>../../images/devices/elro-ab600.png</file>
<file>../../images/vendors/elro.png</file> <file>../../images/vendors/elro.png</file>
<file>../../images/vendors/homeeasy.png</file> <file>../../images/vendors/homeeasy.png</file>
</qresource> </qresource>
</RCC> </RCC>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf8" ?> <?xml version="1.0" encoding="utf8" ?>
<devices> <devices>
<type name="Remote Switches" expanded="true"> <type name="Remote Switches" expanded="true">
<vendor name="Chacon" image="chacon"> <vendor name="Chacon" image="chacon">
<device model="selflearning-switch:chacon" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:chacon" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
</vendor> </vendor>
</devices> </devices>

View file

@ -1,8 +1,8 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file alias="data/devices.xml">devices.xml</file> <file alias="data/devices.xml">devices.xml</file>
<file>../../images/devices/arctech_cs.png</file> <file>../../images/devices/arctech_cs.png</file>
<file>../../images/devices/arctech_sl.png</file> <file>../../images/devices/arctech_sl.png</file>
<file>../../images/vendors/chacon.png</file> <file>../../images/vendors/chacon.png</file>
</qresource> </qresource>
</RCC> </RCC>

View file

@ -1,131 +1,131 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<devices> <devices>
<type name="Remote Switches" expanded="true"> <type name="Remote Switches" expanded="true">
<!--<text></text> --> <!--<text></text> -->
<vendor name="Brennenstuhl" image="brennenstuhl"> <vendor name="Brennenstuhl" image="brennenstuhl">
<device model="codeswitch:brennenstuhl" protocol="sartano" widget="2" image="brennenstuhl_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:brennenstuhl" protocol="sartano" widget="2" image="brennenstuhl_cs" name="Code Switch">Code Switch</device>
</vendor> </vendor>
<vendor name="Bye Bye Standby" image="byebyelogo"> <vendor name="Bye Bye Standby" image="byebyelogo">
<!--<text></text>--> <!--<text></text>-->
<device model="codeswitch:byebyestandby" protocol="arctech" widget="1" image="byebye" name="Code Switch">Code Switch</device> <device model="codeswitch:byebyestandby" protocol="arctech" widget="1" image="byebye" name="Code Switch">Code Switch</device>
</vendor> </vendor>
<vendor name="Chacon" image="chacon"> <vendor name="Chacon" image="chacon">
<!--<text></text>--> <!--<text></text>-->
<device model="codeswitch:chacon" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:chacon" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:chacon" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:chacon" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
<device model="selflearning-dimmer:chacon" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:chacon" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
<device model="bell:chacon" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device> <device model="bell:chacon" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
</vendor> </vendor>
<vendor name="CoCo Technologies" image="coco"> <vendor name="CoCo Technologies" image="coco">
<!--<text>http://www.coco-technology.com/index_EN.htm</text>--> <!--<text>http://www.coco-technology.com/index_EN.htm</text>-->
<device model="codeswitch:coco" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:coco" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:coco" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:coco" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
<device model="selflearning-dimmer:coco" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:coco" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
<device model="bell:coco" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device> <device model="bell:coco" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
</vendor> </vendor>
<vendor name="Conrad" image="conrad"> <vendor name="Conrad" image="conrad">
<device model="selflearning:conrad" protocol="risingsun" widget="12" image="conrad-rsl888" name="Self Learning">Self Learning</device> <device model="selflearning:conrad" protocol="risingsun" widget="12" image="conrad-rsl888" name="Self Learning">Self Learning</device>
</vendor> </vendor>
<vendor name="Ecosavers" image="ecosavers"> <vendor name="Ecosavers" image="ecosavers">
<device model="ecosavers:ecosavers" protocol="silvanchip" widget="14" image="ecosavers" name="Self Learning">Self Learning</device> <device model="ecosavers:ecosavers" protocol="silvanchip" widget="14" image="ecosavers" name="Self Learning">Self Learning</device>
</vendor> </vendor>
<vendor name="Elro" image="elro"> <vendor name="Elro" image="elro">
<!--<text>http://www.elro-nl.com/elro-en-05/home.htm</text> --> <!--<text>http://www.elro-nl.com/elro-en-05/home.htm</text> -->
<device model="codeswitch:elro" protocol="sartano" widget="2" image="elro" name="Code Switch">Code Switch</device> <device model="codeswitch:elro" protocol="sartano" widget="2" image="elro" name="Code Switch">Code Switch</device>
<device model="codeswitch:elro-ab600" protocol="arctech" widget="1" image="elro-ab600" name="Code Switch - System AB600">Code Switch - System AB600</device> <device model="codeswitch:elro-ab600" protocol="arctech" widget="1" image="elro-ab600" name="Code Switch - System AB600">Code Switch - System AB600</device>
</vendor> </vendor>
<vendor name="GAO" image="gao"> <vendor name="GAO" image="gao">
<!--<text>http://www.everflourish.com.cn/</text> --> <!--<text>http://www.everflourish.com.cn/</text> -->
<device model="codeswitch:gao" protocol="risingsun" widget="10" image="gao_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:gao" protocol="risingsun" widget="10" image="gao_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:gao" protocol="everflourish" widget="11" image="gao_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:gao" protocol="everflourish" widget="11" image="gao_sl" name="Self Learning on/off">Self Learning on/off</device>
</vendor> </vendor>
<vendor name="Goobay (experimental)" image="goobay"> <vendor name="Goobay (experimental)" image="goobay">
<device model="goobay:goobay" protocol="yidong" widget="13" image="goobay" name="Code Switch">Code Switch</device> <device model="goobay:goobay" protocol="yidong" widget="13" image="goobay" name="Code Switch">Code Switch</device>
</vendor> </vendor>
<vendor name="HomeEasy (UK only)" image="homeeasy"> <vendor name="HomeEasy (UK only)" image="homeeasy">
<!--<text>http://www.homeeasy.eu/home.php</text>--> <!--<text>http://www.homeeasy.eu/home.php</text>-->
<device model="codeswitch:homeeasy" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:homeeasy" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
<device model="selflearning-dimmer:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
</vendor> </vendor>
<vendor name="HQ" image="hq"> <vendor name="HQ" image="hq">
<device model="codeswitch:fuhaote" protocol="fuhaote" widget="2" image="hq_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:fuhaote" protocol="fuhaote" widget="2" image="hq_cs" name="Code Switch">Code Switch</device>
</vendor> </vendor>
<vendor name="IKEA" image="ikea"> <vendor name="IKEA" image="ikea">
<device model="selflearning:ikea" protocol="ikea" widget="3" image="koppla">Koppla</device> <device model="selflearning:ikea" protocol="ikea" widget="3" image="koppla">Koppla</device>
</vendor> </vendor>
<vendor name="Intertechno" image="intertechno"> <vendor name="Intertechno" image="intertechno">
<!--<text>http://www.intertechno.at/</text> --> <!--<text>http://www.intertechno.at/</text> -->
<device model="codeswitch:intertechno" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:intertechno" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:intertechno" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:intertechno" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
<device model="selflearning-dimmer:intertechno" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:intertechno" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
<device model="bell:intertechno" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device> <device model="bell:intertechno" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
</vendor> </vendor>
<vendor name="Kappa" image="kappa"> <vendor name="Kappa" image="kappa">
<!--<text>http://www.kappak.sk</text> --> <!--<text>http://www.kappak.sk</text> -->
<device model="codeswitch:kappa" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:kappa" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:kappa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:kappa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
<device model="selflearning-dimmer:kappa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:kappa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
<device model="bell:kappa" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device> <device model="bell:kappa" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
</vendor> </vendor>
<vendor name="Kjell o Company" image="kjelloco"> <vendor name="Kjell o Company" image="kjelloco">
<!--<text>http://www.kjell.com/</text> --> <!--<text>http://www.kjell.com/</text> -->
<device model="codeswitch:kjelloco" protocol="risingsun" widget="5" image="risingsun_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:kjelloco" protocol="risingsun" widget="5" image="risingsun_cs" name="Code Switch">Code Switch</device>
</vendor> </vendor>
<vendor name="KlikAanKlikUit" image="klikaanklikuit"> <vendor name="KlikAanKlikUit" image="klikaanklikuit">
<!--<text>http://www.klikaanklikuit.nl/producten.asp</text> --> <!--<text>http://www.klikaanklikuit.nl/producten.asp</text> -->
<device model="codeswitch:klikaanklikuit" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:klikaanklikuit" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:klikaanklikuit" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:klikaanklikuit" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
<device model="selflearning-dimmer:klikaanklikuit" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:klikaanklikuit" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
<device model="bell:klikaanklikuit" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device> <device model="bell:klikaanklikuit" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
</vendor> </vendor>
<vendor name="Nexa" image="nexa"> <vendor name="Nexa" image="nexa">
<!--<text>http://www.nexa.se/</text> --> <!--<text>http://www.nexa.se/</text> -->
<device model="codeswitch:nexa" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:nexa" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:nexa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:nexa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
<device model="selflearning-dimmer:nexa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:nexa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
<device model="bell:nexa" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device> <device model="bell:nexa" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
</vendor> </vendor>
<vendor name="Otio" image="otio"> <vendor name="Otio" image="otio">
<device model="selflearning:otio" protocol="risingsun" widget="12" image="otio" name="Self Learning">Self Learning</device> <device model="selflearning:otio" protocol="risingsun" widget="12" image="otio" name="Self Learning">Self Learning</device>
</vendor> </vendor>
<vendor name="Proove" image="proove"> <vendor name="Proove" image="proove">
<!--<text>http://www.proove.se/</text> --> <!--<text>http://www.proove.se/</text> -->
<device model="codeswitch:proove" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:proove" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
<device model="selflearning-switch:proove" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device> <device model="selflearning-switch:proove" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
<device model="selflearning-dimmer:proove" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:proove" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
<device model="bell:proove" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device> <device model="bell:proove" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
</vendor> </vendor>
<vendor name="Rusta" image="rusta"> <vendor name="Rusta" image="rusta">
<!--<text>http://www.rusta.se/</text> --> <!--<text>http://www.rusta.se/</text> -->
<device model="codeswitch:rusta" protocol="sartano" widget="2" image="zke-2603" name="Code Switch">Code Switch</device> <device model="codeswitch:rusta" protocol="sartano" widget="2" image="zke-2603" name="Code Switch">Code Switch</device>
<device model="selflearning-dimmer:rusta" protocol="arctech" widget="8" image="fr004r" name="Self Learning dimmer">Self Learning dimmer</device> <device model="selflearning-dimmer:rusta" protocol="arctech" widget="8" image="fr004r" name="Self Learning dimmer">Self Learning dimmer</device>
</vendor> </vendor>
<vendor name="Sartano" image="sartano"> <vendor name="Sartano" image="sartano">
<!--<text></text> --> <!--<text></text> -->
<device model="codeswitch:sartano" protocol="sartano" widget="2" image="sartano" name="Code Switch">Code Switch</device> <device model="codeswitch:sartano" protocol="sartano" widget="2" image="sartano" name="Code Switch">Code Switch</device>
</vendor> </vendor>
<vendor name="UPM" image="upm"> <vendor name="UPM" image="upm">
<device model="selflearning:upm" protocol="upm" widget="9" image="upm_sl" name="Self Learning">Self Learning</device> <device model="selflearning:upm" protocol="upm" widget="9" image="upm_sl" name="Self Learning">Self Learning</device>
</vendor> </vendor>
<vendor name="Waveman" image="waveman"> <vendor name="Waveman" image="waveman">
<!--<text></text> --> <!--<text></text> -->
<device model="codeswitch:waveman" protocol="waveman" widget="1" image="waveman_cs" name="Code Switch">Code Switch</device> <device model="codeswitch:waveman" protocol="waveman" widget="1" image="waveman_cs" name="Code Switch">Code Switch</device>
</vendor> </vendor>
<vendor name="X10 (experimental)" image="x10"> <vendor name="X10 (experimental)" image="x10">
<!--<text></text> --> <!--<text></text> -->
<device model="codeswitch:x10" protocol="x10" widget="1" image="x10" name="Code Switch">Code Switch</device> <device model="codeswitch:x10" protocol="x10" widget="1" image="x10" name="Code Switch">Code Switch</device>
</vendor> </vendor>
</type> </type>
<type name="Projector screens and blinds" expanded="true"> <type name="Projector screens and blinds" expanded="true">
<vendor name="Hasta" image="hasta"> <vendor name="Hasta" image="hasta">
<device model="selflearning:hasta" protocol="hasta" widget="16" image="hasta">Blinds</device> <device model="selflearning:hasta" protocol="hasta" widget="16" image="hasta">Blinds</device>
</vendor> </vendor>
<vendor name="Roxcore" image="roxcore"> <vendor name="Roxcore" image="roxcore">
<device model="codeswitch:roxcore" protocol="brateck" widget="6" image="projectorscreen">Projector screen</device> <device model="codeswitch:roxcore" protocol="brateck" widget="6" image="projectorscreen">Projector screen</device>
</vendor> </vendor>
<vendor name="KingPin" image="kingpin"> <vendor name="KingPin" image="kingpin">
<device model="kp100:kingpin" protocol="silvanchip" widget="15" image="kp100">KP100</device> <device model="kp100:kingpin" protocol="silvanchip" widget="15" image="kp100">KP100</device>
</vendor> </vendor>
</type> </type>
</devices> </devices>

View file

@ -1,57 +1,57 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file alias="data/devices.xml">devices.xml</file> <file alias="data/devices.xml">devices.xml</file>
<file>../../images/devices/arctech_cs.png</file> <file>../../images/devices/arctech_cs.png</file>
<file>../../images/devices/arctech_sl.png</file> <file>../../images/devices/arctech_sl.png</file>
<file>../../images/devices/bell.png</file> <file>../../images/devices/bell.png</file>
<file>../../images/devices/byebye.png</file> <file>../../images/devices/byebye.png</file>
<file>../../images/devices/brennenstuhl_cs.png</file> <file>../../images/devices/brennenstuhl_cs.png</file>
<file>../../images/devices/conrad-rsl888.png</file> <file>../../images/devices/conrad-rsl888.png</file>
<file>../../images/devices/ecosavers.png</file> <file>../../images/devices/ecosavers.png</file>
<file>../../images/devices/elro.png</file> <file>../../images/devices/elro.png</file>
<file>../../images/devices/elro-ab600.png</file> <file>../../images/devices/elro-ab600.png</file>
<file>../../images/devices/fr004r.png</file> <file>../../images/devices/fr004r.png</file>
<file>../../images/devices/goobay.png</file> <file>../../images/devices/goobay.png</file>
<file>../../images/devices/gao_cs.png</file> <file>../../images/devices/gao_cs.png</file>
<file>../../images/devices/gao_sl.png</file> <file>../../images/devices/gao_sl.png</file>
<file>../../images/devices/hasta.png</file> <file>../../images/devices/hasta.png</file>
<file>../../images/devices/hq_cs.png</file> <file>../../images/devices/hq_cs.png</file>
<file>../../images/devices/koppla.png</file> <file>../../images/devices/koppla.png</file>
<file>../../images/devices/kp100.png</file> <file>../../images/devices/kp100.png</file>
<file>../../images/devices/otio.png</file> <file>../../images/devices/otio.png</file>
<file>../../images/devices/projectorscreen.png</file> <file>../../images/devices/projectorscreen.png</file>
<file>../../images/devices/risingsun_cs.png</file> <file>../../images/devices/risingsun_cs.png</file>
<file>../../images/devices/sartano.png</file> <file>../../images/devices/sartano.png</file>
<file>../../images/devices/upm_sl.png</file> <file>../../images/devices/upm_sl.png</file>
<file>../../images/devices/waveman_cs.png</file> <file>../../images/devices/waveman_cs.png</file>
<file>../../images/devices/x10.png</file> <file>../../images/devices/x10.png</file>
<file>../../images/devices/zke-2603.png</file> <file>../../images/devices/zke-2603.png</file>
<file>../../images/vendors/byebyelogo.png</file> <file>../../images/vendors/byebyelogo.png</file>
<file>../../images/vendors/chacon.png</file> <file>../../images/vendors/chacon.png</file>
<file>../../images/vendors/coco.png</file> <file>../../images/vendors/coco.png</file>
<file>../../images/vendors/conrad.png</file> <file>../../images/vendors/conrad.png</file>
<file>../../images/vendors/brennenstuhl.png</file> <file>../../images/vendors/brennenstuhl.png</file>
<file>../../images/vendors/ecosavers.png</file> <file>../../images/vendors/ecosavers.png</file>
<file>../../images/vendors/elro.png</file> <file>../../images/vendors/elro.png</file>
<file>../../images/vendors/goobay.png</file> <file>../../images/vendors/goobay.png</file>
<file>../../images/vendors/gao.png</file> <file>../../images/vendors/gao.png</file>
<file>../../images/vendors/hasta.png</file> <file>../../images/vendors/hasta.png</file>
<file>../../images/vendors/homeeasy.png</file> <file>../../images/vendors/homeeasy.png</file>
<file>../../images/vendors/hq.png</file> <file>../../images/vendors/hq.png</file>
<file>../../images/vendors/ikea.png</file> <file>../../images/vendors/ikea.png</file>
<file>../../images/vendors/intertechno.png</file> <file>../../images/vendors/intertechno.png</file>
<file>../../images/vendors/kappa.png</file> <file>../../images/vendors/kappa.png</file>
<file>../../images/vendors/kingpin.png</file> <file>../../images/vendors/kingpin.png</file>
<file>../../images/vendors/kjelloco.png</file> <file>../../images/vendors/kjelloco.png</file>
<file>../../images/vendors/klikaanklikuit.png</file> <file>../../images/vendors/klikaanklikuit.png</file>
<file>../../images/vendors/nexa.png</file> <file>../../images/vendors/nexa.png</file>
<file>../../images/vendors/otio.png</file> <file>../../images/vendors/otio.png</file>
<file>../../images/vendors/proove.png</file> <file>../../images/vendors/proove.png</file>
<file>../../images/vendors/roxcore.png</file> <file>../../images/vendors/roxcore.png</file>
<file>../../images/vendors/rusta.png</file> <file>../../images/vendors/rusta.png</file>
<file>../../images/vendors/sartano.png</file> <file>../../images/vendors/sartano.png</file>
<file>../../images/vendors/upm.png</file> <file>../../images/vendors/upm.png</file>
<file>../../images/vendors/waveman.png</file> <file>../../images/vendors/waveman.png</file>
<file>../../images/vendors/x10.png</file> <file>../../images/vendors/x10.png</file>
</qresource> </qresource>
</RCC> </RCC>

View file

@ -9,7 +9,7 @@ class MethodDelegate : public QStyledItemDelegate {
public: public:
MethodDelegate( QWidget *parent = 0 ); MethodDelegate( QWidget *parent = 0 );
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
}; };
DeviceView::DeviceView(QWidget *parent) DeviceView::DeviceView(QWidget *parent)
@ -51,15 +51,15 @@ MethodDelegate::MethodDelegate( QWidget *parent )
:QStyledItemDelegate(parent) :QStyledItemDelegate(parent)
{} {}
QWidget *MethodDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem & /* option */, const QModelIndex &index) const { QWidget *MethodDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem & /* option */, const QModelIndex &index) const {
DeviceView *p = qobject_cast<DeviceView *>(this->parent()); DeviceView *p = qobject_cast<DeviceView *>(this->parent());
if (!p) { if (!p) {
return 0; return 0;
} }
DeviceModel *model = qobject_cast<DeviceModel*>( p->model() ); DeviceModel *model = qobject_cast<DeviceModel*>( p->model() );
if (!model) { if (!model) {
return 0; return 0;
} }
MethodWidget *widget = new MethodWidget(model->device(index), parent); MethodWidget *widget = new MethodWidget(model->device(index), parent);
return widget; return widget;
} }

View file

@ -1,18 +1,18 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file>images/bell.png</file> <file>images/bell.png</file>
<file>images/list-add.png</file> <file>images/list-add.png</file>
<file>images/list-edit.png</file> <file>images/list-edit.png</file>
<file>images/list-remove.png</file> <file>images/list-remove.png</file>
<file>images/state_1.png</file> <file>images/state_1.png</file>
<file>images/state_2.png</file> <file>images/state_2.png</file>
<file>images/state_16.png</file> <file>images/state_16.png</file>
<file>images/state_dimmed_25.png</file> <file>images/state_dimmed_25.png</file>
<file>images/state_dimmed_50.png</file> <file>images/state_dimmed_50.png</file>
<file>images/state_dimmed_75.png</file> <file>images/state_dimmed_75.png</file>
<file>images/execute.png</file> <file>images/execute.png</file>
<file>images/up.png</file> <file>images/up.png</file>
<file>images/down.png</file> <file>images/down.png</file>
<file>images/stop.png</file> <file>images/stop.png</file>
</qresource> </qresource>
</RCC> </RCC>

View file

@ -1,15 +1,15 @@
FIND_LIBRARY( QCA_LIBRARY qca ) FIND_LIBRARY( QCA_LIBRARY qca )
IF (WIN32) IF (WIN32)
GET_FILENAME_COMPONENT(QCA_PATH ${QCA_LIBRARY} PATH) GET_FILENAME_COMPONENT(QCA_PATH ${QCA_LIBRARY} PATH)
MESSAGE(${QCA_PATH}) MESSAGE(${QCA_PATH})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QCA_PATH}/../include/QtCrypto/ ${QCA_PATH}/../include/QtCrypto/
) )
ELSE(WIN32) ELSE(WIN32)
#Maybe not so pretty, should be done better #Maybe not so pretty, should be done better
INCLUDE_DIRECTORIES( /usr/include/qca2/QtCrypto/ /usr/include/QtCrypto/ ) INCLUDE_DIRECTORIES( /usr/include/qca2/QtCrypto/ /usr/include/QtCrypto/ )
ENDIF (WIN32) ENDIF (WIN32)

View file

@ -1,19 +1,19 @@
IF(WIN32) IF(WIN32)
SET(SIGN_FILES FALSE CACHE BOOL "Sign files ofter build") SET(SIGN_FILES FALSE CACHE BOOL "Sign files ofter build")
ENDIF() ENDIF()
FUNCTION(SIGN TARGET) FUNCTION(SIGN TARGET)
IF (NOT WIN32) IF (NOT WIN32)
RETURN() RETURN()
ENDIF() ENDIF()
IF (NOT SIGN_FILES) IF (NOT SIGN_FILES)
RETURN() RETURN()
ENDIF() ENDIF()
GET_TARGET_PROPERTY(file ${TARGET} LOCATION) GET_TARGET_PROPERTY(file ${TARGET} LOCATION)
GET_FILENAME_COMPONENT(filename ${file} NAME) GET_FILENAME_COMPONENT(filename ${file} NAME)
ADD_CUSTOM_COMMAND( TARGET ${TARGET} POST_BUILD ADD_CUSTOM_COMMAND( TARGET ${TARGET} POST_BUILD
COMMAND signtool.exe sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll ${file} COMMAND signtool.exe sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll ${file}
COMMENT "Signing file ${filename}" COMMENT "Signing file ${filename}"
) )
ENDFUNCTION() ENDFUNCTION()

View file

@ -1,21 +1,21 @@
IF (APPLE) IF (APPLE)
FIND_LIBRARY( TELLDUSCORE_LIBRARY TelldusCore ) FIND_LIBRARY( TELLDUSCORE_LIBRARY TelldusCore )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${TELLDUSCORE_LIBRARY}/Headers ${TELLDUSCORE_LIBRARY}/Headers
) )
ELSEIF (WIN32) ELSEIF (WIN32)
SET(TELLDUSCORE_LIBRARY ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusCore.lib) SET(TELLDUSCORE_LIBRARY ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusCore.lib)
SET(TELLDUSCORE_INCLUDE_PATH ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/) SET(TELLDUSCORE_INCLUDE_PATH ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/)
ELSE (APPLE) ELSE (APPLE)
FIND_LIBRARY( TELLDUSCORE_LIBRARY telldus-core ) FIND_LIBRARY( TELLDUSCORE_LIBRARY telldus-core )
ENDIF(APPLE) ENDIF(APPLE)
IF(TELLDUSCORE_INCLUDE_PATH) IF(TELLDUSCORE_INCLUDE_PATH)
INCLUDE_DIRECTORIES(${TELLDUSCORE_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${TELLDUSCORE_INCLUDE_PATH})
ENDIF() ENDIF()