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
5bb5444b
Commit
5bb5444b
authored
Sep 04, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue for resizing on title page
parent
21807120
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
UBTeacherGuideWidget.cpp
src/gui/UBTeacherGuideWidget.cpp
+14
-7
UBTeacherGuideWidget.h
src/gui/UBTeacherGuideWidget.h
+2
-0
No files found.
src/gui/UBTeacherGuideWidget.cpp
View file @
5bb5444b
...
...
@@ -676,18 +676,16 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpPageNumberLabel
->
setText
(
tr
(
"Title page"
));
mpLayout
->
addWidget
(
mpPageNumberLabel
);
mpScrollArea
=
new
QScrollArea
();
mpContainerWidget
=
new
QWidget
();
mpContainerWidgetLayout
=
new
QVBoxLayout
();
mpLayout
->
addWidget
(
mpScrollArea
);
mpScrollArea
->
setWidget
(
mpContainerWidget
);
mpScrollArea
->
setWidgetResizable
(
true
);
mpScrollArea
->
setHorizontalScrollBarPolicy
(
Qt
::
ScrollBarAlwaysOff
);
mpContainerWidget
->
setLayout
(
mpContainerWidgetLayout
);
mpButtonTitleLayout
=
new
QHBoxLayout
(
0
);
mpModePushButton
=
new
QPushButton
(
this
);
...
...
@@ -774,6 +772,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpContainerWidgetLayout
->
addWidget
(
mpSchoolLevelItemLabel
);
mpSchoolLevelBox
=
new
QComboBox
(
this
);
mpSchoolLevelBox
->
setMinimumHeight
(
22
);
mpSchoolLevelBox
->
setMinimumWidth
(
LOWER_RESIZE_WIDTH
);
mpSchoolLevelBox
->
setObjectName
(
"DockPaletteWidgetComboBox"
);
connect
(
mpSchoolLevelBox
,
SIGNAL
(
currentIndexChanged
(
QString
)),
this
,
SLOT
(
onSchoolLevelChanged
(
QString
)));
mpContainerWidgetLayout
->
addWidget
(
mpSchoolLevelBox
);
...
...
@@ -787,6 +786,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpContainerWidgetLayout
->
addWidget
(
mpSchoolSubjectsItemLabel
);
mpSchoolSubjectsBox
=
new
QComboBox
(
this
);
mpSchoolSubjectsBox
->
setMinimumHeight
(
22
);
mpSchoolSubjectsBox
->
setMinimumWidth
(
LOWER_RESIZE_WIDTH
);
mpSchoolSubjectsBox
->
setObjectName
(
"DockPaletteWidgetComboBox"
);
mpContainerWidgetLayout
->
addWidget
(
mpSchoolSubjectsBox
);
mpSchoolSubjectsValueLabel
=
new
QLabel
(
this
);
...
...
@@ -799,6 +799,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpContainerWidgetLayout
->
addWidget
(
mpSchoolTypeItemLabel
);
mpSchoolTypeBox
=
new
QComboBox
(
this
);
mpSchoolTypeBox
->
setMinimumHeight
(
22
);
mpSchoolTypeBox
->
setMinimumWidth
(
LOWER_RESIZE_WIDTH
);
mpSchoolTypeBox
->
setObjectName
(
"DockPaletteWidgetComboBox"
);
mpContainerWidgetLayout
->
addWidget
(
mpSchoolTypeBox
);
mpSchoolTypeValueLabel
=
new
QLabel
(
this
);
...
...
@@ -816,12 +817,15 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpContainerWidgetLayout
->
addWidget
(
mpLicenceLabel
);
mpLicenceBox
=
new
QComboBox
(
this
);
mpLicenceBox
->
setMinimumHeight
(
22
);
mpLicenceBox
->
setMinimumWidth
(
LOWER_RESIZE_WIDTH
);
mpLicenceBox
->
setObjectName
(
"DockPaletteWidgetComboBox"
);
mpContainerWidgetLayout
->
addWidget
(
mpLicenceBox
);
mpLicenceLayout
=
new
QHBoxLayout
(
0
);
mpLicenceIcon
=
new
QLabel
(
this
);
mpLicenceIcon
->
setMinimumWidth
(
LOWER_RESIZE_WIDTH
/
2
);
mpLicenceLayout
->
addWidget
(
mpLicenceIcon
);
mpLicenceValueLabel
=
new
QLabel
(
this
);
mpLicenceValueLabel
->
setMinimumWidth
(
LOWER_RESIZE_WIDTH
/
2
);
mpLicenceLayout
->
addWidget
(
mpLicenceValueLabel
);
mpContainerWidgetLayout
->
addLayout
(
mpLicenceLayout
);
mpContainerWidgetLayout
->
addStretch
(
1
);
...
...
@@ -941,7 +945,8 @@ void UBTeacherGuidePageZeroWidget::onSchoolLevelChanged(QString schoolLevel)
mpSchoolSubjectsItemLabel
->
setEnabled
(
true
);
mpSchoolSubjectsBox
->
setEnabled
(
true
);
mpSchoolSubjectsBox
->
addItems
(
subjects
);
}
else
{
}
else
{
mpSchoolSubjectsItemLabel
->
setDisabled
(
true
);
mpSchoolSubjectsBox
->
setDisabled
(
true
);
}
...
...
@@ -1144,10 +1149,12 @@ bool UBTeacherGuidePageZeroWidget::isModified()
return
result
;
}
void
UBTeacherGuidePageZeroWidget
::
resizeEvent
(
QResizeEvent
*
ev
){
void
UBTeacherGuidePageZeroWidget
::
resizeEvent
(
QResizeEvent
*
ev
)
{
emit
resized
();
QWidget
::
resizeEvent
(
ev
);
/* mpScrollArea->resize(width(), height());
mpContainerWidget->resize(width(), height());
*/
QWidget
::
resizeEvent
(
ev
);
}
/***************************************************************************
...
...
src/gui/UBTeacherGuideWidget.h
View file @
5bb5444b
...
...
@@ -35,6 +35,8 @@ typedef enum
tUBTGZeroPageMode_PRESENTATION
}
tUBTGZeroPageMode
;
#define LOWER_RESIZE_WIDTH 50
/***************************************************************************
* class UBTeacherGuideEditionWidget *
***************************************************************************/
...
...
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