[qet] [1701] Introduced the new icon for title block templates, got rid of the " green directory" icon used for projects. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 1701
Author: xavier
Date: 2012-04-28 23:33:36 +0200 (Sat, 28 Apr 2012)
Log Message:
-----------
Introduced the new icon for title block templates, got rid of the "green directory" icon used for projects.
Modified Paths:
--------------
branches/0.3/qelectrotech.qrc
branches/0.3/sources/genericpanel.cpp
branches/0.3/sources/projectview.cpp
branches/0.3/sources/qeticons.cpp
Added Paths:
-----------
branches/0.3/ico/16x16/label.png
branches/0.3/ico/22x22/label.png
Removed Paths:
-------------
branches/0.3/ico/16x16/project.png
branches/0.3/ico/titleblock.png
Added: branches/0.3/ico/16x16/label.png
===================================================================
--- branches/0.3/ico/16x16/label.png (rev 0)
+++ branches/0.3/ico/16x16/label.png 2012-04-28 21:33:36 UTC (rev 1701)
@@ -0,0 +1,10 @@
+\x89PNG
+
+
+IHDR\xF3\xFFabKGD\xFF\xFF\xFF\xA0\xBD\xA7\x93 pHYs
+\xD7
+\xD7B(\x9BxtIME\xDC\x96\x90\xF5iIDAT8˥\x93=OUA\x86\x9F\x99y\xEF=l\xFC*\xC0\x8F\xCAD t\xD2`gAEKb@\xFF\x91\xB5!6&&\xFE\x8D\xADͥ!\xA12\xE2/ !|\x84\xB3cq\xEE=\xE7\x84\xE4 Ʃ&\xBB\xFB>\xF3\xEE\xEC\xFCGd&\xF6\xEB\xF87\x92\xCC\xCC\xECo\x82R
+\xE6\xCE\xF7\xAF\xDF\xD8}\xBB\x83\x99\xD5u\xED\x99\xF9Xb\xB0\x92\xEE\xC6(\x82$\x99\x9E\xFD!@\xC0\xF0\x98\x87f\xB7/\x8Cp\xDC3G
+B0l0\xE0!\xF0X\xE8\x8B\xDD
+\xF7h\xEE\x8E$\xAD\xD1y
+Yvw"f\xE2\x98š5\xEB\xA6FwFٚ\xF7pB\x81"\x88PS\xDD\xDCa$\xBD\xB4\xC5p\xBFJ^\xEE;Wu\x992j(\xF5\xACY]S\xC3\xD0h\x83\xCD>\xA0ԅ\xC3\xED\xE5[\xBD\xFF\xB3/?\xDB\xDC;r\xDE\xFA\xF5?L\xD33芵\xCFG\xD7w\x92\xC5qprYc\xC0\xBD\xB1_`\x9C\x9F\x9D2\xD9Y\xAC\xBA\xFE\xE9\x80ɻ\xD5i>\xE9\x92\x89*/n\xB4]\x95\xF3^ޝ\xD5\xDE\xDE_y\xFA\x98\xC1\xEB\x8F\x{30C0ED5}\xDA\xFDq\xFF\x9A\x99Ye\xE6\xFB\xCC,\xF9\x8F\xBC\x9A5tx44LC\xD3,\xE9\xECh>\x99\xB1\xF5g\x8B\x8FIEND\xAEB`\x82
\ No newline at end of file
Deleted: branches/0.3/ico/16x16/project.png
===================================================================
(Binary files differ)
Added: branches/0.3/ico/22x22/label.png
===================================================================
--- branches/0.3/ico/22x22/label.png (rev 0)
+++ branches/0.3/ico/22x22/label.png 2012-04-28 21:33:36 UTC (rev 1701)
@@ -0,0 +1,6 @@
+\x89PNG
+
+
+IHDRĴl;bKGD\xFF\xFF\xFF\xA0\xBD\xA7\x93 pHYs \x84 \x84\xAA\xE2cytIME\xDC$<\xFFH\xE2IDAT8˵\x95\xBD\x8AA\x85\xBFs\xAB\xA6z`م]Mt3#A\xD0@\xFCc7W\x8CD\xC1'P\x9Ff\xC1AM|
+A610\xD55QC
+t\xC6\xE9\xBA]=팳\xCE8\xBA.E\xD3\xDD_\x9D{n\xFD\xC0a\xC5\xFB\xFD\x87\xC2\xC0\xC7O\x9F\xCD\xDD#`\xF3\xB3\xE7\x8C\x92\xA8\xAA\x8A\xC1`\xC0\xFD{w\x914\x8C\xEE\xBE9\x8D\xB6\x81\xCDe\xE0\xA9\xCC9\x93\xEB /c\xF9v\xB8\x9C\xD2"\xA0\x99afH 5c\x8C\xD0\xEE\xB4\xE0\xAD\xBD\^̍(̦\xC7\x91Ԃ\xD7[\xB0\xA5\xFDYpW\xB6\xB0&\xA3\xA4\xA6I*\x93\xB6\xBD\x8B\xCBxB\x94\xA8(o\xD3J\xB6CC\x81\x86\xCEf\xA8S|0xZi \x9B4\xAE[#a!\xFCA\xB1\xC3Fρ\xA3M\xA0&\xEB|4\xA3\xD0)KB`\xCD\xEA\xF9\xE0\xB5\xE8\za\xE4:\xE3Cnf\xF3n\xDE|\xA4c=l@Ι\xB77N\xAC\xB4\x8DO=y7Ś\xDA\xE1!\xE7\x95χ\xE0y>\xD8=\xADN\xF9\xC7\xEF\xBB;\xB2\xC8\xD1Xs\xFE\xF1\xF2\xC7\xD7F\x8A|\x8D\x8F\x81#)\xCCo\x9E$\xBE}\xF2\xEA晥^|\xB8\xC7\xEB[g'\xCF\xEDM[\xD1n$z\xF5p\xE9\xD2\xE3/\xA5\xF4\xEA+RJ\x98\xFD*\xD1\xF3\xF1J\x9E\xA4Y\xF0`\xF0\x80\xF1\xB8\xA6o\x99\xB5\xE3W\xD8\xD9}\x8A\xA3\x857\xC4V\xD9\xD9}\xD6\xF6@ov\xA5\xBB\xFBUw\xEE\xFF)\x80s*\xFEV\xC0I`\xBD\xBD\xAE\xFE%RJ_ \xC4ќ\x92\xCF \xC0IEND\xAEB`\x82
\ No newline at end of file
Deleted: branches/0.3/ico/titleblock.png
===================================================================
(Binary files differ)
Modified: branches/0.3/qelectrotech.qrc
===================================================================
--- branches/0.3/qelectrotech.qrc 2012-04-28 21:15:50 UTC (rev 1700)
+++ branches/0.3/qelectrotech.qrc 2012-04-28 21:33:36 UTC (rev 1701)
@@ -59,6 +59,7 @@
<file>ico/16x16/item_cancel.png</file>
<file>ico/16x16/item_copy.png</file>
<file>ico/16x16/item_move.png</file>
+ <file>ico/16x16/label.png</file>
<file>ico/16x16/masquer.png</file>
<file>ico/16x16/neutral.png</file>
<file>ico/16x16/north.png</file>
@@ -140,6 +141,7 @@
<file>ico/22x22/go-home.png</file>
<file>ico/22x22/go-up.png</file>
<file>ico/22x22/hotspot.png</file>
+ <file>ico/22x22/label.png</file>
<file>ico/22x22/landscape.png</file>
<file>ico/22x22/line.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/64x64/apps/qelectrotech.png</file>
<file>ico/splash.png</file>
- <file>ico/titleblock.png</file>
<file>titleblocks/default.titleblock</file>
<file>LICENSE</file>
</qresource>
Modified: branches/0.3/sources/genericpanel.cpp
===================================================================
--- branches/0.3/sources/genericpanel.cpp 2012-04-28 21:15:50 UTC (rev 1700)
+++ branches/0.3/sources/genericpanel.cpp 2012-04-28 21:33:36 UTC (rev 1701)
@@ -1052,11 +1052,11 @@
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());
}
Modified: branches/0.3/sources/projectview.cpp
===================================================================
--- branches/0.3/sources/projectview.cpp 2012-04-28 21:15:50 UTC (rev 1700)
+++ branches/0.3/sources/projectview.cpp 2012-04-28 21:33:36 UTC (rev 1701)
@@ -43,7 +43,7 @@
project_(0)
{
setObjectName("ProjectView");
- setWindowIcon(QET::Icons::Project);
+ setWindowIcon(QET::Icons::ProjectFile);
// construit le widget "fallback"
fallback_widget_ = new QWidget();
Modified: branches/0.3/sources/qeticons.cpp
===================================================================
--- branches/0.3/sources/qeticons.cpp 2012-04-28 21:15:50 UTC (rev 1700)
+++ branches/0.3/sources/qeticons.cpp 2012-04-28 21:33:36 UTC (rev 1701)
@@ -325,7 +325,6 @@
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 @@
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");