i(m_reply_details);
+ while (i.hasNext()) {
+ i.key()->abort();
}
-
- socket.waitForReadyRead(-1);
- socket.readAll();
-
- socket.write(QString("DEFINE wn \"%1\"\n").arg(m_word).toUtf8());
- socket.flush();
-
- m_data.clear();
- do {
- socket.waitForReadyRead(-1);
- m_data += socket.readAll();
- } while (!m_data.contains("250") && !m_data.contains("552"));
-
- socket.disconnectFromHost();
}
//-----------------------------------------------------------------------------
-void Dictionary::parseDefinition() {
- if (m_data.isEmpty()) {
+void Dictionary::lookupFinished(QNetworkReply* reply) {
+ // Find word
+ QString word = m_reply_details.value(reply);
+ if (!word.isEmpty()) {
+ m_reply_details.remove(reply);
+ word = m_spellings.take(word);
+ }
+ if (word.isEmpty()) {
+ qWarning("Unknown lookup");
+ reply->deleteLater();
return;
}
- Type type = Status;
- QRegExp part_of_speech("(n|v|adj|adv) 1?: .*");
- QRegExp number("(\\d*:) .*");
- int definitions = 0;
- bool first_line = false;
-
- m_definition.clear();
- QStringList lines = m_data.split('\n', QString::SkipEmptyParts);
- for (int i = 0; i < lines.count(); ++i) {
- QString line = lines.at(i).simplified();
-
- // Parse status
- if (type == Status) {
-
- QString status = line.left(3);
- if (status == "150") {
- } else if (status == "151") {
- type = Name;
- } else if (status == "250") {
- type = Done;
- } else if (status == "550") {
- type = Done;
- } else if (status == "552") {
- m_definition = tr("No definition found");
- type = Done;
- }
-
- // Parse name
- } else if (type == Name) {
+ // Determine if this is the last spelling of a word
+ bool last_definition = m_spellings.key(word).isEmpty();
- m_definition += "" + line;
- type = Definition;
- first_line = true;
-
- } else if (type == Definition) {
-
- // Parse part of speech
- if (part_of_speech.exactMatch(line)) {
- QString cap = part_of_speech.cap(1);
- line.remove(0, cap.length() + 1);
- if (cap == "n") {
- cap = "noun";
- } else if (cap == "v") {
- cap = "verb";
- } else if (cap == "adj") {
- cap = "adjective";
- } else if (cap == "adv") {
- cap = "adverb";
- }
- definitions = 0;
- m_definition += "
\n" + cap + "
\n";
- first_line = false;
- } else if (first_line) {
- m_definition += "
\n";
- first_line = false;
+ // Fetch word definitions
+ QString definition = m_definitions.value(word);
+ if (reply->error() == QNetworkReply::NoError) {
+ QXmlStreamReader xml(reply);
+ while (!xml.atEnd()) {
+ xml.readNext();
+ if (!xml.isStartElement()) {
+ continue;
}
- // Parse numbered definition
- if (number.exactMatch(line)) {
- QString cap = number.cap(1);
- line.remove(0, cap.length() + 1);
- if (cap.left(cap.length() - 1).toInt() > 0) {
- if (definitions > 0) {
- m_definition += "
\n";
- }
- definitions++;
- line.prepend("" + cap + " ");
- }
+ if (xml.name() == "section") {
+ definition += xml.readElementText();
+ } else if (xml.name() == "error") {
+ xml.raiseError();
}
+ }
- // Parse end of defintion
- if (line == ".") {
- m_definition += "
\n";
- type = Status;
- continue;
+ if (!xml.hasError()) {
+ if (last_definition) {
+ definition += "" + tr("Definition from Wiktionary, the free dictionary") + "
";
+ m_definitions.remove(word);
+ } else {
+ definition += "
";
+ m_definitions[word] = definition;
}
-
- // Add definition text
- m_definition += line + " ";
-
+ } else if (last_definition && definition.isEmpty()) {
+ definition += tr("No definition found");
}
+ } else {
+ definition = tr("Unable to connect to Wiktionary");
+ last_definition = true;
+ }
+ // Show spelling if definition is done
+ if (last_definition) {
+ emit wordDefined(word, definition);
+
+ // Save word to cache
+ QFile file(m_cache_path + word);
+ if (file.open(QFile::WriteOnly | QFile::Text)) {
+ QTextStream stream(&file);
+ stream.setCodec("UTF-8");
+ stream << definition;
+ file.close();
+ }
}
+ reply->deleteLater();
+}
+
+//-----------------------------------------------------------------------------
- // Parse word links
- m_definition.replace(QRegExp("\\{([^\\}]+)\\}"), "\\1");
+void Dictionary::setLanguage(const QString& langcode) {
+ m_url.setHost(langcode + ".wiktionary.org");
- // Remove extra spaces
- m_definition.replace(" ", "");
+ // Find cache path
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+ m_cache_path = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+#else
+ m_cache_path = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
+#endif
+ m_cache_path += "/" + langcode + "/";
+
+ // Create cache directory
+ QDir dir(m_cache_path);
+ dir.mkpath(dir.absolutePath());
}
diff -Nru connectagram-1.0.1/src/dictionary.h connectagram-1.1.2/src/dictionary.h
--- connectagram-1.0.1/src/dictionary.h 2009-08-26 16:50:52.000000000 +0000
+++ connectagram-1.1.2/src/dictionary.h 2013-02-20 21:06:10.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009 Graeme Gott
+ * Copyright (C) 2009, 2013 Graeme Gott
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,33 +20,49 @@
#ifndef DICTIONARY_H
#define DICTIONARY_H
-#include
-#include
+class WordList;
-class Dictionary : public QThread {
- Q_OBJECT
-
- public:
- Dictionary(QObject* parent = 0);
+#include
+#include
+#include
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+#include
+#endif
+class QNetworkAccessManager;
+class QNetworkReply;
- void lookup(const QString& word);
+class Dictionary : public QObject {
+ Q_OBJECT
- signals:
- void wordDefined(const QString& word, const QString& definition);
+public:
+ Dictionary(const WordList* wordlist, QObject* parent = 0);
- protected:
- virtual void run();
-
- private:
- void downloadDefinition();
- void parseDefinition();
-
- private:
- QList m_words;
- QMutex m_word_mutex;
- QString m_word;
- QString m_definition;
- QString m_data;
+ QUrl url() const {
+ return m_url;
+ }
+
+signals:
+ void wordDefined(const QString& word, const QString& definition);
+
+public slots:
+ void lookup(const QString& word);
+ void wait();
+
+private slots:
+ void lookupFinished(QNetworkReply* reply);
+ void setLanguage(const QString& langcode);
+
+private:
+ const WordList* m_wordlist;
+ QUrl m_url;
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+ QUrlQuery m_query;
+#endif
+ QNetworkAccessManager* m_manager;
+ QHash m_reply_details;
+ QHash m_spellings;
+ QHash m_definitions;
+ QString m_cache_path;
};
#endif
diff -Nru connectagram-1.0.1/src/letter.cpp connectagram-1.1.2/src/letter.cpp
--- connectagram-1.0.1/src/letter.cpp 2009-09-03 15:05:38.000000000 +0000
+++ connectagram-1.1.2/src/letter.cpp 2013-01-31 17:45:02.000000000 +0000
@@ -82,7 +82,7 @@
void Letter::setJoin() {
setFlag(QGraphicsItem::ItemIsMovable, false);
setBrush(QColor("#555555"));
- unsetCursor();
+ setCursor(Qt::ArrowCursor);
m_movable = false;
}
@@ -97,11 +97,11 @@
//-----------------------------------------------------------------------------
void Letter::mouseMoveEvent(QGraphicsSceneMouseEvent* event) {
- QGraphicsPathItem::mouseMoveEvent(event);
if (m_dragged == false) {
- event->ignore();
+ event->accept();
return;
}
+ QGraphicsPathItem::mouseMoveEvent(event);
if (m_board->isPaused()) {
m_board->setPaused(false);
@@ -130,7 +130,6 @@
//-----------------------------------------------------------------------------
void Letter::mousePressEvent(QGraphicsSceneMouseEvent* event) {
- QGraphicsPathItem::mousePressEvent(event);
if (event->button() != Qt::LeftButton) {
event->ignore();
return;
@@ -146,6 +145,7 @@
m_board->click("");
}
}
+ m_dragged = false;
return;
}
setCursor(Qt::ClosedHandCursor);
@@ -155,16 +155,23 @@
m_shadow = scene()->addPath(path(), Qt::NoPen, QColor("#a5c1e4"));
m_shadow->setPos(pos());
+
+ QGraphicsPathItem::mousePressEvent(event);
}
//-----------------------------------------------------------------------------
void Letter::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) {
- QGraphicsPathItem::mouseReleaseEvent(event);
if (event->button() != Qt::LeftButton) {
event->ignore();
return;
}
+
+ if (m_dragged == false) {
+ event->accept();
+ return;
+ }
+
m_dragged = false;
setCursor(Qt::OpenHandCursor);
@@ -175,6 +182,8 @@
m_shadow = 0;
m_cell->word()->check();
+
+ QGraphicsPathItem::mouseReleaseEvent(event);
}
//-----------------------------------------------------------------------------
diff -Nru connectagram-1.0.1/src/locale_dialog.cpp connectagram-1.1.2/src/locale_dialog.cpp
--- connectagram-1.0.1/src/locale_dialog.cpp 1970-01-01 00:00:00.000000000 +0000
+++ connectagram-1.1.2/src/locale_dialog.cpp 2013-02-07 11:55:31.000000000 +0000
@@ -0,0 +1,187 @@
+/***********************************************************************
+ *
+ * Copyright (C) 2010, 2011, 2012 Graeme Gott
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ ***********************************************************************/
+
+#include "locale_dialog.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+//-----------------------------------------------------------------------------
+
+QString LocaleDialog::m_current;
+QString LocaleDialog::m_path;
+QString LocaleDialog::m_appname;
+
+//-----------------------------------------------------------------------------
+
+LocaleDialog::LocaleDialog(QWidget* parent)
+ : QDialog(parent, Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint)
+{
+ QString title = parent ? parent->window()->windowTitle() : QString();
+ setWindowTitle(!title.isEmpty() ? title : QCoreApplication::applicationName());
+
+ QLabel* text = new QLabel(tr("Select application language:"), this);
+
+ m_translations = new QComboBox(this);
+ m_translations->addItem(tr(""));
+ QString translation;
+ QStringList translations = findTranslations();
+ foreach (translation, translations) {
+ if (translation.startsWith("qt")) {
+ continue;
+ }
+ translation.remove(m_appname);
+ m_translations->addItem(languageName(translation), translation);
+ }
+ int index = qMax(0, m_translations->findData(m_current));
+ m_translations->setCurrentIndex(index);
+
+ QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
+ connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
+ connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
+
+ QVBoxLayout* layout = new QVBoxLayout(this);
+ layout->setSizeConstraint(QLayout::SetFixedSize);
+ layout->addWidget(text);
+ layout->addWidget(m_translations);
+ layout->addWidget(buttons);
+}
+
+//-----------------------------------------------------------------------------
+
+void LocaleDialog::loadTranslator(const QString& name, const QStringList& datadirs)
+{
+ m_appname = name;
+
+ // Find translator path
+ QStringList paths = datadirs;
+ if (paths.isEmpty()) {
+ QString appdir = QCoreApplication::applicationDirPath();
+ paths.append(appdir);
+ paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
+ paths.append(appdir + "/../Resources");
+ }
+ foreach (const QString& path, paths) {
+ if (QFile::exists(path + "/translations/")) {
+ m_path = path + "/translations/";
+ break;
+ }
+ }
+
+
+ // Find current locale
+ m_current = QSettings().value("Locale/Language").toString();
+ QString current = !m_current.isEmpty() ? m_current : QLocale::system().name();
+ QStringList translations = findTranslations();
+ if (!translations.contains(m_appname + current)) {
+ current = current.left(2);
+ if (!translations.contains(m_appname + current)) {
+ current.clear();
+ }
+ }
+ if (!current.isEmpty()) {
+ QLocale::setDefault(current);
+ } else {
+ current = "en";
+ }
+
+ // Load translators
+ static QTranslator qt_translator;
+ if (translations.contains("qt_" + current) || translations.contains("qt_" + current.left(2))) {
+ qt_translator.load("qt_" + current, m_path);
+ } else {
+ qt_translator.load("qt_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ }
+ QCoreApplication::installTranslator(&qt_translator);
+
+ static QTranslator translator;
+ translator.load(m_appname + current, m_path);
+ QCoreApplication::installTranslator(&translator);
+}
+
+//-----------------------------------------------------------------------------
+
+QString LocaleDialog::languageName(const QString& language)
+{
+ QString lang_code = language.left(5);
+ QLocale locale(lang_code);
+ QString name;
+#if QT_VERSION >= 0x040800
+ if (lang_code.length() > 2) {
+ if (locale.name() == lang_code) {
+ name = locale.nativeLanguageName() + " (" + locale.nativeCountryName() + ")";
+ } else {
+ name = locale.nativeLanguageName() + " (" + language + ")";
+ }
+ } else {
+ name = locale.nativeLanguageName();
+ }
+ if (locale.textDirection() == Qt::RightToLeft) {
+ name.prepend(QChar(0x202b));
+ }
+#else
+ if (lang_code.length() > 2) {
+ if (locale.name() == lang_code) {
+ name = QLocale::languageToString(locale.language()) + " (" + QLocale::countryToString(locale.country()) + ")";
+ } else {
+ name = QLocale::languageToString(locale.language()) + " (" + language + ")";
+ }
+ } else {
+ name = QLocale::languageToString(locale.language());
+ }
+#endif
+ return name;
+}
+
+//-----------------------------------------------------------------------------
+
+QStringList LocaleDialog::findTranslations()
+{
+ QStringList result = QDir(m_path, "*.qm").entryList(QDir::Files);
+ result.replaceInStrings(".qm", "");
+ return result;
+}
+
+//-----------------------------------------------------------------------------
+
+void LocaleDialog::accept()
+{
+ int current = m_translations->findData(m_current);
+ if (current == m_translations->currentIndex()) {
+ return reject();
+ }
+ QDialog::accept();
+
+ m_current = m_translations->itemData(m_translations->currentIndex()).toString();
+ QSettings().setValue("Locale/Language", m_current);
+ QMessageBox::information(this, tr("Note"), tr("Please restart this application for the change in language to take effect."), QMessageBox::Ok);
+}
+
+//-----------------------------------------------------------------------------
diff -Nru connectagram-1.0.1/src/locale_dialog.h connectagram-1.1.2/src/locale_dialog.h
--- connectagram-1.0.1/src/locale_dialog.h 1970-01-01 00:00:00.000000000 +0000
+++ connectagram-1.1.2/src/locale_dialog.h 2013-02-07 11:55:15.000000000 +0000
@@ -0,0 +1,81 @@
+/***********************************************************************
+ *
+ * Copyright (C) 2010, 2011, 2012, 2013 Graeme Gott
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ ***********************************************************************/
+
+#ifndef CONNECTAGRAM_LOCALE_DIALOG_H
+#define CONNECTAGRAM_LOCALE_DIALOG_H
+
+#include
+class QComboBox;
+
+/**
+ * Dialog to set application language.
+ *
+ * This class handles setting the application language when the application is
+ * launched, as well as allowing the user to choose a different language for
+ * future launches.
+ */
+class LocaleDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /**
+ * Construct a dialog to choose application language.
+ *
+ * @param parent the parent widget of the dialog
+ */
+ LocaleDialog(QWidget* parent = 0);
+
+ /**
+ * Load the stored language into the application; defaults to system language.
+ *
+ * @param appname application name to prepend to translation filenames
+ * @param datadirs locations to search for directory containing translations
+ */
+ static void loadTranslator(const QString& appname, const QStringList& datadirs = QStringList());
+
+ /**
+ * Fetch native language name for QLocale name.
+ *
+ * @param language QLocale name to look up
+ * @return translated language name
+ */
+ static QString languageName(const QString& language);
+
+public slots:
+ /** Override parent function to store application language. */
+ void accept();
+
+private:
+ /**
+ * Fetch list of application translations.
+ *
+ * @return list of QLocale names
+ */
+ static QStringList findTranslations();
+
+private:
+ QComboBox* m_translations; /**< list of found translations */
+
+ static QString m_current; /**< stored application language */
+ static QString m_path; /**< location of translations; found in loadTranslator() */
+ static QString m_appname; /**< application name passed to loadTranslator() */
+};
+
+#endif // CONNECTAGRAM_LOCALE_DIALOG_H
diff -Nru connectagram-1.0.1/src/main.cpp connectagram-1.1.2/src/main.cpp
--- connectagram-1.0.1/src/main.cpp 2009-09-06 14:38:50.000000000 +0000
+++ connectagram-1.1.2/src/main.cpp 2013-01-16 23:15:58.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009 Graeme Gott
+ * Copyright (C) 2009, 2012, 2013 Graeme Gott
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,35 +17,39 @@
*
***********************************************************************/
+#include "locale_dialog.h"
#include "window.h"
#include
#include
-#include
-#include
int main(int argc, char** argv) {
QApplication app(argc, argv);
app.setApplicationName("Connectagram");
- app.setApplicationVersion("1.0.1");
+ app.setApplicationVersion(VERSIONSTR);
app.setOrganizationDomain("gottcode.org");
app.setOrganizationName("GottCode");
+ {
+ QIcon fallback(":/hicolor/256x256/apps/connectagram.png");
+ fallback.addFile(":/hicolor/128x128/apps/connectagram.png");
+ fallback.addFile(":/hicolor/64x64/apps/connectagram.png");
+ fallback.addFile(":/hicolor/48x48/apps/connectagram.png");
+ fallback.addFile(":/hicolor/32x32/apps/connectagram.png");
+ fallback.addFile(":/hicolor/24x24/apps/connectagram.png");
+ fallback.addFile(":/hicolor/22x22/apps/connectagram.png");
+ fallback.addFile(":/hicolor/16x16/apps/connectagram.png");
+ app.setWindowIcon(QIcon::fromTheme("connectagram", fallback));
+ }
+
+ QString path = app.applicationDirPath();
+ QStringList paths;
+ paths.append(path + "/data/");
+ paths.append(path + "/../share/connectagram/data/");
+ paths.append(path + "/../Resources/data/");
+ QDir::setSearchPaths("connectagram", paths);
+
+ LocaleDialog::loadTranslator("connectagram_");
- QTranslator qt_translator;
- qt_translator.load("qt_" + QLocale::system().name());
- app.installTranslator(&qt_translator);
-
- QTranslator translator;
- translator.load(":/connectagram_" + QLocale::system().name());
- app.installTranslator(&translator);
-
-#if defined(Q_OS_MAC)
- QDir::setCurrent(QCoreApplication::applicationDirPath() + "/../Resources/");
-#elif defined(Q_OS_UNIX)
- QDir::setCurrent(QCoreApplication::applicationDirPath() + "/../share/connectagram/");
-#elif defined(Q_OS_WIN32)
- QDir::setCurrent(QCoreApplication::applicationDirPath());
-#endif
Window window;
return app.exec();
diff -Nru connectagram-1.0.1/src/new_game_dialog.cpp connectagram-1.1.2/src/new_game_dialog.cpp
--- connectagram-1.0.1/src/new_game_dialog.cpp 2009-09-05 21:12:42.000000000 +0000
+++ connectagram-1.1.2/src/new_game_dialog.cpp 2013-01-29 11:42:18.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009 Graeme Gott
+ * Copyright (C) 2009, 2013 Graeme Gott
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,62 +20,95 @@
#include "new_game_dialog.h"
#include "board.h"
+#include "locale_dialog.h"
#include "pattern.h"
+#include "wordlist.h"
#include
#include
#include
+#include
#include
+#include
+#include
+#include
#include
#include
+#include
#include
+#include
+#include
+
NewGameDialog::NewGameDialog(Board* board, QWidget* parent)
-: QDialog(parent), m_board(board) {
+: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint), m_board(board) {
setWindowTitle(tr("New Game"));
- // Create patterns box
- m_patterns_box = new QComboBox(this);
- for (int i = 0; i < Pattern::types(); ++i) {
- Pattern* pattern = Pattern::create(i);
- m_patterns.append(pattern);
- m_patterns_box->addItem(pattern->name(), i);
+ // Create languages box
+ m_wordlist = new WordList(this);
+ m_wordlist->setLanguage(WordList::defaultLanguage());
+ m_languages_box = new QComboBox(this);
+ QStringList languages = QDir("connectagram:").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+ foreach (const QString& language, languages) {
+ m_languages_box->addItem(LocaleDialog::languageName(language), language);
}
- connect(m_patterns_box, SIGNAL(currentIndexChanged(int)), this, SLOT(patternSelected(int)));
+
+ // Create word count box
+ m_word_count_box = new QComboBox(this);
+ m_word_count_box->addItems(QStringList() << tr("Low") << tr("Medium") << tr("High") << tr("Very High"));
// Create word length box
m_word_length_box = new QComboBox(this);
+ connect(m_word_length_box, SIGNAL(activated(int)), this, SLOT(lengthSelected(int)));
- // Create word count box
- m_word_count_box = new QComboBox(this);
+ // Create pattern buttons
+ QFrame* patterns = new QFrame(this);
+ QGridLayout* patterns_layout = new QGridLayout(patterns);
+ patterns->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+ for (int i = 0; i < Pattern::types(); ++i) {
+ Pattern* pattern = Pattern::create(m_wordlist, i);
+ m_patterns.append(pattern);
+
+ QToolButton* pattern_button = new QToolButton(patterns);
+ pattern_button->setAutoRaise(false);
+ pattern_button->setText(pattern->name());
+ pattern_button->setIconSize(QSize(80,80));
+ pattern_button->setIcon(QIcon(QString(":/patterns/%1.png").arg(i)));
+ pattern_button->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+ pattern_button->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+ connect(pattern_button, SIGNAL(clicked()), this, SLOT(patternSelected()));
+
+ patterns_layout->addWidget(pattern_button, i / 3, i % 3);
+ m_pattern_buttons.append(pattern_button);
+ }
- // Create seed box
- m_seed_box = new QSpinBox(this);
- m_seed_box->setRange(0, 2147483647);
- m_seed_box->setSpecialValueText(tr("Random"));
-
- // Create buttons
- QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
- connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
+ // Create cancel button
+ QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Cancel, Qt::Horizontal, this);
connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
// Lay out dialog
QFormLayout* contents_layout = new QFormLayout;
- contents_layout->addRow(tr("Pattern:"), m_patterns_box);
- contents_layout->addRow(tr("Characters per word:"), m_word_length_box);
- contents_layout->addRow(tr("Number of words:"), m_word_count_box);
- contents_layout->addRow(tr("Game number:"), m_seed_box);
+ contents_layout->setFormAlignment(Qt::AlignHCenter | Qt::AlignTop);
+ contents_layout->setLabelAlignment(Qt::AlignRight | Qt::AlignVCenter);
+ contents_layout->addRow(tr("Language:"), m_languages_box);
+ contents_layout->addRow(tr("Amount of Words:"), m_word_count_box);
+ contents_layout->addRow(tr("Word Length:"), m_word_length_box);
QVBoxLayout* layout = new QVBoxLayout(this);
layout->addLayout(contents_layout);
- layout->addSpacing(18);
+ layout->addSpacing(layout->margin());
+ layout->addWidget(patterns);
+ layout->addSpacing(layout->margin());
layout->addWidget(buttons);
// Load settings
QSettings settings;
- setPattern(settings.value("NewGame/Pattern", 1).toInt());
- setCount(settings.value("NewGame/Count", 10).toInt());
+ setLanguage(settings.value("NewGame/Language", WordList::defaultLanguage()).toString());
+ setCount(settings.value("NewGame/Count", 1).toInt());
setLength(settings.value("NewGame/Length", 7).toInt());
+ m_pattern_buttons.at(settings.value("NewGame/Pattern").toInt())->setFocus();
+
+ connect(m_languages_box, SIGNAL(currentIndexChanged(int)), this, SLOT(languageSelected(int)));
}
//-----------------------------------------------------------------------------
@@ -86,22 +119,70 @@
//-----------------------------------------------------------------------------
-void NewGameDialog::accept() {
- int id = m_patterns_box->itemData(m_patterns_box->currentIndex()).toInt();
- int count = m_word_count_box->currentText().toInt();
- int length = m_word_length_box->currentText().toInt();
- int seed = m_seed_box->value();
- if (seed == 0) {
- srand(time(0));
- seed = rand();
+void NewGameDialog::keyPressEvent(QKeyEvent* event) {
+ if ((event->key() == Qt::Key_Enter) || (event->key() == Qt::Key_Return)) {
+ foreach (QToolButton* button, m_pattern_buttons) {
+ if (button->hasFocus() && button->isEnabled()) {
+ button->click();
+ break;
+ }
+ }
+ } else {
+ QDialog::keyPressEvent(event);
+ }
+}
+
+//-----------------------------------------------------------------------------
+
+void NewGameDialog::languageSelected(int index) {
+ m_wordlist->setLanguage(m_languages_box->itemData(index).toString());
+
+ int length = m_word_length_box->itemData(m_word_length_box->currentIndex()).toInt();
+ m_word_length_box->clear();
+ for (int i = 5; i <= m_wordlist->maximumLength(); ++i) {
+ m_word_length_box->addItem(tr("%n letter(s)", "", i), i);
+ }
+ setLength(length);
+}
+
+//-----------------------------------------------------------------------------
+
+void NewGameDialog::lengthSelected(int index) {
+ int length = m_word_length_box->itemData(index).toInt();
+ for (int i = 0; i < m_pattern_buttons.count(); ++i) {
+ m_pattern_buttons.at(i)->setEnabled(length >= m_patterns.at(i)->minimumLength());
+ }
+}
+
+//-----------------------------------------------------------------------------
+
+void NewGameDialog::patternSelected() {
+ int pattern = -1;
+ for (int i = 0; i < m_pattern_buttons.count(); ++i) {
+ if (m_pattern_buttons.at(i) == sender()) {
+ pattern = i;
+ break;
+ }
+ }
+ if (pattern == -1) {
+ return;
}
+ QString language = m_languages_box->itemData(m_languages_box->currentIndex()).toString();
+ int count = m_word_count_box->currentIndex();
+ int length = m_word_length_box->itemData(m_word_length_box->currentIndex()).toInt();
+ srand(time(0));
+ int seed = rand();
+
QSettings settings;
settings.remove("Current");
- settings.setValue("NewGame/Pattern", id);
+ settings.setValue("NewGame/Language", language);
+ settings.setValue("NewGame/Pattern", pattern);
settings.setValue("NewGame/Count", count);
settings.setValue("NewGame/Length", length);
- settings.setValue("Current/Pattern", id);
+ settings.setValue("Current/Version", 3);
+ settings.setValue("Current/Language", language);
+ settings.setValue("Current/Pattern", pattern);
settings.setValue("Current/Count", count);
settings.setValue("Current/Length", length);
settings.setValue("Current/Seed", seed);
@@ -109,63 +190,34 @@
m_board->openGame();
- QDialog::accept();
+ accept();
}
//-----------------------------------------------------------------------------
-void NewGameDialog::patternSelected(int index) {
- Pattern* pattern = m_patterns.at(m_patterns_box->itemData(index).toInt());
-
- // Set up word count combobox
- int count = m_word_count_box->currentText().toInt();
- m_word_count_box->clear();
- for (int i = pattern->minimumCount(); i <= 20; i += pattern->expandCount()) {
- m_word_count_box->addItem(QString::number(i));
- }
- setCount(count);
-
- // Set up word length combobox
- int length = m_word_length_box->currentText().toInt();
- m_word_length_box->clear();
- for (int i = pattern->minimumLength(); i <= pattern->maximumLength(); ++i) {
- m_word_length_box->addItem(QString::number(i));
- }
- setLength(length);
-}
-
-//-----------------------------------------------------------------------------
-
-void NewGameDialog::setPattern(int pattern) {
- int id = m_patterns_box->findData(pattern);
+void NewGameDialog::setLanguage(const QString& language) {
+ int id = m_languages_box->findData(language);
if (id == -1) {
id = 0;
} else if (id == 0) {
- m_patterns_box->setCurrentIndex(1);
+ m_languages_box->setCurrentIndex(1);
}
- m_patterns_box->setCurrentIndex(id);
+ m_languages_box->setCurrentIndex(id);
+ languageSelected(id);
}
//-----------------------------------------------------------------------------
void NewGameDialog::setCount(int count) {
- count = qBound(m_word_count_box->itemText(0).toInt(), count, m_word_count_box->itemText(m_word_count_box->count() - 1).toInt());
- int smallest = 0x7FFFFFFF;
- int index = 0;
- for (int i = 0; i < m_word_count_box->count(); ++i) {
- int diff = abs(m_word_count_box->itemText(i).toInt() - count);
- if (diff < smallest) {
- smallest = diff;
- index = i;
- }
- }
- m_word_count_box->setCurrentIndex(index);
+ count = qBound(0, count, 3);
+ m_word_count_box->setCurrentIndex(count);
}
//-----------------------------------------------------------------------------
void NewGameDialog::setLength(int length) {
- int min = m_word_length_box->itemText(0).toInt();
- int max = m_word_length_box->itemText(m_word_length_box->count() - 1).toInt();
+ int min = m_word_length_box->itemData(0).toInt();
+ int max = m_word_length_box->itemData(m_word_length_box->count() - 1).toInt();
m_word_length_box->setCurrentIndex(qBound(min, length, max) - min);
+ lengthSelected(m_word_length_box->currentIndex());
}
diff -Nru connectagram-1.0.1/src/new_game_dialog.h connectagram-1.1.2/src/new_game_dialog.h
--- connectagram-1.0.1/src/new_game_dialog.h 2009-08-27 15:03:52.000000000 +0000
+++ connectagram-1.1.2/src/new_game_dialog.h 2013-02-20 21:06:10.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009 Graeme Gott
+ * Copyright (C) 2009, 2013 Graeme Gott
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,11 +20,14 @@
#ifndef NEW_GAME_DIALOG_H
#define NEW_GAME_DIALOG_H
+class Board;
+class Pattern;
+class WordList;
+
#include
class QComboBox;
class QSpinBox;
-class Board;
-class Pattern;
+class QToolButton;
class NewGameDialog : public QDialog {
Q_OBJECT
@@ -33,24 +36,27 @@
NewGameDialog(Board* board, QWidget* parent = 0);
~NewGameDialog();
- public slots:
- void accept();
+ protected:
+ void keyPressEvent(QKeyEvent* event);
private slots:
- void patternSelected(int index);
+ void languageSelected(int index);
+ void lengthSelected(int index);
+ void patternSelected();
private:
- void setPattern(int pattern);
+ void setLanguage(const QString& language);
void setCount(int count);
void setLength(int length);
private:
- QComboBox* m_patterns_box;
+ QComboBox* m_languages_box;
QComboBox* m_word_count_box;
QComboBox* m_word_length_box;
- QSpinBox* m_seed_box;
+ QList m_pattern_buttons;
QList m_patterns;
Board* m_board;
+ WordList* m_wordlist;
};
#endif
diff -Nru connectagram-1.0.1/src/pattern.cpp connectagram-1.1.2/src/pattern.cpp
--- connectagram-1.0.1/src/pattern.cpp 2009-09-03 20:54:16.000000000 +0000
+++ connectagram-1.1.2/src/pattern.cpp 2013-01-27 14:54:59.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009 Graeme Gott
+ * Copyright (C) 2009, 2012, 2013 Graeme Gott
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,38 +21,11 @@
#include "word.h"
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-
-QHash Pattern::m_words;
-int Pattern::m_max_length = 0;
-
//-----------------------------------------------------------------------------
-Pattern::Pattern()
-: m_current(0,0), m_count(0), m_length(0), m_seed(0), m_cancelled(false) {
- if (m_words.isEmpty()) {
- QFile file("words");
- if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
- return;
- }
-
- QTextStream in(&file);
- while (!in.atEnd()) {
- QString line = in.readLine();
- m_max_length = qMax(m_max_length, line.length());
- if (line.length() > 4) {
- m_words[line.length() - 1].append(line.toUpper());
- }
- }
- }
+Pattern::Pattern(WordList* words)
+: m_current(0,0), m_words(words), m_count(0), m_length(0), m_seed(0), m_cancelled(false) {
+ Q_ASSERT(words != 0);
}
//-----------------------------------------------------------------------------
@@ -70,14 +43,14 @@
//-----------------------------------------------------------------------------
void Pattern::setCount(int count) {
- m_count = qMax(count, minimumCount());
- m_count -= ((m_count - minimumCount()) % expandCount());
+ m_count = counts().value(count, 4);
}
//-----------------------------------------------------------------------------
void Pattern::setLength(int length) {
m_length = qBound(minimumLength(), length, maximumLength()) - 1;
+ m_words->setLength(m_length);
}
//-----------------------------------------------------------------------------
@@ -88,26 +61,26 @@
//-----------------------------------------------------------------------------
-Pattern* Pattern::create(int type) {
+Pattern* Pattern::create(WordList* words, int type) {
Pattern* pattern = 0;
switch (type) {
case 0:
- pattern = new ChainPattern;
+ pattern = new ChainPattern(words);
break;
case 1:
- pattern = new FencePattern;
+ pattern = new FencePattern(words);
break;
case 2:
- pattern = new RingsPattern;
+ pattern = new RingsPattern(words);
break;
case 3:
- pattern = new StairsPattern;
+ pattern = new StairsPattern(words);
break;
case 4:
- pattern = new TwistyPattern;
+ pattern = new TwistyPattern(words);
break;
case 5:
- pattern = new WavePattern;
+ pattern = new WavePattern(words);
break;
default:
break;
@@ -119,44 +92,26 @@
Word* Pattern::addRandomWord(Qt::Orientation orientation) {
// Filter words on what characters are on the board
- QString filter;
+ QString known_letters;
QPoint pos = m_current;
QPoint delta = (orientation == Qt::Horizontal) ? QPoint(1, 0) : QPoint(0, 1);
for (int i = 0; i <= wordLength(); ++i) {
QChar c = at(pos);
- filter.append(c.isNull() ? QChar('.') : c);
+ known_letters.append(c.isNull() ? QChar('.') : c);
pos += delta;
}
- QStringList filtered = m_words.value(wordLength()).filter(QRegExp(filter));
-
- // Remove anagrams of words on the board
- QStringList words;
- QString sorted;
- bool anagram;
- foreach (const QString& word, filtered) {
- anagram = false;
- sorted = word;
- std::sort(sorted.begin(), sorted.end());
- foreach (const QString& skip, m_skip) {
- if (sorted == skip) {
- anagram = true;
- break;
- }
- }
- if (!anagram) {
- words.append(word);
- }
- }
+ QStringList words = m_words->filter(known_letters);
// Find word
- QString result = !words.isEmpty() ? words.at(qrand() % words.count()) : QString();
+ QString result = !words.isEmpty() ? words.at(randomInt(words.count())) : QString();
if (result.isEmpty()) {
return 0;
}
- Word* word = new Word(result, m_current, orientation);
- std::sort(result.begin(), result.end());
- m_skip.append(result);
- return word;
+
+ // Remove anagrams of word
+ m_words->addAnagramFilter(result);
+
+ return new Word(result, m_current, orientation, m_random);
}
//-----------------------------------------------------------------------------
@@ -176,16 +131,17 @@
//-----------------------------------------------------------------------------
void Pattern::run() {
- if (m_words.isEmpty()) {
+ if (m_words->isEmpty()) {
return;
}
- qsrand(m_seed);
+ m_random.setSeed(m_seed);
// Add words
cleanUp();
int s = steps();
- for (int i = 0; i < wordCount(); ++i) {
+ int count = counts().value(wordCount());
+ for (int i = 0; i < count; ++i) {
Word* word = addWord(i % s);
if (word) {
m_solution.append(word);
@@ -221,6 +177,8 @@
word->moveBy(delta);
}
+ m_words->resetAnagramFilters();
+
emit generated();
}
@@ -229,7 +187,7 @@
void Pattern::cleanUp() {
qDeleteAll(m_solution);
m_solution.clear();
- m_skip.clear();
+ m_words->resetAnagramFilters();
m_current = QPoint(0,0);
}
@@ -363,10 +321,13 @@
}
while (!positions.isEmpty()) {
- QPoint pos = positions.takeAt(qrand() % positions.count());
- int right = wordLength() + pos.x();
- int left = -wordLength() + pos.x();
+ QPoint pos = positions.takeAt(randomInt(positions.count()));
+ // Define possible range for word
+ int right = wordLength() + pos.x() - 1;
+ int left = -wordLength() + pos.x() + 1;
+
+ // Check for conflicting words on the right side of range for word
for (int x = 1; x <= wordLength(); ++x) {
for (int y = -1; y < 2; ++y) {
QPoint test(pos.x() + x, pos.y() + y);
@@ -378,6 +339,7 @@
}
}
+ // Check for conflicting words on the left side of range for word
for (int x = -1; x >= -wordLength(); --x) {
for (int y = -1; y < 2; ++y) {
QPoint test(pos.x() + x, pos.y() + y);
@@ -389,10 +351,11 @@
}
}
+ // Randomly place word in range if it can fit
int length = right - left;
int offset = length - wordLength();
if (offset >= 0) {
- left += offset ? (qrand() % offset) : 0;
+ left += offset ? randomInt(offset) : 0;
right = left + wordLength();
m_current = QPoint(left, pos.y());
return addRandomWord(Qt::Horizontal);
@@ -411,10 +374,13 @@
}
while (!positions.isEmpty()) {
- QPoint pos = positions.takeAt(qrand() % positions.count());
- int bottom = wordLength() + pos.y();
- int top = -wordLength() + pos.y();
+ QPoint pos = positions.takeAt(randomInt(positions.count()));
+
+ // Define possible range for word
+ int bottom = wordLength() + pos.y() - 1;
+ int top = -wordLength() + pos.y() + 1;
+ // Check for conflicting words on the bottom of range for word
for (int y = 1; y <= wordLength(); ++y) {
for (int x = -1; x < 2; ++x) {
QPoint test(pos.x() + x, pos.y() + y);
@@ -426,6 +392,7 @@
}
}
+ // Check for conflicting words on the top of range for word
for (int y = -1; y >= -wordLength(); --y) {
for (int x = -1; x < 2; ++x) {
QPoint test(pos.x() + x, pos.y() + y);
@@ -437,10 +404,11 @@
}
}
+ // Randomly place word in range if it can fit
int length = bottom - top;
int offset = length - wordLength();
if (offset >= 0) {
- top += offset ? (qrand() % offset) : 0;
+ top += offset ? randomInt(offset) : 0;
bottom = top + wordLength();
m_current = QPoint(pos.x(), top);
return addRandomWord(Qt::Vertical);
diff -Nru connectagram-1.0.1/src/pattern.h connectagram-1.1.2/src/pattern.h
--- connectagram-1.0.1/src/pattern.h 2009-08-31 10:39:09.000000000 +0000
+++ connectagram-1.1.2/src/pattern.h 2013-02-20 21:06:10.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009 Graeme Gott
+ * Copyright (C) 2009, 2013 Graeme Gott
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,6 +20,10 @@
#ifndef PATTERN_H
#define PATTERN_H
+#include "random.h"
+#include "wordlist.h"
+class Word;
+
#include
#include
#include
@@ -27,16 +31,14 @@
#include
#include
#include
-class Word;
class Pattern : public QThread {
Q_OBJECT
public:
- Pattern();
virtual ~Pattern();
- static Pattern* create(int type);
+ static Pattern* create(WordList* words, int type);
static int types() {
return 6;
@@ -46,40 +48,36 @@
return m_size;
}
- virtual int minimumLength() const {
- return 5;
- }
-
- virtual int minimumCount() const {
- return 4;
- }
-
- virtual int expandCount() const {
- return 2;
+ virtual QList counts() const {
+ return QList() << 4 << 8 << 12 << 16;
}
virtual QString name() const {
return QString();
}
- QList solution() const {
- return m_solution;
+ virtual int minimumLength() const {
+ return 5;
}
- QStringList words() const {
- return m_words.value(wordLength());
+ int maximumLength() const {
+ return m_words->maximumLength();
}
- static int maximumLength() {
- return m_max_length;
+ QList solution() const {
+ return m_solution;
}
int seed() const {
return m_seed;
}
+ const WordList* words() const {
+ return m_words;
+ }
+
int wordCount() const {
- return m_count;
+ return counts().indexOf(m_count);
}
int wordLength() const {
@@ -94,10 +92,16 @@
void generated();
protected:
+ Pattern(WordList* words);
+
Word* addRandomWord(Qt::Orientation orientation);
QChar at(const QPoint& pos) const;
virtual void run();
+ unsigned int randomInt(unsigned int max) {
+ return m_random.nextInt(max);
+ }
+
protected:
QPoint m_current;
@@ -105,30 +109,34 @@
void cleanUp();
virtual int steps() const {
- return expandCount();
+ return 2;
}
virtual Word* addWord(int step);
private:
- static QHash m_words;
- static int m_max_length;
+ WordList* m_words;
int m_count;
int m_length;
int m_seed;
QSize m_size;
- QStringList m_skip;
QList m_solution;
bool m_cancelled;
QMutex m_cancelled_mutex;
+ Random m_random;
};
//-----------------------------------------------------------------------------
class ChainPattern : public Pattern {
+ Q_OBJECT
+
public:
- int expandCount() const {
- return 5;
+ ChainPattern(WordList* words) : Pattern(words) {
+ }
+
+ QList counts() const {
+ return QList() << 4 << 9 << 14 << 19;
}
QString name() const {
@@ -136,15 +144,24 @@
}
private:
+ int steps() const {
+ return 5;
+ }
+
Word* addWord(int step);
};
//-----------------------------------------------------------------------------
class FencePattern : public Pattern {
+ Q_OBJECT
+
public:
- int expandCount() const {
- return 3;
+ FencePattern(WordList* words) : Pattern(words) {
+ }
+
+ QList counts() const {
+ return QList