You can subscribe to this list here.
2004 |
Jan
(32) |
Feb
|
Mar
|
Apr
(151) |
May
(7) |
Jun
(3) |
Jul
(8) |
Aug
|
Sep
(2) |
Oct
(15) |
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Denny V. <vra...@us...> - 2004-04-23 22:07:52
|
Update of /cvsroot/darkeyetool/det/src/dsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21024 Modified Files: Sonderfertigkeit.cpp Log Message: diverse SF hinzugefuegt Index: Sonderfertigkeit.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/dsa/Sonderfertigkeit.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Sonderfertigkeit.cpp 13 Apr 2004 21:45:45 -0000 1.25 --- Sonderfertigkeit.cpp 23 Apr 2004 22:07:41 -0000 1.26 *************** *** 555,558 **** --- 555,560 ---- //@<< Kosten >> //@+node:<< Kosten >> + //@@color + int Sonderfertigkeit::Kosten(const int kosten, const Person& p) const { int punkte = kosten; *************** *** 586,595 **** } ! // TODO Vervollständigen if ((ID()==_t("Apport")) ||(ID()==_t("Astrale Meditation")) ||(ID()==_t("Aura verhüllen")) ||(ID()==_t("Aurapanzer")) ! ||(ID()==_t("Blutmagie"))) akademiebonus = true; --- 588,633 ---- } ! if (Definition()->Merkmalskenntnis()) ! akademiebonus = true; ! ! // TODO if (zauberspezialisierung()) akademiebonus = true; ! if ((ID()==_t("Apport")) ||(ID()==_t("Astrale Meditation")) ||(ID()==_t("Aura verhüllen")) ||(ID()==_t("Aurapanzer")) ! ||(ID()==_t("Blutmagie")) ! ||(ID()==_t("Druidenrache")) ! ||(ID()==_t("Eiserner Wille I")) ! ||(ID()==_t("Eiserner Wille II")) ! ||(ID()==_t("Elementarharmonisierte Aura")) ! ||(ID()==_t("Fernzauberei")) ! ||(ID()==_t("Gedankenschutz")) ! ||(ID()==_t("Gefäß der Sterne")) ! ||(ID()==_t("Große Meditation")) ! ||(ID()==_t("Hypervehemenz")) ! ||(ID()==_t("Konzentrationsstärke")) ! ||(ID()==_t("Kraftkontrolle")) ! ||(ID()==_t("Kraftlinienmagie I")) ! ||(ID()==_t("Kraftlinienmagie II")) ! ||(ID()==_t("Matrixkontrolle")) ! ||(ID()==_t("Matrixregeneration I")) ! ||(ID()==_t("Matrixregeneration II")) ! ||(ID()==_t("Matrixverständnis")) ! ||(ID()==_t("Meisterliche Regeneration")) ! ||(ID()==_t("Meisterliche Zauberkontrolle")) ! ||(ID()==_t("Regeneration I")) ! ||(ID()==_t("Regeneration II")) ! ||(ID()==_t("Signaturkenntnis")) ! ||(ID()==_t("Simultanzaubern")) ! ||(ID()==_t("Stapeleffekt")) ! ||(ID()==_t("Tanz der Mada")) ! ||(ID()==_t("Verbotene Pforten")) ! ||(ID()==_t("Zauber bereithalten")) ! ||(ID()==_t("Zauberkontrolle")) ! ||(ID()==_t("Zauberroutine")) ! ||(ID()==_t("Zauber unterbrechen")) ! ||(ID()==_t("Zauber vereinigen")) ! ||(ID()==_t("Zauberzeichen"))) akademiebonus = true; *************** *** 606,609 **** --- 644,706 ---- punkte *= 2; //@-node:Astrale Meditation + //@+node:Aura verhüllen + if (ID() == _t("Aura verhüllen")) + if (p.charakteristika_.Existiert(_t("Schwache Ausstrahlung"))) + punkte = (punkte+1)/2; + //@nonl + //@-node:Aura verhüllen + //@+node:Blutmagie + if (ID() == _t("Blutmagie")) + if (p.charakteristika_.Existiert(_t("Viertelzauberer"))) + punkte *= 2; + //@-node:Blutmagie + //@+node:Druidenrache + if (ID() == _t("Druidenrache")) + if (p.sonderfertigkeiten_.Existiert(_t("Verbotene Pforten"))) + punkte = (punkte+1)/2; + + //@-node:Druidenrache + //@+node:Regeneration II + if (ID() == _t("Regeneration II")) + if (p.charakteristika_.Existiert(_t("Halbzauberer"))) + punkte *= 2; + //@-node:Regeneration II + //@+node:Meisterliche Regeneration + if (ID() == _t("Meisterliche Regeneration")) + if (p.charakteristika_.Existiert(_t("Halbzauberer"))) + punkte *= 2; + //@-node:Meisterliche Regeneration + //@+node:Kraftkontrolle + if (ID() == _t("Kraftkontrolle")) + if (p.sonderfertigkeiten_.Existiert(_t("Merkmalskenntnis (Kraft)"))) + punkte = (punkte+1)/2; + //@-node:Kraftkontrolle + //@+node:Kraftlinienmagie II + if (ID() == _t("Kraftlinienmagie II")) + if ((p.sonderfertigkeiten_.Existiert(_t("Merkmalskenntnis (Kraft)"))) + ||(p.sonderfertigkeiten_.Existiert(_t("Merkmalskenntnis (Hellsicht)"))) + ||(p.sonderfertigkeiten_.Existiert(_t("Merkmalskenntnis (Metamagie)")))) + punkte = (punkte+1)/2; + //@-node:Kraftlinienmagie II + //@+node:Matrixregeneration II + if (ID() == _t("Matrixregeneration II")) + if (p.sonderfertigkeiten_.Existiert(_t("Merkmalskenntnis (Kraft)"))) + punkte = (punkte+1)/2; + //@-node:Matrixregeneration II + //@+node:Zauber bereithalten + if (ID() == _t("Zauber bereithalten")) + if (p.sonderfertigkeiten_.Existiert(_t("Merkmalskenntnis (Metamagie)"))) + punkte = (punkte+1)/2; + //@-node:Zauber bereithalten + //@+node:Zauber unterbrechen + if (ID() == _t("Zauber unterbrechen")) + if (p.sonderfertigkeiten_.Existiert(_t("Merkmalskenntnis (Metamagie)"))) + punkte = (punkte+1)/2; + //@-node:Zauber unterbrechen + //@+node:Zauber vereinigen + if (ID() == _t("Zauber vereinigen")) + if (p.sonderfertigkeiten_.Existiert(_t("Merkmalskenntnis (Metamagie)"))) + punkte = (punkte+1)/2; + //@-node:Zauber vereinigen //@+node:Manöver ohne Stil teurer if (Definition()->WaffenloseSonderfertigkeit()) { *************** *** 849,852 **** --- 946,952 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.26 2004/04/23 22:07:41 vrandezo + // diverse SF hinzugefuegt + // // Revision 1.25 2004/04/13 21:45:45 vrandezo // Akademische Ausbildung (Magier) implementiert |
From: Denny V. <vra...@us...> - 2004-04-23 22:06:43
|
Update of /cvsroot/darkeyetool/det/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20689 Modified Files: PersonGUIwx.cpp Log Message: Schliessen-Bug bei Uebersichtsfenster (Eric J. Francois) Index: PersonGUIwx.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/gui/PersonGUIwx.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** PersonGUIwx.cpp 13 Apr 2004 17:37:41 -0000 1.59 --- PersonGUIwx.cpp 23 Apr 2004 22:06:05 -0000 1.60 *************** *** 1219,1222 **** --- 1219,1223 ---- EVT_BUTTON (BTUMBENENNEN, PersonGUIwx::OnUmbenennenBtn) EVT_BUTTON (BTDRUCKEN, PersonGUIwx::OnDruckenBtn) + EVT_BUTTON (BTSCHLIESSEN, PersonGUIwx::OnSchliessenBtn) EVT_BUTTON (GPINFO, PersonGUIwx::OnGPInfo) EVT_BUTTON (PersonGUIGeneratorHelferwx::BTGPINFO, PersonGUIwx::OnGPInfo) *************** *** 2559,2562 **** --- 2560,2564 ---- //@-node:<< Warnung >> //@nl + if (HandlerArt()==_t("Generator")) return; std::auto_ptr<DSA::Person> p = person_->HolePerson(); HandlerArt("Generator"); *************** *** 3814,3817 **** --- 3816,3822 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.60 2004/04/23 22:06:05 vrandezo + // Schliessen-Bug bei Uebersichtsfenster (Eric J. Francois) + // // Revision 1.59 2004/04/13 17:37:41 twel // wxTextCtrl ein paar mal durch wxStaticText ersetzt, für besseren Look in Linux |
Update of /cvsroot/darkeyetool/det/src/guihtml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17837 Removed Files: cstmdlg.cpp cstmdlg.h helpers.cpp helpers.h wxMozilla.h wxMozillaBrowser.cpp wxMozillaBrowser.h wxMozillaBrowserChrome.cpp wxMozillaBrowserChrome.h wxMozillaBrowserInterface.h wxMozillaDialogs.cpp wxMozillaDialogs.h wxMozillaEvents.cpp wxMozillaEvents.h wxMozillaSettings.cpp wxMozillaSettings.h wxMozillaWindow.cpp wxMozillaWindow.h Log Message: wieder entfernt. stoert nur das configure, und funktioniert noch nicht --- wxMozillaWindow.h DELETED --- --- wxMozilla.h DELETED --- --- wxMozillaBrowserInterface.h DELETED --- --- wxMozillaBrowserChrome.cpp DELETED --- --- wxMozillaEvents.cpp DELETED --- --- wxMozillaSettings.h DELETED --- --- wxMozillaDialogs.h DELETED --- --- wxMozillaSettings.cpp DELETED --- --- helpers.h DELETED --- --- wxMozillaBrowser.cpp DELETED --- --- wxMozillaBrowser.h DELETED --- --- cstmdlg.cpp DELETED --- --- cstmdlg.h DELETED --- --- wxMozillaEvents.h DELETED --- --- wxMozillaWindow.cpp DELETED --- --- wxMozillaBrowserChrome.h DELETED --- --- helpers.cpp DELETED --- --- wxMozillaDialogs.cpp DELETED --- |
From: Denny V. <vra...@us...> - 2004-04-23 14:03:34
|
Update of /cvsroot/darkeyetool/det/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14310 Modified Files: det.cpp Log Message: configure tut wieder Index: det.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/det.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** det.cpp 23 Apr 2004 13:17:15 -0000 1.51 --- det.cpp 23 Apr 2004 14:03:25 -0000 1.52 *************** *** 873,877 **** //@+node:OnBearbeitenMozGUI #ifdef MOZGUI ! #include "guihtml/wxMozillaWindow.h" void detFrame::OnBearbeitenMozGUI(wxCommandEvent& WXUNUSED(event)) { --- 873,880 ---- //@+node:OnBearbeitenMozGUI #ifdef MOZGUI ! // folgendes muss in ein echtes include verwandelt werden, um zu ! // funktionieren, ist zur Zeit ausser Betrieb, damit configure nicht ! // durcheinanderkommt ! // "guihtml/wxMozillaWindow.h" void detFrame::OnBearbeitenMozGUI(wxCommandEvent& WXUNUSED(event)) { *************** *** 1187,1191 **** basisdatei.SetFullName("basis.xdi"); if (wxFileExists(basisdatei.GetFullPath())) { ! wxMessageDialog f(0, _t("Sie starten zum ersten Mal diese Version des DSA4 Werkzeugs.\nSoll die mitgelieferte Datenbasis importiert werden?").c_str(), _t("Achtung!").c_str(), wxYES_NO | wxYES_DEFAULT | wxCANCEL | wxCENTRE); int rv = f.ShowModal(); if (rv == wxID_YES) { --- 1190,1194 ---- basisdatei.SetFullName("basis.xdi"); if (wxFileExists(basisdatei.GetFullPath())) { ! wxMessageDialog f(0, _t("Sie starten zum ersten Mal diese Version des DSA4 Werkzeugs.\nSoll die mitgelieferte Datenbasis importiert werden?\n(Sehr empfohlen)").c_str(), _t("Achtung!").c_str(), wxYES_NO | wxYES_DEFAULT | wxCANCEL | wxCENTRE); int rv = f.ShowModal(); if (rv == wxID_YES) { *************** *** 1342,1345 **** --- 1345,1351 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.52 2004/04/23 14:03:25 vrandezo + // configure tut wieder + // // Revision 1.51 2004/04/23 13:17:15 vrandezo // typo |
From: Denny V. <vra...@us...> - 2004-04-23 13:21:29
|
Update of /cvsroot/darkeyetool/det In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5114 Modified Files: det.leo Log Message: Ergänzungen am Code Index: det.leo =================================================================== RCS file: /cvsroot/darkeyetool/det/det.leo,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** det.leo 13 Apr 2004 21:47:21 -0000 1.5 --- det.leo 23 Apr 2004 13:21:12 -0000 1.6 *************** *** 1,6 **** <?xml version="1.0" encoding="UTF-8"?> <leo_file> ! <leo_header file_format="2" tnodes="0" max_tnode_index="1898" clone_windows="0"/> ! <globals body_outline_ratio="0.33297758804695837"> <global_window_position top="0" left="79" height="714" width="937"/> <global_log_window_position top="0" left="0" height="0" width="0"/> --- 1,6 ---- <?xml version="1.0" encoding="UTF-8"?> <leo_file> ! <leo_header file_format="2" tnodes="0" max_tnode_index="2156" clone_windows="0"/> [...34144 lines suppressed...] --- 49960,49964 ---- Here you will find the English section, that includes the English documentation and a dictionary of Dark Eye terms. The source code (that means, the name of the variables and the language used for comments) of the Dark Eye tool is written in German (sorry for that), but if there grows interest in participating in the further development of the Dark Eye Tool I will try to translate all requested parts to English.</t> ! <t tx="T2155">@nocolor @doc *************** *** 44002,44005 **** --- 50016,50026 ---- Das SourceForge-Projekt DSA Manager für manch hilfreichen Hinweis in deren eigener Diskussion, und für den Ansporn, sie ein wenig herauszufordern. Mit solcher Konkurrenz macht es SpaÃ. Bedauerlich, dass sie es selbst nie zu einem Release schafften. Wollt ihr euch nicht dem DSA4 Werkzeug anschlieÃen? </t> + <t tx="T2156">zunächst, vielen Dank für Dein Interesse am DSA4 Werkzeug! + + Das Projekt kann immer und gerne neue Tester brauchen, und vielleicht wecken wir Dein Interesse auch soweit, dass Du noch an anderen Baustellen beitragen magst. + + Wenn Du magst, nehme ich Dich gerne in die Liste der Stammtester auf. Diese erhalten bei jedem Erscheinen einer neuen Version einen genaueren Ãberblick über das, was sich verändert hat, so dass sie vor genauer nach Fehlern schauen können. AuÃerdem wünsche ich mir nach jedem Release möglichst baldige Antwort über so Basisfragen wie, ob der Link auch tut, ob das Programm überhaupt installiert und ob es startet. Es ist durchaus schon vorgekommen, dass ich fehlerhafte Dateien hochgeladen habe - sehr peinlich - und ich glaube, dadurch verschreckt man potenzielle Benutzer unheimlich. Darum wäre es ideal, möglichst bald zu wissen, dass es grundlegend mal tut. + + Danach habt Ihr noch viel Zeit, Bugs zu finden und zu melden. Das kann man natürlich jederzeit.</t> </tnodes> </leo_file> |
From: Denny V. <vra...@us...> - 2004-04-23 13:20:21
|
Update of /cvsroot/darkeyetool/det/src/guihtml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5033 Modified Files: wxMozillaWindow.h wxMozillaWindow.cpp Log Message: weitere Änderungen am Konzept Index: wxMozillaWindow.h =================================================================== RCS file: /cvsroot/darkeyetool/det/src/guihtml/wxMozillaWindow.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxMozillaWindow.h 17 Apr 2004 14:57:01 -0000 1.1 --- wxMozillaWindow.h 23 Apr 2004 13:20:05 -0000 1.2 *************** *** 113,116 **** --- 113,119 ---- std::string DSA4Lade(const std::string&); + int EvaluiereAnzahl(const std::string&); + void ForExpansion(std::iostream& vorlage, std::stringstream& ausgabe, bool istfor = false); + std::string dateiname; std::string dateitext; Index: wxMozillaWindow.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/guihtml/wxMozillaWindow.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxMozillaWindow.cpp 17 Apr 2004 14:57:01 -0000 1.1 --- wxMozillaWindow.cpp 23 Apr 2004 13:20:12 -0000 1.2 *************** *** 532,535 **** --- 532,536 ---- //@+node:DSA4Execute std::string wxMozillaWindow::DSA4Execute(const std::string& cmd) { + Log::Debug("Execute: " + cmd); if (strings::BeginntMit(cmd, "lade_dsa4")) { DSA4Lade(strings::OhneAnfang(cmd, "lade")); *************** *** 555,558 **** --- 556,562 ---- //@+node:DSA4Return std::string wxMozillaWindow::DSA4Return(const std::string& request) { + Log::Debug("Return: " + request); + if (strings::BeginntMit(request, "dsa4")) + return DSA4Return(strings::OhneAnfang(request, "dsa4")); if (strings::BeginntMit(request, "sprachen()")) return sprache.Return(strings::OhneAnfang(request, "sprachen()")); *************** *** 565,570 **** --- 569,630 ---- //@-node:DSA4Return //@+node:DSA4Lade + //@<< Evaluiere Anzahl >> + //@+node:<< Evaluiere Anzahl >> + int wxMozillaWindow::EvaluiereAnzahl(const std::string& anzahl) { + return strings::sStr2int(DSA4Return(anzahl)); + } + //@nonl + //@-node:<< Evaluiere Anzahl >> + //@nl + //@<< For >> + //@+node:<< For >> + void wxMozillaWindow::ForExpansion(std::iostream& vorlage, std::stringstream& ausgabe, bool istfor) { + char ch; + std::string tag = ""; + if (istfor) + while (vorlage.get(ch)&&(ch!='°')) + tag += ch; + int anzahl = istfor ? EvaluiereAnzahl(tag) : 1; + tag = ""; + bool istag = false; + std::stringstream temp; + while (vorlage.get(ch)) + if (istag) { + if ('°'!=ch) + tag += ch; + else { + if ("endfor"==tag) { istag = false; break; } + else if ("for"==tag) ForExpansion(vorlage, temp, true); + else temp << '°' << tag << ch; + istag = false; + tag = ""; + } + } else + if (ch=='°') + istag = true; + else + temp.put(ch); + if (istag) + temp << '°' << tag; + + if (istfor) { + for (int i = 0; i != anzahl; ++i) { + std::stringstream tempein(temp.str()); + std::stringstream tempaus; + while (tempein.get(ch)) + if ('$'==ch) + tempaus << (i+1); + else + tempaus.put(ch); + ausgabe << tempaus.str(); + } + } else + ausgabe << temp.str(); + } + //@-node:<< For >> + //@nl std::string wxMozillaWindow::DSA4Lade(const std::string& neuerdateiname) { + Log::Debug("Lade: " + neuerdateiname); if (dateiname==neuerdateiname) { // Benutze string dateitext als stream *************** *** 579,583 **** std::stringstream ausgabe; ! //@ << Uebersetze >> //@+node:<< Uebersetze >> --- 639,646 ---- std::stringstream ausgabe; ! std::stringstream temp; ! ! ForExpansion(vorlage, temp); ! //@ << Uebersetze >> //@+node:<< Uebersetze >> *************** *** 585,589 **** std::string tag = ""; bool istag = false; ! while (vorlage.get(ch)) if (istag) { if ('°'!=ch) --- 648,652 ---- std::string tag = ""; bool istag = false; ! while (temp.get(ch)) if (istag) { if ('°'!=ch) |
From: Denny V. <vra...@us...> - 2004-04-23 13:19:38
|
Update of /cvsroot/darkeyetool/det/src/dsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4845 Modified Files: Menge.h Log Message: Erweiterung von return / execute Index: Menge.h =================================================================== RCS file: /cvsroot/darkeyetool/det/src/dsa/Menge.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Menge.h 17 Apr 2004 15:06:01 -0000 1.14 --- Menge.h 23 Apr 2004 13:19:07 -0000 1.15 *************** *** 248,253 **** //@+node:Return std::string Return(const std::string& request) const { ! if (request[0]=='(') ! return ""; // TODO if (request=="anzahl()") return strings::int2sStr(size()); --- 248,268 ---- //@+node:Return std::string Return(const std::string& request) const { ! // beginnt mit Klammern, will also etwas von einem Element ! if (request[0]=='(') { ! int i; ! std::string nummer = ""; ! for (i = 1; i != request.size(); ++i) ! if (isdigit(request[i])) ! nummer += request[i]; ! else ! break; ! int pos = strings::sStr2int(nummer)-1; ! if (size()>pos) ! return Zeige(pos)->Return(request.substr(i+2, request.size()-(i+2))); ! else ! return _t("Außerhalb des Index"); ! } ! ! // direkte Anfrage an die Menge if (request=="anzahl()") return strings::int2sStr(size()); *************** *** 255,259 **** return _t("Unbekannte Abfrage"); } - //@nonl //@-node:Return //@-others --- 270,273 ---- *************** *** 530,535 **** //@+node:<< Version History >> // $Log$ ! // Revision 1.14 2004/04/17 15:06:01 vrandezo ! // um Execute und Return erweitert // // Revision 1.13 2004/04/13 21:45:45 vrandezo --- 544,549 ---- //@+node:<< Version History >> // $Log$ ! // Revision 1.15 2004/04/23 13:19:07 vrandezo ! // Erweiterung von return / execute // // Revision 1.13 2004/04/13 21:45:45 vrandezo |
From: Denny V. <vra...@us...> - 2004-04-23 13:18:53
|
Update of /cvsroot/darkeyetool/det/src/dsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4704 Modified Files: Kampftechnik.h Log Message: Absturz bei Bauern - skt_ nicht initialisiert (Bugmeldung Twel u.a.) Index: Kampftechnik.h =================================================================== RCS file: /cvsroot/darkeyetool/det/src/dsa/Kampftechnik.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Kampftechnik.h 13 Apr 2004 14:06:52 -0000 1.11 --- Kampftechnik.h 23 Apr 2004 13:18:45 -0000 1.12 *************** *** 45,49 **** class KampftechnikDefinition { public: ! KampftechnikDefinition(const std::string& id = "") : id_(id), eBE_("-") {} static std::string Klasse() { return _t("Kampftechnik"); } static std::string Klassen() { return _t("Kampftechniken"); } --- 45,49 ---- class KampftechnikDefinition { public: ! KampftechnikDefinition(const std::string& id = "") : id_(id), eBE_("-"), skt_(D) {} static std::string Klasse() { return _t("Kampftechnik"); } static std::string Klassen() { return _t("Kampftechniken"); } *************** *** 185,188 **** --- 185,191 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.12 2004/04/23 13:18:45 vrandezo + // Absturz bei Bauern - skt_ nicht initialisiert (Bugmeldung Twel u.a.) + // // Revision 1.11 2004/04/13 14:06:52 vrandezo // Hauszauber implementiert |
From: Denny V. <vra...@us...> - 2004-04-23 13:17:24
|
Update of /cvsroot/darkeyetool/det/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4463 Modified Files: det.cpp Log Message: typo Index: det.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/det.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** det.cpp 17 Apr 2004 13:25:19 -0000 1.50 --- det.cpp 23 Apr 2004 13:17:15 -0000 1.51 *************** *** 368,372 **** menuBearbeiten->Append(det_Bearbeiten_CharakteristikaSub, "&Vor- && Nachteile und SF", menuBearbeitenCharakteristika, "Bearbeiten von Vor- und Nachteilen und Sonderfertigkeiten..."); menuBearbeiten->Append(det_Bearbeiten_Zaubersprueche, "&Zaubersprüche\tCtrl-Z", "Zaubersprüche editieren, löschen, erstellen..."); ! #ifdef MOZUGUI menuBearbeiten->Append(det_Bearbeiten_MozGUI, "Neue &GUI\tCtrl-G", "Alternative GUI (Test)"); #endif --- 368,372 ---- menuBearbeiten->Append(det_Bearbeiten_CharakteristikaSub, "&Vor- && Nachteile und SF", menuBearbeitenCharakteristika, "Bearbeiten von Vor- und Nachteilen und Sonderfertigkeiten..."); menuBearbeiten->Append(det_Bearbeiten_Zaubersprueche, "&Zaubersprüche\tCtrl-Z", "Zaubersprüche editieren, löschen, erstellen..."); ! #ifdef MOZGUI menuBearbeiten->Append(det_Bearbeiten_MozGUI, "Neue &GUI\tCtrl-G", "Alternative GUI (Test)"); #endif *************** *** 1342,1345 **** --- 1342,1348 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.51 2004/04/23 13:17:15 vrandezo + // typo + // // Revision 1.50 2004/04/17 13:25:19 vrandezo // Daten lesen und generieren |
From: Denny V. <vra...@us...> - 2004-04-17 15:06:12
|
Update of /cvsroot/darkeyetool/det/src/dsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15920 Modified Files: Menge.h SpracheSchrift.cpp SpracheSchrift.h Log Message: um Execute und Return erweitert Index: SpracheSchrift.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/dsa/SpracheSchrift.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SpracheSchrift.cpp 13 Apr 2004 14:06:52 -0000 1.9 --- SpracheSchrift.cpp 17 Apr 2004 15:06:01 -0000 1.10 *************** *** 55,60 **** //@ << SpracheDefinition >> //@+node:<< SpracheDefinition >> ! //@<< Lese >> ! //@+node:<< Lese >> int SpracheDefinition::Lese(PersistenzManager* pm, const std::string& id) { std::string geleseneID = id; --- 55,60 ---- //@ << SpracheDefinition >> //@+node:<< SpracheDefinition >> ! //@+others ! //@+node:Lese int SpracheDefinition::Lese(PersistenzManager* pm, const std::string& id) { std::string geleseneID = id; *************** *** 80,87 **** } // Lese //@nonl ! //@-node:<< Lese >> ! //@nl ! //@<< Schreibe >> ! //@+node:<< Schreibe >> int SpracheDefinition::Schreibe(PersistenzManager* pm) const { int rv = pm->OeffneZumSchreiben(Klasse(), ID()); --- 80,85 ---- } // Lese //@nonl ! //@-node:Lese ! //@+node:Schreibe int SpracheDefinition::Schreibe(PersistenzManager* pm) const { int rv = pm->OeffneZumSchreiben(Klasse(), ID()); *************** *** 94,101 **** } // Schreibe //@nonl ! //@-node:<< Schreibe >> ! //@nl ! //@<< Pruefe >> ! //@+node:<< Pruefe >> int SpracheDefinition::Pruefe() const { int rv = 0; --- 92,97 ---- } // Schreibe //@nonl ! //@-node:Schreibe ! //@+node:Pruefe int SpracheDefinition::Pruefe() const { int rv = 0; *************** *** 108,122 **** } // Pruefe //@nonl ! //@-node:<< Pruefe >> ! //@nl ! //@<< IDListe >> ! //@+node:<< IDListe >> int SpracheDefinition::IDListe(PersistenzManager* pm, StringListe* liste) { return pm->IDListe(Klasse(), liste); // TODO Prüfen } // IDListe //@nonl ! //@-node:<< IDListe >> ! //@nl ! //@-node:<< SpracheDefinition >> //@nl --- 104,141 ---- } // Pruefe //@nonl ! //@-node:Pruefe ! //@+node:IDListe int SpracheDefinition::IDListe(PersistenzManager* pm, StringListe* liste) { return pm->IDListe(Klasse(), liste); // TODO Prüfen } // IDListe //@nonl ! //@-node:IDListe ! //@+node:Execute ! std::string SpracheDefinition::Execute(const std::string& cmd) { ! if ("sktplus"==cmd) { ! SKTSpalte_(SpalteSchwerer(SKTSpalte_())); ! return ""; ! } ! if ("sktminus"==cmd) { ! SKTSpalte_(SpalteLeichter(SKTSpalte_())); ! return ""; ! } ! return _t("Unbekannte Befehl"); ! } ! //@nonl ! //@-node:Execute ! //@+node:Return ! std::string SpracheDefinition::Return(const std::string& request) const { ! // if (""==request) return Text(); ! if ("name"==request) return ID(); ! if ("familie"==request) return Familie(); ! if ("komplexitaet"==request) return strings::int2sStr(Komplexitaet()); ! if ("skt"==request) return SKTSpalteString(SKTSpalte_()); ! if ("beschreibung"==request) return Beschreibung(); ! return _t("Unbekannte Abfrage"); ! } ! //@-node:Return ! //@-others ! //@nonl //@-node:<< SpracheDefinition >> //@nl *************** *** 420,423 **** --- 439,445 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.10 2004/04/17 15:06:01 vrandezo + // um Execute und Return erweitert + // // Revision 1.9 2004/04/13 14:06:52 vrandezo // Hauszauber implementiert Index: SpracheSchrift.h =================================================================== RCS file: /cvsroot/darkeyetool/det/src/dsa/SpracheSchrift.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SpracheSchrift.h 13 Apr 2004 14:06:52 -0000 1.8 --- SpracheSchrift.h 17 Apr 2004 15:06:01 -0000 1.9 *************** *** 79,82 **** --- 79,85 ---- // std::string Text() const; + + std::string Execute(const std::string& cmd); + std::string Return(const std::string& request) const; int Lese(PersistenzManager* pm, const std::string& id = ""); *************** *** 253,256 **** --- 256,262 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.9 2004/04/17 15:06:01 vrandezo + // um Execute und Return erweitert + // // Revision 1.8 2004/04/13 14:06:52 vrandezo // Hauszauber implementiert Index: Menge.h =================================================================== RCS file: /cvsroot/darkeyetool/det/src/dsa/Menge.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Menge.h 13 Apr 2004 21:45:45 -0000 1.13 --- Menge.h 17 Apr 2004 15:06:01 -0000 1.14 *************** *** 57,260 **** void ID(const std::string& id) { id_ = id; } ! //@ << Lese >> ! //@+node:<< Lese >> ! int Lese(PersistenzManager* pm, const std::string& id = "") { ! int rv = 0; ! std::string geleseneID = id; ! clear(); ! bool zumLesenGeoeffnet = (pm->OeffneZumLesen(T::Klassen(), geleseneID) == 0); ! ! StringListe* s = new StringListe(); ! rv += pm->IDListe(T::Klasse(), s); ! T t; ! for (StringListe::const_iterator i = s->begin(); i != s->end(); ++i) { ! int rv0 = t.Lese(pm, *i); ! if (rv0 == 0) rv += FuegeEin(t) ? 0 : 1; ! rv += rv0; ! } ! delete s; ! ! if (zumLesenGeoeffnet) rv += pm->SchliesseNachLesen(); ! ID(geleseneID); ! return rv; // TODO ! // TODO Auf diese Art und Weise dauert das Lesen von Mengen O(n²), es kann aber ! // auf O(n) runtergedrückt werden, indem nicht zuerst die Stringliste gelesen ! // wird und dann Stück für Stück jedes Objekt einzeln, sondern indem die ! // Objekte linear reingelesen werden. Dies bedarf engerer Zusammenarbeit mit ! // dem Persistenzmanager, kann aber bedeutende Geschwindigkeitserhöhung beim ! // Datenlesen bringen ! } // Lese ! //@nonl ! //@-node:<< Lese >> ! //@nl ! //@ << Schreibe >> ! //@+node:<< Schreibe >> ! int Schreibe(PersistenzManager* pm) const { // TODO Mengen mit ID ! int rv = 0; ! if (empty()) { ! if (pm->Existiert(T::Klassen(), ID())) ! rv += pm->Loesche(T::Klassen(), ID()); ! return rv; } ! ! rv += pm->OeffneZumSchreiben(T::Klassen(), ID()); ! StringListe s; ! rv += pm->IDListe(T::Klasse(), s); ! for (typename StringListe::const_iterator i = s.begin(); i != s.end(); ++i) ! if (!Existiert(*i)) ! rv += pm->Loesche(T::Klasse(), *i); ! for (typename DSA::Menge<T>::const_iterator t = begin(); t != end(); ++t) { ! rv += t->second.Schreibe(pm); ! } ! ! rv += pm->SchliesseNachSchreiben(); ! ! return rv; // TODO ! } // Schreibe ! //@nonl ! //@-node:<< Schreibe >> ! //@nl ! //@ << Pruefe >> ! //@+node:<< Pruefe >> ! int Pruefe() const { ! int rv = 0; ! for (typename DSA::Menge<T>::const_iterator i = begin(); i != end(); ++i) ! rv += i->second.Pruefe(); ! return rv; ! } // Pruefe ! //@nonl ! //@-node:<< Pruefe >> ! //@nl ! //@ << IDListe >> ! //@+node:<< IDListe >> ! static int IDListe(PersistenzManager* pm, StringListe* liste) { ! //return pm->IDListe(Texte::?, liste); // TODO Prüfen ! Log::Error("Menge<" + T::Klasse() + ">::IDListe " + _t("nicht implementiert")); ! return 1; // TODO ! } // IDListe ! //@nonl ! //@-node:<< IDListe >> ! //@nl ! ! //@ << FuegeEin >> ! //@+node:<< FuegeEin >> ! // gibt false zurück, sofern die t schon existierte ! // TODO: virtual wegen Voraussetzungen. Sollte dann entfernt werden, wenn die ! // Voraussetzungen wieder richtig tun ! virtual bool FuegeEin(T t) { ! return insert(std::pair<std::string, T>(t.ID(), t)).second; ! } // FuegeEin ! //@nonl ! //@-node:<< FuegeEin >> ! //@nl ! bool Existiert(const std::string& id) const { return find(id)!=end(); } ! //@ << Loesche >> ! //@+node:<< Loesche >> ! bool Loesche(const std::string& id) { ! typename DSA::Menge<T>::iterator i = find(id); ! if (i==end()) return false; ! erase(i); ! return true; ! } // Loesche ! //@nonl ! //@-node:<< Loesche >> ! //@nl ! ! //@ << Hole >> ! //@+node:<< Hole >> ! // gibt ein leeres T zurück, wenn die jeweilige nicht vorhanden ist ! T Hole(const std::string& id) const { ! T t; ! if (Existiert(id)) t = find(id)->second; ! return t; ! } // Hole(id) ! ! // gibt ein leeres T zurück, wenn die jeweilige nicht vorhanden ist ! // ansonsten alphabetisch sortiert ! T Hole(int pos) const { ! T t; ! if (pos<0) return t; ! if (size()<=pos) return t; ! typename DSA::Menge<T>::const_iterator i = begin(); ! for (; pos-->0; ++i); ! return i->second; ! } // Hole(pos) ! //@-node:<< Hole >> ! //@nl ! //@ << Zeige >> ! //@+node:<< Zeige >> ! // zeigt auf das entsprechende T oder aber auf 0, sofern T nicht vorhanden ! T* Zeige(const std::string& id) { ! T* pt = 0; ! if (Existiert(id)) pt = &(find(id)->second); ! return pt; ! } // Zeige ! ! const T* const Zeige(const std::string& id) const { ! const T* pt = 0; ! if (Existiert(id)) pt = &(find(id)->second); ! return pt; ! } // Zeige ! ! // zeigt auf das entsprechende T oder aber auf 0, sofern T nicht vorhanden ! T* Zeige(int pos) { ! T* pt = 0; ! if (pos<0) return pt; ! if (size()<=pos) return pt; ! typename DSA::Menge<T>::iterator i = begin(); ! for (; pos-->0; ++i); ! return &(i->second); ! } // Zeige ! ! // zeigt auf das entsprechende T oder aber auf 0, sofern T nicht vorhanden ! const T* Zeige(int pos) const { ! T* pt = 0; ! if (pos<0) return pt; ! if (size()<=pos) return pt; ! typename DSA::Menge<T>::const_iterator i = begin(); ! for (; pos-->0; ++i); ! return &(i->second); ! } // Zeige ! //@nonl ! //@-node:<< Zeige >> ! //@nl ! ! //@ << Text >> ! //@+node:<< Text >> ! std::string Text(const std::string& trennzeichen = ", ", const std::string& wennleer = "-") const { ! if (size()==0) return wennleer; ! std::string s = ""; ! for (typename DSA::Menge<T>::const_iterator i = begin(); i != end(); ++i) { ! if (i != begin()) s += trennzeichen; ! s += i->second.Text(); } ! return s; ! } // Text ! //@nonl ! //@-node:<< Text >> ! //@nl ! //@ << Ersetze Tag >> ! //@+node:<< Ersetze Tag >> ! std::string ErsetzeTag(const std::string& tag) const { ! if ("l"==tag) return Text(); ! if ("Anzahl"==tag) return strings::int2sStr(size()); ! std::string nummer = ""; ! int i; ! for (i = 0; i != tag.size(); ++i) { ! if (isdigit(tag[i])) nummer += tag[i]; else break; ! } ! int pos = strings::sStr2int(nummer)-1; ! std::string subtag = tag.substr(i, tag.size()-i); ! std::string rv = ""; // ein Zeichen, was in keinem Tag sein kann ! if (size()>pos) ! rv = Zeige(pos)->ErsetzeTag(subtag); ! else ! return ""; ! if (rv==subtag) return tag; else return rv; ! } // ErsetzeTag ! //@nonl ! //@-node:<< Ersetze Tag >> ! //@nl ! protected: std::string id_; --- 57,262 ---- void ID(const std::string& id) { id_ = id; } ! //@ @+others ! //@+node:Lese ! int Lese(PersistenzManager* pm, const std::string& id = "") { ! int rv = 0; ! std::string geleseneID = id; ! clear(); ! bool zumLesenGeoeffnet = (pm->OeffneZumLesen(T::Klassen(), geleseneID) == 0); ! ! StringListe* s = new StringListe(); ! rv += pm->IDListe(T::Klasse(), s); ! T t; ! for (StringListe::const_iterator i = s->begin(); i != s->end(); ++i) { ! int rv0 = t.Lese(pm, *i); ! if (rv0 == 0) rv += FuegeEin(t) ? 0 : 1; ! rv += rv0; ! } ! delete s; ! ! if (zumLesenGeoeffnet) rv += pm->SchliesseNachLesen(); ! ID(geleseneID); ! return rv; // TODO ! // TODO Auf diese Art und Weise dauert das Lesen von Mengen O(n²), es kann aber ! // auf O(n) runtergedrückt werden, indem nicht zuerst die Stringliste gelesen ! // wird und dann Stück für Stück jedes Objekt einzeln, sondern indem die ! // Objekte linear reingelesen werden. Dies bedarf engerer Zusammenarbeit mit ! // dem Persistenzmanager, kann aber bedeutende Geschwindigkeitserhöhung beim ! // Datenlesen bringen ! } // Lese ! //@nonl ! //@-node:Lese ! //@+node:Schreibe ! int Schreibe(PersistenzManager* pm) const { // TODO Mengen mit ID ! int rv = 0; ! if (empty()) { ! if (pm->Existiert(T::Klassen(), ID())) ! rv += pm->Loesche(T::Klassen(), ID()); ! return rv; ! } ! ! rv += pm->OeffneZumSchreiben(T::Klassen(), ID()); ! StringListe s; ! rv += pm->IDListe(T::Klasse(), s); ! for (typename StringListe::const_iterator i = s.begin(); i != s.end(); ++i) ! if (!Existiert(*i)) ! rv += pm->Loesche(T::Klasse(), *i); ! for (typename DSA::Menge<T>::const_iterator t = begin(); t != end(); ++t) { ! rv += t->second.Schreibe(pm); ! } ! ! rv += pm->SchliesseNachSchreiben(); ! ! return rv; // TODO ! } // Schreibe ! //@nonl ! //@-node:Schreibe ! //@+node:Pruefe ! int Pruefe() const { ! int rv = 0; ! for (typename DSA::Menge<T>::const_iterator i = begin(); i != end(); ++i) ! rv += i->second.Pruefe(); ! return rv; ! } // Pruefe ! //@nonl ! //@-node:Pruefe ! //@+node:IDListe ! static int IDListe(PersistenzManager* pm, StringListe* liste) { ! //return pm->IDListe(Texte::?, liste); // TODO Prüfen ! Log::Error("Menge<" + T::Klasse() + ">::IDListe " + _t("nicht implementiert")); ! return 1; // TODO ! } // IDListe ! //@nonl ! //@-node:IDListe ! //@+node:FuegeEin ! // gibt false zurück, sofern die t schon existierte ! // TODO: virtual wegen Voraussetzungen. Sollte dann entfernt werden, wenn die ! // Voraussetzungen wieder richtig tun ! virtual bool FuegeEin(T t) { ! return insert(std::pair<std::string, T>(t.ID(), t)).second; ! } // FuegeEin ! //@nonl ! //@-node:FuegeEin ! //@+node:Existiert ! bool Existiert(const std::string& id) const { return find(id)!=end(); } ! //@nonl ! //@-node:Existiert ! //@+node:Loesche ! bool Loesche(const std::string& id) { ! typename DSA::Menge<T>::iterator i = find(id); ! if (i==end()) return false; ! erase(i); ! return true; ! } // Loesche ! //@nonl ! //@-node:Loesche ! //@+node:Hole ! // gibt ein leeres T zurück, wenn die jeweilige nicht vorhanden ist ! T Hole(const std::string& id) const { ! T t; ! if (Existiert(id)) t = find(id)->second; ! return t; ! } // Hole(id) ! ! // gibt ein leeres T zurück, wenn die jeweilige nicht vorhanden ist ! // ansonsten alphabetisch sortiert ! T Hole(int pos) const { ! T t; ! if (pos<0) return t; ! if (size()<=pos) return t; ! typename DSA::Menge<T>::const_iterator i = begin(); ! for (; pos-->0; ++i); ! return i->second; ! } // Hole(pos) ! //@-node:Hole ! //@+node:Zeige ! // zeigt auf das entsprechende T oder aber auf 0, sofern T nicht vorhanden ! T* Zeige(const std::string& id) { ! T* pt = 0; ! if (Existiert(id)) pt = &(find(id)->second); ! return pt; ! } // Zeige ! ! const T* const Zeige(const std::string& id) const { ! const T* pt = 0; ! if (Existiert(id)) pt = &(find(id)->second); ! return pt; ! } // Zeige ! ! // zeigt auf das entsprechende T oder aber auf 0, sofern T nicht vorhanden ! T* Zeige(int pos) { ! T* pt = 0; ! if (pos<0) return pt; ! if (size()<=pos) return pt; ! typename DSA::Menge<T>::iterator i = begin(); ! for (; pos-->0; ++i); ! return &(i->second); ! } // Zeige ! ! // zeigt auf das entsprechende T oder aber auf 0, sofern T nicht vorhanden ! const T* Zeige(int pos) const { ! T* pt = 0; ! if (pos<0) return pt; ! if (size()<=pos) return pt; ! typename DSA::Menge<T>::const_iterator i = begin(); ! for (; pos-->0; ++i); ! return &(i->second); ! } // Zeige ! //@nonl ! //@-node:Zeige ! //@+node:Text ! std::string Text(const std::string& trennzeichen = ", ", const std::string& wennleer = "-") const { ! if (size()==0) return wennleer; ! std::string s = ""; ! for (typename DSA::Menge<T>::const_iterator i = begin(); i != end(); ++i) { ! if (i != begin()) s += trennzeichen; ! s += i->second.Text(); ! } ! return s; ! } // Text ! //@nonl ! //@-node:Text ! //@+node:Ersetze Tag ! std::string ErsetzeTag(const std::string& tag) const { ! if ("l"==tag) return Text(); ! if ("Anzahl"==tag) return strings::int2sStr(size()); ! std::string nummer = ""; ! int i; ! for (i = 0; i != tag.size(); ++i) { ! if (isdigit(tag[i])) nummer += tag[i]; else break; ! } ! int pos = strings::sStr2int(nummer)-1; ! std::string subtag = tag.substr(i, tag.size()-i); ! std::string rv = ""; // ein Zeichen, was in keinem Tag sein kann ! if (size()>pos) ! rv = Zeige(pos)->ErsetzeTag(subtag); ! else ! return ""; ! if (rv==subtag) return tag; else return rv; ! } // ErsetzeTag ! //@nonl ! //@-node:Ersetze Tag ! //@+node:Execute ! std::string Execute(const std::string& cmd) { ! if (cmd[0]=='(') ! return ""; ! // etc. ! return _t("Unbekannter Befehl"); } ! //@nonl ! //@-node:Execute ! //@+node:Return ! std::string Return(const std::string& request) const { ! if (request[0]=='(') ! return ""; // TODO ! if (request=="anzahl()") ! return strings::int2sStr(size()); ! ! return _t("Unbekannte Abfrage"); } ! //@nonl ! //@-node:Return ! //@-others ! protected: std::string id_; *************** *** 528,531 **** --- 530,536 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.14 2004/04/17 15:06:01 vrandezo + // um Execute und Return erweitert + // // Revision 1.13 2004/04/13 21:45:45 vrandezo // Akademische Ausbildung (Magier) implementiert |
From: Denny V. <vra...@us...> - 2004-04-17 14:59:51
|
Update of /cvsroot/darkeyetool/det/bin/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14724 Added Files: dsa4gui.html dsa4info.html dsa4sprachen.html dsa4sprachen2.html dsa4sprachen3.html Log Message: diese Beispiele sind wirklich noch nicht Vorzeigefertig und weit von dem Ziel entfernt --- NEW FILE: dsa4info.html --- <html> <head> <title> DSA4 Werkzeug - Info </title> <body> <p>Dies ist eine Testversion, um zu sehen, ob auch alles tut, wie es sollte. Keineswegs wird die Standardoberfläche später auch so langweilig aussehen wie just in diesem Moment, aber, wie stets, will ich gerne zuerst die Technologie testen, bevor ich sie verschönere - was ihr übrigens aucht tun könnt, wenn Ihr wollt und etwas HTML könnt: ändert einfach die Datei <em>dsa4gui.html</em> im Verzeichnis <em>bin/gui</em> eures DSA4 Werkzeug Verzeichnisses. Ihr müsst das DSA4 Werkzeug nicht mal neu Starten! Einfach Fenster schließen und wieder aufmachen - fertig. Probiert's aus! Jetzt gleich!</p> <p align="right"><a href="dsa4gui.html"><em>zurück zum Hauptfenster</em></a><p> </html> --- NEW FILE: dsa4sprachen.html --- <html> <head> <title> Sprachen </title> <body> <table> <tr> <td> <h6>Liste der Sprachen</h6> <strong>XXX</strong><br> <a href="dsa4sprachen2.html">XXX</a><br> <a href="dsa4sprachen3.html">XXX</a> </td> <td> <h1>°dsa4/sprachen()/name°</h1> SKT-Spalte: °dsa4/sprachen()/skt° <a href="http://dsa4/sprachen()/sktplus">+</a> <a href="http://dsa4/sprachen()/sktminus">-</a><br> <br> °dsa4/sprachen()/beschreibung°<br> </td> </table> <p align="center"><a href="dsa4gui.html">zurück zum Hauptfenster</a></p> <p align="right"><a href="http://www.nodix.de">Zu Nodix</a></p> </body> </html> --- NEW FILE: dsa4sprachen3.html --- <html> <head> <title> Sprachen </title> <body> <table> <tr> <td> <h6>Liste der Sprachen</h6> <a href="dsa4sprachen.html">XXX</a><br> <a href="dsa4sprachen2.html">XXX</a><br> <strong>XXX</strong> </td> <td> Beschreibung der Sprache<br> SKT-Spalte: XXX<br> SKT-Spalte wechseln </td> </table> <p align="center"><a href="dsa4gui.html">zurück zum Hauptfenster</a></p> </body> </html> --- NEW FILE: dsa4gui.html --- <html> <head> <title> DSA4 Werkzeug </title> <body> <p align="right"><a href="dsa4info.html"><em>Info</em></a><p> <em><strong>Willkommen zur neuen Benutzeroberfläche des DSA4 Werkzeug!</strong></em> <p>Es sind °dsa4/sprachen/anzahl()° Sprachen geladen worden.</p> <p align="center"> <a href="dsa4sprachen.html"> Bearbeite Sprachen </a> </p> </html> --- NEW FILE: dsa4sprachen2.html --- <html> <head> <title> Sprachen </title> <body> <table> <tr> <td> <h6>Liste der Sprachen</h6> <a href="dsa4sprachen.html">XXX</a><br> <strong>XXX</strong><br> <a href="dsa4sprachen3.html">XXX</a> </td> <td> Beschreibung der Sprache<br> SKT-Spalte: XXX<br> SKT-Spalte wechseln </td> </table> <p align="center"><a href="dsa4gui.html">zurück zum Hauptfenster</a></p> </body> </html> |
From: Denny V. <vra...@us...> - 2004-04-17 14:58:55
|
Update of /cvsroot/darkeyetool/det/bin/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14569/gui Log Message: Directory /cvsroot/darkeyetool/det/bin/gui added to the repository |
From: Denny V. <vra...@us...> - 2004-04-17 14:58:37
|
Update of /cvsroot/darkeyetool/det/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14529/bin Log Message: Directory /cvsroot/darkeyetool/det/bin added to the repository |
Update of /cvsroot/darkeyetool/det/src/guihtml/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14417 Added Files: back24.xpm back24_d.xpm forward24.xpm forward24_d.xpm refresh24.xpm refresh24_d.xpm stop24.xpm stop24_d.xpm Log Message: Test der neuen GUI (die meisten der Files werden wieder rausfliegen, aber fuer den Test mache ich es mir einfach) --- NEW FILE: stop24_d.xpm --- /* XPM */ static char * stop24_d_xpm[] = { "24 24 16 1", " c None", ". c #949494", "+ c #9C9C9C", "@ c #A5A5A5", "# c #ADADAD", "$ c #B5B5B5", "% c #BDBDBD", "& c #C6C6C6", "* c #CECECE", "= c #D6D6D6", "- c #DEDEDE", "; c #E7E7E7", "> c #EFEFEF", ", c #F7F7F7", "' c #FF00FF", ") c #FFFFFF", " ...++... ", " .+#%&&&%$@+. ", " .+$&--;;-=*&$@.. ", " .+%->>;-==**&&$#+. ", " .@&->;=&%%$$%$$$#@+. ", " +%->-&%$$#$#$#####@. ", " .$=>=%$%$#$$##$###@@@. ", " +&;-%$-)*$###&,;#@#@@. ", ".#*-&$%)))*##&,))%@@@@+.", ".%==$$#*)))*%,))=@@@@@+.", ".%*&$$#$*,)),))*@@@@+@@.", "+%&%#$$##&,)))*@@@+@@@++", "+$%$$####%,)))&+@@@+@@@.", ".$#$$###%,)))))&+@@@+@@.", ".#$##$#%,))*&,))&@+@@@+.", ".@#$##$,))*@+&)))$@@+@+.", " +#####;)*@@@+&,>#@@@++ ", " .@##@@#%@@+@@+$#+@@+@. ", " .@#@@@@@@@+@@@@@+@@. ", " .+@@@@@+@@@+@@+@@@.. ", " .+@@+@@@+@@@@@+@.. ", " ..+@@+@@@+@+@+.. ", " .++@+@@@+++. ", " ...+.... "}; --- NEW FILE: back24_d.xpm --- /* XPM */ static char * back24_d_xpm[] = { "24 24 19 1", " c None", ". c #7B7B7B", "+ c #848484", "@ c #8C8C8C", "# c #949494", "$ c #9C9C9C", "% c #A5A5A5", "& c #ADADAD", "* c #B5B5B5", "= c #BDBDBD", "- c #C6C6C6", "; c #CECECE", "> c #D6D6D6", ", c #DEDEDE", "' c #E7E7E7", ") c #EFEFEF", "! c #F7F7F7", "~ c #FF00FF", "{ c #FFFFFF", " $$$$$$$$ ", " $$*=-;-=*$@@ ", " $$=>'!))''>-*$@@ ", " $%;)!!',>;;;-=*%@@ ", " $%>!!';-**&****&&$@+ ", " $;!),=======*&&%%%$+ ", " $='!;====,{{;*&&%%%%@. ", " $>)>===-){{{,*&%%%%$$. ", "$*,,====){{{{-*%%%%$$$+.", "$='-=-=){{{)**&&&&%%$$#.", "$->==-!{{{'------=-&$$$.", "$--*&{{{{{{{{{{{{{{{$$$.", "$*=*&{{{{{{{{{{{{{{{$$$.", "$*&&&,{{{{{)!)!))!)'$$#.", "$&&&&&>{{{,*&%%%%$$$$$#.", "$$*&&&$'{{{)*%%$$$$$$$@.", " @&&%&$$'{{{!*%$$$$$$$. ", " @%%%%$$$'{{{>$$$$$$$#. ", " @%%%$$$$'{{*$$$$$$$. ", " @@%%$$$$$$$$$$$$$$+. ", " @@$$$$$$$$$$$$$$+. ", " +.$$$$$$$$$$$#.. ", " +.##$$$$$#.. ", " ........ "}; --- NEW FILE: refresh24_d.xpm --- /* XPM */ static char * refresh24_d_xpm[] = { "24 24 16 1", " c None", ". c #949494", "+ c #9C9C9C", "@ c #A5A5A5", "# c #ADADAD", "$ c #B5B5B5", "% c #BDBDBD", "& c #C6C6C6", "* c #CECECE", "= c #D6D6D6", "- c #DEDEDE", "; c #E7E7E7", "> c #EFEFEF", ", c #F7F7F7", "' c #FF00FF", ") c #FFFFFF", " %$%$%$%$%$%$%@@ ", " &,,,,),,,,,);@&# ", " %),),,,),),,-@&%@ ", " &,,,,),,),,)-@&%## ", " %,),,,),,,),-@%$#@@ ", " %,,),,,),,,,;@@@@@@ ", " %,,),),,),,,>>-&%$. ", " $),,,,),,,,>>;;-&$. ", " $,,),,-@#@*>;#;--*. ", " $,,),-@=,*@*@@;--=. ", " #),,,#=,>>&@#@--==. ", " #,),,#>>>>@#@#-===. ", " #,,),,>>;#@@#@===*. ", " @),,,>>;;;----=***. ", " @,,,>@#@#@--===***. ", " @>,>>@#@#--==@=**&. ", " @>>>;#@#%=-=$@***&. ", " +>>>;@#%@$=###&***. ", " +;>;;@--$#@#@**&**. ", " @;;;;---==****&***. ", " +;;;--===***&**&**. ", " +;;---===*********. ", " ++++++++++++++++++. ", " "}; --- NEW FILE: forward24_d.xpm --- /* XPM */ static char * forward24_d_xpm[] = { "24 24 19 1", " c None", ". c #7B7B7B", "+ c #848484", "@ c #8C8C8C", "# c #949494", "$ c #9C9C9C", "% c #A5A5A5", "& c #ADADAD", "* c #B5B5B5", "= c #BDBDBD", "- c #C6C6C6", "; c #CECECE", "> c #D6D6D6", ", c #DEDEDE", "' c #E7E7E7", ") c #EFEFEF", "! c #F7F7F7", "~ c #FF00FF", "{ c #FFFFFF", " $$$$$$$$ ", " $$*=-;-=*$@@ ", " $$=>'!))),>-*$@@ ", " $%;)!!',>;;;;=*%@@ ", " $%>!!'>=**&*&**&&%@. ", " $;!!>========&&%%%$+ ", " $=')>===-=;{{>&&%%%%@. ", " $>)>*-===='{{{'%%%%$$. ", "$*,'=======-{{{{'%%$$$@.", "$=,;===-=*=*=){{{'%&$$#.", "$->==->;;;;;-='{{{)&$$$.", "$--**{{{{{{{{{{{{{{!$$$.", "$*=*&{{{{{{{{{{{{{{{$$$.", "$*&&*'!!!!!!)!{{{{{-$$$.", "$&&&&&***&&&&*>{{{-$$$#.", "$$*&&&%&&&&%*){{{'$$$$@.", " @&&%&&&&&%=!{{{'$$$$$. ", " @%%%%%%%%%>{{{'$$$$$@. ", " @%%%$$$$%*{{'$$$$$$. ", " @@%%$$$%$$$$$$$$$$+. ", " @@$$$$$$$$$$$$$$+. ", " ++#$$$$$$$$$$#.. ", " +.#$$$$$$#.. ", " ........ "}; --- NEW FILE: refresh24.xpm --- /* XPM */ static char * refresh24_xpm[] = { "24 24 91 1", " c None", ". c #007300", "+ c #218CEF", "@ c #31A5F7", "# c #3994E7", "$ c #4A5284", "% c #4A9CDE", "& c #52A5EF", "* c #52ADEF", "= c #5A5A8C", "- c #5A6394", "; c #5A63A5", "> c #636394", ", c #636B9C", "' c #6373A5", ") c #63ADAD", "! c #6B6BA5", "~ c #6B73A5", "{ c #6B7BAD", "] c #6B7BB5", "^ c #6B84B5", "/ c #6B84BD", "( c #6B8CC6", "_ c #6B8CCE", ": c #6BA5DE", "< c #6BB5B5", "[ c #738CC6", "} c #7394CE", "| c #739CD6", "1 c #73B5EF", "2 c #73BDB5", "3 c #7B94A5", "4 c #7BBDB5", "5 c #7BBDE7", "6 c #7BBDEF", "7 c #8494A5", "8 c #84BDE7", "9 c #84BDEF", "0 c #84C6EF", "a c #8C9CA5", "b c #8CC6EF", "c c #94B5C6", "d c #94B5CE", "e c #94C6B5", "f c #94C6EF", "g c #94CEEF", "h c #9CADBD", "i c #9CCEB5", "j c #9CCEEF", "k c #9CCEF7", "l c #A5CEEF", "m c #A5CEF7", "n c #A5D6EF", "o c #A5D6F7", "p c #ADCEE7", "q c #ADD6BD", "r c #ADD6F7", "s c #B5C6DE", "t c #B5D6EF", "u c #B5D6F7", "v c #B5DEBD", "w c #B5DEF7", "x c #BDC6DE", "y c #BDD6E7", "z c #BDD6EF", "A c #BDDEF7", "B c #C6C6DE", "C c #C6D6EF", "D c #C6DEEF", "E c #C6DEF7", "F c #C6E7F7", "G c #CED6E7", "H c #CEDEF7", "I c #CEE7F7", "J c #CEE7FF", "K c #D6E7F7", "L c #D6E7FF", "M c #D6EFFF", "N c #DEE7F7", "O c #DEEFF7", "P c #DEEFFF", "Q c #E7EFF7", "R c #E7EFFF", "S c #E7F7FF", "T c #EFEFF7", "U c #EFF7FF", "V c #EFFFFF", "W c #F7F7FF", "X c #F7FFFF", "Y c #FF00FF", "Z c #FFFFFF", " _____________;! ", " |ZZXZZZXZZZXG-1! ", " |WZZZZZZZZZZB;1&! ", " |WZZZZZZZZWXx-1&@! ", " }WZZZZZZZXTVs;:%#+! ", " }TZZZZZZXUQQy;,;-;- ", " [UZZZZZXWQQKKIyha7$ ", " /WZZZZXWQQKKEEzpc3$ ", " /TZZZXv...iHE.ttld$ ", " ^WZZWv.qKi.e..rllf$ ", " {WZXU.qKKEe...lljf$ ", " {TZUT.KKHE....ljf8$ ", " ~TXQQKKID.....fff8$ ", " 'QUQKKEDAttllfff88$ ", " ,NQNI.....lljff885$ ", " ,KOKH....lljf.8855$ ", " >HKID...4ljf<.8595$ ", " >DIEA..4.<f).)5855$ ", " >DEAt.ll2...)58685$ ", " -zEttlljff88585558$ ", " >tzrlljff885868595$ ", " -turljgf0895959505$ ", " -=========-==-====$ ", " "}; --- NEW FILE: stop24.xpm --- /* XPM */ static char * stop24_xpm[] = { "24 24 109 2", " c None", ". c #9C0000", "+ c #A50000", "@ c #A50800", "# c #A51000", "$ c #AD0800", "% c #AD1000", "& c #B50800", "* c #B51000", "= c #B51800", "- c #BD1000", "; c #BD2100", "> c #C62100", ", c #C62900", "' c #C63100", ") c #CE2100", "! c #CE2900", "~ c #CE3100", "{ c #CE4218", "] c #CE4221", "^ c #D62108", "/ c #D62900", "( c #D62910", "_ c #D63100", ": c #D63910", "< c #D65A39", "[ c #D66342", "} c #D67B5A", "| c #DE2900", "1 c #DE3100", "2 c #DE3110", "3 c #DE3910", "4 c #DE6B4A", "5 c #DE735A", "6 c #DE7B5A", "7 c #DE8463", "8 c #E72100", "9 c #E72900", "0 c #E73100", "a c #E73908", "b c #E73918", "c c #E74218", "d c #E74A21", "e c #E76342", "f c #E78C73", "g c #E7947B", "h c #EF2100", "i c #EF2900", "j c #EF3100", "k c #EF3908", "l c #EF4A18", "m c #EF5A39", "n c #EF6342", "o c #EF947B", "p c #F72900", "q c #F73100", "r c #F73908", "s c #F74210", "t c #F74218", "u c #F74A21", "v c #F75229", "w c #F75A31", "x c #F77352", "y c #F77B5A", "z c #F7BDAD", "A c #F7C6B5", "B c #F7D6CE", "C c #FF00FF", "D c #FF2900", "E c #FF3100", "F c #FF3108", "G c #FF3900", "H c #FF3908", "I c #FF3910", "J c #FF4210", "K c #FF4218", "L c #FF4A18", "M c #FF4A21", "N c #FF5221", "O c #FF5229", "P c #FF5A29", "Q c #FF6339", "R c #FF6342", "S c #FF6B42", "T c #FF7352", "U c #FF7B5A", "V c #FF7B63", "W c #FF8463", "X c #FF8C6B", "Y c #FF9473", "Z c #FF947B", "` c #FF9C84", " . c #FFA58C", ".. c #FFA594", "+. c #FFAD94", "@. c #FFAD9C", "#. c #FFB5A5", "$. c #FFBDAD", "%. c #FFC6B5", "&. c #FFC6BD", "*. c #FFCEBD", "=. c #FFCEC6", "-. c #FFD6CE", ";. c #FFDECE", ">. c #FFEFE7", ",. c #FFEFEF", "'. c #FFF7EF", "). c #FFF7F7", "!. c #FFFFFF", " . . . % $ + . . ", " . * : v Q R Q v c ^ % . ", " . @ c x ` #.z #.@.` W w t / @ . ", " . = w ` &.-.%.@.Z X W V x P s 0 # . ", " . = R ..B %.Z S v t s I s u t k a 1 # . ", " @ w ..-.+.S t r E G q r q j k 0 a 1 _ . ", " . b Z *. .v r N q q r E q j d a 1 1 2 ~ , . ", " * S z .v F ..'.W p q r 9 n >.z 3 _ _ ~ ' # ", ". ( X @.S r u !.!.).W i i n >.!.!.[ _ : ' ' = . ", ". u Y X t q E y ).!.!.x m >.!.!.g _ ' ' ' ' ' . ", ". v W R r E q p y ).!.).,.!.!.g ! ' ' ' ' ' ' . ", "% u S u G q r q i x ,.!.!.).f , ~ ' ' ' ' ' ' # ", "% s M r r q r 0 9 m >.!.!.).6 > ' ' ' ' ' { ; # ", ". r r F q k j 9 e >.!.!.).!.!.7 ; ' ' ' ' ; ' . ", ". 0 q r j j 9 e >.!.!.f 5 ).!.!.7 ; ' ' { ' ' . ", ". > r j k 0 d ,.!.!.g , ; } ).!.!.[ ' ' ; ' = . ", " # j 0 a 1 3 A !.g , ' ' ; } ).B ] ' ' ' ' # ", " . , a 1 _ _ : [ ' ' ' ' ' , [ ] ; ' ' ' ; . ", " @ / : _ ~ ~ ' ' ' ' ' ' ' ' ' ' ' ' ' . ", " . # ~ : ' ' ' ' ' ' ' ' ' ' ' ' ' ' # . ", " . # , ' ' ' ' ' ' ' ' ' ' ' ' ' # . ", " . . ; ' ' ' ' ' ' { ; { ; ; . . ", " . # = ' ' { ; ' ' # # . ", " . . . . # . . . "}; --- NEW FILE: back24.xpm --- /* XPM */ static char * back24_xpm[] = { "24 24 122 2", " c None", ". c #005200", "+ c #086308", "@ c #087300", "# c #087B00", "$ c #108400", "% c #109408", "& c #109C08", "* c #10A508", "= c #188408", "- c #18AD08", "; c #18B508", "> c #18BD08", ", c #218408", "' c #21AD08", ") c #21B508", "! c #21B510", "~ c #21BD08", "{ c #29B510", "] c #29BD10", "^ c #31A510", "/ c #31B510", "( c #31BD10", "_ c #31BD18", ": c #399C18", "< c #39BD18", "[ c #39BD21", "} c #42A521", "| c #42AD18", "1 c #42B518", "2 c #42B529", "3 c #42BD18", "4 c #42BD21", "5 c #42BD29", "6 c #42C618", "7 c #4AA521", "8 c #4AAD21", "9 c #4ABD21", "0 c #4ABD29", "a c #4AC621", "b c #4AC639", "c c #52BD21", "d c #52BD29", "e c #52C621", "f c #52C631", "g c #52C639", "h c #52C642", "i c #5ABD29", "j c #5ABD39", "k c #5AC629", "l c #5AC631", "m c #63BD29", "n c #63BD39", "o c #63BD42", "p c #63C629", "q c #63C639", "r c #63CE4A", "s c #6BC631", "t c #6BC639", "u c #6BC642", "v c #6BC64A", "w c #6BCE39", "x c #6BCE42", "y c #6BCE52", "z c #6BCE5A", "A c #73C639", "B c #73C642", "C c #73C652", "D c #73CE42", "E c #73CE4A", "F c #73CE5A", "G c #7BCE42", "H c #7BCE4A", "I c #7BCE5A", "J c #7BCE63", "K c #7BD663", "L c #84CE52", "M c #84CE5A", "N c #84D663", "O c #84D66B", "P c #8CD65A", "Q c #8CD663", "R c #94D663", "S c #94D66B", "T c #94D673", "U c #94DE8C", "V c #9CD673", "W c #9CDE7B", "X c #A5DE84", "Y c #A5DE8C", "Z c #A5DE94", "` c #ADDE84", " . c #ADDE8C", ".. c #ADDE94", "+. c #ADE7A5", "@. c #B5E794", "#. c #B5E79C", "$. c #B5E7A5", "%. c #B5E7AD", "&. c #BDE79C", "*. c #BDE7AD", "=. c #BDE7B5", "-. c #C6E7AD", ";. c #C6EFAD", ">. c #C6EFB5", ",. c #CEEFB5", "'. c #CEEFBD", "). c #CEEFC6", "!. c #D6EFBD", "~. c #D6EFC6", "{. c #D6EFCE", "]. c #DEEFCE", "^. c #DEF7CE", "/. c #DEF7D6", "(. c #E7F7D6", "_. c #E7F7DE", ":. c #E7F7E7", "<. c #EFF7E7", "[. c #EFFFEF", "}. c #F7FFF7", "|. c #FF00FF", "1. c #FFFFFF", " ; - ; - ; - ; - ", " ; - j I S T Q I n } = = ", " ; - v X -.~.).'.-.&.Y R B : , = ", " ; 2 T ,./.].-.#.X V V T S L t 8 = = ", " ; 2 X ~.].-.V M B s t s t t n i k | = + ", " ; T ~.{. .L L L L L H C B m k 9 4 4 ^ + ", " ; C -.~.X L L L L ..1.1.T u i c 9 4 < _ = . ", " ; X '.` B L L L '.1.1.1.#.u 9 9 4 1 / { ! . ", "; o &.#.L L L L '.1.1.1._.F n 9 4 1 _ { ! ) # . ", "; M #.S L L L '.1.1.1.'.v q j f 0 5 4 [ - ; % . ", "; M X H H M ].1.1.1.$.J J N J J F z z b - ; ' . ", "; M Q A A _.1.1.1.1.:.}.1.1.1.1.1.1.1.<.; - ; . ", "; H H s t 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.- ; - . ", "- t A m s Y 1.1.1.1.:.).~.).).).).).).+.- ; - . ", "; m s m p m Y 1.1.1.Y r 2 [ [ { { ! ! - ; ; & . ", "; 7 s d i d ) =.1.1.<.).h < / - ; - ; - ; ) = . ", " = k d 9 d ) ! %.1.1.1.{.h { - ; - ; - ; - . ", " = } 9 4 3 ' ! ' %.1.1.1.U ! - ; - ; ; ; % . ", " = 4 < / ! ) - ! +.1.[.b ! - ; - ; ; - . ", " = , < { { ! ; ' ; - - - ; - ; - ; ; @ . ", " = = { ; ; - ; - ; ; - ; - ; ; - @ . ", " + + - ; ; ; ; - ; ; ; ; ; * . . ", " + . & - ; ; ; ; - % . . ", " . . . . . . . . "}; --- NEW FILE: forward24.xpm --- /* XPM */ static char * forward24_xpm[] = { "24 24 119 2", " c None", ". c #005200", "+ c #086308", "@ c #087300", "# c #087B00", "$ c #108400", "% c #109408", "& c #109C08", "* c #10A508", "= c #188408", "- c #18AD08", "; c #18B508", "> c #18BD08", ", c #218408", "' c #21AD08", ") c #21B508", "! c #21BD08", "~ c #29B510", "{ c #29BD10", "] c #31A510", "^ c #31B510", "/ c #31BD10", "( c #31BD18", "_ c #399C18", ": c #39BD18", "< c #39BD21", "[ c #39BD29", "} c #42A521", "| c #42AD18", "1 c #42B518", "2 c #42B529", "3 c #42BD18", "4 c #42BD21", "5 c #42C618", "6 c #4AA521", "7 c #4AAD21", "8 c #4ABD21", "9 c #4ABD29", "0 c #4AC621", "a c #4AC629", "b c #52BD21", "c c #52BD29", "d c #52C621", "e c #52C629", "f c #52C631", "g c #52C642", "h c #5ABD29", "i c #5ABD39", "j c #5AC629", "k c #5AC631", "l c #5AC642", "m c #63BD29", "n c #63BD39", "o c #63BD42", "p c #63C629", "q c #63C639", "r c #6BC631", "s c #6BC639", "t c #6BC642", "u c #6BC64A", "v c #6BCE39", "w c #6BCE42", "x c #73C639", "y c #73C642", "z c #73C652", "A c #73CE42", "B c #73CE4A", "C c #73D66B", "D c #7BCE42", "E c #7BCE4A", "F c #7BCE52", "G c #7BCE5A", "H c #7BD663", "I c #84CE52", "J c #84CE5A", "K c #84D65A", "L c #8CD663", "M c #8CD66B", "N c #94D663", "O c #94D66B", "P c #94D673", "Q c #94DE84", "R c #9CD673", "S c #9CD67B", "T c #9CDE7B", "U c #9CDE8C", "V c #A5DE84", "W c #A5DE8C", "X c #ADDE84", "Y c #ADDE8C", "Z c #ADE7A5", "` c #B5E794", " . c #B5E79C", ".. c #B5E7A5", "+. c #BDE79C", "@. c #BDE7A5", "#. c #BDE7AD", "$. c #C6E7AD", "%. c #C6EFAD", "&. c #C6EFB5", "*. c #C6EFBD", "=. c #CEEFB5", "-. c #CEEFBD", ";. c #CEEFC6", ">. c #CEEFCE", ",. c #D6EFBD", "'. c #D6EFC6", "). c #D6EFCE", "!. c #D6F7CE", "~. c #D6F7D6", "{. c #DEEFCE", "]. c #DEF7CE", "^. c #DEF7D6", "/. c #E7F7D6", "(. c #E7F7E7", "_. c #EFFFEF", ":. c #F7FFF7", "<. c #FF00FF", "[. c #FFFFFF", " ; - ; - ; - ; - ", " ; - i G M P L J n } = = ", " ; - u V $.'.'.-.$.+.W N y _ = , ", " ; 2 P =.^.{.$. .S S R P O I s 7 = = ", " ; 2 V '.{.$.S I y x r s r s n k c | = + ", " ; P '.).Y I I F I F E z y m h 8 8 4 ] + ", " ; z $.'.V I F I I F S [.[.W h b 8 4 : ( = . ", " ; V -.X y I I F I E ..[.[.[.#.8 4 1 ^ ~ ~ . ", "; o @. .F I I I E z E J (.[.[.[...1 ( ~ ~ ; # . ", "; J .O I I F F E y y t t *.[.[.[.#.< < - ; % . ", "; J V E E N S S P S M M H G Z [.[.[.;.2 ; ; ' . ", "; J L x x :.[.[.[.[.[.[.[.:.(.[.[.[.[.).; - - . ", "; E E r s [.[.[.[.[.[.[.[.[.[.[.[.[.[.[.- ; ; . ", "- s x m r *.{.).).).).;.'.;.(.[.[.[.[.C - ; - . ", "; m r m m p t n k i 9 9 4 l Q [.[.[.C - - ; & . ", "; 6 r c h c b k f c 9 [ l *.(.[.[.Z - ; - ) = . ", " = j c 8 c h c c 9 [ l ).[.[.[.Z - - ; ; ; . ", " = } 8 4 3 3 4 ^ [ < U [.[.[.Z - ; - ; ; % . ", " = 4 : ^ ) - ) ' ( g _.[.Z - - ; ; ; - . ", " = , : ~ ~ ) ; ' ; - - ; - ; - ; - ; @ . ", " = = ~ ; ; - ; - ; - ; - ; - ; ; @ . ", " + + - ; ; ; ; ; - ; ; ; ; * . . ", " + . & - ; ; ; ; - % . . ", " . . . . . . . . "}; |
Update of /cvsroot/darkeyetool/det/src/guihtml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14218 Added Files: cstmdlg.cpp cstmdlg.h helpers.cpp helpers.h wxMozilla.h wxMozillaBrowser.cpp wxMozillaBrowser.h wxMozillaBrowserChrome.cpp wxMozillaBrowserChrome.h wxMozillaBrowserInterface.h wxMozillaDialogs.cpp wxMozillaDialogs.h wxMozillaEvents.cpp wxMozillaEvents.h wxMozillaSettings.cpp wxMozillaSettings.h wxMozillaWindow.cpp wxMozillaWindow.h Log Message: Test der neuen GUI (die meisten der Files werden wieder rausfliegen, aber fuer den Test mache ich es mir einfach) --- NEW FILE: wxMozillaWindow.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaWindow.h #ifndef __WX_MOZILLA_WINDOW_H__ #define __WX_MOZILLA_WINDOW_H__ /* * wxMozilla * * Developers: * Jeremiah Cornelius McCarthy <jer...@wh...> * Kevin Ollivier <ke...@tu...> * Dave Fancella <dav...@at...> */ //@<< includes >> //@+node:<< includes >> #include "wx/wx.h" #include "wx/frame.h" #include "wx/filedlg.h" #include "wx/image.h" #include "wx/fdrepdlg.h" #include "wx/clipbrd.h" #include "wxMozillaBrowser.h" #include "wxMozillaEvents.h" #undef max #undef min #include <string> #include "dsa/SpracheSchrift.h" //@nonl //@-node:<< includes >> //@nl //@<< class wxMozillaWindow >> //@+node:<< class wxMozillaWindow >> class wxMozillaWindow: public wxFrame { private: DECLARE_DYNAMIC_CLASS(wxMozillaWindow) //wxBoxSizer *VBox; //wxBoxSizer *HBox; bool hasMenu; bool hasToolbar; bool hasStatusbar; wxMozillaBrowser *MozWnd2; wxStaticText *lblAddress; wxButton *GoButton; wxButton *BackButton; wxButton *NextButton; wxButton *StopButton; wxButton *RefreshButton; #if wxUSE_FINDREPLDLG wxFindReplaceDialog *findDlg; wxFindReplaceData *settings; #endif wxTextCtrl *txtURL; //store the event so that you can use its data //when someone clicks on the popup menu. wxString eventURL; wxString eventImage; wxString eventBgImage; wxToolBar *toolbar; wxStatusBar *statusBar; wxMenuBar* appMenuBar; wxMenu* fileMenu; wxMenu* editMenu; wxMenu* viewMenu; wxMenu* toolMenu; //wxMenuItem* stopItem; //wxMenuItem* saveItem; //wxMenuItem* refreshItem; //wxArtProvider *imageList; void NewWindow(wxMenuEvent &myEvent); void OpenNewWindow(wxMenuEvent &myEvent); void Quit(wxMenuEvent &myEvent); void ViewSource(wxMenuEvent &myEvent); void GoClicked(wxEvent &myEvent); void BackClicked(wxEvent &myEvent); void NextClicked(wxEvent &myEvent); void StopLoading(wxEvent &myEvent); void RefreshPage(wxEvent &myEvent); void SaveClicked(wxEvent &myEvent); void Undo(wxEvent &myEvent); void MakeEditable(wxEvent &myEvent); void BoldClicked(wxEvent &myEvent); void DoCopy(wxEvent &myEvent); void SelectAll(wxEvent &myEvent); void SelectNone(wxEvent &myEvent); #if wxUSE_FINDREPLDLG void ShowFindDlg(wxEvent &myEvent); void DoFind(wxFindDialogEvent &myEvent); #endif void OnMozillaRightClick(wxMozillaRightClickEvent &event); //void OnMozillaMouseEvent(wxMozillaMouseEvent &myEvent); void OnMouseDown(wxMouseEvent &myEvent); void UpdateURL(wxMozillaLinkChangedEvent &myEvent); void BeforeLoad(wxMozillaBeforeLoadEvent &myEvent); void UpdateStatus(wxMozillaStatusChangedEvent &myEvent); //determine the state of back and next buttons void UpdateState(wxMozillaStateChangedEvent &myEvent); void OnLoadComplete(wxMozillaLoadCompleteEvent &myEvent); void OnLinkProperties(wxEvent &myEvent); void OnEditLink(wxEvent &myEvent); //void SpellCheck(wxMenuEvent &myEvent); DECLARE_EVENT_TABLE() //@ << DSA Elemente >> //@+node:<< DSA Elemente >> // Private Member der wxMozillaWindow-Klasse std::string DSA4Execute(const std::string&); std::string DSA4Return(const std::string&); std::string DSA4Lade(const std::string&); std::string dateiname; std::string dateitext; DSA::SpracheDefinition sprache; //@-node:<< DSA Elemente >> //@nl public: wxMozillaWindow(wxWindow* parent = 0, bool showMenu = TRUE, bool showToolbar = TRUE, bool showStatusbar = TRUE, bool popupWindow = FALSE); wxMozillaBrowser *Mozilla; }; //@nonl //@-node:<< class wxMozillaWindow >> //@nl #endif //@nonl //@-node:@file wxMozillaWindow.h //@-leo --- NEW FILE: wxMozilla.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozilla.h #ifndef __WX_MOZILLA_H__ #define __WX_MOZILLA_H__ /* * wxWindows Mozilla Component * Copyright 2002 (c) Myers Carpenter. All Rights Reserved. * * Author: Myers Carpenter * Created: April 1, 2002 * Licence: wxWindows License */ /* wxwindow includes */ #include "wx/defs.h" #include "wx/window.h" /* wxMozilla headers */ #include "wxMozillaEvents.h" #include "wxMozillaBrowser.h" #include "wxMozillaSettings.h" #endif //@-node:@file wxMozilla.h //@-leo --- NEW FILE: wxMozillaBrowserInterface.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaBrowserInterface.h /* * wxWindows Mozilla Browser Component * * Developers: * Jeremiah Cornelius McCarthy <jer...@wh...> * Kevin Ollivier <ke...@tu...> * Dave Fancella <dav...@at...> */ // Note: this is private header, to be included only by wxMozilla // implementation! #include "nsICommandManager.h" #include "nsIEditingSession.h" #include "nsIDOMEventReceiver.h" #include "nsIWebBrowserFocus.h" #include "nsIHTMLEditor.h" #include "nsIEditor.h" #include "nsIDOMElement.h" #include "nsIEditorSpellCheck.h" #ifdef __WXMAC__ #include "nsIEventSink.h" #endif struct wxMozillaBrowserInterface { nsCOMPtr<nsIBaseWindow> mBaseWindow; nsCOMPtr<nsIWebBrowser> mWebBrowser; nsCOMPtr<nsIWebNavigation> mWebNav; nsCOMPtr<nsICommandManager> mCommandManager; //for editing, NYI nsCOMPtr<nsIEditingSession> mEditingSession; nsCOMPtr<nsIDOMElement> mSelectedElement; nsCOMPtr <nsIEventQueue> eventQueue; nsCOMPtr<nsIDOMEventReceiver> mEventReceiver; nsCOMPtr<nsIEditorSpellCheck> mSpellChecker; #ifdef __WXMAC__ nsCOMPtr<nsIEventSink> mEventSink; #endif }; //@-node:@file wxMozillaBrowserInterface.h //@-leo --- NEW FILE: wxMozillaBrowserChrome.cpp --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaBrowserChrome.cpp /* * wxMozillaBrowserChrome * Copyright 2001 (c) Jeremiah Cornelius McCarthy. All Rights Reserved. */ //@<< wxMozillaBrowserChrome #includes >> //@+node:<< wxMozillaBrowserChrome #includes >> #include "wx/wxprec.h" //@-node:<< wxMozillaBrowserChrome #includes >> //@nl //@<< wxMozillaBrowserChrome declarations >> //@+node:<< wxMozillaBrowserChrome declarations >> #ifndef WX_PRECOMP #include "wx/wx.h" #endif [...1277 lines suppressed...] keyEvent->GetKeyCode(&thisEvent.m_rawCode); thisEvent.m_keyCode = (int)thisEvent.m_rawCode; //if (mMoz->GetParent()) //{ mMoz->GetEventHandler()->ProcessEvent(thisEvent); //} return NS_OK; } //@-node:KeyPress //@+node:HandleEvent NS_IMETHODIMP wxMozillaBrowserChrome::HandleEvent(nsIDOMEvent *event) { return NS_ERROR_NOT_IMPLEMENTED; } //@-node:HandleEvent //@-others //@-node:@file wxMozillaBrowserChrome.cpp //@-leo --- NEW FILE: wxMozillaEvents.cpp --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaEvents.cpp /* * wxWindows Mozilla Browser Events Component * * Developers: * Jeremiah Cornelius McCarthy <jer...@wh...> * Kevin Ollivier <ke...@tu...> * Dave Fancella <dav...@at...> */ //@<< wxMozillaEvents #includes >> //@+node:<< wxMozillaEvents #includes >> #include "wx/wxprec.h" #include "wxMozilla.h" //@-node:<< wxMozillaEvents #includes >> //@nl //@+others //@+node:IMPLEMENT_DYNAMIC_CLASS IMPLEMENT_DYNAMIC_CLASS( wxMozillaBeforeLoadEvent, wxCommandEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaStateChangedEvent, wxCommandEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaSecurityChangedEvent, wxCommandEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaLoadCompleteEvent, wxCommandEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaLinkChangedEvent, wxCommandEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaStatusChangedEvent, wxCommandEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaTitleChangedEvent, wxCommandEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaProgressEvent, wxCommandEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaRightClickEvent, wxMouseEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaMouseEvent, wxMouseEvent ) IMPLEMENT_DYNAMIC_CLASS( wxMozillaKeyEvent, wxKeyEvent ) /** * @author David Teller <Yo...@us...> * Load status events */ //IMPLEMENT_DYNAMIC_CLASS( wxMozillaLoadEvent, wxCommandEvent) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_BEFORE_LOAD ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_STATE_CHANGED ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_SECURITY_CHANGED ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_LOAD_COMPLETE ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_URL_CHANGED ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_STATUS_CHANGED ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_TITLE_CHANGED ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_PROGRESS ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_RIGHT_CLICK ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_MOUSE_EVENT ) DEFINE_EVENT_TYPE( wxEVT_MOZILLA_KEY_EVENT ) /** * @author David Teller <Yo...@us...> * Load status events */ //DEFINE_EVENT_TYPE( wxEVT_MOZILLA_LOAD_EVENT ) wxMozillaBeforeLoadEvent::wxMozillaBeforeLoadEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_BEFORE_LOAD); SetEventObject( win ); SetId(win->GetId()); } //@-node:IMPLEMENT_DYNAMIC_CLASS //@+node:wxMozillaStateChangedEvent wxMozillaStateChangedEvent::wxMozillaStateChangedEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_STATE_CHANGED); SetEventObject( win ); SetId(win->GetId()); } //@-node:wxMozillaStateChangedEvent //@+node:wxMozillaSecurityChangedEvent wxMozillaSecurityChangedEvent::wxMozillaSecurityChangedEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_SECURITY_CHANGED); SetEventObject( win ); SetId(win->GetId()); } //@-node:wxMozillaSecurityChangedEvent //@+node:wxMozillaLoadCompleteEvent wxMozillaLoadCompleteEvent::wxMozillaLoadCompleteEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_LOAD_COMPLETE); SetEventObject( win ); SetId(win->GetId()); } //@-node:wxMozillaLoadCompleteEvent //@+node:wxMozillaLinkChangedEvent wxMozillaLinkChangedEvent::wxMozillaLinkChangedEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_URL_CHANGED); SetEventObject( win ); SetId(win->GetId()); } //@-node:wxMozillaLinkChangedEvent //@+node:wxMozillaStatusChangedEvent wxMozillaStatusChangedEvent::wxMozillaStatusChangedEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_STATUS_CHANGED); SetEventObject( win ); SetId(win->GetId()); } //@-node:wxMozillaStatusChangedEvent //@+node:wxMozillaTitleChangedEvent wxMozillaTitleChangedEvent::wxMozillaTitleChangedEvent( wxWindow* win ) { SetEventType(wxEVT_MOZILLA_TITLE_CHANGED); SetEventObject(win); SetId(win->GetId()); } //@-node:wxMozillaTitleChangedEvent //@+node:wxMozillaProgressEvent wxMozillaProgressEvent::wxMozillaProgressEvent( wxWindow* win ) { SetEventType(wxEVT_MOZILLA_PROGRESS); SetEventObject(win); SetId(win->GetId()); } //@-node:wxMozillaProgressEvent //@+node:wxMozillaRightClickEvent wxMozillaRightClickEvent::wxMozillaRightClickEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_RIGHT_CLICK); SetEventObject( win ); SetId(win->GetId()); } //@-node:wxMozillaRightClickEvent //@+node:wxMozillaMouseEvent wxMozillaMouseEvent::wxMozillaMouseEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_MOUSE_EVENT); SetEventObject( win ); SetId(win->GetId()); } //@-node:wxMozillaMouseEvent //@+node:wxMozillaKeyEvent wxMozillaKeyEvent::wxMozillaKeyEvent( wxWindow* win ) { SetEventType( wxEVT_MOZILLA_KEY_EVENT); SetEventObject( win ); SetId(win->GetId()); } //@-node:wxMozillaKeyEvent //@-others /** * @author David Teller <Yo...@us...> * Load status events wxMozillaLoadEvent::wxMozillaLoadEvent( wxWindow* win ) { SetEventType (wxEVT_MOZILLA_LOAD_EVENT ); SetEventObject (win); SetId(win->GetId()); } /** * @author David Teller <Yo...@us...> * Load status events wxMozillaLoadEvent::wxMozillaLoadEvent( wxEventType commandType, int id ) { //Is this normal ? } */ //@nonl //@-node:@file wxMozillaEvents.cpp //@-leo --- NEW FILE: wxMozillaSettings.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaSettings.h #ifndef __WX_MOZILLA_SETTINGS_H__ #define __WX_MOZILLA_SETTINGS_H__ /* wxwindow includes */ #include "wx/defs.h" #include "wx/string.h" class wxMozillaSettingsData; class wxMozillaBrowser; class nsIPrefBranch; class wxMozillaSettings { public: static bool SetProfilePath(const wxString &path); static wxString GetProfilePath() { return ms_profilePath; } static void SetMozillaPath(const wxString &path); static wxString GetMozillaPath() { return ms_mozillaPath; } static void SetBoolPref(const wxString& name, bool value); static bool GetBoolPref(const wxString& name); static void SetStrPref(const wxString& name, const wxString& value); static wxString GetStrPref(const wxString& name); static void SetIntPref(const wxString& name, int value); static int GetIntPref(const wxString& name); static void SavePrefs(); private: static nsIPrefBranch *GetPrefBranch(); friend void wxMozillaShutdown(); static wxMozillaSettingsData *ms_data; static wxString ms_profilePath, ms_mozillaPath; }; #endif //@-node:@file wxMozillaSettings.h //@-leo --- NEW FILE: wxMozillaDialogs.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaDialogs.h #ifndef __WX_MOZILLA_PROMPTS_H__ #define __WX_MOZILLA_PROMPTS_H__ /* * wxMozilla * * Developers: * Jeremiah Cornelius McCarthy <jer...@wh...> * Kevin Ollivier <ke...@tu...> * Dave Fancella <dav...@at...> */ /* Overrides the Mozilla XUL-based dialogs */ #include "nsError.h" class nsIFactory; extern nsresult NS_NewPromptServiceFactory(nsIFactory** aFactory); #endif //@nonl //@-node:@file wxMozillaDialogs.h //@-leo --- NEW FILE: wxMozillaSettings.cpp --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaSettings.cpp //@<< wxMozillaSettings #includes >> //@+node:<< wxMozillaSettings #includes >> #include <wx/wxprec.h> #include <wx/filename.h> #include "wxMozillaSettings.h" #include "wxMozillaBrowser.h" #include "nsString.h" #include "nsCOMPtr.h" #include "nsProfileDirServiceProvider.h" #include "nsIPrefService.h" #include "nsIPrefBranch.h" //@-node:<< wxMozillaSettings #includes >> //@nl //@<< wxMozillaSettings declarations >> //@+node:<< wxMozillaSettings declarations >> class wxMozillaSettingsData { public: ~wxMozillaSettingsData(); #ifndef __WXMAC__ //There seems to be some extra library needed on OS X - until then skip OS X. nsCOMPtr<nsProfileDirServiceProvider> m_profileDirServiceProvider; #endif nsCOMPtr<nsIPrefService> m_prefService; nsCOMPtr<nsIPrefBranch> m_prefBranch; }; //@-node:<< wxMozillaSettings declarations >> //@nl //@+others //@+node:wxMozillaSettingsData wxMozillaSettingsData::~wxMozillaSettingsData() { #ifndef __WXMAC__ if (m_profileDirServiceProvider) { m_profileDirServiceProvider->Shutdown(); m_profileDirServiceProvider = nsnull; } #endif } //@-node:wxMozillaSettingsData //@+node:SetMozillaPath wxString wxMozillaSettings::ms_profilePath; wxString wxMozillaSettings::ms_mozillaPath; wxMozillaSettingsData *wxMozillaSettings::ms_data = NULL; /** * Sets the path to Mozilla runtime directory. Must be called before * first instance of wxMozillaBrowser is created. By default, current directory * is used on Windows and the directory where Mozilla was during compilation * on Unix. * * @param path * Path to Mozilla runtime */ void wxMozillaSettings::SetMozillaPath(const wxString &path) { wxASSERT_MSG( !wxMozillaBrowser::IsEmbeddingInitialized(), _T("You must call SetMozillaPath before creating wxMozillaBrowser instance!") ); wxFileName fn(path); fn.MakeAbsolute(); ms_mozillaPath = fn.GetFullPath(); } //@-node:SetMozillaPath //@+node:SetProfilePath //@+at //@nonl // * * Sets the profile path for the browser. Profile path // is directory where * Mozilla stores its settings. You // should call this function as soon as * possible and set // the path to directory specific to your application. * // If you don't call the function, settings are discarded // when the application * exits. * * @param path * Path in // which to store profile information * * @return * true // on success, false on failure. //@-at //@@c bool wxMozillaSettings::SetProfilePath(const wxString &path) { //TODO: figure out what needs added on OS X to get this to compile! #ifndef __WXMAC__ wxFileName fn(path); fn.MakeAbsolute(); ms_profilePath = fn.GetFullPath(); // If Mozilla wasn't loaded yet, postpone setting profile path: if (!wxMozillaBrowser::IsEmbeddingInitialized()) return TRUE; if (ms_data == NULL) ms_data = new wxMozillaSettingsData(); nsresult rv; nsCOMPtr<nsILocalFile> dir; NS_NewNativeLocalFile(nsDependentCString(ms_profilePath.fn_str()), PR_TRUE, getter_AddRefs(dir)); if (!dir) return FALSE; if (!ms_data->m_profileDirServiceProvider) { NS_NewProfileDirServiceProvider(PR_TRUE, getter_AddRefs(ms_data->m_profileDirServiceProvider)); if (!ms_data->m_profileDirServiceProvider) return FALSE; rv = ms_data->m_profileDirServiceProvider->Register(); if (NS_FAILED(rv)) return FALSE; } rv = ms_data->m_profileDirServiceProvider->SetProfileDir(dir); if (NS_FAILED(rv)) return FALSE; return TRUE; #endif } //@-node:SetProfilePath //@+node:GetPrefBranch static NS_DEFINE_CID(kPrefServiceCID, NS_PREFSERVICE_CID); /// Return nsIPrefBranch object and create it if we don't have it yet nsIPrefBranch *wxMozillaSettings::GetPrefBranch() { if (!wxMozillaBrowser::EnsureEmbedding()) return NULL; if (ms_data == NULL) ms_data = new wxMozillaSettingsData(); if (!ms_data->m_prefBranch) { ms_data->m_prefService = do_GetService(kPrefServiceCID); ms_data->m_prefBranch = do_QueryInterface(ms_data->m_prefService); // read default prefs files (prefs.js, user.js): ms_data->m_prefService->ReadUserPrefs(nsnull); } wxASSERT_MSG( ms_data->m_prefBranch, _T("failed to get nsIPrefBranch") ); return ms_data->m_prefBranch; } //@-node:GetPrefBranch //@+node:SetBoolPref #ifdef __WXDEBUG__ #define CHECK_PREF_TYPE(pref, name, type, msg) \ PRInt32 ptype; \ pref->GetPrefType(name.ToAscii(), &ptype); \ wxASSERT_MSG( ptype == nsIPrefBranch::type, msg ); #else #define CHECK_PREF_TYPE(pref, name, type, msg) #endif void wxMozillaSettings::SetBoolPref(const wxString& name, bool value) { nsIPrefBranch *p = GetPrefBranch(); CHECK_PREF_TYPE(p, name, PREF_BOOL, _T("preference not bool")) p->SetBoolPref(name.ToAscii(), value); } //@-node:SetBoolPref //@+node:SetStrPref void wxMozillaSettings::SetStrPref(const wxString& name, const wxString& value) { nsIPrefBranch *p = GetPrefBranch(); CHECK_PREF_TYPE(p, name, PREF_STRING, _T("preference not string")) p->SetCharPref(name.ToAscii(), value.ToAscii()); } //@-node:SetStrPref //@+node:SetIntPref void wxMozillaSettings::SetIntPref(const wxString& name, int value) { nsIPrefBranch *p = GetPrefBranch(); CHECK_PREF_TYPE(p, name, PREF_INT, _T("preference not integer")) p->SetIntPref(name.ToAscii(), value); } //@-node:SetIntPref //@+node:GetBoolPref bool wxMozillaSettings::GetBoolPref(const wxString& name) { nsIPrefBranch *p = GetPrefBranch(); CHECK_PREF_TYPE(p, name, PREF_BOOL, _T("preference not bool")) PRBool val; p->GetBoolPref(name.ToAscii(), &val); return val; } //@-node:GetBoolPref //@+node:GetStrPref wxString wxMozillaSettings::GetStrPref(const wxString& name) { nsIPrefBranch *p = GetPrefBranch(); CHECK_PREF_TYPE(p, name, PREF_STRING, _T("preference not string")) char *val; p->GetCharPref(name.ToAscii(), &val); return wxString::FromAscii(val); } //@-node:GetStrPref //@+node:GetIntPref int wxMozillaSettings::GetIntPref(const wxString& name) { nsIPrefBranch *p = GetPrefBranch(); CHECK_PREF_TYPE(p, name, PREF_INT, _T("preference not integer")) int val; p->GetIntPref(name.ToAscii(), &val); return val; } //@-node:GetIntPref //@+node:SavePrefs void wxMozillaSettings::SavePrefs() { if (ms_data && ms_data->m_prefService) { ms_data->m_prefService->SavePrefFile(nsnull); } } //@-node:SavePrefs //@-others //@-node:@file wxMozillaSettings.cpp //@-leo --- NEW FILE: helpers.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file helpers.h /* * wxWindows Mozilla Browser Component * * Developers: * Jeremiah Cornelius McCarthy <jer...@wh...> * Kevin Ollivier <ke...@tu...> * Dave Fancella <dav...@at...> */ // Note: this is private header, to be included only by wxMozilla // implementation! #ifndef __HELPERS_H__ #define __HELPERS_H__ #include <wx/string.h> #include <mozilla-config.h> #include <nsString.h> // ---------------------------------------------------------------------- // String conversion // ---------------------------------------------------------------------- // Conversion functions to convert between Mozilla strings and wxString // // (there are two problems involved: // - Mozilla uses UCS-2, not wchar_t, we have to convert between them // - Mozilla doesn't use locale to convert between UCS-2 and 8bit string) nsString wxString_to_nsString(const wxString& s, wxMBConv& conv); wxString nsString_to_wxString(const nsString& s, wxMBConv& conv); #endif //@-node:@file helpers.h //@-leo --- NEW FILE: wxMozillaBrowser.cpp --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaBrowser.cpp //@+at //@nonl // wxWindows Mozilla Browser Component // // Initial Developers: // * Jeremiah Cornelius McCarthy <jer...@wh...> // * Kevin Ollivier <ke...@tu...> // * Dave Fancella <dav...@at...> //@-at //@@c //@<< includes >> //@+node:<< includes >> #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/wx.h" [...1615 lines suppressed...] //@-node:IMPLEMENT_DYNAMIC_CLASS //@+node:GetDOMDocument //@+at //@nonl // * * @author David Teller <Yo...@us...> // * * Returns a pointer to the current document * // @warning behaviour is non-specified if the current // document is not fully loaded ! //@-at //@@c bool wxMozillaBrowser::GetDOMDocument(nsIDOMDocument** aDocument) { nsresult rv = m_Mozilla->mWebNav->GetDocument(aDocument); return NS_SUCCEEDED(rv); } //@-node:GetDOMDocument //@-others //@-node:@file wxMozillaBrowser.cpp //@-leo --- NEW FILE: wxMozillaBrowser.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaBrowser.h #ifndef __WX_MOZILLA_BROWSER_H__ #define __WX_MOZILLA_BROWSER_H__ /* * wxWindows Mozilla Component * Copyright 2001 (c) Jeremiah Cornelius McCarthy. All Rights Reserved. * * Author: Jeremiah Cornelius McCarthy * Created: January 24th, 2001 * Licence: wxWindows License */ /* wxwindow includes */ #include "wx/defs.h" #include "wx/window.h" #ifdef __WXMAC__ #include <Carbon/Carbon.h> #endif // forward declarations class wxMozillaBrowserChrome; struct wxMozillaBrowserInterface; class wxMozillaDialogs; class nsIHTMLEditor; class nsIDOMDocument; class nsIAppShell; //macros for testing wxMozilla version #define wxMOZ_MAJOR_VERSION 0 #define wxMOZ_MINOR_VERSION 5 #define wxMOZ_RELEASE_NUMBER 3 /* check if the current version is at least major.minor.release */ #define wxMOZILLA_CHECK_VERSION(major,minor,release) \ (wxMOZ_MAJOR_VERSION > (major) || \ (wxMOZ_MAJOR_VERSION == (major) && wxMOZ_MINOR_VERSION > (minor)) || \ (wxMOZ_MAJOR_VERSION == (major) && wxMOZ_MINOR_VERSION == (minor) \ && wxMOZ_RELEASE_NUMBER >= (release))) //forward declaration of function needed by wxPython void wxMozillaInitResourceModule(); extern const wxChar *wxMozillaBrowserNameStr; //static nsIAppShell *gAppShell; //@<< class wxMoziallBrowser >> //@+node:<< class wxMoziallBrowser >> //@+at //@nonl // wxWindows Mozilla browser component //@-at //@@c //@<< head >> //@+node:<< head >> class wxMozillaBrowser: public wxWindow { friend class wxMozillaDialogs; friend class wxMozillaBrowserChrome; //private class int instances; private: DECLARE_DYNAMIC_CLASS(wxMozillaBrowser) #ifdef __WXMAC__ //WXEVENTHANDLERREF m_mozillaEventHandler ; //static pascal OSStatus wxMozillaEventChainHandler(EventHandlerCallRef handler , EventRef event , void *data); #endif //@nonl //@-node:<< head >> //@nl protected: //Mozilla events void OnLocationChange(); void OnStatusChange(); void OnRightClick(); //@ << members >> //@+node:<< members >> class wxMozillaBrowserChrome *Chrome; wxMozillaBrowserInterface *m_Mozilla; static int gNumInstances; WXWidget m_macControl; bool m_needParent; bool m_acceptsFocus; wxString m_status; bool m_isEditable; bool m_isBusy; wxString m_title; // private wxMozilla functions: static bool IsEmbeddingInitialized(); static bool EnsureEmbedding(); friend class wxMozillaSettings; //@nonl //@-node:<< members >> //@nl public: //@ << ctors >> //@+node:<< ctors >> wxMozillaBrowser(); wxMozillaBrowser(wxWindow *parent, wxWindowID id, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxMozillaBrowserNameStr); //{ // Create(parent, id, pos, size, style, name); //} virtual ~wxMozillaBrowser(); bool Create(wxWindow *parent, wxWindowID id, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxMozillaBrowserNameStr); //@nonl //@-node:<< ctors >> //@nl virtual bool LoadURL(const wxString &location); wxString GetURL(); //@ << Events >> //@+node:<< Events >> bool SavePage(const wxString &filename, bool saveFiles=TRUE); bool IsBusy(); bool GoBack(); bool CanGoBack(); bool GoForward(); bool CanGoForward(); bool Stop(); bool Reload(); bool Find(const wxString &searchString, bool matchCase = FALSE, bool matchWholeWord = FALSE, bool wrapAround = TRUE, bool searchBackwards = FALSE); bool FindNext(); wxString GetStatus(); wxString GetSelection(); void Copy(); void SelectAll(); void SelectNone(); //@nonl //@-node:<< Events >> //@nl //@ << HTML editor functionality >> //@+node:<< HTML editor functionality >> void MakeEditable(bool enable=TRUE); bool IsEditable(); void EditCommand(const wxString &cmdId, const wxString &value = wxEmptyString); bool GetCommandState(const wxString &command, const wxString &state); wxString GetStateAttribute(wxString &command); void UpdateBaseURI(); //this is needed because Mozilla's editor screws up the base URI... void InsertHTML(const wxString &html); void GetHTMLEditor(nsIHTMLEditor** htmlEditor); //@nonl //@-node:<< HTML editor functionality >> //@nl bool OpenStream(const wxString &location, const wxString &type); bool AppendToStream(const wxString &data); bool CloseStream(); //@ << platform >> //@+node:<< platform >> #ifdef __WXGTK__ virtual void SetFocus(); #endif void OnSize(wxSizeEvent &event); void OnActivate(wxActivateEvent &event); void OnIdle(wxIdleEvent &event); #ifdef __WXMAC__ virtual void MacRedraw(WXHRGN updatergnr , long time, bool erase); virtual void MacSuperEnabled( bool enabled ) ; virtual void MacSuperChangedPosition() ; virtual void MacSuperShown( bool show ) ; void OnPaint(wxPaintEvent &event); void OnMove(wxMoveEvent &event); void OnLeftDown(wxMouseEvent &event); void OnSetFocus(wxFocusEvent &pEvent); void OnKillFocus(wxFocusEvent &pEvent); //virtual void wxWindow::MacRedraw( WXHRGN updatergn , long time , bool erase) ; #endif //@nonl //@-node:<< platform >> //@nl wxString GetLinkMessage(); wxString GetJSStatus(); bool IsElementInSelection(const wxString &element); bool SelectElement(const wxString &element); wxString GetElementAttribute(const wxString &tagName, const wxString &attrName); void SetElementAttribute(const wxString &attrName, const wxString &attrValue); bool SetPage(const wxString &data); wxString GetPage(); // override wxWindow's empty implementation: void SetTitle(const wxString &title) { m_title = title; } wxString GetTitle() const { return m_title; } //@ << spell checker >> //@+node:<< spell checker >> void StartSpellCheck(); wxString GetNextMisspelledWord(); wxString GetSuggestedWord(); void ReplaceWord(wxString misspelledWord, wxString replacement, bool allOccurrences); void StopSpellChecker(); //@nonl //@-node:<< spell checker >> //@nl DECLARE_EVENT_TABLE() //protected: // int m_numInstances; public: //@ << SetZoom >> //@+node:<< SetZoom >> /** * @author David Teller <Yo...@us...> * Sets the zoom level */ bool SetZoom(float level); //@nonl //@-node:<< SetZoom >> //@nl /** * @author David Teller <Yo...@us...> * * Returns a pointer to the current document * @warning behaviour is non-specified if the current document is not fully loaded ! */ bool GetDOMDocument(nsIDOMDocument** aDocument); }; //@-node:<< class wxMoziallBrowser >> //@nl #endif //@nonl //@-node:@file wxMozillaBrowser.h //@-leo --- NEW FILE: cstmdlg.cpp --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file cstmdlg.cpp /* * Custom wxWindows dialog * Copyright 2004 (c) Kevin Ollivier. All Rights Reserved. * * Licence: wxWindows License */ //@<< cstmdlg #includes >> //@+node:<< cstmdlg #includes >> #include "wx/wxprec.h" //@-node:<< cstmdlg #includes >> //@nl //@<< cstmdlg declarations >> //@+node:<< cstmdlg declarations >> #ifndef WX_PRECOMP #include "wx/wx.h" #endif //#include "wx/dialog.h" //#include "wx/checkbox.h" //#include "wx/button.h" //#include "wx/sizer.h" #include "cstmdlg.h" const int ID_BUTTON1 = 1121; const int ID_BUTTON2 = 1122; const int ID_BUTTON3 = 1123; //@-node:<< cstmdlg declarations >> //@nl //@+others //@+node:IMPLEMENT_DYNAMIC_CLASS IMPLEMENT_DYNAMIC_CLASS(wxLoginDialog, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxCustomDialog, wxDialog) BEGIN_EVENT_TABLE(wxCustomDialog, wxDialog) EVT_BUTTON(ID_BUTTON1, wxCustomDialog::OnButton1) EVT_BUTTON(ID_BUTTON2, wxCustomDialog::OnButton2) EVT_BUTTON(ID_BUTTON3, wxCustomDialog::OnButton3) END_EVENT_TABLE() wxCustomDialog::wxCustomDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxString& btn1Text, const wxString& btn2Text, const wxString& btn3Text, const wxString& checkText, long style, const wxPoint& pos) { m_message = message; m_caption = caption; m_dialogStyle = style; //create the dialog window if (!wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)){ return; } wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); mainSizer->Add(CreateTextSizer(message), 0, wxALL, 6); //create the controls //wxStaticText* messageText = new wxStaticText(this, wxID_ANY, message); if (checkText != wxEmptyString) { m_checkbox = new wxCheckBox(this, wxID_ANY, checkText); //mainSizer->Add(m_checkbox, 0, wxEXPAND | wxALL, 4); } //button1 at least should always appear wxButton* button1 = new wxButton(this, ID_BUTTON1, btn1Text); wxButton* button2 = NULL; wxButton* button3 = NULL; if (btn2Text != wxEmptyString) button2 = new wxButton(this, ID_BUTTON2, btn2Text); if (btn3Text != wxEmptyString) button3 = new wxButton(this, ID_BUTTON3, btn3Text); if (checkText != wxEmptyString) mainSizer->Add(m_checkbox, 0, wxALL, 4); wxBoxSizer* buttonSizer = new wxBoxSizer(wxHORIZONTAL); //buttonSizer->Add(1, 1, 1, wxEXPAND | wxALL, 4); //empty space for the dialog buttonSizer->Add(button1, 0, wxALL, 4); if (button2) buttonSizer->Add(button2, 0, wxALL, 4); if (button3) buttonSizer->Add(button3, 0, wxALL, 4); mainSizer->Add(buttonSizer, 0, wxALIGN_CENTRE, 4); SetSizerAndFit(mainSizer); Layout(); } //@-node:IMPLEMENT_DYNAMIC_CLASS //@+node:OnButton1 void wxCustomDialog::OnButton1(wxCommandEvent& WXUNUSED(event)) { EndModal(ID_BUTTON1); } //@-node:OnButton1 //@+node:OnButton2 void wxCustomDialog::OnButton2(wxCommandEvent& WXUNUSED(event)) { EndModal(ID_BUTTON2); } //@-node:OnButton2 //@+node:OnButton3 void wxCustomDialog::OnButton3(wxCommandEvent& WXUNUSED(event)) { EndModal(ID_BUTTON3); } //@-node:OnButton3 //@+node:ShowModal int wxCustomDialog::ShowModal() { int result; result = wxDialog::ShowModal(); if (result == ID_BUTTON1) return 1; else if (result == ID_BUTTON2) return 2; else if (result == ID_BUTTON3) return 3; else return 0; } //@-node:ShowModal //@+node:IsChecked bool wxCustomDialog::IsChecked() { if (m_checkbox) return m_checkbox->IsChecked(); else return FALSE; } //@-node:IsChecked //@+node:wxLoginDialog wxLoginDialog::wxLoginDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxString& initUsername, const wxString& initPassword, const wxString& checkText, long style, const wxPoint& pos) { //create the dialog window if (!wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)){ return; } wxStaticText* mymessage = new wxStaticText(this, wxID_ANY, message); wxStaticText* userlabel = new wxStaticText(this, wxID_ANY, _("Username")); usertext = new wxTextCtrl(this, wxID_ANY, initUsername); wxStaticText* passlabel = new wxStaticText(this, wxID_ANY, _("Password")); passtext = new wxTextCtrl(this, wxID_ANY, initPassword, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD); m_username = initUsername; m_password = initPassword; wxButton* okButton = new wxButton(this, wxID_OK, _("OK")); wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel")); wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); mainSizer->Add(mymessage, 0, wxALL, 10); mainSizer->Add(userlabel, 0, wxLEFT, 4); mainSizer->Add(usertext, 1, wxEXPAND | wxALL, 4); mainSizer->Add(passlabel, 0, wxLEFT, 4); mainSizer->Add(passtext, 1, wxEXPAND | wxALL, 4); if (checkText != wxEmptyString) { m_checkbox = new wxCheckBox(this, wxID_ANY, checkText); mainSizer->Add(m_checkbox, 0, wxEXPAND | wxALL, 4); } wxBoxSizer* buttonSizer = new wxBoxSizer(wxHORIZONTAL); buttonSizer->Add(1, 1, 1, wxEXPAND | wxALL, 4); //empty space for the dialog buttonSizer->Add(okButton, 0, wxALL, 4); buttonSizer->Add(cancelButton, 0, wxALL, 4); mainSizer->Add(buttonSizer, 0, wxEXPAND); SetSizerAndFit(mainSizer); Layout(); } //@-node:wxLoginDialog //@+node:ShowModal int wxLoginDialog::ShowModal() { int result; result = wxDialog::ShowModal(); m_username = usertext->GetValue(); m_password = passtext->GetValue(); return result; } //@-node:ShowModal //@+node:IsChecked bool wxLoginDialog::IsChecked() { if (m_checkbox) return m_checkbox->IsChecked(); else return FALSE; } //@-node:IsChecked //@-others //@-node:@file cstmdlg.cpp //@-leo --- NEW FILE: cstmdlg.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file cstmdlg.h #ifndef __WX_CUSTOM_DIALOG_H__ #define __WX_CUSTOM_DIALOG_H__ /* * Custom wxWindows dialog * Copyright 2004 (c) Kevin Ollivier. All Rights Reserved. * * Licence: wxWindows License */ /* wxwindow includes */ #include "wx/defs.h" #include "wx/window.h" #include "wx/dialog.h" #include "wx/app.h" #include "wx/defs.h" #include "wx/utils.h" #include "wx/textctrl.h" //This class allows for up to three buttons and an optional checkbox, to handle //scenarios like "Save", "Don't Save", "Cancel" dialogs, as well as "Don't show this again" //type dialogs //Buttons will match with styles, such as wxYES_NO | wxCANCEL extern const wxChar* wxCustomDialogCaptionStr; class wxCustomDialog: public wxDialog { private: DECLARE_DYNAMIC_CLASS(wxCustomDialog) protected: wxString m_message; wxString m_caption; wxCheckBox* m_checkbox; long m_dialogStyle; wxWindow* m_parent; wxButton m_button1; wxButton m_button2; wxButton m_button3; public: wxCustomDialog() {} wxCustomDialog(wxWindow* parent, const wxString& message, const wxString& caption = wxCustomDialogCaptionStr, const wxString& btn1Text = _("OK"), const wxString& btn2Text = wxEmptyString, const wxString& btn3Text = wxEmptyString, const wxString& checkText = wxEmptyString, long style = 0, const wxPoint& pos = wxDefaultPosition); //returns the button number 1, 2, or 3 int ShowModal(void); bool IsChecked(); void OnButton1(wxCommandEvent& event); void OnButton2(wxCommandEvent& event); void OnButton3(wxCommandEvent& event); DECLARE_EVENT_TABLE() }; class wxLoginDialog: public wxDialog { private: DECLARE_DYNAMIC_CLASS(wxLoginDialog) protected: wxString m_message; wxString m_caption; wxString m_username; wxString m_password; wxTextCtrl* usertext; wxTextCtrl* passtext; wxCheckBox* m_checkbox; long m_dialogStyle; public: wxLoginDialog() {} wxLoginDialog(wxWindow* parent, const wxString& message, const wxString& caption = wxEmptyString, const wxString& initUsername = wxEmptyString, const wxString& initPassword = wxEmptyString, const wxString& checkText = wxEmptyString, long style = wxOK|wxCANCEL, const wxPoint& pos = wxDefaultPosition); ~wxLoginDialog(){} //returns the standard button numbers (wxID_YES, wxID_NO, wxID_CANCEL) int ShowModal(void); wxString GetUsername(){ return m_username; } wxString GetPassword(){ return m_password; } bool IsChecked(); }; #endif //@-node:@file cstmdlg.h //@-leo --- NEW FILE: wxMozillaEvents.h --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaEvents.h #ifndef __WX_MOZILLA_EVENTS_H__ #define __WX_MOZILLA_EVENTS_H__ /* * wxWindows Mozilla Component * Copyright 2002 (c) Myers Carpenter. All Rights Reserved. * * Author: Kevin Ollivier * Created: June 5, 2003 * Licence: wxWindows License */ /* wxwindow includes */ #include "wx/defs.h" #include "wx/window.h" //wxMozilla states - for EVT_MOZILLA_STATE_CHANGE enum { wxMOZILLA_STATE_START = 1, wxMOZILLA_STATE_NEGOTIATING = 2, wxMOZILLA_STATE_REDIRECTING = 4, wxMOZILLA_STATE_TRANSFERRING = 8, wxMOZILLA_STATE_STOP = 16, wxMOZILLA_STATE_IS_REQUEST = 32, wxMOZILLA_STATE_IS_DOCUMENT = 64, wxMOZILLA_STATE_IS_NETWORK = 128, wxMOZILLA_STATE_IS_WINDOW = 256 }; //wxMozilla security modes - for EVT_MOZILLA_SECURITY_CHANGE enum { wxMOZILLA_IS_INSECURE = 1, wxMOZILLA_IS_BROKEN = 2, wxMOZILLA_IS_SECURE = 4, wxMOZILLA_SECURE_HIGH = 8, wxMOZILLA_SECURE_MED = 16, wxMOZILLA_SECURE_LOW = 32 }; //wxMozilla right-click event contexts enum { wxMOZILLA_CONTEXT_DOCUMENT = 1, wxMOZILLA_CONTEXT_LINK = 2, wxMOZILLA_CONTEXT_TEXT = 4, wxMOZILLA_CONTEXT_BACKGROUND_IMAGE = 8, wxMOZILLA_CONTEXT_IMAGE = 16 }; class wxMozillaBeforeLoadEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaBeforeLoadEvent ) public: wxString GetURL() { return m_url; } void SetURL(const wxString& newURL) { m_url = newURL; } void Cancel() { m_cancelled = TRUE; } bool IsCancelled() { return m_cancelled; } wxMozillaBeforeLoadEvent( wxWindow* win = (wxWindow*) NULL ); wxEvent *Clone(void) const { return new wxMozillaBeforeLoadEvent(*this); } protected: wxString m_url; bool m_cancelled; }; /*event class definitions*/ class wxMozillaLinkChangedEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaLinkChangedEvent ) public: wxString GetNewURL() { return m_newURL; } bool CanGoBack() { return m_canGoBack; } bool CanGoForward() { return m_canGoForward; } void SetNewURL(const wxString& newurl) { m_newURL = newurl; } void SetCanGoBack(bool goback) { m_canGoBack = goback; } void SetCanGoForward(bool goforward) { m_canGoForward = goforward; } wxMozillaLinkChangedEvent( wxWindow* win = (wxWindow*) NULL ); wxEvent *Clone(void) const { return new wxMozillaLinkChangedEvent(*this); } protected: wxString m_newURL; bool m_canGoBack; bool m_canGoForward; }; class wxMozillaStateChangedEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaStateChangedEvent ) public: int GetState() { return m_state; } void SetState(const int state) { m_state = state; } wxString GetURL() { return m_url; } void SetURL(const wxString& url) { m_url = url; } wxMozillaStateChangedEvent( wxWindow* win = (wxWindow*) NULL ); wxEvent *Clone(void) const { return new wxMozillaStateChangedEvent(*this); } protected: int m_state; wxString m_url; }; class wxMozillaSecurityChangedEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaSecurityChangedEvent ) public: int GetSecurity() { return m_security; } void SetSecurity(const int security) { m_security = security; } wxMozillaSecurityChangedEvent( wxWindow* win = (wxWindow*) NULL ); wxEvent *Clone(void) const { return new wxMozillaSecurityChangedEvent(*this); } protected: int m_security; }; class wxMozillaLoadCompleteEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaLoadCompleteEvent ) public: wxMozillaLoadCompleteEvent( wxWindow* win = (wxWindow*) NULL ); wxEvent *Clone(void) const { return new wxMozillaLoadCompleteEvent(*this); } }; class wxMozillaStatusChangedEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaStatusChangedEvent ) public: wxString GetStatusText() { return m_statusText; } bool IsBusy() { return m_isBusy; } void SetStatusText(const wxString& status) { m_statusText = status; } void SetBusy(bool isbusy) { m_isBusy = isbusy; } wxMozillaStatusChangedEvent( wxWindow* win = (wxWindow*) NULL ); wxEvent *Clone(void) const { return new wxMozillaStatusChangedEvent(*this); } protected: wxString m_statusText; bool m_isBusy; }; class wxMozillaTitleChangedEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaTitleChangedEvent ) public: wxString GetTitle() { return m_title; } void SetTitle(const wxString& title) { m_title = title; } wxMozillaTitleChangedEvent( wxWindow* win = (wxWindow*) NULL ); wxEvent *Clone(void) const { return new wxMozillaTitleChangedEvent(*this); } protected: wxString m_title; }; class wxMozillaProgressEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaProgressEvent ) public: int GetSelfCurrentProgress() { return m_curSelfProgress; } void SetSelfCurrentProgress(int progress) { m_curSelfProgress = progress; } int GetSelfMaxProgress() { return m_maxSelfProgress; } void SetSelfMaxProgress(int progress) { m_maxSelfProgress = progress; } int GetTotalCurrentProgress() { return m_curTotalProgress; } void SetTotalCurrentProgress(int progress) { m_curTotalProgress = progress; } int GetTotalMaxProgress() { return m_maxTotalProgress; } void SetTotalMaxProgress(int progress) { m_maxTotalProgress = progress; } wxMozillaProgressEvent( wxWindow* win = (wxWindow*) NULL ); wxEvent *Clone(void) const { return new wxMozillaProgressEvent(*this); } protected: /// Progress of current request. maxSelfProgress is -1 if unknown int m_curSelfProgress, m_maxSelfProgress; /// Progress of all monitored requests. maxSelfProgress is -1 if unknown int m_curTotalProgress, m_maxTotalProgress; }; class wxMozillaRightClickEvent : public wxMouseEvent { DECLARE_DYNAMIC_CLASS( wxMozillaRightClickEvent ) public: //wxString statusText; bool IsBusy() { return m_isBusy; } void SetBusy(bool isbusy) { m_isBusy = isbusy; } wxString GetBackgroundImageSrc() { return m_backgroundImage; } void SetBackgroundImageSrc(const wxString& name) { m_backgroundImage = name; } wxString GetText() { return m_text; } void SetText(const wxString& text) { m_text = text; } wxString GetImageSrc() { return m_imageSrc; } void SetImageSrc(const wxString& src) { m_imageSrc = src; } wxString GetLink() { return m_link; } void SetLink(const wxString& link) { m_link = link; } int GetContext() { return m_context; } void SetContext(int context) { m_context = context; } wxMozillaRightClickEvent( wxWindow* win = (wxWindow*) NULL ); wxMozillaRightClickEvent( wxEventType commandType, int id ); wxEvent *Clone(void) const { return new wxMozillaRightClickEvent(*this); } //void CopyObject( wxObject& obj ) const { wxEvent::CopyObject( obj_d );} protected: wxString m_backgroundImage; wxString m_text; wxString m_imageSrc; wxString m_link; bool m_isBusy; int m_context; }; class wxMozillaMouseEvent : public wxMouseEvent { DECLARE_DYNAMIC_CLASS( wxMozillaMouseEvent ) public: wxMozillaMouseEvent( wxWindow* win = (wxWindow*) NULL ); wxMozillaMouseEvent( wxEventType commandType, int id ); wxEvent *Clone(void) const { return new wxMozillaMouseEvent(*this); } //void CopyObject( wxObject& obj ) const { wxEvent::CopyObject( obj_d );}; }; class wxMozillaKeyEvent : public wxKeyEvent { DECLARE_DYNAMIC_CLASS( wxMozillaKeyEvent ) public: wxMozillaKeyEvent( wxWindow* win = (wxWindow*) NULL ); wxMozillaKeyEvent( wxEventType commandType, int id ); wxEvent *Clone(void) const { return new wxMozillaKeyEvent(*this); } //void CopyObject( wxObject& obj ) const { wxEvent::CopyObject( obj_d );}; }; /** * @class wxMozillaLoadEvent * @author David Teller <Yo...@us...> * * Load status events class wxMozillaLoadEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS( wxMozillaLoadEvent ) public: bool isStart; bool isRedirecting; bool isTransferring; bool isNegociating; bool isTerminated; bool isRequest; bool isDocument; bool isNetwork; bool isWindow; bool isInsecure; bool isBroken; bool isSecure; bool isSecureHigh; bool isSecureMed; bool isSecureLow; wxMozillaLoadEvent(wxWindow* win = (wxWindow*) NULL); wxMozillaLoadEvent(wxEventType commandType, int id ); wxEvent *Clone() const { return new wxMozillaLoadEvent(*this); } }; */ typedef void (wxEvtHandler::*wxMozillaBeforeLoadEventFunction)(wxMozillaBeforeLoadEvent&); typedef void (wxEvtHandler::*wxMozillaLinkChangedEventFunction)(wxMozillaLinkChangedEvent&); typedef void (wxEvtHandler::*wxMozillaStateChangedEventFunction)(wxMozillaStateChangedEvent&); typedef void (wxEvtHandler::*wxMozillaSecurityChangedEventFunction)(wxMozillaSecurityChangedEvent&); typedef void (wxEvtHandler::*wxMozillaStatusChangedEventFunction)(wxMozillaStatusChangedEvent&); typedef void (wxEvtHandler::*wxMozillaTitleChangedEventFunction)(wxMozillaTitleChangedEvent&); typedef void (wxEvtHandler::*wxMozillaLoadCompleteEventFunction)(wxMozillaLoadCompleteEvent&); typedef void (wxEvtHandler::*wxMozillaProgressEventFunction)(wxMozillaProgressEvent&); typedef void (wxEvtHandler::*wxMozillaRightClickEventFunction)(wxMozillaRightClickEvent&); typedef void (wxEvtHandler::*wxMozillaMouseEventFunction)(wxMozillaMouseEvent&); typedef void (wxEvtHandler::*wxMozillaKeyEventFunction)(wxMozillaKeyEvent&); /** * @author David Teller <Yo...@us...> * * Load status events */ //typedef void (wxEvtHandler::*wxMozillaLoadEventFunction)(wxMozillaLoadEvent&); BEGIN_DECLARE_EVENT_TYPES() DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_BEFORE_LOAD, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_URL_CHANGED, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_STATE_CHANGED, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_SECURITY_CHANGED, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_STATUS_CHANGED, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_TITLE_CHANGED, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_LOAD_COMPLETE, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_PROGRESS, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_RIGHT_CLICK, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_MOUSE_EVENT, -1) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MOZILLA_KEY_EVENT, -1) /** * @author David Teller <Yo...@us...> * * Load status events */ // DECLARE_EVENT_TYPE(wxEVT_MOZILLA_LOAD_EVENT,-1) END_DECLARE_EVENT_TYPES() #define EVT_MOZILLA_BEFORE_LOAD(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_BEFORE_LOAD, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaBeforeLoadEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_URL_CHANGED(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_URL_CHANGED, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaLinkChangedEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_STATE_CHANGED(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_STATE_CHANGED, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaStateChangedEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_SECURITY_CHANGED(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_SECURITY_CHANGED, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaSecurityChangedEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_STATUS_CHANGED(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_STATUS_CHANGED, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaStatusChangedEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_TITLE_CHANGED(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_TITLE_CHANGED, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaTitleChangedEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_LOAD_COMPLETE(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_LOAD_COMPLETE, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaLoadCompleteEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_PROGRESS(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_PROGRESS, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaProgressEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_RIGHT_CLICK(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_RIGHT_CLICK, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaRightClickEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_MOUSE_EVENT(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_MOUSE_EVENT, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaMouseEventFunction) & func, \ (wxObject *) NULL ), #define EVT_MOZILLA_KEY_EVENT(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_KEY_EVENT, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaKeyEventFunction) & func, \ (wxObject *) NULL ), /** * @author David Teller <Yo...@us...> * * Load status events #define EVT_MOZILLA_LOAD_EVENT(func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOZILLA_LOAD_EVENT, \ -1, \ -1, \ (wxObjectEventFunction) \ (wxMozillaLoadEventFunction) & func, \ (wxObject *) NULL ), */ #endif //@-node:@file wxMozillaEvents.h //@-leo --- NEW FILE: wxMozillaWindow.cpp --- //@+leo-ver=4-encoding=iso-8859-1. //@+node:@file wxMozillaWindow.cpp //@+at // wxMozillaWindow Modal Window Browser // // Inital Developers: // * Jeremiah Cornelius McCarthy <jer...@wh...> // * Kevin Ollivier <ke...@tu...> // * Dave Fancella <dav...@at...> //@-at //@@c //@<< includes >> //@+node:<< includes >> #include "wx/wxprec.h" #include "wx/bmpbuttn.h" #include "wxMozillaWindow.h" #include "helpers.h" #include "Log.h" #undef max #undef min #include "dsa/NDSAUtil.h" #include <fstream> #include <sstream> #include "icons/back24.xpm" #include "icons/back24_d.xpm" #include "icons/forward24.xpm" #include "icons/forward24_d.xpm" #include "icons/refresh24.xpm" #include "icons/refresh24_d.xpm" #include "icons/stop24.xpm" #include "icons/stop24_d.xpm" // the application icon #if defined(__WXGTK__) || defined(__WXMOTIF__) #include "dsa.xpm.h" #endif //@-node:<< includes >> //@nl //@<< declarations >> //@+node:<< declarations >> enum { ID_MOZCTL = wxID_HIGHEST + 1, ID_GO = wxID_HIGHEST + 2, ID_ADDRESS = wxID_HIGHEST + 3, ID_BACK = wxID_HIGHEST + 4, ID_NEXT = wxID_HIGHEST + 5, ID_SAVE = wxID_HIGHEST + 6, ID_STOP = wxID_HIGHEST + 7, ID_REFRESH = wxID_HIGHEST + 8, ID_BOLD = wxID_HIGHEST + 9, ID_EDITABLE = wxID_HIGHEST + 10, ID_COPY = wxID_HIGHEST + 11, ID_SELECT_ALL = wxID_HIGHEST + 12, ID_SELECT_NONE = wxID_HIGHEST + 13, ID_FIND = wxID_HIGHEST + 14, ID_NEW_WINDOW = wxID_HIGHEST + 15, ID_OPEN = wxID_HIGHEST + 16, ID_QUIT = wxID_HIGHEST + 17, ID_OPEN_NEW_WINDOW = wxID_HIGHEST + 18, ID_SAVE_LINK = wxID_HIGHEST + 19, ID_SAVE_IMAGE = wxID_HIGHEST + 20, ID_VIEW_SOURCE = wxID_HIGHEST + 21, ID_UNDO = wxID_HIGHEST + 22, ID_VIEW_LINK = wxID_HIGHEST + 23, ID_EDIT_LINK = wxID_HIGHEST + 24 }; //@-node:<< declarations >> //@nl //@<< makros >> //@+node:<< makros >> IMPLEMENT_DYNAMIC_CLASS(wxMozillaWindow, wxFrame) BEGIN_EVENT_TABLE(wxMozillaWindow, wxFrame) EVT_BUTTON(ID_GO, wxMozillaWindow::GoClicked) EVT_TOOL(ID_BACK, wxMozillaWindow::BackClicked) EVT_TOOL(ID_NEXT, wxMozillaWindow::NextClicked) EVT_TOOL(ID_STOP, wxMozillaWindow::StopLoading) EVT_TOOL(ID_REFRESH, wxMozillaWindow::RefreshPage) EVT_MENU(ID_NEW_WINDOW, wxMozillaWindow::NewWindow) EVT_MENU(ID_OPEN_NEW_WINDOW, wxMozillaWindow::OpenNewWindow) EVT_MENU(ID_QUIT, wxMozillaWindow::Quit) EVT_MENU(ID_VIEW_SOURCE, wxMozillaWindow::ViewSource) EVT_MENU(ID_STOP, wxMozillaWindow::StopLoading) EVT_MENU(ID_REFRESH, wxMozillaWindow::RefreshPage) EVT_MENU(wxID_SAVE, wxMozillaWindow::SaveClicked) EVT_MENU(ID_SELECT_ALL, wxMozillaWindow::SelectAll) EVT_MENU(ID_SELECT_NONE, wxMozillaWindow::SelectNone) EVT_MENU(ID_FIND, wxMozillaWindow::ShowFindDlg) //EVT_MENU(ID_SPELLCHECK, wxMozillaWindow::SpellCheck) #if wxUSE_FINDREPLDLG EVT_FIND(-1, wxMozillaWindow::DoFind) EVT_FIND_NEXT(-1, wxMozillaWindow::DoFind) EVT_FIND_CLOSE(-1, wxMozillaWindow::DoFind) #endif EVT_MENU(ID_UNDO, wxMozillaWindow::Undo) EVT_MENU(ID_EDITABLE, wxMozillaWindow::MakeEditable) EVT_MENU(ID_BOLD, wxMozillaWindow::BoldClicked) EVT_MENU(ID_COPY, wxMozillaWindow::DoCopy) EVT_MENU(ID_VIEW_LINK, wxMozillaWindow::OnLinkProperties) EVT_MENU(ID_EDIT_LINK, wxMozillaWindow::OnEditLink) EVT_MOZILLA_URL_CHANGED(wxMozillaWindow::UpdateURL) EVT_MOZILLA_STATUS_CHANGED(wxMozillaWindow::UpdateStatus) EVT_MOZILLA_STATE_CHANGED(wxMozillaWindow::UpdateState) EVT_MOZILLA_BEFORE_LOAD(wxMozillaWindow::BeforeLoad) EVT_MOZILLA_RIGHT_CLICK(wxMozillaWindow::OnMozillaRightClick) EVT_MOZILLA_LOAD_COMPLETE(wxMozillaWindow::OnLoadComplete) //EVT_MOZILLA_MOUSE_EVENT(wxMozillaWindow::OnMozillaMouseEvent) //EVT_MOUSE_EVENTS(wxMozillaWindow::OnMouseDown) END_EVENT_TABLE() //@-node:<< makros >> //@nl //@+others //@+node:ctor wxMozillaWindow::wxMozillaWindow(wxWindow* parent, bool showMenu, bool showToolbar, bool showStatusbar, bool popupWindow) { wxFrame::Create(parent, -1, _("DSA4 Werkzeug")); // set the window icon SetIcon(wxICON(DSA)); //@ << Statusbar >> //@+node:<< Statusbar >> if (showStatusbar){ hasStatusbar = TRUE; statusBar = this->CreateStatusBar(); } else hasStatusbar = FALSE; //@nonl //@-node:<< Statusbar >> //@nl //@ << Menu >> //@+node:<< Menu >> if (showMenu){ hasMenu = TRUE; appMenuBar = new wxMenuBar(); fileMenu = new wxMenu(); fileMenu->Append(ID_NEW_WINDOW, _("New Window")); fileMenu->Append(ID_OPEN, _("Open")); fileMenu->Append(wxID_SAVE, _("Save Page")); fileMenu->AppendSeparator(); fileMenu->Append(ID_QUIT, _("Exit")); appMenuBar->Append(fileMenu, _("File")); editMenu = new wxMenu(); editMenu->Append(ID_UNDO, _("Undo")); editMenu->Append(ID_EDITABLE, _("Make Editable")); editMenu->Append(ID_BOLD, _("Bold")); editMenu->AppendSeparator(); editMenu->Append(ID_COPY, _("Copy")); editMenu->AppendSeparator(); editMenu->Append(ID_SELECT_ALL, _("Select All")); editMenu->Append(ID_SELECT_NONE, _("Select None")); #if wxUSE_FINDREPLDLG editMenu->Append(ID_FIND, _("Find")); #endif appMenuBar->Append(editMenu, _("Edit")); viewMenu = new wxMenu(); viewMenu->Append(ID_STOP, _("Stop")); viewMenu->Append(ID_REFRESH, _("Refresh")); viewMenu->AppendSeparator(); viewMenu->Append(ID_VIEW_SOURCE, _("View Source")); viewMenu->Append(ID_VIEW_LINK, _("Link Properties")); appMenuBar->Append(viewMenu, _("View")); //toolMenu = new wxMenu(); //toolMenu->Append(ID_SPELLCHECK, _("Check Spelling")); //appMenuBar->Append(toolMenu, _("Tool")); this->SetMenuBar(appMenuBar); } else hasMenu = FALSE; //myClipboard = new wxClipboard(); //@nonl //@-node:<< Menu >> //@nl //@ << Toolbar >> //@+node:<< Toolbar >> //Create a fake toolbar - it's not pretty but works for now if (showToolbar){ hasToolbar = TRUE; wxBitmap BackOn = wxBitmap(back24_xpm); wxBitmap BackOff = wxBitmap(back24_d_xpm); wxBitmap NextOn = wxBitmap(forward24_xpm); wxBitmap NextOff = wxBitmap(forward24_d_xpm); wxBitmap RefreshOn = wxBitmap(refresh24_xpm); wxBitmap RefreshOff = wxBitmap(refresh24_d_xpm); wxBitmap StopOn = wxBitmap(stop24_xpm); wxBitmap StopOff = wxBitmap(stop24_d_xpm); toolbar = this->CreateToolBar(); toolbar->SetMargins(6, 2); toolbar->AddTool(ID_BACK, _("Back"), BackOn, BackOff); //toolbar->AddSeparator(); toolbar->AddTool(ID_NEXT, _("Next"), NextOn, NextOff); //toolbar->AddSeparator(); toolbar->AddTool(ID_STOP, _("Stop"), StopOn, StopOff); //toolbar->AddSeparator(); toolbar->AddTool(ID_REFRESH, _("Refresh"), RefreshOn, RefreshOff); //toolbar->AddSeparator(); toolbar->SetToolBitmapSize(wxSize(24,24)); lblAddress = new wxStaticText(toolbar, -1, _("Address:")); txtURL = new wxTextCtrl(toolbar, ID_ADDRESS, _T("http://darkeyetool.sourceforge.net"), wxPoint(400,0), wxSize(180,25)); GoButton = new wxButton(toolbar, ID_GO, _("Go!")); toolbar->AddControl(lblAddress); toolbar->AddControl(txtURL); toolbar->AddControl(GoButton); toolbar->Realize(); } else hasToolbar = FALSE; /* BackButton = new wxButton(this, ID_BACK, _("Back"), wxPoint(30,0)); BackButton->Enable(FALSE); NextButton = new wxButton(this, ID_NEXT, _("Next"), wxPoint(90,0)); NextButton->Enable(FALSE); StopButton = new wxButton(this, ID_STOP, _("Stop"), wxPoint(190,0)); StopButton->Enable(FALSE); RefreshButton = new wxButton(this, ID_REFRESH, _("Refresh"), wxPoint(270,0)); */ //@nonl //@-node:<< Toolbar >> //@nl if (popupWindow) Mozilla = new wxMozillaBrowser(this, ID_MOZCTL, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN); else Mozilla = new wxMozillaBrowser(this, ID... [truncated message content] |
From: Denny V. <vra...@us...> - 2004-04-17 14:56:20
|
Update of /cvsroot/darkeyetool/det/src/guihtml/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14047/icons Log Message: Directory /cvsroot/darkeyetool/det/src/guihtml/icons added to the repository |
From: Denny V. <vra...@us...> - 2004-04-17 14:55:59
|
Update of /cvsroot/darkeyetool/det/src/guihtml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13922/guihtml Log Message: Directory /cvsroot/darkeyetool/det/src/guihtml added to the repository |
From: Denny V. <vra...@us...> - 2004-04-17 13:25:36
|
Update of /cvsroot/darkeyetool/det/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27889 Modified Files: det.cpp Log Message: Daten lesen und generieren Index: det.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/det.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** det.cpp 17 Apr 2004 11:43:53 -0000 1.49 --- det.cpp 17 Apr 2004 13:25:19 -0000 1.50 *************** *** 502,512 **** Lese(DSA::schriften(), pm); Lese(DSA::sprachen(), pm); ! //Lese(DSA::zaubersprueche(), pm); ! //Lese(DSA::rassen(), pm); ! //Lese(DSA::kulturen(), pm); ! //Lese(DSA::professionen(), pm); Lese(DSA::personen(), pm); delete pm; ! //GeneriereDaten(); } //@nonl --- 502,512 ---- Lese(DSA::schriften(), pm); Lese(DSA::sprachen(), pm); ! Lese(DSA::zaubersprueche(), pm); ! Lese(DSA::rassen(), pm); ! Lese(DSA::kulturen(), pm); ! Lese(DSA::professionen(), pm); Lese(DSA::personen(), pm); delete pm; ! GeneriereDaten(); } //@nonl *************** *** 1342,1345 **** --- 1342,1348 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.50 2004/04/17 13:25:19 vrandezo + // Daten lesen und generieren + // // Revision 1.49 2004/04/17 11:43:53 vrandezo // ein ifdef uebersehen |
From: Denny V. <vra...@us...> - 2004-04-17 13:24:11
|
Update of /cvsroot/darkeyetool/det/src/dsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27612 Modified Files: Voraussetzung.cpp Log Message: mehr Info Index: Voraussetzung.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/dsa/Voraussetzung.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Voraussetzung.cpp 12 Apr 2004 13:20:23 -0000 1.21 --- Voraussetzung.cpp 17 Apr 2004 13:24:02 -0000 1.22 *************** *** 379,383 **** if (!gefunden) { ! Log::Info(_t("Unbekannte Voraussetzung")); ++rv; } --- 379,383 ---- if (!gefunden) { ! Log::Info(_t("Unbekannte Voraussetzung") + ": " + ID()); ++rv; } *************** *** 435,438 **** --- 435,441 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.22 2004/04/17 13:24:02 vrandezo + // mehr Info + // // Revision 1.21 2004/04/12 13:20:23 vrandezo // Merkmalskenntnisse implementiert |
From: Denny V. <vra...@us...> - 2004-04-17 13:12:10
|
Update of /cvsroot/darkeyetool/det/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25404 Modified Files: ProfessionGUISpruechewx.cpp Log Message: erst compilen, dann updaten - typo Index: ProfessionGUISpruechewx.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/gui/ProfessionGUISpruechewx.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProfessionGUISpruechewx.cpp 17 Apr 2004 13:09:42 -0000 1.2 --- ProfessionGUISpruechewx.cpp 17 Apr 2004 13:11:59 -0000 1.3 *************** *** 223,227 **** if (liste_->GetSelection()==-1) return; ! sprueche_->erase(std::find(sprueche_->begin(), sprueche_->end(), list_->GetStringSelection().c_str())); Update(); --- 223,227 ---- if (liste_->GetSelection()==-1) return; ! sprueche_->erase(std::find(sprueche_->begin(), sprueche_->end(), liste_->GetStringSelection().c_str())); Update(); *************** *** 234,237 **** --- 234,240 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.3 2004/04/17 13:11:59 vrandezo + // erst compilen, dann updaten - typo + // // Revision 1.2 2004/04/17 13:09:42 vrandezo // Falsche Liste selektiert |
From: Denny V. <vra...@us...> - 2004-04-17 13:09:51
|
Update of /cvsroot/darkeyetool/det/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25028 Modified Files: ProfessionGUISpruechewx.cpp Log Message: Falsche Liste selektiert Index: ProfessionGUISpruechewx.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/gui/ProfessionGUISpruechewx.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProfessionGUISpruechewx.cpp 12 Apr 2004 23:16:27 -0000 1.1 --- ProfessionGUISpruechewx.cpp 17 Apr 2004 13:09:42 -0000 1.2 *************** *** 223,227 **** if (liste_->GetSelection()==-1) return; ! sprueche_->erase(std::find(sprueche_->begin(), sprueche_->end(), rest_->GetStringSelection().c_str())); Update(); --- 223,227 ---- if (liste_->GetSelection()==-1) return; ! sprueche_->erase(std::find(sprueche_->begin(), sprueche_->end(), list_->GetStringSelection().c_str())); Update(); *************** *** 234,237 **** --- 234,240 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.2 2004/04/17 13:09:42 vrandezo + // Falsche Liste selektiert + // // Revision 1.1 2004/04/12 23:16:27 vrandezo // Professionen fuehren bekannte Zaubersprueche mit |
From: Denny V. <vra...@us...> - 2004-04-17 11:44:02
|
Update of /cvsroot/darkeyetool/det/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11520 Modified Files: det.cpp Log Message: ein ifdef uebersehen Index: det.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/det.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** det.cpp 17 Apr 2004 11:42:01 -0000 1.48 --- det.cpp 17 Apr 2004 11:43:53 -0000 1.49 *************** *** 1317,1321 **** --- 1317,1323 ---- EVT_MENU(det_Bearbeiten_Sonderfertigkeiten, detFrame::OnBearbeitenSonderfertigkeiten) EVT_MENU(det_Bearbeiten_Zaubersprueche, detFrame::OnBearbeitenZaubersprueche) + #ifdef MOZGUI EVT_MENU(det_Bearbeiten_MozGUI, detFrame::OnBearbeitenMozGUI) + #endif EVT_MENU(det_Einstellungen_GP_Normalbuerger, detFrame::OnEinstellungenGPNormalbuerger) EVT_MENU(det_Einstellungen_GP_Jugendlicher, detFrame::OnEinstellungenGPJugendlicher) *************** *** 1340,1343 **** --- 1342,1348 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.49 2004/04/17 11:43:53 vrandezo + // ein ifdef uebersehen + // // Revision 1.48 2004/04/17 11:42:01 vrandezo // test der neuen GUI |
From: Denny V. <vra...@us...> - 2004-04-17 11:42:14
|
Update of /cvsroot/darkeyetool/det/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11184 Modified Files: det.cpp Log Message: test der neuen GUI Achtung - bitte haltet das Geheim bis 1.32 ;) Die restlichen Dateien folgen noch heute Index: det.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/det.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** det.cpp 17 Apr 2004 11:04:46 -0000 1.47 --- det.cpp 17 Apr 2004 11:42:01 -0000 1.48 *************** *** 176,180 **** --- 176,182 ---- void OnBearbeitenSonderfertigkeiten(wxCommandEvent& event); void OnBearbeitenZaubersprueche(wxCommandEvent& event); + #ifdef MOZGUI void OnBearbeitenMozGUI(wxCommandEvent& event); + #endif void OnEinstellungenGPNormalbuerger(wxCommandEvent& event); void OnEinstellungenGPJugendlicher(wxCommandEvent& event); *************** *** 274,278 **** det_Bearbeiten_Sonderfertigkeiten, det_Bearbeiten_Zaubersprueche, ! det_Bearbeiten_MozGUI, det_Einstellungen_GP_Normalbuerger, det_Einstellungen_GP_Jugendlicher, --- 276,282 ---- det_Bearbeiten_Sonderfertigkeiten, det_Bearbeiten_Zaubersprueche, ! #ifdef MOZGUI ! det_Bearbeiten_MozGUI, ! #endif det_Einstellungen_GP_Normalbuerger, det_Einstellungen_GP_Jugendlicher, *************** *** 364,369 **** menuBearbeiten->Append(det_Bearbeiten_CharakteristikaSub, "&Vor- && Nachteile und SF", menuBearbeitenCharakteristika, "Bearbeiten von Vor- und Nachteilen und Sonderfertigkeiten..."); menuBearbeiten->Append(det_Bearbeiten_Zaubersprueche, "&Zaubersprüche\tCtrl-Z", "Zaubersprüche editieren, löschen, erstellen..."); menuBearbeiten->Append(det_Bearbeiten_MozGUI, "Neue &GUI\tCtrl-G", "Alternative GUI (Test)"); ! wxMenu* menuEinstellungen = new wxMenu(); wxMenu* menuEinstellungenStartGP = new wxMenu(); --- 368,374 ---- menuBearbeiten->Append(det_Bearbeiten_CharakteristikaSub, "&Vor- && Nachteile und SF", menuBearbeitenCharakteristika, "Bearbeiten von Vor- und Nachteilen und Sonderfertigkeiten..."); menuBearbeiten->Append(det_Bearbeiten_Zaubersprueche, "&Zaubersprüche\tCtrl-Z", "Zaubersprüche editieren, löschen, erstellen..."); + #ifdef MOZUGUI menuBearbeiten->Append(det_Bearbeiten_MozGUI, "Neue &GUI\tCtrl-G", "Alternative GUI (Test)"); ! #endif wxMenu* menuEinstellungen = new wxMenu(); wxMenu* menuEinstellungenStartGP = new wxMenu(); *************** *** 867,870 **** --- 872,876 ---- //@-node:OnBearbeitenZaubersprueche //@+node:OnBearbeitenMozGUI + #ifdef MOZGUI #include "guihtml/wxMozillaWindow.h" *************** *** 873,876 **** --- 879,883 ---- moz->Show(true); } + #endif //@nonl //@-node:OnBearbeitenMozGUI *************** *** 1333,1336 **** --- 1340,1348 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.48 2004/04/17 11:42:01 vrandezo + // test der neuen GUI + // Achtung - bitte haltet das Geheim bis 1.32 ;) + // Die restlichen Dateien folgen noch heute + // // Revision 1.47 2004/04/17 11:04:46 vrandezo // Version 1.31 final |
From: Denny V. <vra...@us...> - 2004-04-17 11:04:55
|
Update of /cvsroot/darkeyetool/det/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5520 Modified Files: det.cpp Log Message: Version 1.31 final Index: det.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/det.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** det.cpp 14 Apr 2004 03:58:07 -0000 1.46 --- det.cpp 17 Apr 2004 11:04:46 -0000 1.47 *************** *** 8,12 **** //@<< Version >> //@+node:<< Version >> ! #define detVERSION "1.31 Beta" #define detWEBSITE "darkeyetool.sourceforge.net" #define detEMAIL "de...@no..." --- 8,12 ---- //@<< Version >> //@+node:<< Version >> ! #define detVERSION "1.31" #define detWEBSITE "darkeyetool.sourceforge.net" #define detEMAIL "de...@no..." *************** *** 161,165 **** void OnDatenDebug(wxCommandEvent& event); #endif ! void OnBearbeitenHelden(wxCommandEvent& event); void OnBearbeitenRassen(wxCommandEvent& event); void OnBearbeitenKulturen(wxCommandEvent& event); --- 161,165 ---- void OnDatenDebug(wxCommandEvent& event); #endif ! void OnBearbeitenHelden(wxCommandEvent& event); void OnBearbeitenRassen(wxCommandEvent& event); void OnBearbeitenKulturen(wxCommandEvent& event); *************** *** 176,179 **** --- 176,180 ---- void OnBearbeitenSonderfertigkeiten(wxCommandEvent& event); void OnBearbeitenZaubersprueche(wxCommandEvent& event); + void OnBearbeitenMozGUI(wxCommandEvent& event); void OnEinstellungenGPNormalbuerger(wxCommandEvent& event); void OnEinstellungenGPJugendlicher(wxCommandEvent& event); *************** *** 273,276 **** --- 274,278 ---- det_Bearbeiten_Sonderfertigkeiten, det_Bearbeiten_Zaubersprueche, + det_Bearbeiten_MozGUI, det_Einstellungen_GP_Normalbuerger, det_Einstellungen_GP_Jugendlicher, *************** *** 362,365 **** --- 364,368 ---- menuBearbeiten->Append(det_Bearbeiten_CharakteristikaSub, "&Vor- && Nachteile und SF", menuBearbeitenCharakteristika, "Bearbeiten von Vor- und Nachteilen und Sonderfertigkeiten..."); menuBearbeiten->Append(det_Bearbeiten_Zaubersprueche, "&Zaubersprüche\tCtrl-Z", "Zaubersprüche editieren, löschen, erstellen..."); + menuBearbeiten->Append(det_Bearbeiten_MozGUI, "Neue &GUI\tCtrl-G", "Alternative GUI (Test)"); wxMenu* menuEinstellungen = new wxMenu(); *************** *** 489,504 **** Lese(DSA::regeln(), pm); Lese(DSA::charakteristika(), pm); ! Lese(DSA::sonderfertigkeiten(), pm); Lese(DSA::talente(), pm); Lese(DSA::kampftechniken(), pm); Lese(DSA::schriften(), pm); Lese(DSA::sprachen(), pm); ! Lese(DSA::zaubersprueche(), pm); ! Lese(DSA::rassen(), pm); ! Lese(DSA::kulturen(), pm); ! Lese(DSA::professionen(), pm); Lese(DSA::personen(), pm); delete pm; ! GeneriereDaten(); } //@nonl --- 492,507 ---- Lese(DSA::regeln(), pm); Lese(DSA::charakteristika(), pm); ! Lese(DSA::sonderfertigkeiten(), pm); Lese(DSA::talente(), pm); Lese(DSA::kampftechniken(), pm); Lese(DSA::schriften(), pm); Lese(DSA::sprachen(), pm); ! //Lese(DSA::zaubersprueche(), pm); ! //Lese(DSA::rassen(), pm); ! //Lese(DSA::kulturen(), pm); ! //Lese(DSA::professionen(), pm); Lese(DSA::personen(), pm); delete pm; ! //GeneriereDaten(); } //@nonl *************** *** 862,867 **** f->Show(true); } - //@nonl //@-node:OnBearbeitenZaubersprueche //@+node:OnEinstellungenGPNormalbuerger void detFrame::OnEinstellungenGPNormalbuerger(wxCommandEvent& WXUNUSED(event)) { --- 865,878 ---- f->Show(true); } //@-node:OnBearbeitenZaubersprueche + //@+node:OnBearbeitenMozGUI + #include "guihtml/wxMozillaWindow.h" + + void detFrame::OnBearbeitenMozGUI(wxCommandEvent& WXUNUSED(event)) { + wxMozillaWindow* moz = new wxMozillaWindow(this, false, false, false, false); // das vorletzte schaltet die Statusleiste an oder aus + moz->Show(true); + } + //@nonl + //@-node:OnBearbeitenMozGUI //@+node:OnEinstellungenGPNormalbuerger void detFrame::OnEinstellungenGPNormalbuerger(wxCommandEvent& WXUNUSED(event)) { *************** *** 1299,1302 **** --- 1310,1314 ---- EVT_MENU(det_Bearbeiten_Sonderfertigkeiten, detFrame::OnBearbeitenSonderfertigkeiten) EVT_MENU(det_Bearbeiten_Zaubersprueche, detFrame::OnBearbeitenZaubersprueche) + EVT_MENU(det_Bearbeiten_MozGUI, detFrame::OnBearbeitenMozGUI) EVT_MENU(det_Einstellungen_GP_Normalbuerger, detFrame::OnEinstellungenGPNormalbuerger) EVT_MENU(det_Einstellungen_GP_Jugendlicher, detFrame::OnEinstellungenGPJugendlicher) *************** *** 1321,1324 **** --- 1333,1339 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.47 2004/04/17 11:04:46 vrandezo + // Version 1.31 final + // // Revision 1.46 2004/04/14 03:58:07 twel // Menü Bearbeiten detachable gemacht |
From: Twelwan <tw...@us...> - 2004-04-14 03:58:16
|
Update of /cvsroot/darkeyetool/det/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9417/src Modified Files: det.cpp Log Message: Menü Bearbeiten detachable gemacht Index: det.cpp =================================================================== RCS file: /cvsroot/darkeyetool/det/src/det.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** det.cpp 9 Apr 2004 22:25:23 -0000 1.45 --- det.cpp 14 Apr 2004 03:58:07 -0000 1.46 *************** *** 339,343 **** menuDaten->Append(det_Daten_Beenden, "&Beenden\tAlt-F4", "Beendet das DSA4 Werkzeug"); ! wxMenu* menuBearbeiten = new wxMenu(); menuBearbeiten->Append(det_Bearbeiten_Helden, "&Helden\tCtrl-H", "Helden generieren, drucken, steigern, exportieren..."); menuBearbeiten->AppendSeparator(); --- 339,343 ---- menuDaten->Append(det_Daten_Beenden, "&Beenden\tAlt-F4", "Beendet das DSA4 Werkzeug"); ! wxMenu* menuBearbeiten = new wxMenu("", wxMENU_TEAROFF); menuBearbeiten->Append(det_Bearbeiten_Helden, "&Helden\tCtrl-H", "Helden generieren, drucken, steigern, exportieren..."); menuBearbeiten->AppendSeparator(); *************** *** 1321,1324 **** --- 1321,1327 ---- //@+node:<< Version History >> // $Log$ + // Revision 1.46 2004/04/14 03:58:07 twel + // Menü Bearbeiten detachable gemacht + // // Revision 1.45 2004/04/09 22:25:23 vrandezo // Version 1.31 Beta - Zauberfertigkeiten |