Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
9097149c
Commit
9097149c
authored
Dec 09, 2009
by
con
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ViewManager --> StatusBarManager
parent
4053ac0c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
27 deletions
+26
-27
src/plugins/coreplugin/coreplugin.pro
src/plugins/coreplugin/coreplugin.pro
+2
-2
src/plugins/coreplugin/mainwindow.cpp
src/plugins/coreplugin/mainwindow.cpp
+9
-9
src/plugins/coreplugin/mainwindow.h
src/plugins/coreplugin/mainwindow.h
+2
-3
src/plugins/coreplugin/statusbarmanager.cpp
src/plugins/coreplugin/statusbarmanager.cpp
+7
-7
src/plugins/coreplugin/statusbarmanager.h
src/plugins/coreplugin/statusbarmanager.h
+6
-6
No files found.
src/plugins/coreplugin/coreplugin.pro
View file @
9097149c
...
...
@@ -32,7 +32,7 @@ SOURCES += mainwindow.cpp \
messageoutputwindow
.
cpp
\
outputpane
.
cpp
\
vcsmanager
.
cpp
\
view
manager
.
cpp
\
statusbar
manager
.
cpp
\
versiondialog
.
cpp
\
editormanager
/
editormanager
.
cpp
\
editormanager
/
editorview
.
cpp
\
...
...
@@ -92,7 +92,7 @@ HEADERS += mainwindow.h \
messageoutputwindow
.
h
\
outputpane
.
h
\
vcsmanager
.
h
\
view
manager
.
h
\
statusbar
manager
.
h
\
editormanager
/
editormanager
.
h
\
editormanager
/
editorview
.
h
\
editormanager
/
openeditorsmodel
.
h
\
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
9097149c
...
...
@@ -53,7 +53,7 @@
#include "settingsdialog.h"
#include "variablemanager.h"
#include "versiondialog.h"
#include "
view
manager.h"
#include "
statusbar
manager.h"
#include "uniqueidmanager.h"
#include "manhattanstyle.h"
#include "dialogs/iwizard.h"
...
...
@@ -127,7 +127,7 @@ MainWindow::MainWindow() :
m_scriptManager
(
new
ScriptManagerPrivate
(
this
)),
m_variableManager
(
new
VariableManager
(
this
)),
m_vcsManager
(
new
VCSManager
),
m_
view
Manager
(
0
),
m_
statusBar
Manager
(
0
),
m_modeManager
(
0
),
m_mimeDatabase
(
new
MimeDatabase
),
m_navigationWidget
(
0
),
...
...
@@ -190,7 +190,7 @@ MainWindow::MainWindow() :
m_modeStack
=
new
FancyTabWidget
(
this
);
m_modeManager
=
new
ModeManager
(
this
,
m_modeStack
);
m_modeManager
->
addWidget
(
m_progressManager
->
progressView
());
m_
view
Manager
=
new
View
Manager
(
this
);
m_
statusBar
Manager
=
new
StatusBar
Manager
(
this
);
m_messageManager
=
new
MessageManager
;
m_editorManager
=
new
EditorManager
(
m_coreImpl
,
this
);
m_editorManager
->
hide
();
...
...
@@ -256,7 +256,7 @@ MainWindow::~MainWindow()
pm
->
removeObject
(
m_outputMode
);
delete
m_outputMode
;
m_outputMode
=
0
;
//we need to delete editormanager and
view
manager explicitly before the end of the destructor,
//we need to delete editormanager and
statusbar
manager explicitly before the end of the destructor,
//because they might trigger stuff that tries to access data from editorwindow, like removeContextWidget
// All modes are now gone
...
...
@@ -268,8 +268,8 @@ MainWindow::~MainWindow()
delete
m_editorManager
;
m_editorManager
=
0
;
delete
m_
view
Manager
;
m_
view
Manager
=
0
;
delete
m_
statusBar
Manager
;
m_
statusBar
Manager
=
0
;
delete
m_progressManager
;
m_progressManager
=
0
;
pm
->
removeObject
(
m_coreImpl
);
...
...
@@ -294,7 +294,7 @@ bool MainWindow::init(QString *errorMessage)
ExtensionSystem
::
PluginManager
*
pm
=
ExtensionSystem
::
PluginManager
::
instance
();
pm
->
addObject
(
m_coreImpl
);
m_
view
Manager
->
init
();
m_
statusBar
Manager
->
init
();
m_modeManager
->
init
();
m_progressManager
->
init
();
QWidget
*
outputModeWidget
=
new
QWidget
;
...
...
@@ -322,7 +322,7 @@ bool MainWindow::init(QString *errorMessage)
pm
->
addObject
(
m_shortcutSettings
);
// Add widget to the bottom, we create the view here instead of inside the
// OutputPaneManager, since the
View
Manager needs to be initilized before
// OutputPaneManager, since the
StatusBar
Manager needs to be initilized before
m_outputView
=
new
Core
::
StatusBarWidget
;
m_outputView
->
setWidget
(
OutputPaneManager
::
instance
()
->
buttonsWidget
());
m_outputView
->
setPosition
(
Core
::
StatusBarWidget
::
Second
);
...
...
@@ -344,7 +344,7 @@ void MainWindow::extensionsInitialized()
{
m_editorManager
->
init
();
m_
view
Manager
->
extensionsInitalized
();
m_
statusBar
Manager
->
extensionsInitalized
();
m_messageManager
->
init
();
OutputPaneManager
::
instance
()
->
init
();
...
...
src/plugins/coreplugin/mainwindow.h
View file @
9097149c
...
...
@@ -63,7 +63,6 @@ class SettingsDatabase;
class
UniqueIDManager
;
class
VariableManager
;
class
VCSManager
;
class
ViewManagerInterface
;
class
IMode
;
namespace
Internal
{
...
...
@@ -75,7 +74,7 @@ class GeneralSettings;
class
NavigationWidget
;
class
ProgressManagerPrivate
;
class
ShortcutSettings
;
class
View
Manager
;
class
StatusBar
Manager
;
class
VersionDialog
;
class
CORE_EXPORT
MainWindow
:
public
EventFilteringMainWindow
...
...
@@ -189,7 +188,7 @@ private:
ScriptManager
*
m_scriptManager
;
VariableManager
*
m_variableManager
;
VCSManager
*
m_vcsManager
;
View
Manager
*
m_
view
Manager
;
StatusBar
Manager
*
m_
statusBar
Manager
;
ModeManager
*
m_modeManager
;
MimeDatabase
*
m_mimeDatabase
;
FancyTabWidget
*
m_modeStack
;
...
...
src/plugins/coreplugin/
view
manager.cpp
→
src/plugins/coreplugin/
statusbar
manager.cpp
View file @
9097149c
...
...
@@ -27,7 +27,7 @@
**
**************************************************************************/
#include "
view
manager.h"
#include "
statusbar
manager.h"
#include "coreconstants.h"
#include "mainwindow.h"
...
...
@@ -47,7 +47,7 @@
using
namespace
Core
;
using
namespace
Core
::
Internal
;
ViewManager
::
View
Manager
(
MainWindow
*
mainWnd
)
StatusBarManager
::
StatusBar
Manager
(
MainWindow
*
mainWnd
)
:
QObject
(
mainWnd
),
m_mainWnd
(
mainWnd
)
{
...
...
@@ -63,11 +63,11 @@ ViewManager::ViewManager(MainWindow *mainWnd)
new
QLabel
(),
1
);
}
View
Manager
::~
View
Manager
()
StatusBar
Manager
::~
StatusBar
Manager
()
{
}
void
View
Manager
::
init
()
void
StatusBar
Manager
::
init
()
{
connect
(
ExtensionSystem
::
PluginManager
::
instance
(),
SIGNAL
(
objectAdded
(
QObject
*
)),
this
,
SLOT
(
objectAdded
(
QObject
*
)));
...
...
@@ -75,7 +75,7 @@ void ViewManager::init()
this
,
SLOT
(
aboutToRemoveObject
(
QObject
*
)));
}
void
View
Manager
::
objectAdded
(
QObject
*
obj
)
void
StatusBar
Manager
::
objectAdded
(
QObject
*
obj
)
{
StatusBarWidget
*
view
=
Aggregation
::
query
<
StatusBarWidget
>
(
obj
);
if
(
!
view
)
...
...
@@ -88,7 +88,7 @@ void ViewManager::objectAdded(QObject *obj)
m_mainWnd
->
addContextObject
(
view
);
}
void
View
Manager
::
aboutToRemoveObject
(
QObject
*
obj
)
void
StatusBar
Manager
::
aboutToRemoveObject
(
QObject
*
obj
)
{
StatusBarWidget
*
view
=
Aggregation
::
query
<
StatusBarWidget
>
(
obj
);
if
(
!
view
)
...
...
@@ -96,6 +96,6 @@ void ViewManager::aboutToRemoveObject(QObject *obj)
m_mainWnd
->
removeContextObject
(
view
);
}
void
View
Manager
::
extensionsInitalized
()
void
StatusBar
Manager
::
extensionsInitalized
()
{
}
src/plugins/coreplugin/
view
manager.h
→
src/plugins/coreplugin/
statusbar
manager.h
View file @
9097149c
...
...
@@ -27,8 +27,8 @@
**
**************************************************************************/
#ifndef
VIEW
MANAGER_H
#define
VIEW
MANAGER_H
#ifndef
STATUSBAR
MANAGER_H
#define
STATUSBAR
MANAGER_H
#include <QtCore/QMap>
#include <QtGui/QWidget>
...
...
@@ -50,13 +50,13 @@ namespace Internal {
class
MainWindow
;
class
NavigationWidget
;
class
View
Manager
:
public
QObject
class
StatusBar
Manager
:
public
QObject
{
Q_OBJECT
public:
View
Manager
(
MainWindow
*
mainWnd
);
~
View
Manager
();
StatusBar
Manager
(
MainWindow
*
mainWnd
);
~
StatusBar
Manager
();
void
init
();
void
extensionsInitalized
();
...
...
@@ -73,4 +73,4 @@ private:
}
// namespace Internal
}
// namespace Core
#endif //
VIEW
MANAGER_H
#endif //
STATUSBAR
MANAGER_H
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment