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
002c544c
Commit
002c544c
authored
Jan 04, 2012
by
shibakaneki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added the action viewer
parent
e4d14dcf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
17 deletions
+9
-17
style.qss
resources/style.qss
+2
-1
UBTeacherBarWidget.cpp
src/gui/UBTeacherBarWidget.cpp
+4
-14
UBTeacherBarWidget.h
src/gui/UBTeacherBarWidget.h
+3
-2
No files found.
resources/style.qss
View file @
002c544c
...
...
@@ -4,7 +4,8 @@ QWidget#UBLibPathViewer,
QWidget#UBTeacherStudentAction,
QWidget#UBLibNavigatorWidget,
QWidget#UBLibItemProperties,
QWidget#UBDownloadWidget
QWidget#UBDownloadWidget,
QWidget#UBWidgetList
{
background: #EEEEEE;
border-radius: 10px;
...
...
src/gui/UBTeacherBarWidget.cpp
View file @
002c544c
...
...
@@ -27,6 +27,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
,
mpDuration2
(
NULL
)
,
mpDuration3
(
NULL
)
,
mpDurationButtons
(
NULL
)
,
mpActions
(
NULL
)
{
setObjectName
(
name
);
mName
=
"TeacherBarWidget"
;
...
...
@@ -79,9 +80,9 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
mpLayout
->
addLayout
(
mpDurationLayout
);
// Actions
mpAction
1
=
new
UBTeacherStudentAction
(
1
,
mpContainer
);
mpLayout
->
addWidget
(
mpAction
1
);
mpAction
s
=
new
UBWidgetList
(
this
);
mpActions
->
setEmptyText
(
tr
(
"Add actions"
));
mpLayout
->
addWidget
(
mpAction
s
);
// Media
mpDropMediaZone
=
new
UBTeacherBarDropMediaZone
();
...
...
@@ -93,8 +94,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
connect
(
UBApplication
::
boardController
,
SIGNAL
(
activeSceneChanged
()),
this
,
SLOT
(
loadContent
()));
connect
(
UBApplication
::
mainWindow
->
actionQuit
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
saveContent
()));
connect
(
mpTitle
,
SIGNAL
(
textChanged
(
QString
)),
this
,
SLOT
(
onValueChanged
()));
connect
(
mpAction1
->
teacher
(),
SIGNAL
(
textChanged
()),
this
,
SLOT
(
onValueChanged
()));
connect
(
mpAction1
->
student
(),
SIGNAL
(
textChanged
()),
this
,
SLOT
(
onValueChanged
()));
}
UBTeacherBarWidget
::~
UBTeacherBarWidget
()
...
...
@@ -184,8 +183,6 @@ void UBTeacherBarWidget::saveContent()
{
sTeacherBarInfos
infos
;
infos
.
title
=
mpTitle
->
text
();
infos
.
action1Master
=
mpAction1
->
teacherText
();
infos
.
action1Student
=
mpAction1
->
studentText
();
UBPersistenceManager
::
persistenceManager
()
->
persistTeacherBar
(
UBApplication
::
boardController
->
activeDocument
(),
UBApplication
::
boardController
->
activeSceneIndex
(),
infos
);
}
...
...
@@ -193,8 +190,6 @@ void UBTeacherBarWidget::loadContent()
{
sTeacherBarInfos
nextInfos
=
UBPersistenceManager
::
persistenceManager
()
->
getTeacherBarInfos
(
UBApplication
::
boardController
->
activeDocument
(),
UBApplication
::
boardController
->
activeSceneIndex
());
mpTitle
->
setText
(
nextInfos
.
title
);
mpAction1
->
setTeacherText
(
nextInfos
.
action1Master
);
mpAction1
->
setStudentText
(
nextInfos
.
action1Student
);
}
void
UBTeacherBarWidget
::
onTitleTextChanged
(
const
QString
&
text
)
...
...
@@ -202,11 +197,6 @@ void UBTeacherBarWidget::onTitleTextChanged(const QString& text)
mpTitle
->
setToolTip
(
text
);
}
void
UBTeacherBarWidget
::
onEquipmentTextChanged
(
const
QString
&
text
)
{
}
UBTeacherStudentAction
::
UBTeacherStudentAction
(
int
actionNumber
,
QWidget
*
parent
,
const
char
*
name
)
:
QWidget
(
parent
)
,
mpActionLabel
(
NULL
)
,
mpTeacherLabel
(
NULL
)
...
...
src/gui/UBTeacherBarWidget.h
View file @
002c544c
...
...
@@ -15,6 +15,7 @@ class UBVideoPlayer;
#include <QButtonGroup>
#include "UBDockPaletteWidget.h"
#include "customWidgets/UBWidgetList.h"
#define LABEL_MINWIDHT 80
...
...
@@ -79,8 +80,7 @@ private slots:
void
saveContent
();
void
loadContent
();
void
onValueChanged
();
void
onTitleTextChanged
(
const
QString
&
text
);
void
onEquipmentTextChanged
(
const
QString
&
text
);
void
onTitleTextChanged
(
const
QString
&
text
);
private
:
void
populateCombos
();
...
...
@@ -99,6 +99,7 @@ private:
QCheckBox
*
mpDuration2
;
QCheckBox
*
mpDuration3
;
QButtonGroup
*
mpDurationButtons
;
UBWidgetList
*
mpActions
;
};
#endif // UBTEACHERBARWIDGET_H
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