[rkward-cvs] SF.net SVN: rkward: [1380] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 1380
          http://svn.sourceforge.net/rkward/?rev=1380&view=rev
Author:   tfry
Date:     2007-02-12 02:46:47 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
Escape / and | in filter labels

Modified Paths:
--------------
    trunk/rkward/TODO
    trunk/rkward/rkward/dialogs/rkimportdialog.cpp

Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO	2007-02-12 03:31:26 UTC (rev 1379)
+++ trunk/rkward/TODO	2007-02-12 10:46:47 UTC (rev 1380)
@@ -2,6 +2,9 @@
 Also, plans change frequently. If something is listed for a specific release, that's no more than a rough plan.
 All in all, this TODO list is mostly for internal purposes, and many parts may not necessarily be intellegible to anybody but the authors.
 
+Important:
+	- Around March 1st, write to R-devel to achieve having IS_UTF8 and IS_LATIN1 in public API (if not already available, then).
+
 Advertizing:
 	- start being a bit bolder about RKWard (descriptions, startup notification, etc.)
 

Modified: trunk/rkward/rkward/dialogs/rkimportdialog.cpp
===================================================================
--- trunk/rkward/rkward/dialogs/rkimportdialog.cpp	2007-02-12 03:31:26 UTC (rev 1379)
+++ trunk/rkward/rkward/dialogs/rkimportdialog.cpp	2007-02-12 10:46:47 UTC (rev 1380)
@@ -60,7 +60,12 @@
 
 		QString filter = handle->getAttributeValue ("format");
 		QString label = handle->getAttributeLabel ("format");
-		formats.append (filter + '|' + label + " (" + filter + ')');
+
+		QString elabel = label;
+		elabel.replace ('/', "\\/");
+		elabel.replace ('|', "\\|");
+		formats.append (filter + '|' + elabel + " (" + filter + ')');
+
 		format_labels.append (label);
 		filters.append (filter);
 	}


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