diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index d40d864..bf226aa 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW) project (awesome-widgets) set (PROJECT_VERSION_MAJOR 2) set (PROJECT_VERSION_MINOR 0) -set (PROJECT_VERSION_PATCH 1) +set (PROJECT_VERSION_PATCH 2) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index 268b69d..6fb5806 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -134,11 +134,11 @@ float AwesomeWidget::getTemp(const float temp) else if (configuration[QString("tempUnits")] == QString("Reaumur")) convertedTemp = temp * 0.8; else if (configuration[QString("tempUnits")] == QString("cm^-1")) - convertedTemp = temp * 0.695; + convertedTemp = (temp + 273.15) * 0.695; else if (configuration[QString("tempUnits")] == QString("kJ/mol")) - convertedTemp = temp * 8.31; + convertedTemp = (temp + 273.15) * 8.31; else if (configuration[QString("tempUnits")] == QString("kcal/mol")) - convertedTemp = temp * 1.98; + convertedTemp = (temp + 273.15) * 1.98; return convertedTemp; } diff --git a/sources/desktop-panel/desktop-panel.cpp b/sources/desktop-panel/desktop-panel.cpp index 8c81b96..6443746 100644 --- a/sources/desktop-panel/desktop-panel.cpp +++ b/sources/desktop-panel/desktop-panel.cpp @@ -211,6 +211,7 @@ void DesktopPanel::reinit() for (int i=0; isetWordWrap(false); + qDebug() << labels[i]->styleSheet(); layout->addItem(labels[i]); } // right stretch