From b04c1e1a96219ecdd0f3f28b9494bdcd1852e01e Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Mon, 24 Apr 2017 11:51:06 +0200
Subject: [PATCH] Change name for UI so it matches the naming convention.

---
 ...Basic_dialog_plugin.ui => Basic_dialog.ui} |   0
 .../Three/Example_plugin/Basic_plugin.cpp     |   2 +-
 .../demo/Three/Example_plugin/CMakeLists.txt  |   2 +-
 .../Three/Example_plugin/Example_plugin.ui    | 156 ------------------
 Three/doc/Three/Three.txt                     |   4 +-
 5 files changed, 4 insertions(+), 160 deletions(-)
 rename Three/demo/Three/Example_plugin/{Basic_dialog_plugin.ui => Basic_dialog.ui} (100%)
 delete mode 100644 Three/demo/Three/Example_plugin/Example_plugin.ui

diff --git a/Three/demo/Three/Example_plugin/Basic_dialog_plugin.ui b/Three/demo/Three/Example_plugin/Basic_dialog.ui
similarity index 100%
rename from Three/demo/Three/Example_plugin/Basic_dialog_plugin.ui
rename to Three/demo/Three/Example_plugin/Basic_dialog.ui
diff --git a/Three/demo/Three/Example_plugin/Basic_plugin.cpp b/Three/demo/Three/Example_plugin/Basic_plugin.cpp
index b357e249ccb..568bb284b6a 100644
--- a/Three/demo/Three/Example_plugin/Basic_plugin.cpp
+++ b/Three/demo/Three/Example_plugin/Basic_plugin.cpp
@@ -5,7 +5,7 @@ Change the value of EXAMPLE_COMPLEXITY in the first line to change the behavior
   - 2 : pops-up a little more elaborated dialog asking to enter an integer , then prints it in the Info and console widgets if it was indeed an integer, else pops-up an error message box.
   */
 #define EXAMPLE_COMPLEXITY 0
-#include "ui_Basic_dialog_plugin.h"
+#include "ui_Basic_dialog.h"
 //! [headers_plugin]
 #include <CGAL/Three/Polyhedron_demo_plugin_interface.h>
 #include <QApplication>
diff --git a/Three/demo/Three/Example_plugin/CMakeLists.txt b/Three/demo/Three/Example_plugin/CMakeLists.txt
index e979520c974..aac852f0bc0 100644
--- a/Three/demo/Three/Example_plugin/CMakeLists.txt
+++ b/Three/demo/Three/Example_plugin/CMakeLists.txt
@@ -37,7 +37,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 
   polyhedron_demo_plugin(example_plugin Example_plugin)
   
-  qt5_wrap_ui( basicUI_FILES Basic_dialog_plugin.ui  )
+  qt5_wrap_ui( basicUI_FILES Basic_dialog.ui  )
   polyhedron_demo_plugin(basic_plugin Basic_plugin ${basicUI_FILES})
 
   qt5_wrap_ui( dockUI_FILES Basic_dock_widget.ui )
diff --git a/Three/demo/Three/Example_plugin/Example_plugin.ui b/Three/demo/Three/Example_plugin/Example_plugin.ui
deleted file mode 100644
index e358f58e5c7..00000000000
--- a/Three/demo/Three/Example_plugin/Example_plugin.ui
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Polyhedron_demo_example_plugin_dialog</class>
- <widget class="QDialog" name="Polyhedron_demo_example_plugin_dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>199</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Triangle coordinates</string>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>40</x>
-     <y>150</y>
-     <width>341</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QWidget" name="gridLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>9</x>
-     <y>9</y>
-     <width>381</width>
-     <height>121</height>
-    </rect>
-   </property>
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="3">
-     <widget class="QLabel" name="label_3">
-      <property name="text">
-       <string>Point C</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_Az"/>
-    </item>
-    <item row="2" column="2">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_By"/>
-    </item>
-    <item row="2" column="3">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_Cy"/>
-    </item>
-    <item row="3" column="2">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_Bz"/>
-    </item>
-    <item row="3" column="3">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_Cz"/>
-    </item>
-    <item row="1" column="1">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_Ax"/>
-    </item>
-    <item row="1" column="3">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_Cx"/>
-    </item>
-    <item row="2" column="1">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_Ay"/>
-    </item>
-    <item row="1" column="2">
-     <widget class="QDoubleSpinBox" name="doubleSpinBox_Bx"/>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>Point A</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="2">
-     <widget class="QLabel" name="label_2">
-      <property name="text">
-       <string>Point B</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label_4">
-      <property name="text">
-       <string>X</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="label_5">
-      <property name="text">
-       <string>Y</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="label_6">
-      <property name="text">
-       <string>Z</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="0">
-     <widget class="QLabel" name="triangle_name_label">
-      <property name="text">
-       <string>TextLabel</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>Polyhedron_demo_example_plugin_dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>Polyhedron_demo_example_plugin_dialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/Three/doc/Three/Three.txt b/Three/doc/Three/Three.txt
index 7645e3e568b..3af25452f09 100644
--- a/Three/doc/Three/Three.txt
+++ b/Three/doc/Three/Three.txt
@@ -82,9 +82,9 @@ For a more elaborate interface, you will have to use the designer tool of QtCrea
 *  \image html menu_2.png
 Then select among the template/form choices.
 *  \image html menu_3.png
-Name it Xxxx_yyyy_plugin_dialog.ui (you may have to rename it once it is created as QtCreator tends to forget the capital letters), and add it to the project in the CMakeLists :
+Name it Xxxx_yyyy_dialog.ui (you may have to rename it once it is created as QtCreator tends to forget the capital letters), and add it to the project in the CMakeLists :
 
-    qt5_wrap_ui( basicUI_FILES Basic_dialog_plugin.ui )
+    qt5_wrap_ui( basicUI_FILES Basic_dialog.ui )
     polyhedron_demo_plugin(basic_plugin Basic_plugin ${basicUI_FILES})
 
 Add a layout to the dialog with a drag and drop and lay it out.