From 2300783bfe85a72e64eeb6c8321f150ee91b15ca Mon Sep 17 00:00:00 2001 From: xavier Date: Wed, 9 May 2012 13:55:59 +0000 Subject: [PATCH] Replaced old Crystal icons with recent Oxygen equivalents. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1777 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/add_col.png | Bin 513 -> 0 bytes ico/16x16/add_row.png | Bin 523 -> 0 bytes ico/16x16/remove_col.png | Bin 351 -> 0 bytes ico/16x16/remove_row.png | Bin 363 -> 0 bytes qelectrotech.qrc | 4 ---- sources/qetdiagrameditor.cpp | 8 ++++---- sources/qeticons.cpp | 8 -------- sources/qeticons.h | 4 ---- 8 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 ico/16x16/add_col.png delete mode 100644 ico/16x16/add_row.png delete mode 100644 ico/16x16/remove_col.png delete mode 100644 ico/16x16/remove_row.png diff --git a/ico/16x16/add_col.png b/ico/16x16/add_col.png deleted file mode 100644 index 02a70edf74ccec967e3906f36497ad28155b9582..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0pdd@S zqpu?a!^Xav-+_~Xe1&9>AYTTCDpdxChGqtapZ|gMO9qBg0|tgy2@DKYGZ+}e^C!h0 zbz@*)EcbMA45_%4kR+=`77P?k+Ff{P}YI>_WvdJ{cVx>@cO*`9ySIR zfimU>y&wNRs~`4X@GO4+{|7;AYz&Mohq?bBi2K2Ng{O#7S&o^3iKCtSpV6NmKc!zx zwNEf(m(vI86fP5I;BELNpTc0rAm9+e`-A%n(}{2P|NkknEH^YVIP>I40Jnfc&jJfq zF$;|?BIouk{wU$I`pyK_&GrA26HizK9x^z*sJ(IO%k%tgYyQt+U_8R$Eg(^$)iLSU z|Njyb+BW|8zRS94Kl9Oj%s2TR9s%V!f_j8~lK-5aAj+Ncf_bA@$OkEbc$QPTX$-p> z1Qi+zb~D^mRS5rM&wMaIy!Pj(vs^0t0uCa(859~kc$z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ-fk{L`RCwBAOp31f&p-goUDD2oOAa7_82%FgAPazi z0T%`cAeJ|8zA#V%00M}GnVE?q0{{YuQ8`zZU>Mw)^ay7d00aw2MKLPDEk+X%?@P$1hUyc;s61}f;W|bG-4NLhcN*H3;^ot9mnQQ^Rxf} N002ovPDHLkV1g^3!u*}UUzeB+n< z^%lGg913^hesEp=^OT+W!e%i44ci|#u4eoC4^@l`4Iio>KF@DT1nS(e_rqWHxaEf# z92hn>bUc~iwWC2?VEx$@hXOj*ut_qo2t2M=$~njmwCPa^P`QXSb|Qh{*pH0bm~R>B QKo2r_y85}Sb4q9e0K;v5YybcN diff --git a/ico/16x16/remove_row.png b/ico/16x16/remove_row.png deleted file mode 100644 index 974cd5470df71a9b309b7f6314ef492f4d53e268..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9DoT z=00;WyaU6T*h}X+y!jLwB>o9AC~!A4Fp9HrC`>cY-)9iO#K6?i zI&)^H5;Krd$g9qL(17FLH~Dl41{MMD5AR%gc=p#hSM2}iaASY{;hWjUt3F8a2{`ER zL@zfqsQJnFu=eM%10TLxx9}&`|M$GW&A@o%(1(Y{lNcR-y*B6gEBvDCKTGX#1_1{L z=6wo04B7t<9{BK_|6(Ht(2VFZ`}Bk#zr_#z{@t$;J(1CYA#lzFper`HFt9K%x@=?w u8a7EL*mEL?@nilK2WMuGus8z~55xXxJ5r=~Z8QgZmci52&t;ucLK6VW3wi+n diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 6f75580f1..83d150efd 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -4,8 +4,6 @@ ico/128x128/settings.png ico/128x128/document-export.png ico/128x128/printer.png - ico/16x16/add_col.png - ico/16x16/add_row.png ico/16x16/application-exit.png ico/16x16/arrow-left-double.png ico/16x16/arrow-left.png @@ -71,8 +69,6 @@ ico/16x16/phase.png ico/16x16/preferences-desktop-user.png ico/16x16/qet.png - ico/16x16/remove_col.png - ico/16x16/remove_row.png ico/16x16/south.png ico/16x16/text-xml.png ico/16x16/user-busy.png diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index acd68f12a..4d721c57c 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -199,10 +199,10 @@ void QETDiagramEditor::actions() { conductor_reset = new QAction(QET::Icons::ConductorSettings, tr("R\351initialiser les conducteurs"), this); infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du sch\351ma"), this); add_text = new QAction(QET::Icons::PartTextField, tr("Ajouter un champ de texte"), this); - add_column = new QAction(QET::Icons::AddColumn, tr("Ajouter une colonne"), this); - remove_column = new QAction(QET::Icons::RemoveColumn, tr("Enlever une colonne"), this); - add_row = new QAction(QET::Icons::AddRow, tr("Ajouter une ligne"), this); - remove_row = new QAction(QET::Icons::RemoveRow, tr("Enlever une ligne"), this); + add_column = new QAction(QET::Icons::EditTableInsertColumnRight, tr("Ajouter une colonne"), this); + remove_column = new QAction(QET::Icons::EditTableDeleteColumn, tr("Enlever une colonne"), this); + add_row = new QAction(QET::Icons::EditTableInsertRowUnder, tr("Ajouter une ligne"), this); + remove_row = new QAction(QET::Icons::EditTableDeleteRow, tr("Enlever une ligne"), this); prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du projet"), this); prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un sch\351ma"), this); diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index deb0d3cdc..1b89ff396 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -22,8 +22,6 @@ namespace QET { namespace Icons { QIcon Add; - QIcon AddColumn; - QIcon AddRow; QIcon Allowed; QIcon ApplicationExit; QIcon ArrowLeft; @@ -132,8 +130,6 @@ namespace QET { QIcon QtLogo; QIcon Raise; QIcon Remove; - QIcon RemoveColumn; - QIcon RemoveRow; QIcon Restore; QIcon SendBackward; QIcon Settings; @@ -167,8 +163,6 @@ void QET::Icons::initIcons() { 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"); ApplicationExit .addFile(":/ico/16x16/application-exit.png"); ApplicationExit .addFile(":/ico/22x22/application-exit.png"); @@ -351,8 +345,6 @@ void QET::Icons::initIcons() { 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"); SendBackward .addFile(":/ico/22x22/send_backward.png"); Settings .addFile(":/ico/128x128/settings.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 1c224f18a..acb88d219 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -29,8 +29,6 @@ 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; extern QIcon ApplicationExit; extern QIcon ArrowLeft; @@ -141,8 +139,6 @@ namespace QET { extern QIcon QtLogo; extern QIcon Raise; extern QIcon Remove; - extern QIcon RemoveColumn; - extern QIcon RemoveRow; extern QIcon Restore; extern QIcon SendBackward; extern QIcon Settings;