summaryrefslogtreecommitdiff
path: root/src/Preferences.cc
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2012-07-23 01:45:12 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2012-07-23 01:45:12 (GMT)
commitb33a02b372cb1efff5bf6b177a2360e5d5ba87b3 (patch)
tree52d7fb8428cc0aa9b7e4d90c0986bb47d2a50179 /src/Preferences.cc
parent3c7a85af570e5609f4a6625e06410f31fa4d4f0f (diff)
remove debugging statements
Diffstat (limited to 'src/Preferences.cc')
-rw-r--r--src/Preferences.cc33
1 files changed, 1 insertions, 32 deletions
diff --git a/src/Preferences.cc b/src/Preferences.cc
index d1324d4..e70a2a1 100644
--- a/src/Preferences.cc
+++ b/src/Preferences.cc
@@ -55,32 +55,19 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent)
this->defaultmap["editor/fontfamily"] = found_family;
this->defaultmap["editor/fontsize"] = 12;
-
uint savedsize = getValue("editor/fontsize").toUInt();
-
-// disconnect(this->fontSize, SIGNAL(currentIndexChanged(const QString&)),0,0);
-// this, SLOT(on_fontSize_editTextChanged(const QString &)));
-#include <iostream>
- std::cout << "pref constructor: savedsize" << savedsize << "\n";
QFontDatabase db;
foreach(uint size, db.standardSizes()) {
- std::cout << "pref iterate standard sizes" << size << "\n";
- std::cout <<"fontsize->additem started\n";
this->fontSize->addItem(QString::number(size));
- std::cout <<"fontsize->additem completed\n";
if (size == savedsize) {
- std::cout << "pref iterate standard sizes - size=savedsize, set index" << this->fontSize->count() - 1 << "\n";
this->fontSize->setCurrentIndex(this->fontSize->count()-1);
}
}
-
- std::cout << "connect fontsize to onfontsize_edittextchanged\n";
connect(this->fontSize, SIGNAL(currentIndexChanged(const QString&)),
this, SLOT(on_fontSize_editTextChanged(const QString &)));
- std::cout << "connect fontsize to onfontsize_edittextchanged done \n";
- std::cout << "pref constr: setedtext\n";
+ // reset GUI fontsize if fontSize->addItem emitted signals that changed it.
this->fontSize->setEditText( QString("%1").arg( savedsize ) );
// Setup default settings
@@ -180,20 +167,14 @@ void Preferences::on_colorSchemeChooser_itemSelectionChanged()
void Preferences::on_fontChooser_activated(const QString &family)
{
- std::cout << "on fontchooser activated\n";
QSettings settings;
settings.setValue("editor/fontfamily", family);
- std::cout << "emitting fontchanged " << getValue("editor/fontsize").toString().toStdString() << "\n";
emit fontChanged(family, getValue("editor/fontsize").toUInt());
}
void Preferences::on_fontSize_editTextChanged(const QString &size)
{
- /// size can be wrong. ignore it.
- std::cout << "on fontsize edittextchanged. set settings: " << size.toStdString() << "\n";
uint intsize = size.toUInt();
- std::cout << "on fontsize edittextchanged. intsize: " << intsize << "\n";
- std::cout << "on fontisze edittextchanged. othsize" << fontSize->currentText().toStdString() << "\n";
QSettings settings;
settings.setValue("editor/fontsize", intsize);
emit fontChanged(getValue("editor/fontfamily").toString(), intsize);
@@ -273,11 +254,6 @@ void Preferences::removeDefaultSettings()
QVariant Preferences::getValue(const QString &key) const
{
QSettings settings;
-#include <iostream>
- std::cout << "prefs: getvalue of key: " << key.toStdString() << "\n";
- std::cout << "prefs: settings.contains key: " << settings.contains(key) << "\n";
- std::cout << "prefs: settings[key]: " << settings.value(key).toString().toStdString() << "\n";
- std::cout << "prefs: defaultmap" << this->defaultmap[key].toString().toStdString() << "\n";
assert(settings.contains(key) || this->defaultmap.contains(key));
return settings.value(key, this->defaultmap[key]);
}
@@ -290,25 +266,20 @@ void Preferences::updateGUI()
Qt::MatchExactly);
if (!found.isEmpty()) this->colorSchemeChooser->setCurrentItem(found.first());
-#include <iostream>
QString fontfamily = getValue("editor/fontfamily").toString();
int fidx = this->fontChooser->findText(fontfamily,Qt::MatchContains);
if (fidx >= 0) {
- std::cout << "font family nofind, set curent index\n";
this->fontChooser->setCurrentIndex(fidx);
}
QString fontsize = getValue("editor/fontsize").toString();
- std::cout << "updateGUI fontsize:" << fontsize.toStdString() << "\n";
int sidx = this->fontSize->findText(fontsize);
if (sidx >= 0) {
- std::cout << "font size nofind, set curent index\n";
this->fontSize->setCurrentIndex(sidx);
}
else {
this->fontSize->setEditText(fontsize);
}
- std::cout << "updateGUI sidx:" << sidx << "\n";
this->openCSGWarningBox->setChecked(getValue("advanced/opencsg_show_warning").toBool());
this->enableOpenCSGBox->setChecked(getValue("advanced/enable_opencsg_opengl1x").toBool());
@@ -320,8 +291,6 @@ void Preferences::updateGUI()
void Preferences::apply() const
{
- std::cout << "Prefs: apply\n";
- std::cout << "editor/fontsize: " << getValue("editor/fontsize").toString().toStdString() << "\n";
emit fontChanged(getValue("editor/fontfamily").toString(), getValue("editor/fontsize").toUInt());
emit requestRedraw();
emit openCSGSettingsChanged();
contact: Jan Huwald // Impressum