From kde-commits  Tue Oct 17 20:01:49 2006
From: Jaroslaw Staniek <js () iidea ! pl>
Date: Tue, 17 Oct 2006 20:01:49 +0000
To: kde-commits
Subject: koffice/kexi/plugins/queries
Message-Id: <1161115309.196076.22256.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=116111531701663

SVN commit 596526 by staniek:

Query Designer
- refresh design view after a sequence of switches: 
   text view -> data view -> design view
2.0: merged



 M  +7 -4      kexiquerydesignerguieditor.cpp  


--- trunk/koffice/kexi/plugins/queries/kexiquerydesignerguieditor.cpp #596525:596526
@@ -630,7 +630,9 @@
 			//todo: load global query properties
 		}
 	}
-	else if (mode==Kexi::TextViewMode) {
+	else if (mode==Kexi::TextViewMode || mode==Kexi::DataViewMode) {
+		// Switch from text or data view. In the second case, the design could be changed as well
+		// because there could be changes made in the text view before switching to the data view.
 		if (tempData()->queryChangedInPreviousView) {
 			//previous view changed query data
 			//-clear and regenerate GUI items
@@ -646,9 +648,10 @@
 				d->relations->clear();
 			}
 		}
-		//todo: load global query properties
+//! @todo load global query properties
 	}
-	else if (mode==Kexi::DataViewMode) {
+	
+	if (mode==Kexi::DataViewMode) {
 		//this is just a SWITCH from data view
 		//set cursor if needed:
 		if (d->dataTable->dataAwareObject()->currentRow()<0
@@ -1546,7 +1549,7 @@
 			result->success = false;
 			result->allowToDiscardChanges = true;
 			result->column = colnum;
-			result->msg = futureI18n("Could not set sorting for multiple columns (%1)")
+			result->msg = i18n("Could not set sorting for multiple columns (%1)")
 				.arg(table=="*" ? table : (table+".*"));
 		}
 	}