QetElementEditor : rewrite gui with ui file

sources/ElementsCollection/elementscollectionwidget.cpp

@@ -17,7 +17,7 @@
 */
 #include "elementscollectionwidget.h"
 
-#include "../editor/qetelementeditor.h"
+#include "../editor/ui/qetelementeditor.h"
 #include "../elementscategoryeditor.h"
 #include "../newelementwizard.h"
 #include "../qetapp.h"
@@ -38,6 +38,9 @@
 #include <QUrl>
 #include <QVBoxLayout>
 #include <QtGlobal>
+#include <QProgressBar>
+#include <QStatusBar>
+#include <QLineEdit>
 
 /**
 	@brief ElementsCollectionWidget::ElementsCollectionWidget

sources/editor/elementitemeditor.cpp

@@ -16,7 +16,7 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "elementitemeditor.h"
-#include "qetelementeditor.h"
+#include "ui/qetelementeditor.h"
 #include "editorcommands.h"
 
 /**

sources/editor/elementscene.cpp

@@ -33,7 +33,7 @@
 #include "graphicspart/partrectangle.h"
 #include "graphicspart/partterminal.h"
 #include "graphicspart/parttext.h"
-#include "qetelementeditor.h"
+#include "ui/qetelementeditor.h"
 #include "ui/elementpropertieseditorwidget.h"
 
 #include <QKeyEvent>

sources/editor/elementview.cpp

@@ -19,7 +19,7 @@
 
 #include "../qetapp.h"
 #include "UndoCommand/pastepartscommand.h"
-#include "qetelementeditor.h"
+#include "ui/qetelementeditor.h"
 /**
 	Constructeur
 	@param scene ElementScene visualisee par cette ElementView

sources/editor/esevent/eseventaddline.cpp

@@ -20,7 +20,7 @@
 #include "../editorcommands.h"
 #include "../elementscene.h"
 #include "../graphicspart/partline.h"
-#include "../qetelementeditor.h"
+#include "../ui/qetelementeditor.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QObject>

sources/editor/esevent/eseventinterface.cpp

@@ -18,7 +18,8 @@
 #include "eseventinterface.h"
 
 #include "../elementscene.h"
-#include "../qetelementeditor.h"
+#include "../ui/qetelementeditor.h"
+#include "../elementview.h"
 
 #include <QGraphicsSceneMouseEvent>
 
@@ -40,7 +41,7 @@ ESEventInterface::ESEventInterface(ElementScene *scene) :
 void ESEventInterface::init()
 {
 	m_scene->setBehavior(ElementScene::Behavior::AddPart);
-	m_editor->slot_setNoDragToView();
+	m_editor->elementView()->setDragMode(QGraphicsView::NoDrag);
 }
 
 /**
@@ -53,31 +54,31 @@ ESEventInterface::~ESEventInterface()
 	delete m_help_verti;
 
 	m_scene->setBehavior(ElementScene::Behavior::Normal);
-	m_editor->slot_setRubberBandToView();
+	m_editor->elementView()->setDragMode(QGraphicsView::RubberBandDrag);
 }
 
 bool ESEventInterface::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
-	Q_UNUSED (event);
+	Q_UNUSED (event)
 	return false;
 }
 
 bool ESEventInterface::mousePressEvent(QGraphicsSceneMouseEvent *event) {
-	Q_UNUSED (event);
+	Q_UNUSED (event)
 	return false;
 }
 
 bool ESEventInterface::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
-	Q_UNUSED (event);
+	Q_UNUSED (event)
 	return false;
 }
 
 bool ESEventInterface::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
-	Q_UNUSED (event);
+	Q_UNUSED (event)
 	return false;
 }
 
 bool ESEventInterface::wheelEvent(QGraphicsSceneWheelEvent *event) {
-	Q_UNUSED (event);
+	Q_UNUSED (event)
 	return false;
 }
 
@@ -97,7 +98,7 @@ bool ESEventInterface::keyPressEvent(QKeyEvent *event) {
 }
 
 bool ESEventInterface::KeyReleaseEvent(QKeyEvent *event) {
-	Q_UNUSED (event);
+	Q_UNUSED (event)
 	return false;
 }
 

sources/editor/graphicspart/customelementpart.cpp

@@ -17,7 +17,8 @@
 */
 #include "customelementpart.h"
 
-#include "../qetelementeditor.h"
+#include "../ui/qetelementeditor.h"
+#include "../elementscene.h"
 
 /// @return le QETElementEditor auquel cet editeur appartient
 QETElementEditor *CustomElementPart::elementEditor() const

sources/editor/graphicspart/partpolygon.cpp

@@ -22,7 +22,7 @@
 #include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
 #include "../../qeticons.h"
 #include "../elementscene.h"
-#include "../qetelementeditor.h"
+#include "../ui/qetelementeditor.h"
 
 /**
 	@brief PartPolygon::PartPolygon

sources/editor/qetelementeditor.h

@@ -1,189 +0,0 @@
-/*
-	Copyright 2006-2020 The QElectroTech Team
-	This file is part of QElectroTech.
-	
-	QElectroTech is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-	
-	QElectroTech is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef CUSTOM_ELEMENT_EDITOR_H
-#define CUSTOM_ELEMENT_EDITOR_H
-#include "../ElementsCollection/elementslocation.h"
-#include "../qet.h"
-#include "../qetmainwindow.h"
-#include "elementscene.h"
-
-class ElementItemEditor;
-class ElementView;
-
-/**
-	This class represents an element editor, allowing users to draw, change and
-	configure a particular electrical element.
-*/
-class QETElementEditor : public QETMainWindow {
-	Q_OBJECT
-
-	// constructor, destructor
-	public:
-		QETElementEditor(QWidget * = nullptr);
-		~QETElementEditor() override;
-	private:
-		QETElementEditor(const QETElementEditor &);
-		void setupActions();
-		void setupMenus();
-		void setupInterface();
-
-	// attributes
-	private:
-		/// whether the editor is "read-only"
-		bool read_only;
-		/// menus
-		QMenu *file_menu, *edit_menu, *paste_from_menu, *display_menu, *tools_menu;
-		/// view widget for the editing scene
-		ElementView *m_view;
-		/// editing scene
-		ElementScene *m_elmt_scene;
-		/// container for widgets dedicated to primitive edition
-		QDockWidget *m_tools_dock;
-		/// Stack of widgets for tools_dock
-		QStackedWidget *m_tools_dock_stack;
-		/// label displayed when several primitives are selected
-		QLabel *m_default_informations;
-		/// Hash associating primitive names with their matching edition widget
-		QHash<QString, ElementItemEditor *> m_editors;
-		/// container for the undo list
-		QDockWidget *m_undo_dock;
-		/// Container for the list of existing primitives
-		QDockWidget *m_parts_dock;
-		/// List of primitives
-		QListWidget *m_parts_list;
-		/// actions for the "file" menu
-		QAction *new_element, *open, *open_dxf, *open_file, *save, *save_as, *save_as_file, *reload, *quit;
-		/// actions for the "edit" menu
-		QAction *selectall, *deselectall, *inv_select;
-		QAction *cut, *copy, *paste, *paste_in_area, *paste_from_file, *paste_from_elmt;
-		QAction *undo, *redo;
-		QAction *edit_delete, *edit_size_hs, *edit_names, *edit_author, *m_edit_properties;
-		/// toolbars
-		QToolBar *parts_toolbar, *main_toolbar, *view_toolbar, *depth_toolbar, *element_toolbar;
-		/// Action group
-		QActionGroup *parts, *m_zoom_ag, *m_depth_action_group;
-		/// minimum window title
-		QString min_title;
-		/// filename of the currently edited element
-		QString filename_;
-		/// location of the currently edited element
-		ElementsLocation location_;
-		/// whether the currently edited element comes from a file or a location
-		bool opened_from_file;
-
-	// methods
-	public:
-		void setNames(const NamesList &);
-		void setLocation(const ElementsLocation &);
-		ElementsLocation location() const;
-		void setFileName(const QString &);
-		QString fileName() const;
-		void setReadOnly(bool);
-		bool isReadOnly() const;
-		void fromFile(const QString &);
-		void fromLocation(const ElementsLocation &);
-		bool toFile(const QString &);
-		bool toLocation(const ElementsLocation &location);
-		bool isEditing(const ElementsLocation &);
-		bool isEditing(const QString &);
-		ElementScene *elementScene() const;
-		void readSettings();
-		void writeSettings();
-		static QPointF pasteOffset();
-		static QString getOpenElementFileName(QWidget * = nullptr, const QString & = QString());
-		void contextMenu(QPoint p, QList<QAction *> actions = QList<QAction*>());
-
-	signals:
-		void saveToLocation(ElementsLocation loc);
-
-	protected:
-		void closeEvent(QCloseEvent *) override;
-		void firstActivation(QEvent *) override;
-
-	private:
-		bool canClose();
-		QWidget *clearToolsDock();
-		void copyAndPasteXml(const QDomDocument &);
-	
-	public slots:
-		void addLine();
-		void addRect();
-		void addEllipse();
-		void addPolygon();
-		void addArc();
-		void addText();
-		void addTerminal();
-		void addDynamicTextField();
-		void UncheckAddPrimitive();
-
-		void slot_new();
-		void slot_open();
-		void slot_openDxf();
-		void slot_openFile();
-		void openRecentFile(const QString &);
-		void openElement(const QString &);
-		void slot_reload();
-		bool slot_save();
-		bool slot_saveAs();
-		bool slot_saveAsFile();
-		void slot_setRubberBandToView();
-		void slot_setNoDragToView();
-		void slot_updateInformations();
-		void slot_updateMenus();
-		void slot_updateTitle();
-		void slot_createPartsList();
-		void slot_updatePartsList();
-		void slot_updateSelectionFromPartsList();
-		bool checkElement();
-		void pasteFromFile();
-		void pasteFromElement();
-		void updateCurrentPartEditor();
-};
-
-/**
-	@param nameslist the new list of names for the currently edited element
-*/
-inline void QETElementEditor::setNames(const NamesList &nameslist) {
-	m_elmt_scene -> setNames(nameslist);
-}
-
-/**
-	@return the location of the currently edited element
-*/
-inline ElementsLocation QETElementEditor::location() const
-{
-	return(location_);
-}
-
-/**
-	@return the filename of the currently edited element
-*/
-inline QString QETElementEditor::fileName() const
-{
-	return(filename_);
-}
-
-/**
-	@return the editing scene
-*/
-inline ElementScene *QETElementEditor::elementScene() const
-{
-	return(m_elmt_scene);
-}
-
-#endif

sources/editor/ui/dynamictextfieldeditor.cpp

@@ -24,7 +24,8 @@
 #include "../../qetinformation.h"
 #include "../../ui/alignmenttextdialog.h"
 #include "../../ui/compositetexteditdialog.h"
-#include "../qetelementeditor.h"
+#include "../ui/qetelementeditor.h"
+#include "../elementscene.h"
 #include "ui_dynamictextfieldeditor.h"
 
 #include <QColorDialog>

sources/editor/ui/qetelementeditor.h

@@ -0,0 +1,163 @@
+/*
+	Copyright 2006-2021 The QElectroTech Team
+	This file is part of QElectroTech.
+
+	QElectroTech is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	QElectroTech is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef QETELEMENTEDITOR_H
+#define QETELEMENTEDITOR_H
+
+#include <QMainWindow>
+#include "../../ElementsCollection/elementslocation.h"
+
+class ElementScene;
+class QActionGroup;
+class ElementItemEditor;
+class ElementView;
+class QListWidget;
+class QStackedWidget;
+class QLabel;
+
+namespace Ui {
+	class QETElementEditor;
+}
+
+class QETElementEditor : public QMainWindow
+{
+		Q_OBJECT
+	signals:
+		void saveToLocation(ElementsLocation loc);
+
+	public:
+		explicit QETElementEditor(QWidget *parent = nullptr);
+		~QETElementEditor() override;
+
+		void contextMenu(QPoint p, QList<QAction *> actions = QList<QAction *>());
+		void setNames(const NamesList &name_list);
+		void setLocation(const ElementsLocation &location);
+		ElementsLocation location() const;
+		void setFileName(const QString &file_name);
+		QString fileName() const;
+		void setReadOnly(bool ro);
+		bool isReadOnly() const;
+		void fromFile(const QString &filepath);
+		bool toFile(const QString &filepath);
+		void fromLocation(const ElementsLocation &location);
+		bool toLocation(const ElementsLocation &location);
+		bool isEditing(const ElementsLocation &location);
+		bool isEditing(const QString &filepath);
+		ElementScene *elementScene() const;
+		ElementView *elementView() const;
+		static QPointF pasteOffset();
+		static QString getOpenElementFileName(QWidget *parent = nullptr, const QString &dir = QString());
+		void updateTitle();
+		void fillPartsList();
+		void UncheckAddPrimitive();
+		void updateCurrentPartEditor();
+		void updateInformations();
+		void updatePartsList();
+		void updateSelectionFromPartsList();
+		void openElement(const QString &filepath);
+		bool checkElement();
+
+	protected:
+		bool event(QEvent *event) override;
+		void closeEvent(QCloseEvent *) override;
+
+
+	private slots:
+		bool on_m_save_action_triggered();
+		bool on_m_save_as_action_triggered();
+		void on_m_select_all_act_triggered();
+		void on_m_edit_element_properties_action_triggered();
+		void on_m_new_action_triggered();
+		void on_m_open_action_triggered();
+		void on_m_open_from_file_action_triggered();
+		void on_m_open_dxf_action_triggered();
+		bool on_m_save_as_file_action_triggered();
+		void on_m_reload_action_triggered();
+		void on_m_quit_action_triggered();
+		void on_m_deselect_all_action_triggered();
+		void on_m_cut_action_triggered();
+		void on_m_copy_action_triggered();
+		void on_m_paste_action_triggered();
+		void on_m_paste_in_area_action_triggered();
+		void on_m_paste_from_file_action_triggered();
+		void on_m_paste_from_element_action_triggered();
+		void on_m_revert_selection_action_triggered();
+		void on_m_delete_action_triggered();
+		void on_m_edit_names_action_triggered();
+		void on_m_edit_author_action_triggered();
+		void on_m_zoom_in_action_triggered();
+		void on_m_zoom_out_action_triggered();
+		void on_m_zoom_fit_best_action_triggered();
+		void on_m_zoom_original_action_triggered();
+		void on_m_about_qet_action_triggered();
+		void on_m_online_manual_triggered();
+		void on_m_youtube_action_triggered();
+		void on_m_donate_action_triggered();
+		void on_m_about_qt_action_triggered();
+
+	private:
+		bool canClose();
+		void readSettings();
+		void writeSettings() const;
+		void setupActions();
+		void updateAction();
+		void setupConnection();
+		void initGui();
+		QWidget *clearToolsDock();
+		void copyAndPasteXml(const QDomDocument &xml_document);
+
+	private:
+		Ui::QETElementEditor *ui;
+
+		bool
+			m_read_only        = false,
+			m_opened_from_file = false,
+			m_first_activation = true;
+
+		ElementScene *m_elmt_scene = nullptr;
+
+		QActionGroup
+			*m_add_part_action_grp = nullptr,
+			*m_depth_action_group  = nullptr;
+
+		QList<QAction *> m_context_menu_action_list;
+
+		QAction
+			*m_undo_action = nullptr,
+			*m_redo_action = nullptr;
+
+
+			/// Hash associating primitive names with their matching edition widget
+		QHash<QString, ElementItemEditor *> m_editors;
+
+		ElementsLocation m_location;
+
+		QString
+			m_file_name,
+			m_min_title;
+
+		ElementView *m_view = nullptr;
+
+		QListWidget *m_parts_list = nullptr;
+
+		QStackedWidget *m_tools_dock_stack = nullptr;
+
+		QLabel *m_default_informations = nullptr;
+
+};
+
+#endif // QETELEMENTEDITOR_H

sources/editor/ui/qetelementeditor.ui

@@ -0,0 +1,496 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QETElementEditor</class>
+ <widget class="QMainWindow" name="QETElementEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>QElectroTech - Éditeur d'élément</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../../../qelectrotech.qrc">
+    <normaloff>:/ico/16x16/qet.png</normaloff>:/ico/16x16/qet.png</iconset>
+  </property>
+  <widget class="QWidget" name="centralwidget"/>
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="m_file_menu">
+    <property name="title">
+     <string>&amp;Fichier</string>
+    </property>
+    <addaction name="m_new_action"/>
+    <addaction name="m_open_action"/>
+    <addaction name="m_open_from_file_action"/>
+    <addaction name="m_open_dxf_action"/>
+    <addaction name="m_save_action"/>
+    <addaction name="m_save_as_action"/>
+    <addaction name="m_save_as_file_action"/>
+    <addaction name="separator"/>
+    <addaction name="m_reload_action"/>
+    <addaction name="separator"/>
+    <addaction name="m_quit_action"/>
+   </widget>
+   <widget class="QMenu" name="m_edit_menu">
+    <property name="title">
+     <string>&amp;Édition</string>
+    </property>
+    <widget class="QMenu" name="m_paste_from_menu">
+     <property name="title">
+      <string>Coller depuis...</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../../qelectrotech.qrc">
+       <normaloff>:/ico/16x16/edit-paste.png</normaloff>:/ico/16x16/edit-paste.png</iconset>
+     </property>
+     <addaction name="m_paste_from_file_action"/>
+     <addaction name="m_paste_from_element_action"/>
+    </widget>
+    <addaction name="separator"/>
+    <addaction name="m_select_all_act"/>
+    <addaction name="m_deselect_all_action"/>
+    <addaction name="m_revert_selection_action"/>
+    <addaction name="separator"/>
+    <addaction name="m_cut_action"/>
+    <addaction name="m_copy_action"/>
+    <addaction name="m_paste_action"/>
+    <addaction name="m_paste_in_area_action"/>
+    <addaction name="m_paste_from_menu"/>
+    <addaction name="separator"/>
+    <addaction name="m_delete_action"/>
+    <addaction name="separator"/>
+    <addaction name="m_edit_names_action"/>
+    <addaction name="m_edit_author_action"/>
+    <addaction name="m_edit_element_properties_action"/>
+   </widget>
+   <widget class="QMenu" name="m_display_menu">
+    <property name="title">
+     <string>Afficha&amp;ge</string>
+    </property>
+    <addaction name="m_zoom_in_action"/>
+    <addaction name="m_zoom_out_action"/>
+    <addaction name="m_zoom_fit_best_action"/>
+    <addaction name="m_zoom_original_action"/>
+    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="menu_Aide">
+    <property name="title">
+     <string>&amp;Aide</string>
+    </property>
+    <addaction name="separator"/>
+    <addaction name="m_about_qet_action"/>
+    <addaction name="m_online_manual"/>
+    <addaction name="m_youtube_action"/>
+    <addaction name="m_donate_action"/>
+    <addaction name="m_about_qt_action"/>
+   </widget>
+   <addaction name="m_file_menu"/>
+   <addaction name="m_edit_menu"/>
+   <addaction name="m_display_menu"/>
+   <addaction name="menu_Aide"/>
+  </widget>
+  <widget class="QDockWidget" name="m_undo_dock">
+   <property name="allowedAreas">
+    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
+   </property>
+   <property name="windowTitle">
+    <string>Annulations</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents"/>
+  </widget>
+  <widget class="QDockWidget" name="m_parts_dock">
+   <property name="allowedAreas">
+    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
+   </property>
+   <property name="windowTitle">
+    <string>Parties</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents_2"/>
+  </widget>
+  <widget class="QDockWidget" name="m_tools_dock">
+   <property name="allowedAreas">
+    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
+   </property>
+   <property name="windowTitle">
+    <string>Informations</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents_3"/>
+  </widget>
+  <widget class="QToolBar" name="m_main_toolbar">
+   <property name="windowTitle">
+    <string>Outils</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="m_new_action"/>
+   <addaction name="m_open_action"/>
+   <addaction name="m_save_action"/>
+   <addaction name="m_save_as_action"/>
+   <addaction name="m_reload_action"/>
+   <addaction name="m_delete_action"/>
+  </widget>
+  <widget class="QToolBar" name="m_view_toolbar">
+   <property name="windowTitle">
+    <string>Affichage</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="m_zoom_in_action"/>
+   <addaction name="m_zoom_out_action"/>
+   <addaction name="m_zoom_fit_best_action"/>
+   <addaction name="m_zoom_original_action"/>
+  </widget>
+  <widget class="QToolBar" name="m_element_toolbar">
+   <property name="windowTitle">
+    <string>Élément</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="m_edit_names_action"/>
+   <addaction name="m_edit_element_properties_action"/>
+  </widget>
+  <widget class="QToolBar" name="m_undo_toolbar">
+   <property name="windowTitle">
+    <string>Annulation</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <action name="m_select_all_act">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/edit-select-all.png</normaloff>:/ico/16x16/edit-select-all.png</iconset>
+   </property>
+   <property name="text">
+    <string>Tout sélectionner</string>
+   </property>
+  </action>
+  <action name="m_new_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/document-new.png</normaloff>:/ico/22x22/document-new.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Nouveau</string>
+   </property>
+  </action>
+  <action name="m_open_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/folder-open.png</normaloff>:/ico/22x22/folder-open.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Ouvrir</string>
+   </property>
+  </action>
+  <action name="m_open_from_file_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/folder-open.png</normaloff>:/ico/22x22/folder-open.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Ouvrir depuis un fichier</string>
+   </property>
+  </action>
+  <action name="m_open_dxf_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/run-dxf.png</normaloff>:/ico/16x16/run-dxf.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Lancer le plugin convertisseur DXF</string>
+   </property>
+  </action>
+  <action name="m_save_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/document-save.png</normaloff>:/ico/22x22/document-save.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Enregistrer</string>
+   </property>
+  </action>
+  <action name="m_save_as_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/document-save-as.png</normaloff>:/ico/22x22/document-save-as.png</iconset>
+   </property>
+   <property name="text">
+    <string>Enregistrer sous</string>
+   </property>
+  </action>
+  <action name="m_save_as_file_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/document-save.png</normaloff>:/ico/22x22/document-save.png</iconset>
+   </property>
+   <property name="text">
+    <string>Enregistrer dans un fichier</string>
+   </property>
+  </action>
+  <action name="m_reload_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/view-refresh.png</normaloff>:/ico/22x22/view-refresh.png</iconset>
+   </property>
+   <property name="text">
+    <string>Recharger</string>
+   </property>
+  </action>
+  <action name="m_quit_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/application-exit.png</normaloff>:/ico/16x16/application-exit.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Quitter</string>
+   </property>
+  </action>
+  <action name="m_deselect_all_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/edit-select-none.png</normaloff>:/ico/16x16/edit-select-none.png</iconset>
+   </property>
+   <property name="text">
+    <string>Désélectionner tout</string>
+   </property>
+  </action>
+  <action name="m_cut_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/edit-cut.png</normaloff>:/ico/16x16/edit-cut.png</iconset>
+   </property>
+   <property name="text">
+    <string>Co&amp;uper</string>
+   </property>
+  </action>
+  <action name="m_copy_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/edit-copy.png</normaloff>:/ico/16x16/edit-copy.png</iconset>
+   </property>
+   <property name="text">
+    <string>Cop&amp;ier</string>
+   </property>
+  </action>
+  <action name="m_paste_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/edit-paste.png</normaloff>:/ico/16x16/edit-paste.png</iconset>
+   </property>
+   <property name="text">
+    <string>C&amp;oller</string>
+   </property>
+  </action>
+  <action name="m_paste_in_area_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/edit-paste.png</normaloff>:/ico/16x16/edit-paste.png</iconset>
+   </property>
+   <property name="text">
+    <string>C&amp;oller dans la zone</string>
+   </property>
+  </action>
+  <action name="m_paste_from_file_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/text-xml.png</normaloff>:/ico/16x16/text-xml.png</iconset>
+   </property>
+   <property name="text">
+    <string>Un fichier</string>
+   </property>
+  </action>
+  <action name="m_paste_from_element_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/element.png</normaloff>:/ico/16x16/element.png</iconset>
+   </property>
+   <property name="text">
+    <string>Un élément</string>
+   </property>
+  </action>
+  <action name="m_revert_selection_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/edit-select-invert.png</normaloff>:/ico/16x16/edit-select-invert.png</iconset>
+   </property>
+   <property name="text">
+    <string>Inverser la sélection</string>
+   </property>
+  </action>
+  <action name="m_delete_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/edit-delete.png</normaloff>:/ico/22x22/edit-delete.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Supprimer</string>
+   </property>
+  </action>
+  <action name="m_edit_names_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/names.png</normaloff>:/ico/22x22/names.png</iconset>
+   </property>
+   <property name="text">
+    <string>Éditer le nom et les traductions de l'élément</string>
+   </property>
+  </action>
+  <action name="m_edit_author_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/preferences-desktop-user.png</normaloff>:/ico/16x16/preferences-desktop-user.png</iconset>
+   </property>
+   <property name="text">
+    <string>Éditer les informations sur l'auteur</string>
+   </property>
+  </action>
+  <action name="m_edit_element_properties_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/element-edit.png</normaloff>:/ico/22x22/element-edit.png</iconset>
+   </property>
+   <property name="text">
+    <string>Éditer les propriétés de l'élément</string>
+   </property>
+  </action>
+  <action name="m_zoom_in_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/zoom-in.png</normaloff>:/ico/22x22/zoom-in.png</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom avant</string>
+   </property>
+  </action>
+  <action name="m_zoom_out_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/zoom-out.png</normaloff>:/ico/22x22/zoom-out.png</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom arrière</string>
+   </property>
+  </action>
+  <action name="m_zoom_fit_best_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/zoom-fit-best.png</normaloff>:/ico/22x22/zoom-fit-best.png</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom adapté</string>
+   </property>
+  </action>
+  <action name="m_zoom_original_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/22x22/zoom-original.png</normaloff>:/ico/22x22/zoom-original.png</iconset>
+   </property>
+   <property name="text">
+    <string>Pas de zoom</string>
+   </property>
+  </action>
+  <action name="m_about_qet_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/qet.png</normaloff>:/ico/16x16/qet.png</iconset>
+   </property>
+   <property name="text">
+    <string>À &amp;propos de QElectroTech</string>
+   </property>
+   <property name="statusTip">
+    <string>Affiche des informations sur QElectroTech</string>
+   </property>
+  </action>
+  <action name="m_online_manual">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/help-contents.png</normaloff>:/ico/16x16/help-contents.png</iconset>
+   </property>
+   <property name="text">
+    <string>Manuel en ligne</string>
+   </property>
+   <property name="statusTip">
+    <string>Lance le navigateur par défaut vers le manuel en ligne de QElectroTech</string>
+   </property>
+  </action>
+  <action name="m_youtube_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/kdenlive-show-video.png</normaloff>:/ico/16x16/kdenlive-show-video.png</iconset>
+   </property>
+   <property name="text">
+    <string>Chaine Youtube</string>
+   </property>
+   <property name="statusTip">
+    <string>Lance le navigateur par défaut vers la chaine Youtube de QElectroTech</string>
+   </property>
+  </action>
+  <action name="m_donate_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/help-donate.png</normaloff>:/ico/16x16/help-donate.png</iconset>
+   </property>
+   <property name="text">
+    <string>Soutenir le projet par un don</string>
+   </property>
+   <property name="statusTip">
+    <string>Soutenir le projet QElectroTech par un don</string>
+   </property>
+  </action>
+  <action name="m_about_qt_action">
+   <property name="icon">
+    <iconset resource="../../../qelectrotech.qrc">
+     <normaloff>:/ico/16x16/qt.png</normaloff>:/ico/16x16/qt.png</iconset>
+   </property>
+   <property name="text">
+    <string>À propos de &amp;Qt</string>
+   </property>
+   <property name="statusTip">
+    <string>Affiche des informations sur la bibliothèque Qt</string>
+   </property>
+  </action>
+ </widget>
+ <resources>
+  <include location="../../../qelectrotech.qrc"/>
+ </resources>
+ <connections/>
+</ui>

sources/elementspanelwidget.cpp

@@ -18,7 +18,7 @@
 #include "elementspanelwidget.h"
 
 #include "diagram.h"
-#include "editor/qetelementeditor.h"
+#include "editor/ui/qetelementeditor.h"
 #include "elementscategoryeditor.h"
 #include "qetapp.h"
 #include "qeticons.h"

sources/newelementwizard.cpp

@@ -20,10 +20,14 @@
 #include "ElementsCollection/elementcollectionitem.h"
 #include "ElementsCollection/elementscollectionmodel.h"
 #include "NameList/ui/namelistwidget.h"
-#include "editor/qetelementeditor.h"
+#include "editor/ui/qetelementeditor.h"
 #include "qetmessagebox.h"
 #include "qfilenameedit.h"
 
+#include <QTreeView>
+#include <QVBoxLayout>
+#include <QLabel>
+
 /**
 	Constructeur
 	@param parent QWidget parent de ce dialogue

sources/projectview.cpp

@@ -21,7 +21,7 @@
 #include "autoNum/assignvariables.h"
 #include "diagram.h"
 #include "diagramview.h"
-#include "editor/qetelementeditor.h"
+#include "editor/ui/qetelementeditor.h"
 #include "exportdialog.h"
 #include "qetapp.h"
 #include "qeticons.h"

sources/qetapp.cpp

@@ -19,7 +19,7 @@
 
 #include "configdialog.h"
 #include "configpages.h"
-#include "editor/qetelementeditor.h"
+#include "editor/ui/qetelementeditor.h"
 #include "elementscollectioncache.h"
 #include "factory/elementfactory.h"
 #include "factory/elementpicturefactory.h"