Some fixes to connection manager.

[jenirok] / src / common / settings.h

diff --git a/src/common/settings.h b/src/common/settings.h
index 2263beb..c0d0a5f 100644 (file)
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -20,7 +20,9 @@
 #define SETTINGS_H
 
 #include <QtCore/QString>
 #define SETTINGS_H
 
 #include <QtCore/QString>

-#include <QCoreApplication>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtGui/QApplication>

 
 class Settings;
 
 
 class Settings;
 

@@ -29,15 +31,33 @@ class Settings
     Q_DECLARE_TR_FUNCTIONS(Settings)
 
 public:
     Q_DECLARE_TR_FUNCTIONS(Settings)
 
 public:

+
+    enum ConnectionType {ALWAYS_ASK, WLAN, GPRS, ANY};
+
+    struct Language
+    {
+        QString name;
+        QString id;
+    };
+

     static Settings* instance();
     static Settings* instance();

+    static void getLanguages(QList<Language>& languages);
+    ~Settings();
+    static void close();
+    void startEdit();
+    void endEdit();
+    void loadLanguage(QApplication& app);

     bool set(QString const& name, QString const& value);
     QString get(QString const& name);
     QString getDefaultValue(QString const& name);
     bool set(QString const& name, QString const& value);
     QString get(QString const& name);
     QString getDefaultValue(QString const& name);

+    ConnectionType getConnectionType();

     bool reset();
 
 private:
     Settings();
     static Settings* instance_;
     bool reset();
 
 private:
     Settings();
     static Settings* instance_;

+    QMap<QString, QString> settings_;
+    bool editing_;

 
 };
 
 
 };