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
9ac508f9
Commit
9ac508f9
authored
May 31, 2012
by
Aleksei Kanash
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WebTools palette hides after switching mode from Internet to any other.
parent
19a3a78e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+9
-0
UBBoardPaletteManager.h
src/board/UBBoardPaletteManager.h
+4
-0
UBWebController.cpp
src/web/UBWebController.cpp
+1
-1
No files found.
src/board/UBBoardPaletteManager.cpp
View file @
9ac508f9
...
...
@@ -29,6 +29,7 @@
#include "gui/UBKeyboardPalette.h"
#include "gui/UBToolWidget.h"
#include "gui/UBZoomPalette.h"
#include "gui/UBWebToolsPalette.h"
#include "gui/UBActionPalette.h"
#include "gui/UBFavoriteToolPalette.h"
#include "gui/UBDockTeacherGuideWidget.h"
...
...
@@ -73,6 +74,7 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll
,
mRightPalette
(
NULL
)
,
mBackgroundsPalette
(
0
)
,
mToolsPalette
(
0
)
,
mWebToolsCurrentPalette
(
0
)
,
mAddItemPalette
(
0
)
,
mErasePalette
(
NULL
)
,
mPagePalette
(
NULL
)
...
...
@@ -683,6 +685,8 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
if
(
!
isInit
)
containerResized
();
if
(
mWebToolsCurrentPalette
)
mWebToolsCurrentPalette
->
hide
();
}
break
;
...
...
@@ -723,6 +727,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
if
(
!
isInit
)
UBApplication
::
applicationController
->
uninotesController
()
->
TransparentWidgetResized
();
if
(
mWebToolsCurrentPalette
)
mWebToolsCurrentPalette
->
hide
();
}
break
;
...
...
@@ -764,6 +771,8 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
else
mKeyboardPalette
->
setParent
(
UBApplication
::
documentController
->
controlView
());
}
if
(
mWebToolsCurrentPalette
)
mWebToolsCurrentPalette
->
hide
();
}
break
;
...
...
src/board/UBBoardPaletteManager.h
View file @
9ac508f9
...
...
@@ -30,6 +30,7 @@
#include "gui/UBFeaturesWidget.h"
class
UBWebToolsPalette
;
class
UBStylusPalette
;
class
UBClockPalette
;
class
UBPageNumberPalette
;
...
...
@@ -66,6 +67,9 @@ class UBBoardPaletteManager : public QObject
UBKeyboardPalette
*
mKeyboardPalette
;
void
setCurrentWebToolsPalette
(
UBWebToolsPalette
*
palette
)
{
mWebToolsCurrentPalette
=
palette
;}
UBWebToolsPalette
*
mWebToolsCurrentPalette
;
void
processPalettersWidget
(
UBDockPalette
*
paletter
,
eUBDockPaletteWidgetMode
mode
);
void
changeMode
(
eUBDockPaletteWidgetMode
newMode
,
bool
isInit
=
false
);
void
startDownloads
();
...
...
src/web/UBWebController.cpp
View file @
9ac508f9
...
...
@@ -424,7 +424,7 @@ void UBWebController::setupPalettes()
if
(
!
(
*
mToolsCurrentPalette
))
{
(
*
mToolsCurrentPalette
)
=
new
UBWebToolsPalette
(
UBApplication
::
mainWindow
,
false
);
UBApplication
::
boardController
->
paletteManager
()
->
setCurrentWebToolsPalette
(
*
mToolsCurrentPalette
);
#ifndef Q_WS_WIN
if
(
UBPlatformUtils
::
hasVirtualKeyboard
()
&&
UBApplication
::
boardController
->
paletteManager
()
->
mKeyboardPalette
)
connect
(
UBApplication
::
boardController
->
paletteManager
()
->
mKeyboardPalette
,
SIGNAL
(
closed
()),
...
...
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