[rkward-cvs] SF.net SVN: rkward: [2139] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2139
          http://rkward.svn.sourceforge.net/rkward/?rev=2139&view=rev
Author:   tfry
Date:     2007-10-28 11:43:30 -0700 (Sun, 28 Oct 2007)

Log Message:
-----------
Fix cursor positioning for Shift+Home/End

Modified Paths:
--------------
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/rkward/rkconsole.cpp
    branches/KDE4_port/rkward/rkward.cpp

Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-10-28 18:27:39 UTC (rev 2138)
+++ branches/KDE4_port/TODO_KDE4	2007-10-28 18:43:30 UTC (rev 2139)
@@ -106,7 +106,6 @@
 
 rkconsole:
 	- check whether all selection, editing, navigating really works as expected
-		-* Shift+End should move the cursor to the end of the line, instead of leaving it at the current position. similarly for SHift+Home
 	- is tab completion for file names still crashy?
 		- currently, problem seems to be inside KUrlCompletion
 	-* one additional newline character printed with every line

Modified: branches/KDE4_port/rkward/rkconsole.cpp
===================================================================
--- branches/KDE4_port/rkward/rkconsole.cpp	2007-10-28 18:27:39 UTC (rev 2138)
+++ branches/KDE4_port/rkward/rkconsole.cpp	2007-10-28 18:43:30 UTC (rev 2139)
@@ -201,9 +201,8 @@
 				}
 			}
 			view->setSelection (newrange);
-		} else {
-			cursorAtTheBeginning ();
 		}
+		cursorAtTheBeginning ();
 		return true;
 	} else if (e->key () == Qt::Key_End) {
 		if (e->modifiers () == Qt::ShiftModifier) {
@@ -220,9 +219,8 @@
 				}
 			}
 			view->setSelection (newrange);
-		} else {
-			cursorAtTheEnd ();
 		}
+		cursorAtTheEnd ();
 		return true;
 	} else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
 		hinter->hideArgHint ();

Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp	2007-10-28 18:27:39 UTC (rev 2138)
+++ branches/KDE4_port/rkward/rkward.cpp	2007-10-28 18:43:30 UTC (rev 2139)
@@ -188,12 +188,10 @@
 		return;
 	}
 
+	e->ignore ();
 	if (doQueryQuit ()) {
 		emit (aboutToQuitRKWard());
-		e->ignore ();
 		new RKQuitAgent (this);
-	} else {
-		e->ignore ();
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.