From 1797ace7eee358bad43ab0bdd97899a113b09869 Mon Sep 17 00:00:00 2001
From: Harmen Prins <prins_harmen@hotmail.com>
Date: Tue, 17 Jun 2014 14:11:50 +0200
Subject: [PATCH] Added file name option

---
 GUI/gui.cfg |  7 +++----
 GUI/gui.py  | 12 +++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/GUI/gui.cfg b/GUI/gui.cfg
index 97c7235..b00c85d 100644
--- a/GUI/gui.cfg
+++ b/GUI/gui.cfg
@@ -2,12 +2,11 @@
 # Personalize options in your User Interface
 
 # Commonly used parameters are listed in the GUI for easy selection
-CommonParameters = One, Two, Three
+CommonParameters = Weight, Polarity, Viscosity, Solubility, Name
 
 # Parameters that are always used in the search
-AlwaysParameters = Zero, Name
+AlwaysParameters = Name
 
 # What filetype the output will be saved in
 # If just one, will be used without the possibility of selecting another
-OutputTypes = csv
-#jsonlines, json, csv, xml
+OutputTypes = csv, jsonlines, json, xml
diff --git a/GUI/gui.py b/GUI/gui.py
index f2f0f41..54b11dd 100644
--- a/GUI/gui.py
+++ b/GUI/gui.py
@@ -108,6 +108,16 @@ class GUI():
 
         frame_all_attributes.pack()
 
+        frame_output_name = Frame(window)
+        output_name = StringVar()
+        output_name.set("results")
+        variables.update({'output_name': output_name})
+        label_output_name = Label(frame_output_name, text="Output name:")
+        input_output_name = Entry(frame_output_name, font=("Helvetica", 12), width=25, textvariable=output_name)
+        frame_output_name.pack()
+        label_output_name.pack()
+        input_output_name.pack()
+
         if output_types and len(output_types) == 1:
             output_type = StringVar()
             output_type.set(output_types[0])
@@ -117,7 +127,7 @@ class GUI():
             output_type.set(output_types[0] if output_types and len(output_types) != 0 else "json")
             variables.update({"output_type": output_type})
             frame_output_type = Frame(window)
-            label_output_type = Label(frame_output_type, text="Output: ")
+            label_output_type = Label(frame_output_type, text="Extension: ")
             if output_types and len(output_types) > 0:
                 input_output_type = OptionMenu(frame_output_type, output_type, *output_types)
             else: