Hello community, here is the log from the commit of package kanagram for openSUSE:Factory checked in at 2014-02-20 07:55:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kanagram (Old) and /work/SRC/openSUSE:Factory/.kanagram.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kanagram" Changes: -------- --- /work/SRC/openSUSE:Factory/kanagram/kanagram.changes 2014-01-27 11:15:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kanagram.new/kanagram.changes 2014-02-20 07:55:50.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 1 10:12:51 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.12.2 + * KDE 4.12.2 release + * See http://www.kde.org/announcements/announce-4.12.2.php + +------------------------------------------------------------------- Old: ---- kanagram-4.12.1.tar.xz New: ---- kanagram-4.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kanagram.spec ++++++ --- /var/tmp/diff_new_pack.E54wn1/_old 2014-02-20 07:55:51.000000000 +0100 +++ /var/tmp/diff_new_pack.E54wn1/_new 2014-02-20 07:55:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: kanagram -Version: 4.12.1 +Version: 4.12.2 Release: 0 Summary: Anagram Game License: GPL-2.0+ ++++++ kanagram-4.12.1.tar.xz -> kanagram-4.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanagram-4.12.1/src/desktop/kanagram.cpp new/kanagram-4.12.2/src/desktop/kanagram.cpp --- old/kanagram-4.12.1/src/desktop/kanagram.cpp 2013-12-24 10:53:07.000000000 +0100 +++ new/kanagram-4.12.2/src/desktop/kanagram.cpp 2014-01-29 06:54:50.000000000 +0100 @@ -130,7 +130,7 @@ if (m_resolveTime != 0) { - m_hintTimer->start(m_resolveTime * 1000); + m_resolveTimer->start(m_resolveTime * 1000); } } @@ -173,17 +173,15 @@ QString resolveTime = KanagramSettings::resolveTime(); - int indexFound = resolveTime.size(); - for (int i = 0; i < indexFound; ++i) + if (resolveTime.at(0).isDigit()) { - if (!resolveTime.at(i).isDigit()) - { - indexFound = i; - break; - } + // because the choices are 0, 15, 30, 45, 60 seconds + m_resolveTime = (resolveTime.at(0).digitValue()) * 15; + } + else + { + m_resolveTime = 0; } - - m_resolveTime = resolveTime.left(indexFound).toInt(); if (KanagramSettings::dataLanguage().isEmpty()) { @@ -607,7 +605,7 @@ if (m_resolveTime != 0) { - m_hintTimer->start(m_resolveTime * 1000); + m_resolveTimer->start(m_resolveTime * 1000); } } @@ -944,7 +942,7 @@ void Kanagram::slotSaveSettings() { - m_shortcutsEditor->save(); + m_shortcutsEditor->save(); } void Kanagram::slotSettingsCancelled() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanagram-4.12.1/src/desktop/mainsettingswidget.ui new/kanagram-4.12.2/src/desktop/mainsettingswidget.ui --- old/kanagram-4.12.1/src/desktop/mainsettingswidget.ui 2013-12-24 10:53:07.000000000 +0100 +++ new/kanagram-4.12.2/src/desktop/mainsettingswidget.ui 2014-01-29 06:54:50.000000000 +0100 @@ -74,22 +74,22 @@ </item> <item> <property name="text" > - <string>30 Seconds</string> + <string>15 Seconds</string> </property> </item> <item> <property name="text" > - <string>60 Seconds</string> + <string>30 Seconds</string> </property> </item> <item> <property name="text" > - <string>120 Seconds</string> + <string>45 Seconds</string> </property> </item> <item> <property name="text" > - <string>300 Seconds</string> + <string>60 Seconds</string> </property> </item> </widget> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
