From df3f79eb8c0814fe861a976b1121133412783d4d Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 7 Mar 2011 15:38:47 -0800 Subject: [PATCH] fixes #2192 import wizard size is set depending on the physical screen size; minor fix in snmp discoverer logging --- src/libfwbuilder/src/fwbuilder/snmp.cpp | 3 +-- .../ImportFirewallConfigurationWizard.cpp | 18 +++++++++++++++++- .../SNMPNetworkDiscoveryWizard.cpp | 18 +++++++++++++++++- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/libfwbuilder/src/fwbuilder/snmp.cpp b/src/libfwbuilder/src/fwbuilder/snmp.cpp index 1f90c0f2d..3b1acafe6 100644 --- a/src/libfwbuilder/src/fwbuilder/snmp.cpp +++ b/src/libfwbuilder/src/fwbuilder/snmp.cpp @@ -1562,8 +1562,7 @@ void SNMPCrawler::run_impl(Logger *logger, included(*(net->getAddressPtr())) && !point2point(*net, j->second)) { - str << "Network " << net->toString() << " found" - << " (" << networks.size() << ")"; + str << "Network " << net->toString() << "\n"; *logger << str; // NOTE: net is a pointer to InetAddrMask object diff --git a/src/libgui/importFirewallConfigurationWizard/ImportFirewallConfigurationWizard.cpp b/src/libgui/importFirewallConfigurationWizard/ImportFirewallConfigurationWizard.cpp index 3a4b8860e..80bd0db50 100644 --- a/src/libgui/importFirewallConfigurationWizard/ImportFirewallConfigurationWizard.cpp +++ b/src/libgui/importFirewallConfigurationWizard/ImportFirewallConfigurationWizard.cpp @@ -30,10 +30,12 @@ #include "IC_PlatformWarningPage.h" #include "IC_ProgressPage.h" #include "IC_NetworkZonesPage.h" +#include "FWWindow.h" #include "fwbuilder/FWObject.h" #include "fwbuilder/Firewall.h" +#include #include using namespace std; @@ -60,7 +62,21 @@ ImportFirewallConfigurationWizard::ImportFirewallConfigurationWizard(QWidget *pa setPage(Page_Progess, new IC_ProgressPage(this)); setPage(Page_NetworkZones, new IC_NetworkZonesPage(this)); - resize(700, 600); + QRect sg = QApplication::desktop()->screenGeometry(mw); + QSize screen_size = sg.size(); + +#if defined(Q_OS_MACX) + QSize desired_size(900, 700); +#else + QSize desired_size(800, 700); +#endif + + if (desired_size.width() > screen_size.width()) + desired_size.setWidth(screen_size.width()); + if (desired_size.height() > screen_size.height()) + desired_size.setHeight(screen_size.height()); + + resize(desired_size); } void ImportFirewallConfigurationWizard::accept() diff --git a/src/libgui/snmpNetworkDiscoveryWizard/SNMPNetworkDiscoveryWizard.cpp b/src/libgui/snmpNetworkDiscoveryWizard/SNMPNetworkDiscoveryWizard.cpp index 5e0f83e9f..c60f0dd4a 100644 --- a/src/libgui/snmpNetworkDiscoveryWizard/SNMPNetworkDiscoveryWizard.cpp +++ b/src/libgui/snmpNetworkDiscoveryWizard/SNMPNetworkDiscoveryWizard.cpp @@ -34,7 +34,9 @@ #include "ND_SelectLibraryPage.h" #include "ND_SetupPage.h" #include "ND_SNMPParametersPage.h" +#include "FWWindow.h" +#include #include using namespace std; @@ -59,6 +61,20 @@ SNMPNetworkDiscoveryWizard::SNMPNetworkDiscoveryWizard(QWidget *parent) : QWizar addPage(new ND_SelectLibraryPage(this)); addPage(new ND_CreateObjectsPage(this)); - resize(700, 500); + QRect sg = QApplication::desktop()->screenGeometry(mw); + QSize screen_size = sg.size(); + +#if defined(Q_OS_MACX) + QSize desired_size(900, 700); +#else + QSize desired_size(800, 700); +#endif + + if (desired_size.width() > screen_size.width()) + desired_size.setWidth(screen_size.width()); + if (desired_size.height() > screen_size.height()) + desired_size.setHeight(screen_size.height()); + + resize(desired_size); }