[fwbuilder-commits] r3222 - branches/v4_1/src/gui

[<a2...@in...>]

Author: a2k
Date: 2010-08-09 09:25:23 -0700 (Mon, 09 Aug 2010)
New Revision: 3222

Modified:
   branches/v4_1/src/gui/DiscoveryDruid.cpp
   branches/v4_1/src/gui/discoverydruid_q.ui
Log:
Fixed #1669: next button in import dialog will be enabled only if both name and file fields are not empty


Modified: branches/v4_1/src/gui/DiscoveryDruid.cpp
===================================================================
--- branches/v4_1/src/gui/DiscoveryDruid.cpp	2010-08-09 01:44:09 UTC (rev 3221)
+++ branches/v4_1/src/gui/DiscoveryDruid.cpp	2010-08-09 16:25:23 UTC (rev 3222)
@@ -2640,8 +2640,9 @@
     done();
 }
 
-void DiscoveryDruid::objNameChanged(QString name)
+void DiscoveryDruid::objNameChanged(QString)
 {
-    m_dialog->nextButton->setEnabled(!name.isEmpty());
+    m_dialog->nextButton->setEnabled(!(m_dialog->obj_name->text().isEmpty()
+                                       || m_dialog->import_filename->text().isEmpty()));
     m_dialog->nextButton->setDefault(true);
 }

Modified: branches/v4_1/src/gui/discoverydruid_q.ui
===================================================================
--- branches/v4_1/src/gui/discoverydruid_q.ui	2010-08-09 01:44:09 UTC (rev 3221)
+++ branches/v4_1/src/gui/discoverydruid_q.ui	2010-08-09 16:25:23 UTC (rev 3222)
@@ -2319,8 +2319,8 @@
    <slot>browseForImport()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>498</x>
-     <y>160</y>
+     <x>572</x>
+     <y>147</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
@@ -2335,8 +2335,8 @@
    <slot>importPlatformChanged(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>130</x>
-     <y>193</y>
+     <x>244</x>
+     <y>176</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
@@ -2703,8 +2703,8 @@
    <slot>checkSNMPCommunity()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>242</x>
-     <y>127</y>
+     <x>111</x>
+     <y>76</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
@@ -2808,6 +2808,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>import_filename</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>DiscoveryDruid_q</receiver>
+   <slot>objNameChanged(QString)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>300</x>
+     <y>124</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>583</x>
+     <y>237</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>objNameChanged(QString)</slot>