Skip to content

Commit 990d323

Browse files
author
Uwe Kindler
committed
Removed external dependencies for build, fixed build system, updated preview images to reflect the current state of the library
1 parent fd76e9e commit 990d323

12 files changed

+29
-49
lines changed

‎demo/demo.pro

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
include($$(cetoni_repository)/build/qt/qtprojectsettings/common.pri)
1+
ADS_ROOT = $${PWD}/..
2+
ADS_OUT_ROOT = $${OUT_PWD}/..
23

34
TARGET = AdvancedDockingSystemDemo
4-
5+
DESTDIR = $${ADS_OUT_ROOT}/lib
56
QT += core gui widgets
6-
DEFINES += ADS_NAMESPACE_ENABLED
77

88
windows {
99
# MinGW
@@ -26,12 +26,12 @@ HEADERS += \
2626
FORMS += \
2727
mainwindow.ui
2828

29+
LIBS += -L$${ADS_OUT_ROOT}/lib
2930

3031
# Dependency: AdvancedDockingSystem (shared)
31-
win32:CONFIG(release, debug|release): LIBS += -l$$qtLinkLibrary(AdvancedDockingSystem)
32-
else:win32:CONFIG(debug, debug|release): LIBS += -l$$qtLinkLibrary(AdvancedDockingSystem)
33-
else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem
32+
win32:CONFIG(release, debug|release): LIBS += -lAdvancedDockingSystem
33+
else:win32:CONFIG(debug, debug|release): LIBS += -lAdvancedDockingSystemd
34+
else:unix: LIBS += -lAdvancedDockingSystem
3435

3536
INCLUDEPATH += ../src
36-
3737
DEPENDPATH += ../src

‎demo/mainwindow.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include "ui_mainwindow.h"
44

5-
#include <iostream>
65

76
#include <QTime>
87
#include <QLabel>
@@ -14,15 +13,13 @@
1413
#include <QBoxLayout>
1514
#include <QSettings>
1615
#include <QDockWidget>
16+
#include <QDebug>
1717

1818
#include "DockManager.h"
1919
#include "DockWidget.h"
2020
#include "DockAreaWidget.h"
2121

2222

23-
///////////////////////////////////////////////////////////////////////
24-
25-
static int CONTENT_COUNT = 0;
2623

2724

2825
static ads::CDockWidget* createLongTextLabelDockWidget(QMenu* ViewMenu)
@@ -82,8 +79,6 @@ static ads::CDockWidget* createFileSystemTreeDockWidget(QMenu* ViewMenu)
8279

8380

8481

85-
///////////////////////////////////////////////////////////////////////
86-
8782
MainWindow::MainWindow(QWidget *parent) :
8883
QMainWindow(parent),
8984
ui(new Ui::MainWindow)
@@ -127,16 +122,16 @@ void MainWindow::createContent()
127122

128123
void MainWindow::closeEvent(QCloseEvent* event)
129124
{
130-
QSettings Settings("Settings.ini", QSettings::IniFormat);
125+
/*QSettings Settings("Settings.ini", QSettings::IniFormat);
131126
Settings.setValue("mainWindow/Geometry", saveGeometry());
132-
Settings.setValue("mainWindow/DockingState", m_DockManager->saveState());
127+
Settings.setValue("mainWindow/DockingState", m_DockManager->saveState());*/
133128
QMainWindow::closeEvent(event);
134129
}
135130

136131

137132
void MainWindow::on_actionSaveState_triggered(bool)
138133
{
139-
std::cout << "MainWindow::on_actionSaveState_triggered" << std::endl;
134+
qDebug() << "MainWindow::on_actionSaveState_triggered";
140135
QSettings Settings("Settings.ini", QSettings::IniFormat);
141136
Settings.setValue("mainWindow/Geometry", saveGeometry());
142137
Settings.setValue("mainWindow/DockingState", m_DockManager->saveState());
@@ -145,7 +140,7 @@ void MainWindow::on_actionSaveState_triggered(bool)
145140

146141
void MainWindow::on_actionRestoreState_triggered(bool)
147142
{
148-
std::cout << "MainWindow::on_actionRestoreState_triggered" << std::endl;
143+
qDebug() << "MainWindow::on_actionRestoreState_triggered";
149144
QSettings Settings("Settings.ini", QSettings::IniFormat);
150145
restoreGeometry(Settings.value("mainWindow/Geometry").toByteArray());
151146
m_DockManager->restoreState(Settings.value("mainWindow/DockingState").toByteArray());

‎preview-dragndrop.png

-109 KB
Loading

‎preview.png

4.01 KB
Loading

‎src/DockAreaWidget.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,6 @@ void DockAreaWidgetPrivate::updateTabsMenu()
374374
menu->clear();
375375
for (int i = 0; i < ContentsLayout->count(); ++i)
376376
{
377-
CDockWidget* DockWidget = dockWidgetAt(i);
378377
addTabsMenuEntry(dockWidgetAt(i), APPEND, menu);
379378
}
380379
}
@@ -449,7 +448,6 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
449448
d->TabsLayout->insertWidget(index, TitleBar);
450449
TitleBar->show();
451450
connect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));
452-
connect(DockWidget, SIGNAL(viewToggled(bool)), this, SLOT(onDockWidgetViewToggled(bool)));
453451
DockWidget->setProperty(INDEX_PROPERTY, index);
454452
if (Activate)
455453
{
@@ -469,7 +467,6 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
469467
TitleBar->hide();
470468
d->TabsLayout->removeWidget(TitleBar);
471469
disconnect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));
472-
disconnect(DockWidget, SIGNAL(viewToggled(bool)), this, SLOT(onDockWidgetViewToggled(bool)));
473470
setCurrentIndex(d->ContentsLayout->currentIndex());
474471
d->updateTabsMenu();
475472

@@ -707,13 +704,6 @@ void CDockAreaWidget::updateDockArea()
707704
}
708705

709706

710-
//============================================================================
711-
void CDockAreaWidget::onDockWidgetViewToggled(bool Open)
712-
{
713-
auto DockWidget = dynamic_cast<CDockWidget*>(sender());
714-
}
715-
716-
717707
//============================================================================
718708
void CDockAreaWidget::saveState(QDataStream& stream) const
719709
{

‎src/DockAreaWidget.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ private slots:
5656
void onDockWidgetTitleClicked();
5757
void onTabsMenuActionTriggered(QAction* Action);
5858
void onCloseButtonClicked();
59-
void onDockWidgetViewToggled(bool Open);
6059

6160
public:
6261
/**
@@ -190,13 +189,6 @@ public slots:
190189
* @param index
191190
*/
192191
void currentChanged(int index);
193-
194-
/**
195-
* This signal is emitted if the dock area is closed or opened.
196-
* The dock area will be closed, if all dock widgets in the dock area are
197-
* closed and will be opened, when the first dock widget is opened
198-
*/
199-
void viewToggled(bool Open);
200192
}; // class DockAreaWidget
201193
}
202194
// namespace ads

‎src/DockContainerWidget.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ void DockContainerWidgetPrivate::dropIntoContainer(CFloatingDockContainer* Float
181181
QLayoutItem* li = Layout->replaceWidget(Splitter, NewSplitter);
182182
NewSplitter->addWidget(Splitter);
183183
Splitter = NewSplitter;
184+
delete li;
184185
}
185186

186187
// Now we can insert the floating widget content into this container
@@ -555,6 +556,9 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
555556
}
556557
qDebug("%sDockArea", (const char*)buf);
557558
}
559+
#else
560+
Q_UNUSED(level);
561+
Q_UNUSED(widget);
558562
#endif
559563
}
560564

@@ -692,7 +696,7 @@ void CDockContainerWidget::addDockArea(CDockAreaWidget* DockAreaWidget,
692696
Container->removeDockArea(DockAreaWidget);
693697
}
694698

695-
d->addDockArea(DockAreaWidget);
699+
d->addDockArea(DockAreaWidget, area);
696700
}
697701

698702

‎src/DockManager.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ bool DockManagerPrivate::restoreContainer(int Index, QDataStream& stream, bool T
154154
if (Index >= Containers.count())
155155
{
156156
CFloatingDockContainer* FloatingWidget = new CFloatingDockContainer(_this);
157-
return FloatingWidget->restoreState(stream, internal::Restore);
157+
return FloatingWidget->restoreState(stream, Testing);
158158
}
159159
else
160160
{
161161
qDebug() << "d->Containers[i]->restoreState ";
162-
return Containers[Index]->restoreState(stream, internal::Restore);
162+
return Containers[Index]->restoreState(stream, Testing);
163163
}
164164
}
165165

@@ -201,8 +201,6 @@ bool DockManagerPrivate::restoreState(const QByteArray &state, int version)
201201
// Delete remaining empty floating widgets
202202
int FloatingWidgetIndex = i - 1;
203203
int DeleteCount = FloatingWidgets.count() - FloatingWidgetIndex;
204-
/*std::cout << "DeleteCount " << DeleteCount << " FloatingWidgets.count() "
205-
<< FloatingWidgets.count() << " FloatingWdgetIndex " << FloatingWidgetIndex << std::endl;*/
206204
for (int i = 0; i < DeleteCount; ++i)
207205
{
208206
FloatingWidgets[FloatingWidgetIndex + i]->deleteLater();

‎src/DockOverlay.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ void CDockOverlay::enableDropPreview(bool Enable)
356356
//============================================================================
357357
void CDockOverlay::paintEvent(QPaintEvent* event)
358358
{
359+
Q_UNUSED(event);
359360
// Draw rect based on location
360361
if (!d->DropPreviewEnabled)
361362
{

‎src/DockWidgetTitleBar.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ struct DockWidgetTitleBarPrivate
112112
* Returns true, if floating has been started and false if floating
113113
* is not possible for any reason
114114
*/
115-
bool startFloating(const QPoint& GlobalPos);
115+
bool startFloating();
116116
};
117117
// struct DockWidgetTitleBarPrivate
118118

@@ -158,7 +158,7 @@ void DockWidgetTitleBarPrivate::moveTab(QMouseEvent* ev)
158158

159159

160160
//============================================================================
161-
bool DockWidgetTitleBarPrivate::startFloating(const QPoint& GlobalPos)
161+
bool DockWidgetTitleBarPrivate::startFloating()
162162
{
163163
qDebug() << "isFloating " << DockWidget->dockContainer()->isFloating();
164164
qDebug() << "areaCount " << DockWidget->dockContainer()->dockAreaCount();
@@ -187,7 +187,6 @@ bool DockWidgetTitleBarPrivate::startFloating(const QPoint& GlobalPos)
187187
qDebug() << "DockWidgetTitleBarPrivate::startFloating DockArea";
188188
// If section widget has only one content widget, we can move the complete
189189
// dock area into floating widget
190-
auto splitter = internal::findParent<QSplitter*>(DockArea);
191190
FloatingWidget = new CFloatingDockContainer(DockArea);
192191
}
193192

@@ -292,7 +291,7 @@ void CDockWidgetTitleBar::mouseMoveEvent(QMouseEvent* ev)
292291
bool MouseInsideTitleArea = d->titleAreaGeometryContains(ev->globalPos());
293292
if (!MouseInsideTitleArea)
294293
{
295-
d->startFloating(ev->globalPos());
294+
d->startFloating();
296295
return;
297296
}
298297
else if (d->DockArea->count() > 1

‎src/FloatingDockContainer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ bool CFloatingDockContainer::event(QEvent *e)
331331
//============================================================================
332332
bool CFloatingDockContainer::eventFilter(QObject *watched, QEvent *event)
333333
{
334+
Q_UNUSED(watched);
334335
if (event->type() == QEvent::MouseButtonRelease && d->DraggingActive)
335336
{
336337
qDebug() << "FloatingWidget::eventFilter QEvent::MouseButtonRelease";
@@ -389,6 +390,7 @@ void CFloatingDockContainer::onDockAreasAddedOrRemoved()
389390
//============================================================================
390391
void CFloatingDockContainer::onDockAreaCurrentChanged(int Index)
391392
{
393+
Q_UNUSED(Index);
392394
this->setWindowTitle(d->SingleDockArea->currentDockWidget()->windowTitle());
393395
}
394396

‎src/src.pro

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
include($$(cetoni_repository)/build/qt/qtprojectsettings/shared_library.pri)
2-
include(src/v2/v2.pri)
1+
ADS_ROOT = $${PWD}/..
2+
ADS_OUT_ROOT = $${OUT_PWD}/..
33

44
TARGET = $$qtLibraryTarget(AdvancedDockingSystem)
55
TEMPLATE = lib
6-
#VERSION = 1.0.0
6+
DESTDIR = $${ADS_OUT_ROOT}/lib
7+
QT += core gui widgets
78

89
CONFIG += adsBuildShared
910

10-
QT += core gui widgets
11-
DEFINES += ADS_NAMESPACE_ENABLED
1211

1312
adsBuildShared {
1413
CONFIG += shared

0 commit comments

Comments
 (0)