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
4e7dac2f
Commit
4e7dac2f
authored
Jul 25, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed page 0 with title page
parent
1525be32
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
7 deletions
+10
-7
UBDocumentController.cpp
src/document/UBDocumentController.cpp
+5
-1
UBDocumentNavigator.cpp
src/gui/UBDocumentNavigator.cpp
+3
-1
UBPageNavigationWidget.cpp
src/gui/UBPageNavigationWidget.cpp
+0
-2
UBTeacherGuideWidget.cpp
src/gui/UBTeacherGuideWidget.cpp
+2
-3
No files found.
src/document/UBDocumentController.cpp
View file @
4e7dac2f
...
@@ -1624,7 +1624,11 @@ void UBDocumentController::refreshDocumentThumbnailsView(UBDocumentContainer*)
...
@@ -1624,7 +1624,11 @@ void UBDocumentController::refreshDocumentThumbnailsView(UBDocumentContainer*)
}
}
items
<<
pixmapItem
;
items
<<
pixmapItem
;
labels
<<
tr
(
"Page %1"
).
arg
(
pageFromSceneIndex
(
i
));
int
pageIndex
=
pageFromSceneIndex
(
i
);
if
(
pageIndex
)
labels
<<
tr
(
"Page %1"
).
arg
(
pageIndex
);
else
labels
<<
tr
(
"Title page"
);
itemsPath
.
append
(
QUrl
::
fromLocalFile
(
proxy
->
persistencePath
()
+
QString
(
"/pages/%1"
).
arg
(
UBDocumentContainer
::
pageFromSceneIndex
(
i
))));
itemsPath
.
append
(
QUrl
::
fromLocalFile
(
proxy
->
persistencePath
()
+
QString
(
"/pages/%1"
).
arg
(
UBDocumentContainer
::
pageFromSceneIndex
(
i
))));
}
}
...
...
src/gui/UBDocumentNavigator.cpp
View file @
4e7dac2f
...
@@ -86,7 +86,9 @@ void UBDocumentNavigator::generateThumbnails(UBDocumentContainer* source)
...
@@ -86,7 +86,9 @@ void UBDocumentNavigator::generateThumbnails(UBDocumentContainer* source)
{
{
const
QPixmap
*
pix
=
source
->
pageAt
(
i
);
const
QPixmap
*
pix
=
source
->
pageAt
(
i
);
UBSceneThumbnailNavigPixmap
*
pixmapItem
=
new
UBSceneThumbnailNavigPixmap
(
*
pix
,
source
->
selectedDocument
(),
i
);
UBSceneThumbnailNavigPixmap
*
pixmapItem
=
new
UBSceneThumbnailNavigPixmap
(
*
pix
,
source
->
selectedDocument
(),
i
);
UBThumbnailTextItem
*
labelItem
=
new
UBThumbnailTextItem
(
tr
(
"Page %0"
).
arg
(
UBDocumentContainer
::
pageFromSceneIndex
(
i
)));
int
pageIndex
=
UBDocumentContainer
::
pageFromSceneIndex
(
i
);
QString
label
=
pageIndex
==
0
?
tr
(
"Title page"
)
:
tr
(
"Page %0"
).
arg
(
pageIndex
);
UBThumbnailTextItem
*
labelItem
=
new
UBThumbnailTextItem
(
label
);
UBImgTextThumbnailElement
thumbWithText
(
pixmapItem
,
labelItem
);
UBImgTextThumbnailElement
thumbWithText
(
pixmapItem
,
labelItem
);
thumbWithText
.
setBorder
(
border
());
thumbWithText
.
setBorder
(
border
());
...
...
src/gui/UBPageNavigationWidget.cpp
View file @
4e7dac2f
...
@@ -74,8 +74,6 @@ UBPageNavigationWidget::UBPageNavigationWidget(QWidget *parent, const char *name
...
@@ -74,8 +74,6 @@ UBPageNavigationWidget::UBPageNavigationWidget(QWidget *parent, const char *name
mTimeFormat
=
mTimeFormat
.
remove
(
":s"
);
mTimeFormat
=
mTimeFormat
.
remove
(
":s"
);
mTimerID
=
startTimer
(
1000
);
mTimerID
=
startTimer
(
1000
);
//connect(mNavigator, SIGNAL(changeCurrentPage()), this, SLOT(changeCurrentPage()));
//connect(UBApplication::boardController, SIGNAL(setDocOnPageNavigator(UBDocumentProxy*)), this, SLOT(onSetDocOnPageNavigator(UBDocumentProxy*)));
}
}
/**
/**
...
...
src/gui/UBTeacherGuideWidget.cpp
View file @
4e7dac2f
...
@@ -135,7 +135,6 @@ UBTeacherGuideEditionWidget::UBTeacherGuideEditionWidget(QWidget *parent, const
...
@@ -135,7 +135,6 @@ UBTeacherGuideEditionWidget::UBTeacherGuideEditionWidget(QWidget *parent, const
if
(
UBSettings
::
settings
()
->
teacherGuideLessonPagesActivated
->
get
().
toBool
()){
if
(
UBSettings
::
settings
()
->
teacherGuideLessonPagesActivated
->
get
().
toBool
()){
UBSvgSubsetAdaptor
::
addElementToBeStored
(
QString
(
"teacherGuide"
),
this
);
UBSvgSubsetAdaptor
::
addElementToBeStored
(
QString
(
"teacherGuide"
),
this
);
//connect(UBApplication::boardController,SIGNAL(activeDocumentChanged()),this,SLOT(onActiveDocumentChanged()));
connect
(
UBApplication
::
boardController
,
SIGNAL
(
documentSet
(
UBDocumentProxy
*
)),
this
,
SLOT
(
onActiveDocumentChanged
()));
connect
(
UBApplication
::
boardController
,
SIGNAL
(
documentSet
(
UBDocumentProxy
*
)),
this
,
SLOT
(
onActiveDocumentChanged
()));
}
}
}
}
...
@@ -198,7 +197,7 @@ QVector<tIDataStorage*> UBTeacherGuideEditionWidget::save(int pageIndex)
...
@@ -198,7 +197,7 @@ QVector<tIDataStorage*> UBTeacherGuideEditionWidget::save(int pageIndex)
tIDataStorage
*
data
=
new
tIDataStorage
();
tIDataStorage
*
data
=
new
tIDataStorage
();
data
->
name
=
"teacherGuide"
;
data
->
name
=
"teacherGuide"
;
data
->
type
=
eElementType_START
;
data
->
type
=
eElementType_START
;
data
->
attributes
.
insert
(
"version"
,
"
1.5
0"
);
data
->
attributes
.
insert
(
"version"
,
"
2.0
0"
);
result
<<
data
;
result
<<
data
;
data
=
new
tIDataStorage
();
data
=
new
tIDataStorage
();
...
@@ -635,7 +634,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
...
@@ -635,7 +634,7 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpPageNumberLabel
=
new
QLabel
(
this
);
mpPageNumberLabel
=
new
QLabel
(
this
);
mpPageNumberLabel
->
setAlignment
(
Qt
::
AlignRight
);
mpPageNumberLabel
->
setAlignment
(
Qt
::
AlignRight
);
mpPageNumberLabel
->
setObjectName
(
"UBTGPageNumberLabel"
);
mpPageNumberLabel
->
setObjectName
(
"UBTGPageNumberLabel"
);
mpPageNumberLabel
->
setText
(
tr
(
"
Page 0
"
));
mpPageNumberLabel
->
setText
(
tr
(
"
Title page
"
));
mpLayout
->
addWidget
(
mpPageNumberLabel
);
mpLayout
->
addWidget
(
mpPageNumberLabel
);
mpButtonTitleLayout
=
new
QHBoxLayout
(
0
);
mpButtonTitleLayout
=
new
QHBoxLayout
(
0
);
...
...
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