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
711c8910
Commit
711c8910
authored
May 14, 2012
by
Ivan Ilyin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Old libpalette document version
parent
4fa5970f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+4
-1
UBBoardPaletteManager.h
src/board/UBBoardPaletteManager.h
+1
-1
UBDocumentController.cpp
src/document/UBDocumentController.cpp
+2
-1
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+2
-1
No files found.
src/board/UBBoardPaletteManager.cpp
View file @
711c8910
...
...
@@ -160,9 +160,11 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
mRightPalette
=
new
UBRightPalette
(
mContainer
);
// RIGHT palette widgets
#ifndef USE_WEB_WIDGET
mpFeaturesWidget
=
new
UBFeaturesWidget
();
mRightPalette
->
registerWidget
(
mpFeaturesWidget
);
mRightPalette
->
addTab
(
mpFeaturesWidget
);
#endif
//Do not show deprecated lib widget to prevent collisions. Uncomment to return lib widget
...
...
@@ -728,7 +730,8 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
{
if
(
UBPlatformUtils
::
hasVirtualKeyboard
()
&&
mKeyboardPalette
!=
NULL
)
{
WBBrowserWindow
*
brWnd
=
UBApplication
::
webController
->
GetCurrentWebBrowser
();
// tmp variable?
// WBBrowserWindow* brWnd = UBApplication::webController->GetCurrentWebBrowser();
if
(
mKeyboardPalette
->
m_isVisible
)
{
...
...
src/board/UBBoardPaletteManager.h
View file @
711c8910
...
...
@@ -44,7 +44,7 @@ class UBApplicationController;
class
UBDockTeacherGuideWidget
;
// Uncomment this to use old-styles lib paletter
//
#define USE_WEB_WIDGET
#define USE_WEB_WIDGET
class
UBBoardPaletteManager
:
public
QObject
...
...
src/document/UBDocumentController.cpp
View file @
711c8910
...
...
@@ -1423,7 +1423,8 @@ bool UBDocumentController::isOKToOpenDocument(UBDocumentProxy* proxy)
QString
docVersion
=
proxy
->
metaData
(
UBSettings
::
documentVersion
).
toString
();
if
(
docVersion
.
isEmpty
()
||
docVersion
.
startsWith
(
"4.1"
)
||
docVersion
.
startsWith
(
"4.2"
)
||
docVersion
.
startsWith
(
"4.3"
)
||
docVersion
.
startsWith
(
"4.4"
)
||
docVersion
.
startsWith
(
"4.5"
))
// TODO UB 4.7 update if necessary
||
docVersion
.
startsWith
(
"4.3"
)
||
docVersion
.
startsWith
(
"4.4"
)
||
docVersion
.
startsWith
(
"4.5"
)
||
docVersion
.
startsWith
(
"4.6"
))
// TODO UB 4.7 update if necessary
{
return
true
;
}
...
...
src/domain/UBGraphicsScene.cpp
View file @
711c8910
...
...
@@ -293,7 +293,8 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
UBApplication
::
applicationController
->
initialVScroll
()));
}
connect
(
this
,
SIGNAL
(
selectionChanged
()),
this
,
SLOT
(
selectionChangedProcessing
()));
// Just for debug. Do not delete please
// connect(this, SIGNAL(selectionChanged()), this, SLOT(selectionChangedProcessing()));
connect
(
this
,
SIGNAL
(
selectionChanged
()),
this
,
SLOT
(
updateGroupButtonState
()));
// just a stub don't treat as a result code
...
...
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