smaller changes

diff --git a/ChangeLog b/ChangeLog
index 776325c8a0a270a92e77f2017f3285fcad205381..f423180ab3c1997aceefccfd945b1a5c015bce0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes since hbs 0.2
+       * Fixed a bug with the emp code.
+       * Added the ability to show the score loss and capping on the planet
+       * Prolly something more that I've forgotten (need to get better at this ;)
+
 Changes since hbs 0.1.1
        * Implemented scorechange for the planet. All fleets with "Home" in their name is counted. (so the capping changes between ticks)
        * Slightly changed the interface (moved the tick changing to the toolbar)

diff --git a/bs/ui/roidseditview.ui b/bs/ui/roidseditview.ui
index 6d6b6c21304adfec59beea5f4d93798655f0e0f7..f77d5b5a98b479d48893fa31341adc3f645bf657 100644 (file)
--- a/bs/ui/roidseditview.ui
+++ b/bs/ui/roidseditview.ui
@@ -192,6 +192,9 @@
             <property name="name">
                 <cstring>ScoreLostEdit</cstring>
             </property>
+            <property name="focusPolicy">
+                <enum>NoFocus</enum>
+            </property>
             <property name="readOnly">
                 <bool>true</bool>
             </property>
@@ -204,33 +207,33 @@
 <connections>
     <connection>
         <sender>MetalEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>returnPressed()</signal>
         <receiver>RoidsEditView</receiver>
-        <slot>slotValueChanged(const QString&amp;)</slot>
+        <slot>slotValueChanged()</slot>
     </connection>
     <connection>
         <sender>CrystalEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>returnPressed()</signal>
         <receiver>RoidsEditView</receiver>
-        <slot>slotValueChanged(const QString&amp;)</slot>
+        <slot>slotValueChanged()</slot>
     </connection>
     <connection>
         <sender>EoniumEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>returnPressed()</signal>
         <receiver>RoidsEditView</receiver>
-        <slot>slotValueChanged(const QString&amp;)</slot>
+        <slot>slotValueChanged()</slot>
     </connection>
     <connection>
         <sender>UninitEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>returnPressed()</signal>
         <receiver>RoidsEditView</receiver>
-        <slot>slotValueChanged(const QString&amp;)</slot>
+        <slot>slotValueChanged()</slot>
     </connection>
     <connection>
         <sender>ScoreEdit</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>returnPressed()</signal>
         <receiver>RoidsEditView</receiver>
-        <slot>slotValueChanged(const QString&amp;)</slot>
+        <slot>slotValueChanged()</slot>
     </connection>
 </connections>
 <tabstops>
@@ -251,7 +254,7 @@
 <slots>
     <slot>init()</slot>
     <slot>setValue( const QString &amp; type, unsigned value )</slot>
-    <slot>slotValueChanged( const QString &amp; s )</slot>
+    <slot>slotValueChanged()</slot>
     <slot>slotSetLost( QString type, float i )</slot>
 </slots>
 <pixmapinproject/>

diff --git a/bs/ui/roidseditview.ui.h b/bs/ui/roidseditview.ui.h
index d02b348fb7ad66f72884f4cdc0039c067786b529..55d22b556e3f2c604efcb96f8ba07922ff00a217 100644 (file)
--- a/bs/ui/roidseditview.ui.h
+++ b/bs/ui/roidseditview.ui.h
@@ -28,7 +28,7 @@ void RoidsEditView::setValue( const QString & type, unsigned value )
 
 }
 
-void RoidsEditView::slotValueChanged( const QString & s )
+void RoidsEditView::slotValueChanged()
 {
        QString type = sender()->name();
        
@@ -43,7 +43,9 @@ void RoidsEditView::slotValueChanged( const QString & s )
        else if (type == "ScoreEdit")
                type = tr("score");
        test = type;
-    emit changed(type, s.toInt());
+       const QLineEdit *le = dynamic_cast<const QLineEdit*>(sender());
+       if (le)
+           emit changed(type, le->text().toInt());
 }