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
0b8014ee
Commit
0b8014ee
authored
Aug 16, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue 994
parent
070d0340
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
UBFeaturesWidget.cpp
src/gui/UBFeaturesWidget.cpp
+14
-9
UBFeaturesWidget.h
src/gui/UBFeaturesWidget.h
+1
-0
No files found.
src/gui/UBFeaturesWidget.cpp
View file @
0b8014ee
...
@@ -107,7 +107,7 @@ void UBFeaturesWidget::currentSelected(const QModelIndex ¤t)
...
@@ -107,7 +107,7 @@ void UBFeaturesWidget::currentSelected(const QModelIndex ¤t)
QString
objName
=
sender
()
->
objectName
();
QString
objName
=
sender
()
->
objectName
();
if
(
objName
.
isEmpty
())
{
if
(
objName
.
isEmpty
())
{
qWarning
()
<<
"incorr
r
ect sender"
;
qWarning
()
<<
"incorrect sender"
;
}
else
if
(
objName
==
objNamePathList
)
{
}
else
if
(
objName
==
objNamePathList
)
{
//Calling to reset the model for listView. Maybe separate function needed
//Calling to reset the model for listView. Maybe separate function needed
controller
->
searchStarted
(
""
,
centralWidget
->
listView
());
controller
->
searchStarted
(
""
,
centralWidget
->
listView
());
...
@@ -478,12 +478,12 @@ UBFeaturesCentralWidget::UBFeaturesCentralWidget(QWidget *parent) : QWidget(pare
...
@@ -478,12 +478,12 @@ UBFeaturesCentralWidget::UBFeaturesCentralWidget(QWidget *parent) : QWidget(pare
//Used to show search bar on the search widget
//Used to show search bar on the search widget
webView
=
new
UBFeaturesWebView
(
this
);
webView
=
new
UBFeaturesWebView
(
this
);
//filling stackwidget
//filling stackwidget
mStackedWidget
->
addWidget
(
mNavigator
);
mStackedWidget
->
addWidget
(
mNavigator
);
mStackedWidget
->
addWidget
(
mFeatureProperties
);
mStackedWidget
->
addWidget
(
mFeatureProperties
);
mStackedWidget
->
addWidget
(
webView
);
mStackedWidget
->
addWidget
(
webView
);
mStackedWidget
->
setCurrentIndex
(
MainList
);
mStackedWidget
->
setCurrentIndex
(
MainList
);
mStackedWidget
->
setContentsMargins
(
0
,
0
,
0
,
0
);
mStackedWidget
->
setContentsMargins
(
0
,
0
,
0
,
0
);
mAdditionalDataContainer
=
new
QStackedWidget
(
this
);
mAdditionalDataContainer
=
new
QStackedWidget
(
this
);
...
@@ -542,7 +542,7 @@ void UBFeaturesCentralWidget::setPropertiesThumbnail(const QPixmap &pix)
...
@@ -542,7 +542,7 @@ void UBFeaturesCentralWidget::setPropertiesThumbnail(const QPixmap &pix)
UBFeature
UBFeaturesCentralWidget
::
getCurElementFromProperties
()
UBFeature
UBFeaturesCentralWidget
::
getCurElementFromProperties
()
{
{
return
mFeatureProperties
->
getCurrentElement
();
return
mFeatureProperties
->
getCurrentElement
();
}
}
void
UBFeaturesCentralWidget
::
showAdditionalData
(
AddWidget
pWidgetType
,
AddWidgetState
pState
)
void
UBFeaturesCentralWidget
::
showAdditionalData
(
AddWidget
pWidgetType
,
AddWidgetState
pState
)
...
@@ -732,7 +732,7 @@ UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(
...
@@ -732,7 +732,7 @@ UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(
mpView
->
setObjectName
(
"SearchEngineView"
);
mpView
->
setObjectName
(
"SearchEngineView"
);
mpSankoreAPI
=
new
UBWidgetUniboardAPI
(
UBApplication
::
boardController
->
activeScene
());
mpSankoreAPI
=
new
UBWidgetUniboardAPI
(
UBApplication
::
boardController
->
activeScene
());
mpView
->
page
()
->
mainFrame
()
->
addToJavaScriptWindowObject
(
"sankore"
,
mpSankoreAPI
);
mpView
->
page
()
->
mainFrame
()
->
addToJavaScriptWindowObject
(
"sankore"
,
mpSankoreAPI
);
connect
(
mpView
->
page
()
->
mainFrame
(),
SIGNAL
(
javaScriptWindowObjectCleared
()),
this
,
SLOT
(
javaScriptWindowObjectCleared
()));
mpWebSettings
=
QWebSettings
::
globalSettings
();
mpWebSettings
=
QWebSettings
::
globalSettings
();
mpWebSettings
->
setAttribute
(
QWebSettings
::
JavaEnabled
,
true
);
mpWebSettings
->
setAttribute
(
QWebSettings
::
JavaEnabled
,
true
);
mpWebSettings
->
setAttribute
(
QWebSettings
::
PluginsEnabled
,
true
);
mpWebSettings
->
setAttribute
(
QWebSettings
::
PluginsEnabled
,
true
);
...
@@ -767,6 +767,11 @@ UBFeaturesWebView::~UBFeaturesWebView()
...
@@ -767,6 +767,11 @@ UBFeaturesWebView::~UBFeaturesWebView()
}
}
}
}
void
UBFeaturesWebView
::
javaScriptWindowObjectCleared
()
{
mpView
->
page
()
->
mainFrame
()
->
addToJavaScriptWindowObject
(
"sankore"
,
mpSankoreAPI
);
}
void
UBFeaturesWebView
::
showElement
(
const
UBFeature
&
elem
)
void
UBFeaturesWebView
::
showElement
(
const
UBFeature
&
elem
)
{
{
QString
qsWidgetName
;
QString
qsWidgetName
;
...
...
src/gui/UBFeaturesWidget.h
View file @
0b8014ee
...
@@ -288,6 +288,7 @@ public:
...
@@ -288,6 +288,7 @@ public:
private
slots
:
private
slots
:
void
onLoadFinished
(
bool
ok
);
void
onLoadFinished
(
bool
ok
);
void
javaScriptWindowObjectCleared
();
private
:
private
:
QWebView
*
mpView
;
QWebView
*
mpView
;
...
...
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