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
e9f6f397
Commit
e9f6f397
authored
Dec 04, 2013
by
Ilia Ryabokon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Old group button has been removed
parent
241ddb92
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
84 deletions
+0
-84
mainWindow.ui
resources/forms/mainWindow.ui
+0
-20
UBBoardController.cpp
src/board/UBBoardController.cpp
+0
-31
UBBoardController.h
src/board/UBBoardController.h
+0
-1
UBApplicationController.cpp
src/core/UBApplicationController.cpp
+0
-1
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+0
-30
UBGraphicsScene.h
src/domain/UBGraphicsScene.h
+0
-1
No files found.
resources/forms/mainWindow.ui
View file @
e9f6f397
...
...
@@ -69,7 +69,6 @@
<addaction
name=
"actionForward"
/>
<addaction
name=
"separator"
/>
<addaction
name=
"actionErase"
/>
<addaction
name=
"actionGroupItems"
/>
<addaction
name=
"actionBoard"
/>
<addaction
name=
"actionWeb"
/>
<addaction
name=
"actionDocument"
/>
...
...
@@ -1561,25 +1560,6 @@
<string>
Ctrl+H
</string>
</property>
</action>
<action
name=
"actionGroupItems"
>
<property
name=
"checkable"
>
<bool>
true
</bool>
</property>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
<property
name=
"icon"
>
<iconset
resource=
"../OpenBoard.qrc"
>
<normaloff>
:/images/toolbar/group.png
</normaloff>
<normalon>
:/images/toolbar/ungroup.png
</normalon>
:/images/toolbar/group.png
</iconset>
</property>
<property
name=
"text"
>
<string>
Group
</string>
</property>
<property
name=
"toolTip"
>
<string>
Group items
</string>
</property>
</action>
<action
name=
"actionPlay"
>
<property
name=
"checkable"
>
<bool>
true
</bool>
...
...
src/board/UBBoardController.cpp
View file @
e9f6f397
...
...
@@ -154,8 +154,6 @@ void UBBoardController::init()
setActiveDocumentScene
(
doc
);
connect
(
UBApplication
::
mainWindow
->
actionGroupItems
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
groupButtonClicked
()));
undoRedoStateChange
(
true
);
}
...
...
@@ -978,35 +976,6 @@ void UBBoardController::lastScene()
updateActionStates
();
}
void
UBBoardController
::
groupButtonClicked
()
{
QAction
*
groupAction
=
UBApplication
::
mainWindow
->
actionGroupItems
;
QList
<
QGraphicsItem
*>
selItems
=
activeScene
()
->
selectedItems
();
if
(
!
selItems
.
count
())
{
qDebug
()
<<
"Got grouping request when there is no any selected item on the scene"
;
return
;
}
if
(
groupAction
->
text
()
==
mActionGroupText
)
{
//The only way to get information from item, considering using smth else
UBGraphicsGroupContainerItem
*
groupItem
=
activeScene
()
->
createGroup
(
selItems
);
groupItem
->
setSelected
(
true
);
UBDrawingController
::
drawingController
()
->
setStylusTool
(
UBStylusTool
::
Selector
);
}
else
if
(
groupAction
->
text
()
==
mActionUngroupText
)
{
//Considering one selected item and it's a group
if
(
selItems
.
count
()
>
1
)
{
qDebug
()
<<
"can't make sense of ungrouping more then one item. Grouping action should be performed for that purpose"
;
return
;
}
UBGraphicsGroupContainerItem
*
currentGroup
=
dynamic_cast
<
UBGraphicsGroupContainerItem
*>
(
selItems
.
first
());
if
(
currentGroup
)
{
currentGroup
->
destroy
();
}
}
}
void
UBBoardController
::
downloadURL
(
const
QUrl
&
url
,
QString
contentSourceUrl
,
const
QPointF
&
pPos
,
const
QSize
&
pSize
,
bool
isBackground
,
bool
internalData
)
{
qDebug
()
<<
"something has been dropped on the board! Url is: "
<<
url
.
toString
();
...
...
src/board/UBBoardController.h
View file @
e9f6f397
...
...
@@ -213,7 +213,6 @@ class UBBoardController : public UBDocumentContainer
void
nextScene
();
void
firstScene
();
void
lastScene
();
void
groupButtonClicked
();
void
downloadURL
(
const
QUrl
&
url
,
QString
contentSourceUrl
=
QString
(),
const
QPointF
&
pPos
=
QPointF
(
0
.
0
,
0
.
0
),
const
QSize
&
pSize
=
QSize
(),
bool
isBackground
=
false
,
bool
internalData
=
false
);
UBItem
*
downloadFinished
(
bool
pSuccess
,
QUrl
sourceUrl
,
QUrl
contentUrl
,
QString
pHeader
,
QByteArray
pData
,
QPointF
pPos
,
QSize
pSize
,
...
...
src/core/UBApplicationController.cpp
View file @
e9f6f397
...
...
@@ -383,7 +383,6 @@ void UBApplicationController::showBoard()
emit
mainModeChanged
(
Board
);
UBApplication
::
boardController
->
freezeW3CWidgets
(
false
);
UBApplication
::
boardController
->
activeScene
()
->
updateGroupButtonState
();
}
...
...
src/domain/UBGraphicsScene.cpp
View file @
e9f6f397
...
...
@@ -340,7 +340,6 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent, bool enableUndoRedoSta
// Just for debug. Do not delete please
// connect(this, SIGNAL(selectionChanged()), this, SLOT(selectionChangedProcessing()));
connect
(
this
,
SIGNAL
(
selectionChanged
()),
this
,
SLOT
(
updateGroupButtonState
()));
connect
(
UBApplication
::
undoStack
.
data
(),
SIGNAL
(
indexChanged
(
int
)),
this
,
SLOT
(
updateSelectionFrameWrapper
(
int
)));
}
...
...
@@ -364,35 +363,6 @@ void UBGraphicsScene::selectionChangedProcessing()
}
}
void
UBGraphicsScene
::
updateGroupButtonState
()
{
UBStylusTool
::
Enum
currentTool
=
(
UBStylusTool
::
Enum
)
UBDrawingController
::
drawingController
()
->
stylusTool
();
if
(
UBStylusTool
::
Selector
!=
currentTool
&&
UBStylusTool
::
Play
!=
currentTool
)
return
;
QAction
*
groupAction
=
UBApplication
::
mainWindow
->
actionGroupItems
;
QList
<
QGraphicsItem
*>
selItems
=
selectedItems
();
int
selCount
=
selItems
.
count
();
if
(
selCount
<
1
)
{
groupAction
->
setEnabled
(
false
);
groupAction
->
setText
(
UBApplication
::
app
()
->
boardController
->
actionGroupText
());
}
else
if
(
selCount
==
1
)
{
if
(
selItems
.
first
()
->
type
()
==
UBGraphicsGroupContainerItem
::
Type
)
{
groupAction
->
setEnabled
(
true
);
groupAction
->
setText
(
UBApplication
::
app
()
->
boardController
->
actionUngroupText
());
}
else
{
groupAction
->
setEnabled
(
false
);
}
}
else
if
(
selCount
>
1
)
{
groupAction
->
setEnabled
(
true
);
groupAction
->
setText
(
UBApplication
::
app
()
->
boardController
->
actionGroupText
());
}
}
bool
UBGraphicsScene
::
inputDevicePress
(
const
QPointF
&
scenePos
,
const
qreal
&
pressure
)
{
bool
accepted
=
false
;
...
...
src/domain/UBGraphicsScene.h
View file @
e9f6f397
...
...
@@ -340,7 +340,6 @@ public slots:
void
setToolCursor
(
int
tool
);
void
selectionChangedProcessing
();
void
updateGroupButtonState
();
void
moveMagnifier
();
void
moveMagnifier
(
QPoint
newPos
,
bool
forceGrab
=
false
);
void
closeMagnifier
();
...
...
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