mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'microFixes' of https://github.com/tcanabrava/subsurface

Browse source
This commit is contained in:
Dirk Hohndel 2013-05-21 19:34:03 -07:00
commit 238c80a708
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qt-gui.cpp
View file

@ -61,6 +61,9 @@ const char *existing_filename;
void init_qt_ui(int *argcp, char ***argvp)
{
application->installTranslator(new Translator(application));
QCoreApplication::setOrganizationName("hohndel");
QCoreApplication::setOrganizationDomain("hohndel.org");
QCoreApplication::setApplicationName("Subsurface");
MainWindow *window = new MainWindow();
window->show();
}
@ -78,7 +81,7 @@ void init_ui(int *argcp, char ***argvp)
QTextCodec::setCodecForCStrings(QTextCodec::codecForMib(106));
#endif
QSettings settings("hohndel.org","subsurface");
QSettings settings;
settings.beginGroup("GeneralSettings");
v = settings.value(QString("default_filename"));
if (v.isValid()) {

8
qt-ui/divelistview.cpp
View file

@ -48,15 +48,20 @@ void DiveListView::reload()
QSettings s;
s.beginGroup("DiveListColumnState");
for(int i = 0; i < model()->columnCount(); i++){
QString title = QString("show %1").arg( model()->headerData( i, Qt::Horizontal).toString());
QString title = QString("show %1").arg(model()->headerData( i, Qt::Horizontal).toString());
QAction *a = new QAction(title, header());
a->setCheckable(true);
a->setChecked( s.value(title, true).toBool());
a->setProperty("index", i);
connect(a, SIGNAL(triggered(bool)), this, SLOT(hideColumnByIndex()));
header()->addAction(a);
if (a->isChecked())
showColumn(true);
else
hideColumn(false);
}
s.endGroup();
s.sync();
}
}
@ -70,6 +75,7 @@ void DiveListView::hideColumnByIndex()
s.beginGroup("DiveListColumnState");
s.setValue(action->text(), action->isChecked());
s.endGroup();
s.sync();
if (action->isChecked())
showColumn(action->property("index").toInt());

4
qt-ui/mainwindow.cpp
View file

@ -323,7 +323,7 @@ void MainWindow::readSettings()
{
int i;
QVariant v;
QSettings settings("hohndel.org","subsurface");
QSettings settings;
settings.beginGroup("MainWindow");
QSize sz = settings.value("size").value<QSize>();
@ -417,7 +417,7 @@ void MainWindow::readSettings()
void MainWindow::writeSettings()
{
int i;
QSettings settings("hohndel.org","subsurface");
QSettings settings;
settings.beginGroup("MainWindow");
settings.setValue("size",size());