Settings 2

ServerLMS/Systems/tools.h

@@ -30,6 +30,9 @@ static const QString tasksFIMfileName = "/tasksFIM.xml";
 static const QString clientHash = staticDataFolderName + "/clientHash.xml";
 static const QString logFolderPath = "log";
 
+static const QString configFolderName = "config";
+static const QString settingsName = configFolderName + "/settings.xml";
+
 static const QString baseNameVersion = "base";//может вынести комманды куда нибудь?
 
 static const QString commandTryBaseDelete = "BASEDELETETRY";

ServerLMS/dialogsettingstray.cpp

@@ -1,4 +1,6 @@
+#include <QXmlStreamReader>
 #include "dialogsettingstray.h"
+#include "Systems/tools.h"
 #include "ui_dialogsettingstray.h"
 
 DialogSettingsTray::DialogSettingsTray(QWidget *parent) :
@@ -42,7 +44,6 @@ DBSettings DialogSettingsTray::getSettings()
 
 bool DialogSettingsTray::loadSettings(DBSettings *settings)
 {
-    /*
     QFile file(settingsName);
     if(! file.open(QIODevice::ReadOnly))
         return false;
@@ -53,15 +54,31 @@ bool DialogSettingsTray::loadSettings(DBSettings *settings)
 
         if(xmlReader.isStartElement()){
 
-            if(xmlReader.name() == "ServerSettings")
+            if(xmlReader.name() == "DataBaseSettings")
             {
 
                 foreach(const QXmlStreamAttribute &attr, xmlReader.attributes()){
                     QString name = attr.name().toString();
                     QString value = attr.value().toString();
 
-                    if(name == "Address"){
+                    if(name == "Type"){
-                        settings->Address = value;
+                        settings->Type = value;
+                    }
+
+                    if(name == "Name"){
+                        settings->Name = value;
+                    }
+
+                    if(name == "UserName"){
+                        settings->UserName = value;
+                    }
+
+                    if(name == "Password"){
+                        settings->Password = value;
+                    }
+
+                    if(name == "HostName"){
+                        settings->HostName = value;
                     }
 
                     if(name == "Port"){
@@ -72,10 +89,6 @@ bool DialogSettingsTray::loadSettings(DBSettings *settings)
                         settings->Language = value;
                     }
 
-                    if(name == "AutoStart"){
-                        settings->isAutoStart = value.toInt();
-                    }
-
                 }
             }
         }
@@ -84,7 +97,6 @@ bool DialogSettingsTray::loadSettings(DBSettings *settings)
     }
 
     file.close();
-    */
 
     return true;
 }
@@ -105,7 +117,9 @@ void DialogSettingsTray::on_btnSave_clicked()
         settings->Language = "RUS";
     }
 
-    //settings->Address = ui->editAddress->text();
+    //settings->Address = ui->editUserName->text();
+    //settings->Address = ui->editPassword->text();
+    //settings->Address = ui->editHostName->text();
     //settings->Port = ui->editPort->text();
 
     saveSettings();
@@ -115,7 +129,6 @@ void DialogSettingsTray::on_btnSave_clicked()
 
 bool DialogSettingsTray::saveSettings()
 {
-    /*
     QFile file(settingsName);
 
     if(! file.open(QIODevice::WriteOnly))
@@ -127,12 +140,15 @@ bool DialogSettingsTray::saveSettings()
     xmlWriter.writeStartDocument();
 
     xmlWriter.writeStartElement("ServerSettingsContainer");
-    xmlWriter.writeStartElement("ServerSettings");
+    xmlWriter.writeStartElement("DataBaseSettings");
 
-    xmlWriter.writeAttribute("Address", settings->Address);
+    xmlWriter.writeAttribute("Type", settings->Type);
+    xmlWriter.writeAttribute("Name", settings->Name);
+    xmlWriter.writeAttribute("UserName", settings->UserName);
+    xmlWriter.writeAttribute("Password", settings->Password);
+    xmlWriter.writeAttribute("HostName", settings->HostName);
     xmlWriter.writeAttribute("Port", settings->Port);
     xmlWriter.writeAttribute("Language", settings->Language);
-    xmlWriter.writeAttribute("AutoStart", QString::number(settings->isAutoStart));
 
     xmlWriter.writeEndElement();
     xmlWriter.writeEndElement();
@@ -140,7 +156,6 @@ bool DialogSettingsTray::saveSettings()
     xmlWriter.writeEndDocument();
 
     file.close();
-    */
 
     return true;
 }

ServerLMS/dialogsettingstray.h

@@ -7,7 +7,11 @@
 
 class DBSettings{
 public:
-    QString Address;
+    QString Type;
+    QString Name;
+    QString UserName;
+    QString Password;
+    QString HostName;
     QString Port;
     QString Language;
 };

ServerLMS/serverlmswidget.cpp

@@ -30,6 +30,9 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
     qRegisterMetaType<PacketType>("PacketType");
     qRegisterMetaType<UserType>("UserType");
     qRegisterMetaType<LogLevel>("LogLevel");
+
+    setLanguageInterfase();
+
     errorCode = 0;
 
     ui->btnStopServer->setEnabled(false);
@@ -240,3 +243,24 @@ void ServerLMSWidget::on_btnSettings_clicked()
         break;
     }
 }
+
+void ServerLMSWidget::setLanguageInterfase()
+{
+    DBSettings settings;
+    DialogSettingsTray::loadSettings(&settings);
+
+    if(settings.Language == "ENG")
+    {
+        qtLanguageTranslator.load(QString("translations/ServerLMS_") + languageENG, ".");
+        language = languageENG;
+    }
+    else
+    {
+        qtLanguageTranslator.load(QString("translations/ServerLMS_") + languageRUS, ".");
+        language = languageRUS;
+    }
+
+    qApp->installTranslator(&qtLanguageTranslator);
+
+    emit signal_LanguageChanged(language);
+}

ServerLMS/serverlmswidget.h

@@ -98,6 +98,9 @@ private slots:
 
     void on_btnSettings_clicked();
 
+private:
+    void setLanguageInterfase();
+
 private:
     Ui::ServerLMSWidget *ui;
 

ServerLMS/serverlmswidget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
+    <width>800</width>
     <height>600</height>
    </rect>
   </property>
@@ -138,6 +138,48 @@
          </property>
         </spacer>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_Block">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Block Authorization</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="lblBlockAuth">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="ServerLMS.qrc">:/resources/icons/open.png</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <widget class="QToolButton" name="btnSettings">
          <property name="minimumSize">
@@ -256,48 +298,6 @@
          </property>
         </spacer>
        </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_Block">
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Block Authorization</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="lblBlockAuth">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>32</width>
-             <height>32</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>32</width>
-             <height>32</height>
-            </size>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="pixmap">
-            <pixmap resource="ServerLMS.qrc">:/resources/icons/open.png</pixmap>
-           </property>
-           <property name="scaledContents">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
       </layout>
      </item>
     </layout>

TrayServerLMS/mainwindow.cpp

@@ -15,12 +15,9 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    //Задаём два пункта с текстом локалей в комбобоксе
-    ui->cmbLanguage->addItems(QStringList() << "English" << "Русский");
-
     serverLMSWidget = new ServerLMSWidget(this);
 
-    ui->verticalLayout_1->addWidget(serverLMSWidget);
+    ui->verticalLayout_Main->addWidget(serverLMSWidget);
 
     connect(serverLMSWidget, &ServerLMSWidget::signal_LanguageChanged, this, &MainWindow::slot_LanguageChanged);
 

TrayServerLMS/mainwindow.ui

@@ -20,7 +20,7 @@
    <string>Server Learning management system (LMS)</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="testServerLMS.qrc">
+   <iconset resource="TrayServerLMS.qrc">
     <normaloff>:/resources/IcoServerRRJ.ico</normaloff>:/resources/IcoServerRRJ.ico</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -28,61 +28,7 @@
     <item row="0" column="0">
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
-       <layout class="QVBoxLayout" name="verticalLayout">
+       <layout class="QVBoxLayout" name="verticalLayout_Main"/>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_1"/>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Language</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="cmbLanguage">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
       </item>
      </layout>
     </item>
@@ -101,7 +47,7 @@
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
  <resources>
-  <include location="testServerLMS.qrc"/>
+  <include location="TrayServerLMS.qrc"/>
  </resources>
  <connections/>
 </ui>