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
28bd9567
Commit
28bd9567
authored
Aug 08, 2012
by
Yimgo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Widget duplication fixed.
parent
cb7a0a38
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
UBGraphicsWidgetItem.cpp
src/domain/UBGraphicsWidgetItem.cpp
+6
-5
UBGraphicsWidgetItem.h
src/domain/UBGraphicsWidgetItem.h
+1
-1
No files found.
src/domain/UBGraphicsWidgetItem.cpp
View file @
28bd9567
...
...
@@ -44,7 +44,7 @@
bool
UBGraphicsWidgetItem
::
sInlineJavaScriptLoaded
=
false
;
QStringList
UBGraphicsWidgetItem
::
sInlineJavaScripts
;
UBGraphicsWidgetItem
::
UBGraphicsWidgetItem
(
QGraphicsItem
*
parent
,
int
widgetType
)
UBGraphicsWidgetItem
::
UBGraphicsWidgetItem
(
const
QUrl
&
pWidgetUrl
,
QGraphicsItem
*
parent
)
:
UBGraphicsWebView
(
parent
)
,
mInitialLoadDone
(
false
)
,
mIsFreezable
(
true
)
...
...
@@ -52,6 +52,7 @@ UBGraphicsWidgetItem::UBGraphicsWidgetItem(QGraphicsItem *parent, int widgetType
,
mLoadIsErronous
(
false
)
,
mCanBeContent
(
0
)
,
mCanBeTool
(
0
)
,
mWidgetUrl
(
pWidgetUrl
)
,
mIsFrozen
(
false
)
,
mIsTakingSnapshot
(
false
)
,
mShouldMoveWidget
(
false
)
...
...
@@ -83,7 +84,7 @@ UBGraphicsWidgetItem::UBGraphicsWidgetItem(QGraphicsItem *parent, int widgetType
viewPalette
.
setBrush
(
QPalette
::
Window
,
QBrush
(
Qt
::
transparent
));
setPalette
(
viewPalette
);
UBGraphicsWidgetItemDelegate
*
delegate
=
new
UBGraphicsWidgetItemDelegate
(
this
,
widgetType
);
UBGraphicsWidgetItemDelegate
*
delegate
=
new
UBGraphicsWidgetItemDelegate
(
this
);
delegate
->
init
();
setDelegate
(
delegate
);
}
...
...
@@ -621,7 +622,7 @@ void UBGraphicsWidgetItem::mainFrameLoadFinished (bool ok)
UBGraphicsAppleWidgetItem
::
UBGraphicsAppleWidgetItem
(
const
QUrl
&
pWidgetUrl
,
QGraphicsItem
*
parent
)
:
UBGraphicsWidgetItem
(
parent
)
:
UBGraphicsWidgetItem
(
p
WidgetUrl
,
p
arent
)
{
QString
path
=
pWidgetUrl
.
toLocalFile
();
...
...
@@ -699,7 +700,7 @@ QString UBGraphicsW3CWidgetItem::sNPAPIWrappperConfigTemplate;
QMap
<
QString
,
QString
>
UBGraphicsW3CWidgetItem
::
sNPAPIWrapperTemplates
;
UBGraphicsW3CWidgetItem
::
UBGraphicsW3CWidgetItem
(
const
QUrl
&
pWidgetUrl
,
QGraphicsItem
*
parent
)
:
UBGraphicsWidgetItem
(
parent
)
:
UBGraphicsWidgetItem
(
p
WidgetUrl
,
p
arent
)
,
mW3CWidgetAPI
(
0
)
{
QString
path
=
pWidgetUrl
.
toLocalFile
();
...
...
@@ -861,7 +862,7 @@ void UBGraphicsW3CWidgetItem::setUuid(const QUuid &pUuid)
UBItem
*
UBGraphicsW3CWidgetItem
::
deepCopy
()
const
{
UBGraphicsW3CWidgetItem
*
copy
=
new
UBGraphicsW3CWidgetItem
(
QGraphicsWebView
::
url
()
,
parentItem
());
UBGraphicsW3CWidgetItem
*
copy
=
new
UBGraphicsW3CWidgetItem
(
mWidgetUrl
,
parentItem
());
copy
->
setPos
(
this
->
pos
());
copy
->
setTransform
(
this
->
transform
());
...
...
src/domain/UBGraphicsWidgetItem.h
View file @
28bd9567
...
...
@@ -43,7 +43,7 @@ class UBGraphicsWidgetItem : public UBGraphicsWebView
Q_OBJECT
public
:
UBGraphicsWidgetItem
(
QGraphicsItem
*
parent
=
0
,
int
widgetType
=
0
);
UBGraphicsWidgetItem
(
const
QUrl
&
pWidgetUrl
=
QUrl
(),
QGraphicsItem
*
parent
=
0
);
~
UBGraphicsWidgetItem
();
virtual
void
initialize
();
...
...
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