[dsa4-cvs] det/src/gui CharakteristikumGUIwx.cpp,1.14,1.15 CharakteristikumGUIwx.h,1.9,1.10 Charakte

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/darkeyetool/det/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15658/src/gui

Modified Files:
	CharakteristikumGUIwx.cpp CharakteristikumGUIwx.h 
	CharakteristikumSchlechteEigenschaftGUIwx.cpp 
	CharakteristikumSchlechteEigenschaftGUIwx.h HoleGUIwx.cpp 
	HoleGUIwx.h InfoGUIwx.cpp InfoGUIwx.h KampftechnikGUIwx.cpp 
	KampftechnikGUIwx.h KonstantenGUIwx.cpp KonstantenGUIwx.h 
	KulturGUIwx.cpp KulturGUIwx.h MengeGUIwx.h 
	PersonGUIGeneratorHelferwx.cpp PersonGUIGeneratorHelferwx.h 
	PersonGUIKulturwx.cpp PersonGUIKulturwx.h 
	PersonGUIPersonenKomponentewx.cpp 
	PersonGUIPersonenKomponentewx.h PersonGUIProfessionwx.cpp 
	PersonGUIProfessionwx.h PersonGUIRassewx.cpp 
	PersonGUIRassewx.h PersonGUIZauberwx.cpp PersonGUIZauberwx.h 
	PersonGUIwx.cpp PersonGUIwx.h PersonenKomponenteGUIwx.h 
	ProfessionGUISpruechewx.cpp ProfessionGUIwx.cpp 
	ProfessionGUIwx.h RasseGUIwx.cpp RasseGUIwx.h 
	SonderfertigkeitGUIwx.cpp SonderfertigkeitGUIwx.h 
	SonderfertigkeitWaffenloseSonderfertigkeitGUIwx.cpp 
	SonderfertigkeitWaffenloseSonderfertigkeitGUIwx.h 
	SonderfertigkeitWaffenloserKampfstilGUIwx.cpp 
	SonderfertigkeitWaffenloserKampfstilGUIwx.h 
	SonderfertigkeitZaubertanzGUIwx.cpp 
	SonderfertigkeitZaubertanzGUIwx.h SpracheSchriftGUIwx.cpp 
	SpracheSchriftGUIwx.h TalentGUIwx.cpp TalentGUIwx.h 
	ZauberGUIwx.cpp ZauberGUIwx.h 
Log Message:
IDs und Bezeichner getrennt - I18N vorbereitet
ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
Aber Entwicklung ohne CVS wird mir zu doof.
Vorsicht vor allem mit Helden und RKP.
Tausend Kleinigkeiten geaendert.
Neue Datensaetze in basis.xdi.

Index: SonderfertigkeitWaffenloserKampfstilGUIwx.cpp
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/SonderfertigkeitWaffenloserKampfstilGUIwx.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10

--- SonderfertigkeitWaffenloserKampfstilGUIwx.cpp	25 Jun 2004 16:12:26 -0000	1.9
+++ SonderfertigkeitWaffenloserKampfstilGUIwx.cpp	17 Oct 2004 19:12:42 -0000	1.10
@@ -13,15 +13,62 @@
 //@<< header >>
 //@+node:<< header >>
 //@+at
-// The content of this file is subject to the license 
-// given in license.txt
+// Copyright (c) 2002-2004, Zdenko Denny Vrandecic and 
+// contributors.
+// All rights reserved.
+// (The license follows closely the new 
+// BSD-OpenSource-License)
+// 
+// Redistribution and use in source and binary forms, with 
+// or without
+// modification, are permitted provided that the following 
+// conditions are met:
+// Redistributions of source code must retain the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer.
+// Redistributions in binary form must reproduce the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+// Neither the name of the copyrightholder or one of the 
+// contributers to this source may be used to endorse or 
+// promote products derived from this software without 
+// specific prior written permission.
 // 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+// (INCLUDING, BUT  NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// If you use this source, please inform me, so I can keep 
+// track of how useful it really is. That would be very 
+// appreciated.
+// 
+// The data distributed with this code is copyrighted by 
+// Fantasy Production, Erkrath, Germany, and *not* subject 
+// to the here given license. Distributing and using this 
+// data is granted by FanPro for the purpose of using 
+// computer driven tools for the role playing game "Das 
+// Schwarze Auge" / "The Dark Eye". Any other use is only 
+// allowed with prior written permission by FanPro.
 //@-at
 //@@c
 
 #ifdef MSVC
 #pragma warning(disable:4786 4503)
 #endif
+
 //@-node:<< header >>
 //@nl
 //@<< includes >>
@@ -93,7 +140,7 @@
   verbessert_->Clear();
   for (DSA::KampftechnikDefinitionen::iterator k = DSA::kampftechniken()->begin(); k != DSA::kampftechniken()->end(); ++k)
     if (k->second.KampfArt()==DSA::WaffenloserKampf)
-      verbessert_->Append(k->first.c_str());
+      verbessert_->Append(k->second.Bezeichnung().c_str());
 
   zeilenSizer->Add(verbessert_, 1, wxEXPAND);
 
@@ -125,7 +172,8 @@
   rechtsSizer->Add(voraussetzungen_, 1, wxEXPAND | wxBOTTOM, 2);
 
   zeilenSizer = new wxBoxSizer(wxHORIZONTAL);
-	zeilenSizer->Add(new wxButton(this, VORHINZU, _t("Voraussetzung hinzufügen").c_str(),	wxPoint(), wxSize(20, 20)), 1, wxRIGHT, 2);
+	zeilenSizer->Add(new wxButton(this, VORHINZU, _t("Neu").c_str(),	wxPoint(), wxSize(20, 20)), 1, wxRIGHT, 2);
+	zeilenSizer->Add(new wxButton(this, VORWEG, _t("Löschen").c_str(),	wxPoint(), wxSize(20, 20)), 1, wxRIGHT, 2);
 	zeilenSizer->Add(new wxButton(this, VORPLUS, "+",	wxPoint(), wxSize(20, 20)), 0, wxRIGHT, 2);
 	zeilenSizer->Add(new wxButton(this, VORMINUS, "-",	wxPoint(), wxSize(20, 20)), 0, wxRIGHT, 4);
 
@@ -177,7 +225,7 @@
 //@-node:SonderfertigkeitWaffenloserKampfstilGUIwx
 //@+node:UpdateTitel
 void SonderfertigkeitWaffenloserKampfstilGUIwx::UpdateTitel() {
-  std::string s = _t("Waffenloser Kampfstil") + ": " + objekt_->ID();
+  std::string s = _t("Waffenloser Kampfstil") + ": " + objekt_->Bezeichnung() + " (ID: " + objekt_->ID() + ")";
 	SetTitle(s.c_str());
 }
 //@nonl
@@ -191,7 +239,7 @@
 
   StringListe sfs;
   for (DSA::SonderfertigkeitDefinitionen::iterator sf = DSA::sonderfertigkeiten()->begin(); sf != DSA::sonderfertigkeiten()->end(); ++sf)
-    if (sf->second.WaffenloseSonderfertigkeit())
+    if (sf->second.IstWaffenloseSonderfertigkeit())
       sfs.push_back(sf->first);
 
   sfs_->Clear();
@@ -200,9 +248,9 @@
     DSA::SonderfertigkeitDefinition* sfd = DSA::sonderfertigkeiten()->Zeige(*s);
     StringListe l = sfd->Extras();
     if (std::find(l.begin(), l.end(), objekt_->ID())!=l.end())
-      sfs_->Append(s->c_str());
+      sfs_->Append(sfd->Bezeichnung().c_str());
     else
-      sfliste_->Append(s->c_str());
+      sfliste_->Append(sfd->Bezeichnung().c_str());
   }
 
   if (voraussetzungen_->GetSelection()==-1) gewaehlteVor_=="";
@@ -211,7 +259,7 @@
     voraussetzungen_->Append(vi->second.Text().c_str());
   int pos = voraussetzungen_->FindString(objekt_->voraussetzungen_.Hole(gewaehlteVor_).Text().c_str());
   if (pos != -1) voraussetzungen_->SetSelection(pos);
-  verbessert_->SetSelection(verbessert_->FindString(objekt_->Extra().c_str()));
+  verbessert_->SetSelection(verbessert_->FindString(DSA::kampftechniken()->Zeige(objekt_->Extra())->Bezeichnung().c_str()));
 
   if (objekt_->Beschreibung() != "")
     beschreibung_->SetValue(objekt_->Beschreibung().c_str());
@@ -221,13 +269,30 @@
   UpdateTitel();
 }
 //@-node:Update
+//@+node:UpdateIDs
+void SonderfertigkeitWaffenloserKampfstilGUIwx::UpdateIDs() {
+	idListe_->Clear();
+	if (!objekte_) return;
+  for (DSA::SonderfertigkeitDefinitionen::iterator i=objekte_->begin(); i!=objekte_->end(); ++i)
+    if (i->second.IstWaffenloserKampfstil()) {
+  		  if (idModus_)
+        idListe_->Append(i->first.c_str());
+      else
+        idListe_->Append(i->second.Bezeichnung().c_str());
+    	if (objekt_.get())
+       if (objekt_->ID() == i->first)
+         idListe_->SetSelection(idListe_->GetCount()-1);
+    }
+}
+//@nonl
+//@-node:UpdateIDs
 //@+node:UpdateData
 void SonderfertigkeitWaffenloserKampfstilGUIwx::UpdateData() {
 	if (!(objekt_.get())) return;
 
 	objekt_->GP(strings::sStr2int(gpKostenText_->GetValue().c_str()));
 	objekt_->AP(strings::sStr2int(apKostenText_->GetValue().c_str()));
-  objekt_->Extra(verbessert_->GetValue().c_str());
+  objekt_->Extra(DSA::kampftechniken()->Finde(verbessert_->GetValue().c_str()));
   if (beschreibung_->GetValue()!=wxString(_t("keine Beschreibung vorhanden").c_str()))
     objekt_->Beschreibung(beschreibung_->GetValue().c_str());
 }
@@ -235,18 +300,14 @@
 //@+node:Neu
 void SonderfertigkeitWaffenloserKampfstilGUIwx::Neu(const std::string& hinzufuegendes) {
   MengeGUIwx<DSA::SonderfertigkeitDefinitionen>::Neu(hinzufuegendes);
-  DSA::sonderfertigkeiten()->Zeige(hinzufuegendes)->WaffenloserKampfstil(true);
+  DSA::sonderfertigkeiten()->Zeige(hinzufuegendes)->IstWaffenloserKampfstil(true);
   DSA::sonderfertigkeiten()->Zeige(hinzufuegendes)->Extra(_t("Raufen")); // TODO Zauberkonstante
 }
 //@-node:Neu
 //@+node:BEGIN_EVENT_TABLE
-//@+at 
-//@nonl
-// Konstruktor
-//@-at
-//@@c
-
 BEGIN_EVENT_TABLE(SonderfertigkeitWaffenloserKampfstilGUIwx, wxFrame)
+  EVT_TOGGLEBUTTON  (BTID,                SonderfertigkeitWaffenloserKampfstilGUIwx::OnIDBtn)
+  EVT_TOGGLEBUTTON  (BTBEZ,               SonderfertigkeitWaffenloserKampfstilGUIwx::OnBezBtn)
 	EVT_LISTBOX (IDLISTBOX,           SonderfertigkeitWaffenloserKampfstilGUIwx::OnIDListboxSelect)
 	EVT_BUTTON  (BTLOESCHEN,          SonderfertigkeitWaffenloserKampfstilGUIwx::OnLoeschenBtn)
 	EVT_BUTTON  (BTKOPIEREN,          SonderfertigkeitWaffenloserKampfstilGUIwx::OnKopierenBtn)
@@ -268,6 +329,7 @@
 	EVT_BUTTON  (VORMINUS,            SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorMinus)
   EVT_BUTTON  (VORHINZU,            SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorHinzu)
 	EVT_LISTBOX_DCLICK(VORWEG,        SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorWeg)
+  EVT_BUTTON  (VORWEG,            SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorWeg)
   EVT_LISTBOX (VORWEG,              SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorAuswahl)
   EVT_COMBOBOX(VERBESSERT,          SonderfertigkeitWaffenloserKampfstilGUIwx::OnUpdateData)
   EVT_BUTTON  (SFWEG,               SonderfertigkeitWaffenloserKampfstilGUIwx::OnSFWeg)
@@ -275,47 +337,20 @@
   EVT_LISTBOX_DCLICK(SFWEGD,        SonderfertigkeitWaffenloserKampfstilGUIwx::OnSFWeg)
   EVT_LISTBOX_DCLICK(SFHINZUD,      SonderfertigkeitWaffenloserKampfstilGUIwx::OnSFHinzu)
 END_EVENT_TABLE()
-
-void SonderfertigkeitWaffenloserKampfstilGUIwx::UpdateIDs() {
-	idListe_->Clear();
-	if (!objekte_) return;
-  for (DSA::SonderfertigkeitDefinitionen::iterator i=objekte_->begin(); i!=objekte_->end(); ++i)
-    if (i->second.WaffenloserKampfstil())
-		  idListe_->Append(i->first.c_str());
-}
-//@nonl
 //@-node:BEGIN_EVENT_TABLE
 //@+node:OnUpdate
-//@+at 
-//@nonl
-// Neu
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnUpdate (wxCommandEvent& WXUNUSED(event)) {
 	Update();
 }
 //@nonl
 //@-node:OnUpdate
 //@+node:OnUpdateData
-//@+at 
-//@nonl
-// OnUpdate
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnUpdateData (wxCommandEvent& WXUNUSED(event)) {
 	UpdateData();
 }
 //@nonl
 //@-node:OnUpdateData
 //@+node:OnGPPlus
-//@+at 
-//@nonl
-// OnUpdateData
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnGPPlus (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->GP(objekt_->GP()+1);
 	objekt_->AP(objekt_->AP()+50);
@@ -324,12 +359,6 @@
 //@nonl
 //@-node:OnGPPlus
 //@+node:OnGPMinus
-//@+at 
-//@nonl
-// OnGPPlus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnGPMinus (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->GP(objekt_->GP()-1);
 	objekt_->AP(objekt_->AP()-50);
@@ -338,12 +367,6 @@
 //@nonl
 //@-node:OnGPMinus
 //@+node:OnAPPlus
-//@+at 
-//@nonl
-// OnGPMinus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnAPPlus (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->AP(objekt_->AP()+1);
 	Update();
@@ -351,12 +374,6 @@
 //@nonl
 //@-node:OnAPPlus
 //@+node:OnAPMinus
-//@+at 
-//@nonl
-// OnAPPlus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnAPMinus (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->AP(objekt_->AP()-1);
 	Update();
@@ -364,12 +381,6 @@
 //@nonl
 //@-node:OnAPMinus
 //@+node:OnAPPlus10
-//@+at 
-//@nonl
-// OnAPMinus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnAPPlus10 (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->AP(objekt_->AP()+10);
 	Update();
@@ -377,12 +388,6 @@
 //@nonl
 //@-node:OnAPPlus10
 //@+node:OnAPMinus10
-//@+at 
-//@nonl
-// OnAPPlus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnAPMinus10 (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->AP(objekt_->AP()-10);
 	Update();
@@ -390,12 +395,6 @@
 //@nonl
 //@-node:OnAPMinus10
 //@+node:OnAPPlus100
-//@+at 
-//@nonl
-// OnAPMinus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnAPPlus100 (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->AP(objekt_->AP()+100);
 	Update();
@@ -403,12 +402,6 @@
 //@nonl
 //@-node:OnAPPlus100
 //@+node:OnAPMinus100
-//@+at 
-//@nonl
-// OnAPPlus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnAPMinus100 (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->AP(objekt_->AP()-100);
 	Update();
@@ -416,12 +409,6 @@
 //@nonl
 //@-node:OnAPMinus100
 //@+node:OnVorPlus
-//@+at 
-//@nonl
-// OnAPMinus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorPlus (wxCommandEvent& WXUNUSED(event)) {
   if (gewaehlteVor_=="") return;
   DSA::Voraussetzung* vor = objekt_->voraussetzungen_.Zeige(gewaehlteVor_);
@@ -431,12 +418,6 @@
 //@nonl
 //@-node:OnVorPlus
 //@+node:OnVorMinus
-//@+at 
-//@nonl
-// OnVorPlus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorMinus (wxCommandEvent& WXUNUSED(event)) {
   if (gewaehlteVor_=="") return;
   DSA::Voraussetzung* vor = objekt_->voraussetzungen_.Zeige(gewaehlteVor_);
@@ -446,41 +427,29 @@
 //@nonl
 //@-node:OnVorMinus
 //@+node:OnVorHinzu
-//@+at 
-//@nonl
-// OnVorMinus
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorHinzu (wxCommandEvent& WXUNUSED(event)) {
   StringListe sl;
-  for (DSA::KampftechnikDefinitionen::iterator k = DSA::kampftechniken()->begin(); k != DSA::kampftechniken()->end(); ++k)
+  forallconstp (DSA::KampftechnikDefinitionen, k, DSA::kampftechniken())
     if (k->second.KampfArt()==DSA::WaffenloserKampf)
-      sl.push_back(k->first);
+      sl.push_back(k->second.Bezeichnung());
 	wxString* wxs = new wxString[sl.size()];
   int i = 0;
-  for (StringListe::iterator si = sl.begin(); si != sl.end(); ++si)
+  forallconst (StringListe, si, sl)
     wxs[i++] = si->c_str();
   wxSingleChoiceDialog s(this, _t("Auf welche Kampftechnik?").c_str(),
                          _t("Bitte wählen").c_str(), sl.size(), wxs);
   delete [] wxs;
   if (s.ShowModal() != wxID_OK) return;
-  DSA::Voraussetzung vor(s.GetStringSelection().c_str());
+  DSA::Voraussetzung vor(DSA::kampftechniken()->Finde(s.GetStringSelection().c_str()));
   vor.Minimal(true);
   vor.MinimalWert(7); // TODO magische Konstante
   objekt_->voraussetzungen_.FuegeEin(vor);
   gewaehlteVor_ = vor.ID();
   Update();
 }
-//@nonl
+
 //@-node:OnVorHinzu
 //@+node:OnVorWeg
-//@+at 
-//@nonl
-// OnVorHinzu
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorWeg (wxCommandEvent& WXUNUSED(event)) {
   if (gewaehlteVor_!="")
     objekt_->voraussetzungen_.Loesche(gewaehlteVor_);
@@ -490,12 +459,6 @@
 //@nonl
 //@-node:OnVorWeg
 //@+node:OnVorAuswahl
-//@+at 
-//@nonl
-// OnVorWeg
-//@-at
-//@@c
-
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnVorAuswahl (wxCommandEvent& WXUNUSED(event)) {
   gewaehlteVor_ = "";
   if (voraussetzungen_->GetSelection()==-1) return;
@@ -509,7 +472,7 @@
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnSFHinzu (wxCommandEvent& WXUNUSED(event)) {
 	if (sfliste_->GetSelection()==-1) return;
 	std::string sf = sfliste_->GetStringSelection().c_str();
-  DSA::SonderfertigkeitDefinition* sfd = DSA::sonderfertigkeiten()->Zeige(sf);
+  DSA::SonderfertigkeitDefinition* sfd = DSA::sonderfertigkeiten()->Zeige(DSA::sonderfertigkeiten()->Finde(sf));
   StringListe l = sfd->Extras();
   l.push_back(objekt_->ID());
   sfd->Extras(l);
@@ -522,7 +485,7 @@
 void SonderfertigkeitWaffenloserKampfstilGUIwx::OnSFWeg (wxCommandEvent& WXUNUSED(event)) {
 	if (sfs_->GetSelection()==-1) return;
 	std::string sf = sfs_->GetStringSelection().c_str();
-  DSA::SonderfertigkeitDefinition* sfd = DSA::sonderfertigkeiten()->Zeige(sf);
+  DSA::SonderfertigkeitDefinition* sfd = DSA::sonderfertigkeiten()->Zeige(DSA::sonderfertigkeiten()->Finde(sf));
   StringListe l = sfd->Extras();
   
   StringListe neueStile;
@@ -540,6 +503,14 @@
 //@<< Version History >>
 //@+node:<< Version History >>
 // $Log$
+// Revision 1.10  2004/10/17 19:12:42  vrandezo
+// IDs und Bezeichner getrennt - I18N vorbereitet
+// ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
+// Aber Entwicklung ohne CVS wird mir zu doof.
+// Vorsicht vor allem mit Helden und RKP.
+// Tausend Kleinigkeiten geaendert.
+// Neue Datensaetze in basis.xdi.
+//
 // Revision 1.9  2004/06/25 16:12:26  twel
 // wxListBox::Number() ersetzt durch GetCount() (deprecated)
 //
@@ -570,5 +541,6 @@
 //@nonl
 //@-node:<< Version History >>
 //@nl
+
 //@-node:@file SonderfertigkeitWaffenloserKampfstilGUIwx.cpp
 //@-leo

Index: PersonGUIGeneratorHelferwx.cpp
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/PersonGUIGeneratorHelferwx.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PersonGUIGeneratorHelferwx.cpp	9 Apr 2004 22:26:20 -0000	1.8
+++ PersonGUIGeneratorHelferwx.cpp	17 Oct 2004 19:12:41 -0000	1.9
@@ -12,15 +12,62 @@
 //@<< header >>
 //@+node:<< header >>
 //@+at
-// The content of this file is subject to the license 
-// given in license.txt
+// Copyright (c) 2002-2004, Zdenko Denny Vrandecic and 
+// contributors.
+// All rights reserved.
+// (The license follows closely the new 
+// BSD-OpenSource-License)
+// 
+// Redistribution and use in source and binary forms, with 
+// or without
+// modification, are permitted provided that the following 
+// conditions are met:
+// Redistributions of source code must retain the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer.
+// Redistributions in binary form must reproduce the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+// Neither the name of the copyrightholder or one of the 
+// contributers to this source may be used to endorse or 
+// promote products derived from this software without 
+// specific prior written permission.
 // 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+// (INCLUDING, BUT  NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// If you use this source, please inform me, so I can keep 
+// track of how useful it really is. That would be very 
+// appreciated.
+// 
+// The data distributed with this code is copyrighted by 
+// Fantasy Production, Erkrath, Germany, and *not* subject 
+// to the here given license. Distributing and using this 
+// data is granted by FanPro for the purpose of using 
+// computer driven tools for the role playing game "Das 
+// Schwarze Auge" / "The Dark Eye". Any other use is only 
+// allowed with prior written permission by FanPro.
 //@-at
 //@@c
 
 #ifdef MSVC
 #pragma warning(disable:4786 4503)
 #endif
+
 //@-node:<< header >>
 //@nl
 //@<< includes >>
@@ -211,6 +258,14 @@
 //@<< Version History >>
 //@+node:<< Version History >>
 // $Log$
+// Revision 1.9  2004/10/17 19:12:41  vrandezo
+// IDs und Bezeichner getrennt - I18N vorbereitet
+// ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
+// Aber Entwicklung ohne CVS wird mir zu doof.
+// Vorsicht vor allem mit Helden und RKP.
+// Tausend Kleinigkeiten geaendert.
+// Neue Datensaetze in basis.xdi.
+//
 // Revision 1.8  2004/04/09 22:26:20  vrandezo
 // Zauberfertigkeiten fuer Personen eintragbar
 //

Index: KonstantenGUIwx.cpp
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/KonstantenGUIwx.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- KonstantenGUIwx.cpp	13 May 2004 07:52:45 -0000	1.4
+++ KonstantenGUIwx.cpp	17 Oct 2004 19:12:41 -0000	1.5
@@ -12,15 +12,62 @@
 //@<< header >>
 //@+node:<< header >>
 //@+at
-// The content of this file is subject to the license 
-// given in license.txt
+// Copyright (c) 2002-2004, Zdenko Denny Vrandecic and 
+// contributors.
+// All rights reserved.
+// (The license follows closely the new 
+// BSD-OpenSource-License)
+// 
+// Redistribution and use in source and binary forms, with 
+// or without
+// modification, are permitted provided that the following 
+// conditions are met:
+// Redistributions of source code must retain the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer.
+// Redistributions in binary form must reproduce the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+// Neither the name of the copyrightholder or one of the 
+// contributers to this source may be used to endorse or 
+// promote products derived from this software without 
+// specific prior written permission.
 // 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+// (INCLUDING, BUT  NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// If you use this source, please inform me, so I can keep 
+// track of how useful it really is. That would be very 
+// appreciated.
+// 
+// The data distributed with this code is copyrighted by 
+// Fantasy Production, Erkrath, Germany, and *not* subject 
+// to the here given license. Distributing and using this 
+// data is granted by FanPro for the purpose of using 
+// computer driven tools for the role playing game "Das 
+// Schwarze Auge" / "The Dark Eye". Any other use is only 
+// allowed with prior written permission by FanPro.
 //@-at
 //@@c
 
 #ifdef MSVC
 #pragma warning(disable:4786 4503)
 #endif
+
 //@-node:<< header >>
 //@nl
 //@<< includes >>
@@ -190,6 +237,14 @@
 //@<< Version History >>
 //@+node:<< Version History >>
 // $Log$
+// Revision 1.5  2004/10/17 19:12:41  vrandezo
+// IDs und Bezeichner getrennt - I18N vorbereitet
+// ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
+// Aber Entwicklung ohne CVS wird mir zu doof.
+// Vorsicht vor allem mit Helden und RKP.
+// Tausend Kleinigkeiten geaendert.
+// Neue Datensaetze in basis.xdi.
+//
 // Revision 1.4  2004/05/13 07:52:45  dertron
 // Korrekturen für gcc 3.4, der einiges ISO-C++-konformer ist.
 //

Index: SonderfertigkeitWaffenloserKampfstilGUIwx.h
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/SonderfertigkeitWaffenloserKampfstilGUIwx.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SonderfertigkeitWaffenloserKampfstilGUIwx.h	28 Nov 2003 16:47:21 -0000	1.5
+++ SonderfertigkeitWaffenloserKampfstilGUIwx.h	17 Oct 2004 19:12:42 -0000	1.6
@@ -12,15 +12,62 @@
 //@<< header >>
 //@+node:<< header >>
 //@+at
-// The content of this file is subject to the license 
-// given in license.txt
+// Copyright (c) 2002-2004, Zdenko Denny Vrandecic and 
+// contributors.
+// All rights reserved.
+// (The license follows closely the new 
+// BSD-OpenSource-License)
+// 
+// Redistribution and use in source and binary forms, with 
+// or without
+// modification, are permitted provided that the following 
+// conditions are met:
+// Redistributions of source code must retain the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer.
+// Redistributions in binary form must reproduce the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+// Neither the name of the copyrightholder or one of the 
+// contributers to this source may be used to endorse or 
+// promote products derived from this software without 
+// specific prior written permission.
 // 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+// (INCLUDING, BUT  NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// If you use this source, please inform me, so I can keep 
+// track of how useful it really is. That would be very 
+// appreciated.
+// 
+// The data distributed with this code is copyrighted by 
+// Fantasy Production, Erkrath, Germany, and *not* subject 
+// to the here given license. Distributing and using this 
+// data is granted by FanPro for the purpose of using 
+// computer driven tools for the role playing game "Das 
+// Schwarze Auge" / "The Dark Eye". Any other use is only 
+// allowed with prior written permission by FanPro.
 //@-at
 //@@c
 
 #ifdef MSVC
 #pragma warning(disable:4786 4503)
 #endif
+
 //@-node:<< header >>
 //@nl
 
@@ -104,6 +151,14 @@
 //@<< Version History >>
 //@+node:<< Version History >>
 // $Log$
+// Revision 1.6  2004/10/17 19:12:42  vrandezo
+// IDs und Bezeichner getrennt - I18N vorbereitet
+// ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
+// Aber Entwicklung ohne CVS wird mir zu doof.
+// Vorsicht vor allem mit Helden und RKP.
+// Tausend Kleinigkeiten geaendert.
+// Neue Datensaetze in basis.xdi.
+//
 // Revision 1.5  2003/11/28 16:47:21  vrandezo
 // Manöver
 //

Index: CharakteristikumSchlechteEigenschaftGUIwx.h
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/CharakteristikumSchlechteEigenschaftGUIwx.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CharakteristikumSchlechteEigenschaftGUIwx.h	28 Nov 2003 16:48:04 -0000	1.5
+++ CharakteristikumSchlechteEigenschaftGUIwx.h	17 Oct 2004 19:12:41 -0000	1.6
@@ -1,26 +1,92 @@
 //@+leo-ver=4-encoding=iso-8859-1.
 //@+node:@file CharakteristikumSchlechteEigenschaftGUIwx.h
-//////////////////////////////////////////////////////////////////////
-//
-// CharakteristikumSchlechteEigenschaftGUIwx.h: Fenster zum Editieren
-// von Schlechten Eigenschaften
-//
+//@+at
+// CharakteristikumSchlechteEigenschaftGUIwx.h: Fenster 
+// zum Editieren von Schlechten Eigenschaften
+// 
 // $Revision$
 // $Date$
-//
-// Der Inhalt dieser Datei fällt unter die in license.txt gegebene Lizenz.
-//
-//////////////////////////////////////////////////////////////////////
+//@-at
+//@@c
+
+//@<< header >>
+//@+node:<< header >>
+//@+at
+// Copyright (c) 2002-2004, Zdenko Denny Vrandecic and 
+// contributors.
+// All rights reserved.
+// (The license follows closely the new 
+// BSD-OpenSource-License)
+// 
+// Redistribution and use in source and binary forms, with 
+// or without
+// modification, are permitted provided that the following 
+// conditions are met:
+// Redistributions of source code must retain the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer.
+// Redistributions in binary form must reproduce the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+// Neither the name of the copyrightholder or one of the 
+// contributers to this source may be used to endorse or 
+// promote products derived from this software without 
+// specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+// (INCLUDING, BUT  NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// If you use this source, please inform me, so I can keep 
+// track of how useful it really is. That would be very 
+// appreciated.
+// 
+// The data distributed with this code is copyrighted by 
+// Fantasy Production, Erkrath, Germany, and *not* subject 
+// to the here given license. Distributing and using this 
+// data is granted by FanPro for the purpose of using 
+// computer driven tools for the role playing game "Das 
+// Schwarze Auge" / "The Dark Eye". Any other use is only 
+// allowed with prior written permission by FanPro.
+//@-at
+//@@c
+
+#ifdef MSVC
+#pragma warning(disable:4786 4503)
+#endif
+
+//@-node:<< header >>
+//@nl
 
 #if !defined(CHARAKTERISTIKUMSCHLECHTEEIGENSCHAFTGUIWX_H)
 #define CHARAKTERISTIKUMSCHLECHTEEIGENSCHAFTGUIWX_H
 
+//@<< includes >>
+//@+node:<< includes >>
 #include "dsa/Charakteristikum.h"
 #include "MengeGUIwx.h"
+//@nonl
+//@-node:<< includes >>
+//@nl
 
 class wxCheckBox;
 class wxComboBox;
 
+//@<< CharakteristikumSchlechteEigenschaftGUIwx >>
+//@+node:<< CharakteristikumSchlechteEigenschaftGUIwx >>
 //! Fenster zum Darstellen und Editieren von Charakteristika
 class CharakteristikumSchlechteEigenschaftGUIwx 
 : public MengeGUIwx<DSA::CharakteristikumDefinitionen> {
@@ -76,10 +142,23 @@
 
   DECLARE_EVENT_TABLE()
 }; // CharakteristikumSchlechteEigenschaftGUIwx
+//@nonl
+//@-node:<< CharakteristikumSchlechteEigenschaftGUIwx >>
+//@nl
 
 #endif // !defined(CHARAKTERISTIKUMSCHLECHTEIGENSCHAFTGUIWX_H)
 
+//@<< Version History >>
+//@+node:<< Version History >>
 // $Log$
+// Revision 1.6  2004/10/17 19:12:41  vrandezo
+// IDs und Bezeichner getrennt - I18N vorbereitet
+// ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
+// Aber Entwicklung ohne CVS wird mir zu doof.
+// Vorsicht vor allem mit Helden und RKP.
+// Tausend Kleinigkeiten geaendert.
+// Neue Datensaetze in basis.xdi.
+//
 // Revision 1.5  2003/11/28 16:48:04  vrandezo
 // Zeilenvorlauf am Dateiende (Warnung bei gcc)
 //
@@ -94,5 +173,9 @@
 // Revision 1.1  2003/03/09 13:04:21  vrandezo
 // Aufgeteilte Editoren für Schlechte Eigenschaften und sonstige Vor- und Nachteile
 //
+//@nonl
+//@-node:<< Version History >>
+//@nl
+//@nonl
 //@-node:@file CharakteristikumSchlechteEigenschaftGUIwx.h
 //@-leo

Index: SpracheSchriftGUIwx.cpp
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/SpracheSchriftGUIwx.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SpracheSchriftGUIwx.cpp	25 Jun 2004 16:12:26 -0000	1.7
+++ SpracheSchriftGUIwx.cpp	17 Oct 2004 19:12:42 -0000	1.8
@@ -1,22 +1,77 @@
 //@+leo-ver=4-encoding=iso-8859-1.
 //@+node:@file SpracheSchriftGUIwx.cpp
-//////////////////////////////////////////////////////////////////////
-//
-// SpracheSchriftGUIwx.cpp: Implementierung des Fensters zum Editieren von Sprachen und Schriften
-//
+//@+at
+// SpracheSchriftGUIwx.cpp: Implementierung des Fensters 
+// zum Editieren von Sprachen und Schriften
+// 
 // $Revision$
 // $Date$
-//
-// Der Inhalt dieser Datei fällt unter die in license.txt gegebene Lizenz.
-//
-//////////////////////////////////////////////////////////////////////
+//@-at
+//@@c
+
+//@<< header >>
+//@+node:<< header >>
+//@+at
+// Copyright (c) 2002-2004, Zdenko Denny Vrandecic and 
+// contributors.
+// All rights reserved.
+// (The license follows closely the new 
+// BSD-OpenSource-License)
+// 
+// Redistribution and use in source and binary forms, with 
+// or without
+// modification, are permitted provided that the following 
+// conditions are met:
+// Redistributions of source code must retain the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer.
+// Redistributions in binary form must reproduce the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+// Neither the name of the copyrightholder or one of the 
+// contributers to this source may be used to endorse or 
+// promote products derived from this software without 
+// specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+// (INCLUDING, BUT  NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// If you use this source, please inform me, so I can keep 
+// track of how useful it really is. That would be very 
+// appreciated.
+// 
+// The data distributed with this code is copyrighted by 
+// Fantasy Production, Erkrath, Germany, and *not* subject 
+// to the here given license. Distributing and using this 
+// data is granted by FanPro for the purpose of using 
+// computer driven tools for the role playing game "Das 
+// Schwarze Auge" / "The Dark Eye". Any other use is only 
+// allowed with prior written permission by FanPro.
+//@-at
+//@@c
 
 #ifdef MSVC
-#pragma warning(disable:4786)
+#pragma warning(disable:4786 4503)
 #endif
 
-//@<< SpracheSchriftGUIwx #includes >>
-//@+node:<< SpracheSchriftGUIwx #includes >>
+//@-node:<< header >>
+//@nl
+//@<< includes >>
+//@+node:<< includes >>
 #include "dsa/NDSAUtil.h"
 #include "dsa/SpracheSchrift.h"
 
@@ -30,24 +85,23 @@
 #include "wx/combobox.h"
 
 #include <set>
-//@-node:<< SpracheSchriftGUIwx #includes >>
+//@-node:<< includes >>
 //@nl
-//@<< SpracheSchriftGUIwx declarations >>
-//@+node:<< SpracheSchriftGUIwx declarations >>
-
+//@<< filename >>
+//@+node:<< filename >>
 #ifdef _DEBUG
 #undef THIS_FILE
 static char THIS_FILE[]=__FILE__;
-//@-node:<< SpracheSchriftGUIwx declarations >>
-//@nl
-//@+others
-//@+node:SpracheGUIwx
+//#define new DEBUG_NEW
 #endif
 
-//////////////////////////////////////////////////////////////////////
-// Konstruktion/Destruktion
-//////////////////////////////////////////////////////////////////////
+//@-node:<< filename >>
+//@nl
 
+//@+others
+//@+node:SpracheGUIwx
+//@+others
+//@+node:Konstruktor
 SpracheGUIwx::SpracheGUIwx(wxWindow* parent)
 : MengeGUIwx<DSA::SpracheDefinitionen>(parent, DSA::sprachen()) {
 	wxBoxSizer* allSizer = new wxBoxSizer(wxHORIZONTAL);
@@ -58,13 +112,13 @@
 
 	wxBoxSizer* zeilenSizer = new wxBoxSizer(wxHORIZONTAL);
 	zeilenSizer->Add(new wxStaticText(this, -1, _t("Sprachfamilie").c_str()), 0, wxALIGN_CENTER_VERTICAL);
-	familie_ = new wxComboBox(this, COMBOFAMILIE, "", wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_DROPDOWN);
+	familie_ = new wxComboBox(this, COMBOFAMILIE, "", wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_DROPDOWN | wxCB_READONLY);
 	familie_->Clear();
   std::set<std::string> familien;
   for (DSA::SpracheDefinitionen::iterator s = DSA::sprachen()->begin(); s != DSA::sprachen()->end(); ++s)
     familien.insert(s->second.Familie());
   for (std::set<std::string>::iterator f = familien.begin(); f != familien.end(); ++f)
-    familie_->Append(f->c_str());
+    familie_->Append(DSA::SpracheDefinitionen::Kriterium2Bezeichnung(*f).c_str());
   
 	zeilenSizer->Add(familie_, 1, wxEXPAND | wxLEFT, 10);
 	rechtsSizer->Add(zeilenSizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, 10);
@@ -114,14 +168,8 @@
 	Update();	
 }
 //@nonl
-//@-node:SpracheGUIwx
-//@+node:SpracheGUIwx
-//@+at 
-//@nonl
-// Konstruktor
-//@-at
-//@@c
-
+//@-node:Konstruktor
+//@+node:Konstruktor klein
 SpracheGUIwx::SpracheGUIwx(wxWindow* parent, DSA::SpracheDefinition def)
 : MengeGUIwx<DSA::SpracheDefinitionen>(parent, def) {
 	einzelText_->AppendText((_t("Sprachamilie") + ": " + def.Familie() + "\n\n").c_str());
@@ -130,15 +178,11 @@
   einzelText_->AppendText(def.Beschreibung().c_str());
 }
 //@nonl
-//@-node:SpracheGUIwx
+//@-node:Konstruktor klein
 //@+node:BEGIN_EVENT_TABLE
-//@+at 
-//@nonl
-// Konstruktor
-//@-at
-//@@c
-
 BEGIN_EVENT_TABLE(SpracheGUIwx, wxFrame)
+  EVT_TOGGLEBUTTON  (BTID,                SpracheGUIwx::OnIDBtn)
+  EVT_TOGGLEBUTTON  (BTBEZ,               SpracheGUIwx::OnBezBtn)
 	EVT_LISTBOX (IDLISTBOX,           SpracheGUIwx::OnIDListboxSelect)
 	EVT_BUTTON  (BTLOESCHEN,          SpracheGUIwx::OnLoeschenBtn)
 	EVT_BUTTON  (BTKOPIEREN,          SpracheGUIwx::OnKopierenBtn)
@@ -154,7 +198,8 @@
 	EVT_BUTTON  (KOMPLEXITAETPLUS,    SpracheGUIwx::OnKomplexitaetPlus)
 	EVT_BUTTON  (KOMPLEXITAETMINUS,   SpracheGUIwx::OnKomplexitaetMinus)
 END_EVENT_TABLE()
-
+//@-node:BEGIN_EVENT_TABLE
+//@+node:Update
 void SpracheGUIwx::Update() {	
 	if (!(objekt_.get())) return;
 
@@ -163,8 +208,8 @@
   for (DSA::SpracheDefinitionen::iterator s = DSA::sprachen()->begin(); s != DSA::sprachen()->end(); ++s)
     familien.insert(s->second.Familie());
   for (std::set<std::string>::iterator f = familien.begin(); f != familien.end(); ++f)
-    familie_->Append(f->c_str());
-	familie_->SetValue((objekt_->Familie()).c_str());
+    familie_->Append(DSA::SpracheDefinitionen::Kriterium2Bezeichnung(*f).c_str());
+	familie_->SetValue((DSA::SpracheDefinitionen::Kriterium2Bezeichnung(objekt_->Familie())).c_str());
 	komplexitaetWertText_->SetValue(strings::int2sStr(objekt_->Komplexitaet()).c_str());
 	skt_->SetSelection(skt_->FindString(DSA::SKTSpalteString(objekt_->SKTSpalte_()).c_str()));
   if (objekt_->Beschreibung() != "")
@@ -175,18 +220,12 @@
 	UpdateTitel();
 }
 //@nonl
-//@-node:BEGIN_EVENT_TABLE
+//@-node:Update
 //@+node:UpdateData
-//@+at 
-//@nonl
-// Update
-//@-at
-//@@c
-
 void SpracheGUIwx::UpdateData() {
 	if (!(objekt_.get())) return;
 
-	objekt_->Familie(familie_->GetValue().c_str());
+	objekt_->Familie(DSA::SpracheDefinitionen::Bezeichnung2Kriterium(familie_->GetValue().c_str()));
 	objekt_->Komplexitaet(strings::sStr2int(komplexitaetWertText_->GetValue().c_str()));
 	objekt_->SKTSpalte_(DSA::SKTSpalteString(skt_->GetStringSelection().c_str()));
   if (beschreibung_->GetValue()!=wxString(_t("keine Beschreibung vorhanden").c_str()))
@@ -194,25 +233,15 @@
 }
 //@nonl
 //@-node:UpdateData
+//@+node:Events
+//@+others
 //@+node:OnUpdate
-//@+at 
-//@nonl
-// UpdateData
-//@-at
-//@@c
-
 void SpracheGUIwx::OnUpdate (wxCommandEvent& WXUNUSED(event)) {
 	Update();
 }
 //@nonl
 //@-node:OnUpdate
 //@+node:OnUpdateData
-//@+at 
-//@nonl
-// OnUpdate
-//@-at
-//@@c
-
 void SpracheGUIwx::OnUpdateData (wxCommandEvent& WXUNUSED(event)) {
 	UpdateData();
 }
@@ -244,13 +273,15 @@
 }
 //@nonl
 //@-node:OnKomplexitaetMinus
-//@+node:SchriftGUIwx
-//@+at 
+//@-others
 //@nonl
-// OnKomplexitaetMinus
-//@-at
-//@@c
-
+//@-node:Events
+//@-others
+//@nonl
+//@-node:SpracheGUIwx
+//@+node:SchriftGUIwx
+//@+others
+//@+node:Konstruktor
 SchriftGUIwx::SchriftGUIwx(wxWindow* parent)
 : MengeGUIwx<DSA::SchriftDefinitionen>(parent, DSA::schriften()) {
 	wxBoxSizer* allSizer = new wxBoxSizer(wxHORIZONTAL);
@@ -292,7 +323,7 @@
 	SetAutoLayout(true);
 	SetSizer(allSizer);
 	allSizer->Fit(this);
-	SetSize(300, 200);
+	SetSize(350, 300);
 
 	UpdateIDs();
 
@@ -304,14 +335,8 @@
 	Update();	
 }
 //@nonl
-//@-node:SchriftGUIwx
-//@+node:SchriftGUIwx
-//@+at 
-//@nonl
-// Konstruktor
-//@-at
-//@@c
-
+//@-node:Konstruktor
+//@+node:Konstruktor klein
 SchriftGUIwx::SchriftGUIwx(wxWindow* parent, DSA::SchriftDefinition def)
 : MengeGUIwx<DSA::SchriftDefinitionen>(parent, def) {
 	einzelText_->AppendText((_t("Komplexität") + ": " + strings::int2sStr(def.Komplexitaet()) + "\n\n").c_str());
@@ -319,15 +344,11 @@
   einzelText_->AppendText(def.Beschreibung().c_str());
 }
 //@nonl
-//@-node:SchriftGUIwx
+//@-node:Konstruktor klein
 //@+node:BEGIN_EVENT_TABLE
-//@+at 
-//@nonl
-// Konstruktor
-//@-at
-//@@c
-
 BEGIN_EVENT_TABLE(SchriftGUIwx, wxFrame)
+  EVT_TOGGLEBUTTON  (BTID,                SchriftGUIwx::OnIDBtn)
+  EVT_TOGGLEBUTTON  (BTBEZ,               SchriftGUIwx::OnBezBtn)
 	EVT_LISTBOX (IDLISTBOX,           SchriftGUIwx::OnIDListboxSelect)
 	EVT_BUTTON  (BTLOESCHEN,          SchriftGUIwx::OnLoeschenBtn)
 	EVT_BUTTON  (BTKOPIEREN,          SchriftGUIwx::OnKopierenBtn)
@@ -341,7 +362,8 @@
 	EVT_BUTTON  (KOMPLEXITAETPLUS,    SchriftGUIwx::OnKomplexitaetPlus)
 	EVT_BUTTON  (KOMPLEXITAETMINUS,   SchriftGUIwx::OnKomplexitaetMinus)
 END_EVENT_TABLE()
-
+//@-node:BEGIN_EVENT_TABLE
+//@+node:Update
 void SchriftGUIwx::Update() {	
 	if (!(objekt_.get())) return;
 
@@ -355,14 +377,8 @@
 	UpdateTitel();
 }
 //@nonl
-//@-node:BEGIN_EVENT_TABLE
+//@-node:Update
 //@+node:UpdateData
-//@+at 
-//@nonl
-// Update
-//@-at
-//@@c
-
 void SchriftGUIwx::UpdateData() {
 	if (!(objekt_.get())) return;
 
@@ -373,37 +389,21 @@
 }
 //@nonl
 //@-node:UpdateData
+//@+node:Events
+//@+others
 //@+node:OnUpdate
-//@+at 
-//@nonl
-// UpdateData
-//@-at
-//@@c
-
 void SchriftGUIwx::OnUpdate (wxCommandEvent& WXUNUSED(event)) {
 	Update();
 }
 //@nonl
 //@-node:OnUpdate
 //@+node:OnUpdateData
-//@+at 
-//@nonl
-// OnUpdate
-//@-at
-//@@c
-
 void SchriftGUIwx::OnUpdateData (wxCommandEvent& WXUNUSED(event)) {
 	UpdateData();
 }
 //@nonl
 //@-node:OnUpdateData
 //@+node:OnKomplexitaetPlus
-//@+at 
-//@nonl
-// OnUpdateData
-//@-at
-//@@c
-
 void SchriftGUIwx::OnKomplexitaetPlus (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->Komplexitaet(objekt_->Komplexitaet()+1);
 	Update();
@@ -411,12 +411,6 @@
 //@nonl
 //@-node:OnKomplexitaetPlus
 //@+node:OnKomplexitaetMinus
-//@+at 
-//@nonl
-// OnKomplexitaetPlus
-//@-at
-//@@c
-
 void SchriftGUIwx::OnKomplexitaetMinus (wxCommandEvent& WXUNUSED(event)) {
 	objekt_->Komplexitaet(objekt_->Komplexitaet()-1);
 	Update();
@@ -424,9 +418,24 @@
 //@nonl
 //@-node:OnKomplexitaetMinus
 //@-others
- // OnKomplexitaetMinus
+//@nonl
+//@-node:Events
+//@-others
+//@nonl
+//@-node:SchriftGUIwx
+//@-others
 
+//@<< Version History >>
+//@+node:<< Version History >>
 // $Log$
+// Revision 1.8  2004/10/17 19:12:42  vrandezo
+// IDs und Bezeichner getrennt - I18N vorbereitet
+// ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
+// Aber Entwicklung ohne CVS wird mir zu doof.
+// Vorsicht vor allem mit Helden und RKP.
+// Tausend Kleinigkeiten geaendert.
+// Neue Datensaetze in basis.xdi.
+//
 // Revision 1.7  2004/06/25 16:12:26  twel
 // wxListBox::Number() ersetzt durch GetCount() (deprecated)
 //
@@ -470,5 +479,8 @@
 // SpracheGUIwx hinzugefügt
 // SortierteMenge erweitert um Zeige
 //
+//@nonl
+//@-node:<< Version History >>
+//@nl
 //@-node:@file SpracheSchriftGUIwx.cpp
 //@-leo

Index: ProfessionGUIwx.h
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/ProfessionGUIwx.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ProfessionGUIwx.h	12 Apr 2004 23:16:28 -0000	1.12
+++ ProfessionGUIwx.h	17 Oct 2004 19:12:42 -0000	1.13
@@ -12,15 +12,62 @@
 //@<< header >>
 //@+node:<< header >>
 //@+at
-// The content of this file is subject to the license 
-// given in license.txt
+// Copyright (c) 2002-2004, Zdenko Denny Vrandecic and 
+// contributors.
+// All rights reserved.
+// (The license follows closely the new 
+// BSD-OpenSource-License)
+// 
+// Redistribution and use in source and binary forms, with 
+// or without
+// modification, are permitted provided that the following 
+// conditions are met:
+// Redistributions of source code must retain the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer.
+// Redistributions in binary form must reproduce the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+// Neither the name of the copyrightholder or one of the 
+// contributers to this source may be used to endorse or 
+// promote products derived from this software without 
+// specific prior written permission.
 // 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+// (INCLUDING, BUT  NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// If you use this source, please inform me, so I can keep 
+// track of how useful it really is. That would be very 
+// appreciated.
+// 
+// The data distributed with this code is copyrighted by 
+// Fantasy Production, Erkrath, Germany, and *not* subject 
+// to the here given license. Distributing and using this 
+// data is granted by FanPro for the purpose of using 
+// computer driven tools for the role playing game "Das 
+// Schwarze Auge" / "The Dark Eye". Any other use is only 
+// allowed with prior written permission by FanPro.
 //@-at
 //@@c
 
 #ifdef MSVC
 #pragma warning(disable:4786 4503)
 #endif
+
 //@-node:<< header >>
 //@nl
 
@@ -118,6 +165,14 @@
 //@<< Version History >>
 //@+node:<< Version History >>
 // $Log$
+// Revision 1.13  2004/10/17 19:12:42  vrandezo
+// IDs und Bezeichner getrennt - I18N vorbereitet
+// ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
+// Aber Entwicklung ohne CVS wird mir zu doof.
+// Vorsicht vor allem mit Helden und RKP.
+// Tausend Kleinigkeiten geaendert.
+// Neue Datensaetze in basis.xdi.
+//
 // Revision 1.12  2004/04/12 23:16:28  vrandezo
 // Professionen fuehren bekannte Zaubersprueche mit
 //

Index: RasseGUIwx.cpp
===================================================================
RCS file: /cvsroot/darkeyetool/det/src/gui/RasseGUIwx.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- RasseGUIwx.cpp	25 Jun 2004 16:12:26 -0000	1.17
+++ RasseGUIwx.cpp	17 Oct 2004 19:12:42 -0000	1.18
@@ -12,15 +12,62 @@
 //@<< header >>
 //@+node:<< header >>
 //@+at
-// The content of this file is subject to the license 
-// given in license.txt
+// Copyright (c) 2002-2004, Zdenko Denny Vrandecic and 
+// contributors.
+// All rights reserved.
+// (The license follows closely the new 
+// BSD-OpenSource-License)
+// 
+// Redistribution and use in source and binary forms, with 
+// or without
+// modification, are permitted provided that the following 
+// conditions are met:
+// Redistributions of source code must retain the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer.
+// Redistributions in binary form must reproduce the above 
+// copyright notice, this list of conditions and the 
+// following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+// Neither the name of the copyrightholder or one of the 
+// contributers to this source may be used to endorse or 
+// promote products derived from this software without 
+// specific prior written permission.
 // 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+// CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+// (INCLUDING, BUT  NOT LIMITED TO, PROCUREMENT OF 
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// If you use this source, please inform me, so I can keep 
+// track of how useful it really is. That would be very 
+// appreciated.
+// 
+// The data distributed with this code is copyrighted by 
+// Fantasy Production, Erkrath, Germany, and *not* subject 
+// to the here given license. Distributing and using this 
+// data is granted by FanPro for the purpose of using 
+// computer driven tools for the role playing game "Das 
+// Schwarze Auge" / "The Dark Eye". Any other use is only 
+// allowed with prior written permission by FanPro.
 //@-at
 //@@c
 
 #ifdef MSVC
 #pragma warning(disable:4786 4503)
 #endif
+
 //@-node:<< header >>
 //@nl
 
@@ -67,7 +114,7 @@
 	if (idListe_->GetCount()>0) {
 		idListe_->SetSelection(0);
 		std::auto_ptr<DSA::RasseDefinition> r(new DSA::RasseDefinition
-      (DSA::rassen()->find(idListe_->GetStringSelection().c_str())->second));
+      (DSA::rassen()->find(DSA::rassen()->Finde(idListe_->GetStringSelection().c_str()))->second));
 		objekt_ = r;
 	} else {
 		std::auto_ptr<DSA::RasseDefinition> r(new DSA::RasseDefinition());
@@ -384,39 +431,41 @@
 //@+others
 //@+node:BEGIN_EVENT_TABLE
 BEGIN_EVENT_TABLE(RasseGUIwx, wxFrame)
-	EVT_LISTBOX (IDLISTBOX,           RasseGUIwx::OnIDListboxSelect)
+  EVT_LISTBOX (IDLISTBOX,           RasseGUIwx::OnIDListboxSelect)
   EVT_TEXT    (SPEZIES,             RasseGUIwx::OnSpezies)
-	EVT_COMBOBOX(SPEZIES,             RasseGUIwx::OnSpezies)
-	EVT_BUTTON  (BTKOPIEREN,          RasseGUIwx::OnKopierenBtn)
+  EVT_COMBOBOX(SPEZIES,             RasseGUIwx::OnSpezies)
+  EVT_TOGGLEBUTTON(BTID,            RasseGUIwx::OnIDBtn)
+  EVT_TOGGLEBUTTON(BTBEZ,           RasseGUIwx::OnBezBtn)
+  EVT_BUTTON  (BTKOPIEREN,          RasseGUIwx::OnKopierenBtn)
   EVT_BUTTON  (BTLOESCHEN,          RasseGUIwx::OnLoeschenBtn)
-	EVT_BUTTON  (BTNEU,               RasseGUIwx::OnNeuBtn)
-	EVT_BUTTON  (BTUMBENENNEN,        RasseGUIwx::OnUmbenennenBtn)
-	EVT_BUTTON  (BTUEBERNEHMEN,       RasseGUIwx::OnUebernehmenBtn)
-	EVT_BUTTON  (BTZURUECKSETZEN,     RasseGUIwx::OnZuruecksetzenBtn)
+  EVT_BUTTON  (BTNEU,               RasseGUIwx::OnNeuBtn)
+  EVT_BUTTON  (BTUMBENENNEN,        RasseGUIwx::OnUmbenennenBtn)
+  EVT_BUTTON  (BTUEBERNEHMEN,       RasseGUIwx::OnUebernehmenBtn)
+  EVT_BUTTON  (BTZURUECKSETZEN,     RasseGUIwx::OnZuruecksetzenBtn)
   EVT_TEXT    (VARIANTE,            RasseGUIwx::OnVariante)
   EVT_COMBOBOX(GESCHLECHT,          RasseGUIwx::OnGeschlecht)
-	EVT_BUTTON  (MODPLUS,             RasseGUIwx::OnModPlus)
-	EVT_BUTTON  (MODMINUS,            RasseGUIwx::OnModMinus)
-	EVT_BUTTON  (MODHINZU,            RasseGUIwx::OnModHinzu)
-	EVT_BUTTON  (MODWEG,              RasseGUIwx::OnModWeg)
+  EVT_BUTTON  (MODPLUS,             RasseGUIwx::OnModPlus)
+  EVT_BUTTON  (MODMINUS,            RasseGUIwx::OnModMinus)
+  EVT_BUTTON  (MODHINZU,            RasseGUIwx::OnModHinzu)
+  EVT_BUTTON  (MODWEG,              RasseGUIwx::OnModWeg)
   EVT_LISTBOX_DCLICK(MOD,           RasseGUIwx::OnMod)
   EVT_LISTBOX_DCLICK(MODGESAMT,     RasseGUIwx::OnModGesamt)
-	EVT_BUTTON  (VORPLUS,             RasseGUIwx::OnVorPlus)
-	EVT_BUTTON  (VORMINUS,            RasseGUIwx::OnVorMinus)
-	EVT_BUTTON  (VORHINZU,            RasseGUIwx::OnVorHinzu)
-	EVT_BUTTON  (VORWEG,              RasseGUIwx::OnVorWeg)
+  EVT_BUTTON  (VORPLUS,             RasseGUIwx::OnVorPlus)
+  EVT_BUTTON  (VORMINUS,            RasseGUIwx::OnVorMinus)
+  EVT_BUTTON  (VORHINZU,            RasseGUIwx::OnVorHinzu)
+  EVT_BUTTON  (VORWEG,              RasseGUIwx::OnVorWeg)
   EVT_LISTBOX_DCLICK(VOR,           RasseGUIwx::OnVor)
   EVT_LISTBOX_DCLICK(VORGESAMT,     RasseGUIwx::OnVorGesamt)
-	EVT_BUTTON  (TALPLUS,             RasseGUIwx::OnTalPlus)
-	EVT_BUTTON  (TALMINUS,            RasseGUIwx::OnTalMinus)
-	EVT_BUTTON  (TALPLUSDIREKT,       RasseGUIwx::OnTalPlusDirekt)
-	EVT_BUTTON  (TALMINUSDIREKT,      RasseGUIwx::OnTalMinusDirekt)
-	EVT_BUTTON  (TALMODHINZU,         RasseGUIwx::OnTalModHinzu)
-	EVT_BUTTON  (TALMODWEG,           RasseGUIwx::OnTalModWeg)
-	EVT_BUTTON  (TALWERTHINZU,        RasseGUIwx::OnTalWertHinzu)
-	EVT_BUTTON  (TALWERTWEG,          RasseGUIwx::OnTalWertWeg)
-	EVT_BUTTON  (TALAUSWAHLHINZU,     RasseGUIwx::OnTalAuswahlHinzu)
-	EVT_BUTTON  (TALAUSWAHLWEG,       RasseGUIwx::OnTalAuswahlWeg)
+  EVT_BUTTON  (TALPLUS,             RasseGUIwx::OnTalPlus)
+  EVT_BUTTON  (TALMINUS,            RasseGUIwx::OnTalMinus)
+  EVT_BUTTON  (TALPLUSDIREKT,       RasseGUIwx::OnTalPlusDirekt)
+  EVT_BUTTON  (TALMINUSDIREKT,      RasseGUIwx::OnTalMinusDirekt)
+  EVT_BUTTON  (TALMODHINZU,         RasseGUIwx::OnTalModHinzu)
+  EVT_BUTTON  (TALMODWEG,           RasseGUIwx::OnTalModWeg)
+  EVT_BUTTON  (TALWERTHINZU,        RasseGUIwx::OnTalWertHinzu)
+  EVT_BUTTON  (TALWERTWEG,          RasseGUIwx::OnTalWertWeg)
+  EVT_BUTTON  (TALAUSWAHLHINZU,     RasseGUIwx::OnTalAuswahlHinzu)
+  EVT_BUTTON  (TALAUSWAHLWEG,       RasseGUIwx::OnTalAuswahlWeg)
   EVT_RADIOBOX(TALOPTIONEN,         RasseGUIwx::OnTalOptionen)
   EVT_LISTBOX (TALMOD,              RasseGUIwx::OnTalMod)
   EVT_LISTBOX_DCLICK(TALMOD,        RasseGUIwx::OnTalModD)
@@ -446,37 +495,37 @@
   EVT_LISTBOX_DCLICK(SFLISTE,       RasseGUIwx::OnSFListeD)
   EVT_LISTBOX_DCLICK(MSFLISTE,      RasseGUIwx::OnMSFListeD)
   EVT_LISTBOX_DCLICK(VSFLISTE,      RasseGUIwx::OnVSFListeD)
-	EVT_BUTTON  (GPPLUS,              RasseGUIwx::OnGPPlus)
-	EVT_BUTTON  (GPMINUS,             RasseGUIwx::OnGPMinus)
-	EVT_BUTTON  (GPRECHNEN,           RasseGUIwx::OnGPRechnen)
+  EVT_BUTTON  (GPPLUS,              RasseGUIwx::OnGPPlus)
+  EVT_BUTTON  (GPMINUS,             RasseGUIwx::OnGPMinus)
+  EVT_BUTTON  (GPRECHNEN,           RasseGUIwx::OnGPRechnen)
   EVT_BUTTON  (VPZEIGEN,            RasseGUIwx::OnVPZeigen)
-	EVT_BUTTON  (BTSCHLIESSEN,        RasseGUIwx::OnSchliessenBtn)
-	EVT_BUTTON  (MKHINZU,             RasseGUIwx::OnMKHinzu)
-	EVT_BUTTON  (MKWEG,               RasseGUIwx::OnMKWeg)
-	EVT_BUTTON  (UKHINZU,             RasseGUIwx::OnUKHinzu)
-	EVT_BUTTON  (UKWEG,               RasseGUIwx::OnUKWeg)
+  EVT_BUTTON  (BTSCHLIESSEN,        RasseGUIwx::OnSchliessenBtn)
+  EVT_BUTTON  (MKHINZU,             RasseGUIwx::OnMKHinzu)
+  EVT_BUTTON  (MKWEG,               RasseGUIwx::OnMKWeg)
+  EVT_BUTTON  (UKHINZU,             RasseGUIwx::OnUKHinzu)
+  EVT_BUTTON  (UKWEG,               RasseGUIwx::OnUKWeg)
   EVT_LISTBOX_DCLICK(SAEMTLICHEKULTUREN,RasseGUIwx::OnUKHinzu)
   EVT_LISTBOX_DCLICK(MOEGLICHEKULTUREN,RasseGUIwx::OnMKWeg)
   EVT_LISTBOX_DCLICK(UEBLICHEKULTUREN,RasseGUIwx::OnUKWeg)
   EVT_CHECKBOX(KEINEVARIANTEN,      RasseGUIwx::OnKeineVarianten)
-	EVT_BUTTON  (AUGENFARBEHINZU,     RasseGUIwx::OnAugenfarbeHinzu)
-	EVT_BUTTON  (AUGENFARBEWEG,       RasseGUIwx::OnAugenfarbeWeg)
-	EVT_BUTTON  (HAUPTFARBEWEG,       RasseGUIwx::OnHauptfarbeWeg)
-	EVT_BUTTON  (HAUPTFARBEHINZU,     RasseGUIwx::OnHauptfarbeHinzu)
-	EVT_BUTTON  (GROESSEPLUS,         RasseGUIwx::OnGroessePlus)
-	EVT_BUTTON  (GROESSEMINUS,        RasseGUIwx::OnGroesseMinus)
-	EVT_BUTTON  (GROESSEW6PLUS,       RasseGUIwx::OnGroesseW6Plus)
-	EVT_BUTTON  (GROESSEW6MINUS,      RasseGUIwx::OnGroesseW6Minus)
-	EVT_BUTTON  (GROESSEW20PLUS,      RasseGUIwx::OnGroesseW20Plus)
-	EVT_BUTTON  (GROESSEW20MINUS,     RasseGUIwx::OnGroesseW20Minus)
-	EVT_BUTTON  (ALTERPLUS,           RasseGUIwx::OnAlterPlus)
-	EVT_BUTTON  (ALTERMINUS,          RasseGUIwx::OnAlterMinus)
-	EVT_BUTTON  (ALTERW6PLUS,         RasseGUIwx::OnAlterW6Plus)
-	EVT_BUTTON  (ALTERW6MINUS,        RasseGUIwx::OnAlterW6Minus)
-	EVT_BUTTON  (ALTERW3PLUS,         RasseGUIwx::OnAlterW3Plus)
-	EVT_BUTTON  (ALTERW3MINUS,        RasseGUIwx::OnAlterW3Minus)
-	EVT_BUTTON  (GEWICHTPLUS,         RasseGUIwx::OnGewichtPlus)
-	EVT_BUTTON  (GEWICHTMINUS,        RasseGUIwx::OnGewichtMinus)
+  EVT_BUTTON  (AUGENFARBEHINZU,     RasseGUIwx::OnAugenfarbeHinzu)
+  EVT_BUTTON  (AUGENFARBEWEG,       RasseGUIwx::OnAugenfarbeWeg)
+  EVT_BUTTON  (HAUPTFARBEWEG,       RasseGUIwx::OnHauptfarbeWeg)
+  EVT_BUTTON  (HAUPTFARBEHINZU,     RasseGUIwx::OnHauptfarbeHinzu)
+  EVT_BUTTON  (GROESSEPLUS,         RasseGUIwx::OnGroessePlus)
+  EVT_BUTTON  (GROESSEMINUS,        RasseGUIwx::OnGroesseMinus)
+  EVT_BUTTON  (GROESSEW6PLUS,       RasseGUIwx::OnGroesseW6Plus)
+  EVT_BUTTON  (GROESSEW6MINUS,      RasseGUIwx::OnGroesseW6Minus)
+  EVT_BUTTON  (GROESSEW20PLUS,      RasseGUIwx::OnGroesseW20Plus)
+  EVT_BUTTON  (GROESSEW20MINUS,     RasseGUIwx::OnGroesseW20Minus)
+  EVT_BUTTON  (ALTERPLUS,           RasseGUIwx::OnAlterPlus)
+  EVT_BUTTON  (ALTERMINUS,          RasseGUIwx::OnAlterMinus)
+  EVT_BUTTON  (ALTERW6PLUS,         RasseGUIwx::OnAlterW6Plus)
+  EVT_BUTTON  (ALTERW6MINUS,        RasseGUIwx::OnAlterW6Minus)
+  EVT_BUTTON  (ALTERW3PLUS,         RasseGUIwx::OnAlterW3Plus)
+  EVT_BUTTON  (ALTERW3MINUS,        RasseGUIwx::OnAlterW3Minus)
+  EVT_BUTTON  (GEWICHTPLUS,         RasseGUIwx::OnGewichtPlus)
+  EVT_BUTTON  (GEWICHTMINUS,        RasseGUIwx::OnGewichtMinus)
   EVT_TEXT    (TEXTBESCHREIBUNG,    RasseGUIwx::OnBeschreibung)
 END_EVENT_TABLE()
 //@nonl
@@ -727,6 +776,14 @@
 //@<< Version History >>
 //@+node:<< Version History >>
 // $Log$
+// Revision 1.18  2004/10/17 19:12:42  vrandezo
+// IDs und Bezeichner getrennt - I18N vorbereitet
+// ACHTUNG! Daten sichern. Das Programm ist noch reichlich fehlerhaft.
+// Aber Entwicklung ohne CVS wird mir zu doof.
+// Vorsicht vor allem mit Helden und RKP.
+// Tausend K...
 
[truncated message content]