diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc
index 6c1d2ad6..9c861cab 100644
--- a/resources/OpenBoard.qrc
+++ b/resources/OpenBoard.qrc
@@ -286,6 +286,9 @@
images/libpalette/trash_favorite.svg
images/libpalette/back.png
images/libpalette/loading.png
+ images/libpalette/notFound.svg
+ images/libpalette/back.svg
+ images/libpalette/loading.svg
images/stylusPalette/eraserArrow.png
images/stylusPalette/eraserOnArrow.png
images/stylusPalette/markerArrow.png
@@ -307,6 +310,11 @@
images/libpalette/miniNewFolder.png
images/libpalette/miniFavorite.png
images/libpalette/home.png
+ images/libpalette/miniSearch.svg
+ images/libpalette/miniTrash.svg
+ images/libpalette/miniNewFolder.svg
+ images/libpalette/miniFavorite.svg
+ images/libpalette/home.svg
images/toolbar/updates.png
images/paletteLibrary.png
images/paletteNavigator.png
diff --git a/resources/images/libpalette/FavoritesCategory.svg b/resources/images/libpalette/FavoritesCategory.svg
index 319b913e..4218e5f7 100644
--- a/resources/images/libpalette/FavoritesCategory.svg
+++ b/resources/images/libpalette/FavoritesCategory.svg
@@ -1,91 +1,301 @@
-
-
-
-]>
-
+
+
+
+
diff --git a/resources/images/libpalette/TrashCategory.svg b/resources/images/libpalette/TrashCategory.svg
index d740f9c5..9e68d2ef 100644
--- a/resources/images/libpalette/TrashCategory.svg
+++ b/resources/images/libpalette/TrashCategory.svg
@@ -1,712 +1,299 @@
-
-
-
-]>
-
+
+
+
+
diff --git a/resources/images/libpalette/back.svg b/resources/images/libpalette/back.svg
new file mode 100644
index 00000000..e1d84be7
--- /dev/null
+++ b/resources/images/libpalette/back.svg
@@ -0,0 +1,88 @@
+
+
+
+
diff --git a/resources/images/libpalette/folder.svg b/resources/images/libpalette/folder.svg
index 8899505e..810fa0ad 100644
--- a/resources/images/libpalette/folder.svg
+++ b/resources/images/libpalette/folder.svg
@@ -1,60 +1,208 @@
-
-
-
-]>
-
+
+
+
+
diff --git a/resources/images/libpalette/home.svg b/resources/images/libpalette/home.svg
new file mode 100644
index 00000000..8092ffc0
--- /dev/null
+++ b/resources/images/libpalette/home.svg
@@ -0,0 +1,189 @@
+
+
+
+
diff --git a/resources/images/libpalette/loading.svg b/resources/images/libpalette/loading.svg
new file mode 100644
index 00000000..4ec0a392
--- /dev/null
+++ b/resources/images/libpalette/loading.svg
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/resources/images/libpalette/miniFavorite.svg b/resources/images/libpalette/miniFavorite.svg
new file mode 100644
index 00000000..5f9d28f9
--- /dev/null
+++ b/resources/images/libpalette/miniFavorite.svg
@@ -0,0 +1,212 @@
+
+
+
+
diff --git a/resources/images/libpalette/miniNewFolder.svg b/resources/images/libpalette/miniNewFolder.svg
new file mode 100644
index 00000000..4d992376
--- /dev/null
+++ b/resources/images/libpalette/miniNewFolder.svg
@@ -0,0 +1,232 @@
+
+
+
+
diff --git a/resources/images/libpalette/miniSearch.svg b/resources/images/libpalette/miniSearch.svg
new file mode 100644
index 00000000..8f23129a
--- /dev/null
+++ b/resources/images/libpalette/miniSearch.svg
@@ -0,0 +1,274 @@
+
+
+
+
diff --git a/resources/images/libpalette/miniTrash.svg b/resources/images/libpalette/miniTrash.svg
new file mode 100644
index 00000000..acf44450
--- /dev/null
+++ b/resources/images/libpalette/miniTrash.svg
@@ -0,0 +1,225 @@
+
+
+
+
diff --git a/resources/images/libpalette/notFound.svg b/resources/images/libpalette/notFound.svg
new file mode 100644
index 00000000..de14491f
--- /dev/null
+++ b/resources/images/libpalette/notFound.svg
@@ -0,0 +1,66 @@
+
+
+
+
diff --git a/resources/images/libpalette/social.svg b/resources/images/libpalette/social.svg
new file mode 100644
index 00000000..05776c6e
--- /dev/null
+++ b/resources/images/libpalette/social.svg
@@ -0,0 +1,144 @@
+
+
+
+
diff --git a/resources/images/libpalette/trash_favorite.svg b/resources/images/libpalette/trash_favorite.svg
index bfdead1c..5bffdd1d 100644
--- a/resources/images/libpalette/trash_favorite.svg
+++ b/resources/images/libpalette/trash_favorite.svg
@@ -1,96 +1,322 @@
-
+
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index 0ca973b2..256db233 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -330,7 +330,7 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) :
mLibSearchDirectoryPath =QUrl::fromLocalFile(UBSettings::settings()->userSearchDirectory());
trashDirectoryPath = QUrl::fromLocalFile(UBSettings::userTrashDirPath());
- rootElement = UBFeature(rootPath, QImage( ":images/libpalette/home.png" ), "root", QUrl());
+ rootElement = UBFeature(rootPath, QImage( ":images/libpalette/home.svg" ), "root", QUrl());
audiosElement = UBFeature( audiosPath, QImage(":images/libpalette/AudiosCategory.svg"), tr("Audios") , mUserAudioDirectoryPath, FEATURE_CATEGORY);
moviesElement = UBFeature( moviesPath, QImage(":images/libpalette/MoviesCategory.svg"), tr("Movies") , mUserVideoDirectoryPath, FEATURE_CATEGORY);
picturesElement = UBFeature( picturesPath, QImage(":images/libpalette/PicturesCategory.svg"), tr("Pictures") , mUserPicturesDirectoryPath, FEATURE_CATEGORY);
@@ -683,14 +683,14 @@ QImage UBFeaturesController::getIcon(const QString &path, UBFeatureElementType p
} else if (pFType == FEATURE_IMAGE) {
QImage pix(path);
if (pix.isNull()) {
- pix = QImage(":images/libpalette/notFound.png");
+ pix = QImage(":images/libpalette/notFound.svg");
} else {
pix = pix.scaledToWidth(qMin(UBSettings::maxThumbnailWidth, pix.width()));
}
return pix;
}
- return QImage(":images/libpalette/notFound.png");
+ return QImage(":images/libpalette/notFound.svg");
}
bool UBFeaturesController::isDeletable( const QUrl &url )
@@ -728,7 +728,7 @@ QImage UBFeaturesController::createThumbnail(const QString &path)
return pix;
} else {
- thumbnailPath = ":images/libpalette/notFound.png";
+ thumbnailPath = ":images/libpalette/notFound.svg";
}
}
diff --git a/src/domain/UBDragableThumbnail.h b/src/domain/UBDragableThumbnail.h
index fe25c2c5..720d7308 100644
--- a/src/domain/UBDragableThumbnail.h
+++ b/src/domain/UBDragableThumbnail.h
@@ -12,7 +12,7 @@
class UBDraggableThumbnail : public QFrame
{
public:
- UBDraggableThumbnail(QWidget* parent =0, const QPixmap& pixmap = QPixmap(":images/libpalette/notFound.png"));
+ UBDraggableThumbnail(QWidget* parent =0, const QPixmap& pixmap = QPixmap(":images/libpalette/notFound.svg"));
void setThumbnail(const QPixmap &pixmap);
void setPixmap(const QPixmap & pixmap);
diff --git a/src/gui/UBFeaturesActionBar.cpp b/src/gui/UBFeaturesActionBar.cpp
index 17cc2898..f1a7e88f 100644
--- a/src/gui/UBFeaturesActionBar.cpp
+++ b/src/gui/UBFeaturesActionBar.cpp
@@ -68,14 +68,14 @@ UBFeaturesActionBar::UBFeaturesActionBar( UBFeaturesController *controller, QWid
setMaximumHeight(ACTIONBAR_HEIGHT);
// Create the actions
- mpFavoriteAction = new QAction(QIcon(":/images/libpalette/miniFavorite.png"), tr("Add to favorites"), this);
- mpSocialAction = new QAction(QIcon(":/images/libpalette/social.png"), tr("Share"), this);
- mpSearchAction = new QAction(QIcon(":/images/libpalette/miniSearch.png"), tr("Search"), this);
+ mpFavoriteAction = new QAction(QIcon(":/images/libpalette/miniFavorite.svg"), tr("Add to favorites"), this);
+ mpSocialAction = new QAction(QIcon(":/images/libpalette/social.svg"), tr("Share"), this);
+ mpSearchAction = new QAction(QIcon(":/images/libpalette/miniSearch.svg"), tr("Search"), this);
mpRescanModelAction = new QAction(QIcon(":/images/cursors/rotate.svg"), tr("Rescan file system"), this);
- mpDeleteAction = new QAction(QIcon(":/images/libpalette/miniTrash.png"), tr("Delete"), this);
+ mpDeleteAction = new QAction(QIcon(":/images/libpalette/miniTrash.svg"), tr("Delete"), this);
mpCloseAction = new QAction(QIcon(":/images/close.svg"), tr("Back to folder"), this);
mpRemoveFavorite = new QAction(QIcon(":/images/libpalette/trash_favorite.svg"), tr("Remove from favorites"), this);
- mpNewFolderAction = new QAction(QIcon(":/images/libpalette/miniNewFolder.png"), tr("Create new folder"), this);
+ mpNewFolderAction = new QAction(QIcon(":/images/libpalette/miniNewFolder.svg"), tr("Create new folder"), this);
// Create the buttons
mpFavoriteBtn = new UBActionButton(this, mpFavoriteAction);
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index 81dfed6d..b3d84807 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -271,7 +271,7 @@ void UBFeaturesWidget::removeFromFavorite( const UBFeaturesMimeData * mimeData )
void UBFeaturesWidget::onDisplayMetadata( QMap metadata )
{
- QString previewImageUrl = ":images/libpalette/notFound.png";
+ QString previewImageUrl = ":images/libpalette/notFound.svg";
QString widgetsUrl = QUrl::fromEncoded(metadata["Url"].toLatin1()).toString()/*metadata.value("Url", QString())*/;
QString widgetsThumbsUrl = QUrl::fromEncoded(metadata["thumbnailUrl"].toLatin1()).toString();
@@ -299,7 +299,7 @@ void UBFeaturesWidget::onDisplayMetadata( QMap metadata )
}
if (!widgetsThumbsUrl.isNull()) {
- previewImageUrl = ":/images/libpalette/loading.png";
+ previewImageUrl = ":/images/libpalette/loading.svg";
if (!imageGatherer)
imageGatherer = new UBDownloadHttpFile(0, this);
@@ -882,7 +882,7 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
maxThumbHeight = height() / 4;
mpThumbnail = new QLabel();
- QPixmap icon(":images/libpalette/notFound.png");
+ QPixmap icon(":images/libpalette/notFound.svg");
icon.scaledToWidth(THUMBNAIL_WIDTH);
mpThumbnail->setPixmap(icon);