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
45ec8db8
Commit
45ec8db8
authored
Dec 19, 2011
by
Ivan Ilin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sankore 427
parent
4e75d6d2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
13 deletions
+16
-13
UBApplicationController.cpp
src/core/UBApplicationController.cpp
+4
-2
UBWebController.cpp
src/web/UBWebController.cpp
+3
-1
WBBrowserWindow.cpp
src/web/browser/WBBrowserWindow.cpp
+4
-6
WBTabWidget.cpp
src/web/browser/WBTabWidget.cpp
+0
-1
WBTabWidget.h
src/web/browser/WBTabWidget.h
+5
-3
No files found.
src/core/UBApplicationController.cpp
View file @
45ec8db8
...
@@ -460,6 +460,7 @@ void UBApplicationController::showTutorial()
...
@@ -460,6 +460,7 @@ void UBApplicationController::showTutorial()
UBApplication
::
boardController
->
hide
();
UBApplication
::
boardController
->
hide
();
}
}
// it's needed not to duplicate webbrowser search in web mode. If I've breaked smbd's code let Ivan know
UBApplication
::
webController
->
show
(
UBWebController
::
Tutorial
);
UBApplication
::
webController
->
show
(
UBWebController
::
Tutorial
);
mMainWindow
->
webToolBar
->
hide
();
mMainWindow
->
webToolBar
->
hide
();
...
@@ -488,6 +489,7 @@ void UBApplicationController::showSankoreEditor()
...
@@ -488,6 +489,7 @@ void UBApplicationController::showSankoreEditor()
UBApplication
::
boardController
->
hide
();
UBApplication
::
boardController
->
hide
();
}
}
// it's needed not to duplicate webbrowser search in web mode. If I've breaked smbd's code let Ivan know
UBApplication
::
webController
->
show
(
UBWebController
::
Paraschool
);
UBApplication
::
webController
->
show
(
UBWebController
::
Paraschool
);
mMainWindow
->
webToolBar
->
hide
();
mMainWindow
->
webToolBar
->
hide
();
...
...
src/web/UBWebController.cpp
View file @
45ec8db8
...
@@ -148,6 +148,8 @@ void UBWebController::webBrowserInstance()
...
@@ -148,6 +148,8 @@ void UBWebController::webBrowserInstance()
(
*
mCurrentWebBrowser
)
->
tabWidget
()
->
tabBar
()
->
show
();
(
*
mCurrentWebBrowser
)
->
tabWidget
()
->
tabBar
()
->
show
();
(
*
mCurrentWebBrowser
)
->
tabWidget
()
->
lineEdits
()
->
show
();
(
*
mCurrentWebBrowser
)
->
tabWidget
()
->
lineEdits
()
->
show
();
// (*mCurrentWebBrowser)->tabWidget()->tabBar()->hide();
// (*mCurrentWebBrowser)->tabWidget()->lineEdits()->hide();
}
}
UBApplication
::
applicationController
->
setMirrorSourceWidget
((
*
mCurrentWebBrowser
)
->
paintWidget
());
UBApplication
::
applicationController
->
setMirrorSourceWidget
((
*
mCurrentWebBrowser
)
->
paintWidget
());
...
@@ -192,7 +194,7 @@ void UBWebController::tutorialWebInstance()
...
@@ -192,7 +194,7 @@ void UBWebController::tutorialWebInstance()
else
else
{
{
mCurrentWebBrowser
=
&
mWebBrowserList
[
Tutorial
];
mCurrentWebBrowser
=
&
mWebBrowserList
[
Tutorial
];
mToolsCurrentPalette
=
&
mToolsPaletteList
[
Tutorial
];
//
mToolsCurrentPalette = &mToolsPaletteList[Tutorial];
// mKeyboardCurrentPalette = &mKeyboardPaletteList[Tutorial];
// mKeyboardCurrentPalette = &mKeyboardPaletteList[Tutorial];
mToolsPalettePositionned
=
&
mToolsPalettePositionnedList
[
Tutorial
];
mToolsPalettePositionned
=
&
mToolsPalettePositionnedList
[
Tutorial
];
if
(
!
(
*
mCurrentWebBrowser
))
if
(
!
(
*
mCurrentWebBrowser
))
...
...
src/web/browser/WBBrowserWindow.cpp
View file @
45ec8db8
...
@@ -97,11 +97,11 @@ WBBrowserWindow::WBBrowserWindow(QWidget *parent, Ui::MainWindow* uniboardMainWi
...
@@ -97,11 +97,11 @@ WBBrowserWindow::WBBrowserWindow(QWidget *parent, Ui::MainWindow* uniboardMainWi
defaultSettings
->
setAttribute
(
QWebSettings
::
PluginsEnabled
,
true
);
defaultSettings
->
setAttribute
(
QWebSettings
::
PluginsEnabled
,
true
);
setupMenu
();
setupMenu
();
//
if(!isViewerWebInstance)
if
(
!
isViewerWebInstance
)
setupToolBar
();
setupToolBar
();
//
else{
else
{
//
setupToolBarForTutorial();
setupToolBarForTutorial
();
//
}
}
QVBoxLayout
*
layout
=
new
QVBoxLayout
;
QVBoxLayout
*
layout
=
new
QVBoxLayout
;
layout
->
setSpacing
(
0
);
layout
->
setSpacing
(
0
);
...
@@ -205,8 +205,6 @@ void WBBrowserWindow::setupToolBar()
...
@@ -205,8 +205,6 @@ void WBBrowserWindow::setupToolBar()
connect
(
mSearchToolBar
,
SIGNAL
(
search
(
const
QUrl
&
)),
SLOT
(
loadUrl
(
const
QUrl
&
)));
connect
(
mSearchToolBar
,
SIGNAL
(
search
(
const
QUrl
&
)),
SLOT
(
loadUrl
(
const
QUrl
&
)));
mChaseWidget
=
new
WBChaseWidget
(
this
);
mChaseWidget
=
new
WBChaseWidget
(
this
);
mWebToolBar
->
insertWidget
(
mUniboardMainWindow
->
actionWebBigger
,
mChaseWidget
);
mWebToolBar
->
insertSeparator
(
mUniboardMainWindow
->
actionWebBigger
);
mWebToolBar
->
insertSeparator
(
mUniboardMainWindow
->
actionWebBigger
);
connect
(
mUniboardMainWindow
->
actionHome
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
slotHome
()));
connect
(
mUniboardMainWindow
->
actionHome
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
slotHome
()));
...
...
src/web/browser/WBTabWidget.cpp
View file @
45ec8db8
...
@@ -251,7 +251,6 @@ WBTabWidget::WBTabWidget(QWidget *parent)
...
@@ -251,7 +251,6 @@ WBTabWidget::WBTabWidget(QWidget *parent)
mLineEdits
->
setMinimumWidth
(
200
);
mLineEdits
->
setMinimumWidth
(
200
);
QSizePolicy
spolicy
=
mLineEdits
->
sizePolicy
();
QSizePolicy
spolicy
=
mLineEdits
->
sizePolicy
();
mLineEdits
->
setSizePolicy
(
QSizePolicy
::
Maximum
,
spolicy
.
verticalPolicy
());
mLineEdits
->
setSizePolicy
(
QSizePolicy
::
Maximum
,
spolicy
.
verticalPolicy
());
}
}
void
WBTabWidget
::
clear
()
void
WBTabWidget
::
clear
()
...
...
src/web/browser/WBTabWidget.h
View file @
45ec8db8
...
@@ -138,7 +138,7 @@ class WBWebActionMapper : public QObject
...
@@ -138,7 +138,7 @@ class WBWebActionMapper : public QObject
*/
*/
class
WBTabWidget
:
public
QTabWidget
class
WBTabWidget
:
public
QTabWidget
{
{
Q_OBJECT
;
Q_OBJECT
signals
:
signals
:
// tab widget signals
// tab widget signals
...
@@ -171,8 +171,10 @@ class WBTabWidget : public QTabWidget
...
@@ -171,8 +171,10 @@ class WBTabWidget : public QTabWidget
QByteArray
saveState
()
const
;
QByteArray
saveState
()
const
;
bool
restoreState
(
const
QByteArray
&
state
);
bool
restoreState
(
const
QByteArray
&
state
);
WBTabBar
*
tabBar
()
{
return
mTabBar
;
};
WBTabBar
*
tabBar
()
{
return
mTabBar
;
}
QStackedWidget
*
lineEdits
()
{
return
mLineEdits
;
};
QStackedWidget
*
lineEdits
()
{
return
mLineEdits
;
}
void
setLineEditStackVisible
(
bool
visible
)
{
mLineEdits
->
setVisible
(
visible
);
mLineEdits
->
hide
();}
protected
:
protected
:
void
mouseDoubleClickEvent
(
QMouseEvent
*
event
);
void
mouseDoubleClickEvent
(
QMouseEvent
*
event
);
void
contextMenuEvent
(
QContextMenuEvent
*
event
);
void
contextMenuEvent
(
QContextMenuEvent
*
event
);
...
...
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