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
7348e3cf
Commit
7348e3cf
authored
Sep 07, 2011
by
shibakaneki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved an issue related to retrieving the cache properties from UBZ
parent
3c3e8246
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
UBSvgSubsetAdaptor.cpp
src/adaptors/UBSvgSubsetAdaptor.cpp
+5
-5
UBCachePropertiesWidget.cpp
src/gui/UBCachePropertiesWidget.cpp
+4
-3
UBPageNavigationWidget.cpp
src/gui/UBPageNavigationWidget.cpp
+1
-0
No files found.
src/adaptors/UBSvgSubsetAdaptor.cpp
View file @
7348e3cf
...
@@ -811,11 +811,11 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
...
@@ -811,11 +811,11 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
scene
->
setModified
(
false
);
scene
->
setModified
(
false
);
}
}
if
(
annotationGroup
)
if
(
annotationGroup
)
{
{
if
(
annotationGroup
->
polygons
().
empty
())
if
(
annotationGroup
->
polygons
().
empty
())
delete
annotationGroup
;
delete
annotationGroup
;
}
}
return
scene
;
return
scene
;
}
}
...
...
src/gui/UBCachePropertiesWidget.cpp
View file @
7348e3cf
...
@@ -61,8 +61,6 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
...
@@ -61,8 +61,6 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
mpColorLabel
=
new
QLabel
(
tr
(
"Color:"
),
mpProperties
);
mpColorLabel
=
new
QLabel
(
tr
(
"Color:"
),
mpProperties
);
mpColor
=
new
QPushButton
(
mpProperties
);
mpColor
=
new
QPushButton
(
mpProperties
);
mpColor
->
setObjectName
(
"DockPaletteWidgetButton"
);
mpColor
->
setObjectName
(
"DockPaletteWidgetButton"
);
// TODO: Check in the document if the page has a color and assign it to this cache
// else set the black color by default
updateCacheColor
(
Qt
::
black
);
updateCacheColor
(
Qt
::
black
);
mpColorLayout
->
addWidget
(
mpColorLabel
,
0
);
mpColorLayout
->
addWidget
(
mpColorLabel
,
0
);
mpColorLayout
->
addWidget
(
mpColor
,
0
);
mpColorLayout
->
addWidget
(
mpColor
,
0
);
...
@@ -86,7 +84,6 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
...
@@ -86,7 +84,6 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
mpShapeLayout
->
addStretch
(
1
);
mpShapeLayout
->
addStretch
(
1
);
mpPropertiesLayout
->
addLayout
(
mpShapeLayout
,
0
);
mpPropertiesLayout
->
addLayout
(
mpShapeLayout
,
0
);
// TODO: Check in the document which shape is saved and check the corresponding button
mpCircleButton
->
setChecked
(
true
);
mpCircleButton
->
setChecked
(
true
);
// Shape Size
// Shape Size
...
@@ -111,6 +108,9 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
...
@@ -111,6 +108,9 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
// Fill the empty space
// Fill the empty space
mpPropertiesLayout
->
addStretch
(
1
);
mpPropertiesLayout
->
addStretch
(
1
);
// Get the infos from the current cache
// ...
// Connect signals / slots
// Connect signals / slots
connect
(
mpCloseButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
onCloseClicked
()));
connect
(
mpCloseButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
onCloseClicked
()));
connect
(
mpColor
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
onColorClicked
()));
connect
(
mpColor
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
onColorClicked
()));
...
@@ -277,6 +277,7 @@ void UBCachePropertiesWidget::updateCurrentCache()
...
@@ -277,6 +277,7 @@ void UBCachePropertiesWidget::updateCurrentCache()
{
{
if
(
"Cache"
==
it
->
data
(
Qt
::
UserRole
).
toString
())
if
(
"Cache"
==
it
->
data
(
Qt
::
UserRole
).
toString
())
{
{
qDebug
()
<<
">>> Setting cache parameters"
;
setEnabled
(
true
);
setEnabled
(
true
);
mpCurrentCache
=
dynamic_cast
<
UBGraphicsCache
*>
(
it
);
mpCurrentCache
=
dynamic_cast
<
UBGraphicsCache
*>
(
it
);
if
((
NULL
!=
mpCurrentCache
)
&&
(
!
mCaches
.
contains
(
mpCurrentCache
)))
if
((
NULL
!=
mpCurrentCache
)
&&
(
!
mCaches
.
contains
(
mpCurrentCache
)))
...
...
src/gui/UBPageNavigationWidget.cpp
View file @
7348e3cf
...
@@ -113,6 +113,7 @@ void UBPageNavigationWidget::setDocument(UBDocumentProxy *document)
...
@@ -113,6 +113,7 @@ void UBPageNavigationWidget::setDocument(UBDocumentProxy *document)
if
(
mNavigator
->
currentDoc
()
!=
document
)
if
(
mNavigator
->
currentDoc
()
!=
document
)
{
{
mNavigator
->
setDocument
(
document
);
mNavigator
->
setDocument
(
document
);
UBApplication
::
boardController
->
notifyPageChanged
();
}
}
}
}
...
...
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