From 553eadb33203eff5f209d9e68fe8e12537c69d2c Mon Sep 17 00:00:00 2001 From: nuri Date: Mon, 27 Nov 2017 23:41:24 +0000 Subject: [PATCH] icon theme: add new icons git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5120 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/conductor-edit.png | Bin 0 -> 309 bytes ico/16x16/conductor-reset.png | Bin 0 -> 393 bytes ico/16x16/edit-select-invert.png | Bin 0 -> 336 bytes ico/16x16/edit-select-none.png | Bin 0 -> 328 bytes ico/16x16/transform-rotate.png | Bin 0 -> 282 bytes qelectrotech.qrc | 5 +++++ sources/editor/qetelementeditor.cpp | 4 ++-- sources/qetdiagrameditor.cpp | 20 ++++++++++---------- sources/qeticons.cpp | 18 ++++++++++++++---- sources/qeticons.h | 4 ++++ 10 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 ico/16x16/conductor-edit.png create mode 100644 ico/16x16/conductor-reset.png create mode 100644 ico/16x16/edit-select-invert.png create mode 100644 ico/16x16/edit-select-none.png create mode 100644 ico/16x16/transform-rotate.png diff --git a/ico/16x16/conductor-edit.png b/ico/16x16/conductor-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..fa8eea246c7c778dbbd93b5849036764bfa866c4 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4nV2!TFVbn13b%n<*@6V7da0&&N+q10N7wuP z`*%KF@`txz!vAYaHymx4Syi-0eWA{2yN1vVi|1++cdwIHKOa(M{=W9zoZW3(UvM3< zl2of?D)@Nsc|7Avg9h6M*#`F)o`0AF*tULu(!5IU>>8EI?AzO3{C&Z7*nnYz&FWXz y&Ugu~oV85Tss0p~wDIn4kI?I-b_@TT?`1IRvv)U{t;qs(J%gvKpUXO@geCxN!E?s| literal 0 HcmV?d00001 diff --git a/ico/16x16/conductor-reset.png b/ico/16x16/conductor-reset.png new file mode 100644 index 0000000000000000000000000000000000000000..2a7458d8c19b4e68daa3914dacf1a30d561f76ba GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4M``idOM}&;9BbbVZI>t%-=#`DxK0HYx4{%dO}Ru`tgTnL|!@ zt(0~i+SD6*qo-HiaFv>XP#GAM$!ptHeahB#^cXySt?dY)UI^lWy k59`^cKVre+FW-M;Y6%H>>s3{72N-M&p00i_>zopr0Ls**@c;k- literal 0 HcmV?d00001 diff --git a/ico/16x16/edit-select-invert.png b/ico/16x16/edit-select-invert.png new file mode 100644 index 0000000000000000000000000000000000000000..d6a5b1fe1dfaed153f76d1626a2750076e53aeb3 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4uaYrf`rnenl(Cg&%L2jNyw64y{wvCM~I`&yhC;M#L zU3q`@blC^jk3JJ$gyjjD%8>$E;PW9&Kk+Ij^^7)$U)f>L(>|ur-`p_KW8aqXYw2 z_?@3Fp}npt7n$#`-FkaFr-z(}8bcq$yi)aRw<6~~-+qy0Rn{ew+;4k|jxJVJdZzs# b{}t=r>Tp3ejqnFRk1=?<`njxgN@xNAnGk{j literal 0 HcmV?d00001 diff --git a/ico/16x16/edit-select-none.png b/ico/16x16/edit-select-none.png new file mode 100644 index 0000000000000000000000000000000000000000..39e824a95f6098a4540f24f63be9bad71be396e4 GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4*C(d?HBu6A_TcIJUTc7syIIC^<0%w(!TIAL_a_6 ze)>J8{cSHCG+kxGLsiv2u1WLJOI&kz-OEjByF42|DhK-|Z#H=p^UmJD@JPyy%e?DE zcHZ=z_%%*~bLZw;Mr`{kKD_+ma7E!#yL61h66V0{cd-Ya>}tC_b*Dh5L!Xn1U-+|G zv;Qz(o?ETooBDmni-Vb@^u4a*rny!y`vi(p=Uajk=lFakLclCcZ{Yjz8bMO6Y RKLqp;gQu&X%Q~loCIG$3eB}TD literal 0 HcmV?d00001 diff --git a/ico/16x16/transform-rotate.png b/ico/16x16/transform-rotate.png new file mode 100644 index 0000000000000000000000000000000000000000..71042d3c325c9a01ab4f22a324b45fca48104934 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4G_?*XY@3enr;Za z>N|OXfYXld6LL5HsxWjI#x;i8zTX$SMt=Jn@1uJYe4fvj@G%H@Ej`)(Qp&+Udw>qp V6~6q}(+}uG22WQ%mvv4FO#lOico/16x16/go-bottom.png ico/16x16/run-dxf.png ico/22x22/folder-open.png + ico/16x16/conductor-reset.png + ico/16x16/conductor-edit.png + ico/16x16/edit-select-invert.png + ico/16x16/edit-select-none.png + ico/16x16/transform-rotate.png diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index 97e0093cf..e32ae94f5 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -149,14 +149,14 @@ void QETElementEditor::setupActions() { reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger"), this); quit = new QAction(QET::Icons::ApplicationExit, tr("&Quitter"), this); selectall = new QAction(QET::Icons::EditSelectAll, tr("Tout sélectionner"), this); - deselectall = new QAction( tr("Désélectionner tout"), this); + deselectall = new QAction(QET::Icons::EditSelectNone, tr("Désélectionner tout"), this); cut = new QAction(QET::Icons::EditCut, tr("Co&uper"), this); copy = new QAction(QET::Icons::EditCopy, tr("Cop&ier"), this); paste = new QAction(QET::Icons::EditPaste, tr("C&oller"), this); paste_in_area = new QAction(QET::Icons::EditPaste, tr("C&oller dans la zone..."), this); paste_from_file = new QAction(QET::Icons::XmlTextFile, tr("un fichier"), this); paste_from_elmt = new QAction(QET::Icons::Element, tr("un élément"), this); - inv_select = new QAction( tr("Inverser la sélection"), this); + inv_select = new QAction(QET::Icons::EditSelectInvert, tr("Inverser la sélection"), this); edit_delete = new QAction(QET::Icons::EditDelete, tr("&Supprimer"), this); edit_names = new QAction(QET::Icons::Names, tr("Éditer le nom et les traductions de l'élément"), this); edit_author = new QAction(QET::Icons::UserInformations, tr("Éditer les informations sur l'auteur"), this); diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index bcb6bb57d..9c350fbd2 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -351,11 +351,11 @@ void QETDiagramEditor::setUpActions() connect(&m_row_column_actions_group, &QActionGroup::triggered, this, &QETDiagramEditor::rowColumnGroupTriggered); //Selections Actions (related to a selected item) - m_delete_selection = m_selection_actions_group.addAction( QET::Icons::EditDelete, tr("Supprimer") ); - m_rotate_selection = m_selection_actions_group.addAction( QET::Icons::ObjectRotateRight, tr("Pivoter") ); - m_rotate_texts = m_selection_actions_group.addAction( QET::Icons::ObjectRotateRight, tr("Orienter les textes") ); - m_find_element = m_selection_actions_group.addAction( tr("Retrouver dans le panel") ); - m_edit_selection = m_selection_actions_group.addAction( QET::Icons::ElementEdit, tr("Éditer l'item sélectionné") ); + m_delete_selection = m_selection_actions_group.addAction( QET::Icons::EditDelete, tr("Supprimer") ); + m_rotate_selection = m_selection_actions_group.addAction( QET::Icons::TransformRotate, tr("Pivoter") ); + m_rotate_texts = m_selection_actions_group.addAction( QET::Icons::ObjectRotateRight, tr("Orienter les textes") ); + m_find_element = m_selection_actions_group.addAction( QET::Icons::ZoomDraw, tr("Retrouver dans le panel") ); + m_edit_selection = m_selection_actions_group.addAction( QET::Icons::ElementEdit, tr("Éditer l'item sélectionné") ); m_delete_selection -> setShortcut( QKeySequence::Delete); m_rotate_selection -> setShortcut( QKeySequence( tr("Space") ) ); @@ -376,9 +376,9 @@ void QETDiagramEditor::setUpActions() connect(&m_selection_actions_group, &QActionGroup::triggered, this, &QETDiagramEditor::selectionGroupTriggered); //Select Action - QAction *select_all = m_select_actions_group.addAction( QET::Icons::EditSelectAll, tr("Tout sélectionner") ); - QAction *select_nothing = m_select_actions_group.addAction( tr("Désélectionner tout") ); - QAction *select_invert = m_select_actions_group.addAction( tr("Inverser la sélection") ); + QAction *select_all = m_select_actions_group.addAction( QET::Icons::EditSelectAll, tr("Tout sélectionner") ); + QAction *select_nothing = m_select_actions_group.addAction( QET::Icons::EditSelectNone, tr("Désélectionner tout") ); + QAction *select_invert = m_select_actions_group.addAction( QET::Icons::EditSelectInvert, tr("Inverser la sélection") ); select_all -> setShortcut(QKeySequence::SelectAll); select_nothing -> setShortcut(QKeySequence::Deselect); @@ -626,7 +626,7 @@ void QETDiagramEditor::setUpMenu() { // menu Affichage - QMenu *projects_view_mode = menu_affichage -> addMenu(tr("Afficher les projets")); + QMenu *projects_view_mode = menu_affichage -> addMenu(QET::Icons::ConfigureToolbars, tr("Afficher les projets")); projects_view_mode -> setTearOffEnabled(true); projects_view_mode -> addAction(windowed_view_mode); projects_view_mode -> addAction(tabbed_view_mode); @@ -1461,7 +1461,7 @@ void QETDiagramEditor::slot_updateComplexActions() else if (selected_conductors_count) { m_edit_selection -> setText(tr("Éditer le conducteur", "edit conductor")); - m_edit_selection -> setIcon(QET::Icons::ElementEdit); + m_edit_selection -> setIcon(QET::Icons::ConductorEdit); } } //not an editable item diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 1af0674e5..addc096c1 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -33,6 +33,7 @@ namespace QET { QIcon BringForward; QIcon Cancel; QIcon Conductor; + QIcon ConductorEdit; QIcon ConductorSettings; QIcon Configure; QIcon ConfigureToolbars; @@ -67,6 +68,8 @@ namespace QET { QIcon EditRedo; QIcon EditRename; QIcon EditSelectAll; + QIcon EditSelectInvert; + QIcon EditSelectNone; QIcon EditTableCellMerge; QIcon EditTableCellSplit; QIcon EditTableDeleteColumn; @@ -162,6 +165,7 @@ namespace QET { QIcon TitleBlock; QIcon TitleBlockBottom; QIcon TitleBlockRight; + QIcon TransformRotate; QIcon UserInformations; QIcon ViewFitWidth; QIcon ViewFitWindow; @@ -235,6 +239,8 @@ void QET::Icons::initIcons() { Autoconnect .addFile(":/ico/22x22/autoconnect.png"); BringForward .addFile(":/ico/22x22/bring_forward.png"); Cancel .addFile(":/ico/16x16/item-cancel.png"); + ConductorEdit .addFile(":/ico/16x16/conductor-edit.png"); + ConductorSettings .addFile(":/ico/16x16/conductor-reset.png"); ConductorSettings .addFile(":/ico/22x22/conductor2.png"); Configure .addFile(":/ico/16x16/configure.png"); Configure .addFile(":/ico/22x22/configure.png"); @@ -306,10 +312,12 @@ 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"); + 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"); + EditSelectInvert .addFile(":/ico/16x16/edit-select-invert.png"); + EditSelectNone .addFile(":/ico/16x16/edit-select-none.png"); EditTableCellMerge .addFile(":/ico/16x16/edit-table-cell-merge.png"); EditTableCellMerge .addFile(":/ico/22x22/edit-table-cell-merge.png"); EditTableCellSplit .addFile(":/ico/16x16/edit-table-cell-split.png"); @@ -389,6 +397,7 @@ void QET::Icons::initIcons() { NewDiagram .addFile(":/ico/128x128/diagram.png"); North .addFile(":/ico/16x16/north.png"); ObjectLocked .addFile(":/ico/22x22/object-locked.png"); + ObjectRotateRight .addFile(":/ico/16x16/object-rotate-right.png"); ObjectRotateRight .addFile(":/ico/22x22/object-rotate-right.png"); ObjectUnlocked .addFile(":/ico/22x22/object-unlocked.png"); Orientations .addFile(":/ico/16x16/orientations.png"); @@ -454,6 +463,7 @@ void QET::Icons::initIcons() { TitleBlock .addFile(":/ico/22x22/label.png"); TitleBlockBottom .addFile(":/ico/22x22/titleblock-bottom.png"); TitleBlockRight .addFile(":/ico/22x22/titleblock-right.png"); + TransformRotate .addFile(":/ico/16x16/transform-rotate.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"); diff --git a/sources/qeticons.h b/sources/qeticons.h index a47811e75..d63b7227f 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -40,6 +40,7 @@ namespace QET { extern QIcon BringForward; extern QIcon Cancel; extern QIcon Conductor; + extern QIcon ConductorEdit; extern QIcon ConductorSettings; extern QIcon Configure; extern QIcon ConfigureToolbars; @@ -74,6 +75,8 @@ namespace QET { extern QIcon EditRedo; extern QIcon EditRename; extern QIcon EditSelectAll; + extern QIcon EditSelectInvert; + extern QIcon EditSelectNone; extern QIcon EditTableCellMerge; extern QIcon EditTableCellSplit; extern QIcon EditTableDeleteColumn; @@ -170,6 +173,7 @@ namespace QET { extern QIcon TitleBlock; extern QIcon TitleBlockBottom; extern QIcon TitleBlockRight; + extern QIcon TransformRotate; extern QIcon UserInformations; extern QIcon ViewFitWidth; extern QIcon ViewFitWindow;