diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc
index 6f3624f7..3524fe7d 100644
--- a/resources/OpenBoard.qrc
+++ b/resources/OpenBoard.qrc
@@ -515,5 +515,36 @@
images/trash-delete-folder.png
images/trash-document.png
images/trash-document-page.png
+ images/navig_arrow.svg
+ images/asc.svg
+ images/pages_close.svg
+ images/pages_open.svg
+ images/tab_mask.svg
+ images/bigOpenBoard.svg
+ images/folder.svg
+ images/cache_circle.svg
+ images/cache_close.svg
+ images/trash-delete-document.svg
+ images/cache_open.svg
+ images/trash-delete-folder.svg
+ images/cache_square.svg
+ images/trash-document-page.svg
+ images/trash-document.svg
+ images/trash-empty.svg
+ images/trash-folder.svg
+ images/left_arrow.svg
+ images/trash-my-documents.svg
+ images/trash.svg
+ images/library_close.svg
+ images/library_open.svg
+ images/currentDocument.svg
+ images/up_arrow.svg
+ images/defaultWidgetIcon.svg
+ images/desc.svg
+ images/down_arrow.svg
+ images/right_arrow.svg
+ images/OpenBoard.svg
+ images/download_close.svg
+ images/download_open.svg
diff --git a/resources/forms/blackoutWidget.ui b/resources/forms/blackoutWidget.ui
index 372d5c90..75cc129b 100644
--- a/resources/forms/blackoutWidget.ui
+++ b/resources/forms/blackoutWidget.ui
@@ -82,7 +82,7 @@
- background: url(:/images/bigOpenBoard.png); border: none;
+ background: url(:/images/bigOpenBoard.svg); border: none;
@@ -188,8 +188,6 @@
-
-
-
+
diff --git a/resources/forms/documents.ui b/resources/forms/documents.ui
index efec7a6a..29ee51ab 100644
--- a/resources/forms/documents.ui
+++ b/resources/forms/documents.ui
@@ -140,8 +140,8 @@
- :/images/asc.png
- :/images/desc.png:/images/asc.png
+ :/images/asc.svg
+ :/images/desc.svg:/images/asc.svg
true
diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui
index a2380054..f4fdd0af 100644
--- a/resources/forms/mainWindow.ui
+++ b/resources/forms/mainWindow.ui
@@ -15,7 +15,7 @@
- :/images/OpenBoard.png:/images/OpenBoard.png
+ :/images/OpenBoard.svg:/images/OpenBoard.svg
diff --git a/resources/images/OpenBoard.svg b/resources/images/OpenBoard.svg
new file mode 100644
index 00000000..e222c278
--- /dev/null
+++ b/resources/images/OpenBoard.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/resources/images/asc.svg b/resources/images/asc.svg
new file mode 100644
index 00000000..12bd5703
--- /dev/null
+++ b/resources/images/asc.svg
@@ -0,0 +1,143 @@
+
+
+
+
diff --git a/resources/images/bigOpenBoard.svg b/resources/images/bigOpenBoard.svg
new file mode 100644
index 00000000..3b83d1b2
--- /dev/null
+++ b/resources/images/bigOpenBoard.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/resources/images/cache_circle.svg b/resources/images/cache_circle.svg
new file mode 100644
index 00000000..739864fa
--- /dev/null
+++ b/resources/images/cache_circle.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/resources/images/cache_close.svg b/resources/images/cache_close.svg
new file mode 100644
index 00000000..eea2af4d
--- /dev/null
+++ b/resources/images/cache_close.svg
@@ -0,0 +1,93 @@
+
+
+
+
diff --git a/resources/images/cache_open.svg b/resources/images/cache_open.svg
new file mode 100644
index 00000000..01334a35
--- /dev/null
+++ b/resources/images/cache_open.svg
@@ -0,0 +1,93 @@
+
+
+
+
diff --git a/resources/images/cache_square.svg b/resources/images/cache_square.svg
new file mode 100644
index 00000000..8c296001
--- /dev/null
+++ b/resources/images/cache_square.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/resources/images/currentDocument.svg b/resources/images/currentDocument.svg
new file mode 100644
index 00000000..cd5b715d
--- /dev/null
+++ b/resources/images/currentDocument.svg
@@ -0,0 +1,93 @@
+
+
+
+
diff --git a/resources/images/defaultWidgetIcon.svg b/resources/images/defaultWidgetIcon.svg
new file mode 100644
index 00000000..3e272f01
--- /dev/null
+++ b/resources/images/defaultWidgetIcon.svg
@@ -0,0 +1,133 @@
+
+
+
+
diff --git a/resources/images/desc.svg b/resources/images/desc.svg
new file mode 100644
index 00000000..3adaaedf
--- /dev/null
+++ b/resources/images/desc.svg
@@ -0,0 +1,143 @@
+
+
+
+
diff --git a/resources/images/down_arrow.svg b/resources/images/down_arrow.svg
new file mode 100644
index 00000000..8f45a3af
--- /dev/null
+++ b/resources/images/down_arrow.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/resources/images/download_close.svg b/resources/images/download_close.svg
new file mode 100644
index 00000000..65827edf
--- /dev/null
+++ b/resources/images/download_close.svg
@@ -0,0 +1,90 @@
+
+
+
+
diff --git a/resources/images/download_open.svg b/resources/images/download_open.svg
new file mode 100644
index 00000000..379d5289
--- /dev/null
+++ b/resources/images/download_open.svg
@@ -0,0 +1,89 @@
+
+
+
+
diff --git a/resources/images/folder.svg b/resources/images/folder.svg
new file mode 100644
index 00000000..cbfa3721
--- /dev/null
+++ b/resources/images/folder.svg
@@ -0,0 +1,226 @@
+
+
+
+
diff --git a/resources/images/left_arrow.svg b/resources/images/left_arrow.svg
new file mode 100644
index 00000000..818e00c7
--- /dev/null
+++ b/resources/images/left_arrow.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/resources/images/library_close.svg b/resources/images/library_close.svg
new file mode 100644
index 00000000..9c982d33
--- /dev/null
+++ b/resources/images/library_close.svg
@@ -0,0 +1,90 @@
+
+
+
+
diff --git a/resources/images/library_open.svg b/resources/images/library_open.svg
new file mode 100644
index 00000000..118c4476
--- /dev/null
+++ b/resources/images/library_open.svg
@@ -0,0 +1,89 @@
+
+
+
+
diff --git a/resources/images/myFolder.svg b/resources/images/myFolder.svg
new file mode 100644
index 00000000..cbfa3721
--- /dev/null
+++ b/resources/images/myFolder.svg
@@ -0,0 +1,226 @@
+
+
+
+
diff --git a/resources/images/navig_arrow.svg b/resources/images/navig_arrow.svg
new file mode 100644
index 00000000..f3a3383a
--- /dev/null
+++ b/resources/images/navig_arrow.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/resources/images/pages_close.svg b/resources/images/pages_close.svg
new file mode 100644
index 00000000..8cf4b748
--- /dev/null
+++ b/resources/images/pages_close.svg
@@ -0,0 +1,101 @@
+
+
+
+
diff --git a/resources/images/pages_open.svg b/resources/images/pages_open.svg
new file mode 100644
index 00000000..076f9521
--- /dev/null
+++ b/resources/images/pages_open.svg
@@ -0,0 +1,97 @@
+
+
+
+
diff --git a/resources/images/right_arrow.svg b/resources/images/right_arrow.svg
new file mode 100644
index 00000000..f66ea2ef
--- /dev/null
+++ b/resources/images/right_arrow.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/resources/images/tab_mask.svg b/resources/images/tab_mask.svg
new file mode 100644
index 00000000..b9a37f2c
--- /dev/null
+++ b/resources/images/tab_mask.svg
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/resources/images/trash-delete-document.svg b/resources/images/trash-delete-document.svg
new file mode 100644
index 00000000..88753419
--- /dev/null
+++ b/resources/images/trash-delete-document.svg
@@ -0,0 +1,502 @@
+
+
+
+
diff --git a/resources/images/trash-delete-folder.svg b/resources/images/trash-delete-folder.svg
new file mode 100644
index 00000000..c8c8cf31
--- /dev/null
+++ b/resources/images/trash-delete-folder.svg
@@ -0,0 +1,475 @@
+
+
+
+
diff --git a/resources/images/trash-document-page.svg b/resources/images/trash-document-page.svg
new file mode 100644
index 00000000..54a44a68
--- /dev/null
+++ b/resources/images/trash-document-page.svg
@@ -0,0 +1,405 @@
+
+
+
+
diff --git a/resources/images/trash-document.svg b/resources/images/trash-document.svg
new file mode 100644
index 00000000..e61b29be
--- /dev/null
+++ b/resources/images/trash-document.svg
@@ -0,0 +1,504 @@
+
+
+
+
diff --git a/resources/images/trash-empty.svg b/resources/images/trash-empty.svg
new file mode 100644
index 00000000..9b20f012
--- /dev/null
+++ b/resources/images/trash-empty.svg
@@ -0,0 +1,271 @@
+
+
+
+
diff --git a/resources/images/trash-folder.svg b/resources/images/trash-folder.svg
new file mode 100644
index 00000000..d7536637
--- /dev/null
+++ b/resources/images/trash-folder.svg
@@ -0,0 +1,479 @@
+
+
+
+
diff --git a/resources/images/trash-my-documents.svg b/resources/images/trash-my-documents.svg
new file mode 100644
index 00000000..d15a8e3b
--- /dev/null
+++ b/resources/images/trash-my-documents.svg
@@ -0,0 +1,719 @@
+
+
+
+
diff --git a/resources/images/trash.svg b/resources/images/trash.svg
new file mode 100644
index 00000000..17554256
--- /dev/null
+++ b/resources/images/trash.svg
@@ -0,0 +1,251 @@
+
+
+
+
diff --git a/resources/images/up_arrow.svg b/resources/images/up_arrow.svg
new file mode 100644
index 00000000..587d85f7
--- /dev/null
+++ b/resources/images/up_arrow.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/resources/style.qss b/resources/style.qss
index a877c11b..3987d479 100644
--- a/resources/style.qss
+++ b/resources/style.qss
@@ -97,7 +97,7 @@ QComboBox#DockPaletteWidgetComboBox:drop-down
QComboBox#DockPaletteWidgetComboBox::down-arrow
{
- image:url(:/images/down_arrow.png);
+ image:url(:/images/down_arrow.svg);
background:#BBBBBB;
border: 2px solid #999999;
height:16px;
@@ -145,7 +145,7 @@ QScrollBar::handle:vertical
QScrollBar::add-line:vertical
{
- image:url(:/images/down_arrow.png);
+ image:url(:/images/down_arrow.svg);
height:16px;
background:#BBBBBB;
border:2px solid #999999;
@@ -157,7 +157,7 @@ QScrollBar::add-line:vertical
QScrollBar::sub-line:vertical
{
- image:url(:/images/up_arrow.png);
+ image:url(:/images/up_arrow.svg);
height:16px;
background:#BBBBBB;
border:2px solid #999999;
@@ -188,7 +188,7 @@ QScrollBar::handle:horizontal
QScrollBar::add-line:horizontal
{
- image:url(:/images/right_arrow.png);
+ image:url(:/images/right_arrow.svg);
width:16px;
background:#BBBBBB;
border:2px solid #999999;
@@ -200,7 +200,7 @@ QScrollBar::add-line:horizontal
QScrollBar::sub-line:horizontal
{
- image:url(:/images/left_arrow.png);
+ image:url(:/images/left_arrow.svg);
width:16px;
background:#BBBBBB;
border:2px solid #999999;
diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index a2c1c7cb..089448bd 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -132,7 +132,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : Single
updateProtoActionsState();
#ifndef Q_OS_OSX
- setWindowIcon(QIcon(":/images/OpenBoard.png"));
+ setWindowIcon(QIcon(":/images/OpenBoard.svg"));
#endif
setStyle("fusion");
diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
index 1645bf0b..c049c95f 100644
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
@@ -499,17 +499,17 @@ QVariant UBDocumentTreeModel::data(const QModelIndex &index, int role) const
switch (role) {
case (Qt::DecorationRole) :
if (mCurrentNode && mCurrentNode == dataNode) {
- return QIcon(":images/currentDocument.png");
+ return QIcon(":images/currentDocument.svg");
} else {
if (index == trashIndex()) {
- return QIcon(":images/trash.png");
+ return QIcon(":images/trash.svg");
} else if (isConstant(index)) {
return QIcon(":images/libpalette/ApplicationsCategory.svg");
}
switch (static_cast(dataNode->nodeType()))
{
case UBDocumentTreeNode::Catalog :
- return QIcon(":images/folder.png");
+ return QIcon(":images/folder.svg");
case UBDocumentTreeNode::Document :
return QIcon(":images/toolbar/board.png");
}
@@ -3521,72 +3521,72 @@ void UBDocumentController::updateActions()
case MoveToTrash :
if (mSelectionType == Folder)
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-folder.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-folder.svg"));
mMainWindow->actionDelete->setText(tr("Delete"));
}
else if (mSelectionType == Document)
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document.svg"));
mMainWindow->actionDelete->setText(tr("Trash"));
}
else if (mSelectionType == Page)
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.svg"));
mMainWindow->actionDelete->setText(tr("Trash"));
}
else
{//can happen ?
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash.svg"));
mMainWindow->actionDelete->setText(tr("Trash"));
}
break;
case DeletePage :
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.svg"));
mMainWindow->actionDelete->setText(tr("Trash"));
break;
case CompleteDelete :
if (mSelectionType == Folder)
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-folder.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-folder.svg"));
mMainWindow->actionDelete->setText(tr("Delete"));
}
else
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-document.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-document.svg"));
mMainWindow->actionDelete->setText(tr("Delete"));
}
break;
case EmptyFolder :
if (firstSelectedTreeIndex() == docModel->myDocumentsIndex())
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-my-documents.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-my-documents.svg"));
mMainWindow->actionDelete->setText(tr("Empty"));
}
else
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-folder.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-folder.svg"));
mMainWindow->actionDelete->setText(tr("Delete"));
}
break;
case EmptyTrash :
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-empty.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-empty.svg"));
mMainWindow->actionDelete->setText(tr("Empty"));
break;
case NoDeletion :
default:
if (mSelectionType == Folder)
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-folder.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-folder.svg"));
mMainWindow->actionDelete->setText(tr("Delete"));
}
else if (mSelectionType == Document)
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-document.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-delete-document.svg"));
mMainWindow->actionDelete->setText(tr("Delete"));
}
else if (mSelectionType == Page)
{
- mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.png"));
+ mMainWindow->actionDelete->setIcon(QIcon(":/images/trash-document-page.svg"));
mMainWindow->actionDelete->setText(tr("Delete"));
}
break;
diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp
index 90f4865b..e610eeab 100644
--- a/src/domain/UBGraphicsWidgetItem.cpp
+++ b/src/domain/UBGraphicsWidgetItem.cpp
@@ -471,7 +471,7 @@ QString UBGraphicsWidgetItem::iconFilePath(const QUrl& pUrl)
/* default */
if (file.length() == 0)
{
- file = QString(":/images/defaultWidgetIcon.png");
+ file = QString(":/images/defaultWidgetIcon.svg");
}
return file;
}
diff --git a/src/gui/UBCachePropertiesWidget.cpp b/src/gui/UBCachePropertiesWidget.cpp
index da06b931..4032ffc6 100644
--- a/src/gui/UBCachePropertiesWidget.cpp
+++ b/src/gui/UBCachePropertiesWidget.cpp
@@ -69,8 +69,8 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
mName = "CachePropWidget";
mVisibleState = false;
- mIconToLeft = QPixmap(":images/cache_open.png");
- mIconToRight = QPixmap(":images/cache_close.png");
+ mIconToLeft = QPixmap(":images/cache_open.svg");
+ mIconToRight = QPixmap(":images/cache_close.svg");
setContentsMargins(10, 10, 10, 10);
// Build the UI
@@ -105,11 +105,11 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
mpShapeLayout = new QHBoxLayout();
mpShapeLabel = new QLabel(tr("Shape:"), mpProperties);
mpSquareButton = new QPushButton(mpProperties);
- mpSquareButton->setIcon(QIcon(":images/cache_square.png"));
+ mpSquareButton->setIcon(QIcon(":images/cache_square.svg"));
mpSquareButton->setObjectName("DockPaletteWidgetButton");
mpSquareButton->setCheckable(true);
mpCircleButton = new QPushButton(mpProperties);
- mpCircleButton->setIcon(QIcon(":images/cache_circle.png"));
+ mpCircleButton->setIcon(QIcon(":images/cache_circle.svg"));
mpCircleButton->setObjectName("DockPaletteWidgetButton");
mpCircleButton->setCheckable(true);
mpShapeLayout->addWidget(mpShapeLabel, 0);
diff --git a/src/gui/UBDockDownloadWidget.cpp b/src/gui/UBDockDownloadWidget.cpp
index 60c03f74..264a7d5b 100644
--- a/src/gui/UBDockDownloadWidget.cpp
+++ b/src/gui/UBDockDownloadWidget.cpp
@@ -43,8 +43,8 @@ UBDockDownloadWidget::UBDockDownloadWidget(QWidget *parent, const char *name):UB
SET_STYLE_SHEET();
- mIconToLeft = QPixmap(":images/download_open.png");
- mIconToRight = QPixmap(":images/download_close.png");
+ mIconToLeft = QPixmap(":images/download_open.svg");
+ mIconToRight = QPixmap(":images/download_close.svg");
mpLayout = new QVBoxLayout(this);
setLayout(mpLayout);
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index b3d84807..069e4b18 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -58,8 +58,8 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
SET_STYLE_SHEET();
- mIconToLeft = QPixmap(":images/library_open.png");
- mIconToRight = QPixmap(":images/library_close.png");
+ mIconToLeft = QPixmap(":images/library_open.svg");
+ mIconToRight = QPixmap(":images/library_close.svg");
setAcceptDrops(true);
//Main UBFeature functionality
@@ -1466,7 +1466,7 @@ QString UBFeaturesItemDelegate::displayText ( const QVariant & value, const Q
UBFeaturesPathItemDelegate::UBFeaturesPathItemDelegate(QObject *parent) : QStyledItemDelegate(parent)
{
- arrowPixmap = new QPixmap(":images/navig_arrow.png");
+ arrowPixmap = new QPixmap(":images/navig_arrow.svg");
}
QString UBFeaturesPathItemDelegate::displayText ( const QVariant & value, const QLocale & locale ) const
diff --git a/src/gui/UBPageNavigationWidget.cpp b/src/gui/UBPageNavigationWidget.cpp
index 32bd233b..df156166 100644
--- a/src/gui/UBPageNavigationWidget.cpp
+++ b/src/gui/UBPageNavigationWidget.cpp
@@ -53,8 +53,8 @@ UBPageNavigationWidget::UBPageNavigationWidget(QWidget *parent, const char *name
SET_STYLE_SHEET();
- mIconToRight = QPixmap(":images/pages_open.png");
- mIconToLeft = QPixmap(":images/pages_close.png");
+ mIconToRight = QPixmap(":images/pages_open.svg");
+ mIconToLeft = QPixmap(":images/pages_close.svg");
// Build the gui
mLayout = new QVBoxLayout(this);