diff options
author | Eike Ziller <eike.ziller@digia.com> | 2014-05-28 10:13:50 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-28 11:16:24 +0200 |
commit | 665eb733144cd1f29f9e31fcf1ee3782e4a6434d (patch) | |
tree | beb82b7c1e2f7e8d50b9422e0407af041881c10b | |
parent | 14976ca1422632a9700d7140c5a23f7ac27978e0 (diff) | |
download | qt-creator-665eb733144cd1f29f9e31fcf1ee3782e4a6434d.tar.gz |
More robust saving of output pane button visibility setting.
Explicitly manage visibility state instead of relying on
QWidget::isVisible which might lead to problems at shutdown.
Change-Id: Ic0c2f4e4f83c4241aea2ad28e533f5148cc4606e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
-rw-r--r-- | src/plugins/coreplugin/outputpanemanager.cpp | 20 | ||||
-rw-r--r-- | src/plugins/coreplugin/outputpanemanager.h | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index b7103d6693..4a060e41b3 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -289,6 +289,7 @@ void OutputPaneManager::init() bool visible = outPane->priorityInStatusBar() != -1; button->setVisible(visible); + m_buttonVisibility.insert(id, visible); connect(action, SIGNAL(triggered()), this, SLOT(shortcutTriggered())); } @@ -363,19 +364,18 @@ void OutputPaneManager::buttonTriggered(int idx) void OutputPaneManager::readSettings() { - QMap<QString, bool> visibility; QSettings *settings = ICore::settings(); int num = settings->beginReadArray(QLatin1String(outputPaneSettingsKeyC)); for (int i = 0; i < num; ++i) { settings->setArrayIndex(i); - visibility.insert(settings->value(QLatin1String(outputPaneIdKeyC)).toString(), + m_buttonVisibility.insert(Id::fromSetting(settings->value(QLatin1String(outputPaneIdKeyC))), settings->value(QLatin1String(outputPaneVisibleKeyC)).toBool()); } settings->endArray(); for (int i = 0; i < m_ids.size(); ++i) { - if (visibility.contains(m_ids.at(i).toString())) - m_buttons.at(i)->setVisible(visibility.value(m_ids.at(i).toString())); + if (m_buttonVisibility.contains(m_ids.at(i))) + m_buttons.at(i)->setVisible(m_buttonVisibility.value(m_ids.at(i))); } m_outputPaneHeight = settings->value(QLatin1String("OutputPanePlaceHolder/Height"), 0).toInt(); @@ -555,7 +555,7 @@ void OutputPaneManager::popupMenu() foreach (IOutputPane *pane, m_panes) { QAction *act = menu.addAction(pane->displayName()); act->setCheckable(true); - act->setChecked(m_buttons.at(idx)->isVisible()); + act->setChecked(m_buttonVisibility.value(m_ids.at(idx))); act->setData(idx); ++idx; } @@ -563,14 +563,17 @@ void OutputPaneManager::popupMenu() if (!result) return; idx = result->data().toInt(); + Id id = m_ids.at(idx); QTC_ASSERT(idx >= 0 && idx < m_buttons.size(), return); QToolButton *button = m_buttons.at(idx); - if (button->isVisible()) { + if (m_buttonVisibility.value(id)) { m_panes.value(idx)->visibilityChanged(false); button->setChecked(false); button->hide(); + m_buttonVisibility.insert(id, false); } else { button->show(); + m_buttonVisibility.insert(id, true); showPage(idx, IOutputPane::ModeSwitch); } } @@ -582,8 +585,9 @@ void OutputPaneManager::saveSettings() const m_ids.size()); for (int i = 0; i < m_ids.size(); ++i) { settings->setArrayIndex(i); - settings->setValue(QLatin1String(outputPaneIdKeyC), m_ids.at(i).toString()); - settings->setValue(QLatin1String(outputPaneVisibleKeyC), m_buttons.at(i)->isVisible()); + settings->setValue(QLatin1String(outputPaneIdKeyC), m_ids.at(i).toSetting()); + settings->setValue(QLatin1String(outputPaneVisibleKeyC), + m_buttonVisibility.value(m_ids.at(i))); } settings->endArray(); settings->setValue(QLatin1String("OutputPanePlaceHolder/Height"), m_outputPaneHeight); diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h index 84d06f105e..308ea963ad 100644 --- a/src/plugins/coreplugin/outputpanemanager.h +++ b/src/plugins/coreplugin/outputpanemanager.h @@ -32,6 +32,7 @@ #include <coreplugin/id.h> +#include <QMap> #include <QToolButton> QT_BEGIN_NAMESPACE @@ -126,6 +127,7 @@ private: QVector<OutputPaneToggleButton *> m_buttons; QVector<QAction *> m_actions; QVector<Id> m_ids; + QMap<Id, bool> m_buttonVisibility; QStackedWidget *m_outputWidgetPane; QStackedWidget *m_opToolBarWidgets; |