From 418f9c87a9fa471aed790a5adf13be6ff1ba4da0 Mon Sep 17 00:00:00 2001 From: Aleksandr Mikhaylov Date: Mon, 14 Dec 2020 03:31:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BA=D1=81=D1=82=20=D0=B5=D0=B4?= =?UTF-8?q?=D0=B8=D1=82=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Manager_DB_/Manager_DB.pro.user | 28 ++++++++++++++-------------- Manager_DB_/mainwindow.cpp | 24 ++++++++++++++++++------ Manager_DB_/mainwindow.h | 2 +- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/Manager_DB_/Manager_DB.pro.user b/Manager_DB_/Manager_DB.pro.user index 34d5ce2..04a7390 100644 --- a/Manager_DB_/Manager_DB.pro.user +++ b/Manager_DB_/Manager_DB.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {1c563829-7584-49c6-810e-756b1bcf4562} + {d7160f69-00b6-4b15-a769-2251652e751b} ProjectExplorer.Project.ActiveTarget @@ -87,17 +87,17 @@ ProjectExplorer.Project.Target.0 Desktop - Desktop Qt 5.15.1 MinGW 64-bit - Desktop Qt 5.15.1 MinGW 64-bit - qt.qt5.5151.win64_mingw81_kit + Desktop Qt 5.15.2 MinGW 64-bit + Desktop Qt 5.15.2 MinGW 64-bit + qt.qt5.5152.win64_mingw81_kit 0 0 0 true 0 - D:\Programms\Qt Labs\manager_db\build-Manager_DB-Desktop_Qt_5_15_1_MinGW_64_bit-Debug - D:/Programms/Qt Labs/manager_db/build-Manager_DB-Desktop_Qt_5_15_1_MinGW_64_bit-Debug + C:\Labs\manager_db\build-Manager_DB-Desktop_Qt_5_15_2_MinGW_64_bit-Debug + C:/Labs/manager_db/build-Manager_DB-Desktop_Qt_5_15_2_MinGW_64_bit-Debug true @@ -148,8 +148,8 @@ true 2 - D:\Programms\Qt Labs\manager_db\build-Manager_DB-Desktop_Qt_5_15_1_MinGW_64_bit-Release - D:/Programms/Qt Labs/manager_db/build-Manager_DB-Desktop_Qt_5_15_1_MinGW_64_bit-Release + C:\Labs\manager_db\build-Manager_DB-Desktop_Qt_5_15_2_MinGW_64_bit-Release + C:/Labs/manager_db/build-Manager_DB-Desktop_Qt_5_15_2_MinGW_64_bit-Release true @@ -200,8 +200,8 @@ true 0 - D:\Programms\Qt Labs\manager_db\build-Manager_DB-Desktop_Qt_5_15_1_MinGW_64_bit-Profile - D:/Programms/Qt Labs/manager_db/build-Manager_DB-Desktop_Qt_5_15_1_MinGW_64_bit-Profile + C:\Labs\manager_db\build-Manager_DB-Desktop_Qt_5_15_2_MinGW_64_bit-Profile + C:/Labs/manager_db/build-Manager_DB-Desktop_Qt_5_15_2_MinGW_64_bit-Profile true @@ -325,8 +325,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/Programms/Qt Labs/manager_db/Manager_DB_/Manager_DB.pro - D:/Programms/Qt Labs/manager_db/Manager_DB_/Manager_DB.pro + Qt4ProjectManager.Qt4RunConfiguration:C:/Labs/manager_db/Manager_DB_/Manager_DB.pro + C:/Labs/manager_db/Manager_DB_/Manager_DB.pro false @@ -337,7 +337,7 @@ false true - D:/Programms/Qt Labs/manager_db/build-Manager_DB-Desktop_Qt_5_15_1_MinGW_64_bit-Debug + C:/Labs/manager_db/build-Manager_DB-Desktop_Qt_5_15_2_MinGW_64_bit-Debug 1 diff --git a/Manager_DB_/mainwindow.cpp b/Manager_DB_/mainwindow.cpp index f387770..05b657e 100644 --- a/Manager_DB_/mainwindow.cpp +++ b/Manager_DB_/mainwindow.cpp @@ -37,7 +37,7 @@ MainWindow::MainWindow(QWidget *parent) setMenuBar(menuBar); mainWidget = new QWidget(); - lineEdit = new QLineEdit(this); + lineEdit = new QTextEdit(this); textEdit_log = new QTextEdit(this); label = new QLabel(this); listWidget = new QListWidget(this); @@ -61,7 +61,7 @@ MainWindow::MainWindow(QWidget *parent) pushButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); pushButton_2->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); - QString StyleSheet_2 = "QLineEdit { color: black; border: none; font: 10pt 'consolas'; }"; + QString StyleSheet_2 = "QTextEdit { color: black; border: none; font: 10pt 'consolas'; }"; QString StyleSheet_3 = "QTextEdit { color: black; border: none; font: 12pt 'consolas'; font-weight: 600; }"; lineEdit->setAlignment(Qt::AlignLeft | Qt::AlignTop); lineEdit->setStyleSheet(StyleSheet_2); @@ -94,13 +94,25 @@ MainWindow::MainWindow(QWidget *parent) DBUpdate(item->text()); }); - QShortcut *shortcut = new QShortcut(Qt::Key_Return, this); - QObject::connect(shortcut, SIGNAL(activated()), this, SLOT(ok_clicked())); - + // QShortcut *shortcut = new QShortcut(Qt::SHIFT + Qt::Key_Return, this); + // QObject::connect(shortcut, SIGNAL(activated()), this, SLOT(ok_clicked())); + pushButton->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Return)); } void MainWindow::ok_clicked() { - QString command = lineEdit->text(); + QString temp = lineEdit->toPlainText(); + QString command; + for (int i = 0; i < temp.size(); i++) { + if (i == 0) { + command.append(temp[i]); + } + else { + if (!(temp[i-1] == "\n" && temp[i] == "\n")) { + command.append(temp[i]); + } + } + + } QSqlQuery query; bool cmd = query.exec(command); diff --git a/Manager_DB_/mainwindow.h b/Manager_DB_/mainwindow.h index da8f4ce..6c8c95a 100644 --- a/Manager_DB_/mainwindow.h +++ b/Manager_DB_/mainwindow.h @@ -53,7 +53,7 @@ public: QListWidget *listWidget = nullptr; QTableView *tableView = nullptr; QTextEdit *textEdit_log = nullptr; - QLineEdit *lineEdit = nullptr; + QTextEdit *lineEdit = nullptr; QPushButton *pushButton = nullptr, *pushButton_2 = nullptr; QAction* actionExit = nullptr; -- GitLab