Commit 95db74ff authored by Ralf Habacker's avatar Ralf Habacker

Cleanup order of tabbed dock widgets.

With the increasing number of additional dock widgets is has
been required to cleanup grouping on initial startup.

The resulting order is:
- Tree view and uml object related dock widgets are tabbed
  into one group at the top left area.
- Documentation, undo stack, protocol and debug dock widgets
  are tabbed into one group at the bottem left area
- Welcome page and bird view are tabbed into the right area.

BUG:372253
FIXED-IN:2.20.80 (KDE Applications 16.11.80)
Signed-off-by: Ralf Habacker's avatarRalf Habacker <ralf.habacker@freenet.de>
parent 52a9df26
......@@ -931,13 +931,6 @@ void UMLApp::initView()
widget->setLayout(m_layout);
setCentralWidget(widget);
m_d->createDiagramsWindow();
#ifdef ENABLE_UML_OBJECTS_WINDOW
m_d->createObjectsWindow();
#endif
m_d->createStereotypesWindow();
m_d->createWelcomeWindow();
// create the tree viewer
m_listDock = new QDockWidget(i18n("&Tree View"), this);
m_listDock->setObjectName(QLatin1String("TreeViewDock"));
......@@ -949,12 +942,6 @@ void UMLApp::initView()
m_listDock->setWidget(m_listView);
connect(m_listDock, SIGNAL(visibilityChanged(bool)), viewShowTree, SLOT(setChecked(bool)));
m_debugDock = new QDockWidget(i18n("&Debug"), this);
m_debugDock->setObjectName(QLatin1String("DebugDock"));
addDockWidget(Qt::LeftDockWidgetArea, m_debugDock);
m_debugDock->setWidget(Tracer::instance());
connect(m_debugDock, SIGNAL(visibilityChanged(bool)), viewShowLog, SLOT(setChecked(bool)));
// create the documentation viewer
m_documentationDock = new QDockWidget(i18n("Doc&umentation"), this);
m_documentationDock->setObjectName(QLatin1String("DocumentationDock"));
......@@ -976,6 +963,19 @@ void UMLApp::initView()
m_cmdHistoryDock->setWidget(m_pQUndoView);
connect(m_cmdHistoryDock, SIGNAL(visibilityChanged(bool)), viewShowCmdHistory, SLOT(setChecked(bool)));
m_d->createDiagramsWindow();
#ifdef ENABLE_UML_OBJECTS_WINDOW
m_d->createObjectsWindow();
#endif
m_d->createStereotypesWindow();
m_d->createWelcomeWindow();
m_debugDock = new QDockWidget(i18n("&Debug"), this);
m_debugDock->setObjectName(QLatin1String("DebugDock"));
addDockWidget(Qt::LeftDockWidgetArea, m_debugDock);
m_debugDock->setWidget(Tracer::instance());
connect(m_debugDock, SIGNAL(visibilityChanged(bool)), viewShowLog, SLOT(setChecked(bool)));
// create the log viewer
m_logDock = new QDockWidget(i18n("&Log"), this);
m_logDock->setObjectName(QLatin1String("LogDock"));
......@@ -997,6 +997,15 @@ void UMLApp::initView()
tabifyDockWidget(m_documentationDock, m_cmdHistoryDock);
tabifyDockWidget(m_cmdHistoryDock, m_logDock);
//tabifyDockWidget(m_cmdHistoryDock, m_propertyDock); //:TODO:
tabifyDockWidget(m_logDock, m_debugDock);
tabifyDockWidget(m_listDock, m_d->stereotypesWindow);
tabifyDockWidget(m_d->stereotypesWindow, m_d->diagramsWindow);
#ifdef ENABLE_UML_OBJECTS_WINDOW
tabifyDockWidget(m_d->diagramsWindow, m_d->objectsWindow);
#endif
tabifyDockWidget(m_d->welcomeWindow, m_birdViewDock);
m_listDock->raise();
m_d->welcomeWindow->raise();
}
/**
......
......@@ -519,6 +519,7 @@ private:
signals:
void sigCutSuccessful();
friend class UMLAppPrivate;
friend class UMLView;
};
......
......@@ -145,7 +145,7 @@ public slots:
{
// create the object window
objectsWindow = new ObjectsWindow(i18n("&UML Objects"), parent);
parent->addDockWidget(Qt::RightDockWidgetArea, objectsWindow);
parent->addDockWidget(Qt::LeftDockWidgetArea, objectsWindow);
viewObjectsWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_objects_window"));
connect(viewObjectsWindow, SIGNAL(triggered(bool)), objectsWindow, SLOT(setVisible(bool)));
......@@ -177,7 +177,7 @@ public slots:
view->setHtml(html);
view->show();
welcomeWindow->setWidget(view);
parent->addDockWidget(Qt::LeftDockWidgetArea, welcomeWindow);
parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_welcome_window"));
connect(viewWelcomeWindow, SIGNAL(triggered(bool)), welcomeWindow, SLOT(setVisible(bool)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment