From e6180e89714afa3f14212dab7cae2b32a3e7ddac Mon Sep 17 00:00:00 2001 From: xavier Date: Sat, 28 Apr 2012 21:33:36 +0000 Subject: [PATCH] Introduced the new icon for title block templates, got rid of the "green directory" icon used for projects. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1701 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/label.png | Bin 0 -> 476 bytes ico/16x16/project.png | Bin 392 -> 0 bytes ico/22x22/label.png | Bin 0 -> 597 bytes ico/titleblock.png | Bin 168 -> 0 bytes qelectrotech.qrc | 3 ++- sources/genericpanel.cpp | 4 ++-- sources/projectview.cpp | 2 +- sources/qeticons.cpp | 4 ++-- 8 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 ico/16x16/label.png delete mode 100644 ico/16x16/project.png create mode 100644 ico/22x22/label.png delete mode 100644 ico/titleblock.png diff --git a/ico/16x16/label.png b/ico/16x16/label.png new file mode 100644 index 0000000000000000000000000000000000000000..9d2d3576eefd2569420492098550c61db525da16 GIT binary patch literal 476 zcmV<20VDp2P)<;`#WG43O_&1Ww%j0)k0Cz^&n)h%*fg*@dQ{4>QVI&s4w8aE) zze-;2J6Cm?GHNLGtXW-C0K?E|gUvnwpwxxK?d4m&|FbVY+uS>H-ueUeKTOjDGal%Q zwa-V_40n>nad2{3W5B(!UjtyApPe$U=li7GE{v|W|+Uf!M6 z-rfgadHR?If5GdI`-6bHmD>Gr|C*UuW#;?LEcuTCyqYz18F(}_OheNw>Ff_^KAExg SXN!*j0000(XHW literal 0 HcmV?d00001 diff --git a/ico/16x16/project.png b/ico/16x16/project.png deleted file mode 100644 index 615db7d85d4632f64198a6c3b61a146149429acd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpik_^>lFz zskpWDvaJ`3qX6rJ@L1Emmp3bEXf$OcJrexFCoL(->BcQ3@mklWp|P`Rr+UBz;Tf}6 zWGphUwYIju`;B8+()pUR-cqjuJtuybbLMC|J$?3T7uDY!Hh+$%f8AQXr?TSz`zEfh zZB4)aMn_(_dH3jR(SMhAJS*E(XRvVb^2?jINY0(`eRao!&U@Z7=U+be_=)Ayi?f<8 zbv$^mYSY~Pp2srRMLIVMgg@9lGv-*5j&QRQcTI&;&e4Kt<%erCe$40nbj|XWRI)%v zM4?_=aP-2kj^!rmVbdn7MhDzntuXn@sckp4a;%k)EH<3&6m#>ItK{PTU2Ak1PdJr1 k^E^7^B*zxN_>jZ>w}&GHQ~urF1PnC>Pgg&ebxsLQ01dmP(EtDd diff --git a/ico/22x22/label.png b/ico/22x22/label.png new file mode 100644 index 0000000000000000000000000000000000000000..75424759d6e85ced4bba890c95be549199cbf173 GIT binary patch literal 597 zcmV-b0;>IqP)Pt?H&={A!6#6kX2C&CdAD78J?)IM&N#XkE=AMbU!8ky{lHBPoK@*BVd2?v*(Nh zlBlYR!C=7sdv}pEi~#PwIU0?&fz4&$?vA9X%sG?m8Xy2KWBGO)xCWdC(juUlVP;4m zHDinc3kJ{!?zG^o0=-;b%#98x%%&B`7?IS1*ITd^rTtlOSGEwGk$&?!p;LSW76`QWwaTzX;TI^!BcZf5gt-UECC6QpC;xjheTK+c)BH%_dy zjZZy!H^rLT;UVXh&xhc7KG+34AFT{d`N!`byF0ST(O7f-@f-3I$Ja)Rd>M@!kAWj8 z%x|6~zI`9^>gJiH6kdF|$Lm{XC(joi?M++JZU!WJ^>FFZ<1eKH^y(QaQc9Q^{VLJ( z@k*Woq*?G_@PP5Srf-?G<5$?(eTt)nH^f#I+1Y*89QHtOcBQ-fRd;{x|0#fTD*jf$ jNnpLbuKp!bN?(5hAjHv}lFuN(00000NkvXXu0mjfw^#-I literal 0 HcmV?d00001 diff --git a/ico/titleblock.png b/ico/titleblock.png deleted file mode 100644 index c0585d411df07088d7ce52aee6fc3c5efabceea5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gw!3HFS-u9~jDb50q$YKTtz9S&aI8~cZ8Ymd$ z>Eak-(fjs_BUgh1kMl+OkN?8^xR*a#z^4`ISC;$mqN^suHeZd@m9IqZ1m%gC9S~yK z?Nf2+`kDfn!Z*`GKb*7Map`Z)mG=)Ga{ani&-?#I1OuPF;@o)wHqyoyC8b(Dj)nkj OVeoYIb6Mw<&;$V6d^!mL 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");