Resolved issue #683. Tool Seam allowance's dialog is off screen on small

resolutions.

--HG--
branch : develop

ChangeLog.txt

@@ -1,6 +1,9 @@
 # Version 0.6.0
 - [#682] New feature. Export increments to Excel .csv.
 
+# Version 0.5.1
+- [#683] Tool Seam allowance's dialog is off screen on small resolutions.
+
 # Version 0.5.0 May 9, 2017
 - [#581] User can now filter input lists by keyword in function wizard.
 - [#24] User can now add labels with different information on the detail

src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp

@@ -89,7 +89,6 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 &
       m_tabPins(new QWidget),
       m_tabPassmarks(new QWidget),
       m_ftb(new FancyTabBar(FancyTabBar::Left, this)),
-      dialogIsInitialized(false),
       applyAllowed(false),// By default disabled
       flagGPin(true),
       flagDPin(true),
@@ -425,21 +424,8 @@ void DialogSeamAllowance::closeEvent(QCloseEvent *event)
 //---------------------------------------------------------------------------------------------------------------------
 void DialogSeamAllowance::showEvent(QShowEvent *event)
 {
-    DialogTool::showEvent( event );
+    // Skip DialotTool implementation. For this tool don't need disable resizing because it uses a scroll area.
-    if ( event->spontaneous() )
+    QDialog::showEvent( event );
-    {
-        return;
-    }
-    if (dialogIsInitialized)
-    {
-        return;
-    }
-    // do your init stuff here
-
-    m_ftb->setMaximumSize(m_ftb->size());
-    m_ftb->setMinimumSize(m_ftb->size());
-
-    dialogIsInitialized = true;//first show windows are held
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h

@@ -173,7 +173,6 @@ private:
 
     FancyTabBar* m_ftb;
 
-    bool   dialogIsInitialized;
     bool   applyAllowed;
     bool   flagGPin;
     bool   flagDPin;

src/libs/vtools/dialogs/tools/piece/dialogseamallowance.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>659</width>
+    <width>593</width>
-    <height>574</height>
+    <height>663</height>
    </rect>
   </property>
   <property name="windowTitle">

src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>275</width>
+    <width>402</width>
-    <height>362</height>
+    <height>452</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,6 +18,21 @@
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>382</width>
+        <height>432</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QGroupBox" name="groupBoxGrainline">
          <property name="title">
@@ -507,6 +522,10 @@
        </item>
       </layout>
      </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
  <resources>
   <include location="../../../../../vmisc/share/resources/icon.qrc"/>
  </resources>

src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>532</width>
+    <width>566</width>
-    <height>479</height>
+    <height>596</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,6 +17,21 @@
    <iconset resource="../../../../../vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>546</width>
+        <height>576</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QTabWidget" name="tabWidget">
@@ -1616,6 +1631,10 @@
        </item>
       </layout>
      </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
  <resources>
   <include location="../../../../../vmisc/share/resources/icon.qrc"/>
  </resources>

src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui

@@ -6,13 +6,28 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>268</width>
+    <width>352</width>
-    <height>377</height>
+    <height>411</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>332</width>
+        <height>391</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <layout class="QFormLayout" name="formLayout">
@@ -177,13 +192,17 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-       <height>40</height>
+           <height>11</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
  <resources/>
  <connections/>
  <buttongroups>

src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>401</width>
+    <width>426</width>
-    <height>600</height>
+    <height>637</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,6 +17,21 @@
    <iconset resource="../../../../../vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
+  <layout class="QVBoxLayout" name="verticalLayout_8">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>406</width>
+        <height>617</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QTabWidget" name="tabWidget">
@@ -900,6 +915,10 @@
        </item>
       </layout>
      </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
  <resources>
   <include location="../../../../../vmisc/share/resources/icon.qrc"/>
  </resources>