fixes #2398 remove checkbox "make tag and classify actions terminating"

src/libgui/ipcopAdvancedDialog.cpp

@@ -129,8 +129,6 @@ ipcopAdvancedDialog::ipcopAdvancedDialog(QWidget *parent,FWObject *o)
     data.registerOption(m_dialog->emptyGroups, fwoptions,
                         "ignore_empty_groups");
     data.registerOption(m_dialog->localNAT, fwoptions, "local_nat");
-    data.registerOption(m_dialog->makeTagClassifyTerminating,
-                        fwoptions, "classify_mark_terminating");
     slm=getActionsOnReject( platform.c_str());
     m_dialog->actionOnReject->clear();
     m_dialog->actionOnReject->addItems(getScreenNames(slm));

src/libgui/ipcopadvanceddialog_q.ui

@@ -12,7 +12,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>674</width>
+    <width>726</width>
     <height>710</height>
    </rect>
   </property>
@@ -250,13 +250,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QCheckBox" name="makeTagClassifyTerminating">
-           <property name="text">
-            <string>Make Tag and Classify actions terminating</string>
-           </property>
-          </widget>
-         </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
@@ -1289,7 +1282,6 @@ with this address:</string>
   <tabstop>shadowing</tabstop>
   <tabstop>emptyGroups</tabstop>
   <tabstop>localNAT</tabstop>
-  <tabstop>makeTagClassifyTerminating</tabstop>
   <tabstop>actionOnReject</tabstop>
   <tabstop>mgmt_ssh</tabstop>
   <tabstop>mgmt_addr</tabstop>

src/libgui/iptAdvancedDialog.cpp

@@ -126,8 +126,6 @@ iptAdvancedDialog::iptAdvancedDialog(QWidget *parent,FWObject *o)
                         "ignore_empty_groups");
     data.registerOption(m_dialog->localNAT, fwoptions, "local_nat");
     data.registerOption(m_dialog->clampMSStoMTU, fwoptions, "clamp_mss_to_mtu");
-    data.registerOption(m_dialog->makeTagClassifyTerminating,
-                        fwoptions, "classify_mark_terminating");
     data.registerOption(m_dialog->ipv6NeighborDiscovery,
                         fwoptions, "add_rules_for_ipv6_neighbor_discovery");
 

src/libgui/iptadvanceddialog_q.ui

@@ -12,8 +12,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>842</width>
+    <width>1054</width>
-    <height>602</height>
+    <height>628</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -428,13 +428,6 @@ in host settings dialog.
            </property>
           </widget>
          </item>
-         <item row="4" column="1">
-          <widget class="QCheckBox" name="makeTagClassifyTerminating">
-           <property name="text">
-            <string>Make Tag and Classify actions terminating</string>
-           </property>
-          </widget>
-         </item>
          <item row="5" column="0">
           <layout class="QHBoxLayout" name="horizontalLayout_4">
            <item>
@@ -874,10 +867,10 @@ packets to IPv6 policies</string>
        <string>Prolog/Epilog</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin">
+       <property name="verticalSpacing">
         <number>6</number>
        </property>
-       <property name="verticalSpacing">
+       <property name="margin">
         <number>6</number>
        </property>
        <item row="1" column="0">
@@ -1008,12 +1001,12 @@ packets to IPv6 policies</string>
        <string>Logging</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin">
-        <number>20</number>
-       </property>
        <property name="verticalSpacing">
         <number>6</number>
        </property>
+       <property name="margin">
+        <number>20</number>
+       </property>
        <item row="0" column="0" rowspan="5">
         <widget class="QGroupBox" name="buttonGroup1">
          <property name="title">
@@ -1607,7 +1600,6 @@ packets to IPv6 policies</string>
   <tabstop>emptyGroups</tabstop>
   <tabstop>localNAT</tabstop>
   <tabstop>clampMSStoMTU</tabstop>
-  <tabstop>makeTagClassifyTerminating</tabstop>
   <tabstop>ipv6NeighborDiscovery</tabstop>
   <tabstop>mgmt_ssh</tabstop>
   <tabstop>mgmt_addr</tabstop>

src/libgui/secuwallAdvancedDialog.cpp

@@ -109,8 +109,6 @@ secuwallAdvancedDialog::secuwallAdvancedDialog(QWidget *parent, FWObject *o)
                         "ignore_empty_groups");
     data.registerOption(m_dialog->localNAT, fwoptions, "local_nat");
     data.registerOption(m_dialog->clampMSStoMTU, fwoptions, "clamp_mss_to_mtu");
-    data.registerOption(m_dialog->makeTagClassifyTerminating,
-                        fwoptions, "classify_mark_terminating");
 
     slm = getActionsOnReject(obj->getStr("platform").c_str());
     m_dialog->actionOnReject->clear();

src/libgui/secuwalladvanceddialog_q.ui

@@ -12,7 +12,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>674</width>
+    <width>762</width>
     <height>665</height>
    </rect>
   </property>
@@ -340,14 +340,7 @@ in host settings dialog.
          </property>
         </widget>
        </item>
-       <item row="13" column="1" colspan="4">
+       <item row="13" column="1">
-        <widget class="QCheckBox" name="makeTagClassifyTerminating">
-         <property name="text">
-          <string>Make Tag and Classify actions terminating</string>
-         </property>
-        </widget>
-       </item>
-       <item row="14" column="1">
         <widget class="QLabel" name="textLabel9">
          <property name="text">
           <string>Default action on 'Reject':</string>
@@ -357,10 +350,10 @@ in host settings dialog.
          </property>
         </widget>
        </item>
-       <item row="14" column="2" colspan="2">
+       <item row="13" column="2" colspan="2">
         <widget class="QComboBox" name="actionOnReject"/>
        </item>
-       <item row="14" column="4">
+       <item row="13" column="4">
         <spacer>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -376,7 +369,7 @@ in host settings dialog.
          </property>
         </spacer>
        </item>
-       <item row="15" column="0" colspan="5">
+       <item row="14" column="0" colspan="5">
         <widget class="Line" name="line4">
          <property name="frameShape">
           <enum>QFrame::HLine</enum>
@@ -389,7 +382,7 @@ in host settings dialog.
          </property>
         </widget>
        </item>
-       <item row="16" column="0" rowspan="2">
+       <item row="15" column="0" rowspan="2">
         <spacer>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -405,14 +398,14 @@ in host settings dialog.
          </property>
         </spacer>
        </item>
-       <item row="16" column="1" colspan="4">
+       <item row="15" column="1" colspan="4">
         <widget class="QCheckBox" name="mgmt_ssh">
          <property name="text">
           <string>Always permit ssh access from the management workstation with this address:</string>
          </property>
         </widget>
        </item>
-       <item row="17" column="1" colspan="4">
+       <item row="16" column="1" colspan="4">
         <widget class="QLineEdit" name="mgmt_addr">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -428,7 +421,7 @@ in host settings dialog.
          </property>
         </widget>
        </item>
-       <item row="18" column="1" colspan="4">
+       <item row="17" column="1" colspan="4">
         <widget class="QCheckBox" name="add_mgmt_ssh_rule_when_stoped">
          <property name="text">
           <string>Install the rule for ssh access from the management workstation when the firewall 
@@ -436,7 +429,7 @@ is stopped</string>
          </property>
         </widget>
        </item>
-       <item row="19" column="1">
+       <item row="18" column="1">
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -1340,7 +1333,6 @@ is stopped</string>
   <tabstop>emptyGroups</tabstop>
   <tabstop>localNAT</tabstop>
   <tabstop>clampMSStoMTU</tabstop>
-  <tabstop>makeTagClassifyTerminating</tabstop>
   <tabstop>actionOnReject</tabstop>
   <tabstop>mgmt_ssh</tabstop>
   <tabstop>mgmt_addr</tabstop>