Merge pull request #1 from XenotriX1337/deprecated_function

Tectu · web-flow · commit cdca8c2ac031 · 2019-09-09T14:31:19.000+02:00
Replace deprecated function
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,7 +86,7 @@ install(TARGETS qtadvanceddocking
     ARCHIVE DESTINATION lib COMPONENT library
 )
 target_include_directories(qtadvanceddocking PUBLIC 
-    $<BUILD_INTERFACE:${ads_INCLUDE}>
+    "$<BUILD_INTERFACE:${ads_INCLUDE}>"
     $<INSTALL_INTERFACE:include>
     )
 target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS})
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Qt Advanced Docking System lets you create customizable layouts using a full
 featured window docking system similar to what is found in many popular 
 integrated development environements (IDEs) such as Visual Studio. 
 Everything is implemented with standard Qt functionality without any
-platform specific code. Basic usage of QWidgets an QLayouts and using basic 
+platform specific code. Basic usage of QWidgets and QLayouts and using basic 
 styles as much as possible.
 
 This work is based on and inspired by the 
diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
@@ -24,7 +24,6 @@ set(ads_demo_SRCS
     main.cpp
     MainWindow.cpp
     mainwindow.ui
-    main.qrc
 )
 add_executable(AdvancedDockingSystemDemo WIN32 ${ads_demo_SRCS})
 if(BUILD_STATIC)
diff --git a/demo/demo.pro b/demo/demo.pro
@@ -21,7 +21,6 @@ HEADERS += \
 FORMS += \
 	mainwindow.ui
 
-RESOURCES += main.qrc
 
 LIBS += -L$${ADS_OUT_ROOT}/lib
 
diff --git a/demo/main.qrc b/demo/main.qrc
diff --git a/example/example.pro b/example/example.pro
@@ -23,7 +23,6 @@ HEADERS += \
 FORMS += \
         MainWindow.ui
         
-#RESOURCES += main.qrc
 
 LIBS += -L$${ADS_OUT_ROOT}/lib
 
diff --git a/src/DockAreaTabBar.h b/src/DockAreaTabBar.h
@@ -44,6 +44,10 @@ class CFloatingDockContainer;
  * Custom tabbar implementation for tab area that is shown on top of a
  * dock area widget.
  * The tabbar displays the tab widgets of the contained dock widgets.
+ * We cannot use QTabBar here because it does a lot of fancy animations
+ * that will crash the application if a tab is removed while the animation
+ * has not finished. And we need to remove a tab, if the user drags a
+ * a dock widget out of a group of tabbed widgets
  */
 class CDockAreaTabBar : public QScrollArea
 {
@@ -61,6 +65,7 @@ private slots:
 
 protected:
 	virtual void wheelEvent(QWheelEvent* Event) override;
+
 	/**
 	 * Stores mouse position to detect dragging
 	 */
@@ -96,6 +101,7 @@ private slots:
 
 public:
 	using Super = QScrollArea;
+
 	/**
 	 * Default Constructor
 	 */
diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
@@ -99,8 +99,9 @@ struct DockAreaTitleBarPrivate
 	}
 
     /**
-     * Helper class to set title bar button icons depending on operating system
-     * and to avoid duplicated code
+     * Helper function to set title bar button icons depending on operating
+     * system and to avoid duplicated code. On windows the standard icons
+     * are blurry since Qt 5.11 so we need to do some additional steps
      */
     void setTitleBarButtonIcon(tTileBarButton* Button, QStyle::StandardPixmap StandarPixmap)
     {
@@ -136,14 +137,14 @@ void DockAreaTitleBarPrivate::createButtons()
 	TabsMenuButton->setPopupMode(QToolButton::InstantPopup);
     setTitleBarButtonIcon(TabsMenuButton, QStyle::SP_TitleBarUnshadeButton);
 	QMenu* TabsMenu = new QMenu(TabsMenuButton);
-	#ifndef QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
 	TabsMenu->setToolTipsVisible(true);
-	#endif
+#endif
 	_this->connect(TabsMenu, SIGNAL(aboutToShow()), SLOT(onTabsMenuAboutToShow()));
 	TabsMenuButton->setMenu(TabsMenu);
-	#ifndef QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
 	TabsMenuButton->setToolTip(QObject::tr("List all tabs"));
-	#endif
+#endif
 	TabsMenuButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 	TopLayout->addWidget(TabsMenuButton, 0);
 	_this->connect(TabsMenuButton->menu(), SIGNAL(triggered(QAction*)),
@@ -154,9 +155,9 @@ void DockAreaTitleBarPrivate::createButtons()
 	UndockButton = new tTileBarButton();
 	UndockButton->setObjectName("undockButton");
 	UndockButton->setAutoRaise(true);
-	#ifndef QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
 	UndockButton->setToolTip(QObject::tr("Detach Group"));
-	#endif
+#endif
     setTitleBarButtonIcon(UndockButton, QStyle::SP_TitleBarNormalButton);
     UndockButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 	TopLayout->addWidget(UndockButton, 0);
@@ -168,7 +169,7 @@ void DockAreaTitleBarPrivate::createButtons()
 	CloseButton->setObjectName("closeButton");
 	CloseButton->setAutoRaise(true);
     setTitleBarButtonIcon(CloseButton, QStyle::SP_TitleBarCloseButton);
-	#ifndef QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
 	if (testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))
 	{
 		CloseButton->setToolTip(QObject::tr("Close Active Tab"));
@@ -177,7 +178,7 @@ void DockAreaTitleBarPrivate::createButtons()
 	{
 		CloseButton->setToolTip(QObject::tr("Close Group"));
 	}
-	#endif
+#endif
 	CloseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 	CloseButton->setIconSize(QSize(16, 16));
 	TopLayout->addWidget(CloseButton, 0);
diff --git a/src/DockAreaTitleBar.h b/src/DockAreaTitleBar.h
@@ -43,7 +43,9 @@ class CDockAreaWidget;
 struct DockAreaTitleBarPrivate;
 
 /**
- * Title bar of a dock area
+ * Title bar of a dock area.
+ * The title bar contains a tabbar with all tabs for a dock widget group and
+ * with a tabs menu button, a undock button and a close button.
  */
 class CDockAreaTitleBar : public QFrame
 {
@@ -61,6 +63,10 @@ private slots:
 	void showContextMenu(const QPoint& pos);
 
 public slots:
+	/**
+	 * Call this slot to tell the title bar that it should update the tabs menu
+	 * the next time it is shown.
+	 */
 	void markTabsMenuOutdated();
 
 
@@ -87,7 +93,8 @@ public slots:
 	QAbstractButton* button(TitleBarButton which) const;
 
 	/**
-	 * This function is here for debug reasons
+	 * Marks the tabs menu outdated before it calls its base class
+	 * implementation
 	 */
 	virtual void setVisible(bool Visible) override;
 
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
@@ -63,8 +63,11 @@ static const char* const INDEX_PROPERTY = "index";
 static const char* const ACTION_PROPERTY = "action";
 
 /**
- * New dock area layout mimics stack layout but only inserts the current
- * widget into the internal QLayout object
+ * Internal dock area layout mimics stack layout but only inserts the current
+ * widget into the internal QLayout object.
+ * \warning Only the current widget has a parent. All other widgets
+ * do not have a parent. That means, a widget that is in this layout may
+ * return nullptr for its parent() function if it is not the current widget.
  */
 class CDockAreaLayout
 {
@@ -118,7 +121,7 @@ class CDockAreaLayout
 	}
 
 	/**
-	 * Removes the given widget from the lyout
+	 * Removes the given widget from the layout
 	 */
 	void removeWidget(QWidget* Widget)
 	{
diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h
@@ -185,12 +185,12 @@ protected slots:
 	QList<CDockWidget*> dockWidgets() const;
 
 	/**
-	 * Returns the number of dock widgets in this area
+	 * Returns the number of open dock widgets in this area
 	 */
 	int openDockWidgetsCount() const;
 
 	/**
-	 * Returns a list of dock widgets that are not closed
+	 * Returns a list of dock widgets that are not closed.
 	 */
 	QList<CDockWidget*> openedDockWidgets() const;
 
@@ -236,8 +236,10 @@ protected slots:
 	 * This functions returns the dock widget features of all dock widget in
 	 * this area.
 	 * A bitwise and is used to combine the flags of all dock widgets. That
-	 * means, if only dock widget does not support a certain flag, the whole
-	 * dock are does not support the flag.
+	 * means, if only one single dock widget does not support a certain flag,
+	 * the whole dock are does not support the flag. I.e. if one single
+	 * dock widget in this area is not closabe, the whole dock are is not
+	 * closable.
 	 */
 	CDockWidget::DockWidgetFeatures features() const;
 
diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h
@@ -50,7 +50,10 @@ struct FloatingDockContainerPrivate;
 
 /**
  * Container that manages a number of dock areas with single dock widgets
- * or tabyfied dock widgets in each area
+ * or tabyfied dock widgets in each area.
+ * Each window that support docking has a DockContainerWidget. That means
+ * the main application window and all floating windows are ore contain
+ * an DockContainerWidget.
  */
 class ADS_EXPORT CDockContainerWidget : public QFrame
 {
diff --git a/src/DockManager.h b/src/DockManager.h
@@ -131,7 +131,7 @@ class ADS_EXPORT CDockManager : public CDockContainerWidget
 	 * If the given parent is a QMainWindow, the dock manager sets itself as the
 	 * central widget.
 	 * Before you create any dock widgets, you should properly setup the
-	 * configuration flags via setConfigFlags()
+	 * configuration flags via setConfigFlags().
 	 */
 	CDockManager(QWidget* parent = 0);
 
diff --git a/src/DockOverlay.h b/src/DockOverlay.h
@@ -245,9 +245,6 @@ class CDockOverlayCross : public QWidget
 protected:
 	virtual void showEvent(QShowEvent* e) override;
 	void setAreaWidgets(const QHash<DockWidgetArea, QWidget*>& widgets);
-
-private:
-
 }; // CDockOverlayCross
 
 } // namespace ads
diff --git a/src/DockSplitter.h b/src/DockSplitter.h
@@ -38,7 +38,8 @@ namespace ads
 struct DockSplitterPrivate;
 
 /**
- * Splitter used internally instead of QSplitter
+ * Splitter used internally instead of QSplitter with some additional
+ * fuctionality.
  */
 class ADS_EXPORT CDockSplitter : public QSplitter
 {
diff --git a/src/DockWidgetTab.cpp b/src/DockWidgetTab.cpp
@@ -444,7 +444,7 @@ void CDockWidgetTab::setIcon(const QIcon& Icon)
 	d->Icon = Icon;
 	if (d->IconLabel)
 	{
-		d->IconLabel->setPixmap(Icon.pixmap(this->windowHandle(), QSize(16, 16)));
+		d->IconLabel->setPixmap(Icon.pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize, nullptr, this)));
 		d->IconLabel->setVisible(true);
 	}
 }
diff --git a/src/DockWidgetTab.h b/src/DockWidgetTab.h
@@ -143,7 +143,6 @@ private slots:
 	virtual bool event(QEvent *e) override;
 
 public slots:
-
 	  virtual void setVisible(bool visible) override;
 
 
diff --git a/src/ElidingLabel.cpp b/src/ElidingLabel.cpp
@@ -158,9 +158,9 @@ QSize CElidingLabel::minimumSizeHint() const
     }
     const QFontMetrics  &fm = fontMetrics();
     #if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
-        QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height());
+        QSize size(fm.horizontalAdvance(d->Text.left(2) + "…"), fm.height());
     #else
-        QSize size(fm.width(d->Text), QLabel::sizeHint().height());
+        QSize size(fm.width(d->Text.left(2) + "…"), fm.height());
     #endif
     return size;
 }
diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp
diff --git a/src/FloatingDockContainer.h b/src/FloatingDockContainer.h
diff --git a/src/ads_globals.h b/src/ads_globals.h
diff --git a/src/linux/FloatingWidgetTitleBar.cpp b/src/linux/FloatingWidgetTitleBar.cpp
diff --git a/src/linux/FloatingWidgetTitleBar.h b/src/linux/FloatingWidgetTitleBar.h

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ install(TARGETS qtadvanceddocking`
`86`	`86`	`ARCHIVE DESTINATION lib COMPONENT library`
`87`	`87`	`)`
`88`	`88`	`target_include_directories(qtadvanceddocking PUBLIC`
`89`		`- $<BUILD_INTERFACE:${ads_INCLUDE}>`
	`89`	`+ "$<BUILD_INTERFACE:${ads_INCLUDE}>"`
`90`	`90`	`$<INSTALL_INTERFACE:include>`
`91`	`91`	`)`
`92`	`92`	`target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS})`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ set(ads_demo_SRCS`
`24`	`24`	`main.cpp`
`25`	`25`	`MainWindow.cpp`
`26`	`26`	`mainwindow.ui`
`27`		`- main.qrc`
`28`	`27`	`)`
`29`	`28`	`add_executable(AdvancedDockingSystemDemo WIN32 ${ads_demo_SRCS})`
`30`	`29`	`if(BUILD_STATIC)`