| [qet] qet/qet: [5120] icon theme: add new icons |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 5120
Author: nuri
Date: 2017-11-28 00:41:24 +0100 (Tue, 28 Nov 2017)
Log Message:
-----------
icon theme: add new icons
Modified Paths:
--------------
trunk/qelectrotech.qrc
trunk/sources/editor/qetelementeditor.cpp
trunk/sources/qetdiagrameditor.cpp
trunk/sources/qeticons.cpp
trunk/sources/qeticons.h
Added Paths:
-----------
trunk/ico/16x16/conductor-edit.png
trunk/ico/16x16/conductor-reset.png
trunk/ico/16x16/edit-select-invert.png
trunk/ico/16x16/edit-select-none.png
trunk/ico/16x16/transform-rotate.png
Added: trunk/ico/16x16/conductor-edit.png
===================================================================
(Binary files differ)
Index: trunk/ico/16x16/conductor-edit.png
===================================================================
--- trunk/ico/16x16/conductor-edit.png 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/ico/16x16/conductor-edit.png 2017-11-27 23:41:24 UTC (rev 5120)
Property changes on: trunk/ico/16x16/conductor-edit.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/ico/16x16/conductor-reset.png
===================================================================
(Binary files differ)
Index: trunk/ico/16x16/conductor-reset.png
===================================================================
--- trunk/ico/16x16/conductor-reset.png 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/ico/16x16/conductor-reset.png 2017-11-27 23:41:24 UTC (rev 5120)
Property changes on: trunk/ico/16x16/conductor-reset.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/ico/16x16/edit-select-invert.png
===================================================================
(Binary files differ)
Index: trunk/ico/16x16/edit-select-invert.png
===================================================================
--- trunk/ico/16x16/edit-select-invert.png 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/ico/16x16/edit-select-invert.png 2017-11-27 23:41:24 UTC (rev 5120)
Property changes on: trunk/ico/16x16/edit-select-invert.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/ico/16x16/edit-select-none.png
===================================================================
(Binary files differ)
Index: trunk/ico/16x16/edit-select-none.png
===================================================================
--- trunk/ico/16x16/edit-select-none.png 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/ico/16x16/edit-select-none.png 2017-11-27 23:41:24 UTC (rev 5120)
Property changes on: trunk/ico/16x16/edit-select-none.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/ico/16x16/transform-rotate.png
===================================================================
(Binary files differ)
Index: trunk/ico/16x16/transform-rotate.png
===================================================================
--- trunk/ico/16x16/transform-rotate.png 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/ico/16x16/transform-rotate.png 2017-11-27 23:41:24 UTC (rev 5120)
Property changes on: trunk/ico/16x16/transform-rotate.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/qelectrotech.qrc
===================================================================
--- trunk/qelectrotech.qrc 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/qelectrotech.qrc 2017-11-27 23:41:24 UTC (rev 5120)
@@ -580,5 +580,10 @@
<file>ico/16x16/go-bottom.png</file>
<file>ico/16x16/run-dxf.png</file>
<file>ico/22x22/folder-open.png</file>
+ <file>ico/16x16/conductor-reset.png</file>
+ <file>ico/16x16/conductor-edit.png</file>
+ <file>ico/16x16/edit-select-invert.png</file>
+ <file>ico/16x16/edit-select-none.png</file>
+ <file>ico/16x16/transform-rotate.png</file>
</qresource>
</RCC>
Modified: trunk/sources/editor/qetelementeditor.cpp
===================================================================
--- trunk/sources/editor/qetelementeditor.cpp 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/sources/editor/qetelementeditor.cpp 2017-11-27 23:41:24 UTC (rev 5120)
@@ -149,7 +149,7 @@
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);
@@ -156,7 +156,7 @@
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);
Modified: trunk/sources/qetdiagrameditor.cpp
===================================================================
--- trunk/sources/qetdiagrameditor.cpp 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/sources/qetdiagrameditor.cpp 2017-11-27 23:41:24 UTC (rev 5120)
@@ -351,11 +351,11 @@
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 @@
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 @@
// 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 @@
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
Modified: trunk/sources/qeticons.cpp
===================================================================
--- trunk/sources/qeticons.cpp 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/sources/qeticons.cpp 2017-11-27 23:41:24 UTC (rev 5120)
@@ -33,6 +33,7 @@
QIcon BringForward;
QIcon Cancel;
QIcon Conductor;
+ QIcon ConductorEdit;
QIcon ConductorSettings;
QIcon Configure;
QIcon ConfigureToolbars;
@@ -67,6 +68,8 @@
QIcon EditRedo;
QIcon EditRename;
QIcon EditSelectAll;
+ QIcon EditSelectInvert;
+ QIcon EditSelectNone;
QIcon EditTableCellMerge;
QIcon EditTableCellSplit;
QIcon EditTableDeleteColumn;
@@ -162,6 +165,7 @@
QIcon TitleBlock;
QIcon TitleBlockBottom;
QIcon TitleBlockRight;
+ QIcon TransformRotate;
QIcon UserInformations;
QIcon ViewFitWidth;
QIcon ViewFitWindow;
@@ -235,6 +239,8 @@
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 @@
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 @@
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 @@
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");
Modified: trunk/sources/qeticons.h
===================================================================
--- trunk/sources/qeticons.h 2017-11-27 20:27:49 UTC (rev 5119)
+++ trunk/sources/qeticons.h 2017-11-27 23:41:24 UTC (rev 5120)
@@ -40,6 +40,7 @@
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 @@
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 @@
extern QIcon TitleBlock;
extern QIcon TitleBlockBottom;
extern QIcon TitleBlockRight;
+ extern QIcon TransformRotate;
extern QIcon UserInformations;
extern QIcon ViewFitWidth;
extern QIcon ViewFitWindow;