From 1c2b3baba79ccc52a548191a1976a220fa078ee8 Mon Sep 17 00:00:00 2001
From: blacksun
 <blacksun@r5936  blacksun  2019-06-24 19:44:37 +0200 (lun. 24 juin 2019)>
Date: Mon, 4 Mar 2019 08:55:06 +0000
Subject: [PATCH] Minor : update gui layout. Fix : change grid step doesn't
 applyed

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5754 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/diagram.cpp                           |  12 +-
 .../ui/configpage/generalconfigurationpage.h  |   8 +-
 .../ui/configpage/generalconfigurationpage.ui | 194 ++++++++++--------
 3 files changed, 116 insertions(+), 98 deletions(-)

diff --git a/sources/diagram.cpp b/sources/diagram.cpp
index 7067cb657..2ff36bcf3 100644
--- a/sources/diagram.cpp
+++ b/sources/diagram.cpp
@@ -154,8 +154,8 @@ void Diagram::drawBackground(QPainter *p, const QRectF &r) {
 
 			//If user allow zoom out beyond of folio, we draw grid outside of border.
 		QSettings settings;
-		int xGrid = settings.value("DiagramEditor_xGrid_sb", Diagram::xGrid).toInt();
-		int yGrid = settings.value("DiagramEditor_yGrid_sb", Diagram::yGrid).toInt();
+		int xGrid = settings.value("diagrameditor/Xgrid", Diagram::xGrid).toInt();
+		int yGrid = settings.value("diagrameditor/Ygrid", Diagram::yGrid).toInt();
 		QRectF rect = settings.value("diagrameditor/zoom-out-beyond-of-folio", false).toBool() ?
 						  r :
 						  border_and_titleblock.insideBorderRect().intersected(r);
@@ -285,10 +285,10 @@ void Diagram::wheelEvent(QGraphicsSceneWheelEvent *event)
 void Diagram::keyPressEvent(QKeyEvent *event)
 {
 	QSettings settings;
-	int xKeyGrid = settings.value("DiagramEditor_xKeyGrid_sb", Diagram::xKeyGrid).toInt();
-	int yKeyGrid = settings.value("DiagramEditor_yKeyGrid_sb", Diagram::yKeyGrid).toInt();
-    int xKeyGridFine = settings.value("DiagramEditor_xKeyGridFine_sb", Diagram::xKeyGridFine).toInt();
-    int yKeyGridFine = settings.value("DiagramEditor_yKeyGridFine_sb", Diagram::yKeyGridFine).toInt();
+	int xKeyGrid = settings.value("diagrameditor/key_Xgrid", Diagram::xKeyGrid).toInt();
+	int yKeyGrid = settings.value("diagrameditor/key_Ygrid", Diagram::yKeyGrid).toInt();
+	int xKeyGridFine = settings.value("iagrameditor/key_fine_Xgrid", Diagram::xKeyGridFine).toInt();
+	int yKeyGridFine = settings.value("diagrameditor/key_fine_Ygrid", Diagram::yKeyGridFine).toInt();
 	event->setAccepted(false);
 	
 	if (m_event_interface) {
diff --git a/sources/ui/configpage/generalconfigurationpage.h b/sources/ui/configpage/generalconfigurationpage.h
index 30d80bf99..162355358 100644
--- a/sources/ui/configpage/generalconfigurationpage.h
+++ b/sources/ui/configpage/generalconfigurationpage.h
@@ -1,4 +1,4 @@
-/*
+/*
 	Copyright 2006-2019 The QElectroTech Team
 	This file is part of QElectroTech.
 	
@@ -30,8 +30,8 @@ class GeneralConfigurationPage : public ConfigPage
 	Q_OBJECT
 	
 	public:
-		explicit GeneralConfigurationPage(QWidget *parent = 0);
-		~GeneralConfigurationPage();
+		explicit GeneralConfigurationPage(QWidget *parent = nullptr);
+		~GeneralConfigurationPage() override;
 	
 		virtual void applyConf() override;
 		virtual QString title() const override;
@@ -50,7 +50,7 @@ class GeneralConfigurationPage : public ConfigPage
 		
 		
 		
-		private:
+	private:
 		void fillLang();
 	
 	private:
diff --git a/sources/ui/configpage/generalconfigurationpage.ui b/sources/ui/configpage/generalconfigurationpage.ui
index 0d0ef5900..ee868823e 100644
--- a/sources/ui/configpage/generalconfigurationpage.ui
+++ b/sources/ui/configpage/generalconfigurationpage.ui
@@ -6,40 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>998</width>
-    <height>500</height>
+    <width>893</width>
+    <height>481</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>500</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_5">
+   <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>980</width>
-       <height>500</height>
-      </size>
-     </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
@@ -474,16 +450,21 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
          <property name="title">
           <string>Grille : 1 - 30</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <item row="0" column="0">
-           <widget class="QLabel" name="Label_Diagram_xGrid">
-            <property name="text">
-             <string>DiagramEditor xGrid</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
+         <property name="flat">
+          <bool>false</bool>
+         </property>
+         <property name="checkable">
+          <bool>false</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_6">
+          <item row="0" column="2">
            <widget class="QSpinBox" name="DiagramEditor_xGrid_sb">
+            <property name="minimumSize">
+             <size>
+              <width>80</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="minimum">
              <number>1</number>
             </property>
@@ -498,8 +479,28 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="1" column="0">
+           <widget class="QLabel" name="Label_Diagram_yGrid">
+            <property name="text">
+             <string>DiagramEditor yGrid</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="Label_Grid_Tip">
+            <property name="text">
+             <string>La Grille doite etre active pour pouvoir voir les modifications.</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
            <widget class="QSpinBox" name="DiagramEditor_yGrid_sb">
+            <property name="minimumSize">
+             <size>
+              <width>80</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="minimum">
              <number>1</number>
             </property>
@@ -511,22 +512,15 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="Label_Diagram_yGrid">
+          <item row="0" column="0">
+           <widget class="QLabel" name="Label_Diagram_xGrid">
             <property name="text">
-             <string>DiagramEditor yGrid</string>
+             <string>DiagramEditor xGrid</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QLabel" name="Label_Grid_Tip">
-            <property name="text">
-             <string>La Grille doite etre active pour pouvoir voir les modifications.</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <spacer name="horizontalSpacer_4">
+          <item row="0" column="1">
+           <spacer name="horizontalSpacer_6">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
@@ -547,6 +541,50 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
           <string>Déplacement au clavier : 1 - 30</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_10">
+          <item row="0" column="2">
+           <widget class="QSpinBox" name="DiagramEditor_xKeyGrid_sb">
+            <property name="minimumSize">
+             <size>
+              <width>80</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>30</number>
+            </property>
+            <property name="singleStep">
+             <number>1</number>
+            </property>
+            <property name="value">
+             <number>10</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QSpinBox" name="DiagramEditor_yKeyGrid_sb">
+            <property name="minimumSize">
+             <size>
+              <width>80</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>30</number>
+            </property>
+            <property name="singleStep">
+             <number>1</number>
+            </property>
+            <property name="value">
+             <number>10</number>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="Label_Diagram_Key_xGrid">
             <property name="text">
@@ -562,38 +600,6 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QSpinBox" name="DiagramEditor_xKeyGrid_sb">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>30</number>
-            </property>
-            <property name="singleStep">
-             <number>1</number>
-            </property>
-            <property name="value">
-             <number>10</number>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="DiagramEditor_yKeyGrid_sb">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>30</number>
-            </property>
-            <property name="singleStep">
-             <number>1</number>
-            </property>
-            <property name="value">
-             <number>10</number>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2">
            <spacer name="horizontalSpacer_5">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -622,8 +628,14 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QSpinBox" name="DiagramEditor_xKeyGridFine_sb">
+          <item row="1" column="3">
+           <widget class="QSpinBox" name="DiagramEditor_yKeyGridFine_sb">
+            <property name="minimumSize">
+             <size>
+              <width>80</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="minimum">
              <number>1</number>
             </property>
@@ -645,8 +657,14 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QSpinBox" name="DiagramEditor_yKeyGridFine_sb">
+          <item row="0" column="3">
+           <widget class="QSpinBox" name="DiagramEditor_xKeyGridFine_sb">
+            <property name="minimumSize">
+             <size>
+              <width>80</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="minimum">
              <number>1</number>
             </property>
@@ -661,8 +679,8 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <spacer name="horizontalSpacer_6">
+          <item row="0" column="2">
+           <spacer name="horizontalSpacer_4">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>