Added new settings for program owner (web,email, phone)

core/reporting/variablefiller.cpp

@@ -25,6 +25,9 @@ void VariableFiller::fill(ReportPtr report, int recordId)
     vars[IC] = QString::number(m_settings->ic());
     vars[DIC] = m_settings->dic();
     vars[LOGO_PATH] = m_settings->logoPath();
+    vars[WEB] = m_settings->web();
+    vars[EMAIL] = m_settings->email();
+    vars[PHONE] = m_settings->phone();
 
     if (recordId > 0)
     {

core/reporting/variablefiller.h

@@ -14,6 +14,9 @@
 #define DIC "DIC"
 #define LOGO_PATH "LOGO_PATH"
 #define RECORD_ID "RECORD_ID"
+#define WEB "WEB"
+#define EMAIL "EMAIL"
+#define PHONE "PHONE"
 
 class CORESHARED_EXPORT VariableFiller
 {

core/settings/globalsettings.cpp

@@ -126,5 +126,35 @@ void GlobalSettings::setVatSecondLower(QDecDouble vatSecondLower)
     m_vatSecondLower = FROM_DEC(vatSecondLower);
 }
 
+QString GlobalSettings::email() const
+{
+    return m_email;
+}
+
+void GlobalSettings::setEmail(const QString &email)
+{
+    m_email = email;
+}
+
+QString GlobalSettings::web() const
+{
+    return m_web;
+}
+
+void GlobalSettings::setWeb(const QString &web)
+{
+    m_web = web;
+}
+
+QString GlobalSettings::phone() const
+{
+    return m_phone;
+}
+
+void GlobalSettings::setPhone(const QString &phone)
+{
+    m_phone = phone;
+}
+
 
 

core/settings/globalsettings.h

@@ -22,6 +22,10 @@ class CORESHARED_EXPORT GlobalSettings : public QObject
     Q_PROPERTY(QDecDouble vatHigh READ vatHigh WRITE setVatHigh)
     Q_PROPERTY(QDecDouble vatFirstLower READ vatFirstLower WRITE setVatFirstLower)
     Q_PROPERTY(QDecDouble vatSecondLower READ vatSecondLower WRITE setVatSecondLower)
+    Q_PROPERTY(QString email READ email WRITE setEmail)
+    Q_PROPERTY(QString web READ web WRITE setWeb)
+    Q_PROPERTY(QString phone READ phone WRITE setPhone)
+
 public:
     explicit GlobalSettings(QObject *parent = 0);
 
@@ -61,6 +65,15 @@ public:
     QDecDouble vatSecondLower() const;
     void setVatSecondLower(QDecDouble vatSecondLower);
 
+    QString email() const;
+    void setEmail(const QString &email);
+
+    QString web() const;
+    void setWeb(const QString &web);
+
+    QString phone() const;
+    void setPhone(const QString &phone);
+
 private:
     QString m_firmName;
     QString m_street;
@@ -74,6 +87,9 @@ private:
     int m_vatHigh;
     int m_vatFirstLower;
     int m_vatSecondLower;
+    QString m_email;
+    QString m_web;
+    QString m_phone;
 
 signals:
 

core/settings/globalsettingsform.cpp

@@ -28,6 +28,9 @@ GlobalSettingsForm::GlobalSettingsForm(QWidget *parent) :
     registerBinding(ui->vatHigh);
     registerBinding(ui->vatFirstLower);
     registerBinding(ui->vatSecondLower);
+    registerBinding(ui->web);
+    registerBinding(ui->email);
+    registerBinding(ui->phone);
 
     m_seriesModel = new AutoTableModel<NumberSeries>(this);
     m_seriesModel->setEditableCols(QList<int>() << 0);

core/settings/globalsettingsform.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>759</width>
-    <height>552</height>
+    <height>557</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -89,6 +89,36 @@
           <item row="4" column="1">
            <widget class="QLineEdit" name="zipCode"/>
           </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="web"/>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLineEdit" name="email"/>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLineEdit" name="phone"/>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="text">
+             <string>Web</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>E-mail</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="label_14">
+            <property name="text">
+             <string>Phone</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>