第一阶段初稿+修复部分内容

OfficeAssistant_msvc/mainscreen.h

@@ -11,7 +11,8 @@
 #include <QPushButton>
 #include "wke.h"
 #include "qminiblink.h"
-
+#include "settingsscreen.h"
+class MyThread;
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainScreen; }
 QT_END_NAMESPACE
@@ -19,13 +20,16 @@ QT_END_NAMESPACE
 class MainScreen : public QWidget {
 Q_OBJECT
 signals:
-	void destroy();
+	void started();
+	void ondestroy();
 	void changeUrl(QString url);
+	void initMiniBlink();
 public:
     explicit MainScreen(QWidget *parent = nullptr);
     ~MainScreen() override;
 public slots:
 	void clickButton1(QString text, QString url);
+	void firstUrl(QString url);
 protected:
 	//void resizeEvent(QResizeEvent *event) override;
 private:
@@ -36,11 +40,12 @@ private:
 	QIcon *icon;
 	QWidget *broswer;
 	static bool isInited();
-	QThread *thread;
+	MyThread *thread;
 	QMiniBlink *miniblink;
+	SettingsScreen *settingScreen;
+	
 private slots:
 	void startWeChat();
-	
 };