kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduced the new icon for title block templates, got rid of the "green directory" icon used for projects.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1701 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-04-28 21:33:36 +00:00
parent a507e863e7
commit e6180e8971
8 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ico/16x16/label.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 476 B

BIN
ico/16x16/project.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 392 B

BIN
ico/22x22/label.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 597 B

BIN
ico/titleblock.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 168 B

3
qelectrotech.qrc
View File

@@ -59,6 +59,7 @@
<file>ico/16x16/item_cancel.png</file> <file>ico/16x16/item_cancel.png</file>
<file>ico/16x16/item_copy.png</file> <file>ico/16x16/item_copy.png</file>
<file>ico/16x16/item_move.png</file> <file>ico/16x16/item_move.png</file>
<file>ico/16x16/label.png</file>
<file>ico/16x16/masquer.png</file> <file>ico/16x16/masquer.png</file>
<file>ico/16x16/neutral.png</file> <file>ico/16x16/neutral.png</file>
<file>ico/16x16/north.png</file> <file>ico/16x16/north.png</file>
@@ -140,6 +141,7 @@
<file>ico/22x22/go-home.png</file> <file>ico/22x22/go-home.png</file>
<file>ico/22x22/go-up.png</file> <file>ico/22x22/go-up.png</file>
<file>ico/22x22/hotspot.png</file> <file>ico/22x22/hotspot.png</file>
<file>ico/22x22/label.png</file>
<file>ico/22x22/landscape.png</file> <file>ico/22x22/landscape.png</file>
<file>ico/22x22/line.png</file> <file>ico/22x22/line.png</file>
<file>ico/22x22/lower.png</file> <file>ico/22x22/lower.png</file>
@@ -196,7 +198,6 @@
<file>ico/oxygen-icons/48x48/apps/qelectrotech.png</file> <file>ico/oxygen-icons/48x48/apps/qelectrotech.png</file>
<file>ico/oxygen-icons/64x64/apps/qelectrotech.png</file> <file>ico/oxygen-icons/64x64/apps/qelectrotech.png</file>
<file>ico/splash.png</file> <file>ico/splash.png</file>
<file>ico/titleblock.png</file>
<file>titleblocks/default.titleblock</file> <file>titleblocks/default.titleblock</file>
<file>LICENSE</file> <file>LICENSE</file>
</qresource> </qresource>

4
sources/genericpanel.cpp
View File

@@ -1052,11 +1052,11 @@ QIcon GenericPanel::defaultIcon(QET::ItemType type) {
if (type & QET::ElementsContainer) { if (type & QET::ElementsContainer) {
return(QET::Icons::Folder); return(QET::Icons::Folder);
} else if (type & QET::TitleBlockTemplatesCollectionItem) { } else if (type & QET::TitleBlockTemplatesCollectionItem) {
return(QET::Icons::TitleBlock); return(QIcon(QET::Icons::TitleBlock.pixmap(QSize(16, 16))));
} else if (type == QET::Diagram) { } else if (type == QET::Diagram) {
return(QET::Icons::Diagram); return(QET::Icons::Diagram);
} else if (type == QET::Project) { } else if (type == QET::Project) {
return(QET::Icons::Project); return(QIcon(QET::Icons::ProjectFile.pixmap(QSize(16, 16))));
} }
return(QIcon()); return(QIcon());
} }

2
sources/projectview.cpp
View File

@@ -43,7 +43,7 @@ ProjectView::ProjectView(QETProject *project, QWidget *parent) :
project_(0) project_(0)
{ {
setObjectName("ProjectView"); setObjectName("ProjectView");
setWindowIcon(QET::Icons::Project); setWindowIcon(QET::Icons::ProjectFile);
// construit le widget "fallback" // construit le widget "fallback"
fallback_widget_ = new QWidget(); fallback_widget_ = new QWidget();

4
sources/qeticons.cpp
View File

@@ -325,7 +325,6 @@ void QET::Icons::initIcons() {
PrintLandscape .addFile(":/ico/22x22/landscape.png"); PrintLandscape .addFile(":/ico/22x22/landscape.png");
PrintPortrait .addFile(":/ico/22x22/portrait.png"); PrintPortrait .addFile(":/ico/22x22/portrait.png");
PrintTwoPages .addFile(":/ico/22x22/two_pages.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/16x16/mimetypes/application-x-qet-project.png");
ProjectFile .addFile(":/ico/oxygen-icons/22x22/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"); 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"); South .addFile(":/ico/16x16/south.png");
Start .addFile(":/ico/22x22/start.png"); Start .addFile(":/ico/22x22/start.png");
Terminal .addFile(":/ico/22x22/terminal.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/16x16/preferences-desktop-user.png");
UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png"); UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png");
ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png"); ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png");