Lock func merge

src/InputObject.cpp

@@ -85,6 +85,11 @@ void InputObject::initUi()
 bool InputObject::eventFilter(QObject* obj, QEvent* event)
 {
 
+	if (event->type() == QEvent::MouseButtonPress)
+	{
+		emit touchScreen();
+		qDebug() << "touchScreen()";
+	}
 	//mouse button release means setfocus is useless
 	if (event->type() == QEvent::MouseButtonRelease)
 	{

src/InputObject.h

@@ -9,24 +9,26 @@ class QTextEdit;
 //#define CUTE_STYLE
 
 namespace Ui {
-class InputObject;
+	class InputObject;
 }
 
 class InputObject : public QWidget
 {
-    Q_OBJECT
+	Q_OBJECT
 
 public:
-    explicit InputObject(QWidget *parent = nullptr);
+	explicit InputObject(QWidget* parent = nullptr);
-    ~InputObject();
+	~InputObject();
-	bool eventFilter(QObject *obj, QEvent *event);
+	bool eventFilter(QObject* obj, QEvent* event);
-    void ShowPanel();
+	void ShowPanel();
+signals:
+	void touchScreen();
 private:
-    Ui::InputObject *ui;
+	Ui::InputObject* ui;
 	void initUi();
-//	void ShowPanel();
+	//	void ShowPanel();
 	void HidePanel();
-	QDateEdit *curDateEdit = nullptr;
+	QDateEdit* curDateEdit = nullptr;
 	QLineEdit* curLine = nullptr;
 	QTextEdit* curText = nullptr;
 };

src/main.cpp

@@ -55,8 +55,8 @@ int main(int argc, char* argv[])
 	InputObject* obj = new InputObject();
 	a.installEventFilter(obj);
 	SQLHelper::Open();
-    UserOperationLog::Default()->init();
 	MainWindow w;
+	QObject::connect(obj, SIGNAL(touchScreen()), &w, SLOT(refreshTimer()));
 
 
 	QStringList app_args = a.arguments();

src/mainwindow.h

@@ -2,6 +2,8 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include <QDebug>
+#include <QTimer>
 #include "StdOutRedirector.h"
 namespace Ui {
 	class MainWindow;
@@ -21,7 +23,13 @@ public:
 	void requestLogin();
 	QTextEdit* getEdit();
 	void debugConsoleOn();
+public slots:
+	void coverScreen();
+	void refreshTimer();
+
 private:
+	QTimer* screenTimer = nullptr;
+	int counter = 30000;
 	Ui::MainWindow* ui;
 	GUIMessageDialog* msgDialog = nullptr;
 	StdOutRedirector* redir = nullptr;