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
04561f96
Commit
04561f96
authored
Sep 20, 2012
by
Aleksei Kanash
Browse files
Options
Browse Files
Download
Plain Diff
Merging from aleksei_kanash_dev.
UBToolWidget is QWidget now.
parents
667efeb9
b1c00c05
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
148 additions
and
147 deletions
+148
-147
UBBoardController.cpp
src/board/UBBoardController.cpp
+25
-17
UBBoardController.h
src/board/UBBoardController.h
+1
-0
UBBoardView.cpp
src/board/UBBoardView.cpp
+3
-3
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+1
-1
UBToolWidget.cpp
src/gui/UBToolWidget.cpp
+94
-94
UBToolWidget.h
src/gui/UBToolWidget.h
+24
-32
No files found.
src/board/UBBoardController.cpp
View file @
04561f96
...
@@ -1786,6 +1786,13 @@ qreal UBBoardController::currentZoom()
...
@@ -1786,6 +1786,13 @@ qreal UBBoardController::currentZoom()
return
1.0
;
return
1.0
;
}
}
void
UBBoardController
::
removeTool
(
UBToolWidget
*
toolWidget
)
{
toolWidget
->
hide
();
delete
toolWidget
;
}
void
UBBoardController
::
hide
()
void
UBBoardController
::
hide
()
{
{
UBApplication
::
mainWindow
->
actionLibrary
->
setChecked
(
false
);
UBApplication
::
mainWindow
->
actionLibrary
->
setChecked
(
false
);
...
@@ -2313,31 +2320,32 @@ void UBBoardController::togglePodcast(bool checked)
...
@@ -2313,31 +2320,32 @@ void UBBoardController::togglePodcast(bool checked)
void
UBBoardController
::
moveGraphicsWidgetToControlView
(
UBGraphicsWidgetItem
*
graphicsWidget
)
void
UBBoardController
::
moveGraphicsWidgetToControlView
(
UBGraphicsWidgetItem
*
graphicsWidget
)
{
{
graphicsWidget
->
remove
();
mActiveScene
->
setURStackEnable
(
false
);
mActiveScene
->
setURStackEnable
(
false
);
UBGraphicsItem
*
toolW3C
=
duplicateItem
(
dynamic_cast
<
UBItem
*>
(
graphicsWidget
));
graphicsWidget
->
remove
(
false
);
UBGraphicsWidgetItem
*
copyedGraphicsWidget
=
NULL
;
mActiveScene
->
addItemToDeletion
(
graphicsWidget
);
if
(
UBGraphicsWidgetItem
::
Type
==
toolW3C
->
type
())
copyedGraphicsWidget
=
static_cast
<
UBGraphicsWidgetItem
*>
(
toolW3C
);
UBToolWidget
*
toolWidget
=
new
UBToolWidget
(
copyedGraphicsWidget
);
UBToolWidget
*
toolWidget
=
new
UBToolWidget
(
graphicsWidget
,
mControlView
);
mActiveScene
->
addItem
(
toolWidget
);
qreal
ssf
=
1
/
UBApplication
::
boardController
->
systemScaleFactor
();
toolWidget
->
setScale
(
ssf
);
toolWidget
->
setPos
(
graphicsWidget
->
scenePos
());
mActiveScene
->
setURStackEnable
(
true
);
mActiveScene
->
setURStackEnable
(
true
);
QPoint
controlViewPos
=
mControlView
->
mapFromScene
(
graphicsWidget
->
sceneBoundingRect
().
center
());
toolWidget
->
centerOn
(
mControlView
->
mapTo
(
mControlContainer
,
controlViewPos
));
toolWidget
->
show
();
}
}
void
UBBoardController
::
moveToolWidgetToScene
(
UBToolWidget
*
toolWidget
)
void
UBBoardController
::
moveToolWidgetToScene
(
UBToolWidget
*
toolWidget
)
{
{
UBGraphicsWidgetItem
*
graphicsWidgetItem
=
addW3cWidget
(
toolWidget
->
graphicsWidgetItem
()
->
widgetUrl
(),
QPointF
(
0
,
0
));
UBGraphicsWidgetItem
*
widgetToScene
=
toolWidget
->
toolWidget
();
graphicsWidgetItem
->
setPos
(
toolWidget
->
pos
());
widgetToScene
->
resetTransform
();
QPoint
mainWindowCenter
=
toolWidget
->
mapTo
(
mMainWindow
,
QPoint
(
toolWidget
->
width
(),
toolWidget
->
height
())
/
2
);
QPoint
controlViewCenter
=
mControlView
->
mapFrom
(
mMainWindow
,
mainWindowCenter
);
QPointF
scenePos
=
mControlView
->
mapToScene
(
controlViewCenter
);
mActiveScene
->
addGraphicsWidget
(
widgetToScene
,
scenePos
);
toolWidget
->
remove
();
toolWidget
->
remove
();
graphicsWidgetItem
->
setSelected
(
true
);
}
}
...
...
src/board/UBBoardController.h
View file @
04561f96
...
@@ -203,6 +203,7 @@ class UBBoardController : public UBDocumentContainer
...
@@ -203,6 +203,7 @@ class UBBoardController : public UBDocumentContainer
void
hideMessage
();
void
hideMessage
();
void
setDisabled
(
bool
disable
);
void
setDisabled
(
bool
disable
);
void
setColorIndex
(
int
pColorIndex
);
void
setColorIndex
(
int
pColorIndex
);
void
removeTool
(
UBToolWidget
*
toolWidget
);
void
hide
();
void
hide
();
void
show
();
void
show
();
void
setWidePageSize
(
bool
checked
);
void
setWidePageSize
(
bool
checked
);
...
...
src/board/UBBoardView.cpp
View file @
04561f96
...
@@ -553,8 +553,8 @@ Here we determines cases when items should to get mouse press event at pressing
...
@@ -553,8 +553,8 @@ Here we determines cases when items should to get mouse press event at pressing
return
false
;
return
false
;
break
;
break
;
case
UBToolWidget
:
:
Type
:
//
case UBToolWidget::Type:
return
true
;
//
return true;
case
QGraphicsWebView
:
:
Type
:
case
QGraphicsWebView
:
:
Type
:
return
true
;
return
true
;
...
@@ -1123,7 +1123,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
...
@@ -1123,7 +1123,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
DelegateButton
::
Type
!=
movingItem
->
type
()
&&
DelegateButton
::
Type
!=
movingItem
->
type
()
&&
QGraphicsSvgItem
::
Type
!=
movingItem
->
type
()
&&
QGraphicsSvgItem
::
Type
!=
movingItem
->
type
()
&&
UBGraphicsDelegateFrame
::
Type
!=
movingItem
->
type
()
&&
UBGraphicsDelegateFrame
::
Type
!=
movingItem
->
type
()
&&
UBToolWidget
::
Type
!=
movingItem
->
type
()
&&
//
UBToolWidget::Type != movingItem->type() &&
UBGraphicsCache
::
Type
!=
movingItem
->
type
()
&&
UBGraphicsCache
::
Type
!=
movingItem
->
type
()
&&
QGraphicsWebView
::
Type
!=
movingItem
->
type
()
&&
// for W3C widgets as Tools.
QGraphicsWebView
::
Type
!=
movingItem
->
type
()
&&
// for W3C widgets as Tools.
!
(
!
isMultipleSelectionEnabled
()
&&
movingItem
->
parentItem
()
&&
UBGraphicsWidgetItem
::
Type
==
movingItem
->
type
()
&&
UBGraphicsGroupContainerItem
::
Type
==
movingItem
->
parentItem
()
->
type
()))
!
(
!
isMultipleSelectionEnabled
()
&&
movingItem
->
parentItem
()
&&
UBGraphicsWidgetItem
::
Type
==
movingItem
->
type
()
&&
UBGraphicsGroupContainerItem
::
Type
==
movingItem
->
parentItem
()
->
type
()))
...
...
src/domain/UBGraphicsScene.cpp
View file @
04561f96
...
@@ -1310,7 +1310,7 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co
...
@@ -1310,7 +1310,7 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co
if
(
graphicsWidget
->
canBeContent
())
if
(
graphicsWidget
->
canBeContent
())
{
{
// graphicsWidget->widgetWebView()
->loadMainHtml();
graphicsWidget
->
loadMainHtml
();
graphicsWidget
->
setSelected
(
true
);
graphicsWidget
->
setSelected
(
true
);
if
(
mUndoRedoStackEnabled
)
{
//should be deleted after scene own undo stack implemented
if
(
mUndoRedoStackEnabled
)
{
//should be deleted after scene own undo stack implemented
...
...
src/gui/UBToolWidget.cpp
View file @
04561f96
This diff is collapsed.
Click to expand it.
src/gui/UBToolWidget.h
View file @
04561f96
...
@@ -17,60 +17,52 @@
...
@@ -17,60 +17,52 @@
#define UBTOOLWIDGET_H_
#define UBTOOLWIDGET_H_
#include <QtGui>
#include <QtGui>
#include <QtWebKit>
#include "core/UB.h"
class
UBGraphicsScene
;
class
UBGraphicsWidgetItem
;
class
UBGraphicsWidgetItem
;
class
QWidget
;
class
UBGraphicsScene
;
class
QWebView
;
class
UBToolWidget
:
public
Q
Graphics
Widget
class
UBToolWidget
:
public
QWidget
{
{
Q_OBJECT
Q_OBJECT
;
public
:
public
:
UBToolWidget
(
const
QUrl
&
pUrl
,
Q
GraphicsItem
*
pParent
=
0
);
UBToolWidget
(
const
QUrl
&
pUrl
,
Q
Widget
*
pParent
=
0
);
UBToolWidget
(
UBGraphicsWidgetItem
*
p
GraphicsWidgetItem
,
QGraphicsItem
*
pParent
=
0
);
UBToolWidget
(
UBGraphicsWidgetItem
*
p
Widget
,
QWidget
*
pParent
=
0
);
virtual
~
UBToolWidget
();
virtual
~
UBToolWidget
();
UBGraphicsWidgetItem
*
graphicsWidgetItem
()
const
;
QPointF
naturalCenter
()
const
;
void
centerOn
(
const
QPointF
&
pos
);
void
remove
();
void
remove
();
void
centerOn
(
const
QPoint
&
pos
);
virtual
UBGraphicsScene
*
scene
();
QPoint
naturalCenter
()
const
;
virtual
QPointF
pos
()
const
;
virtual
void
setPos
(
const
QPointF
&
point
);
virtual
void
setPos
(
qreal
x
,
qreal
y
);
virtual
int
type
()
const
;
enum
UBGraphicsWidgetItem
*
toolWidget
()
const
;
{
Type
=
UBGraphicsItemType
::
ToolWidgetItemType
};
protected
:
protected
:
void
initialize
();
void
initialize
();
virtual
void
paintEvent
(
QPaintEvent
*
event
);
virtual
bool
event
(
Q
Event
*
event
);
virtual
void
mousePressEvent
(
QMouse
Event
*
event
);
virtual
void
mouse
PressEvent
(
QGraphicsScene
MouseEvent
*
event
);
virtual
void
mouse
MoveEvent
(
Q
MouseEvent
*
event
);
virtual
void
mouse
MoveEvent
(
QGraphicsScene
MouseEvent
*
event
);
virtual
void
mouse
ReleaseEvent
(
Q
MouseEvent
*
event
);
virtual
void
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
paint
(
QPainter
*
painter
,
const
QStyleOptionGraphicsItem
*
option
,
QWidget
*
widget
);
virtual
bool
eventFilter
(
QObject
*
obj
,
QEvent
*
event
);
private
slots
:
private
slots
:
void
javaScriptWindowObjectCleared
();
void
javaScriptWindowObjectCleared
();
protected
:
protected
:
bool
mShouldMoveWidget
;
QWebView
*
mWebView
;
int
mContentMargin
;
UBGraphicsWidgetItem
*
mToolWidget
;
int
mFrameWidth
;
QGraphicsWebView
*
mGraphicsWebView
;
UBGraphicsWidgetItem
*
mGraphicsWidgetItem
;
QPointF
mMousePressPos
;
static
QPixmap
*
sClosePixmap
;
static
QPixmap
*
sClosePixmap
;
static
QPixmap
*
sUnpinPixmap
;
static
QPixmap
*
sUnpinPixmap
;
QPoint
mMousePressPos
;
bool
mShouldMoveWidget
;
int
mContentMargin
;
int
mFrameWidth
;
};
};
#endif
/* UBTOOLWIDGET_H_ */
#endif
/* UBTOOLWIDGET_H_ */
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