Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-17 06:11:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not repeat the application name and organization name everywhere

Browse source
This commit is contained in:
Olivier Teulière 2012-02-02 09:02:20 +01:00
parent a3b8b9872a
commit e86d71626c
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt/aux_window.cpp
View file

@ -85,7 +85,7 @@ void AuxWindow::closeEvent(QCloseEvent *event)
void AuxWindow::writeSettings() const void AuxWindow::writeSettings() const
{ {
QSettings settings(ORGANIZATION, PACKAGE_NAME); QSettings settings;
settings.beginGroup(m_windowName); settings.beginGroup(m_windowName);
settings.setValue("size", size()); settings.setValue("size", size());
settings.setValue("pos", pos()); settings.setValue("pos", pos());
@ -95,7 +95,7 @@ void AuxWindow::writeSettings() const
void AuxWindow::readSettings() void AuxWindow::readSettings()
{ {
QSettings settings(ORGANIZATION, PACKAGE_NAME); QSettings settings;
settings.beginGroup(m_windowName); settings.beginGroup(m_windowName);
QSize size = settings.value("size").toSize(); QSize size = settings.value("size").toSize();
if (size.isValid()) if (size.isValid())

2
qt/history_widget.cpp
View file

@ -124,7 +124,7 @@ void HistoryWidget::updateModel()
if (m_history != NULL && m_history->getSize() != 0) if (m_history != NULL && m_history->getSize() != 0)
{ {
// Should we align the rack with its solution? // Should we align the rack with its solution?
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
bool align = qs.value(PrefsDialog::kINTF_ALIGN_HISTORY).toBool(); bool align = qs.value(PrefsDialog::kINTF_ALIGN_HISTORY).toBool();
if (!align) if (!align)

3
qt/main.cpp
View file

@ -119,6 +119,9 @@ int main(int argc, char **argv)
MyApplication app(argc, argv); MyApplication app(argc, argv);
app.setWindowIcon(QIcon(":/images/eliot.xpm")); app.setWindowIcon(QIcon(":/images/eliot.xpm"));
// Used for QSettings
app.setApplicationName(PACKAGE_NAME);
app.setOrganizationName("eliot");
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
// Set the message domain // Set the message domain

20
qt/main_window.cpp
View file

@ -99,7 +99,7 @@ MainWindow::MainWindow(QWidget *iParent)
// Make it easier to reproduce bugs // Make it easier to reproduce bugs
LOG_DEBUG("Rand seed: " << val); LOG_DEBUG("Rand seed: " << val);
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
int timerTotal = qs.value(PrefsDialog::kINTF_TIMER_TOTAL_DURATION, 180).toInt(); int timerTotal = qs.value(PrefsDialog::kINTF_TIMER_TOTAL_DURATION, 180).toInt();
int timerAlert = qs.value(PrefsDialog::kINTF_TIMER_ALERT_DURATION, 30).toInt(); int timerAlert = qs.value(PrefsDialog::kINTF_TIMER_ALERT_DURATION, 30).toInt();
m_timerModel = new TimerModel(timerTotal, timerAlert); m_timerModel = new TimerModel(timerTotal, timerAlert);
@ -260,7 +260,7 @@ void MainWindow::linkTrainingAnd7P1()
// Reconnect it only if needed // Reconnect it only if needed
if (m_dicToolsWindow != NULL) if (m_dicToolsWindow != NULL)
{ {
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
if (qs.value(PrefsDialog::kINTF_LINK_TRAINING_7P1, false).toBool()) if (qs.value(PrefsDialog::kINTF_LINK_TRAINING_7P1, false).toBool())
{ {
QObject::connect(m_trainingWidget, QObject::connect(m_trainingWidget,
@ -285,7 +285,7 @@ void MainWindow::prefsUpdated()
} }
// Refresh the timer values // Refresh the timer values
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
int timerTotal = qs.value(PrefsDialog::kINTF_TIMER_TOTAL_DURATION).toInt(); int timerTotal = qs.value(PrefsDialog::kINTF_TIMER_TOTAL_DURATION).toInt();
int timerAlert = qs.value(PrefsDialog::kINTF_TIMER_ALERT_DURATION).toInt(); int timerAlert = qs.value(PrefsDialog::kINTF_TIMER_ALERT_DURATION).toInt();
m_timerModel->setTotalDuration(timerTotal); m_timerModel->setTotalDuration(timerTotal);
@ -424,7 +424,7 @@ void MainWindow::displayInfoMsg(QString iMsg)
void MainWindow::showDefinition(QString iWord) void MainWindow::showDefinition(QString iWord)
{ {
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
QString url = qs.value(PrefsDialog::kINTF_DEFINITIONS_SITE_URL, QString url = qs.value(PrefsDialog::kINTF_DEFINITIONS_SITE_URL,
PrefsDialog::kDEFAULT_DEF_SITE).toString(); PrefsDialog::kDEFAULT_DEF_SITE).toString();
if (url == "") if (url == "")
@ -477,7 +477,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
void MainWindow::writeSettings() const void MainWindow::writeSettings() const
{ {
QSettings settings(ORGANIZATION, PACKAGE_NAME); QSettings settings;
settings.beginGroup(m_windowName); settings.beginGroup(m_windowName);
settings.setValue("size", size()); settings.setValue("size", size());
settings.setValue("pos", pos()); settings.setValue("pos", pos());
@ -492,7 +492,7 @@ void MainWindow::writeSettings() const
void MainWindow::readSettings() void MainWindow::readSettings()
{ {
QSettings settings(ORGANIZATION, PACKAGE_NAME); QSettings settings;
settings.beginGroup(m_windowName); settings.beginGroup(m_windowName);
QSize size = settings.value("size").toSize(); QSize size = settings.value("size").toSize();
if (size.isValid()) if (size.isValid())
@ -528,7 +528,7 @@ void MainWindow::changeDictionary(QString iFileName)
displayInfoMsg(_q("Loaded dictionary '%1'").arg(iFileName)); displayInfoMsg(_q("Loaded dictionary '%1'").arg(iFileName));
// Save the location of the dictionary in the preferences // Save the location of the dictionary in the preferences
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
qs.setValue(PrefsDialog::kINTF_DIC_PATH, iFileName); qs.setValue(PrefsDialog::kINTF_DIC_PATH, iFileName);
} }
catch (std::exception &e) catch (std::exception &e)
@ -558,7 +558,7 @@ QAction * MainWindow::addMenuAction(QMenu *menu, QString iText,
void MainWindow::createMenu() void MainWindow::createMenu()
{ {
// Decide whether to show the toolbar // Decide whether to show the toolbar
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
bool showToolBar = qs.value(PrefsDialog::kINTF_SHOW_TOOLBAR, true).toBool(); bool showToolBar = qs.value(PrefsDialog::kINTF_SHOW_TOOLBAR, true).toBool();
m_ui.toolBar->setVisible(showToolBar); m_ui.toolBar->setVisible(showToolBar);
@ -944,7 +944,7 @@ void MainWindow::onWindowsToolbar()
m_ui.toolBar->hide(); m_ui.toolBar->hide();
else else
m_ui.toolBar->show(); m_ui.toolBar->show();
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
qs.setValue(PrefsDialog::kINTF_SHOW_TOOLBAR, m_ui.toolBar->isVisible()); qs.setValue(PrefsDialog::kINTF_SHOW_TOOLBAR, m_ui.toolBar->isVisible());
} }
@ -1161,7 +1161,7 @@ void MainWindow::onHistoryReplayTurn()
if (m_game == NULL) if (m_game == NULL)
return; return;
QSettings settings(ORGANIZATION, PACKAGE_NAME); QSettings settings;
bool warn = settings.value(PrefsDialog::kINTF_WARN_REPLAY_TURN, true).toBool(); bool warn = settings.value(PrefsDialog::kINTF_WARN_REPLAY_TURN, true).toBool();
if (warn) { if (warn) {
// Ask for a confirmation, because this may lead to data loss // Ask for a confirmation, because this may lead to data loss

2
qt/new_game.cpp
View file

@ -125,7 +125,7 @@ NewGame::NewGame(QWidget *iParent)
void NewGame::refresh() void NewGame::refresh()
{ {
// Retrieve the default computer level // Retrieve the default computer level
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
int defLevel = qs.value(PrefsDialog::kINTF_DEFAULT_AI_LEVEL, 100).toInt(); int defLevel = qs.value(PrefsDialog::kINTF_DEFAULT_AI_LEVEL, 100).toInt();
// Ensure a valid range // Ensure a valid range
if (defLevel < 0) if (defLevel < 0)

4
qt/prefs_dialog.cpp
View file

@ -73,7 +73,7 @@ PrefsDialog::PrefsDialog(QWidget *iParent)
try try
{ {
// Interface settings // Interface settings
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
lineEditIntfDicPath->setText(qs.value(kINTF_DIC_PATH, "").toString()); lineEditIntfDicPath->setText(qs.value(kINTF_DIC_PATH, "").toString());
lineEditDefSite->setText(qs.value(kINTF_DEFINITIONS_SITE_URL, lineEditDefSite->setText(qs.value(kINTF_DEFINITIONS_SITE_URL,
kDEFAULT_DEF_SITE).toString()); kDEFAULT_DEF_SITE).toString());
@ -133,7 +133,7 @@ void PrefsDialog::updateSettings()
try try
{ {
// Interface settings // Interface settings
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
qs.setValue(kINTF_DIC_PATH, lineEditIntfDicPath->text()); qs.setValue(kINTF_DIC_PATH, lineEditIntfDicPath->text());
qs.setValue(kINTF_DEFINITIONS_SITE_URL, lineEditDefSite->text()); qs.setValue(kINTF_DEFINITIONS_SITE_URL, lineEditDefSite->text());
if (qs.value(kINTF_ALIGN_HISTORY, true).toBool() != checkBoxIntfAlignHistory->isChecked()) if (qs.value(kINTF_ALIGN_HISTORY, true).toBool() != checkBoxIntfAlignHistory->isChecked())

3
qt/qtcommon.h
View file

@ -55,9 +55,6 @@ QString qfw(const wstring &wstr);
# define _q(s) QString::fromLocal8Bit(_(s)) # define _q(s) QString::fromLocal8Bit(_(s))
#endif #endif
// Used for QSettings
#define ORGANIZATION "eliot"
class QObject; class QObject;
class QWidget; class QWidget;

2
qt/tile_widget.cpp
View file

@ -194,7 +194,7 @@ void TileWidget::paintEvent(QPaintEvent *iEvent)
painter.setPen(TextNormalColour); painter.setPen(TextNormalColour);
// Should we display the tiles points? // Should we display the tiles points?
QSettings qs(ORGANIZATION, PACKAGE_NAME); QSettings qs;
const bool showPoints = qs.value(PrefsDialog::kINTF_SHOW_TILES_POINTS, true).toBool(); const bool showPoints = qs.value(PrefsDialog::kINTF_SHOW_TILES_POINTS, true).toBool();
// Draw the points of the tile // Draw the points of the tile