Update: realtime modify

add end date in config.ini
bitdust · May 16, 2017 · 778dcfe · 778dcfe
1 parent d167f83
commit 778dcfe
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 76 deletions.
diff --git a/WamaCry/WamaCry.pro b/WamaCry/WamaCry.pro
@@ -32,4 +32,5 @@ FORMS    += wamacry.ui
 
 RESOURCES += \
     wamacry.qrc
+
 RC_ICONS =ico.ico
diff --git a/WamaCry/mod/config.ini b/WamaCry/mod/config.ini
@@ -15,7 +15,8 @@ address=2MAXLVy54FkShb8drFEmGcyz3qEW19MVQn
 button1=Copy
 button2=Check Payment
 button3=Decrypt
-picture1=./mod/picture1.png
-picture2=./mod/picture2.png
-englishhtml=./mod/english.html
-chinesehtml=./mod/chinese.html
+picture1=/mod/picture1.png
+picture2=/mod/picture2.png
+englishhtml=/mod/english.html
+chinesehtml=/mod/chinese.html
+enddate=2017:06:01
diff --git a/WamaCry/mod/config.ini.doge b/WamaCry/mod/config.ini.doge
@@ -15,7 +15,8 @@ address=DOGGGGGGGGGGGGGGGGGGGE
 button1=Copy
 button2=Check DOGE
 button3=DOGE
-picture1=./mod/doge.jpg
-picture2=./mod/picture2.png
-englishhtml=./mod/doge.html
-chinesehtml=./mod/chinese.html
+picture1=/mod/doge.jpg
+picture2=/mod/picture2.png
+englishhtml=/mod/doge.html
+chinesehtml=/mod/chinese.html
+enddate=2017:06:01
diff --git a/WamaCry/mod/config.ini.nyancat b/WamaCry/mod/config.ini.nyancat
@@ -15,7 +15,8 @@ address=NYAAAAAAAAAAAAAAAAAAAAAN
 button1=Copy
 button2=Check Nyan
 button3=Nyyyya
-picture1=./mod/nyancat1.png
-picture2=./mod/nyancat2.png
-englishhtml=./mod/nyancat.html
-chinesehtml=./mod/chinese.html
+picture1=/mod/nyancat1.png
+picture2=/mod/nyancat2.png
+englishhtml=/mod/nyancat.html
+chinesehtml=/mod/chinese.html
+enddate=2017:06:01
diff --git a/WamaCry/mod/config.ini.orgin b/WamaCry/mod/config.ini.orgin
@@ -15,7 +15,8 @@ address=2MAXLVy54FkShb8drFEmGcyz3qEW19MVQn
 button1=Copy
 button2=Check Payment
 button3=Decrypt
-picture1=./mod/picture1.png
-picture2=./mod/picture2.png
-englishhtml=./mod/english.html
-chinesehtml=./mod/chinese.html
+picture1=/mod/picture1.png
+picture2=/mod/picture2.png
+englishhtml=/mod/english.html
+chinesehtml=/mod/chinese.html
+enddate=2017:06:01
diff --git a/WamaCry/mod/config.ini.readme b/WamaCry/mod/config.ini.readme
@@ -15,7 +15,8 @@ address=address
 button1=button1
 button2=button2
 button3=button3
-picture1=./mod/picture1.png
-picture2=./mod/picture2.png
-englishhtml=./mod/english.html
-chinesehtml=./mod/chinese.html
+picture1=/mod/picture1.png
+picture2=/mod/picture2.png
+englishhtml=/mod/english.html
+chinesehtml=/mod/chinese.html
+enddate=2017:06:01
diff --git a/WamaCry/wamacry.cpp b/WamaCry/wamacry.cpp
@@ -1,8 +1,6 @@
 #include "wamacry.h"
 #include "ui_wamacry.h"
 #include <qtimer.h>
-#include <QTime>
-#include <QDateTime>
 #include <QDesktopServices>
 #include <QMessageBox>
 #include <QFile>
@@ -16,39 +14,9 @@ WamaCry::WamaCry(QWidget *parent) :
     ui->setupUi(this);
     setWindowFlags(windowFlags()& ~Qt::WindowMaximizeButtonHint);
     setFixedSize(this->width(), this->height());
-    // read settings
-    QSettings settings(QCoreApplication::applicationDirPath() + "/mod/config.ini", QSettings::IniFormat);
-    settings.setIniCodec("UTF8");
-    this->setStyleSheet(QString("background-color: ")+settings.value("config/bgcolor").toString());
-    ui->title->setText(settings.value("config/title").toString());
-    ui->title->setStyleSheet(QString("color: ")+settings.value("config/titlecolor").toString());
-    ui->countdown1->setText(settings.value("config/countdown1").toString());
-    ui->countdown2->setText(settings.value("config/countdown2").toString());
-    ui->countdown3->setText(settings.value("config/countdown3").toString());
-    ui->countdown4->setText(settings.value("config/countdown4").toString());
-    ui->text->setText(settings.value("config/text").toString());
-    ui->countdown1->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
-    ui->countdown2->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
-    ui->countdown3->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
-    ui->countdown4->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
-    ui->text->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
-    ui->address->setText(settings.value("config/address").toString());
-    ui->button1->setText(settings.value("config/button1").toString());
-    ui->button2->setText(settings.value("config/button2").toString());
-    ui->button3->setText(settings.value("config/button3").toString());
-    ui->link1->setText(settings.value("config/link1").toString());
-    ui->link2->setText(settings.value("config/link2").toString());
-    ui->link3->setText(settings.value("config/link3").toString());
-    ui->picture1->setPixmap(QPixmap(QCoreApplication::applicationDirPath() + settings.value("config/picture1").toString()));
-    ui->picture2->setPixmap(QPixmap(QCoreApplication::applicationDirPath() + settings.value("config/picture2").toString()));
-
-    QFile file(QCoreApplication::applicationDirPath() + settings.value("config/englishhtml").toString());
-    QTextStream in(&file);
-    file.open(QIODevice::ReadOnly | QIODevice::Text);
-    ui->textBrowser->setText(in.readAll());
 
-    ui->picture1->setScaledContents( true );
-    ui->picture2->setScaledContents( true );
+    load_config();
+    ui->textBrowser->setText(englishdoc);
 
     QTimer *timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(showTime()));
@@ -64,14 +32,15 @@ WamaCry::~WamaCry()
 
 void WamaCry::showTime()
 {
+    load_config();
+
     QTime timenow = QTime::currentTime();
     QTime time_end = QTime::fromString(QString("23:59"),"hh:mm");
     QTime time_left = QTime::fromMSecsSinceStartOfDay(timenow.msecsTo(time_end));
     QString text = time_left.toString("hh:mm:ss");
     ui->lcdNumber->display(text);
 
     QDateTime datenow = QDateTime::currentDateTime();
-    QDateTime date_end = QDateTime::fromString(QString("2017:6:3"), "yyyy:M:d");
     ui->end_of_world->setText(date_end.toString("yyyy-M-d:hh:mm"));
     int days_left = datenow.secsTo(date_end)/3600/24;
     int hours_left = (datenow.secsTo(date_end)-days_left*24*3600)/3600;
@@ -122,20 +91,56 @@ void WamaCry::on_comboBox_currentIndexChanged(int index)
 {
     if(index == 0)
     {
-        QSettings settings(QCoreApplication::applicationDirPath() + "/mod/config.ini", QSettings::IniFormat);
-        settings.setIniCodec("UTF8");
-        QFile file(QCoreApplication::applicationDirPath() + settings.value("config/englishhtml").toString());
-        QTextStream in(&file);
-        file.open(QIODevice::ReadOnly | QIODevice::Text);
-        ui->textBrowser->setText(in.readAll());
+        ui->textBrowser->setText(englishdoc);
     }
     else
     {
-        QSettings settings(QCoreApplication::applicationDirPath() + "/mod/config.ini", QSettings::IniFormat);
-        settings.setIniCodec("UTF8");
-        QFile file(QCoreApplication::applicationDirPath() + settings.value("config/chinesehtml").toString());
-        QTextStream in(&file);
-        file.open(QIODevice::ReadOnly | QIODevice::Text);
-        ui->textBrowser->setText(in.readAll());
+        ui->textBrowser->setText(chinesedoc);
     }
 }
+
+void WamaCry::load_config()
+{
+    // read settings
+    QSettings settings(QCoreApplication::applicationDirPath() + "/mod/config.ini", QSettings::IniFormat);
+    settings.setIniCodec("UTF8");
+    this->setStyleSheet(QString("background-color: ")+settings.value("config/bgcolor").toString());
+    ui->title->setText(settings.value("config/title").toString());
+    ui->title->setStyleSheet(QString("color: ")+settings.value("config/titlecolor").toString());
+    ui->countdown1->setText(settings.value("config/countdown1").toString());
+    ui->countdown2->setText(settings.value("config/countdown2").toString());
+    ui->countdown3->setText(settings.value("config/countdown3").toString());
+    ui->countdown4->setText(settings.value("config/countdown4").toString());
+    ui->text->setText(settings.value("config/text").toString());
+    ui->countdown1->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
+    ui->countdown2->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
+    ui->countdown3->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
+    ui->countdown4->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
+    ui->text->setStyleSheet(QString("color: ")+settings.value("config/txtcolor").toString());
+    ui->address->setText(settings.value("config/address").toString());
+    ui->button1->setText(settings.value("config/button1").toString());
+    ui->button2->setText(settings.value("config/button2").toString());
+    ui->button3->setText(settings.value("config/button3").toString());
+    ui->link1->setText(settings.value("config/link1").toString());
+    ui->link2->setText(settings.value("config/link2").toString());
+    ui->link3->setText(settings.value("config/link3").toString());
+    ui->picture1->setPixmap(QPixmap(QCoreApplication::applicationDirPath() + settings.value("config/picture1").toString()));
+    ui->picture2->setPixmap(QPixmap(QCoreApplication::applicationDirPath() + settings.value("config/picture2").toString()));
+
+    QFile file1(QCoreApplication::applicationDirPath() + settings.value("config/englishhtml").toString());
+    QTextStream in1(&file1);
+    file1.open(QIODevice::ReadOnly | QIODevice::Text);
+    englishdoc = in1.readAll();
+    file1.close();
+
+    QFile file2(QCoreApplication::applicationDirPath() + settings.value("config/chinesehtml").toString());
+    QTextStream in2(&file2);
+    file2.open(QIODevice::ReadOnly | QIODevice::Text);
+    chinesedoc = in2.readAll();
+    file2.close();
+
+    ui->picture1->setScaledContents( true );
+    ui->picture2->setScaledContents( true );
+
+    date_end = QDateTime::fromString(QString(settings.value("config/enddate").toString()), "yyyy:M:d");
+}
diff --git a/WamaCry/wamacry.h b/WamaCry/wamacry.h
@@ -2,6 +2,8 @@
 #define WAMACRY_H
 
 #include <QMainWindow>
+#include <QTime>
+#include <QDateTime>
 
 namespace Ui {
 class WamaCry;
@@ -17,6 +19,10 @@ class WamaCry : public QMainWindow
 
 private:
     Ui::WamaCry *ui;
+    void load_config();
+    QString englishdoc;
+    QString chinesedoc;
+    QDateTime date_end;
 
 private slots:
     void showTime();
@@ -28,6 +34,7 @@ private slots:
     void on_button3_clicked();
     void on_comboBox_currentIndexChanged(int index);
 
+
 };
 
 #endif // WAMACRY_H
diff --git a/WamaCry/wamacry.ui b/WamaCry/wamacry.ui
@@ -46,16 +46,16 @@
     </item>
     <item>
      <property name="text">
-      <string>中文</string>
+      <string>chinese</string>
      </property>
     </item>
    </widget>
    <widget class="QLabel" name="title">
     <property name="geometry">
      <rect>
-      <x>410</x>
+      <x>310</x>
       <y>0</y>
-      <width>431</width>
+      <width>531</width>
       <height>41</height>
      </rect>
     </property>
@@ -99,7 +99,7 @@ color: rgb(255, 255, 255);</string>
       <rect>
        <x>170</x>
        <y>20</y>
-       <width>351</width>
+       <width>411</width>
        <height>16</height>
       </rect>
      </property>
@@ -429,10 +429,10 @@ color: rgb(0, 0, 0);</string>
     <widget class="QLabel" name="countdown3">
      <property name="geometry">
       <rect>
-       <x>40</x>
+       <x>20</x>
        <y>10</y>
-       <width>181</width>
-       <height>16</height>
+       <width>211</width>
+       <height>20</height>
       </rect>
      </property>
      <property name="font">
@@ -512,7 +512,7 @@ color: rgb(0, 0, 0);</string>
      </property>
     </widget>
    </widget>
-   <widget class="QWidget" name="">
+   <widget class="QWidget" name="layoutWidget">
     <property name="geometry">
      <rect>
       <x>20</x>
@@ -542,7 +542,7 @@ color: rgb(0, 0, 0);</string>
        </property>
       </widget>
      </item>
-     <item alignment="Qt::AlignLeft">
+     <item>
       <widget class="QPushButton" name="link2">
        <property name="font">
         <font>