diff --git a/Valentina.pro b/Valentina.pro index aec82f41f..5f13ed161 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -43,7 +43,8 @@ include(src/xml/xml.pri) RESOURCES += \ share/resources/icon.qrc \ - share/resources/cursor.qrc + share/resources/cursor.qrc \ + share/resources/theme.qrc OTHER_FILES += share/resources/valentina.rc \ share/resources/icon/64x64/icon64x64.ico diff --git a/share/resources/icons/win.icon.theme/16x16/actions/document-new.png b/share/resources/icons/win.icon.theme/16x16/actions/document-new.png new file mode 100644 index 000000000..2cab19daf Binary files /dev/null and b/share/resources/icons/win.icon.theme/16x16/actions/document-new.png differ diff --git a/share/resources/icons/win.icon.theme/16x16/actions/document-open.png b/share/resources/icons/win.icon.theme/16x16/actions/document-open.png new file mode 100644 index 000000000..4eb86be58 Binary files /dev/null and b/share/resources/icons/win.icon.theme/16x16/actions/document-open.png differ diff --git a/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png b/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png new file mode 100644 index 000000000..3c4f56d07 Binary files /dev/null and b/share/resources/icons/win.icon.theme/16x16/actions/document-save-as.png differ diff --git a/share/resources/icons/win.icon.theme/16x16/actions/document-save.png b/share/resources/icons/win.icon.theme/16x16/actions/document-save.png new file mode 100644 index 000000000..3c4f56d07 Binary files /dev/null and b/share/resources/icons/win.icon.theme/16x16/actions/document-save.png differ diff --git a/share/resources/icons/win.icon.theme/24x24/actions/document-new.png b/share/resources/icons/win.icon.theme/24x24/actions/document-new.png new file mode 100755 index 000000000..e0388997b Binary files /dev/null and b/share/resources/icons/win.icon.theme/24x24/actions/document-new.png differ diff --git a/share/resources/icons/win.icon.theme/24x24/actions/document-open.png b/share/resources/icons/win.icon.theme/24x24/actions/document-open.png new file mode 100755 index 000000000..57fe97be8 Binary files /dev/null and b/share/resources/icons/win.icon.theme/24x24/actions/document-open.png differ diff --git a/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png b/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png new file mode 100755 index 000000000..9cd361f3f Binary files /dev/null and b/share/resources/icons/win.icon.theme/24x24/actions/document-save-as.png differ diff --git a/share/resources/icons/win.icon.theme/24x24/actions/document-save.png b/share/resources/icons/win.icon.theme/24x24/actions/document-save.png new file mode 100755 index 000000000..ba66561a0 Binary files /dev/null and b/share/resources/icons/win.icon.theme/24x24/actions/document-save.png differ diff --git a/share/resources/icons/win.icon.theme/32x32/actions/document-new.png b/share/resources/icons/win.icon.theme/32x32/actions/document-new.png new file mode 100755 index 000000000..18a64739c Binary files /dev/null and b/share/resources/icons/win.icon.theme/32x32/actions/document-new.png differ diff --git a/share/resources/icons/win.icon.theme/32x32/actions/document-open.png b/share/resources/icons/win.icon.theme/32x32/actions/document-open.png new file mode 100644 index 000000000..f5e6806e3 Binary files /dev/null and b/share/resources/icons/win.icon.theme/32x32/actions/document-open.png differ diff --git a/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png b/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png new file mode 100755 index 000000000..ad62d0c5f Binary files /dev/null and b/share/resources/icons/win.icon.theme/32x32/actions/document-save-as.png differ diff --git a/share/resources/icons/win.icon.theme/32x32/actions/document-save.png b/share/resources/icons/win.icon.theme/32x32/actions/document-save.png new file mode 100644 index 000000000..3e6f2ad17 Binary files /dev/null and b/share/resources/icons/win.icon.theme/32x32/actions/document-save.png differ diff --git a/share/resources/icons/win.icon.theme/index.theme b/share/resources/icons/win.icon.theme/index.theme new file mode 100755 index 000000000..6f99bdbdb --- /dev/null +++ b/share/resources/icons/win.icon.theme/index.theme @@ -0,0 +1,29 @@ +[Icon Theme] +Name=win.icon.theme +Comment=win.icon.theme for valentina +Inherits=gnome,hicolor +Example=x-directory-normal + +#Directories +Directories=16x16/actions,24x24/actions,32x32/actions,scalable/actions + +[16x16/actions] +Size=16 +Context=Actions +Type=Fixed + +[24x24/actions] +Size=24 +Context=Actions +Type=Fixed + +[32x32/actions] +Size=32 +Context=Actions +Type=Fixed + +[scalable/actions] +Size=128 +Context=Actions +Type=scalable + diff --git a/share/resources/icons/win.icon.theme/scalable/actions/document-new.png b/share/resources/icons/win.icon.theme/scalable/actions/document-new.png new file mode 100755 index 000000000..d3dc4f8e0 Binary files /dev/null and b/share/resources/icons/win.icon.theme/scalable/actions/document-new.png differ diff --git a/share/resources/icons/win.icon.theme/scalable/actions/document-open.png b/share/resources/icons/win.icon.theme/scalable/actions/document-open.png new file mode 100644 index 000000000..02b4d25f6 Binary files /dev/null and b/share/resources/icons/win.icon.theme/scalable/actions/document-open.png differ diff --git a/share/resources/icons/win.icon.theme/scalable/actions/document-save-as.png b/share/resources/icons/win.icon.theme/scalable/actions/document-save-as.png new file mode 100755 index 000000000..02dbc228e Binary files /dev/null and b/share/resources/icons/win.icon.theme/scalable/actions/document-save-as.png differ diff --git a/share/resources/icons/win.icon.theme/scalable/actions/document-save.png b/share/resources/icons/win.icon.theme/scalable/actions/document-save.png new file mode 100755 index 000000000..02dbc228e Binary files /dev/null and b/share/resources/icons/win.icon.theme/scalable/actions/document-save.png differ diff --git a/share/resources/theme.qrc b/share/resources/theme.qrc new file mode 100644 index 000000000..8509a4355 --- /dev/null +++ b/share/resources/theme.qrc @@ -0,0 +1,21 @@ + + + icons/win.icon.theme/index.theme + icons/win.icon.theme/16x16/actions/document-new.png + icons/win.icon.theme/16x16/actions/document-open.png + icons/win.icon.theme/16x16/actions/document-save.png + icons/win.icon.theme/16x16/actions/document-save-as.png + icons/win.icon.theme/24x24/actions/document-new.png + icons/win.icon.theme/24x24/actions/document-open.png + icons/win.icon.theme/24x24/actions/document-save.png + icons/win.icon.theme/24x24/actions/document-save-as.png + icons/win.icon.theme/32x32/actions/document-new.png + icons/win.icon.theme/32x32/actions/document-open.png + icons/win.icon.theme/32x32/actions/document-save.png + icons/win.icon.theme/32x32/actions/document-save-as.png + icons/win.icon.theme/scalable/actions/document-new.png + icons/win.icon.theme/scalable/actions/document-open.png + icons/win.icon.theme/scalable/actions/document-save.png + icons/win.icon.theme/scalable/actions/document-save-as.png + + diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8951c7890..51c9a6385 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -63,6 +63,19 @@ MainWindow::MainWindow(QWidget *parent) mode(Draw::Calculation), currentDrawIndex(0) { ui->setupUi(this); + static const char * GENERIC_ICON_TO_CHECK = "document-open"; + static const char * FALLBACK_ICON_THEME = "win.icon.theme"; + if (!QIcon::hasThemeIcon(GENERIC_ICON_TO_CHECK)) { + //If there is no default working icon theme then we should + //use an icon theme that we provide via a .qrc file + //This case happens under Windows and Mac OS X + //This does not happen under GNOME or KDE + QIcon::setThemeName(FALLBACK_ICON_THEME); + ui->actionNew->setIcon(QIcon::fromTheme("document-new")); + ui->actionOpen->setIcon(QIcon::fromTheme("document-open")); + ui->actionSave->setIcon(QIcon::fromTheme("document-save")); + ui->actionSaveAs->setIcon(QIcon::fromTheme("document-save-as")); + } ToolBarOption(); ToolBarDraws(); QRectF sceneRect = QRectF(0, 0, PaperSize, PaperSize);