Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
7f3760aa
Commit
7f3760aa
authored
Nov 24, 2011
by
shibakaneki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed an issue related to the dockpalette tabs
parent
5458a273
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
43 additions
and
26 deletions
+43
-26
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+2
-0
UBCachePropertiesWidget.cpp
src/gui/UBCachePropertiesWidget.cpp
+1
-0
UBDockDownloadWidget.cpp
src/gui/UBDockDownloadWidget.cpp
+1
-0
UBDockPalette.cpp
src/gui/UBDockPalette.cpp
+32
-24
UBDockPaletteWidget.h
src/gui/UBDockPaletteWidget.h
+4
-2
UBLibWidget.cpp
src/gui/UBLibWidget.cpp
+1
-0
UBPageNavigationWidget.cpp
src/gui/UBPageNavigationWidget.cpp
+1
-0
UBTeacherBarWidget.cpp
src/gui/UBTeacherBarWidget.cpp
+1
-0
No files found.
src/board/UBBoardPaletteManager.cpp
View file @
7f3760aa
...
...
@@ -1013,6 +1013,7 @@ void UBBoardPaletteManager::startDownloads()
if
(
!
mDownloadInProgress
)
{
mDownloadInProgress
=
true
;
mpDownloadWidget
->
setVisibleState
(
true
);
mRightPalette
->
addTab
(
mpDownloadWidget
);
}
}
...
...
@@ -1022,6 +1023,7 @@ void UBBoardPaletteManager::stopDownloads()
if
(
mDownloadInProgress
)
{
mDownloadInProgress
=
false
;
mpDownloadWidget
->
setVisibleState
(
false
);
mRightPalette
->
removeTab
(
mpDownloadWidget
->
name
());
}
}
src/gui/UBCachePropertiesWidget.cpp
View file @
7f3760aa
...
...
@@ -38,6 +38,7 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
setStyleSheet
(
UBApplication
::
globalStyleSheet
());
mName
=
"CachePropWidget"
;
mVisibleState
=
false
;
mIconToLeft
=
QPixmap
(
":images/cache_open.png"
);
mIconToRight
=
QPixmap
(
":images/cache_close.png"
);
setContentsMargins
(
10
,
10
,
10
,
10
);
...
...
src/gui/UBDockDownloadWidget.cpp
View file @
7f3760aa
...
...
@@ -20,6 +20,7 @@ UBDockDownloadWidget::UBDockDownloadWidget(QWidget *parent, const char *name):UB
,
mpDLWidget
(
NULL
)
{
mName
=
"DownloadWidget"
;
mVisibleState
=
false
;
setAttribute
(
Qt
::
WA_StyledBackground
,
true
);
setStyleSheet
(
UBApplication
::
globalStyleSheet
());
...
...
src/gui/UBDockPalette.cpp
View file @
7f3760aa
...
...
@@ -540,35 +540,35 @@ int UBDockPalette::customMargin()
* \brief Add the given tab widget
* @param widget as the given widget
*/
void
UBDockPalette
::
addTab
(
UBDockPaletteWidget
*
widget
)
{
if
(
!
mTabWidgets
.
contains
(
widget
)
)
{
widget
->
setVisible
(
true
);
mTabWidgets
.
append
(
widget
);
mpStackWidget
->
addWidget
(
widget
);
mpStackWidget
->
setCurrentWidget
(
widget
);
update
();
}
void
UBDockPalette
::
addTab
(
UBDockPaletteWidget
*
widget
)
{
if
(
!
mTabWidgets
.
contains
(
widget
)
&&
widget
->
visibleState
())
{
widget
->
setVisible
(
true
);
mTabWidgets
.
append
(
widget
);
mpStackWidget
->
addWidget
(
widget
);
mpStackWidget
->
setCurrentWidget
(
widget
);
update
();
}
}
/**
* \brief Remove the given tab
* @param widgetName as the tab widget name
*/
void
UBDockPalette
::
removeTab
(
const
QString
&
widgetName
)
{
for
(
int
i
=
0
;
i
<
mTabWidgets
.
size
();
i
++
)
{
UBDockPaletteWidget
*
pCrntWidget
=
mTabWidgets
.
at
(
i
);
if
(
NULL
!=
pCrntWidget
&&
(
pCrntWidget
->
name
()
==
widgetName
))
{
mpStackWidget
->
removeWidget
(
pCrntWidget
);
mTabWidgets
.
remove
(
i
);
pCrntWidget
->
hide
();
update
();
break
;
}
}
void
UBDockPalette
::
removeTab
(
const
QString
&
widgetName
)
{
for
(
int
i
=
0
;
i
<
mTabWidgets
.
size
();
i
++
)
{
UBDockPaletteWidget
*
pCrntWidget
=
mTabWidgets
.
at
(
i
);
if
(
NULL
!=
pCrntWidget
&&
(
pCrntWidget
->
name
()
==
widgetName
))
{
mpStackWidget
->
removeWidget
(
pCrntWidget
);
mTabWidgets
.
remove
(
i
);
pCrntWidget
->
hide
();
update
();
break
;
}
}
}
/**
...
...
@@ -600,6 +600,7 @@ void UBDockPalette::onShowTabWidget(const QString &widgetName)
UBDockPaletteWidget
*
pCrntWidget
=
mRegisteredWidgets
.
at
(
i
);
if
(
NULL
!=
pCrntWidget
&&
(
pCrntWidget
->
name
()
==
widgetName
))
{
pCrntWidget
->
setVisibleState
(
true
);
addTab
(
pCrntWidget
);
break
;
}
...
...
@@ -612,6 +613,13 @@ void UBDockPalette::onShowTabWidget(const QString &widgetName)
*/
void
UBDockPalette
::
onHideTabWidget
(
const
QString
&
widgetName
)
{
for
(
int
i
=
0
;
i
<
mRegisteredWidgets
.
size
();
i
++
){
UBDockPaletteWidget
*
pCrntWidget
=
mRegisteredWidgets
.
at
(
i
);
if
(
NULL
!=
pCrntWidget
&&
(
pCrntWidget
->
name
()
==
widgetName
)){
pCrntWidget
->
setVisibleState
(
false
);
break
;
}
}
removeTab
(
widgetName
);
}
...
...
src/gui/UBDockPaletteWidget.h
View file @
7f3760aa
...
...
@@ -27,8 +27,9 @@ public:
void
registerMode
(
eUBDockPaletteWidgetMode
mode
);
QVector
<
eUBDockPaletteWidgetMode
>
GetRegisteredModes
()
{
return
mRegisteredModes
;
};
QVector
<
eUBDockPaletteWidgetMode
>
GetRegisteredModes
()
{
return
mRegisteredModes
;
}
bool
visibleState
(){
return
mVisibleState
;}
void
setVisibleState
(
bool
state
){
mVisibleState
=
state
;}
signals
:
void
hideTab
(
const
QString
&
widgetName
);
...
...
@@ -46,6 +47,7 @@ protected:
/* The current widget available mode list */
QVector
<
eUBDockPaletteWidgetMode
>
mRegisteredModes
;
bool
mVisibleState
;
};
#endif // UBDOCKPALETTEWIDGET_H
src/gui/UBLibWidget.cpp
View file @
7f3760aa
...
...
@@ -35,6 +35,7 @@ UBLibWidget::UBLibWidget(QWidget *parent, const char *name):UBDockPaletteWidget(
{
setObjectName
(
name
);
mName
=
"LibWidget"
;
mVisibleState
=
true
;
setAttribute
(
Qt
::
WA_StyledBackground
,
true
);
setStyleSheet
(
UBApplication
::
globalStyleSheet
());
...
...
src/gui/UBPageNavigationWidget.cpp
View file @
7f3760aa
...
...
@@ -31,6 +31,7 @@ UBPageNavigationWidget::UBPageNavigationWidget(QWidget *parent, const char *name
{
setObjectName
(
name
);
mName
=
"PageNavigator"
;
mVisibleState
=
true
;
setAttribute
(
Qt
::
WA_StyledBackground
,
true
);
setStyleSheet
(
UBApplication
::
globalStyleSheet
());
...
...
src/gui/UBTeacherBarWidget.cpp
View file @
7f3760aa
...
...
@@ -36,6 +36,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
{
setObjectName
(
name
);
mName
=
"TeacherBarWidget"
;
mVisibleState
=
true
;
setAttribute
(
Qt
::
WA_StyledBackground
,
true
);
setStyleSheet
(
UBApplication
::
globalStyleSheet
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment