[qet] [3406] dxtTOelmt fixed screen layout

[subversion@xxxxxxxxxxxxx]

Revision: 3406
Author:   rdsivd
Date:     2014-10-27 19:57:53 +0100 (Mon, 27 Oct 2014)
Log Message:
-----------
dxtTOelmt fixed screen layout

Modified Paths:
--------------
    branches/dxftoelmt/src/ui/dxftoelmt.cpp
    branches/dxftoelmt/src/ui/mainwindow.ui
    branches/dxftoelmt/src/ui_mainwindow.h

Modified: branches/dxftoelmt/src/ui/dxftoelmt.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxftoelmt.cpp	2014-10-27 13:51:27 UTC (rev 3405)
+++ branches/dxftoelmt/src/ui/dxftoelmt.cpp	2014-10-27 18:57:53 UTC (rev 3406)
@@ -2782,7 +2782,7 @@
 						Load_Ellipse.LTypeCount1=LtypeCount;
 
 
-						Load_Ellipse.ConvertEllipse(LineCount4, BlockCount, Entitieswitch, LineTable4,LTypeDXF, LayerDXF, BlockList);
+						//Load_Ellipse.ConvertEllipse(LineCount4, BlockCount, Entitieswitch, LineTable4,LTypeDXF, LayerDXF, BlockList);
 
 						LineCount4=1;
 

Modified: branches/dxftoelmt/src/ui/mainwindow.ui
===================================================================
--- branches/dxftoelmt/src/ui/mainwindow.ui	2014-10-27 13:51:27 UTC (rev 3405)
+++ branches/dxftoelmt/src/ui/mainwindow.ui	2014-10-27 18:57:53 UTC (rev 3406)
@@ -18,8 +18,8 @@
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0,0">
-      <property name="horizontalSpacing">
-       <number>6</number>
+      <property name="spacing">
+       <number>5</number>
       </property>
       <item row="4" column="3">
        <widget class="QLineEdit" name="ExportFile"/>
@@ -99,24 +99,20 @@
        </widget>
       </item>
       <item row="7" column="2" colspan="2">
-       <widget class="QTextEdit" name="ExportToELMT">
-        <property name="lineWrapMode">
-         <enum>QTextEdit::NoWrap</enum>
-        </property>
-       </widget>
+       <widget class="QTextEdit" name="ExportToELMT"/>
       </item>
       <item row="7" column="4">
        <widget class="QTextEdit" name="ProcesLog">
         <property name="enabled">
          <bool>true</bool>
         </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
        </widget>
       </item>
       <item row="2" column="0" colspan="2">
        <widget class="QLabel" name="label_3">
-        <property name="acceptDrops">
-         <bool>false</bool>
-        </property>
         <property name="text">
          <string>Binary DXF can not be converted !!!</string>
         </property>

Modified: branches/dxftoelmt/src/ui_mainwindow.h
===================================================================
--- branches/dxftoelmt/src/ui_mainwindow.h	2014-10-27 13:51:27 UTC (rev 3405)
+++ branches/dxftoelmt/src/ui_mainwindow.h	2014-10-27 18:57:53 UTC (rev 3406)
@@ -61,12 +61,15 @@
         if (MainWindow->objectName().isEmpty())
             MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
 		MainWindow->resize(1088, 669);
+
         centralWidget = new QWidget(MainWindow);
         centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
+
         verticalLayout = new QVBoxLayout(centralWidget);
         verticalLayout->setSpacing(6);
         verticalLayout->setContentsMargins(11, 11, 11, 11);
         verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
+
         gridLayout_2 = new QGridLayout();
         gridLayout_2->setSpacing(6);
         gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
@@ -83,11 +86,12 @@
 
         SectionCount1 = new QLineEdit(centralWidget);
         SectionCount1->setObjectName(QString::fromUtf8("SectionCount1"));
-        QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+		/*QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
         sizePolicy.setHeightForWidth(SectionCount1->sizePolicy().hasHeightForWidth());
-        SectionCount1->setSizePolicy(sizePolicy);
+		SectionCount1->setSizePolicy(sizePolicy);*/
 
         gridLayout_2->addWidget(SectionCount1, 3, 1, 1, 1);
 
@@ -103,7 +107,7 @@
 
         m_import_file_path_le = new QLineEdit(centralWidget);
         m_import_file_path_le->setObjectName(QString::fromUtf8("m_import_file_path_le"));
-        m_import_file_path_le->setMaximumSize(QSize(16777165, 16777215));
+		//m_import_file_path_le->setMaximumSize(QSize(16777165, 16777215));
 
         gridLayout_2->addWidget(m_import_file_path_le, 2, 1, 1, 1);
 
@@ -144,7 +148,7 @@
 		ProcesLog->setObjectName(QString::fromUtf8("ExportToELMT"));
 		ProcesLog->setLineWrapMode(QTextEdit::NoWrap);
 
-		gridLayout_2->addWidget(ProcesLog, 4, 4, 1, 1);
+		gridLayout_2->addWidget(ProcesLog, 4, 4, 1, 2);
 
         m_load_dxf_pb = new QPushButton(centralWidget);
         m_load_dxf_pb->setObjectName(QString::fromUtf8("m_load_dxf_pb"));
@@ -155,13 +159,16 @@
         verticalLayout->addLayout(gridLayout_2);
 
         MainWindow->setCentralWidget(centralWidget);
+
         menuBar = new QMenuBar(MainWindow);
         menuBar->setObjectName(QString::fromUtf8("menuBar"));
         menuBar->setGeometry(QRect(0, 0, 758, 20));
         MainWindow->setMenuBar(menuBar);
+
         mainToolBar = new QToolBar(MainWindow);
         mainToolBar->setObjectName(QString::fromUtf8("mainToolBar"));
         MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar);
+
         statusBar = new QStatusBar(MainWindow);
         statusBar->setObjectName(QString::fromUtf8("statusBar"));
         MainWindow->setStatusBar(statusBar);