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
254d1acc
Commit
254d1acc
authored
Apr 27, 2012
by
Anna Udovichenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slider for thumbnail size added
parent
0cf7b075
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
21 deletions
+38
-21
UBFeaturesController.cpp
src/board/UBFeaturesController.cpp
+1
-8
UBFeaturesController.h
src/board/UBFeaturesController.h
+2
-2
UBFeaturesWidget.cpp
src/gui/UBFeaturesWidget.cpp
+26
-9
UBFeaturesWidget.h
src/gui/UBFeaturesWidget.h
+9
-2
No files found.
src/board/UBFeaturesController.cpp
View file @
254d1acc
...
...
@@ -55,7 +55,7 @@ void UBFeaturesController::initDirectoryTree()
mLibShapesDirectoryPath
=
UBSettings
::
settings
()
->
applicationShapeLibraryDirectory
()
;
trashDirectoryPath
=
UBSettings
::
userTrashDirPath
();
featuresList
=
new
Q
Vector
<
UBFeature
>
();
featuresList
=
new
Q
List
<
UBFeature
>
();
QList
<
UBToolsManager
::
UBToolDescriptor
>
tools
=
UBToolsManager
::
manager
()
->
allTools
();
...
...
@@ -322,13 +322,6 @@ UBFeature UBFeaturesController::moveItemToFolder( const QUrl &url, const UBFeatu
{
UBFeature
newElement
=
copyItemToFolder
(
url
,
destination
);
deleteItem
(
url
);
/*QString sourcePath = url.toLocalFile();
QFile::remove( sourcePath );
QString thumbnailPath = UBFileSystemUtils::thumbnailPath( sourcePath );
if (thumbnailPath.length() && QFileInfo( thumbnailPath ).exists())
{
QFile::remove(thumbnailPath);
}*/
return
newElement
;
}
...
...
src/board/UBFeaturesController.h
View file @
254d1acc
...
...
@@ -53,7 +53,7 @@ public:
UBFeaturesController
(
QWidget
*
parentWidget
);
virtual
~
UBFeaturesController
();
Q
Vector
<
UBFeature
>*
getFeatures
()
const
{
return
featuresList
;
}
Q
List
<
UBFeature
>*
getFeatures
()
const
{
return
featuresList
;
}
const
QString
&
getRootPath
()
const
{
return
rootPath
;
}
...
...
@@ -81,7 +81,7 @@ private:
static
UBFeatureElementType
fileTypeFromUrl
(
const
QString
&
path
);
Q
Vector
<
UBFeature
>
*
featuresList
;
Q
List
<
UBFeature
>
*
featuresList
;
UBFeature
*
rootElement
;
QString
mUserAudioDirectoryPath
;
...
...
src/gui/UBFeaturesWidget.cpp
View file @
254d1acc
...
...
@@ -56,14 +56,14 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale
itemDelegate
=
new
UBFeaturesItemDelegate
(
this
,
featuresListView
);
featuresListView
->
setItemDelegate
(
itemDelegate
);
featuresListView
->
setIconSize
(
QSize
(
40
,
40
)
);
featuresListView
->
setGridSize
(
QSize
(
70
,
70
)
);
featuresListView
->
setIconSize
(
QSize
(
defaultThumbnailSize
,
defaultThumbnailSize
)
);
featuresListView
->
setGridSize
(
QSize
(
defaultThumbnailSize
*
1.75
,
defaultThumbnailSize
*
1.75
)
);
//pathListView->setStyleSheet( QString("background: #EEEEEE; border-radius : 10px; border : 2px solid #999999;") );
pathListView
->
setModel
(
featuresPathModel
);
pathListView
->
setViewMode
(
QListView
::
IconMode
);
pathListView
->
setIconSize
(
QSize
(
30
,
3
0
)
);
pathListView
->
setGridSize
(
QSize
(
50
,
3
0
)
);
pathListView
->
setIconSize
(
QSize
(
defaultThumbnailSize
-
10
,
defaultThumbnailSize
-
1
0
)
);
pathListView
->
setGridSize
(
QSize
(
defaultThumbnailSize
+
10
,
defaultThumbnailSize
-
1
0
)
);
pathListView
->
setFixedHeight
(
60
);
pathItemDelegate
=
new
UBFeaturesPathItemDelegate
(
this
);
pathListView
->
setItemDelegate
(
pathItemDelegate
);
...
...
@@ -89,7 +89,12 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale
currentStackedWidget
=
ID_LISTVIEW
;
mActionBar
=
new
UBFeaturesActionBar
(
controller
,
this
);
layout
->
addWidget
(
mActionBar
);
thumbSlider
=
new
QSlider
(
Qt
::
Horizontal
,
this
);
thumbSlider
->
setMinimum
(
minThumbnailSize
);
thumbSlider
->
setMaximum
(
maxThumbnailSize
);
thumbSlider
->
setValue
(
defaultThumbnailSize
);
layout
->
addWidget
(
thumbSlider
);
layout
->
addWidget
(
mActionBar
);
/*connect(featuresListView->selectionModel(), SIGNAL(currentChanged ( const QModelIndex &, const QModelIndex & )),
this, SLOT(currentSelected(const QModelIndex &)));*/
...
...
@@ -102,6 +107,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale
connect
(
mActionBar
,
SIGNAL
(
removeFromFavorite
(
const
QMimeData
&
)
),
this
,
SLOT
(
removeFromFavorite
(
const
QMimeData
&
)
)
);
connect
(
pathListView
,
SIGNAL
(
clicked
(
const
QModelIndex
&
)
),
this
,
SLOT
(
currentPathChanged
(
const
QModelIndex
&
)
)
);
connect
(
thumbSlider
,
SIGNAL
(
sliderMoved
(
int
)
),
this
,
SLOT
(
thumbnailSizeChanged
(
int
)
)
);
}
void
UBFeaturesWidget
::
searchStarted
(
const
QString
&
pattern
)
...
...
@@ -253,6 +259,12 @@ void UBFeaturesWidget::removeFromFavorite( const QMimeData & mimeData )
}
}
void
UBFeaturesWidget
::
thumbnailSizeChanged
(
int
value
)
{
featuresListView
->
setIconSize
(
QSize
(
value
,
value
)
);
featuresListView
->
setGridSize
(
QSize
(
value
*
1.75
,
value
*
1.75
)
);
}
void
UBFeaturesWidget
::
switchToListView
()
{
stackedWidget
->
setCurrentIndex
(
ID_LISTVIEW
);
...
...
@@ -407,7 +419,10 @@ void UBFeatureProperties::showElement( const UBFeature &elem )
void
UBFeatureProperties
::
onAddToPage
()
{
if
(
UBApplication
::
isFromWeb
(
mpElement
->
getUrl
()
)
)
QWidget
*
w
=
parentWidget
()
->
parentWidget
();
UBFeaturesWidget
*
featuresWidget
=
dynamic_cast
<
UBFeaturesWidget
*>
(
w
);
featuresWidget
->
getFeaturesController
()
->
addItemToPage
(
*
mpElement
);
/*if ( UBApplication::isFromWeb( mpElement->getUrl() ) )
{
sDownloadFileDesc desc;
desc.isBackground = false;
...
...
@@ -422,7 +437,7 @@ void UBFeatureProperties::onAddToPage()
QWidget *w = parentWidget()->parentWidget();
UBFeaturesWidget* featuresWidget = dynamic_cast<UBFeaturesWidget*>( w );
featuresWidget->getFeaturesController()->addItemToPage( *mpElement );
}
}
*/
}
UBFeatureProperties
::~
UBFeatureProperties
()
...
...
@@ -562,7 +577,8 @@ bool UBFeaturesModel::removeRows( int row, int count, const QModelIndex & parent
if
(
row
+
count
>
featuresList
->
size
()
)
return
false
;
beginRemoveRows
(
parent
,
row
,
row
+
count
-
1
);
featuresList
->
remove
(
row
,
count
);
//featuresList->remove( row, count );
featuresList
->
erase
(
featuresList
->
begin
()
+
row
,
featuresList
->
begin
()
+
row
+
count
);
endRemoveRows
();
return
true
;
}
...
...
@@ -574,7 +590,8 @@ bool UBFeaturesModel::removeRow( int row, const QModelIndex & parent )
if
(
row
>=
featuresList
->
size
()
)
return
false
;
beginRemoveRows
(
parent
,
row
,
row
);
featuresList
->
remove
(
row
);
//featuresList->remove( row );
featuresList
->
erase
(
featuresList
->
begin
()
+
row
);
endRemoveRows
();
return
true
;
}
...
...
src/gui/UBFeaturesWidget.h
View file @
254d1acc
...
...
@@ -51,6 +51,10 @@ public:
||
mode
==
eUBDockPaletteWidget_DESKTOP
;
}
UBFeaturesController
*
getFeaturesController
()
const
{
return
controller
;
};
static
const
int
minThumbnailSize
=
20
;
static
const
int
maxThumbnailSize
=
100
;
static
const
int
defaultThumbnailSize
=
40
;
private
:
void
switchToListView
();
void
switchToProperties
();
...
...
@@ -67,6 +71,8 @@ private:
UBFeaturesListView
*
featuresListView
;
UBFeaturesListView
*
pathListView
;
QSlider
*
thumbSlider
;
QVBoxLayout
*
layout
;
//UBFeaturesPathViewer *pathViewer;
QGraphicsScene
*
pathScene
;
...
...
@@ -85,6 +91,7 @@ private slots:
void
deleteElements
(
const
QMimeData
&
);
void
addToFavorite
(
const
QMimeData
&
);
void
removeFromFavorite
(
const
QMimeData
&
);
void
thumbnailSizeChanged
(
int
);
};
class
UBFeaturesListView
:
public
QListView
...
...
@@ -165,9 +172,9 @@ public:
Qt
::
DropActions
supportedDropActions
()
const
{
return
Qt
::
MoveAction
|
Qt
::
CopyAction
;
}
void
setFeaturesList
(
Q
Vector
<
UBFeature
>
*
flist
)
{
featuresList
=
flist
;
}
void
setFeaturesList
(
Q
List
<
UBFeature
>
*
flist
)
{
featuresList
=
flist
;
}
private
:
Q
Vector
<
UBFeature
>
*
featuresList
;
Q
List
<
UBFeature
>
*
featuresList
;
};
class
UBFeaturesProxyModel
:
public
QSortFilterProxyModel
...
...
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