diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/options/container.cpp | 1 | ||||
| -rw-r--r-- | src/modules/options/dialog.cpp | 20 | ||||
| -rw-r--r-- | src/modules/options/optw_messages.cpp | 4 |
3 files changed, 19 insertions, 6 deletions
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index 731f5ff33..c9673bdf9 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -82,7 +82,6 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w) KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className()); if(e) { - //KviStr caption(KviStr::Format,"%s - KVIrc",e->szName); setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(e->iIcon)))); setWindowTitle(e->szName); } diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index d2e1836d7..cf65dc081 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -611,8 +611,20 @@ void KviOptionsDialog::applyClicked() void KviOptionsDialog::apply(bool bDialogAboutToClose) { int count=m_pTreeWidget->topLevelItemCount(); + int curTab=-1; KviOptionsTreeWidgetItem * it; + if(!bDialogAboutToClose) + { + // bring up the current widget again! + it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem(); + //checking if the check of the check is checkable + if(it) + if(it->m_pOptionsWidget) + if(it->m_pOptionsWidget->tabWidget()) + curTab = it->m_pOptionsWidget->tabWidget()->currentIndex(); + } + for (int i=0;i<count;i++) { it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); @@ -623,7 +635,13 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose) { // bring up the current widget again! it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem(); - if(it)treeWidgetItemSelectionChanged(it, 0); + if(it) + { + treeWidgetItemSelectionChanged(it, 0); + if(curTab > 0 && it->m_pOptionsWidget) + if(it->m_pOptionsWidget->tabWidget()) + it->m_pOptionsWidget->tabWidget()->setCurrentIndex(curTab); + } } g_pApp->saveConfiguration(); diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index cc8159e39..7fff27958 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -589,18 +589,14 @@ void KviMessageColorsOptionsWidget::save() void KviMessageColorsOptionsWidget::load() { - //KviStr szName; QString szName; - //KviStr szInit; QString szInit; g_pApp->getLocalKvircDirectory(szInit,KviApp::MsgColors); #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) // symlink local to global - //KviStr szGlobal; QString szGlobal; g_pApp->getGlobalKvircDirectory(szGlobal,KviApp::MsgColors); - //KviStr szLocal; QString szLocal; g_pApp->getLocalKvircDirectory(szLocal,KviApp::MsgColors,"presets"); //qDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr()); |