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
c4a694e7
Commit
c4a694e7
authored
12 years ago
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue of multiple lines on the teacher bar on the presentation mode
parent
232730e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
UBTeacherGuideWidget.cpp
src/gui/UBTeacherGuideWidget.cpp
+8
-4
UBTeacherGuideWidgetsTools.cpp
src/gui/UBTeacherGuideWidgetsTools.cpp
+1
-0
No files found.
src/gui/UBTeacherGuideWidget.cpp
View file @
c4a694e7
...
@@ -386,10 +386,14 @@ void UBTeacherGuidePresentationWidget::showData(QVector<tUBGEElementNode*> data)
...
@@ -386,10 +386,14 @@ void UBTeacherGuidePresentationWidget::showData(QVector<tUBGEElementNode*> data)
else
if
(
element
->
type
==
"action"
){
else
if
(
element
->
type
==
"action"
){
QTreeWidgetItem
*
newWidgetItem
=
new
QTreeWidgetItem
(
mpRootWidgetItem
);
QTreeWidgetItem
*
newWidgetItem
=
new
QTreeWidgetItem
(
mpRootWidgetItem
);
newWidgetItem
->
setText
(
0
,
element
->
attributes
.
value
(
"task"
));
newWidgetItem
->
setText
(
0
,
element
->
attributes
.
value
(
"task"
));
QColor
color
=
element
->
attributes
.
value
(
"owner"
).
toInt
()
==
0
?
QColor
(
Qt
::
red
)
:
QColor
(
Qt
::
green
);
QString
colorString
=
element
->
attributes
.
value
(
"owner"
).
toInt
()
==
0
?
"red"
:
"green"
;
newWidgetItem
->
setData
(
0
,
Qt
::
ForegroundRole
,
QBrush
(
color
));
UBTGAdaptableText
*
textWidget
=
new
UBTGAdaptableText
(
newWidgetItem
,
0
);
newWidgetItem
->
setData
(
0
,
tUBTGTreeWidgetItemRole_HasAnAction
,
tUBTGActionAssociateOnClickItem_NONE
);
textWidget
->
bottomMargin
(
15
);
newWidgetItem
->
setData
(
0
,
Qt
::
FontRole
,
QVariant
(
QFont
(
QApplication
::
font
().
family
(),
11
)));
textWidget
->
setStyleSheet
(
"QWidget {background: #EEEEEE; border:none; color:"
+
colorString
+
";}"
);
textWidget
->
showText
(
element
->
attributes
.
value
(
"task"
));
textWidget
->
document
()
->
setDefaultFont
(
QFont
(
QApplication
::
font
().
family
(),
11
));
mpTreeWidget
->
setItemWidget
(
newWidgetItem
,
0
,
textWidget
);
mpRootWidgetItem
->
addChild
(
newWidgetItem
);
mpRootWidgetItem
->
addChild
(
newWidgetItem
);
}
}
else
if
(
element
->
type
==
"media"
){
else
if
(
element
->
type
==
"media"
){
...
...
This diff is collapsed.
Click to expand it.
src/gui/UBTeacherGuideWidgetsTools.cpp
View file @
c4a694e7
...
@@ -327,6 +327,7 @@ void UBTGMediaWidget::createWorkWidget(QString& path)
...
@@ -327,6 +327,7 @@ void UBTGMediaWidget::createWorkWidget(QString& path)
mpLayout
->
addWidget
(
mpMediaWidget
);
mpLayout
->
addWidget
(
mpMediaWidget
);
}
}
else
if
(
mpWebView
){
else
if
(
mpWebView
){
mpWebView
->
setMaximumHeight
(
mpTreeWidgetItem
->
treeWidget
()
->
size
().
width
());
mpWebView
->
setParent
(
mpWorkWidget
);
mpWebView
->
setParent
(
mpWorkWidget
);
mpLayout
->
addWidget
(
mpWebView
);
mpLayout
->
addWidget
(
mpWebView
);
}
}
...
...
This diff is collapsed.
Click to expand it.
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