[qet] [3814] make corrections for QT5

[subversion@xxxxxxxxxxxxx]

Revision: 3814
Author:   rdsivd
Date:     2015-03-08 15:02:52 +0100 (Sun, 08 Mar 2015)
Log Message:
-----------
make corrections for QT5

Modified Paths:
--------------
    branches/dxftoelmt/src/ui/dxf_block.cpp
    branches/dxftoelmt/src/ui/dxf_elmt_output.cpp
    branches/dxftoelmt/src/ui/dxf_elmt_output.h
    branches/dxftoelmt/src/ui/dxf_form_mainwindow.ui
    branches/dxftoelmt/src/ui/dxf_mainwindow.cpp

Modified: branches/dxftoelmt/src/ui/dxf_block.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxf_block.cpp	2015-03-05 21:56:13 UTC (rev 3813)
+++ branches/dxftoelmt/src/ui/dxf_block.cpp	2015-03-08 14:02:52 UTC (rev 3814)
@@ -69,7 +69,7 @@
 
 	Lineout.append(" width=");
 	Lineout.append(QChar(34));
-	Lineout.append("0.00");
+	Lineout.append("100.00");
 	Lineout.append(QChar(34));
 
 	Lineout.append(" version=");
@@ -79,7 +79,7 @@
 
 	Lineout.append(" height=");
 	Lineout.append(QChar(34));
-	Lineout.append("0.00");
+	Lineout.append("100.00");
 	Lineout.append(QChar(34));
 
 	Lineout.append(" hotspot_x=");

Modified: branches/dxftoelmt/src/ui/dxf_elmt_output.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxf_elmt_output.cpp	2015-03-05 21:56:13 UTC (rev 3813)
+++ branches/dxftoelmt/src/ui/dxf_elmt_output.cpp	2015-03-08 14:02:52 UTC (rev 3814)
@@ -395,6 +395,7 @@
 	QString Lineout3;
 	QString Lineout4;
 	QString Flname;
+	QUuid Uuidstring;
 
 	x=0;
 
@@ -436,7 +437,8 @@
 	Lineout2.append(QChar(34));
 	Lineout2.append(" uuid=");
 	Lineout2.append(QChar(34));
-//	Lineout2.append(QUuid::createUuid());
+	Uuidstring=QUuid::createUuid();
+	Lineout2.append(Uuidstring.toString());
 	Lineout2.append(QChar(34));
 	Lineout2.append(" orientation=");
 	Lineout2.append(QChar(34));
@@ -506,7 +508,8 @@
 			Lineout3.append(QChar(34));
 			Lineout3.append(" uuid=");
 			Lineout3.append(QChar(34));
-//			Lineout3.append(QUuid::createUuid());
+			Uuidstring=QUuid::createUuid();
+			Lineout3.append(Uuidstring.toString());
 			Lineout3.append(QChar(34));
 			Lineout3.append(" orientation=");
 			Lineout3.append(QChar(34));

Modified: branches/dxftoelmt/src/ui/dxf_elmt_output.h
===================================================================
--- branches/dxftoelmt/src/ui/dxf_elmt_output.h	2015-03-05 21:56:13 UTC (rev 3813)
+++ branches/dxftoelmt/src/ui/dxf_elmt_output.h	2015-03-08 14:02:52 UTC (rev 3814)
@@ -3,6 +3,7 @@
 
 #include <QtCore>
 #include "dxf_data.h"
+#include <QUuid>
 
 class dxf_elmt_output: public DXF_Data
 {

Modified: branches/dxftoelmt/src/ui/dxf_form_mainwindow.ui
===================================================================
--- branches/dxftoelmt/src/ui/dxf_form_mainwindow.ui	2015-03-05 21:56:13 UTC (rev 3813)
+++ branches/dxftoelmt/src/ui/dxf_form_mainwindow.ui	2015-03-08 14:02:52 UTC (rev 3814)
@@ -107,6 +107,13 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="2">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Export directory path :</string>
+        </property>
+       </widget>
+      </item>
       <item row="7" column="0" colspan="2">
        <widget class="QTextEdit" name="ImportDXF">
         <property name="sizePolicy">
@@ -117,12 +124,8 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="2">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Export directory path :</string>
-        </property>
-       </widget>
+      <item row="5" column="4">
+       <widget class="QLineEdit" name="dxfLineCounter"/>
       </item>
       <item row="3" column="0">
        <widget class="QPushButton" name="m_load_dxf_pb">
@@ -131,9 +134,6 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="4">
-       <widget class="QLineEdit" name="dxfLineCounter"/>
-      </item>
       <item row="3" column="4">
        <widget class="QPushButton" name="m_save_qet_pb">
         <property name="sizePolicy">
@@ -157,7 +157,7 @@
         </property>
        </widget>
       </item>
-      <item row="8" column="0" colspan="5">
+      <item row="9" column="0" colspan="5">
        <widget class="QTextEdit" name="ProcesLog">
         <property name="enabled">
          <bool>true</bool>
@@ -191,6 +191,19 @@
         </property>
        </widget>
       </item>
+      <item row="8" column="0" colspan="5">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </item>
    </layout>

Modified: branches/dxftoelmt/src/ui/dxf_mainwindow.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxf_mainwindow.cpp	2015-03-05 21:56:13 UTC (rev 3813)
+++ branches/dxftoelmt/src/ui/dxf_mainwindow.cpp	2015-03-08 14:02:52 UTC (rev 3814)
@@ -144,7 +144,7 @@
     out << ui->ExportToELMT->toPlainText();
 
     file.close();
-	QMessageBox::information(this, tr("Export as elmt file"), tr("L'\351l\351ment %1 \340 bien \351t\351 enregistr\351").arg(ui->m_elmt_name_le->text()));
+	QMessageBox::information(this, tr("Export as elmt file"), tr("L'element %1 a bien ete enregistre").arg(ui->m_elmt_name_le->text()));
 }
 
 void MainWindow::on_m_load_dxf_pb_clicked()
@@ -172,5 +172,5 @@
 	out << ui->ExportToQet->toPlainText();
 
 	file.close();
-	QMessageBox::information(this, tr("Export as qet file"), tr("L'\351l\351ment %1 \340 bien \351t\351 enregistr\351").arg(ui->m_elmt_name_le->text()));
+	QMessageBox::information(this, tr("Export as qet file"), tr("QET %1 a bien ete enregistre").arg(ui->m_elmt_name_le->text()));
 }