From 1cd8912d64bdf8f7792a3e04adf7e41e386f4d32 Mon Sep 17 00:00:00 2001 From: blacksun Date: Sat, 29 Sep 2018 15:58:29 +0000 Subject: [PATCH] Add new icons, thank Nuri. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5539 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/conductor.png | Bin 0 -> 197 bytes ico/16x16/element-master.png | Bin 0 -> 312 bytes ico/16x16/element-slave.png | Bin 0 -> 296 bytes ico/16x16/folio-ref-coming.png | Bin 0 -> 292 bytes ico/16x16/terminal.png | Bin 0 -> 227 bytes .../ui/searchandreplacewidget.cpp | 6 +++++- .../SearchAndReplace/ui/searchandreplacewidget.ui | 3 +++ sources/qeticons.cpp | 9 +++++++++ sources/qeticons.h | 4 ++++ 9 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ico/16x16/conductor.png create mode 100644 ico/16x16/element-master.png create mode 100644 ico/16x16/element-slave.png create mode 100644 ico/16x16/folio-ref-coming.png create mode 100644 ico/16x16/terminal.png diff --git a/ico/16x16/conductor.png b/ico/16x16/conductor.png new file mode 100644 index 0000000000000000000000000000000000000000..63689325e471a60051a5cfb7ef5f1f29ab96bee9 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T?JY5_^ zEP9g@BqlwuXFgmnF}pM9u!dQK&xeQhiKZ0}o}Qd{7{pRIFVdQ&MBb@0M4H{7XSbN literal 0 HcmV?d00001 diff --git a/ico/16x16/element-master.png b/ico/16x16/element-master.png new file mode 100644 index 0000000000000000000000000000000000000000..669081a6b2851571e2a3f861fd6b88ef2c91f4b0 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UHdb&7< zSo9_*ED$hwG-*TBZ=ZQHCsyhmu4m(BQ)_$tzy80kosimBj#yb?J?0sbGoKq77+4q^ z7!?@*NiRrDNSxQ~E9=KBAt7<*;+!nUS&ThA>JxVUmkjvH!u#X*`}|Y&Y;AXWczEK0 zD#{H1{G8o%d}|2XzJ2?mIXAvcwl=KkVl?h~`1tYVW$V`M3yh7O`}^A3=-(Zp&F;#| z%E@}n%*^J@%+7k6Nhe+=2r;XiQ=h14*1*8fzuNA2Ox1ohpa&Q{UHx3vIVCg!02Uf+ APXGV_ literal 0 HcmV?d00001 diff --git a/ico/16x16/element-slave.png b/ico/16x16/element-slave.png new file mode 100644 index 0000000000000000000000000000000000000000..9b32fb38c6076aaa0432b24646768b2a79a26809 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T+db&7< zSo9v9w2}9afq?7%iAK%_Y?(2Rq9=nVm?a-zxMJXxp(7>1@N9w7m374;3XM8E5iTEQ zfBygP`}!Tt`idL-H|exTPFvgH6#8AssPvqy^L+)ef^0eFogF?6PmSYE7$jKtcyI+= zbyjHoQ|fTNRCEKg%?8$0Gq%@9WShUgw}0k8&iDMwEYJF0uG(yOK4{BtDc7tPnJs=7 l<=#1nHB8U;z4EV4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1SRdb&7< zSoFS~V90gILBRF?I_|imS9UguIZo5HX*q82KvKu1#dXFtwFzb0%{auw!tN#Ny2Q+$ zaMW!5te*z`4-X%?f5xtP>o)DKNB6$})pcJWAY*c;4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1SNJY5_^ zEP9g@76=$534i(e^>4r4w#v_GYqBB>X2t{uf0j9xmzg>7$kIN}`JX>zs+?j-37?S4 zVAznvT)_6|>FMc5*{`wg+O!Vm% QkQW#{UHx3vIVCg!0JBX?<^TWy literal 0 HcmV?d00001 diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp index 424ed645c..ba9dbcd77 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp @@ -155,27 +155,31 @@ void SearchAndReplaceWidget::setUpTreeItems() m_master_elmt_qtwi= new QTreeWidgetItem(m_elements_qtwi); m_master_elmt_qtwi->setText(0, tr("Elements maître")); + m_master_elmt_qtwi->setIcon(0, QET::Icons::ElementMaster); m_master_elmt_qtwi->setCheckState(0, Qt::Checked); m_qtwi_elmts.append(m_master_elmt_qtwi); m_slave_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi); m_slave_elmt_qtwi->setText(0, tr("Elements esclave")); + m_slave_elmt_qtwi->setIcon(0, QET::Icons::ElementSlave); m_slave_elmt_qtwi->setCheckState(0, Qt::Checked); m_qtwi_elmts.append(m_slave_elmt_qtwi); m_report_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi); m_report_elmt_qtwi->setText(0, tr("Elements report de folio")); + m_report_elmt_qtwi->setIcon(0, QET::Icons::FolioXrefComing); m_report_elmt_qtwi->setCheckState(0, Qt::Checked); m_qtwi_elmts.append(m_report_elmt_qtwi); m_terminal_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi); m_terminal_elmt_qtwi->setText(0, tr("Elements bornier")); + m_terminal_elmt_qtwi->setIcon(0, QET::Icons::ElementTerminal); m_terminal_elmt_qtwi->setCheckState(0, Qt::Checked); m_qtwi_elmts.append(m_terminal_elmt_qtwi); m_category_qtwi.append(m_qtwi_elmts); m_conductor_qtwi = new QTreeWidgetItem(m_root_qtwi); - m_conductor_qtwi->setIcon(0, QET::Icons::ConductorSettings); + m_conductor_qtwi->setIcon(0, QET::Icons::Conductor); m_conductor_qtwi->setText(0, tr("Conducteurs")); m_conductor_qtwi->setCheckState(0, Qt::Checked); m_category_qtwi.append(m_conductor_qtwi); diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.ui b/sources/SearchAndReplace/ui/searchandreplacewidget.ui index 0aa64cfaf..3444121e3 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.ui +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.ui @@ -48,6 +48,9 @@ true + + true + true diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index bdbbebcbe..8f45f3681 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -211,6 +211,10 @@ namespace QET { QIcon super; QIcon sub; QIcon textGroup; + QIcon ElementMaster; + QIcon ElementSlave; + QIcon FolioXrefComing; + QIcon ElementTerminal; } } @@ -239,6 +243,7 @@ void QET::Icons::initIcons() { Autoconnect .addFile(":/ico/22x22/autoconnect.png"); BringForward .addFile(":/ico/22x22/bring_forward.png"); Cancel .addFile(":/ico/16x16/item-cancel.png"); + Conductor .addFile(":/ico/16x16/conductor.png"); ConductorEdit .addFile(":/ico/16x16/conductor-edit.png"); ConductorSettings .addFile(":/ico/16x16/conductor-reset.png"); ConductorSettings .addFile(":/ico/22x22/conductor2.png"); @@ -518,4 +523,8 @@ void QET::Icons::initIcons() { sub .addFile(":/ico/22x22/format-text-subscript.png"); super .addFile(":/ico/22x22/format-text-superscript.png"); textGroup .addFile(":/ico/16x16/object-group.png"); + ElementMaster .addFile(":/ico/16x16/element-master.png"); + ElementSlave .addFile(":/ico/16x16/element-slave.png"); + FolioXrefComing .addFile(":/ico/16x16/folio-ref-coming.png"); + ElementTerminal .addFile(":/ico/16x16/terminal.png"); } diff --git a/sources/qeticons.h b/sources/qeticons.h index d63b7227f..0945e9631 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -219,6 +219,10 @@ namespace QET { extern QIcon super; extern QIcon sub; extern QIcon textGroup; + extern QIcon ElementMaster; + extern QIcon ElementSlave; + extern QIcon FolioXrefComing; + extern QIcon ElementTerminal; } } #endif