fixed ipv6 validator

Author: andrew-bibb

code/peditor/peditor.cpp

@@ -46,20 +46,24 @@ PropertiesEditor::PropertiesEditor(QWidget* parent, const arrayElement& ae, bool
   // Setup the address validator and apply it to any ui QLineEdit.
   // The lev validator will validate an IP address or up to one white space character (to allow
   // editing of the line edit).
-  QString octet = "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])";
+  QString s_ip4 = "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])";
+  QString s_ip6 = "(?:[0-9a-fA-F]{1,4})";
 
   // QLineEdits that allow single address
-  QRegularExpression rx("\\s?|^" + octet + "\\." + octet + "\\." + octet + "\\." + octet + "$");
-  QRegularExpressionValidator* lev_s = new QRegularExpressionValidator(rx, this);
-  ui.lineEdit_ipv4address->setValidator(lev_s);
-  ui.lineEdit_ipv4netmask->setValidator(lev_s);
-  ui.lineEdit_ipv4gateway->setValidator(lev_s);
-  ui.lineEdit_ipv6address->setValidator(lev_s);
-  ui.lineEdit_ipv6gateway->setValidator(lev_s);
+  QRegularExpression rx4("\\s?|^" + s_ip4 + "\\." + s_ip4 + "\\." + s_ip4 + "\\." + s_ip4 + "$");
+  QRegularExpression rx6("\\s?|^" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + "$");
+  QRegularExpressionValidator* lev_4 = new QRegularExpressionValidator(rx4, this);
+  QRegularExpressionValidator* lev_6 = new QRegularExpressionValidator(rx6, this);
+  ui.lineEdit_ipv4address->setValidator(lev_4);
+  ui.lineEdit_ipv4netmask->setValidator(lev_4);
+  ui.lineEdit_ipv4gateway->setValidator(lev_4);
+  ui.lineEdit_ipv6address->setValidator(lev_6);
+  ui.lineEdit_ipv6gateway->setValidator(lev_6);
 
   // now QLineEdits that allow multiple addresses
-  rx.setPattern("\\s*|(" + octet + "\\." + octet + "\\." + octet + "\\." + octet + "(\\s*[,|;]?\\s*))+");
-  QRegularExpressionValidator* lev_m = new QRegularExpressionValidator(rx, this);
+  //rx4.setPattern("\\s*|(" + s_ip4 + "\\." + s_ip4 + "\\." + s_ip4 + "\\." + s_ip4 + "(\\s*[,|;]?\\s*))+");
+  QRegularExpression rx46("\\s?|((" + s_ip4 + "\\." + s_ip4 + "\\." + s_ip4 + "\\." + s_ip4 + "|" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ":" + s_ip6 + ")" + "(\\s*[,|;|\\s]+\\s*))+");
+  QRegularExpressionValidator* lev_m = new QRegularExpressionValidator(rx46, this);
   ui.lineEdit_nameservers->setValidator(lev_m);
   ui.lineEdit_timeservers->setValidator(lev_m);
   ui.lineEdit_domains->setValidator(lev_m);

code/peditor/ui/peditor.ui

@@ -26,6 +26,14 @@
       <number>0</number>
      </property>
      <widget class="QWidget" name="general">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>279</width>
+        <height>166</height>
+       </rect>
+      </property>
       <attribute name="label">
        <string>&amp;General</string>
       </attribute>
@@ -162,8 +170,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>279</width>
-        <height>166</height>
+        <width>154</width>
+        <height>132</height>
        </rect>
       </property>
       <property name="whatsThis">
@@ -253,8 +261,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>279</width>
-        <height>166</height>
+        <width>194</width>
+        <height>161</height>
        </rect>
       </property>
       <property name="whatsThis">
@@ -335,7 +343,7 @@
            </item>
            <item>
             <property name="text">
-             <string>Prefered</string>
+             <string>Preferred</string>
             </property>
            </item>
            <item>
@@ -374,7 +382,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>265</width>
+        <width>146</width>
         <height>168</height>
        </rect>
       </property>
@@ -416,7 +424,7 @@
          <item row="1" column="0" colspan="2">
           <widget class="QStackedWidget" name="stackedWidget_proxy01">
            <property name="currentIndex">
-            <number>0</number>
+            <number>2</number>
            </property>
            <widget class="QWidget" name="page_0"/>
            <widget class="QWidget" name="page_1">

code/resource.h

@@ -34,8 +34,8 @@ DEALINGS IN THE SOFTWARE.
 
 ///////////////////////////////// Program Values ///////////////////////
 // Program Info 
-#define VERSION "14.10.12-1"
-#define RELEASE_DATE "23 August 2014"
+#define VERSION "14.10.14-1"
+#define RELEASE_DATE "15 October 2014"
 #define COPYRIGHT_DATE "2013-2014"
 
 // Program Values

text/changelog.txt

@@ -1,7 +1,7 @@
-<b><center>Connman System Tray (CMST)</center></b>
+q<b><center>Connman System Tray (CMST)</center></b>
 <b><center>Change Log</center></b>
 <br>
-<br><b>In Progress</b>
+<br><b>2014.10.15</b>
 <ul>
 <li>Connect, Disconnect, and Remove buttons in the Wifi tab are disabled if no Wifi services are available.<li>
 <li>If only one WiFi service exists it is no longer necessary to select it first before pressing the Connect button.</li>
@@ -10,6 +10,7 @@
 <li>If an instance of CMST is started while one is running the running copy will be raised, and a message about a second instance trying to start will be printed to stderr.</li> 
 <li>Wifi signal strength bar and techonlogy buttons now have frames around them so that they do not fill an entire table cell</li>
 <li>Autoconnect property can be set or unset from the property editor.</li>
+<li>Fixed IPv6 validator in the properties editor.</li>
 </ul>
 <br>
 <br><b>2014.08.23</b>