[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/games/krosswordpuzzle/src
From:       Friedrich Karl Tilman Pülz <fpuelz () gmx ! de>
Date:       2009-09-30 21:48:12
Message-ID: 1254347292.703982.19178.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1029850 by fkpulz:

    - BugFix: When pressing backspace letter cells weren't cleared.
    - BugFix: The status bar sometimes didn't display information for the highlighted \
                clue, but for another one.
    - Corrected the COMPILE_FOR_KDE_4_2_2 preprocessor switch. It was also needed for \
KDE 4.3. Now it's named KDE_4_4 and should only be uncommented to compile for KDE \
4.4.

 M  +1 -1      krosswordcell.cpp  
 M  +6 -3      krosswordpuzzle.cpp  
 M  +2 -2      krosswordpuzzle.h  
 M  +1 -1      main.cpp  


--- trunk/playground/games/krosswordpuzzle/src/krosswordcell.cpp #1029849:1029850
@@ -630,7 +630,7 @@
 			    setCurrentLetter( ' ' );
 			break;
 		    case EmitEditRequestsOnKeyboardEdit:
-			if ( (!krossWord()->isEditable() && isEmpty())
+			if ( (!krossWord()->isEditable() && !isEmpty())
 				|| (krossWord()->isEditable() && correctLetter() != ' ') )
 			    krossWord()->emitLetterEditRequest( this, currentLetter(), ' ' );
 			break;
--- trunk/playground/games/krosswordpuzzle/src/krosswordpuzzle.cpp #1029849:1029850
@@ -1729,15 +1729,18 @@
 		    ClueCell* clue, const QString &currentAnswer,
 		    bool statusbar, const KIcon &icon )
 {
+    if ( clue != m_view->krossWord()->highlightedClue() )
+	return;
+
     if ( statusbar ) {
 	if ( clue->isHorizontal() ) {
 	    statusBar()->showMessage(
-		    i18n("Clue (horizontal): \"%1\", %2 letters, current answer: \"%3\"",
+		    i18n("Clue (across): \"%1\", %2 letters, current answer: \"%3\"",
 		    clue->clueWithNumber(), clue->correctAnswer().length(),
 		    currentAnswer) );
 	} else {
 	    statusBar()->showMessage(
-		    i18n("Clue (vertical): \"%1\", %2 letters, current answer: \"%3\"",
+		    i18n("Clue (down): \"%1\", %2 letters, current answer: \"%3\"",
 		    clue->clueWithNumber(), clue->correctAnswer().length(),
 		    currentAnswer) );
 	}
@@ -1864,7 +1867,7 @@
     else
 	startDir = KUrl(m_curFileName).path();
 
-#ifdef COMPILE_FOR_KDE_4_2
+#ifndef KDE_4_4
     QString fileName;
     KFileDialog fileDlg( startDir,
 	    "application/x-krosswordpuzzle "
--- trunk/playground/games/krosswordpuzzle/src/krosswordpuzzle.h #1029849:1029850
@@ -1,5 +1,5 @@
 /*
- *   Copyright 2009 Friedrich Pülz <fpuelz@gmx.de>
+ *   Copyright 2009 Friedrich P?lz <fpuelz@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -20,7 +20,7 @@
 #ifndef KROSSWORDPUZZLE_H
 #define KROSSWORDPUZZLE_H
 
-// #define COMPILE_FOR_KDE_4_2
+// #define KDE_4_4
 
 #include <kxmlguiwindow.h>
 
--- trunk/playground/games/krosswordpuzzle/src/main.cpp #1029849:1029850
@@ -26,7 +26,7 @@
 static const char description[] =
     I18N_NOOP("A crossword puzzle game and editor for KDE 4");
 
-static const char version[] = "0.7.9";
+static const char version[] = "0.7.9.1";
 
 int main(int argc, char **argv)
 {


[prev in list] [next in list] [prev in thread] [next in thread]