diff --git a/ico/16x16/label.png b/ico/16x16/label.png new file mode 100644 index 000000000..9d2d3576e Binary files /dev/null and b/ico/16x16/label.png differ diff --git a/ico/16x16/project.png b/ico/16x16/project.png deleted file mode 100644 index 615db7d85..000000000 Binary files a/ico/16x16/project.png and /dev/null differ diff --git a/ico/22x22/label.png b/ico/22x22/label.png new file mode 100644 index 000000000..75424759d Binary files /dev/null and b/ico/22x22/label.png differ diff --git a/ico/titleblock.png b/ico/titleblock.png deleted file mode 100644 index c0585d411..000000000 Binary files a/ico/titleblock.png and /dev/null differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 961f994e6..1c09e8280 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -59,6 +59,7 @@ ico/16x16/item_cancel.png ico/16x16/item_copy.png ico/16x16/item_move.png + ico/16x16/label.png ico/16x16/masquer.png ico/16x16/neutral.png ico/16x16/north.png @@ -140,6 +141,7 @@ ico/22x22/go-home.png ico/22x22/go-up.png ico/22x22/hotspot.png + ico/22x22/label.png ico/22x22/landscape.png ico/22x22/line.png ico/22x22/lower.png @@ -196,7 +198,6 @@ ico/oxygen-icons/48x48/apps/qelectrotech.png ico/oxygen-icons/64x64/apps/qelectrotech.png ico/splash.png - ico/titleblock.png titleblocks/default.titleblock LICENSE diff --git a/sources/genericpanel.cpp b/sources/genericpanel.cpp index 22377a372..3f5306f90 100644 --- a/sources/genericpanel.cpp +++ b/sources/genericpanel.cpp @@ -1052,11 +1052,11 @@ QIcon GenericPanel::defaultIcon(QET::ItemType type) { if (type & QET::ElementsContainer) { return(QET::Icons::Folder); } else if (type & QET::TitleBlockTemplatesCollectionItem) { - return(QET::Icons::TitleBlock); + return(QIcon(QET::Icons::TitleBlock.pixmap(QSize(16, 16)))); } else if (type == QET::Diagram) { return(QET::Icons::Diagram); } else if (type == QET::Project) { - return(QET::Icons::Project); + return(QIcon(QET::Icons::ProjectFile.pixmap(QSize(16, 16)))); } return(QIcon()); } diff --git a/sources/projectview.cpp b/sources/projectview.cpp index 53ce89d82..9129d6265 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -43,7 +43,7 @@ ProjectView::ProjectView(QETProject *project, QWidget *parent) : project_(0) { setObjectName("ProjectView"); - setWindowIcon(QET::Icons::Project); + setWindowIcon(QET::Icons::ProjectFile); // construit le widget "fallback" fallback_widget_ = new QWidget(); diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 41c521325..9079f8f87 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -325,7 +325,6 @@ void QET::Icons::initIcons() { PrintLandscape .addFile(":/ico/22x22/landscape.png"); PrintPortrait .addFile(":/ico/22x22/portrait.png"); PrintTwoPages .addFile(":/ico/22x22/two_pages.png"); - Project .addFile(":/ico/16x16/project.png"); ProjectFile .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/oxygen-icons/22x22/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/oxygen-icons/32x32/mimetypes/application-x-qet-project.png"); @@ -350,7 +349,8 @@ void QET::Icons::initIcons() { South .addFile(":/ico/16x16/south.png"); Start .addFile(":/ico/22x22/start.png"); Terminal .addFile(":/ico/22x22/terminal.png"); - TitleBlock .addFile(":/ico/titleblock.png"); + TitleBlock .addFile(":/ico/16x16/label.png"); + TitleBlock .addFile(":/ico/22x22/label.png"); UserInformations .addFile(":/ico/16x16/preferences-desktop-user.png"); UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png"); ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png");