diff --git a/ico/16x16/conductor-edit.png b/ico/16x16/conductor-edit.png new file mode 100644 index 000000000..fa8eea246 Binary files /dev/null and b/ico/16x16/conductor-edit.png differ diff --git a/ico/16x16/conductor-reset.png b/ico/16x16/conductor-reset.png new file mode 100644 index 000000000..2a7458d8c Binary files /dev/null and b/ico/16x16/conductor-reset.png differ diff --git a/ico/16x16/edit-select-invert.png b/ico/16x16/edit-select-invert.png new file mode 100644 index 000000000..d6a5b1fe1 Binary files /dev/null and b/ico/16x16/edit-select-invert.png differ diff --git a/ico/16x16/edit-select-none.png b/ico/16x16/edit-select-none.png new file mode 100644 index 000000000..39e824a95 Binary files /dev/null and b/ico/16x16/edit-select-none.png differ diff --git a/ico/16x16/transform-rotate.png b/ico/16x16/transform-rotate.png new file mode 100644 index 000000000..71042d3c3 Binary files /dev/null and b/ico/16x16/transform-rotate.png differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index da678265d..096c4304c 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -580,5 +580,10 @@ ico/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;