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
64542002
Commit
64542002
authored
Jan 06, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed last scale issues
parent
92abcddb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
5 deletions
+18
-5
UBWidgetList.cpp
src/customWidgets/UBWidgetList.cpp
+8
-0
UBMediaPlayer.cpp
src/gui/UBMediaPlayer.cpp
+5
-3
UBTeacherBarWidget.cpp
src/gui/UBTeacherBarWidget.cpp
+5
-2
No files found.
src/customWidgets/UBWidgetList.cpp
View file @
64542002
...
@@ -53,6 +53,7 @@ void UBWidgetList::addWidget(QWidget *widget)
...
@@ -53,6 +53,7 @@ void UBWidgetList::addWidget(QWidget *widget)
if
(
NULL
!=
mpLayout
){
if
(
NULL
!=
mpLayout
){
mpEmptyLabel
->
setVisible
(
false
);
mpEmptyLabel
->
setVisible
(
false
);
mWidgetInfo
[
widget
]
=
widget
->
size
();
mWidgetInfo
[
widget
]
=
widget
->
size
();
qDebug
()
<<
__FUNCTION__
<<
"widget->size () "
<<
widget
->
size
();
updateView
(
size
());
updateView
(
size
());
mpLayout
->
addWidget
(
widget
);
mpLayout
->
addWidget
(
widget
);
}
}
...
@@ -75,6 +76,7 @@ void UBWidgetList::removeWidget(QWidget *widget)
...
@@ -75,6 +76,7 @@ void UBWidgetList::removeWidget(QWidget *widget)
int
UBWidgetList
::
scaleWidgets
(
QSize
pSize
)
int
UBWidgetList
::
scaleWidgets
(
QSize
pSize
)
{
{
int
result
=
0
;
int
result
=
0
;
int
count
=
0
;
foreach
(
QWidget
*
eachWidget
,
mWidgetInfo
.
keys
()){
foreach
(
QWidget
*
eachWidget
,
mWidgetInfo
.
keys
()){
qreal
scaleFactor
=
0
;
qreal
scaleFactor
=
0
;
int
newWidgetWidth
=
pSize
.
width
();
int
newWidgetWidth
=
pSize
.
width
();
...
@@ -89,6 +91,12 @@ int UBWidgetList::scaleWidgets(QSize pSize)
...
@@ -89,6 +91,12 @@ int UBWidgetList::scaleWidgets(QSize pSize)
newWidgetWidth
=
mWidgetInfo
[
eachWidget
].
width
()
/
scaleFactor
;
newWidgetWidth
=
mWidgetInfo
[
eachWidget
].
width
()
/
scaleFactor
;
result
+=
newWidgetWidth
;
result
+=
newWidgetWidth
;
}
}
qDebug
()
<<
__PRETTY_FUNCTION__
<<
"widget "
<<
&
eachWidget
;
qDebug
()
<<
__PRETTY_FUNCTION__
<<
"count "
<<
count
++
;
qDebug
()
<<
__PRETTY_FUNCTION__
<<
"widget orignal size "
<<
mWidgetInfo
[
eachWidget
];
qDebug
()
<<
__PRETTY_FUNCTION__
<<
"containes size "
<<
pSize
;
qDebug
()
<<
__PRETTY_FUNCTION__
<<
"scale factor "
<<
scaleFactor
;
qDebug
()
<<
__PRETTY_FUNCTION__
<<
"new height "
<<
result
;
}
}
return
result
;
return
result
;
}
}
...
...
src/gui/UBMediaPlayer.cpp
View file @
64542002
...
@@ -100,14 +100,17 @@ UBMediaPlayer::UBMediaPlayer() :
...
@@ -100,14 +100,17 @@ UBMediaPlayer::UBMediaPlayer() :
// vLayout->addWidget(info);
// vLayout->addWidget(info);
initVideoWindow
();
initVideoWindow
();
vLayout
->
addWidget
(
&
m_videoWindow
);
vLayout
->
addWidget
(
&
m_videoWindow
);
// m_videoWidget->setStyleSheet(QString("background:red;"));
QVBoxLayout
*
buttonPanelLayout
=
new
QVBoxLayout
();
QVBoxLayout
*
buttonPanelLayout
=
new
QVBoxLayout
();
//
m_videoWindow.hide();
//
m_videoWindow.hide();
// buttonPanelLayout->addLayout(layout);
// buttonPanelLayout->addLayout(layout);
// timeLabel = new QLabel(this);
// timeLabel = new QLabel(this);
progressLabel
=
new
QLabel
(
this
);
progressLabel
=
new
QLabel
(
this
);
QWidget
*
sliderPanel
=
new
QWidget
(
this
);
QWidget
*
sliderPanel
=
new
QWidget
(
this
);
// sliderPanel->setStyleSheet(QString("background:green;"));
QHBoxLayout
*
sliderLayout
=
new
QHBoxLayout
();
QHBoxLayout
*
sliderLayout
=
new
QHBoxLayout
();
// playButton->setStyleSheet(QString("background:yellow;"));
sliderLayout
->
addWidget
(
playButton
);
sliderLayout
->
addWidget
(
playButton
);
sliderLayout
->
addWidget
(
slider
);
sliderLayout
->
addWidget
(
slider
);
// sliderLayout->addWidget(timeLabel);
// sliderLayout->addWidget(timeLabel);
...
@@ -130,7 +133,6 @@ UBMediaPlayer::UBMediaPlayer() :
...
@@ -130,7 +133,6 @@ UBMediaPlayer::UBMediaPlayer() :
vLayout
->
addWidget
(
buttonPanelWidget
);
vLayout
->
addWidget
(
buttonPanelWidget
);
QHBoxLayout
*
labelLayout
=
new
QHBoxLayout
();
QHBoxLayout
*
labelLayout
=
new
QHBoxLayout
();
vLayout
->
addLayout
(
labelLayout
);
vLayout
->
addLayout
(
labelLayout
);
setLayout
(
vLayout
);
setLayout
(
vLayout
);
...
@@ -224,7 +226,7 @@ void UBMediaPlayer::initVideoWindow()
...
@@ -224,7 +226,7 @@ void UBMediaPlayer::initVideoWindow()
videoLayout
->
addWidget
(
m_videoWidget
);
videoLayout
->
addWidget
(
m_videoWidget
);
videoLayout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
videoLayout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
m_videoWindow
.
setLayout
(
videoLayout
);
m_videoWindow
.
setLayout
(
videoLayout
);
m_videoWindow
.
setMinimumSize
(
100
,
10
0
);
m_videoWindow
.
setMinimumSize
(
60
,
4
0
);
}
}
void
UBMediaPlayer
::
playPause
()
void
UBMediaPlayer
::
playPause
()
...
...
src/gui/UBTeacherBarWidget.cpp
View file @
64542002
...
@@ -913,7 +913,7 @@ UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char*
...
@@ -913,7 +913,7 @@ UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char*
mWidget
=
new
UBWidgetList
(
parent
);
mWidget
=
new
UBWidgetList
(
parent
);
// mWidget->setEmptyText(tr("No media found"));
// mWidget->setEmptyText(tr("No media found"));
mLayout
.
addWidget
(
mWidget
);
mLayout
.
addWidget
(
mWidget
);
mWidget
->
setStyleSheet
(
QString
(
"background-color: red;"
));
//
mWidget->setStyleSheet(QString("background-color: red;"));
setLayout
(
&
mLayout
);
setLayout
(
&
mLayout
);
mWidgetList
.
clear
();
mWidgetList
.
clear
();
}
}
...
@@ -931,10 +931,13 @@ void UBTeacherBarPreviewMedia::cleanMedia()
...
@@ -931,10 +931,13 @@ void UBTeacherBarPreviewMedia::cleanMedia()
{
{
foreach
(
QWidget
*
eachWidget
,
mWidgetList
.
keys
()){
foreach
(
QWidget
*
eachWidget
,
mWidgetList
.
keys
()){
if
(
QString
(
eachWidget
->
metaObject
()
->
className
()).
contains
(
"UBDraggable"
)){
if
(
QString
(
eachWidget
->
metaObject
()
->
className
()).
contains
(
"UBDraggable"
)){
mWidget
->
removeWidget
(
eachWidget
);
delete
eachWidget
;
delete
eachWidget
;
eachWidget
=
NULL
;
eachWidget
=
NULL
;
}
}
mWidget
->
removeWidget
(
eachWidget
);
else
{
mWidget
->
removeWidget
(
eachWidget
);
}
}
}
mWidgetList
.
clear
();
mWidgetList
.
clear
();
}
}
...
...
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