feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fixed a crash with sidebar when using old settings files

Browse Source 
If the user uses old QtC settings files (QtCreator.ini), sidebar item
names are there translated. Because the new settings uses id's instead
of translated names, old sidebar items will not exist on save, causing
crashes. this fixes that issue.

Reviewed-by: con
This commit is contained in:
Lasse Holmstedt
2010-05-14 12:05:49 +02:00
parent a8133e089e
commit 0cf8209936
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/coreplugin/sidebar.cpp
View File

@@ -218,11 +218,19 @@ void SideBar::saveSettings(QSettings *settings, const QString &name)
const QString prefix = name.isEmpty() ? name : (name + QLatin1Char('/'));
QStringList views;
for (int i = 0; i < m_widgets.count(); ++i)
views.append(m_widgets.at(i)->currentItemId());
for (int i = 0; i < m_widgets.count(); ++i) {
QString currentItemId = m_widgets.at(i)->currentItemId();
if (!currentItemId.isEmpty())
views.append(currentItemId);
}
if (views.isEmpty() && m_itemMap.size()) {
QMapIterator<QString, QWeakPointer<SideBarItem> > iter(m_itemMap);
iter.next();
views.append(iter.key());
}
settings->setValue(prefix + "Views", views);
settings->setValue(prefix + "Visible", true);//isVisible());
settings->setValue(prefix + "Visible", true);
settings->setValue(prefix + "VerticalPosition", saveState());
settings->setValue(prefix + "Width", width());
}
@@ -244,6 +252,7 @@ void SideBar::readSettings(QSettings *settings, const QString &name)
if (views.count()) {
foreach (const QString &id, views)
insertSideBarWidget(m_widgets.count(), id);
} else {
insertSideBarWidget(0);
}
@@ -365,7 +374,9 @@ QString SideBarWidget::currentItemTitle() const
QString SideBarWidget::currentItemId() const
{
return m_currentItem->id();
if (m_currentItem)
return m_currentItem->id();
return QString();
}
void SideBarWidget::setCurrentItem(const QString &id)