From 7da80783fdb8e52c03c730f27adfc339cad128ad Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 28 Aug 2008 04:52:06 +0000 Subject: [PATCH] bug 2078671 ] fwbuilder 3.0.0 build 487 - add/edit interface --- doc/ChangeLog | 4 + src/gui/addressrangedialog_q.ui | 30 +- src/gui/addresstabledialog_q.ui | 14 +- src/gui/customservicedialog_q.ui | 20 +- src/gui/dnsnamedialog_q.ui | 4 +- src/gui/firewalldialog_q.ui | 4 +- src/gui/groupobjectdialog_q.ui | 169 +++--- src/gui/hostdialog_q.ui | 4 +- src/gui/icmpservicedialog_q.ui | 25 +- src/gui/interfacedialog_q.ui | 924 ++++++++++++++++--------------- src/gui/ipservicedialog_q.ui | 8 +- src/gui/ipv4dialog_q.ui | 6 +- src/gui/ipv6dialog_q.ui | 14 +- src/gui/librarydialog_q.ui | 8 +- src/gui/networkdialog_q.ui | 8 +- src/gui/networkdialogipv6_q.ui | 41 +- src/gui/physaddressdialog_q.ui | 8 +- src/gui/projectpanel_q.ui | 6 +- src/gui/tagservicedialog_q.ui | 8 +- src/gui/tcpservicedialog_q.ui | 8 +- src/gui/timedialog_q.ui | 8 +- src/gui/udpservicedialog_q.ui | 8 +- src/gui/userdialog_q.ui | 8 +- 23 files changed, 695 insertions(+), 642 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index b7720fac8..9ddcf33d3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -8,6 +8,10 @@ default. This provides for better backwards compatibility for existing routers. + * various object type dialogs: layout changes for bug #2078671: + "fwbuilder 3.0.0 build 487 - add/edit interface". Dialogs did not + look right under QT theme with large fonts. + 2008-08-26 Vadim Kurland * instDialog.cpp (instDialog::addToLog): fixed bug (no #): compile diff --git a/src/gui/addressrangedialog_q.ui b/src/gui/addressrangedialog_q.ui index 1f9bc4c01..63e943588 100644 --- a/src/gui/addressrangedialog_q.ui +++ b/src/gui/addressrangedialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 643 - 227 + 712 + 251 @@ -230,13 +230,13 @@ - 0 + 200 0 - 200 + 0 0 @@ -282,7 +282,23 @@ - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 250 + 20 + + + + + Qt::Vertical @@ -292,8 +308,8 @@ - 20 - 5 + 110 + 21 diff --git a/src/gui/addresstabledialog_q.ui b/src/gui/addresstabledialog_q.ui index 3b78cd25d..1ae44b5a4 100644 --- a/src/gui/addresstabledialog_q.ui +++ b/src/gui/addresstabledialog_q.ui @@ -5,8 +5,8 @@ 0 0 - 556 - 283 + 774 + 264 @@ -217,7 +217,7 @@ - 300 + 0 16 @@ -242,13 +242,13 @@ - 0 + 200 0 - 200 + 0 0 @@ -293,14 +293,14 @@ - + 0 0 - 250 + 0 0 diff --git a/src/gui/customservicedialog_q.ui b/src/gui/customservicedialog_q.ui index d22dadabd..b759cd3b7 100644 --- a/src/gui/customservicedialog_q.ui +++ b/src/gui/customservicedialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 643 - 290 + 748 + 307 @@ -224,13 +224,25 @@ - 0 + 200 0 - 200 + 0 + 0 + + + + + 0 + 0 + + + + + 0 0 diff --git a/src/gui/dnsnamedialog_q.ui b/src/gui/dnsnamedialog_q.ui index 4f36de78f..d4495db85 100644 --- a/src/gui/dnsnamedialog_q.ui +++ b/src/gui/dnsnamedialog_q.ui @@ -227,13 +227,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/firewalldialog_q.ui b/src/gui/firewalldialog_q.ui index 0ab4383f6..64a271c30 100644 --- a/src/gui/firewalldialog_q.ui +++ b/src/gui/firewalldialog_q.ui @@ -274,13 +274,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/groupobjectdialog_q.ui b/src/gui/groupobjectdialog_q.ui index bd14a18fb..c67f274ec 100644 --- a/src/gui/groupobjectdialog_q.ui +++ b/src/gui/groupobjectdialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 854 - 232 + 750 + 242 @@ -213,55 +213,31 @@ QFrame::Sunken - - 2 - - - 2 - - - 2 - - - 2 - - - 2 - - - 2 - - - - - Comment: + + + + Qt::Horizontal - - false + + QSizePolicy::Expanding - + + + 251 + 34 + + + - + - - 2 - 2 - - 2 - 2 - - 2 - - - 2 - @@ -324,62 +300,30 @@ + + + + Qt::Horizontal + + + + 151 + 20 + + + + - - - - Qt::Horizontal + + + + Comment: - - QSizePolicy::Expanding + + false - - - 230 - 20 - - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - true - - - - - - - - 0 - 0 - - - - - 250 - 100 - - - - true - - @@ -429,13 +373,13 @@ - 0 + 200 0 - 200 + 0 0 @@ -457,6 +401,45 @@ + + + + + 250 + 0 + + + + + 250 + 100 + + + + true + + + + + + + + + 0 + 0 + + + + + 200 + 0 + + + + true + + + diff --git a/src/gui/hostdialog_q.ui b/src/gui/hostdialog_q.ui index bbef1e77e..181432637 100644 --- a/src/gui/hostdialog_q.ui +++ b/src/gui/hostdialog_q.ui @@ -259,13 +259,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/icmpservicedialog_q.ui b/src/gui/icmpservicedialog_q.ui index 0bd273e19..fff4821ce 100644 --- a/src/gui/icmpservicedialog_q.ui +++ b/src/gui/icmpservicedialog_q.ui @@ -222,12 +222,6 @@ QFrame::Sunken - - 8 - - - 8 - @@ -248,13 +242,13 @@ - 0 + 200 0 - 200 + 0 0 @@ -306,7 +300,20 @@ - + + + + Qt::Horizontal + + + + 111 + 20 + + + + + Qt::Vertical diff --git a/src/gui/interfacedialog_q.ui b/src/gui/interfacedialog_q.ui index 653b43996..d4f76ca02 100644 --- a/src/gui/interfacedialog_q.ui +++ b/src/gui/interfacedialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 936 - 268 + 818 + 278 @@ -22,479 +22,503 @@ Interface - - 2 - - - 2 - - - 2 - - - 2 - - - 0 - - - 0 - - - - 2 + + + + 0 + 0 + - - - - - 0 - 0 - - - - - 16 - 30 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 254 - 253 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 254 - 253 - - - - - - - - - 255 - 254 - 253 - - - - - - - 255 - 254 - 253 - - - - - - - - true - - - QFrame::Box - - - QFrame::Sunken - - - - 2 + + + 16 + 30 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 254 + 253 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 254 + 253 + + + + + + + + + 255 + 254 + 253 + + + + + + + 255 + 254 + 253 + + + + + + + + true + + + QFrame::Box + + + QFrame::Sunken + + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + + 0 + 0 + - - 2 + + + 75 + true + - - 2 + + Interface - - 2 + + false - - 2 + + + + + + + 0 + 0 + - - 2 + + - - - - - 0 - 0 - - - - - 75 - true - - - - Interface - - - false - - - - - - - - 0 - 0 - - - - - - - :/Icons/Interface/icon - - - - - - - - - - - 0 - 0 - - - - QFrame::Box - - - QFrame::Sunken - - - - - - - 0 - 0 - - - - QFrame::Box - - - QFrame::Sunken - - - - 8 + + :/Icons/Interface/icon + + + + + + + + + + + 0 + 0 + + + + QFrame::Box + + + QFrame::Sunken + + + + + + + 0 + 0 + + + + + 0 + 16 + + + + QFrame::Box + + + QFrame::Sunken + + + + + + + 0 + 0 + - - 8 + + Name: - - 8 + + false - - 8 + + + + + + + 200 + 0 + - - 8 + + + 0 + 23 + - - 8 + + + + + + + 0 + 0 + - - - - Name: - - - false - - - - - - - Label: - - - false - - - - - - - - 0 - 0 - - - - - 0 - 40 - - - - Security -level: - - - false - - - - - - - - 0 - 0 - - - - <p>Each interface of the firewall must have security level associated with it.<br>Security level can be any number between 0 and 100, 0 being least secure and 100 being most secure levels. Interface with security level 0 ususally serves Internet connection.</p> - - - <p>Each interface of the firewall must have security level associated with it.<br> + + Label: + + + false + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Security level: + + + false + + + + + + + + 0 + 0 + + + + <p>Each interface of the firewall must have security level associated with it.<br>Security level can be any number between 0 and 100, 0 being least secure and 100 being most secure levels. Interface with security level 0 ususally serves Internet connection.</p> + + + <p>Each interface of the firewall must have security level associated with it.<br> Security level can be any number between 0 and 100, 0 being least secure and 100 being most secure levels. Interface with security level 0 ususally serves Internet connection.</p> - - - QAbstractSpinBox::PlusMinus - - - 100 - - - - - - - - - - - 200 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 2 - - - - - - - - - - - - 0 - 0 - - - - - - - - 8 - - 8 + + QAbstractSpinBox::PlusMinus - - 8 + + 100 - - 8 + + + + + + Qt::Vertical - - 8 + + QSizePolicy::MinimumExpanding - - 8 + + + 282 + 51 + - - - - <p>One interface of the firewall must be marked as 'external'. This interface should be connected to the least secure network, usually the Internet.</p> - - - One interface of the firewall must be marked as 'external'. This interface should be connected to the least secure network, usually the Internet. - - - This interface is external (insecure) - - - - - - - <p>Check if this interface is used for management (SNMP queries, remote policy install etc.)<p> - - - Management interface - - - - - - - Unnumbered interface - - - - - - - Address is assigned dynamically - - - - - - - Regular interface - - - - - - - Skip this interface while assigning policy rules - - - Unprotected interface - - - - - - - Bridge port - - - - - - - - - - - 0 - 0 - - - - Comment: - - - false - - - - - - - - 0 - 100 - - - - - 200 - 0 - - - - true - - - - - - - Network zone: - - - false - - - - - - - <p>Network zone consists of hosts and networks that can be reached through this interface of the firewall. Subnet to which this interface is directly attached must be part of its network zone. Other subnets reachable by means of routing should alse be added to the network zone. + + + + + + + + + + 0 + 0 + + + + + + + + 8 + + + 2 + + + 8 + + + 2 + + + 8 + + + 2 + + + + + <p>One interface of the firewall must be marked as 'external'. This interface should be connected to the least secure network, usually the Internet.</p> + + + One interface of the firewall must be marked as 'external'. This interface should be connected to the least secure network, usually the Internet. + + + This interface is external (insecure) + + + + + + + <p>Check if this interface is used for management (SNMP queries, remote policy install etc.)<p> + + + Management interface + + + + + + + Unnumbered interface + + + + + + + Address is assigned dynamically + + + + + + + Regular interface + + + + + + + Skip this interface while assigning policy rules + + + Unprotected interface + + + + + + + Bridge port + + + + + + + + + + + 0 + 0 + + + + Comment: + + + false + + + + + + + + 0 + 100 + + + + + 200 + 0 + + + + true + + + + + + + + 0 + 0 + + + + Network zone: + + + false + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + <p>Network zone consists of hosts and networks that can be reached through this interface of the firewall. Subnet to which this interface is directly attached must be part of its network zone. Other subnets reachable by means of routing should alse be added to the network zone. <br> If network zone for this interface consists of only one subnet, you can simply choose that network's object in the pull-down below. If your network zone should include multiple subnets, you need to create an Object Group, then put all hosts and networks which are going to be part of the network zone into that group and finally choose this group in the pull-down below.</p> - - - <p>Network zone consists of hosts and networks that can be reached through this interface of the firewall. Subnet to which this interface is directly attached must be part of its network zone. Other subnets reachable by means of routing should alse be added to the network zone. + + + <p>Network zone consists of hosts and networks that can be reached through this interface of the firewall. Subnet to which this interface is directly attached must be part of its network zone. Other subnets reachable by means of routing should alse be added to the network zone. <br> If network zone for this interface consists of only one subnet, you can simply choose that network's object in the pull-down below. If your network zone should include multiple subnets, you need to create an Object Group, then put all hosts and networks which are going to be part of the network zone into that group and finally choose this group in the pull-down below.</p> - - - - - - - + + + + + + + Qt::Vertical + + + + 20 + 21 + + + + + + diff --git a/src/gui/ipservicedialog_q.ui b/src/gui/ipservicedialog_q.ui index 8b9677111..7d3206940 100644 --- a/src/gui/ipservicedialog_q.ui +++ b/src/gui/ipservicedialog_q.ui @@ -228,9 +228,15 @@ + + + 200 + 0 + + - 200 + 0 0 diff --git a/src/gui/ipv4dialog_q.ui b/src/gui/ipv4dialog_q.ui index 378fb4fca..381c26fd7 100644 --- a/src/gui/ipv4dialog_q.ui +++ b/src/gui/ipv4dialog_q.ui @@ -8,7 +8,7 @@ 0 0 - 613 + 612 237 @@ -245,13 +245,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/ipv6dialog_q.ui b/src/gui/ipv6dialog_q.ui index d78959fec..001b541a7 100644 --- a/src/gui/ipv6dialog_q.ui +++ b/src/gui/ipv6dialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 724 - 254 + 621 + 259 @@ -226,7 +226,7 @@ - 300 + 0 16 @@ -263,13 +263,13 @@ - 0 + 200 0 - 250 + 0 25 @@ -301,13 +301,13 @@ - 0 + 200 0 - 250 + 0 25 diff --git a/src/gui/librarydialog_q.ui b/src/gui/librarydialog_q.ui index 3cf107c2b..ccc1cda40 100644 --- a/src/gui/librarydialog_q.ui +++ b/src/gui/librarydialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 737 - 232 + 726 + 237 @@ -233,13 +233,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/networkdialog_q.ui b/src/gui/networkdialog_q.ui index 626c8cc53..9e300ca49 100644 --- a/src/gui/networkdialog_q.ui +++ b/src/gui/networkdialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 696 - 221 + 711 + 210 @@ -254,13 +254,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/networkdialogipv6_q.ui b/src/gui/networkdialogipv6_q.ui index 80fc8485f..dcd9c4c9a 100644 --- a/src/gui/networkdialogipv6_q.ui +++ b/src/gui/networkdialogipv6_q.ui @@ -8,8 +8,8 @@ 0 0 - 732 - 205 + 668 + 249 @@ -276,7 +276,7 @@ - 300 + 0 16 @@ -301,13 +301,13 @@ - 0 + 200 0 - 250 + 0 0 @@ -327,13 +327,13 @@ - 0 + 200 0 - 250 + 0 0 @@ -348,24 +348,12 @@ QFrame::Raised - - 0 - 0 0 - - 0 - - - 0 - - - 0 - @@ -387,11 +375,24 @@ 0 - 0 + 23 + + + + Qt::Vertical + + + + 20 + 21 + + + + diff --git a/src/gui/physaddressdialog_q.ui b/src/gui/physaddressdialog_q.ui index 23636666e..09fd6fec9 100644 --- a/src/gui/physaddressdialog_q.ui +++ b/src/gui/physaddressdialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 613 - 209 + 736 + 246 @@ -230,13 +230,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/projectpanel_q.ui b/src/gui/projectpanel_q.ui index c59c5cde9..e7a6ebf6d 100644 --- a/src/gui/projectpanel_q.ui +++ b/src/gui/projectpanel_q.ui @@ -404,15 +404,15 @@ - + 0 0 - 16 - 10 + 200 + 200 diff --git a/src/gui/tagservicedialog_q.ui b/src/gui/tagservicedialog_q.ui index f0554e68d..696902aa3 100644 --- a/src/gui/tagservicedialog_q.ui +++ b/src/gui/tagservicedialog_q.ui @@ -5,8 +5,8 @@ 0 0 - 659 - 205 + 688 + 199 @@ -221,13 +221,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/tcpservicedialog_q.ui b/src/gui/tcpservicedialog_q.ui index 621344def..8bc4ae650 100644 --- a/src/gui/tcpservicedialog_q.ui +++ b/src/gui/tcpservicedialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 981 - 262 + 849 + 258 @@ -257,13 +257,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/timedialog_q.ui b/src/gui/timedialog_q.ui index a99093510..fbe82e2fd 100644 --- a/src/gui/timedialog_q.ui +++ b/src/gui/timedialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 1012 - 300 + 968 + 258 @@ -221,13 +221,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/udpservicedialog_q.ui b/src/gui/udpservicedialog_q.ui index 2f21bffd9..f14037550 100644 --- a/src/gui/udpservicedialog_q.ui +++ b/src/gui/udpservicedialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 878 - 253 + 767 + 243 @@ -264,13 +264,13 @@ - 0 + 200 0 - 200 + 0 0 diff --git a/src/gui/userdialog_q.ui b/src/gui/userdialog_q.ui index b8113256d..58b801599 100644 --- a/src/gui/userdialog_q.ui +++ b/src/gui/userdialog_q.ui @@ -8,8 +8,8 @@ 0 0 - 732 - 229 + 730 + 233 @@ -248,13 +248,13 @@ - 0 + 200 0 - 200 + 0 0