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
525e706f
Commit
525e706f
authored
Jan 24, 2012
by
Anatoly Mihalchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Part of fix for ticket 409.
parent
71d9a71a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
2 deletions
+12
-2
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+5
-0
UBBoardPaletteManager.h
src/board/UBBoardPaletteManager.h
+1
-0
UBDocumentController.cpp
src/document/UBDocumentController.cpp
+4
-1
UBTeacherBarWidget.h
src/gui/UBTeacherBarWidget.h
+2
-1
No files found.
src/board/UBBoardPaletteManager.cpp
View file @
525e706f
...
...
@@ -1057,3 +1057,8 @@ QRect UBBoardPaletteManager::GetFreeRectGlobalCoords() const
}
return
QRect
(
topLeft
,
bottomRight
);
}
void
UBBoardPaletteManager
::
ForceTeacherBarToSaveData
()
{
mpTeacherBarWidget
->
saveContent
();
}
src/board/UBBoardPaletteManager.h
View file @
525e706f
...
...
@@ -66,6 +66,7 @@ class UBBoardPaletteManager : public QObject
void
startDownloads
();
void
stopDownloads
();
QRect
GetFreeRectGlobalCoords
()
const
;
void
ForceTeacherBarToSaveData
();
signals
:
void
connectToDocController
();
...
...
src/document/UBDocumentController.cpp
View file @
525e706f
...
...
@@ -534,6 +534,9 @@ void UBDocumentController::duplicateSelectedItem()
if
(
UBApplication
::
applicationController
->
displayMode
()
!=
UBApplicationController
::
Document
)
return
;
UBBoardPaletteManager
*
paletteMan
=
UBApplication
::
boardController
->
paletteManager
();
//necessary to save active scene teacher bar data, if the scene didn't happen to be changed
if
(
paletteMan
)
paletteMan
->
ForceTeacherBarToSaveData
();
if
(
mSelectionType
==
Page
)
{
QList
<
QGraphicsItem
*>
selectedItems
=
mDocumentUI
->
thumbnailWidget
->
selectedItems
();
...
...
src/gui/UBTeacherBarWidget.h
View file @
525e706f
...
...
@@ -46,9 +46,10 @@ public:
UBTeacherBarWidget
(
QWidget
*
parent
=
0
,
const
char
*
name
=
"UBTeacherBarWidget"
);
~
UBTeacherBarWidget
();
p
rivate
slots
:
p
ublic
slots
:
void
saveContent
();
void
loadContent
();
private
slots
:
void
onValueChanged
();
void
onTitleTextChanged
(
const
QString
&
text
);
void
onEquipmentTextChanged
(
const
QString
&
text
);
...
...
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