From ba557576d960281d774ac1e3c83f2e29786ed682 Mon Sep 17 00:00:00 2001
From: 李太白3028 <2410382594@qq.com>
Date: 星期三, 30 七月 2025 09:21:41 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719
---
Server/付林涛/code/tianKai/vcsmainwindow.h | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git "a/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.h" "b/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.h"
index a65aa9e..31d268a 100644
--- "a/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.h"
+++ "b/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.h"
@@ -2,10 +2,13 @@
#define VCSMAINWINDOW_H
#include <QMainWindow>
+#include <QMessageBox>
+#include <QTimer>
#include "addfile.h"
#include "release.h"
#include "rollback.h"
#include "readlog.h"
+#include "uploador.h"
namespace Ui {
class VCSMainWindow;
}
@@ -17,7 +20,8 @@
public:
explicit VCSMainWindow(QWidget *parent = 0);
~VCSMainWindow();
-
+signals:
+ void releaseSignal();
private slots:
void on_pushButton_clicked();
@@ -27,12 +31,20 @@
void on_pushButton_3_clicked();
+ void addFileSlot(std::shared_ptr<char>,int);
+ void msgSlot(QString);
+
+
private:
Ui::VCSMainWindow *ui;
AddFile *m_addFile;
Release *m_release;
RollBack *m_rollBack;
ReadLog *m_readLog;
+ UpLoador *m_upLoad;
+ QMessageBox *m_msg;
+// QTimer* m_heartCheckTimer;
+
};
#endif // VCSMAINWINDOW_H
--
Gitblit v1.8.0