diff --git a/ico/16x16/go-bottom.png b/ico/16x16/go-bottom.png new file mode 100644 index 000000000..490b265c0 Binary files /dev/null and b/ico/16x16/go-bottom.png differ diff --git a/ico/16x16/go-down-double.png b/ico/16x16/go-down-double.png new file mode 100644 index 000000000..46e2bed31 Binary files /dev/null and b/ico/16x16/go-down-double.png differ diff --git a/ico/16x16/go-down.png b/ico/16x16/go-down.png index 4459ab35d..05c690b06 100644 Binary files a/ico/16x16/go-down.png and b/ico/16x16/go-down.png differ diff --git a/ico/16x16/go-top.png b/ico/16x16/go-top.png new file mode 100644 index 000000000..ae516930f Binary files /dev/null and b/ico/16x16/go-top.png differ diff --git a/ico/16x16/go-up-double.png b/ico/16x16/go-up-double.png new file mode 100644 index 000000000..cef7f8b41 Binary files /dev/null and b/ico/16x16/go-up-double.png differ diff --git a/ico/22x22/dialog-information.png b/ico/22x22/dialog-information.png index 1f2a3c680..2bb174d6c 100644 Binary files a/ico/22x22/dialog-information.png and b/ico/22x22/dialog-information.png differ diff --git a/ico/copyright b/ico/copyright index 79e819d94..0a65a9885 100644 --- a/ico/copyright +++ b/ico/copyright @@ -159,6 +159,8 @@ Clarification: ico/16x16/folder-only-this.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/folder-properties.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/folder-show-all.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/go-down-double.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/go-up-double.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/ground.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/label.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/list-remove.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) diff --git a/qelectrotech.qrc b/qelectrotech.qrc index c819f41d9..0c0fef062 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -573,5 +573,9 @@ ico/16x16/folder-edit.png ico/16x16/folder-open.png ico/16x16/folder-properties.png + ico/16x16/go-up-double.png + ico/16x16/go-down-double.png + ico/16x16/go-top.png + ico/16x16/go-bottom.png diff --git a/sources/elementspanelwidget.cpp b/sources/elementspanelwidget.cpp index c906712dc..26cfb89c2 100644 --- a/sources/elementspanelwidget.cpp +++ b/sources/elementspanelwidget.cpp @@ -43,19 +43,19 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) { elements_panel = new ElementsPanel(this); // initialise les actions - open_directory = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this); - copy_path = new QAction(QET::Icons::IC_CopyFile, tr("Copier le chemin"), this); - prj_activate = new QAction(QET::Icons::ProjectFile, tr("Basculer vers ce projet"), this); - prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this); - prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this); - prj_prop_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this); - prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this); - prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer ce folio"), this); - prj_move_diagram_up = new QAction(QET::Icons::GoUp, tr("Remonter ce folio"), this); - prj_move_diagram_down = new QAction(QET::Icons::GoDown, tr("Abaisser ce folio"), this); - prj_move_diagram_upx10 = new QAction(QET::Icons::GoUp, tr("Remonter ce folio x10"), this); - prj_move_diagram_top = new QAction(QET::Icons::GoUp, tr("Remonter ce folio au debut"), this); - prj_move_diagram_downx10 = new QAction(QET::Icons::GoDown, tr("Abaisser ce folio x10"), this); + open_directory = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this); + copy_path = new QAction(QET::Icons::IC_CopyFile, tr("Copier le chemin"), this); + prj_activate = new QAction(QET::Icons::ProjectFile, tr("Basculer vers ce projet"), this); + prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this); + prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this); + prj_prop_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this); + prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this); + prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer ce folio"), this); + prj_move_diagram_up = new QAction(QET::Icons::GoUp, tr("Remonter ce folio"), this); + prj_move_diagram_down = new QAction(QET::Icons::GoDown, tr("Abaisser ce folio"), this); + prj_move_diagram_upx10 = new QAction(QET::Icons::GoUpDouble, tr("Remonter ce folio x10"), this); + prj_move_diagram_top = new QAction(QET::Icons::GoTop, tr("Remonter ce folio au debut"), this); + prj_move_diagram_downx10 = new QAction(QET::Icons::GoDownDouble, tr("Abaisser ce folio x10"), this); tbt_add = new QAction(QET::Icons::TitleBlock, tr("Nouveau modèle"), this); tbt_edit = new QAction(QET::Icons::TitleBlock, tr("Éditer ce modèle"), this); tbt_remove = new QAction(QET::Icons::TitleBlock, tr("Supprimer ce modèle"), this); diff --git a/sources/projectview.cpp b/sources/projectview.cpp index 13840d636..b7dc709c1 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -387,7 +387,7 @@ void ProjectView::addDiagram(DiagramView *diagram_view) return; // Add new tab for the diagram - m_tab->addTab(diagram_view, QET::Icons::Diagram, diagram_view -> title()); + m_tab->addTab(diagram_view, QET::Icons::Diagram, diagram_view -> title()); diagram_view->setFrameStyle(QFrame::Plain | QFrame::NoFrame); m_diagram_view_list << diagram_view; diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 20604d327..64e160b3d 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -99,8 +99,12 @@ namespace QET { QIcon Forbidden; QIcon FullScreenEnter; QIcon FullScreenExit; - QIcon GoDown; - QIcon GoUp; + QIcon GoBottom; + QIcon GoDown; + QIcon GoDownDouble; + QIcon GoTop; + QIcon GoUp; + QIcon GoUpDouble; QIcon Ground; QIcon Grid; QIcon Hide; @@ -237,6 +241,7 @@ void QET::Icons::initIcons() { IC_CopyFile .addFile(":/ico/16x16/item-copy.png"); DiagramAdd .addFile(":/ico/16x16/folio-new.png"); DiagramAdd .addFile(":/ico/22x22/diagram_add.png"); + Diagram .addFile(":/ico/16x16/diagram.png"); Diagram .addFile(":/ico/diagram.png"); DiagramBg .addFile(":/ico/22x22/diagram_bg.png"); DiagramDelete .addFile(":/ico/16x16/folio-delete.png"); @@ -358,10 +363,14 @@ void QET::Icons::initIcons() { FullScreenEnter .addFile(":/ico/22x22/view-fullscreen.png"); FullScreenExit .addFile(":/ico/16x16/view-restore.png"); FullScreenExit .addFile(":/ico/22x22/view-restore.png"); + GoBottom .addFile(":/ico/16x16/go-bottom.png"); GoDown .addFile(":/ico/16x16/go-down.png"); GoDown .addFile(":/ico/22x22/go-down.png"); + GoDownDouble .addFile(":/ico/16x16/go-down-double.png"); + GoTop .addFile(":/ico/16x16/go-top.png"); GoUp .addFile(":/ico/16x16/go-up.png"); GoUp .addFile(":/ico/22x22/go-up.png"); + GoUpDouble .addFile(":/ico/16x16/go-up-double.png"); Ground .addFile(":/ico/16x16/ground.png"); Grid .addFile(":/ico/16x16/grid.png"); Grid .addFile(":/ico/22x22/grid.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 9d5e5d2c6..dd0a34aa7 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -105,8 +105,12 @@ namespace QET { extern QIcon Forbidden; extern QIcon FullScreenEnter; extern QIcon FullScreenExit; - extern QIcon GoDown; - extern QIcon GoUp; + extern QIcon GoBottom; + extern QIcon GoDown; + extern QIcon GoDownDouble; + extern QIcon GoTop; + extern QIcon GoUp; + extern QIcon GoUpDouble; extern QIcon Ground; extern QIcon Grid; extern QIcon Hide;