diff --git a/windows/README.txt b/windows/README.txt
new file mode 100644
index 0000000..65ceeeb
--- /dev/null
+++ b/windows/README.txt
@@ -0,0 +1,25 @@
+Requirements:
+1)Python 2.6;
+2)PyQt for python 2.6 (it should already include the qt libs);
+3)Py2exe
+4)Innosetup
+
+It might be necessary to have the: Microsoft Visual C++ 2008 Redistributable Package, because python 2.6 uses it and it's not installed by default in windows.
+
+
+ Create an exe file
+- Move the file windows/input.py to ../
+- Chech that the version number is correct
+- Execute "python input.py py2exe"
+
+At the end, there should be a directory named "dist" containing the exe file and the needed libs (excluding for the c++ one)
+
+ Create the setup with Inno Setup
+- Move windows/ss.iss to ../
+- Open ss.iss with Inno Setup, Build and Compile
+
+A directory named "Output" will be created, which will contain the installer.
+
+Notes:
+- To create the setup, don't move the "dist" directory or its content.
+- Do not delete or move the directory windows/font dejavu
diff --git a/windows/Wiki For Winows ITA.txt b/windows/Wiki For Winows ITA.txt
deleted file mode 100644
index f848e58..0000000
--- a/windows/Wiki For Winows ITA.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Installare:
-1)Python consigliabile 2.5;
-2)Qt 4 o superiore;
-3)PyQt per python 2.5;
-4)Py2exe;
-
-Scompattare font dejavu nella sottocartella \font dejavu (es :...\relational_trunk\windows\font dejavu\)
-e successivamente installarli;
-
-Crare un file exe per windows:
-
-1)Copiare il file relational_gui.py nella stessa cartella e rinominarlo come input.py;
-2)Aprire il file input.py con l'IDLE ed aggiungere:
-
- from distutils.core import setup
- import py2exe
- setup(windows=[{"script": "relational_gui.py","icon_resources": [(0, "windows/favicon.ico")]}])
-
- e salvare;
-
-3)Ora aprite "Esegui..." trascinateci il file input.py dentro, poi a destra dell'indirizzo di input.py (fuori le virgolette),
- digitate uno spazio e poi py2exe, date OK *;
-
-
-*appariranno molte stringhe, poi si aprirà Relational.
-
-Ecco comparse 2 cartelle, Build, che potete cancellarla,Dist,contenente il file .exe relational_gui.exe,
-potete cancellare il file input.py.
-
-Dopo aver seguito tutti i passi precedenti ecco come creare un setup con Inno Setup:
-
-1)Scaricare ed Installare Inno Setup;
-2)Spostare il file ss.iss nella cartella centrale (es: ...\relational_trunk\);
-3)Aprire il file ss.iss , Build e Compile;
-
-Verra' creata una cartella Output, contenente il RelationalSetup.exe .
-
-N.B.
-Per creare il setup, non spostare la cartella dist dalla directory d'origine,
-e non eliminare la cartella font dejavu dalla directory d'origine.
\ No newline at end of file
diff --git a/windows/font dejavu(da non perdere).rar b/windows/font dejavu(da non perdere).rar
deleted file mode 100644
index ee2ebfd..0000000
Binary files a/windows/font dejavu(da non perdere).rar and /dev/null differ
diff --git a/windows/font dejavu/DejaVuCondensedSerifBoldItalic.ttf b/windows/font dejavu/DejaVuCondensedSerifBoldItalic.ttf
new file mode 100755
index 0000000..f244136
Binary files /dev/null and b/windows/font dejavu/DejaVuCondensedSerifBoldItalic.ttf differ
diff --git a/windows/font dejavu/DejaVuCondensedSerifItalic.ttf b/windows/font dejavu/DejaVuCondensedSerifItalic.ttf
new file mode 100755
index 0000000..6e16797
Binary files /dev/null and b/windows/font dejavu/DejaVuCondensedSerifItalic.ttf differ
diff --git a/windows/font dejavu/DejaVuSans-BoldOblique.ttf b/windows/font dejavu/DejaVuSans-BoldOblique.ttf
new file mode 100755
index 0000000..b46f69b
Binary files /dev/null and b/windows/font dejavu/DejaVuSans-BoldOblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSans-Oblique.ttf b/windows/font dejavu/DejaVuSans-Oblique.ttf
new file mode 100755
index 0000000..d85292b
Binary files /dev/null and b/windows/font dejavu/DejaVuSans-Oblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSans.ttf b/windows/font dejavu/DejaVuSans.ttf
new file mode 100755
index 0000000..7843b11
Binary files /dev/null and b/windows/font dejavu/DejaVuSans.ttf differ
diff --git a/windows/font dejavu/DejaVuSansBold.ttf b/windows/font dejavu/DejaVuSansBold.ttf
new file mode 100755
index 0000000..773d633
Binary files /dev/null and b/windows/font dejavu/DejaVuSansBold.ttf differ
diff --git a/windows/font dejavu/DejaVuSansCondensed-Bold.ttf b/windows/font dejavu/DejaVuSansCondensed-Bold.ttf
new file mode 100755
index 0000000..dfc96e4
Binary files /dev/null and b/windows/font dejavu/DejaVuSansCondensed-Bold.ttf differ
diff --git a/windows/font dejavu/DejaVuSansCondensed-BoldOblique.ttf b/windows/font dejavu/DejaVuSansCondensed-BoldOblique.ttf
new file mode 100755
index 0000000..ec8920a
Binary files /dev/null and b/windows/font dejavu/DejaVuSansCondensed-BoldOblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSansCondensed-Oblique.ttf b/windows/font dejavu/DejaVuSansCondensed-Oblique.ttf
new file mode 100755
index 0000000..8faf4fc
Binary files /dev/null and b/windows/font dejavu/DejaVuSansCondensed-Oblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSansCondensed.ttf b/windows/font dejavu/DejaVuSansCondensed.ttf
new file mode 100755
index 0000000..e72beef
Binary files /dev/null and b/windows/font dejavu/DejaVuSansCondensed.ttf differ
diff --git a/windows/font dejavu/DejaVuSansExtraLight.ttf b/windows/font dejavu/DejaVuSansExtraLight.ttf
new file mode 100755
index 0000000..04fab51
Binary files /dev/null and b/windows/font dejavu/DejaVuSansExtraLight.ttf differ
diff --git a/windows/font dejavu/DejaVuSansMono-Bold.ttf b/windows/font dejavu/DejaVuSansMono-Bold.ttf
new file mode 100755
index 0000000..3f41ccf
Binary files /dev/null and b/windows/font dejavu/DejaVuSansMono-Bold.ttf differ
diff --git a/windows/font dejavu/DejaVuSansMono-BoldOb.ttf b/windows/font dejavu/DejaVuSansMono-BoldOb.ttf
new file mode 100755
index 0000000..5250085
Binary files /dev/null and b/windows/font dejavu/DejaVuSansMono-BoldOb.ttf differ
diff --git a/windows/font dejavu/DejaVuSansMono-Oblique.ttf b/windows/font dejavu/DejaVuSansMono-Oblique.ttf
new file mode 100755
index 0000000..5f41d4c
Binary files /dev/null and b/windows/font dejavu/DejaVuSansMono-Oblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSansMono-Roman.ttf b/windows/font dejavu/DejaVuSansMono-Roman.ttf
new file mode 100755
index 0000000..a2fa4c1
Binary files /dev/null and b/windows/font dejavu/DejaVuSansMono-Roman.ttf differ
diff --git a/windows/font dejavu/DejaVuSerif-Bold.ttf b/windows/font dejavu/DejaVuSerif-Bold.ttf
new file mode 100755
index 0000000..0ac9d35
Binary files /dev/null and b/windows/font dejavu/DejaVuSerif-Bold.ttf differ
diff --git a/windows/font dejavu/DejaVuSerif-BoldOblique.ttf b/windows/font dejavu/DejaVuSerif-BoldOblique.ttf
new file mode 100755
index 0000000..2e9a68f
Binary files /dev/null and b/windows/font dejavu/DejaVuSerif-BoldOblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSerif-Oblique.ttf b/windows/font dejavu/DejaVuSerif-Oblique.ttf
new file mode 100755
index 0000000..72255ec
Binary files /dev/null and b/windows/font dejavu/DejaVuSerif-Oblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSerif-Roman.ttf b/windows/font dejavu/DejaVuSerif-Roman.ttf
new file mode 100755
index 0000000..607395c
Binary files /dev/null and b/windows/font dejavu/DejaVuSerif-Roman.ttf differ
diff --git a/windows/font dejavu/DejaVuSerifBoldItalic.ttf b/windows/font dejavu/DejaVuSerifBoldItalic.ttf
new file mode 100755
index 0000000..9b8095b
Binary files /dev/null and b/windows/font dejavu/DejaVuSerifBoldItalic.ttf differ
diff --git a/windows/font dejavu/DejaVuSerifCondensed-Bold.ttf b/windows/font dejavu/DejaVuSerifCondensed-Bold.ttf
new file mode 100755
index 0000000..33f4c58
Binary files /dev/null and b/windows/font dejavu/DejaVuSerifCondensed-Bold.ttf differ
diff --git a/windows/font dejavu/DejaVuSerifCondensed-BoldOblique.ttf b/windows/font dejavu/DejaVuSerifCondensed-BoldOblique.ttf
new file mode 100755
index 0000000..78959da
Binary files /dev/null and b/windows/font dejavu/DejaVuSerifCondensed-BoldOblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSerifCondensed-Oblique.ttf b/windows/font dejavu/DejaVuSerifCondensed-Oblique.ttf
new file mode 100755
index 0000000..5344035
Binary files /dev/null and b/windows/font dejavu/DejaVuSerifCondensed-Oblique.ttf differ
diff --git a/windows/font dejavu/DejaVuSerifCondensed.ttf b/windows/font dejavu/DejaVuSerifCondensed.ttf
new file mode 100755
index 0000000..7be333c
Binary files /dev/null and b/windows/font dejavu/DejaVuSerifCondensed.ttf differ
diff --git a/windows/font dejavu/DejaVuSerifItalic.ttf b/windows/font dejavu/DejaVuSerifItalic.ttf
new file mode 100755
index 0000000..ec65d30
Binary files /dev/null and b/windows/font dejavu/DejaVuSerifItalic.ttf differ
diff --git a/windows/input.py b/windows/input.py
index e8c30a0..7ac02e0 100644
--- a/windows/input.py
+++ b/windows/input.py
@@ -4,7 +4,7 @@
# Relational
# Copyright (C) 2008 Salvo "LtWorf" Tomaselli
#
-# Relation is free software: you can redistribute it and/or modify
+# Relational is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
@@ -18,42 +18,13 @@
# along with this program. If not, see .
#
# author Salvo "LtWorf" Tomaselli
+
from distutils.core import setup
import py2exe
-#setup(console=['relational_gui.pyw'])
-#setup(windows=['relational_gui.py'])
-setup(windows=[{"script": "relational_gui.py","icon_resources": [(0, "favicon.ico")]}])
-
-import sys
-import sip
-from PyQt4 import QtCore, QtGui
-from relational_gui import maingui, about
-from relational import relation, parser
-
-
-version="0.10"
-about.version=version
-
-if __name__ == "__main__":
- if len (sys.argv) > 1 and sys.argv[1] == "-v":
- print version
- sys.exit(0)
-
- try:
- import psyco
- psyco.full()
- except:
- pass
-
- app = QtGui.QApplication(sys.argv)
- Form = QtGui.QWidget()
-
-
- Form.setFont(QtGui.QFont("Dejavu Sans Bold"))
-
-
- ui = maingui.Ui_Form()
- ui.setupUi(Form)
- Form.show()
-
- sys.exit(app.exec_())
+setup(windows=
+ [
+ {"script": "relational_gui.py","icon_resources": [(0, "windows/favicon.ico")]}
+ ]
+ ,name="Relational",
+ version="0.11"
+ )