Hello community, here is the log from the commit of package kalzium for openSUSE:Factory checked in at 2015-05-11 17:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalzium (Old) and /work/SRC/openSUSE:Factory/.kalzium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kalzium" Changes: -------- --- /work/SRC/openSUSE:Factory/kalzium/kalzium.changes 2015-03-11 09:44:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kalzium.new/kalzium.changes 2015-05-11 17:35:57.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 12:42:45 UTC 2015 - [email protected] + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 17:19:27 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:35:40 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- kalzium-14.12.3.tar.xz New: ---- kalzium-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalzium.spec ++++++ --- /var/tmp/diff_new_pack.Z5iXyb/_old 2015-05-11 17:35:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Z5iXyb/_new 2015-05-11 17:35:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: kalzium -Version: 14.12.3 +Version: 15.04.0 Release: 0 Summary: Periodic Table of Elements License: GPL-2.0+ ++++++ kalzium-14.12.3.tar.xz -> kalzium-15.04.0.tar.xz ++++++ Files old/kalzium-14.12.3/data/icons/hi16-action-energies.png and new/kalzium-15.04.0/data/icons/hi16-action-energies.png differ Files old/kalzium-14.12.3/data/icons/hi16-action-misc.png and new/kalzium-15.04.0/data/icons/hi16-action-misc.png differ Files old/kalzium-14.12.3/data/icons/hi32-action-energies.png and new/kalzium-15.04.0/data/icons/hi32-action-energies.png differ Files old/kalzium-14.12.3/data/icons/hi32-action-misc.png and new/kalzium-15.04.0/data/icons/hi32-action-misc.png differ Files old/kalzium-14.12.3/data/icons/hi48-action-chemical.png and new/kalzium-15.04.0/data/icons/hi48-action-chemical.png differ Files old/kalzium-14.12.3/data/icons/hi48-action-energies.png and new/kalzium-15.04.0/data/icons/hi48-action-energies.png differ Files old/kalzium-14.12.3/data/icons/hi48-action-misc.png and new/kalzium-15.04.0/data/icons/hi48-action-misc.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-14.12.3/kalzium.appdata.xml new/kalzium-15.04.0/kalzium.appdata.xml --- old/kalzium-14.12.3/kalzium.appdata.xml 2015-02-21 07:35:39.000000000 +0100 +++ new/kalzium-15.04.0/kalzium.appdata.xml 2015-02-21 03:12:33.000000000 +0100 @@ -4,6 +4,7 @@ <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0+</project_license> <name>Kalzium</name> + <name xml:lang="bg">Kalzium</name> <name xml:lang="bs">Kalzium</name> <name xml:lang="ca">Kalzium</name> <name xml:lang="cs">Kalzium</name> @@ -20,6 +21,7 @@ <name xml:lang="pl">Kalzium</name> <name xml:lang="pt">Kalzium</name> <name xml:lang="pt-BR">Kalzium</name> + <name xml:lang="ru">Kalzium</name> <name xml:lang="sk">Kalzium</name> <name xml:lang="sl">Kalzium</name> <name xml:lang="sv">Kalzium</name> @@ -28,6 +30,7 @@ <name xml:lang="x-test">xxKalziumxx</name> <name xml:lang="zh-TW">化學_Kalzium</name> <summary>Periodic Table of Elements</summary> + <summary xml:lang="bg">Периодична таблица на химичните елементи</summary> <summary xml:lang="bs">Periodni sistem elemenata</summary> <summary xml:lang="ca">Taula periòdica dels elements</summary> <summary xml:lang="cs">Periodická tabulka</summary> @@ -43,6 +46,7 @@ <summary xml:lang="pl">Tablica okresowa pierwiastków</summary> <summary xml:lang="pt">Tabela Periódica dos Elementos</summary> <summary xml:lang="pt-BR">Tabela Periódica dos Elementos</summary> + <summary xml:lang="ru">Периодическая таблица элементов</summary> <summary xml:lang="sk">Periodická tabuľka prvkov</summary> <summary xml:lang="sl">Periodni sistem elementov</summary> <summary xml:lang="sv">Periodiska systemet</summary> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-14.12.3/plasmoid/applet/bodr/plasma_kalzium.desktop new/kalzium-15.04.0/plasmoid/applet/bodr/plasma_kalzium.desktop --- old/kalzium-14.12.3/plasmoid/applet/bodr/plasma_kalzium.desktop 2015-02-21 07:35:39.000000000 +0100 +++ new/kalzium-15.04.0/plasmoid/applet/bodr/plasma_kalzium.desktop 2015-02-21 03:12:33.000000000 +0100 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Chemical Data Name[ast]=Datos químicos +Name[bg]=Химични данни Name[bs]=Hemijski podaci Name[ca]=Dades químiques Name[ca@valencia]=Dades químiques diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-14.12.3/src/calculator/titrationCalculator.cpp new/kalzium-15.04.0/src/calculator/titrationCalculator.cpp --- old/kalzium-14.12.3/src/calculator/titrationCalculator.cpp 2015-02-21 07:35:39.000000000 +0100 +++ new/kalzium-15.04.0/src/calculator/titrationCalculator.cpp 2015-02-21 03:12:33.000000000 +0100 @@ -193,8 +193,7 @@ } else if (a < 0) { d = py[totaldata - 1] - (a / 2); } - double cn; - kDebug() << cn; + double cn = 0.0; int th = 0; for (int i = 1; i < (totaldata - 1); ++i) { //now i'm using the value of the points to fit the curve diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-14.12.3/src/kalziumdataobject.cpp new/kalzium-15.04.0/src/kalziumdataobject.cpp --- old/kalzium-14.12.3/src/kalziumdataobject.cpp 2015-02-21 07:35:39.000000000 +0100 +++ new/kalzium-15.04.0/src/kalziumdataobject.cpp 2015-02-21 03:12:33.000000000 +0100 @@ -147,7 +147,7 @@ { // checking that we are requesting a valid element if ((number <= 0) || (number > m_numOfElements)) - return 0; + return QPixmap(); if (PixmapList.isEmpty()) loadIconSet(); return PixmapList[ number-1 ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-14.12.3/src/legendwidget.cpp new/kalzium-15.04.0/src/legendwidget.cpp --- old/kalzium-14.12.3/src/legendwidget.cpp 2015-02-21 07:35:39.000000000 +0100 +++ new/kalzium-15.04.0/src/legendwidget.cpp 2015-02-21 03:12:33.000000000 +0100 @@ -58,8 +58,9 @@ void LegendWidget::updateContent() { - if (!m_update) + if (!m_update) { return; + } QString gradientDesc; QList< QPair<QString, QColor> > items; @@ -150,23 +151,39 @@ { emit resetElementMatch(); - if (color.operator==(QColor())) + if (color.operator==(QColor())) { return; - - KalziumElementProperty *elementProperty = KalziumElementProperty::instance(); + } for (int element = 1; element <= 118; ++element) { - if(Prefs::colorgradientbox() == KalziumElementProperty::NOGRADIENT){ - if (elementProperty->getElementColor(element).operator!=(color)) { - emit elementMatched(element); - } - }else{ - if (elementProperty->getBorderColor(element).operator==(color) || - elementProperty->getElementColor(element).operator==(color)) { - emit elementMatched(element); - } + if (isElementMatch(element, color)) { + emit elementMatched(element); + } + } +} + +bool LegendWidget::isElementMatch(int element, QColor &color){ + QColor elementBackgroundColor; + QColor elementBorderColor; + + elementBackgroundColor = KalziumElementProperty::instance()->getElementColor(element); + elementBorderColor = KalziumElementProperty::instance()->getBorderColor(element); + + switch(Prefs::colorgradientbox()){ + + case KalziumElementProperty::NOGRADIENT: + if (elementBackgroundColor.operator!=(color)) { + return true; + } + break; + + default: // all other gradients + if (elementBorderColor.operator==(color) || + elementBackgroundColor.operator==(color)) { + return true; } } + return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-14.12.3/src/legendwidget.h new/kalzium-15.04.0/src/legendwidget.h --- old/kalzium-14.12.3/src/legendwidget.h 2015-02-21 07:35:39.000000000 +0100 +++ new/kalzium-15.04.0/src/legendwidget.h 2015-02-21 03:12:33.000000000 +0100 @@ -58,6 +58,8 @@ void legendItemAction(QColor color); private: + bool isElementMatch(int element, QColor &color); + bool m_update; QPixmap m_pixmap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalzium-14.12.3/src/main.cpp new/kalzium-15.04.0/src/main.cpp --- old/kalzium-14.12.3/src/main.cpp 2015-02-21 07:35:39.000000000 +0100 +++ new/kalzium-15.04.0/src/main.cpp 2015-02-21 03:12:33.000000000 +0100 @@ -26,7 +26,7 @@ #include <config-kalzium.h> -#define APP_VERSION "2.4.02" +#define APP_VERSION "2.4.03" static const char description[] = I18N_NOOP("A periodic table of the elements");
