From 79f0ca0c2163326da4758176ed071dacd6377589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Sun, 24 Jun 2018 10:34:02 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@412
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/graphic/graphic.cpp   |  2 +-
 qad/widgets/qcodeedit.cpp | 22 ++++++++++++++++++++--
 qad/widgets/qcodeedit.h   |  2 ++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp
index e09db88..beec644 100644
--- a/qad/graphic/graphic.cpp
+++ b/qad/graphic/graphic.cpp
@@ -983,7 +983,7 @@ void Graphic::drawGrid() {
 				if (!str.second.isEmpty()) {
 					rect = sfm.boundingRect(str.second);
 					painter->setFont(sf);
-					painter->drawText(cx + dx, cy - font_sz.height() / 2.5, str.second);
+					painter->drawText(cx + dx, cy - font_sz.height() / 4., str.second);
 				}
 			}
 		}
diff --git a/qad/widgets/qcodeedit.cpp b/qad/widgets/qcodeedit.cpp
index 39f8f2d..5342797 100644
--- a/qad/widgets/qcodeedit.cpp
+++ b/qad/widgets/qcodeedit.cpp
@@ -73,12 +73,20 @@ QCodeEdit::QCodeEdit(QWidget * parent): QWidget(parent) {
 	QAction * a = new QAction(this);
 	a->setShortcut(QKeySequence("Shift+Tab"));
 	a->setShortcutContext(Qt::WidgetShortcut);
-	connect(a, SIGNAL(triggered(bool)), this, SLOT(deindent()));
+	connect(a, SIGNAL(triggered()), this, SLOT(deindent()));
 	ui->textCode->addAction(a);
 	a = new QAction(this);
 	a->setShortcut(QKeySequence("Ctrl+D"));
 	a->setShortcutContext(Qt::WidgetShortcut);
-	connect(a, SIGNAL(triggered(bool)), this, SLOT(deleteLine()));
+	connect(a, SIGNAL(triggered()), this, SLOT(deleteLine()));
+	a = new QAction(this);
+	a->setShortcut(QKeySequence("Ctrl+Return"));
+	a->setShortcutContext(Qt::WidgetShortcut);
+	connect(a, SIGNAL(triggered()), this, SLOT(newLine()));
+	a = new QAction(this);
+	a->setShortcut(QKeySequence("Ctrl+Shift+Return"));
+	a->setShortcutContext(Qt::WidgetShortcut);
+	connect(a, SIGNAL(triggered()), this, SLOT(newLineBefore()));
 	ui->textCode->addAction(a);
 	ui->frame->setFocusProxy(ui->textCode);
 	QTextOption to = ui->textLines->document()->defaultTextOption();
@@ -916,6 +924,16 @@ void QCodeEdit::scrollToTop() {
 }
 
 
+void QCodeEdit::newLine() {
+	/// TODO
+}
+
+
+void QCodeEdit::newLineBefore() {
+	/// TODO
+}
+
+
 void QCodeEdit::setFocus() {
 	ui->textCode->setFocus();
 }
diff --git a/qad/widgets/qcodeedit.h b/qad/widgets/qcodeedit.h
index 04ff15d..b17542e 100644
--- a/qad/widgets/qcodeedit.h
+++ b/qad/widgets/qcodeedit.h
@@ -132,6 +132,8 @@ private slots:
 public slots:
 	void updateLines();
 	void scrollToTop();
+	void newLine();
+	void newLineBefore();
 	void setFocus();
 	void setText(const QString & t);
 	void setShowSpaces(bool yes);