forked from qt-creator/qt-creator
Move progress indicators out of mode bar.
This both allows the mode bar to be hidden optionally, and can give the progress information a bit more room (e.g. for titles). Progress information can either be shown in "pop up" windows in the lower left corner of the main window (hiding window contents below), or in a summary progress bar in the bottom right corner of the status bar. Hovering the summary progress bar temporarily pops up the detailed progress information. Keyboard can be used to switch between the two views. Change-Id: Ic6d6ab4fd43906e84b480c8ddf8eae5f5852e1f3 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
@@ -51,6 +51,7 @@
|
||||
#include "outputpane.h"
|
||||
#include "plugindialog.h"
|
||||
#include "progressmanager_p.h"
|
||||
#include "progressview.h"
|
||||
#include "shortcutsettings.h"
|
||||
#include "vcsmanager.h"
|
||||
#include "scriptmanager_p.h"
|
||||
@@ -202,7 +203,6 @@ MainWindow::MainWindow() :
|
||||
|
||||
m_modeStack = new FancyTabWidget(this);
|
||||
m_modeManager = new ModeManager(this, m_modeStack);
|
||||
m_modeManager->addWidget(m_progressManager->progressView());
|
||||
m_statusBarManager = new StatusBarManager(this);
|
||||
m_messageManager = new MessageManager;
|
||||
m_editorManager = new EditorManager(this);
|
||||
@@ -210,6 +210,9 @@ MainWindow::MainWindow() :
|
||||
m_externalToolManager = new ExternalToolManager();
|
||||
setCentralWidget(m_modeStack);
|
||||
|
||||
m_progressManager->progressView()->setParent(this);
|
||||
m_progressManager->progressView()->setReferenceWidget(m_modeStack->statusBar());
|
||||
|
||||
connect(QApplication::instance(), SIGNAL(focusChanged(QWidget*,QWidget*)),
|
||||
this, SLOT(updateFocusWidget(QWidget*,QWidget*)));
|
||||
// Add a small Toolbutton for toggling the navigation widget
|
||||
@@ -297,10 +300,10 @@ MainWindow::~MainWindow()
|
||||
|
||||
delete m_editorManager;
|
||||
m_editorManager = 0;
|
||||
delete m_statusBarManager;
|
||||
m_statusBarManager = 0;
|
||||
delete m_progressManager;
|
||||
m_progressManager = 0;
|
||||
delete m_statusBarManager;
|
||||
m_statusBarManager = 0;
|
||||
ExtensionSystem::PluginManager::removeObject(m_coreImpl);
|
||||
delete m_coreImpl;
|
||||
m_coreImpl = 0;
|
||||
@@ -327,7 +330,7 @@ bool MainWindow::init(QString *errorMessage)
|
||||
ExtensionSystem::PluginManager::addObject(m_coreImpl);
|
||||
m_statusBarManager->init();
|
||||
m_modeManager->init();
|
||||
m_progressManager->init();
|
||||
m_progressManager->init(); // needs the status bar manager
|
||||
|
||||
ExtensionSystem::PluginManager::addObject(m_generalSettings);
|
||||
ExtensionSystem::PluginManager::addObject(m_shortcutSettings);
|
||||
|
||||
Reference in New Issue
Block a user