Skip to content

use updated sip files from from char101 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions sip/AutoHideDockContainer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ namespace ads

class CAutoHideDockContainer : QFrame
{

%TypeHeaderCode
#include <AutoHideDockContainer.h>
%End
%TypeHeaderCode
#include <AutoHideDockContainer.h>
%End

protected:
virtual bool eventFilter(QObject* watched, QEvent* event);
Expand All @@ -19,27 +18,26 @@ protected:
void saveState(QXmlStreamWriter& Stream);

public:
CAutoHideDockContainer(ads::CDockWidget* DockWidget /Transfer/, ads::SideBarLocation area,
ads::CDockContainerWidget* parent /TransferThis/);
CAutoHideDockContainer(CDockWidget* DockWidget /Transfer/, ads::SideBarLocation area, CDockContainerWidget* parent /TransferThis/);
virtual ~CAutoHideDockContainer();
ads::CAutoHideSideBar* autoHideSideBar() const;
ads::CAutoHideTab* autoHideTab() const;
ads::CDockWidget* dockWidget() const;
int tabIndex() const;
void addDockWidget(ads::CDockWidget* DockWidget /Transfer/);
ads::SideBarLocation sideBarLocation() const;
void setSideBarLocation(ads::SideBarLocation SideBarLocation);
ads::CDockAreaWidget* dockAreaWidget() const;
ads::CDockContainerWidget* dockContainer() const;
void moveContentsToParent();
CAutoHideSideBar* autoHideSideBar() const;
CAutoHideTab* autoHideTab() const;
CDockWidget* dockWidget() const;
int tabIndex() const;
void addDockWidget(CDockWidget* DockWidget /Transfer/);
SideBarLocation sideBarLocation() const;
void setSideBarLocation(SideBarLocation SideBarLocation);
CDockAreaWidget* dockAreaWidget() const;
CDockContainerWidget* dockContainer() const;
void moveContentsToParent();
void cleanupAndDelete();
void toggleView(bool Enable);
void collapseView(bool Enable);
void toggleCollapseState();
void setSize(int Size);
void resetToInitialDockWidgetSize();
Qt::Orientation orientation() const;
void moveToNewSideBarLocation(ads::SideBarLocation);
void resetToInitialDockWidgetSize();
Qt::Orientation orientation() const;
void moveToNewSideBarLocation(SideBarLocation);
};

};
33 changes: 16 additions & 17 deletions sip/AutoHideSideBar.sip
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,34 @@
namespace ads
{


class CAutoHideSideBar : QScrollArea
{

%TypeHeaderCode
#include <AutoHideSideBar.h>
%End
%TypeHeaderCode
#include <AutoHideSideBar.h>
%End

protected:
virtual bool eventFilter(QObject *watched, QEvent *event);
void saveState(QXmlStreamWriter& Stream) const;
void insertTab(int Index, ads::CAutoHideTab* SideTab /Transfer/);
void insertTab(int Index, CAutoHideTab* SideTab /Transfer/);

public:
CAutoHideSideBar(ads::CDockContainerWidget* parent /TransferThis/, SideBarLocation area);
CAutoHideSideBar(CDockContainerWidget* parent /TransferThis/, SideBarLocation area);
virtual ~CAutoHideSideBar();
void removeTab(ads::CAutoHideTab* SideTab) /TransferBack/;
ads::CAutoHideDockContainer* insertDockWidget(int Index, ads::CDockWidget* DockWidget /Transfer/);
void removeAutoHideWidget(ads::CAutoHideDockContainer* AutoHideWidget) /TransferBack/;
void addAutoHideWidget(ads::CAutoHideDockContainer* AutoHideWidget, int Index);
void removeTab(CAutoHideTab* SideTab) /TransferBack/;
CAutoHideDockContainer* insertDockWidget(int Index, CDockWidget* DockWidget /Transfer/);
void removeAutoHideWidget(CAutoHideDockContainer* AutoHideWidget) /TransferBack/;
void addAutoHideWidget(CAutoHideDockContainer* AutoHideWidget, int Index);
Qt::Orientation orientation() const;
ads::CAutoHideTab* tab(int index) const;
int tabAt(const QPoint& Pos) const;
int tabInsertIndexAt(const QPoint& Pos) const;
int indexOfTab(const CAutoHideTab& Tab) const;
CAutoHideTab* tab(int index) const;
int tabAt(const QPoint& Pos) const;
int tabInsertIndexAt(const QPoint& Pos) const;
int indexOfTab(const CAutoHideTab& Tab) const;
int count() const;
int visibleTabCount() const;
bool hasVisibleTabs() const;
ads::SideBarLocation sideBarLocation() const;
int visibleTabCount() const;
bool hasVisibleTabs() const;
SideBarLocation sideBarLocation() const;
virtual QSize minimumSizeHint() const;
virtual QSize sizeHint() const;
int spacing() const;
Expand Down
56 changes: 30 additions & 26 deletions sip/AutoHideTab.sip
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,40 @@ namespace ads

class CAutoHideTab : CPushButton
{
%TypeHeaderCode
#include <AutoHideTab.h>
%End

%TypeHeaderCode
#include <AutoHideTab.h>
%End

protected:
void setSideBar(ads::CAutoHideSideBar *SideTabBar);
void removeFromSideBar();
virtual bool event(QEvent* event);
virtual void contextMenuEvent(QContextMenuEvent* ev);
virtual void mousePressEvent(QMouseEvent* ev);
virtual void mouseReleaseEvent(QMouseEvent* ev);
virtual void mouseMoveEvent(QMouseEvent* ev);
void setSideBar(CAutoHideSideBar *SideTabBar /Transfer/);
void removeFromSideBar();
virtual bool event(QEvent* event);
virtual void contextMenuEvent(QContextMenuEvent* ev);
virtual void mousePressEvent(QMouseEvent* ev);
virtual void mouseReleaseEvent(QMouseEvent* ev);
virtual void mouseMoveEvent(QMouseEvent* ev);
virtual void dragEnterEvent(QDragEnterEvent* ev);
virtual void dragLeaveEvent(QDragLeaveEvent* ev);

public:
CAutoHideTab(QWidget* parent /TransferThis/ = 0);
virtual ~CAutoHideTab();
void updateStyle();
ads::SideBarLocation sideBarLocation() const;
void setOrientation(Qt::Orientation Orientation);
Qt::Orientation orientation() const;
bool isActiveTab() const;
ads::CDockWidget* dockWidget() const;
void setDockWidget(ads::CDockWidget* DockWidget);
bool iconOnly() const;
ads::CAutoHideSideBar* sideBar() const;
int tabIndex() const;
void setDockWidgetFloating();
void unpinDockWidget();
void requestCloseDockWidget();
CAutoHideTab(QWidget* parent /TransferThis/ = nullptr);
virtual ~CAutoHideTab();
void updateStyle();
SideBarLocation sideBarLocation() const;
void setOrientation(Qt::Orientation Orientation);
Qt::Orientation orientation() const;
bool isActiveTab() const;
CDockWidget* dockWidget() const;
void setDockWidget(CDockWidget* DockWidget);
bool iconOnly() const;
CAutoHideSideBar* sideBar() const;
int tabIndex() const;

public slots:
void setDockWidgetFloating();
void unpinDockWidget();
void requestCloseDockWidget();
};

};
61 changes: 31 additions & 30 deletions sip/DockAreaTabBar.sip
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,45 @@ namespace ads

class CDockAreaTabBar : QScrollArea
{
%TypeHeaderCode
#include <DockAreaTabBar.h>
%End
%TypeHeaderCode
#include <DockAreaTabBar.h>
%End

protected:
virtual void wheelEvent(QWheelEvent* Event);
virtual void wheelEvent(QWheelEvent* Event);

public:
CDockAreaTabBar(ads::CDockAreaWidget* parent /TransferThis/);
virtual ~CDockAreaTabBar();
void insertTab(int Index, ads::CDockWidgetTab* Tab /Transfer/);
void removeTab(ads::CDockWidgetTab* Tab) /TransferBack/;
int count() const;
int currentIndex() const;
ads::CDockWidgetTab* currentTab() const;
ads::CDockWidgetTab* tab(int Index) const;
int tabAt(const QPoint& Pos) const;
int tabInsertIndexAt(const QPoint& Pos) const;
virtual bool eventFilter(QObject *watched, QEvent *event);
bool isTabOpen(int Index) const;
virtual QSize minimumSizeHint() const;
virtual QSize sizeHint() const;
void elidedChanged(bool elided);
CDockAreaTabBar(CDockAreaWidget* parent /TransferThis/);
virtual ~CDockAreaTabBar();
void insertTab(int Index, CDockWidgetTab* Tab /Transfer/);
void removeTab(CDockWidgetTab* Tab) /TransferBack/;
int count() const;
int currentIndex() const;
CDockWidgetTab* currentTab() const;
CDockWidgetTab* tab(int Index) const;
int tabAt(const QPoint& Pos) const;
int tabInsertIndexAt(const QPoint& Pos) const;
virtual bool eventFilter(QObject *watched, QEvent *event);
bool isTabOpen(int Index) const;
virtual QSize minimumSizeHint() const;
virtual QSize sizeHint() const;
bool areTabsOverflowing() const;

public slots:
void setCurrentIndex(int Index);
void closeTab(int Index);
void setCurrentIndex(int Index);
void closeTab(int Index);

signals:
void currentChanging(int Index);
void currentChanged(int Index);
void tabBarClicked(int index);
void tabCloseRequested(int index);
void tabClosed(int index);
void tabOpened(int index);
void tabMoved(int from, int to);
void removingTab(int index);
void tabInserted(int index);
void currentChanging(int Index);
void currentChanged(int Index);
void tabBarClicked(int index);
void tabCloseRequested(int index);
void tabClosed(int index);
void tabOpened(int index);
void tabMoved(int from, int to);
void removingTab(int index);
void tabInserted(int index);
void elidedChanged(bool elided);
};

};
75 changes: 37 additions & 38 deletions sip/DockAreaTitleBar.sip
Original file line number Diff line number Diff line change
Expand Up @@ -5,59 +5,58 @@ namespace ads

class CTitleBarButton : QToolButton
{
%TypeHeaderCode
#include <DockAreaTitleBar.h>
%End

public:
CTitleBarButton(bool ShowInTitleBar, bool HideWhenDisabled, TitleBarButton ButtonId,
QWidget* /TransferThis/ = Q_NULLPTR );
virtual void setVisible(bool);
void setShowInTitleBar(bool);
%TypeHeaderCode
#include <DockAreaTitleBar.h>
%End

TitleBarButton buttonId() const;
ads::CDockAreaTitleBar* titleBar() const;
bool isInAutoHideArea() const;
public:
CTitleBarButton(bool ShowInTitleBar, bool HideWhenDisabled, TitleBarButton ButtonId, QWidget* parent /TransferThis/ = nullptr);
virtual void setVisible(bool);
void setShowInTitleBar(bool);
TitleBarButton buttonId() const;
CDockAreaTitleBar* titleBar() const;
bool isInAutoHideArea() const;

protected:
bool event(QEvent *ev);
bool event(QEvent *ev);
};

class CDockAreaTitleBar : QFrame
{
%TypeHeaderCode
#include <DockAreaTitleBar.h>
%End
%TypeHeaderCode
#include <DockAreaTitleBar.h>
%End

protected:
virtual void mousePressEvent(QMouseEvent* ev);
virtual void mouseReleaseEvent(QMouseEvent* ev);
virtual void mouseMoveEvent(QMouseEvent* ev);
virtual void mouseDoubleClickEvent(QMouseEvent *event);
virtual void contextMenuEvent(QContextMenuEvent *event);
virtual void mousePressEvent(QMouseEvent* ev);
virtual void mouseReleaseEvent(QMouseEvent* ev);
virtual void mouseMoveEvent(QMouseEvent* ev);
virtual void mouseDoubleClickEvent(QMouseEvent *event);
virtual void contextMenuEvent(QContextMenuEvent *event);
virtual void resizeEvent(QResizeEvent *event);

public slots:
void markTabsMenuOutdated();

void markTabsMenuOutdated();

public:
CDockAreaTitleBar(ads::CDockAreaWidget* parent /TransferThis/);
virtual ~CDockAreaTitleBar();
ads::CDockAreaTabBar* tabBar() const;
ads::CTitleBarButton* button(ads::TitleBarButton which) const;
ads::CElidingLabel* autoHideTitleLabel() const;
ads::CDockAreaWidget* dockAreaWidget() const;
void updateDockWidgetActionsButtons();
virtual void setVisible(bool Visible);
void insertWidget(int index, QWidget *widget /Transfer/ );
int indexOf(QWidget *widget) const;
QString titleBarButtonToolTip(ads::TitleBarButton Button) const;
void setAreaFloating();
void showAutoHideControls(bool Show);
bool isAutoHide() const;
CDockAreaTitleBar(CDockAreaWidget* parent /TransferThis/);
virtual ~CDockAreaTitleBar();
CDockAreaTabBar* tabBar() const;
CTitleBarButton* button(TitleBarButton which) const;
CElidingLabel* autoHideTitleLabel() const;
CDockAreaWidget* dockAreaWidget() const;
void updateDockWidgetActionsButtons();
virtual void setVisible(bool Visible);
void insertWidget(int index, QWidget *widget /Transfer/);
int indexOf(QWidget *widget) const;
QString titleBarButtonToolTip(TitleBarButton Button) const;
void setAreaFloating();
void showAutoHideControls(bool Show);
bool isAutoHide() const;
virtual QMenu *buildContextMenu(QMenu *menu /Transfer/ = nullptr);

signals:
void tabBarClicked(int index);
void tabBarClicked(int index);
};

};
8 changes: 4 additions & 4 deletions sip/DockAreaTitleBar_p.sip
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ namespace ads

class CSpacerWidget : QWidget
{
%TypeHeaderCode
#include <DockAreaTitleBar_p.h>
%End
%TypeHeaderCode
#include <DockAreaTitleBar_p.h>
%End

public:
CSpacerWidget(QWidget* Parent /TransferThis/ = 0 );
CSpacerWidget(QWidget* Parent /TransferThis/ = nullptr);
virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const;
};
Expand Down
Loading