Add IP Address setting for TCP server

Author: serhmarch

src/server/gui/dialogs/server_dialogport.cpp

@@ -38,6 +38,10 @@ mbServerDialogPort::mbServerDialogPort(QWidget *parent) :
     const Modbus::Defaults &d = Modbus::Defaults::instance();
 
     QSpinBox *sp;
+    QLineEdit *ln;
+    // IP Address
+    ln = ui->lnIpaddr;
+    ln->setText(d.ipaddr);
     // Max conncetions
     sp = ui->spMaxConn;
     sp->setMinimum(1);
@@ -75,6 +79,7 @@ MBSETTINGS mbServerDialogPort::cachedSettings() const
     Modbus::Strings vs = Modbus::Strings::instance();
     const QString &prefix = Strings().cachePrefix;
     MBSETTINGS m = mbCoreDialogPort::cachedSettings();
+    m[prefix+vs.ipaddr ] = ui->lnIpaddr ->text ();
     m[prefix+vs.maxconn] = ui->spMaxConn->value();
     return m;
 }
@@ -89,7 +94,8 @@ void mbServerDialogPort::setCachedSettings(const MBSETTINGS &m)
     MBSETTINGS::const_iterator end = m.end();
     //bool ok;
 
-    it = m.find(prefix+vs.maxconn); if (it != end) ui->spMaxConn->setValue(it.value().toInt());
+    it = m.find(prefix+vs.ipaddr ); if (it != end) ui->lnIpaddr ->setText (it.value().toString());
+    it = m.find(prefix+vs.maxconn); if (it != end) ui->spMaxConn->setValue(it.value().toInt   ());
 }
 
 void mbServerDialogPort::fillFormInner(const MBSETTINGS &settings)
@@ -98,12 +104,14 @@ void mbServerDialogPort::fillFormInner(const MBSETTINGS &settings)
     MBSETTINGS::const_iterator it;
     MBSETTINGS::const_iterator end = settings.end();
 
-    it = settings.find(vs.maxconn); if (it != end) ui->spMaxConn->setValue(it.value().toInt());
+    it = settings.find(vs.ipaddr ); if (it != end) ui->lnIpaddr ->setText (it.value().toString());
+    it = settings.find(vs.maxconn); if (it != end) ui->spMaxConn->setValue(it.value().toInt   ());
 }
 
 void mbServerDialogPort::fillDataInner(MBSETTINGS &settings) const
 {
     Modbus::Strings vs = Modbus::Strings::instance();
 
+    settings[vs.ipaddr ] = ui->lnIpaddr ->text ();
     settings[vs.maxconn] = ui->spMaxConn->value();
 }

src/server/gui/dialogs/server_dialogport.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>261</width>
-    <height>423</height>
+    <height>420</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -160,45 +160,68 @@
          </widget>
          <widget class="QWidget" name="pgTCP">
           <layout class="QFormLayout" name="formLayout_3">
-           <item row="0" column="0">
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="lnIpaddr"/>
+           </item>
+           <item row="1" column="0">
             <widget class="QLabel" name="label_13">
              <property name="text">
               <string>Port</string>
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
+           <item row="1" column="1">
             <widget class="QSpinBox" name="spPort">
              <property name="maximum">
               <number>65535</number>
              </property>
             </widget>
            </item>
-           <item row="1" column="0">
+           <item row="2" column="0">
             <widget class="QLabel" name="label_26">
              <property name="text">
               <string>Timeout</string>
              </property>
             </widget>
            </item>
-           <item row="1" column="1">
+           <item row="2" column="1">
             <widget class="QSpinBox" name="spTimeout">
              <property name="maximum">
               <number>1000000000</number>
              </property>
             </widget>
            </item>
-           <item row="2" column="1">
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_27">
+             <property name="text">
+              <string>Max. connections</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
             <widget class="QSpinBox" name="spMaxConn">
              <property name="maximum">
               <number>1000000000</number>
              </property>
             </widget>
            </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_27">
+           <item row="4" column="1">
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_14">
              <property name="text">
-              <string>Max. connections</string>
+              <string>IP Address</string>
              </property>
             </widget>
            </item>