Small changes

* move logging ini file from dataengine to library
* improve dataengine desktop file
* fix configuration warnings with the newest plasma
This commit is contained in:
2016-03-17 19:19:10 +03:00
parent 07c753b703
commit 453d4d5149
5 changed files with 6 additions and 8 deletions

View File

@ -13,6 +13,7 @@ include_directories(
file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
file(GLOB SUBPROJECT_HEADER *.h ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.h)
file(GLOB SUBPROJECT_UI *.ui)
file(GLOB SUBPROJECT_INI *.ini)
set(SUBPROJECT_CONFIGS ${CMAKE_CURRENT_SOURCE_DIR}/configs)
set(SUBPROJECT_GRAPHITEMS ${CMAKE_CURRENT_SOURCE_DIR}/desktops)
set(SUBPROJECT_QUOTES ${CMAKE_CURRENT_SOURCE_DIR}/quotes)
@ -36,4 +37,5 @@ install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT
install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
install(FILES ${SUBPROJECT_INI} DESTINATION ${CONFIG_INSTALL_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/weather)

View File

@ -0,0 +1,17 @@
[Rules]
org.kde.plasma.awesomewidget.debug=true
org.kde.plasma.awesomewidget.info=true
org.kde.plasma.awesomewidget.warning=true
org.kde.plasma.awesomewidget.critical=true
org.kde.plasma.desktoppanel.debug=true
org.kde.plasma.desktoppanel.info=true
org.kde.plasma.desktoppanel.warning=true
org.kde.plasma.desktoppanel.critical=true
org.kde.plasma.extsysmon.debug=true
org.kde.plasma.extsysmon.info=true
org.kde.plasma.extsysmon.warning=true
org.kde.plasma.extsysmon.critical=true
org.kde.plasma.awesomewidgets.debug=true
org.kde.plasma.awesomewidgets.info=true
org.kde.plasma.awesomewidgets.warning=true
org.kde.plasma.awesomewidgets.critical=true

View File

@ -551,8 +551,8 @@ void GraphicalItem::changeValue(const int state)
{
qCDebug(LOG_LIB) << "Current state is" << state;
ui->widget_value->setHidden(state == Qt::Unchecked);
ui->widget_customValue->setHidden(state != Qt::Unchecked);
ui->widget_value->setHidden(state != Qt::Unchecked);
ui->widget_customValue->setHidden(state == Qt::Unchecked);
}