mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-03-18 17:27:20 +01:00
Merge branch 'development' of ssh://ncgit/var/git/fwbuilder into development
This commit is contained in:
commit
12ad3fefcf
@ -26,6 +26,7 @@
|
|||||||
#ifndef __FWBSETTINGS_H_
|
#ifndef __FWBSETTINGS_H_
|
||||||
#define __FWBSETTINGS_H_
|
#define __FWBSETTINGS_H_
|
||||||
|
|
||||||
|
#include "../../VERSION.h"
|
||||||
|
|
||||||
#include <qsettings.h>
|
#include <qsettings.h>
|
||||||
#include <qrect.h>
|
#include <qrect.h>
|
||||||
@ -34,10 +35,11 @@
|
|||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
|
|
||||||
#define SETTINGS_PATH_PREFIX "/4.2"
|
#define SETTINGS_PATH_PREFIX "/" GENERATION
|
||||||
|
|
||||||
#include <fwbuilder/FWObject.h>
|
#include <fwbuilder/FWObject.h>
|
||||||
|
|
||||||
|
|
||||||
class QWidget;
|
class QWidget;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -48,8 +50,8 @@ class QWidget;
|
|||||||
#define LoadStandardObjects 0
|
#define LoadStandardObjects 0
|
||||||
#define LoadLastEditedFile 1
|
#define LoadLastEditedFile 1
|
||||||
|
|
||||||
class FWBSettings : public QSettings {
|
class FWBSettings : public QSettings
|
||||||
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
enum LabelColors { RED, ORANGE, YELLOW, GREEN, BLUE, PURPLE, GRAY };
|
enum LabelColors { RED, ORANGE, YELLOW, GREEN, BLUE, PURPLE, GRAY };
|
||||||
@ -68,7 +70,10 @@ class FWBSettings : public QSettings {
|
|||||||
FWBSettings(bool testData = false);
|
FWBSettings(bool testData = false);
|
||||||
~FWBSettings();
|
~FWBSettings();
|
||||||
|
|
||||||
static QString getApplicationNameForSettings() { return "FirewallBuilder4.2"; }
|
static QString getApplicationNameForSettings()
|
||||||
|
{
|
||||||
|
return "FirewallBuilder" GENERATION;
|
||||||
|
}
|
||||||
|
|
||||||
void init(bool force_first_time_run=false);
|
void init(bool force_first_time_run=false);
|
||||||
void save();
|
void save();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user