Skip to content

Commit

Permalink
release 3.1.1
Browse files Browse the repository at this point in the history
* translation update
* fix broken build with gcc (#87). The issue was reproduced only with
  gcc build and has been resolved by just replacing C-like `isnan` to
  `std::isnan`
  • Loading branch information
arcan1s committed Apr 6, 2016
1 parent d216ee1 commit e9146b3
Show file tree
Hide file tree
Showing 16 changed files with 287 additions and 74 deletions.
4 changes: 2 additions & 2 deletions packages/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pkgname=plasma5-applet-awesome-widgets
_pkgname=awesome-widgets
pkgver=3.1.0
pkgver=3.1.1
pkgrel=1
pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
arch=('i686' 'x86_64')
Expand All @@ -17,7 +17,7 @@ optdepends=("catalyst: for GPU monitor"
makedepends=('cmake' 'extra-cmake-modules')
source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
install=${pkgname}.install
md5sums=('08d1c0b3995ae6003a5b552a7ae7b93d')
md5sums=('1a4dc1d912b663dfd24d00712ab68f07')
backup=('etc/xdg/plasma-dataengine-extsysmon.conf')

prepare() {
Expand Down
2 changes: 1 addition & 1 deletion sources/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com")
set(PROJECT_LICENSE "GPL3")
set(PROJECT_VERSION_MAJOR "3")
set(PROJECT_VERSION_MINOR "1")
set(PROJECT_VERSION_PATCH "0")
set(PROJECT_VERSION_PATCH "1")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
# append git version if any
set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
Expand Down
2 changes: 1 addition & 1 deletion sources/awesome-widget/package/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
X-KDE-PluginInfo-Version=3.0.1
X-KDE-PluginInfo-Version=3.1.0
X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends=
Expand Down
2 changes: 1 addition & 1 deletion sources/awesome-widget/plugin/awdataaggregator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ void AWDataAggregator::setData(const QString &source, float value,
else if (data[source].count()
> configuration[QString("tooltipNumber")].toInt())
data[source].removeFirst();
if (isnan(value))
if (std::isnan(value))
value = 0.0;

// notifications
Expand Down
2 changes: 1 addition & 1 deletion sources/awesomewidgets/graphicalitemhelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ float GraphicalItemHelper::getPercents(const float &value, const float &min,
{
qCDebug(LOG_LIB) << "Get percent value from" << value;
// newest Qt crashes here if value is nan
if (isnan(value))
if (std::isnan(value))
return 0.0;

return (value - min) / (max - min);
Expand Down
2 changes: 1 addition & 1 deletion sources/desktop-panel/package/metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
X-KDE-PluginInfo-Version=3.0.1
X-KDE-PluginInfo-Version=3.1.0
X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends=
Expand Down
17 changes: 16 additions & 1 deletion sources/translations/awesome-widgets.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2016-02-15 11:43+0300\n"
"POT-Creation-Date: 2016-04-06 14:39+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -547,6 +547,9 @@ msgstr ""
msgid "Use images"
msgstr ""

msgid "Points count"
msgstr ""

msgid "Use custom formula"
msgstr ""

Expand All @@ -559,12 +562,24 @@ msgstr ""
msgid "Min value"
msgstr ""

msgid "Use image for active"
msgstr ""

msgid "Active color"
msgstr ""

msgid "Active image"
msgstr ""

msgid "Use image for inactive"
msgstr ""

msgid "Inactive color"
msgstr ""

msgid "Inactive image"
msgstr ""

msgid "Type"
msgstr ""

Expand Down
19 changes: 17 additions & 2 deletions sources/translations/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2016-02-15 11:43+0300\n"
"PO-Revision-Date: 2016-02-15 11:43+0300\n"
"POT-Creation-Date: 2016-04-06 14:39+0300\n"
"PO-Revision-Date: 2016-04-06 14:40+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: English <kde-russian@lists.kde.ru>\n"
"Language: ru\n"
Expand Down Expand Up @@ -556,6 +556,9 @@ msgstr "Timestamp"
msgid "Use images"
msgstr "Use images"

msgid "Points count"
msgstr "Points count"

msgid "Use custom formula"
msgstr "Use custom formula"

Expand All @@ -568,12 +571,24 @@ msgstr "Max value"
msgid "Min value"
msgstr "Min value"

msgid "Use image for active"
msgstr "Use image for active"

msgid "Active color"
msgstr "Active color"

msgid "Active image"
msgstr "Active image"

msgid "Use image for inactive"
msgstr "Use image for inactive"

msgid "Inactive color"
msgstr "Inactive color"

msgid "Inactive image"
msgstr "Inactive image"

msgid "Type"
msgstr "Type"

Expand Down
20 changes: 19 additions & 1 deletion sources/translations/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Awesome widgets\n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2016-02-15 11:43+0300\n"
"POT-Creation-Date: 2016-04-06 14:39+0300\n"
"PO-Revision-Date: 2015-09-26 22:07+0000\n"
"Last-Translator: Ernesto Avilés Vázquez <whippiii@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/arcanis/awesome-widgets/"
Expand Down Expand Up @@ -561,6 +561,9 @@ msgstr "Marca de tiempo"
msgid "Use images"
msgstr "Usar imágenes"

msgid "Points count"
msgstr ""

#, fuzzy
msgid "Use custom formula"
msgstr "Formato personalizado de hora"
Expand All @@ -576,12 +579,27 @@ msgstr "Mostrar valor"
msgid "Min value"
msgstr "Mostrar valor"

#, fuzzy
msgid "Use image for active"
msgstr "Usar imágenes"

msgid "Active color"
msgstr "Color de activo"

#, fuzzy
msgid "Active image"
msgstr "Activo"

msgid "Use image for inactive"
msgstr ""

msgid "Inactive color"
msgstr "Color de inactivo"

#, fuzzy
msgid "Inactive image"
msgstr "Escritorio inactivo"

msgid "Type"
msgstr "Tipo"

Expand Down
19 changes: 18 additions & 1 deletion sources/translations/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2016-02-15 11:43+0300\n"
"POT-Creation-Date: 2016-04-06 14:39+0300\n"
"PO-Revision-Date: 2015-07-31 22:16+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: French <kde-russian@lists.kde.ru>\n"
Expand Down Expand Up @@ -579,6 +579,9 @@ msgstr "Durée"
msgid "Use images"
msgstr ""

msgid "Points count"
msgstr ""

#, fuzzy
msgid "Use custom formula"
msgstr "Format de l'heure personnalisé"
Expand All @@ -595,14 +598,28 @@ msgstr "Afficher la valeur"
msgid "Min value"
msgstr "Afficher la valeur"

msgid "Use image for active"
msgstr ""

#, fuzzy
msgid "Active color"
msgstr "Batterie"

#, fuzzy
msgid "Active image"
msgstr "Batterie"

msgid "Use image for inactive"
msgstr ""

#, fuzzy
msgid "Inactive color"
msgstr "Batterie"

#, fuzzy
msgid "Inactive image"
msgstr "Bureau inactif"

msgid "Type"
msgstr ""

Expand Down
19 changes: 18 additions & 1 deletion sources/translations/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Awesome widgets\n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2016-02-15 11:43+0300\n"
"POT-Creation-Date: 2016-04-06 14:39+0300\n"
"PO-Revision-Date: 2015-08-20 22:52+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
Expand Down Expand Up @@ -579,6 +579,9 @@ msgstr ""
msgid "Use images"
msgstr ""

msgid "Points count"
msgstr ""

#, fuzzy
msgid "Use custom formula"
msgstr "Aangepaste tijdsopmaak"
Expand All @@ -594,12 +597,26 @@ msgstr "Waarde weergeven"
msgid "Min value"
msgstr "Waarde weergeven"

msgid "Use image for active"
msgstr ""

msgid "Active color"
msgstr "Actieve kleur"

#, fuzzy
msgid "Active image"
msgstr "Actieve kleur"

msgid "Use image for inactive"
msgstr ""

msgid "Inactive color"
msgstr "Inactieve kleur"

#, fuzzy
msgid "Inactive image"
msgstr "Inactieve kleur"

msgid "Type"
msgstr "Type"

Expand Down
Loading

0 comments on commit e9146b3

Please sign in to comment.