diff -Nru kanagram-4.12.90/debian/changelog kanagram-4.12.95/debian/changelog --- kanagram-4.12.90/debian/changelog 2014-03-19 10:37:23.000000000 +0000 +++ kanagram-4.12.95/debian/changelog 2014-03-23 10:57:36.000000000 +0000 @@ -1,3 +1,9 @@ +kanagram (4:4.12.95-0ubuntu1) trusty; urgency=medium + + * New upstream beta release + + -- Rohan Garg Sun, 23 Mar 2014 11:57:35 +0100 + kanagram (4:4.12.90-0ubuntu1) trusty; urgency=medium * New upstream beta release diff -Nru kanagram-4.12.90/debian/control kanagram-4.12.95/debian/control --- kanagram-4.12.90/debian/control 2014-03-19 10:37:23.000000000 +0000 +++ kanagram-4.12.95/debian/control 2014-03-23 10:57:36.000000000 +0000 @@ -9,7 +9,7 @@ cmake, pkg-kde-tools (>= 0.14), kde-sc-dev-latest (>= 4:4.10), - libkdeedu-dev (>= 4:4.12.90) + libkdeedu-dev (>= 4:4.12.95) Standards-Version: 3.9.2 Homepage: https://projects.kde.org/projects/kde/kdeedu/kanagram Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram diff -Nru kanagram-4.12.90/src/desktop/kanagram.cpp kanagram-4.12.95/src/desktop/kanagram.cpp --- kanagram-4.12.90/src/desktop/kanagram.cpp 2014-01-29 05:52:05.000000000 +0000 +++ kanagram-4.12.95/src/desktop/kanagram.cpp 2014-03-18 01:08:49.000000000 +0000 @@ -951,6 +951,7 @@ void Kanagram::slotSaveSettings() { m_shortcutsEditor->save(); + // TODO: Update the current puzzle based on the new settings } void Kanagram::slotSettingsCancelled() diff -Nru kanagram-4.12.90/src/desktop/mainsettingswidget.ui kanagram-4.12.95/src/desktop/mainsettingswidget.ui --- kanagram-4.12.90/src/desktop/mainsettingswidget.ui 2014-01-29 05:52:05.000000000 +0000 +++ kanagram-4.12.95/src/desktop/mainsettingswidget.ui 2014-03-18 01:08:49.000000000 +0000 @@ -134,6 +134,16 @@ + + + Use Uppercase. + + + Use only uppercase letters + + + + Qt::Vertical diff -Nru kanagram-4.12.90/src/engine/kanagramgame.cpp kanagram-4.12.95/src/engine/kanagramgame.cpp --- kanagram-4.12.90/src/engine/kanagramgame.cpp 2014-01-29 05:52:05.000000000 +0000 +++ kanagram-4.12.95/src/engine/kanagramgame.cpp 2014-03-18 01:08:49.000000000 +0000 @@ -202,7 +202,15 @@ } // lowercase the entry text so german words that start capitalized will be lowercased - m_originalWord = translation->text().toLower(); + m_uppercaseOnly=KanagramSettings::uppercaseOnly(); + if(m_uppercaseOnly) + { + m_originalWord = translation->text().toUpper(); + } + else + { + m_originalWord = translation->text().toLower(); + } m_picHintUrl = translation->imageUrl(); m_answeredWords.append(m_originalWord); diff -Nru kanagram-4.12.90/src/engine/kanagramgame.h kanagram-4.12.95/src/engine/kanagramgame.h --- kanagram-4.12.90/src/engine/kanagramgame.h 2014-01-29 05:52:05.000000000 +0000 +++ kanagram-4.12.95/src/engine/kanagramgame.h 2014-03-18 01:08:49.000000000 +0000 @@ -156,6 +156,9 @@ /** Which index the current filename is in m_fileList */ int m_index; + /** Uppercase Only option in the setting */ + bool m_uppercaseOnly; + /** The list of vocabulary files */ QStringList m_fileList; diff -Nru kanagram-4.12.90/src/engine/kanagram.kcfg kanagram-4.12.95/src/engine/kanagram.kcfg --- kanagram-4.12.90/src/engine/kanagram.kcfg 2014-01-29 05:52:05.000000000 +0000 +++ kanagram-4.12.95/src/engine/kanagram.kcfg 2014-03-18 01:08:49.000000000 +0000 @@ -21,6 +21,10 @@ true + + + false +