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
bd818d16
Commit
bd818d16
authored
Oct 22, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue 1253
parent
17c42091
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
20 deletions
+19
-20
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+6
-7
UBFeaturesController.cpp
src/board/UBFeaturesController.cpp
+1
-1
UBFeaturesController.h
src/board/UBFeaturesController.h
+1
-1
UBFeaturesWidget.cpp
src/gui/UBFeaturesWidget.cpp
+10
-10
UBFeaturesWidget.h
src/gui/UBFeaturesWidget.h
+1
-1
No files found.
src/board/UBBoardPaletteManager.cpp
View file @
bd818d16
...
...
@@ -94,13 +94,12 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll
UBBoardPaletteManager
::~
UBBoardPaletteManager
()
{
delete
mAddItemPalette
;
if
(
NULL
!=
mStylusPalette
)
{
delete
mStylusPalette
;
mStylusPalette
=
NULL
;
}
// mAddedItemPalette is delete automatically because of is parent
// that changes depending on the mode
// mMainWindow->centralWidget is the parent of mStylusPalette
// do not delete this here.
}
void
UBBoardPaletteManager
::
initPalettesPosAtStartup
()
...
...
@@ -958,8 +957,8 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var)
// Clean the old palette
if
(
NULL
!=
mStylusPalette
)
{
// TODO : check why this line creates a crash in the application.
delete
mStylusPalette
;
mStylusPalette
=
NULL
;
}
// Create the new palette
...
...
src/board/UBFeaturesController.cpp
View file @
bd818d16
...
...
@@ -1089,7 +1089,7 @@ UBFeaturesController::~UBFeaturesController()
}
}
void
UBFeaturesController
::
assignFeaturesListV
ei
w
(
UBFeaturesListView
*
pList
)
void
UBFeaturesController
::
assignFeaturesListV
ie
w
(
UBFeaturesListView
*
pList
)
{
pList
->
setDragDropMode
(
QAbstractItemView
::
DragDrop
);
pList
->
setSelectionMode
(
QAbstractItemView
::
ContiguousSelection
);
...
...
src/board/UBFeaturesController.h
View file @
bd818d16
...
...
@@ -187,7 +187,7 @@ public:
static
const
QString
virtualRootName
;
void
assignFeaturesListV
ei
w
(
UBFeaturesListView
*
pList
);
void
assignFeaturesListV
ie
w
(
UBFeaturesListView
*
pList
);
void
assignPathListView
(
UBFeaturesListView
*
pList
);
public
:
...
...
src/gui/UBFeaturesWidget.cpp
View file @
bd818d16
...
...
@@ -42,7 +42,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
controller
->
assignPathListView
(
pathListView
);
centralWidget
=
new
UBFeaturesCentralWidget
(
this
);
controller
->
assignFeaturesListV
ei
w
(
centralWidget
->
listView
());
controller
->
assignFeaturesListV
ie
w
(
centralWidget
->
listView
());
centralWidget
->
setSliderPosition
(
UBSettings
::
settings
()
->
featureSliderPosition
->
get
().
toInt
());
//Bottom actionbar for DnD, quick search etc
...
...
@@ -430,7 +430,7 @@ void UBFeaturesListView::thumbnailSizeChanged( int value )
}
UBFeaturesNavigatorWidget
::
UBFeaturesNavigatorWidget
(
QWidget
*
parent
,
const
char
*
name
)
:
QWidget
(
parent
),
mListView
(
0
),
mListSlder
(
0
)
QWidget
(
parent
),
mListView
(
0
),
mListSl
i
der
(
0
)
{
name
=
"UBFeaturesNavigatorWidget"
;
...
...
@@ -440,26 +440,26 @@ UBFeaturesNavigatorWidget::UBFeaturesNavigatorWidget(QWidget *parent, const char
mListView
=
new
UBFeaturesListView
(
this
,
UBFeaturesWidget
::
objNameFeatureList
);
mListSlder
=
new
QSlider
(
Qt
::
Horizontal
,
this
);
mListSl
i
der
=
new
QSlider
(
Qt
::
Horizontal
,
this
);
mListSlder
->
setMinimum
(
UBFeaturesWidget
::
minThumbnailSize
);
mListSlder
->
setMaximum
(
UBFeaturesWidget
::
maxThumbnailSize
);
mListSlder
->
setValue
(
UBFeaturesWidget
::
minThumbnailSize
);
mListSlder
->
setMinimumHeight
(
20
);
mListSl
i
der
->
setMinimum
(
UBFeaturesWidget
::
minThumbnailSize
);
mListSl
i
der
->
setMaximum
(
UBFeaturesWidget
::
maxThumbnailSize
);
mListSl
i
der
->
setValue
(
UBFeaturesWidget
::
minThumbnailSize
);
mListSl
i
der
->
setMinimumHeight
(
20
);
mListView
->
setParent
(
this
);
QVBoxLayout
*
mainLayer
=
new
QVBoxLayout
(
this
);
mainLayer
->
addWidget
(
mListView
,
1
);
mainLayer
->
addWidget
(
mListSlder
,
0
);
mainLayer
->
addWidget
(
mListSl
i
der
,
0
);
mainLayer
->
setMargin
(
0
);
connect
(
mListSlder
,
SIGNAL
(
valueChanged
(
int
)),
mListView
,
SLOT
(
thumbnailSizeChanged
(
int
)));
connect
(
mListSl
i
der
,
SIGNAL
(
valueChanged
(
int
)),
mListView
,
SLOT
(
thumbnailSizeChanged
(
int
)));
}
void
UBFeaturesNavigatorWidget
::
setSliderPosition
(
int
pValue
)
{
mListSlder
->
setValue
(
pValue
);
mListSl
i
der
->
setValue
(
pValue
);
}
UBFeaturesCentralWidget
::
UBFeaturesCentralWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
)
...
...
src/gui/UBFeaturesWidget.h
View file @
bd818d16
...
...
@@ -154,7 +154,7 @@ public:
private
:
UBFeaturesListView
*
mListView
;
QSlider
*
mListSlder
;
QSlider
*
mListSl
i
der
;
};
...
...
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