mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 07:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix driver setup.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2017-09-04 18:53:45 +05:00
parent a8b742feda
commit 1983b0b7b9
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/ui/fortmanager.cpp
View File

@ -25,7 +25,9 @@ FortManager::FortManager(QObject *parent) :
m_firewallConfToEdit(nullConf()), m_firewallConfToEdit(nullConf()),
m_driverManager(new DriverManager(this)) m_driverManager(new DriverManager(this))
{ {
m_fortSettings->readConf(*m_firewallConf); setupDriver();
loadSettings(m_firewallConf);
registerQmlTypes(); registerQmlTypes();
@ -50,6 +52,16 @@ void FortManager::registerQmlTypes()
qmlRegisterType<LogEntry>("com.fortfirewall", 1, 0, "LogEntry"); qmlRegisterType<LogEntry>("com.fortfirewall", 1, 0, "LogEntry");
} }
bool FortManager::setupDriver()
{
if (!m_driverManager->openDevice()) {
showErrorBox(m_driverManager->errorMessage());
return false;
}
return true;
}
void FortManager::setupTrayIcon() void FortManager::setupTrayIcon()
{ {
m_trayIcon->setToolTip(qApp->applicationDisplayName()); m_trayIcon->setToolTip(qApp->applicationDisplayName());
@ -75,16 +87,6 @@ void FortManager::setupEngine()
Q_ASSERT(m_appWindow); Q_ASSERT(m_appWindow);
} }
bool FortManager::setupDriver()
{
if (!m_driverManager->openDevice()) {
showErrorBox(m_driverManager->errorMessage());
return false;
}
return true;
}
void FortManager::showTrayIcon() void FortManager::showTrayIcon()
{ {
m_trayIcon->show(); m_trayIcon->show();
@ -140,6 +142,16 @@ void FortManager::setFirewallConfToEdit(FirewallConf *conf)
emit firewallConfToEditChanged(); emit firewallConfToEditChanged();
} }
bool FortManager::loadSettings(FirewallConf *conf)
{
if (!m_fortSettings->readConf(*conf)) {
showErrorBox(m_fortSettings->errorMessage());
return false;
}
return updateDriverConf(conf);
}
bool FortManager::saveSettings(FirewallConf *newConf) bool FortManager::saveSettings(FirewallConf *newConf)
{ {
if (!m_fortSettings->writeConf(*newConf)) { if (!m_fortSettings->writeConf(*newConf)) {
@ -152,8 +164,13 @@ bool FortManager::saveSettings(FirewallConf *newConf)
updateTrayMenu(); updateTrayMenu();
return updateDriverConf(m_firewallConf);
}
bool FortManager::updateDriverConf(FirewallConf *conf)
{
// Update driver // Update driver
if (!m_driverManager->writeConf(*m_firewallConf)) { if (!m_driverManager->writeConf(*conf)) {
showErrorBox(m_driverManager->errorMessage()); showErrorBox(m_driverManager->errorMessage());
return false; return false;
} }
@ -161,7 +178,7 @@ bool FortManager::saveSettings(FirewallConf *newConf)
return true; return true;
} }
bool FortManager::updateDriverFlags(FirewallConf *conf) bool FortManager::updateDriverConfFlags(FirewallConf *conf)
{ {
// Update driver // Update driver
if (!m_driverManager->writeConfFlags(*conf)) { if (!m_driverManager->writeConfFlags(*conf)) {
@ -176,7 +193,7 @@ void FortManager::setAppLogBlocked(bool enable)
{ {
m_firewallConf->setAppLogBlocked(enable); m_firewallConf->setAppLogBlocked(enable);
updateDriverFlags(m_firewallConf); updateDriverConfFlags(m_firewallConf);
} }
void FortManager::saveTrayFlags() void FortManager::saveTrayFlags()
@ -197,7 +214,7 @@ void FortManager::saveTrayFlags()
m_fortSettings->writeConfFlags(*m_firewallConf); m_fortSettings->writeConfFlags(*m_firewallConf);
updateDriverFlags(m_firewallConf); updateDriverConfFlags(m_firewallConf);
} }
FirewallConf *FortManager::cloneConf(const FirewallConf &conf) FirewallConf *FortManager::cloneConf(const FirewallConf &conf)

8
src/ui/fortmanager.h
View File

@ -34,8 +34,6 @@ signals:
void firewallConfToEditChanged(); void firewallConfToEditChanged();
public slots: public slots:
bool setupDriver();
void showTrayIcon(); void showTrayIcon();
void showWindow(); void showWindow();
@ -58,11 +56,15 @@ private:
static void registerQmlTypes(); static void registerQmlTypes();
bool setupDriver();
void setupTrayIcon(); void setupTrayIcon();
void setupEngine(); void setupEngine();
bool loadSettings(FirewallConf *conf);
bool saveSettings(FirewallConf *newConf); bool saveSettings(FirewallConf *newConf);
bool updateDriverFlags(FirewallConf *conf);
bool updateDriverConf(FirewallConf *conf);
bool updateDriverConfFlags(FirewallConf *conf);
FirewallConf *cloneConf(const FirewallConf &conf); FirewallConf *cloneConf(const FirewallConf &conf);

5
src/ui/main.cpp
View File

@ -22,11 +22,6 @@ int main(int argc, char *argv[])
return FortCommon::provRegister(true); return FortCommon::provRegister(true);
} }
// Open the driver device
if (!fortManager.setupDriver()) {
return 1;
}
fortManager.showTrayIcon(); fortManager.showTrayIcon();
return app.exec(); return app.exec();