Refactorings to improve code, started to refactor secion content
This commit is contained in:
@@ -65,7 +65,7 @@ class QSplitter;
|
||||
//#define ADS_ANIMATION_DURATION 150
|
||||
|
||||
ADS_NAMESPACE_BEGIN
|
||||
class MainContainerWidget;
|
||||
class CMainContainerWidget;
|
||||
class SectionWidget;
|
||||
|
||||
enum DropArea
|
||||
@@ -82,7 +82,7 @@ enum DropArea
|
||||
};
|
||||
Q_DECLARE_FLAGS(DropAreas, DropArea)
|
||||
|
||||
void deleteEmptySplitter(MainContainerWidget* container);
|
||||
void deleteEmptySplitter(CMainContainerWidget* container);
|
||||
QSplitter* findParentSplitter(QWidget* w);
|
||||
QSplitter* findImmediateSplitter(QWidget* w);
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace ads
|
||||
class SectionWidget;
|
||||
class DropOverlay;
|
||||
class InternalContentData;
|
||||
class MainContainerWidget;
|
||||
class CMainContainerWidget;
|
||||
|
||||
/**
|
||||
* @brief
|
||||
@@ -51,7 +51,7 @@ class CContainerWidget : public QFrame
|
||||
friend class ContainerWidgetPrivate;
|
||||
|
||||
public:
|
||||
explicit CContainerWidget(MainContainerWidget* MainContainerWidget, QWidget *parent = nullptr);
|
||||
explicit CContainerWidget(CMainContainerWidget* MainContainerWidget, QWidget *parent = nullptr);
|
||||
virtual ~CContainerWidget();
|
||||
|
||||
/**
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
|
||||
void dumpLayout();
|
||||
|
||||
MainContainerWidget* mainContainerWidget() const {return m_MainContainerWidget;}
|
||||
CMainContainerWidget* mainContainerWidget() const {return m_MainContainerWidget;}
|
||||
|
||||
void addSectionWidget(SectionWidget* section);
|
||||
|
||||
@@ -112,7 +112,7 @@ protected:
|
||||
QPointer<QSplitter> m_Splitter; // $mfreiholz: I'd like to remove this variable entirely,
|
||||
// because it changes during user interaction anyway.
|
||||
|
||||
MainContainerWidget* m_MainContainerWidget = 0;
|
||||
CMainContainerWidget* m_MainContainerWidget = 0;
|
||||
unsigned int m_zOrderIndex = 0;
|
||||
static unsigned int zOrderCounter;
|
||||
|
||||
|
||||
@@ -25,9 +25,9 @@ class QBoxLayout;
|
||||
#include "ads/SectionContent.h"
|
||||
|
||||
ADS_NAMESPACE_BEGIN
|
||||
class MainContainerWidget;
|
||||
class CMainContainerWidget;
|
||||
class SectionTitleWidget;
|
||||
class SectionContentWidget;
|
||||
class CSectionContentWidget;
|
||||
class InternalContentData;
|
||||
class SectionWidget;
|
||||
class CContainerWidget;
|
||||
@@ -40,7 +40,7 @@ private:
|
||||
QPoint m_DragStartPosition;
|
||||
QPoint m_DragStartMousePosition;
|
||||
FloatingWidget* floatingWidget() const;
|
||||
MainContainerWidget* mainContainerWidget() const;
|
||||
CMainContainerWidget* mainContainerWidget() const;
|
||||
void moveFloatingWidget(QMouseEvent* ev);
|
||||
|
||||
private slots:
|
||||
@@ -65,12 +65,12 @@ class FloatingWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
friend class MainContainerWidget;
|
||||
friend class CMainContainerWidget;
|
||||
friend class CFloatingTitleWidget;
|
||||
|
||||
public:
|
||||
FloatingWidget(MainContainerWidget* container, SectionContent::RefPtr sc, SectionTitleWidget* titleWidget, SectionContentWidget* contentWidget, QWidget* parent = NULL);
|
||||
FloatingWidget(MainContainerWidget* container, SectionWidget* sectionWidget);
|
||||
FloatingWidget(CMainContainerWidget* container, SectionContent::RefPtr sc, SectionTitleWidget* titleWidget, CSectionContentWidget* contentWidget, QWidget* parent = NULL);
|
||||
FloatingWidget(CMainContainerWidget* container, SectionWidget* sectionWidget);
|
||||
virtual ~FloatingWidget();
|
||||
|
||||
/**
|
||||
@@ -79,7 +79,7 @@ public:
|
||||
unsigned int zOrderIndex() const;
|
||||
|
||||
CContainerWidget* containerWidget() const {return m_ContainerWidget;}
|
||||
MainContainerWidget* mainContainerWidget() const {return m_MainContainerWidget;}
|
||||
CMainContainerWidget* mainContainerWidget() const {return m_MainContainerWidget;}
|
||||
|
||||
public://private:
|
||||
bool takeContent(InternalContentData& data);
|
||||
@@ -100,7 +100,7 @@ private slots:
|
||||
private:
|
||||
void setDraggingActive(bool Active);
|
||||
|
||||
MainContainerWidget* m_MainContainerWidget;
|
||||
CMainContainerWidget* m_MainContainerWidget;
|
||||
CContainerWidget* m_ContainerWidget;
|
||||
CContainerWidget* m_DropContainer;
|
||||
bool m_DraggingActive = false;
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
ADS_NAMESPACE_BEGIN
|
||||
class SectionContent;
|
||||
class SectionTitleWidget;
|
||||
class SectionContentWidget;
|
||||
class CSectionContentWidget;
|
||||
|
||||
|
||||
class InternalContentData
|
||||
@@ -45,7 +45,7 @@ public:
|
||||
|
||||
QSharedPointer<SectionContent> content;
|
||||
SectionTitleWidget* titleWidget;
|
||||
SectionContentWidget* contentWidget;
|
||||
CSectionContentWidget* contentWidget;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ class InternalContentData;
|
||||
* ContainerWidget is the main container to provide the docking
|
||||
* functionality. It manages multiple sections with all possible areas.
|
||||
*/
|
||||
class ADS_EXPORT_API MainContainerWidget : public CContainerWidget
|
||||
class ADS_EXPORT_API CMainContainerWidget : public CContainerWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -57,10 +57,11 @@ class ADS_EXPORT_API MainContainerWidget : public CContainerWidget
|
||||
friend class ContainerWidgetPrivate;
|
||||
friend class CFloatingTitleWidget;
|
||||
friend class CContainerWidget;
|
||||
friend class CSectionContentWidget;
|
||||
|
||||
public:
|
||||
explicit MainContainerWidget(QWidget *parent = nullptr);
|
||||
virtual ~MainContainerWidget();
|
||||
explicit CMainContainerWidget(QWidget *parent = nullptr);
|
||||
virtual ~CMainContainerWidget();
|
||||
|
||||
//
|
||||
// Public API
|
||||
|
||||
@@ -25,11 +25,11 @@ class QWidget;
|
||||
#include "ads/API.h"
|
||||
|
||||
ADS_NAMESPACE_BEGIN
|
||||
class MainContainerWidget;
|
||||
class CMainContainerWidget;
|
||||
|
||||
class ADS_EXPORT_API SectionContent
|
||||
{
|
||||
friend class MainContainerWidget;
|
||||
friend class CMainContainerWidget;
|
||||
|
||||
private:
|
||||
SectionContent();
|
||||
@@ -58,13 +58,13 @@ public:
|
||||
* \param content The widget to use as content.
|
||||
* \return May return a invalid ref-pointer in case of invalid parameters.
|
||||
*/
|
||||
static RefPtr newSectionContent(const QString& uniqueName, MainContainerWidget* container, QWidget* title, QWidget* content);
|
||||
static RefPtr newSectionContent(const QString& uniqueName, CMainContainerWidget* container, QWidget* title, QWidget* content);
|
||||
|
||||
virtual ~SectionContent();
|
||||
int uid() const;
|
||||
QString uniqueName() const;
|
||||
MainContainerWidget* containerWidget() const;
|
||||
QWidget* titleWidget() const;
|
||||
CMainContainerWidget* containerWidget() const;
|
||||
QWidget* titleWidgetContent() const;
|
||||
QWidget* contentWidget() const;
|
||||
Flags flags() const;
|
||||
|
||||
@@ -77,9 +77,9 @@ private:
|
||||
const int _uid;
|
||||
QString _uniqueName;
|
||||
|
||||
QPointer<MainContainerWidget> _containerWidget;
|
||||
QPointer<QWidget> _titleWidget;
|
||||
QPointer<QWidget> _contentWidget;
|
||||
QPointer<CMainContainerWidget> m_MainContainerWidget;
|
||||
QPointer<QWidget> m_TitleWidgetContent;
|
||||
QPointer<QWidget> m_ContentWidget;
|
||||
|
||||
// Optional attributes
|
||||
QString _title;
|
||||
|
||||
@@ -22,23 +22,64 @@
|
||||
#include "ads/API.h"
|
||||
#include "ads/SectionContent.h"
|
||||
|
||||
ADS_NAMESPACE_BEGIN
|
||||
class MainContainerWidget;
|
||||
namespace ads
|
||||
{
|
||||
class CMainContainerWidget;
|
||||
class SectionWidget;
|
||||
class SectionTitleWidget;
|
||||
|
||||
class SectionContentWidget : public QFrame
|
||||
|
||||
struct SectionContentWidgetPrivate;
|
||||
|
||||
|
||||
class CSectionContentWidget : public QFrame
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
friend class MainContainerWidget;
|
||||
private:
|
||||
SectionContentWidgetPrivate* d;
|
||||
friend class SectionContentWidgetPrivate;
|
||||
friend class CMainContainerWidget;
|
||||
|
||||
public:
|
||||
SectionContentWidget(SectionContent::RefPtr c, QWidget* parent = 0);
|
||||
virtual ~SectionContentWidget();
|
||||
enum Flag
|
||||
{
|
||||
None = 0,
|
||||
Closeable = 1,
|
||||
Maximizable = 2,
|
||||
AllFlags = Closeable | Maximizable
|
||||
};
|
||||
Q_DECLARE_FLAGS(Flags, Flag)
|
||||
|
||||
CSectionContentWidget(SectionContent::RefPtr c = SectionContent::RefPtr(), QWidget* parent = 0);
|
||||
virtual ~CSectionContentWidget();
|
||||
|
||||
/*!
|
||||
* Creates new content, associates it to <em>container</em> and takes ownership of
|
||||
* <em>title</em>- and <em>content</em>- widgets.
|
||||
* \param uniqueName An unique identifier across the entire process.
|
||||
* \param container The parent ContainerWidget in which this content will be active.
|
||||
* \param title The widget to use as title.
|
||||
* \param content The widget to use as content.
|
||||
* \return May return a invalid ref-pointer in case of invalid parameters.
|
||||
*/
|
||||
static CSectionContentWidget* newSectionContent(const QString& uniqueName,
|
||||
CMainContainerWidget* container, QWidget* title, QWidget* content);
|
||||
|
||||
int uid() const;
|
||||
QString uniqueName() const;
|
||||
CMainContainerWidget* containerWidget() const;
|
||||
QWidget* titleWidgetContent() const;
|
||||
QWidget* contentWidget() const;
|
||||
Flags flags() const;
|
||||
|
||||
QString visibleTitle() const;
|
||||
QString title() const;
|
||||
void setTitle(const QString& title);
|
||||
void setFlags(const Flags f);
|
||||
|
||||
private:
|
||||
SectionContent::RefPtr _content;
|
||||
};
|
||||
|
||||
ADS_NAMESPACE_END
|
||||
} // namespace ads
|
||||
#endif
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
class QPushButton;
|
||||
|
||||
ADS_NAMESPACE_BEGIN
|
||||
class MainContainerWidget;
|
||||
class CMainContainerWidget;
|
||||
class SectionWidget;
|
||||
class FloatingWidget;
|
||||
|
||||
@@ -36,7 +36,7 @@ class SectionTitleWidget : public QFrame
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(bool activeTab READ isActiveTab WRITE setActiveTab NOTIFY activeTabChanged)
|
||||
|
||||
friend class MainContainerWidget;
|
||||
friend class CMainContainerWidget;
|
||||
friend class SectionWidget;
|
||||
friend class CContainerWidget;
|
||||
|
||||
@@ -66,7 +66,7 @@ protected:
|
||||
virtual void mouseMoveEvent(QMouseEvent* ev);
|
||||
|
||||
private:
|
||||
void startFloating(QMouseEvent* ev, MainContainerWidget* cw, SectionWidget* sectionwidget);
|
||||
void startFloating(QMouseEvent* ev, CMainContainerWidget* cw, SectionWidget* sectionwidget);
|
||||
void moveTab(QMouseEvent* ev);
|
||||
|
||||
signals:
|
||||
|
||||
@@ -33,9 +33,9 @@ class QMenu;
|
||||
#include "ads/FloatingWidget.h"
|
||||
|
||||
ADS_NAMESPACE_BEGIN
|
||||
class MainContainerWidget;
|
||||
class CMainContainerWidget;
|
||||
class SectionTitleWidget;
|
||||
class SectionContentWidget;
|
||||
class CSectionContentWidget;
|
||||
|
||||
// SectionWidget manages multiple instances of SectionContent.
|
||||
// It displays a title TAB, which is clickable and will switch to
|
||||
@@ -43,10 +43,10 @@ class SectionContentWidget;
|
||||
class ADS_EXPORT_API SectionWidget : public QFrame
|
||||
{
|
||||
Q_OBJECT
|
||||
friend class MainContainerWidget;
|
||||
friend class CMainContainerWidget;
|
||||
friend class CContainerWidget;
|
||||
|
||||
explicit SectionWidget(MainContainerWidget* MainContainer, CContainerWidget* parent);
|
||||
explicit SectionWidget(CMainContainerWidget* MainContainer, CContainerWidget* parent);
|
||||
|
||||
public:
|
||||
virtual ~SectionWidget();
|
||||
@@ -88,10 +88,10 @@ private slots:
|
||||
|
||||
private:
|
||||
const int _uid;
|
||||
QPointer<MainContainerWidget> m_MainContainerWidget;
|
||||
QPointer<CMainContainerWidget> m_MainContainerWidget;
|
||||
QList<SectionContent::RefPtr> m_Contents;
|
||||
QList<SectionTitleWidget*> m_TitleWidgets;
|
||||
QList<SectionContentWidget*> m_ContentWidgets;
|
||||
QList<CSectionContentWidget*> m_ContentWidgets;
|
||||
|
||||
QBoxLayout* _topLayout;
|
||||
QScrollArea* _tabsScrollArea;
|
||||
|
||||
Reference in New Issue
Block a user