--- trunk/RCS/lohnrechner.py	2005/01/13 16:59:53	18
+++ trunk/RCS/lohnrechner.py	2005/01/14 13:04:09	22
@@ -1,4 +1,5 @@
 #! /usr/bin/python
+# -*- coding: iso-8859-1 -*-
 # --------------------------------------------------------------------
 # Lohnsteuer und Sozialabgaben Rechner
 # $Id$
@@ -16,7 +17,7 @@
 __version__ = "$Revision$"
 # $Source$
         
-_release_version = "0.%s alpha" % __version__[11:-2]
+_release_version = "0.%s beta" % __version__[11:-2]
 
 import LST2005
 from Tkinter import *
@@ -26,25 +27,47 @@
     def __init__(self, root):
         LST2005.LStRechner2005.__init__(self)
 
+        # Land, Kirchensteuersatz
+        self.laender = [("Baden-Württemberg", 8),
+                        ("Bayern", 8),
+                        ("Berlin", 9),
+                        ("Brandenburg", 9),
+                        ("Bremen", 9),
+                        ("Bremerhaven", 9),
+                        ("Hamburg", 9),
+                        ("Hessen", 9),
+                        ("Mecklenburg-Vorpommern", 9),
+                        ("Niedersachsen" ,9),
+                        ("Nordrhein-Westfalen", 9),
+                        ("Rheinland-Pfalz", 9),
+                        ("Saarland", 9),
+                        ("Sachsen", 9),
+                        ("Sachsen-Anhalt", 9),
+                        ("Schleswig-Holstein", 9),
+                        ("Thüringen", 9)]
+
         root.title("Lohnrechner 2005 - v%s" % _release_version)
         root.resizable(NO, NO)
         self.root = root
 
-        Label(root, text="Lohn:").grid(row=0, sticky=E)
-        self.lohn = Entry(root)
+        frame = Frame(root)
+        frame.grid(padx=10, pady=10)
+
+        Label(frame, text="Lohn:").grid(row=0, sticky=E)
+        self.lohn = Entry(frame)
         self.lohn.bind("<Return>", self.NewInput)
         self.lohn.grid(row=0, column=1, sticky=W)
 
-        Label(root, text="Steuerklasse:").grid(row=1, sticky=E)
-        self.stkl = StringVar()
-        stklframe = Frame(root)
+        Label(frame, text="Steuerklasse:").grid(row=1, sticky=E)
+        self.stkl = IntVar()
+        stklframe = Frame(frame)
         stklframe.grid(row=1, column=1, sticky=W)
-        for text, val in [("I", "1"),
-                          ("II", "2"),
-                          ("III", "3"),
-                          ("IV", "4"),
-                          ("V", "5"),
-                          ("VI", "6")]:
+        for text, val in [("I", 1),
+                          ("II", 2),
+                          ("III", 3),
+                          ("IV", 4),
+                          ("V", 5),
+                          ("VI", 6)]:
             stklradio = Radiobutton(stklframe, text=text, value=val,
                                     indicatoron=0, command=self.CalcOutput,
                                     variable=self.stkl)
@@ -52,36 +75,47 @@
                 stklradio.select()
             stklradio.pack(side=LEFT)
 
-        Label(root, text="Kirchensteuer (%):").grid(row=2, sticky=E)
-        self.kirche = StringVar()
-        kircheframe = Frame(root)
-        kircheframe.grid(row=2, column=1, sticky=W)
-        for text, val in [("keine", "0"),
-                          ("8 %", "8"),
-                          ("9 %", "9")]:
-            kircheradio = Radiobutton(kircheframe, text=text, value=val,
-                                    indicatoron=0, command=self.CalcOutput,
-                                    variable=self.kirche)
-            if val == "0":
-                kircheradio.select()
-            kircheradio.pack(side=LEFT)
-
+        Label(frame, text="Kirchensteuer:").grid(row=2, sticky=E)
+        self.kirche = IntVar()
+        kircheradio = Checkbutton(frame, onvalue=1, offvalue=0,
+                                  command=self.CalcOutput,
+                                  variable=self.kirche).grid(row=2, column=1, sticky=W)
+
+        Label(frame, text="Kinderfreibetrag:").grid(row=3, sticky=E)
+        self.kfb = Entry(frame)
+        self.kfb.bind("<Return>", self.NewInput)
+        self.kfb.grid(row=3, column=1, sticky=W)
+
+        Label(frame, text="Bundesland:").grid(row=4, sticky=E)
+        landframe = Frame(frame)
+        scrollbar = Scrollbar(landframe, orient=VERTICAL)
+        self.land = Listbox(landframe, height=4, selectmode=SINGLE,
+                            yscrollcommand=scrollbar.set)
+        for land in self.laender:
+            self.land.insert(END, land[0])
+        self.land.select_set(0)
+        self.land.bind("<ButtonRelease-1>", self.NewInput)
+        self.land.pack(side=RIGHT, fill=Y)
+        scrollbar.config(command=self.land.yview)
+        scrollbar.pack(side=LEFT, fill=BOTH, expand=1)
+        landframe.grid(row=4, column=1, sticky=W)
+        
         self.ResetInput()
 
-        Label(root, text="Lohnsteuer:").grid(row=0, column=2, sticky=E)
-        self.lst = Entry(root)
+        Label(frame, text="Lohnsteuer:").grid(row=0, column=2, sticky=E)
+        self.lst = Entry(frame)
         self.lst.grid(row=0, column=3, sticky=W)
 
-        Label(root, text="Solidaritätszuschlag:").grid(row=1, column=2, sticky=E)
-        self.soli = Entry(root)
+        Label(frame, text="Solidaritätszuschlag:").grid(row=1, column=2, sticky=E)
+        self.soli = Entry(frame)
         self.soli.grid(row=1, column=3, sticky=W)
 
-        Label(root, text="Kirchensteuer:").grid(row=2, column=2, sticky=E)
-        self.kist = Entry(root)
+        Label(frame, text="Kirchensteuer:").grid(row=2, column=2, sticky=E)
+        self.kist = Entry(frame)
         self.kist.grid(row=2, column=3, sticky=W)
 
-        buttons = Frame()
-        buttons.grid(row=3, columnspan=4)
+        buttons = Frame(frame)
+        buttons.grid(row=4, column=2, columnspan=2)
         Button(buttons, text="Quit", command=root.quit).pack(side=LEFT)
         Button(buttons, text="Info", command=self.Info).pack(side=LEFT)
         Button(buttons, text="Berechnen", command=self.CalcOutput).pack(side=LEFT)
@@ -98,14 +132,24 @@
         self.lohn.delete(0, END)
         self.lohn.insert(0, "0")
 
+    def ResetInputKfb(self):
+        self.kfb.delete(0, END)
+        self.kfb.insert(0, "0")
+
     def InitCalc(self):
         try:
             self.SetLohn(float(self.lohn.get()))
         except:
             self.ResetInputLohn()
 
-        self.SetSteuerklasse(int(self.stkl.get()))
-        self.SetKirchensteuer(int(self.kirche.get()))
+        try:
+            self.SetKinderfreibetrag(float(self.kfb.get()))
+        except:
+            self.ResetInputKfb()
+
+        self.SetSteuerklasse(self.stkl.get())
+        self.SetKirchensteuer(self.kirche.get() *
+                              self.laender[int(self.land.curselection()[0])][1])
 
     def CalcOutput(self):
         self.InitCalc()