From a8b0d63a5c524d55d8c5eed5f8cc7fbe5e74b11d Mon Sep 17 00:00:00 2001 From: xavier Date: Wed, 9 May 2012 12:56:18 +0000 Subject: [PATCH] TBT editor: logo manager: added icons. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1776 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/edit-rename.png | Bin 0 -> 245 bytes ico/16x16/list-add.png | Bin 0 -> 564 bytes ico/16x16/list-remove.png | Bin 0 -> 332 bytes ico/22x22/edit-rename.png | Bin 0 -> 353 bytes ico/22x22/list-add.png | Bin 0 -> 907 bytes ico/22x22/list-remove.png | Bin 0 -> 498 bytes qelectrotech.qrc | 6 ++++++ sources/qeticons.cpp | 9 +++++++++ sources/qeticons.h | 3 +++ sources/titleblock/templatelogomanager.cpp | 6 +++--- 10 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 ico/16x16/edit-rename.png create mode 100644 ico/16x16/list-add.png create mode 100644 ico/16x16/list-remove.png create mode 100644 ico/22x22/edit-rename.png create mode 100644 ico/22x22/list-add.png create mode 100644 ico/22x22/list-remove.png diff --git a/ico/16x16/edit-rename.png b/ico/16x16/edit-rename.png new file mode 100644 index 0000000000000000000000000000000000000000..2323757e0e94760b6aec976d52da09ee2584bb7d GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFR|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMhd7%J-{c# z_5c6>9WXF)(u7^Rb{;r*;ONn#7cO3S^XARlw{PFQdk0jr(_cj#sD-&C$S;_|`i9?` zLLiU9(9^{+gyVX0f&vqVWOJiZ^RG8|9X4$4IQVMDaY==UGYPe7Y)5YNv@(V>UuQLE aH)mjws#a^|o9@yJ((UQ$=d#Wzp$PyKYFkPG literal 0 HcmV?d00001 diff --git a/ico/16x16/list-add.png b/ico/16x16/list-add.png new file mode 100644 index 0000000000000000000000000000000000000000..1e03be9bc896c5f6d8a943ff9d153b42b67e6b16 GIT binary patch literal 564 zcmV-40?Yl0P)8Z)0JRB|3DF3=|YfF7jDEZ>IVpdRI~vVL~%?rHj{Mb-aA4?aN$HkpY6+e zIJ}%A@;qlRND8>Ne);a1hpoZcM@ORNcT0CDpm2lpt8;$t;5m`HA+Mts_V&s9W~>cf zetj;y8B(ff-fq3o6i^ss-tluMK}bpJ9RCvtKmqnoV4WvU2M7e2b^n@kK&}DWEA7Qj z+`01X%TpaFO`sJG5esISB#+&7>@2gVH>sP%}a+DuI`p-7R~pI$1Y5x z9J%rcDSiulyep{dI#Oy%ghc%waq@#~ax=Pj`qhjEu-38}b?Q6+eS$+ zxgkjtHlh#o1_P#oDl|xq z)$=3opuA-AQ-@kiO_W*dZ1Abw6Jy@#*R^Fg!5P*sA&3jgil^7k&X>BCo8zhBfN|0000j literal 0 HcmV?d00001 diff --git a/ico/16x16/list-remove.png b/ico/16x16/list-remove.png new file mode 100644 index 0000000000000000000000000000000000000000..5a4d15b7baaf3a4d255430be6d2c0423379f0f9c GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe0@>FMGa zQgQ3;q>X${1_EvC9b7%{lo;_Hxw!m6mdKI;Vst075>6Bme*a literal 0 HcmV?d00001 diff --git a/ico/22x22/edit-rename.png b/ico/22x22/edit-rename.png new file mode 100644 index 0000000000000000000000000000000000000000..ea8872fea61ae20585a422020c907e57dbb364f3 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf4nJ zFqeTaW9`+ZGeAMf64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U;fk+p1}8$oO4U9J{M*|g*JgY|@JjTC6TDo;<`-reJkZwU>}i{1 z;qd9}_epB;5_S9@p`ivxk`)(ML>Tri%4n{1WpegwjM0!QlxVy2*+%)=B8?^$&m`4# zOV_<-N?tQP#Or3yoL38{-IF&z@tH^GHe3C}!ygNN9lc#?cx&H{-0u^X`4_11t(o?E zfH< literal 0 HcmV?d00001 diff --git a/ico/22x22/list-add.png b/ico/22x22/list-add.png new file mode 100644 index 0000000000000000000000000000000000000000..e029787c716868c498d99a78a967575568a28f96 GIT binary patch literal 907 zcmV;619bd}P)<)YyS&C)sOPuUU7GWft~Bx(#euuEiJk0F$V%W=dn22X$(LfTCDSj0d_?ky^aNW z(5(;d7)eh@fYJRj_TG`?8EKy4oWmghVS@ z+{eNZQkxQIF;WO(7h_b&xtk|^pcGmw0@d^J@mUs*Ufg+_ZC})DPuIS=eD?B~^Evfs z3l9kCDI`2X2y#+7wgW)s5^56`e)dBe@%CFf%~Jl^ zd4Q8Koh$|iQVF!{#o@aKk5Ps|1q8Bd5t7)HN6p9lUH_Tgs7)uym@!AYj83tRf<J$I7pBXX6(Tc`=cZT`N^sDS?uHHPHHk z_KSWEm}MW0e>?1>JSre1tw?-C+^rvcS{MEIxW9_L+F84pKr2Dw;^GZp5O9&-Ub;tS za}bc&=y3iD>nzQrg(5;pfyi53usxhl=t-xEi`%r~giz#%5ykgtUc2nGhr97=;!=c^ks(+f hwc{TxEiLs0{|}&sZo)`g(B=RD002ovPDHLkV1oSvsSW@D literal 0 HcmV?d00001 diff --git a/ico/22x22/list-remove.png b/ico/22x22/list-remove.png new file mode 100644 index 0000000000000000000000000000000000000000..2bb1a59831d42e01df138bbe76861b3c573cd71a GIT binary patch literal 498 zcmVRHg64C~ZChUS5vpoL5VA5tAr}#SR$T{WGVm-b<<#qEEI#tZ50{s_ zoB2GJ{XUkK6-*-`DOY$(N^&m*v}_h{o(H?v!{cy>!(tJ_w)cZ57K;U5Ivqr2GuZ@_ zl0vXVk4B*}a!Qvcbf!~0H5wR?MtB84xg6Zd1lnrG9&lqfo5vfRQ#76C(+C7#7A*2u zQ7DK8~KoZ=ls6?v;mtBy1Il+Yx+d6O^HH;mDg~3Pp&X;F85rUpy ot~*YL`;#rAZuoZ##s5M40Ta=R=mj`S^8f$<07*qoM6N<$f>l$>!vFvP literal 0 HcmV?d00001 diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 2dcdc5c6c..6f75580f1 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -35,6 +35,7 @@ ico/16x16/edit-delete.png ico/16x16/edit-paste.png ico/16x16/edit-redo.png + ico/16x16/edit-rename.png ico/16x16/edit-select-all.png ico/16x16/edit-table-insert-row-above.png ico/16x16/edit-table-insert-column-left.png @@ -60,6 +61,8 @@ ico/16x16/item_copy.png ico/16x16/item_move.png ico/16x16/label.png + ico/16x16/list-add.png + ico/16x16/list-remove.png ico/16x16/masquer.png ico/16x16/neutral.png ico/16x16/north.png @@ -119,6 +122,7 @@ ico/22x22/edit-delete.png ico/22x22/edit-paste.png ico/22x22/edit-redo.png + ico/22x22/edit-rename.png ico/22x22/edit-select-all.png ico/22x22/edit-table-insert-row-above.png ico/22x22/edit-table-insert-column-left.png @@ -144,6 +148,8 @@ ico/22x22/label.png ico/22x22/landscape.png ico/22x22/line.png + ico/22x22/list-add.png + ico/22x22/list-remove.png ico/22x22/lower.png ico/22x22/move.png ico/22x22/names.png diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 0f41436a0..deb0d3cdc 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -21,6 +21,7 @@ // on redeclare ici les icones namespace QET { namespace Icons { + QIcon Add; QIcon AddColumn; QIcon AddRow; QIcon Allowed; @@ -62,6 +63,7 @@ namespace QET { QIcon EditDelete; QIcon EditPaste; QIcon EditRedo; + QIcon EditRename; QIcon EditSelectAll; QIcon EditTableCellMerge; QIcon EditTableCellSplit; @@ -129,6 +131,7 @@ namespace QET { QIcon QETOxygenLogo; QIcon QtLogo; QIcon Raise; + QIcon Remove; QIcon RemoveColumn; QIcon RemoveRow; QIcon Restore; @@ -162,6 +165,8 @@ void QET::Icons::initIcons() { bool rtl = QApplication::isRightToLeft(); QTransform reverse = QTransform().scale(-1, 1); + Add .addFile(":/ico/16x16/list-add.png"); + Add .addFile(":/ico/22x22/list-add.png"); AddColumn .addFile(":/ico/16x16/add_col.png"); AddRow .addFile(":/ico/16x16/add_row.png"); Allowed .addFile(":/ico/16x16/user-online.png"); @@ -242,6 +247,8 @@ void QET::Icons::initIcons() { EditRedo .addFile(":/ico/16x16/edit-redo.png"); EditRedo .addFile(":/ico/22x22/edit-redo.png"); } + EditRename .addFile(":/ico/16x16/edit-rename.png"); + EditRename .addFile(":/ico/22x22/edit-rename.png"); EditSelectAll .addFile(":/ico/16x16/edit-select-all.png"); EditSelectAll .addFile(":/ico/22x22/edit-select-all.png"); EditTableCellMerge .addFile(":ico/16x16/edit-table-cell-merge.png"); @@ -342,6 +349,8 @@ void QET::Icons::initIcons() { QETOxygenLogo .addFile(":/ico/oxygen-icons/64x64/apps/qelectrotech.png"); QtLogo .addFile(":/ico/32x32/qt.png"); Raise .addFile(":/ico/22x22/raise.png"); + Remove .addFile(":/ico/16x16/list-remove.png"); + Remove .addFile(":/ico/22x22/list-remove.png"); RemoveColumn .addFile(":/ico/16x16/remove_col.png"); RemoveRow .addFile(":/ico/16x16/remove_row.png"); Restore .addFile(":/ico/22x22/restaurer.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 61a840996..1c224f18a 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -28,6 +28,7 @@ namespace QET { // l'utilisation du mot-cle extern permet l'acces aux objets statiques // depuis l'exterieur du namespace + extern QIcon Add; extern QIcon AddColumn; extern QIcon AddRow; extern QIcon Allowed; @@ -69,6 +70,7 @@ namespace QET { extern QIcon EditDelete; extern QIcon EditPaste; extern QIcon EditRedo; + extern QIcon EditRename; extern QIcon EditSelectAll; extern QIcon EditTableCellMerge; extern QIcon EditTableCellSplit; @@ -138,6 +140,7 @@ namespace QET { extern QIcon QETOxygenLogo; extern QIcon QtLogo; extern QIcon Raise; + extern QIcon Remove; extern QIcon RemoveColumn; extern QIcon RemoveRow; extern QIcon Restore; diff --git a/sources/titleblock/templatelogomanager.cpp b/sources/titleblock/templatelogomanager.cpp index 33625b7de..365196f5b 100644 --- a/sources/titleblock/templatelogomanager.cpp +++ b/sources/titleblock/templatelogomanager.cpp @@ -84,12 +84,12 @@ void TitleBlockTemplateLogoManager::initWidgets() { logos_view_ -> setWrapping(true); logos_view_ -> setMovement(QListView::Static); logos_view_ -> setResizeMode(QListView::Adjust); - add_button_ = new QPushButton(tr("Ajouter un logo")); - delete_button_ = new QPushButton(tr("Supprimer ce logo")); + add_button_ = new QPushButton(QET::Icons::Add, tr("Ajouter un logo")); + delete_button_ = new QPushButton(QET::Icons::Remove, tr("Supprimer ce logo")); logo_box_ = new QGroupBox(tr("Propri\351t\351s")); logo_name_label_ = new QLabel(tr("Nom :")); logo_name_ = new QLineEdit(); - rename_button_ = new QPushButton(tr("Renommer")); + rename_button_ = new QPushButton(QET::Icons::EditRename, tr("Renommer")); logo_type_ = new QLabel(tr("Type :")); buttons_ = new QDialogButtonBox(QDialogButtonBox::Ok);