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
2ac46095
Commit
2ac46095
authored
Aug 13, 2013
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added menu item that allows to reach the tutorial
parent
6d2f062f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
13 deletions
+24
-13
mainWindow.ui
resources/forms/mainWindow.ui
+12
-12
UBApplication.cpp
src/core/UBApplication.cpp
+2
-0
UBWebController.cpp
src/web/UBWebController.cpp
+7
-0
UBWebController.h
src/web/UBWebController.h
+3
-1
No files found.
resources/forms/mainWindow.ui
View file @
2ac46095
...
...
@@ -1537,18 +1537,6 @@
<string>
Import eduMedia simulation
</string>
</property>
</action>
<action
name=
"actionTutorial"
>
<property
name=
"icon"
>
<iconset
resource=
"../OpenBoard.qrc"
>
<normaloff>
:/images/toolbar/tutorial.png
</normaloff>
:/images/toolbar/tutorial.png
</iconset>
</property>
<property
name=
"text"
>
<string>
Tutorial
</string>
</property>
<property
name=
"toolTip"
>
<string>
Open the tutorial
</string>
</property>
</action>
<action
name=
"actionCheckUpdate"
>
<property
name=
"icon"
>
<iconset
resource=
"../OpenBoard.qrc"
>
...
...
@@ -1620,6 +1608,18 @@
<string>
Remove the backgound
</string>
</property>
</action>
<action
name=
"actionOpenTutorial"
>
<property
name=
"icon"
>
<iconset
resource=
"../OpenBoard.qrc"
>
<normaloff>
:/images/toolbar/tutorial.png
</normaloff>
:/images/toolbar/tutorial.png
</iconset>
</property>
<property
name=
"text"
>
<string>
Open Tutorial
</string>
</property>
<property
name=
"toolTip"
>
<string>
Open the tutorial web page
</string>
</property>
</action>
</widget>
<resources>
<include
location=
"../OpenBoard.qrc"
/>
...
...
src/core/UBApplication.cpp
View file @
2ac46095
...
...
@@ -523,6 +523,8 @@ void UBApplication::decorateActionMenu(QAction* action)
menu
->
addAction
(
mainWindow
->
actionHideApplication
);
menu
->
addAction
(
mainWindow
->
actionSleep
);
menu
->
addSeparator
();
menu
->
addAction
(
mainWindow
->
actionOpenTutorial
);
menu
->
addSeparator
();
menu
->
addAction
(
mainWindow
->
actionPreferences
);
menu
->
addAction
(
mainWindow
->
actionMultiScreen
);
...
...
src/web/UBWebController.cpp
View file @
2ac46095
...
...
@@ -74,6 +74,8 @@ UBWebController::UBWebController(UBMainWindow* mainWindow)
// TODO : Comment the next line to continue the Youtube button bugfix
initialiazemOEmbedProviders
();
connect
(
mMainWindow
->
actionOpenTutorial
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
onOpenTutorial
()));
}
...
...
@@ -82,6 +84,11 @@ UBWebController::~UBWebController()
// NOOP
}
void
UBWebController
::
onOpenTutorial
()
{
loadUrl
(
QUrl
(
"http://tutorial.openboard.org"
));
}
void
UBWebController
::
initialiazemOEmbedProviders
()
{
mOEmbedProviders
<<
"5min.com"
;
...
...
src/web/UBWebController.h
View file @
2ac46095
...
...
@@ -40,7 +40,7 @@ class UBServerXMLHttpRequest;
class
UBWebController
:
public
QObject
{
Q_OBJECT
;
Q_OBJECT
public
:
UBWebController
(
UBMainWindow
*
mainWindow
);
...
...
@@ -125,6 +125,8 @@ class UBWebController : public QObject
void
toggleWebTrap
(
bool
checked
);
void
onOEmbedParsed
(
QVector
<
sOEmbedContent
>
contents
);
void
onOpenTutorial
();
signals
:
/**
...
...
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