widget less confusing

git-svn-id: svn+ssh://orchestra.med.harvard.edu/svn/megason/Code/GoFigure2@2166 ef826fda-c0ae-4237-af8e-f8dcbcf7929c
gofigure2 · Feb 12, 2010 · 4d4bc53 · 4d4bc53
1 parent 119719b
commit 4d4bc53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 64 deletions.
diff --git a/trunk/GoFigure2Beta/Code/GUI/lib/LsmToMegaExportDialog.ui b/trunk/GoFigure2Beta/Code/GUI/lib/LsmToMegaExportDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>438</width>
-    <height>342</height>
+    <width>294</width>
+    <height>304</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -182,51 +182,8 @@ p, li { white-space: pre-wrap; }
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>LsmToMegaExportDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>155</x>
-     <y>349</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>232</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>LsmToMegaExportDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>87</x>
-     <y>349</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff --git a/trunk/GoFigure2Beta/Code/GUI/lib/QGoLsmToMegaExportDialog.cxx b/trunk/GoFigure2Beta/Code/GUI/lib/QGoLsmToMegaExportDialog.cxx
@@ -140,7 +140,6 @@ on_convert_clicked()
   this->selectLsmFile->setEnabled(false);
   this->selectMegaPath->setEnabled(false);
   this->outputFormat->setEnabled(false);
-  this->buttonBox->setEnabled(false);
   this->convert->setEnabled(false);
   this->label->setEnabled(false);
   this->selectLSMLabel->setEnabled(false);
@@ -175,22 +174,7 @@ QGoLsmToMegaExportDialog::
 ConversionTerminatedReceived()
 {
   m_ProgressDialog->accept();
-
-  //Enable everything
-  lsmFileName->setEnabled(true);
-  megaFilePath->setEnabled(true);
-  selectLsmFile->setEnabled(true);
-  selectMegaPath->setEnabled(true);
-  outputFormat->setEnabled(true);
-  this->buttonBox->setEnabled(true);
-  this->convert->setEnabled(true);
-  this->label->setEnabled(true);
-  this->selectLSMLabel->setEnabled(true);
-  this->megaFilePath_2->setEnabled(true);
-  this->outputFormatLabel->setEnabled(true);
-  this->label_2->setEnabled(true);
-
-  this->convertLabel->setText( tr("")  );
+  this->accept();
 }
 
 /**
@@ -211,7 +195,7 @@ InitialisationProgressReceived()
   // +1 because m_Counter starts at 1
   // +1 to prevent that the dialoProgressWindow automatically close
   //    then re-open when 100% reached
-  m_ProgressDialog->setRange(0,sizeProgressBar+2);
+  m_ProgressDialog->setRange(0,sizeProgressBar+5);
   m_ProgressDialog->setValue(m_Counter);
 
 }