onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 19:27:13 +01:00
Code Issues Releases Wiki Activity

fixes #2192 import wizard size is set depending on the physical screen size; minor fix in snmp discoverer logging

Browse Source
This commit is contained in:
Vadim Kurland 2011-03-07 15:38:47 -08:00
parent 65f93be39d
commit df3f79eb8c
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libfwbuilder/src/fwbuilder/snmp.cpp
View File

@ -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

18
src/libgui/importFirewallConfigurationWizard/ImportFirewallConfigurationWizard.cpp
View File

@ -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 <QDesktopWidget>
#include <QtDebug>
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()

18
src/libgui/snmpNetworkDiscoveryWizard/SNMPNetworkDiscoveryWizard.cpp
View File

@ -34,7 +34,9 @@
#include "ND_SelectLibraryPage.h"
#include "ND_SetupPage.h"
#include "ND_SNMPParametersPage.h"
#include "FWWindow.h"
#include <QDesktopWidget>
#include <QtDebug>
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);
}