From: Thomas F. <tho...@ru...> - 2015-02-05 15:18:36
|
Git commit 9b8c2624af6598d7a1f5ff7d2ecb6ff2b5aa2a82 by Thomas Friedrichsmeier. Committed on 18/10/2014 at 16:03. Pushed by tfry into branch 'releases/0.6.2'. Pick 2b0b3e67c1c516d67b25e0ab474783bc0be9ee59 from trunk M +2 -0 ChangeLog M +5 -2 rkward/dialogs/startupdialog.cpp http://commits.kde.org/rkward/9b8c2624af6598d7a1f5ff7d2ecb6ff2b5aa2a82 diff --git a/ChangeLog b/ChangeLog index c3ca47a..8671c42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +- Fixed display of file paths containing non-ascii characters in the title bar and startup dialog + --- Version 0.6.2 - Oct-20-2014 - In data editor, indicate NAs, explicitly - Import Stata plugin gains option to convert character encoding. diff --git a/rkward/dialogs/startupdialog.cpp b/rkward/dialogs/startupdialog.cpp index 54f1bbd..7ac4273 100644 --- a/rkward/dialogs/startupdialog.cpp +++ b/rkward/dialogs/startupdialog.cpp @@ -2,7 +2,7 @@ startupdialog - description ------------------- begin : Thu Aug 26 2004 - copyright : (C) 2004, 2011 by Thomas Friedrichsmeier + copyright : (C) 2004, 2011, 2014 by Thomas Friedrichsmeier email : tf...@us... ***************************************************************************/ @@ -77,7 +77,10 @@ StartupDialog::StartupDialog (QWidget *parent, StartupDialogResult *result, KRec file_list->setSortingEnabled (false); chose_file_item = new QListWidgetItem (i18n ("<<Open another file>>"), file_list); if (recent_files) { - file_list->addItems (recent_files->urls ().toStringList ()); + KUrl::List urls = recent_files->urls (); + for (int i = 0; i < urls.length (); ++i) { + file_list->addItem (urls[i].pathOrUrl ()); + } } connect (file_list, SIGNAL (itemClicked (QListWidgetItem*)), this, SLOT (listClicked (QListWidgetItem*))); connect (file_list, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this, SLOT (listDoubleClicked (QListWidgetItem*))); |