arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-10-31 05:13:40 +00:00
Code Issues Projects Releases Wiki Activity

edit temp conversion

Browse Source
This commit is contained in:
arcan1s
2014-09-13 03:06:00 +04:00
parent 1d1fe469f8
commit 43daae5529
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/CMakeLists.txt
View File

@ -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)

6
sources/awesome-widget/awesome-widget.cpp
View File

@ -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;
}

1
sources/desktop-panel/desktop-panel.cpp
View File

@ -211,6 +211,7 @@ void DesktopPanel::reinit()
for (int i=0; i<desktopNames.count(); i++) {
labels.append(new CustomPlasmaLabel(this, i));
labels[i]->setWordWrap(false);
qDebug() << labels[i]->styleSheet();
layout->addItem(labels[i]);
}
// right stretch