Index: diagram.cpp
===================================================================
--- diagram.cpp	(révision 5734)
+++ diagram.cpp	(copie de travail)
@@ -38,8 +38,8 @@
 #include "undocommand/addelementtextcommand.h"
 #include "QPropertyUndoCommand/qpropertyundocommand.h"
 
-const int   Diagram::xGrid  = 10;
-const int   Diagram::yGrid  = 10;
+int   Diagram::xGrid  = 10;
+int   Diagram::yGrid  = 10;
 const qreal Diagram::margin = 5.0;
 
 // static variable to keep track of present background color of the diagram.
@@ -150,6 +150,8 @@
 
 			//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();
 		QRectF rect = settings.value("diagrameditor/zoom-out-beyond-of-folio", false).toBool() ?
 						  r :
 						  border_and_titleblock.insideBorderRect().intersected(r);
Index: diagram.h
===================================================================
--- diagram.h	(révision 5734)
+++ diagram.h	(copie de travail)
@@ -73,9 +73,9 @@
 		/// Diagram dimensions and title block
 		BorderTitleBlock border_and_titleblock;
 		/// abscissa grid step size
-		static const int xGrid;
+        static int xGrid;
 		/// ordinate grid step size
-		static const int yGrid;
+        static int yGrid;
 		/// margin around the diagram
 		static const qreal margin;
 		/// background color of diagram
Index: ui/configpage/generalconfigurationpage.cpp
===================================================================
--- ui/configpage/generalconfigurationpage.cpp	(révision 5734)
+++ ui/configpage/generalconfigurationpage.cpp	(copie de travail)
@@ -35,6 +35,8 @@
 	
 	QSettings settings;
 	
+    ui->DiagramEditor_xGrid_sb->setValue(settings.value("DiagramEditor_xGrid_sb", 10).toInt());
+    ui->DiagramEditor_yGrid_sb->setValue(settings.value("DiagramEditor_yGrid_sb", 10).toInt());
 	ui->m_use_system_color_cb->setChecked(settings.value("usesystemcolors", "true").toBool());
 	bool tabbed = settings.value("diagrameditor/viewmode", "tabbed") == "tabbed";
 	if(tabbed)
@@ -137,7 +139,9 @@
 	settings.setValue("diagrameditor/autosave-interval", ui->m_autosave_sb->value());
 	settings.setValue("dynamic_rotation", ui->m_rotation->value());
 	settings.setValue("dynamic_with", ui->m_text_width_sb->value());
-	
+    settings.setValue("DiagramEditor_xGrid_sb", ui->DiagramEditor_xGrid_sb->value());
+    settings.setValue("DiagramEditor_yGrid_sb", ui->DiagramEditor_yGrid_sb->value());
+
 	QString path = settings.value("elements-collections/common-collection-path").toString();
 	if (ui->m_common_elmt_path_cb->currentIndex() == 1)
 	{
Index: ui/configpage/generalconfigurationpage.ui
===================================================================
--- ui/configpage/generalconfigurationpage.ui	(révision 5734)
+++ ui/configpage/generalconfigurationpage.ui	(copie de travail)
@@ -41,7 +41,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>5</number>
      </property>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
@@ -464,7 +464,92 @@
        </item>
       </layout>
      </widget>
+    <widget class="QWidget" name="Grid">
+      <attribute name="title">
+       <string>Grid</string>
+      </attribute>
+      <widget class="QLabel" name="Label_Diagram_xGrid">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>10</y>
+         <width>191</width>
+         <height>30</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>DiagramEditor xGrid</string>
+       </property>
+      </widget>
+      <widget class="QLabel" name="Label_Diagram_yGrid">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>50</y>
+         <width>191</width>
+         <height>30</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>DiagramEditor yGrid</string>
+       </property>
+      </widget>
+      <widget class="QSpinBox" name="DiagramEditor_xGrid_sb">
+       <property name="geometry">
+        <rect>
+         <x>220</x>
+         <y>10</y>
+         <width>55</width>
+         <height>30</height>
+        </rect>
+       </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>10</number>
+       </property>
+       <property name="singleStep">
+        <number>1</number>
+       </property>
+       <property name="value">
+        <number>10</number>
+       </property>
+      </widget>
+      <widget class="QSpinBox" name="DiagramEditor_yGrid_sb">
+       <property name="geometry">
+        <rect>
+         <x>220</x>
+         <y>50</y>
+         <width>55</width>
+         <height>30</height>
+        </rect>
+       </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>10</number>
+       </property>
+       <property name="value">
+        <number>10</number>
+       </property>
+      </widget>
+      <widget class="QLabel" name="Label_DiagramGrid">
+       <property name="geometry">
+        <rect>
+         <x>20</x>
+         <y>100</y>
+         <width>251</width>
+         <height>30</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Grid on/off = See the change</string>
+       </property>
+     </widget>
     </widget>
+   </widget> 
    </item>
   </layout>
  </widget>