kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

icon theme: add new icons

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5120 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
nuri
2017-11-27 23:41:24 +00:00
parent dbd867d604
commit 553eadb332
10 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ico/16x16/conductor-edit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

BIN
ico/16x16/conductor-reset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 393 B

BIN
ico/16x16/edit-select-invert.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 336 B

BIN
ico/16x16/edit-select-none.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 328 B

BIN
ico/16x16/transform-rotate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 282 B

5
qelectrotech.qrc
View File

@@ -580,5 +580,10 @@
<file>ico/16x16/go-bottom.png</file> <file>ico/16x16/go-bottom.png</file>
<file>ico/16x16/run-dxf.png</file> <file>ico/16x16/run-dxf.png</file>
<file>ico/22x22/folder-open.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> </qresource>
</RCC> </RCC>

4
sources/editor/qetelementeditor.cpp
View File

@@ -149,14 +149,14 @@ void QETElementEditor::setupActions() {
reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger"), this); reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger"), this);
quit = new QAction(QET::Icons::ApplicationExit, tr("&Quitter"), this); quit = new QAction(QET::Icons::ApplicationExit, tr("&Quitter"), this);
selectall = new QAction(QET::Icons::EditSelectAll, tr("Tout sélectionner"), 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); cut = new QAction(QET::Icons::EditCut, tr("Co&uper"), this);
copy = new QAction(QET::Icons::EditCopy, tr("Cop&ier"), this); copy = new QAction(QET::Icons::EditCopy, tr("Cop&ier"), this);
paste = new QAction(QET::Icons::EditPaste, tr("C&oller"), 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_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_file = new QAction(QET::Icons::XmlTextFile, tr("un fichier"), this);
paste_from_elmt = new QAction(QET::Icons::Element, tr("un élément"), 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_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_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); edit_author = new QAction(QET::Icons::UserInformations, tr("Éditer les informations sur l'auteur"), this);

20
sources/qetdiagrameditor.cpp
View File

@@ -351,11 +351,11 @@ void QETDiagramEditor::setUpActions()
connect(&m_row_column_actions_group, &QActionGroup::triggered, this, &QETDiagramEditor::rowColumnGroupTriggered); connect(&m_row_column_actions_group, &QActionGroup::triggered, this, &QETDiagramEditor::rowColumnGroupTriggered);
//Selections Actions (related to a selected item) //Selections Actions (related to a selected item)
m_delete_selection = m_selection_actions_group.addAction( QET::Icons::EditDelete, tr("Supprimer") ); 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_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_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_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_edit_selection = m_selection_actions_group.addAction( QET::Icons::ElementEdit, tr("Éditer l'item sélectionné") );
m_delete_selection -> setShortcut( QKeySequence::Delete); m_delete_selection -> setShortcut( QKeySequence::Delete);
m_rotate_selection -> setShortcut( QKeySequence( tr("Space") ) ); m_rotate_selection -> setShortcut( QKeySequence( tr("Space") ) );
@@ -376,9 +376,9 @@ void QETDiagramEditor::setUpActions()
connect(&m_selection_actions_group, &QActionGroup::triggered, this, &QETDiagramEditor::selectionGroupTriggered); connect(&m_selection_actions_group, &QActionGroup::triggered, this, &QETDiagramEditor::selectionGroupTriggered);
//Select Action //Select Action
QAction *select_all = m_select_actions_group.addAction( QET::Icons::EditSelectAll, tr("Tout sélectionner") ); 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_nothing = m_select_actions_group.addAction( QET::Icons::EditSelectNone, tr("Désélectionner tout") );
QAction *select_invert = m_select_actions_group.addAction( tr("Inverser la sélection") ); QAction *select_invert = m_select_actions_group.addAction( QET::Icons::EditSelectInvert, tr("Inverser la sélection") );
select_all -> setShortcut(QKeySequence::SelectAll); select_all -> setShortcut(QKeySequence::SelectAll);
select_nothing -> setShortcut(QKeySequence::Deselect); select_nothing -> setShortcut(QKeySequence::Deselect);
@@ -626,7 +626,7 @@ void QETDiagramEditor::setUpMenu() {
// menu Affichage // 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 -> setTearOffEnabled(true);
projects_view_mode -> addAction(windowed_view_mode); projects_view_mode -> addAction(windowed_view_mode);
projects_view_mode -> addAction(tabbed_view_mode); projects_view_mode -> addAction(tabbed_view_mode);
@@ -1461,7 +1461,7 @@ void QETDiagramEditor::slot_updateComplexActions()
else if (selected_conductors_count) else if (selected_conductors_count)
{ {
m_edit_selection -> setText(tr("Éditer le conducteur", "edit conductor")); 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 //not an editable item

18
sources/qeticons.cpp
View File

@@ -33,6 +33,7 @@ namespace QET {
QIcon BringForward; QIcon BringForward;
QIcon Cancel; QIcon Cancel;
QIcon Conductor; QIcon Conductor;
QIcon ConductorEdit;
QIcon ConductorSettings; QIcon ConductorSettings;
QIcon Configure; QIcon Configure;
QIcon ConfigureToolbars; QIcon ConfigureToolbars;
@@ -67,6 +68,8 @@ namespace QET {
QIcon EditRedo; QIcon EditRedo;
QIcon EditRename; QIcon EditRename;
QIcon EditSelectAll; QIcon EditSelectAll;
QIcon EditSelectInvert;
QIcon EditSelectNone;
QIcon EditTableCellMerge; QIcon EditTableCellMerge;
QIcon EditTableCellSplit; QIcon EditTableCellSplit;
QIcon EditTableDeleteColumn; QIcon EditTableDeleteColumn;
@@ -162,6 +165,7 @@ namespace QET {
QIcon TitleBlock; QIcon TitleBlock;
QIcon TitleBlockBottom; QIcon TitleBlockBottom;
QIcon TitleBlockRight; QIcon TitleBlockRight;
QIcon TransformRotate;
QIcon UserInformations; QIcon UserInformations;
QIcon ViewFitWidth; QIcon ViewFitWidth;
QIcon ViewFitWindow; QIcon ViewFitWindow;
@@ -235,6 +239,8 @@ void QET::Icons::initIcons() {
Autoconnect .addFile(":/ico/22x22/autoconnect.png"); Autoconnect .addFile(":/ico/22x22/autoconnect.png");
BringForward .addFile(":/ico/22x22/bring_forward.png"); BringForward .addFile(":/ico/22x22/bring_forward.png");
Cancel .addFile(":/ico/16x16/item-cancel.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"); ConductorSettings .addFile(":/ico/22x22/conductor2.png");
Configure .addFile(":/ico/16x16/configure.png"); Configure .addFile(":/ico/16x16/configure.png");
Configure .addFile(":/ico/22x22/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/16x16/edit-redo.png");
EditRedo .addFile(":/ico/22x22/edit-redo.png"); EditRedo .addFile(":/ico/22x22/edit-redo.png");
} }
EditRename .addFile(":/ico/16x16/edit-rename.png"); EditRename .addFile(":/ico/16x16/edit-rename.png");
EditRename .addFile(":/ico/22x22/edit-rename.png"); EditRename .addFile(":/ico/22x22/edit-rename.png");
EditSelectAll .addFile(":/ico/16x16/edit-select-all.png"); EditSelectAll .addFile(":/ico/16x16/edit-select-all.png");
EditSelectAll .addFile(":/ico/22x22/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/16x16/edit-table-cell-merge.png");
EditTableCellMerge .addFile(":/ico/22x22/edit-table-cell-merge.png"); EditTableCellMerge .addFile(":/ico/22x22/edit-table-cell-merge.png");
EditTableCellSplit .addFile(":/ico/16x16/edit-table-cell-split.png"); EditTableCellSplit .addFile(":/ico/16x16/edit-table-cell-split.png");
@@ -389,6 +397,7 @@ void QET::Icons::initIcons() {
NewDiagram .addFile(":/ico/128x128/diagram.png"); NewDiagram .addFile(":/ico/128x128/diagram.png");
North .addFile(":/ico/16x16/north.png"); North .addFile(":/ico/16x16/north.png");
ObjectLocked .addFile(":/ico/22x22/object-locked.png"); ObjectLocked .addFile(":/ico/22x22/object-locked.png");
ObjectRotateRight .addFile(":/ico/16x16/object-rotate-right.png");
ObjectRotateRight .addFile(":/ico/22x22/object-rotate-right.png"); ObjectRotateRight .addFile(":/ico/22x22/object-rotate-right.png");
ObjectUnlocked .addFile(":/ico/22x22/object-unlocked.png"); ObjectUnlocked .addFile(":/ico/22x22/object-unlocked.png");
Orientations .addFile(":/ico/16x16/orientations.png"); Orientations .addFile(":/ico/16x16/orientations.png");
@@ -454,6 +463,7 @@ void QET::Icons::initIcons() {
TitleBlock .addFile(":/ico/22x22/label.png"); TitleBlock .addFile(":/ico/22x22/label.png");
TitleBlockBottom .addFile(":/ico/22x22/titleblock-bottom.png"); TitleBlockBottom .addFile(":/ico/22x22/titleblock-bottom.png");
TitleBlockRight .addFile(":/ico/22x22/titleblock-right.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/16x16/preferences-desktop-user.png");
UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png"); UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png");
ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png"); ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png");

4
sources/qeticons.h
View File

@@ -40,6 +40,7 @@ namespace QET {
extern QIcon BringForward; extern QIcon BringForward;
extern QIcon Cancel; extern QIcon Cancel;
extern QIcon Conductor; extern QIcon Conductor;
extern QIcon ConductorEdit;
extern QIcon ConductorSettings; extern QIcon ConductorSettings;
extern QIcon Configure; extern QIcon Configure;
extern QIcon ConfigureToolbars; extern QIcon ConfigureToolbars;
@@ -74,6 +75,8 @@ namespace QET {
extern QIcon EditRedo; extern QIcon EditRedo;
extern QIcon EditRename; extern QIcon EditRename;
extern QIcon EditSelectAll; extern QIcon EditSelectAll;
extern QIcon EditSelectInvert;
extern QIcon EditSelectNone;
extern QIcon EditTableCellMerge; extern QIcon EditTableCellMerge;
extern QIcon EditTableCellSplit; extern QIcon EditTableCellSplit;
extern QIcon EditTableDeleteColumn; extern QIcon EditTableDeleteColumn;
@@ -170,6 +173,7 @@ namespace QET {
extern QIcon TitleBlock; extern QIcon TitleBlock;
extern QIcon TitleBlockBottom; extern QIcon TitleBlockBottom;
extern QIcon TitleBlockRight; extern QIcon TitleBlockRight;
extern QIcon TransformRotate;
extern QIcon UserInformations; extern QIcon UserInformations;
extern QIcon ViewFitWidth; extern QIcon ViewFitWidth;
extern QIcon ViewFitWindow; extern QIcon ViewFitWindow;