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

Throw some unused things from "ViewManager" away.

Browse Source
This commit is contained in:
con
2009-12-09 10:51:18 +01:00
parent aea194252e
commit 4053ac0c10
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -1161,7 +1161,6 @@ void MainWindow::writeSettings()
m_settings->endGroup(); m_settings->endGroup();
m_fileManager->saveRecentFiles(); m_fileManager->saveRecentFiles();
m_viewManager->saveSettings(m_settings);
m_actionManager->saveSettings(m_settings); m_actionManager->saveSettings(m_settings);
m_editorManager->saveSettings(); m_editorManager->saveSettings();
m_navigationWidget->saveSettings(m_settings); m_navigationWidget->saveSettings(m_settings);

2
src/plugins/coreplugin/statusbarwidget.h
View File

@@ -41,7 +41,7 @@ class CORE_EXPORT StatusBarWidget : public IContext
Q_OBJECT Q_OBJECT
public: public:
enum StatusBarPosition { First=0, Second=1, Third=2 }; enum StatusBarPosition { First=0, Second=1, Third=2, Last=Third };
StatusBarWidget(QObject *parent = 0); StatusBarWidget(QObject *parent = 0);
~StatusBarWidget(); ~StatusBarWidget();

14
src/plugins/coreplugin/viewmanager.cpp
View File

@@ -51,7 +51,7 @@ ViewManager::ViewManager(MainWindow *mainWnd)
: QObject(mainWnd), : QObject(mainWnd),
m_mainWnd(mainWnd) m_mainWnd(mainWnd)
{ {
for (int i = 0; i < 3; ++i) { for (int i = 0; i <= StatusBarWidget::Last; ++i) {
QWidget *w = new QWidget(); QWidget *w = new QWidget();
m_mainWnd->statusBar()->insertPermanentWidget(i, w); m_mainWnd->statusBar()->insertPermanentWidget(i, w);
w->setLayout(new QHBoxLayout); w->setLayout(new QHBoxLayout);
@@ -59,8 +59,8 @@ ViewManager::ViewManager(MainWindow *mainWnd)
w->layout()->setMargin(0); w->layout()->setMargin(0);
m_statusBarWidgets.append(w); m_statusBarWidgets.append(w);
} }
QLabel *l = new QLabel(); m_mainWnd->statusBar()->insertPermanentWidget(StatusBarWidget::Last+1,
m_mainWnd->statusBar()->insertPermanentWidget(3, l, 1); new QLabel(), 1);
} }
ViewManager::~ViewManager() ViewManager::~ViewManager()
@@ -85,7 +85,6 @@ void ViewManager::objectAdded(QObject *obj)
viewWidget = view->widget(); viewWidget = view->widget();
m_statusBarWidgets.at(view->position())->layout()->addWidget(viewWidget); m_statusBarWidgets.at(view->position())->layout()->addWidget(viewWidget);
m_viewMap.insert(view, viewWidget);
m_mainWnd->addContextObject(view); m_mainWnd->addContextObject(view);
} }
@@ -99,11 +98,4 @@ void ViewManager::aboutToRemoveObject(QObject *obj)
void ViewManager::extensionsInitalized() void ViewManager::extensionsInitalized()
{ {
QSettings *settings = m_mainWnd->settings();
m_mainWnd->restoreState(settings->value(QLatin1String("ViewGroup_Default"), QByteArray()).toByteArray());
}
void ViewManager::saveSettings(QSettings *settings)
{
settings->setValue(QLatin1String("ViewGroup_Default"), m_mainWnd->saveState());
} }

3
src/plugins/coreplugin/viewmanager.h
View File

@@ -60,15 +60,12 @@ public:
void init(); void init();
void extensionsInitalized(); void extensionsInitalized();
void saveSettings(QSettings *settings);
private slots: private slots:
void objectAdded(QObject *obj); void objectAdded(QObject *obj);
void aboutToRemoveObject(QObject *obj); void aboutToRemoveObject(QObject *obj);
private: private:
QMap<Core::StatusBarWidget *, QWidget *> m_viewMap;
MainWindow *m_mainWnd; MainWindow *m_mainWnd;
QList<QWidget *> m_statusBarWidgets; QList<QWidget *> m_statusBarWidgets;
}; };