Theme Editor: Began working on open document functionality (still incomplete), fixed a nested conditional parsing bug in the parser, and fixed segfault-on-codegen-from-empty-tree bug

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26609 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 7 deletions

diff --git a/utils/themeeditor/skindocument.cpp b/utils/themeeditor/skindocument.cpp
index aada24d..469401d 100644
--- a/utils/themeeditor/skindocument.cpp
+++ b/utils/themeeditor/skindocument.cpp
@@ -28,12 +28,7 @@
 #include <QFileDialog>
 
 SkinDocument::SkinDocument(QWidget *parent) :
-    QWidget(parent), fileFilter(tr("WPS Files (*.wps *.rwps);;"
-                                   "SBS Files (*.sbs *.rsbs);;"
-                                   "FMS Files (*.fms *.rfms);;"
-                                   "All Skin Files (*.wps *.rwps *.sbs "
-                                   "*.rsbs *.fms *.rfms);;"
-                                   "All Files (*.*)"))
+    QWidget(parent)
 {
     setupUI();
 
@@ -147,7 +142,7 @@ void SkinDocument::saveAs()
         directory = settings.value("defaultDirectory", "").toString();
 
     fileName = QFileDialog::getSaveFileName(this, tr("Save Document"),
-                                            directory, fileFilter);
+                                            directory, fileFilter());
     directory = fileName;
     if(fileName == "")
         return;