summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2015-01-01 10:50:21 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2015-01-01 10:50:21 +0900
commitb6fa8d4f2ab9a45c46990b226d28c5482acb01fe (patch)
tree4182db71d6d98cb6177b0fad7072f5fb15b78142
parent592bebb509786ccec893b305d3ae6a0c76ed3bdb (diff)
downloadtdelibs-b6fa8d4f2ab9a45c46990b226d28c5482acb01fe.tar.gz
tdelibs-b6fa8d4f2ab9a45c46990b226d28c5482acb01fe.zip
Added 'Delete Line' menu entry in Kate. This resolves bug 1907.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--kate/data/katepartreadonlyui.rc3
-rw-r--r--kate/data/katepartui.rc3
-rw-r--r--kate/part/kateview.cpp9
3 files changed, 11 insertions, 4 deletions
diff --git a/kate/data/katepartreadonlyui.rc b/kate/data/katepartreadonlyui.rc
index e1fff590e..430748afe 100644
--- a/kate/data/katepartreadonlyui.rc
+++ b/kate/data/katepartreadonlyui.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KatePartView" version="40">
+<kpartgui name="KatePartView" version="41">
<MenuBar>
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="file_save_as" group="save_merge" />
@@ -68,6 +68,7 @@
<Action name="tools_lowercase" group="tools_operations" />
<Action name="tools_capitalize" group="tools_operations" />
<Separator group="tools_operations" />
+ <Action name="tools_delete_line" group="tools_operations" />
<Action name="tools_join_lines" group="tools_operations" />
<Action name="tools_apply_wordwrap" group="tools_operations" />
</Menu>
diff --git a/kate/data/katepartui.rc b/kate/data/katepartui.rc
index 7a01434e2..7743806d1 100644
--- a/kate/data/katepartui.rc
+++ b/kate/data/katepartui.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KatePartView" version="40">
+<kpartgui name="KatePartView" version="41">
<MenuBar>
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="file_save" group="save_merge" />
@@ -83,6 +83,7 @@
<Action name="tools_lowercase" group="tools_operations" />
<Action name="tools_capitalize" group="tools_operations" />
<Separator group="tools_operations" />
+ <Action name="tools_delete_line" group="tools_operations" />
<Action name="tools_join_lines" group="tools_operations" />
<Action name="tools_apply_wordwrap" group="tools_operations" />
</Menu>
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index f5593da9a..57c795914 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -284,8 +284,13 @@ void KateView::setupActions()
a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
"cursor if no text is selected.") );
+ a = new TDEAction( i18n("Delete Line"), 0, TQT_TQOBJECT(this),
+ TQT_SLOT( killLine() ), ac, "tools_delete_line");
+ a->setWhatsThis(i18n("Use this to delete the current line."));
+
a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
+ a->setWhatsThis(i18n("Use this to join lines together."));
}
else
{
@@ -756,8 +761,8 @@ void KateView::slotReadWriteChanged ()
l << "edit_replace" << "set_insert" << "tools_spelling" << "tools_indent"
<< "tools_unindent" << "tools_cleanIndent" << "tools_align" << "tools_comment"
<< "tools_uncomment" << "tools_uppercase" << "tools_lowercase"
- << "tools_capitalize" << "tools_join_lines" << "tools_apply_wordwrap"
- << "edit_undo" << "edit_redo" << "tools_spelling_from_cursor"
+ << "tools_capitalize" << "tools_delete_line" << "tools_join_lines"
+ << "tools_apply_wordwrap" << "edit_undo" << "edit_redo" << "tools_spelling_from_cursor"
<< "tools_spelling_selection";
TDEAction *a = 0;