Merge remote-tracking branch 'origin/dev'

agateau · Jan 8, 2019 · 7c2e2f3 · 7c2e2f3
2 parents 0d20e5f + 33bb844
commit 7c2e2f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/screenshot.png b/screenshot.png
diff --git a/src/IndentExtension.cpp b/src/IndentExtension.cpp
@@ -105,7 +105,8 @@ bool IndentExtension::canRemoveIndentation() const
 
 void IndentExtension::insertIndentation()
 {
-    mTextEdit->insertPlainText(QString(INDENT_SIZE, ' '));
+    auto cursor = mTextEdit->textCursor();
+    indentLine(cursor);
 }
 
 void IndentExtension::processSelection(ProcessSelectionCallback callback)

diff --git a/src/welcome.txt b/src/welcome.txt
@@ -17,6 +17,6 @@ It also has a few handy editing features, like auto-bullet lists:
 
 You can also open urls using Control + click. You can try clicking on this one for example: https://github.com/agateau/nanonote.
 
-Finally, you can indent/unindent text by selecting it and pressing Tab and Shift+Tab.
+Finally, you can indent selected lines with Ctrl+I and unindent with Ctrl+U.
 
-That's all there is to say, now you can erase this text and start taking notes!
+That's all there is to say, now you can erase this text and start taking notes!