Menu
▾
▴
sharedaemon-cvs — ShareDaemon CVS Updates
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(102) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(38) |
Feb
(16) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Alo S. <al...@ho...> - 2004-03-06 09:55:07
|
Hello ShareDaemon-CVS list subscribers. We have moved our CVS repository to BerliOS since SourceForge CVS services are unusable. Please subscribe to our new CVS-commits mailing list on the following address: https://lists.berlios.de/mailman/listinfo/sharedaemon-cvs More information on accessing our new CVS repository can be found the CVS information page on our project page on BerliOS here: http://developer.berlios.de/cvs/?group_id=1509 Note: anonymous CVS and webCVS now run against live CVS data, no more ~3 days behind anoncvs! :) Thank you for your continued support, ShareDaemon development team. http://sharedaemon.berlios.de |
|
From: <ma...@us...> - 2004-03-04 19:01:34
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12337 Modified Files: Changelog Log Message: 4 additions that were commited to CVS but never added to changelog... oldest dating back to 2004/02/19 Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- Changelog 15 Feb 2004 16:59:59 -0000 1.127 +++ Changelog 4 Mar 2004 18:40:11 -0000 1.128 @@ -25,6 +25,20 @@ # This also helps in backtracking changes, or reviewing development history. # ############################################################################### +2004/03/03 Alo Sarv + * Added Italian translation by Daniele Barillà from InSys + (http://www.insys.it). + +2004/02/28 Alo Sarv + * wxWidgets 2.5.1 compatibility: Fixed event handlers issues. + +2004/02/23 Alo Sarv + * Cleaned up include mess, now only neccesery wxWidgets headers are + included. This speeds up compilation times by 30%. + +2004/02/19 Alo Sarv + * Nicer compile-time output. + 2004/02/15 Alo Sarv * Fixed maximized state saving between sessions. Credits: Avi. * Fixed shutdown freeze reported by Avi. Credits: Avi. |
|
From: <ma...@us...> - 2004-03-03 16:40:32
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19096 Modified Files: wxInterface.cpp Log Message: Added Italian translation by Daniele Barilla Index: wxInterface.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- wxInterface.cpp 22 Feb 2004 23:54:37 -0000 1.18 +++ wxInterface.cpp 3 Mar 2004 16:20:00 -0000 1.19 @@ -174,6 +174,7 @@ supportedlangs.Add(wxT("French")); supportedlangs.Add(wxT("Spanish")); supportedlangs.Add(wxT("Hungarian")); + supportedlangs.Add(wxT("Italian")); m_config->SetPath(wxT("/General/Lang")); |
|
From: <ma...@us...> - 2004-03-03 16:40:32
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19096/lang Modified Files: Makefile Added Files: Italian.po Log Message: Added Italian translation by Daniele Barilla --- NEW FILE: Italian.po --- # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # msgid "" msgstr "" "Project-Id-Version: wxInterface Italian 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-03-03 18:00+0200\n" "PO-Revision-Date: 2004-03-02 16:50+0100\n" "Last-Translator: Daniele Barillà <ad...@in...>\n" "Language-Team: Italian <su...@in...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../DownloadListCtrl.cpp:53 ../SharedFilesListCtrl.cpp:54 msgid "File Name" [...1173 lines suppressed...] #~ msgid "max Size" #~ msgstr "Diimensione max." #~ msgid "Availability" #~ msgstr "Disponibile" #~ msgid "Extension" #~ msgstr "Estensione" #~ msgid "Direct Download" #~ msgstr "Download Diretto" #~ msgid "ED2K Link(s)" #~ msgstr "ED2K Link(s)" #~ msgid "Start" #~ msgstr "Avvia" #~ msgid "Download Selected" #~ msgstr "Download Selezionati" Index: Makefile =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 28 Feb 2004 07:32:02 -0000 1.3 +++ Makefile 3 Mar 2004 16:20:00 -0000 1.4 @@ -7,12 +7,14 @@ @msgmerge French.po empty.po -o French.po; @msgmerge German.po empty.po -o German.po; @msgmerge Spanish.po empty.po -o Spanish.po; + @msgmerge Italian.po empty.po -o Italian.po; @echo Compiling language catalogs...; @msgfmt Estonian.po -o Estonian.mo; @msgfmt French.po -o French.mo; @msgfmt German.po -o German.mo; @msgfmt Spanish.po -o Spanish.mo; + @msgfmt Italian.po -o Italian.mo; clean: @echo Cleaning up language catalogs...; - @rm -f Estonian.mo French.mo German.mo Spanish.mo; + @rm -f Estonian.mo French.mo German.mo Spanish.mo Italian.mo; |
|
From: <ma...@us...> - 2004-02-28 07:49:45
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16811 Modified Files: Estonian.po French.po German.po Spanish.po empty.po Log Message: Updated language files. Index: Estonian.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Estonian.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Estonian.po 31 Dec 2003 16:27:19 -0000 1.6 +++ Estonian.po 28 Feb 2004 07:32:34 -0000 1.7 @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-31 16:43+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-28 09:29+0200\n" "PO-Revision-Date: 2003-12-31 17:18+0200\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -14,216 +15,228 @@ "Content-Type: text/plain; charset=UTF-8\n" [...1382 lines suppressed...] +#~ msgid "min Size" +#~ msgstr "min Suurus" + +#~ msgid "max Size" +#~ msgstr "max suurus" + +#~ msgid "Extension" +#~ msgstr "Laiend" + +#~ msgid "Direct Download" +#~ msgstr "Otsene allalaadimine" + +#~ msgid "ED2K Link(s)" +#~ msgstr "ED2K Lingid" + +#~ msgid "Start" +#~ msgstr "Alusta" + +#~ msgid "Download Selected" +#~ msgstr "Lae valitud alla" Index: French.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/French.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- French.po 31 Dec 2003 16:27:19 -0000 1.4 +++ French.po 28 Feb 2004 07:32:35 -0000 1.5 @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: wxInterface CVS-30-12-2003\n" -"POT-Creation-Date: 2003-12-31 16:43+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-28 09:29+0200\n" "PO-Revision-Date: 2003-12-31 17:42+0200\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: French <n.l...@fr...>\n" @@ -14,53 +15,68 @@ "Content-Type: text/plain; charset=UTF-8\n" [...1412 lines suppressed...] +#~ msgid "Text" +#~ msgstr "Texte" + +#~ msgid "Reset" +#~ msgstr "Annuler" + +#~ msgid "Filter" +#~ msgstr "Filtre" + +#~ msgid "min Size" +#~ msgstr "Taille Min." + +#~ msgid "max Size" +#~ msgstr "Taille Max." + +#~ msgid "Extension" +#~ msgstr "Extension" + +#~ msgid "ED2K Link(s)" +#~ msgstr "Lien(s) ED2K" Index: German.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/German.po,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- German.po 19 Jan 2004 20:13:35 -0000 1.9 +++ German.po 28 Feb 2004 07:32:35 -0000 1.10 @@ -6,541 +6,500 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-01-16 20:24+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-28 09:29+0200\n" "PO-Revision-Date: 2004-01-19 22:11+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" [...1267 lines suppressed...] +"neue\n" "Iconset Name also MeinNeuerIconSet ist, wird dies im\n" "images/meinneuericonset Verzeichnis gesucht." -#: ../wxInterface_wdr.cpp:549 +#: ../wxInterface_wdr.cpp:552 msgid "ShareDaemon wxInterface ready!" msgstr "ShareDaemon wxInterface bereit!" -#: ../wxInterface_wdr.cpp:585 +#: ../wxInterface_wdr.cpp:588 msgid "0 kb/s" msgstr "0 kb/s" # or "Verbindung verloren" is good too -#: ../wxInterface_wdr.cpp:594 +#: ../wxInterface_wdr.cpp:597 msgid "Disconnected" msgstr "Getrennt" - Index: Spanish.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Spanish.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Spanish.po 31 Dec 2003 16:27:19 -0000 1.4 +++ Spanish.po 28 Feb 2004 07:32:36 -0000 1.5 @@ -10,7 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: spanish\n" -"POT-Creation-Date: 2003-12-31 16:43+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-28 09:29+0200\n" "PO-Revision-Date: 2003-12-31 17:32+0200\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: Español\n" @@ -18,74 +19,65 @@ "Content-Type: text/plain; charset=UTF-8\n" [...1421 lines suppressed...] +#~ msgid "max Size" +#~ msgstr "Tamaño máx." + +#~ msgid "Availability" +#~ msgstr "Disponibilidad" + +#~ msgid "Extension" +#~ msgstr "Extensión" + +#~ msgid "Direct Download" +#~ msgstr "Descarga directa" + +#~ msgid "ED2K Link(s)" +#~ msgstr "ED2K Link(s)" + +#~ msgid "Start" +#~ msgstr "Empezar" + +#~ msgid "Download Selected" +#~ msgstr "Descargar seleccionado" Index: empty.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/empty.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- empty.po 31 Dec 2003 16:27:19 -0000 1.5 +++ empty.po 28 Feb 2004 07:32:36 -0000 1.6 @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-31 16:43+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-28 09:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -15,459 +16,621 @@ "Content-Type: text/plain; charset=UTF-8\n" [...1179 lines suppressed...] "Please enter the name of your new icon set in the box below.\n" "The iconset files must be in PNG format and filenames must\n" @@ -1036,14 +1119,14 @@ "images/mynewiconset dir." msgstr "" -#: ../wxInterface_wdr.cpp:743 +#: ../wxInterface_wdr.cpp:552 msgid "ShareDaemon wxInterface ready!" msgstr "" -#: ../wxInterface_wdr.cpp:779 +#: ../wxInterface_wdr.cpp:588 msgid "0 kb/s" msgstr "" -#: ../wxInterface_wdr.cpp:788 +#: ../wxInterface_wdr.cpp:597 msgid "Disconnected" msgstr "" |
|
From: <ma...@us...> - 2004-02-28 07:49:11
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16756 Modified Files: Makefile Log Message: Now applies correct charset. Index: Makefile =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 31 Dec 2003 15:16:18 -0000 1.2 +++ Makefile 28 Feb 2004 07:32:02 -0000 1.3 @@ -1,7 +1,8 @@ all: @echo Updating language catalogs...; @xgettext -k'_:1' ../*.cpp ../*.h -o empty.po; -# @sed 's/CHARSET/iso-8859-1/' empty.po > empty.po; + @sed 's/CHARSET/UTF-8/' empty.po > .tmp; + @mv .tmp empty.po; @msgmerge Estonian.po empty.po -o Estonian.po; @msgmerge French.po empty.po -o French.po; @msgmerge German.po empty.po -o German.po; |
|
From: <ma...@us...> - 2004-02-28 03:10:50
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11756 Modified Files: MainDlg.cpp Log Message: Fixed duplicate events triggering on mouse events in toolbar. Index: MainDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- MainDlg.cpp 28 Feb 2004 02:48:01 -0000 1.65 +++ MainDlg.cpp 28 Feb 2004 02:53:49 -0000 1.66 @@ -66,7 +66,6 @@ /******************************************************************************/ void MyToolBar::RightClick(wxMouseEvent &event) { mainframe->ShowToolPopupMenu(); - event.Skip(); } /* .... */ @@ -76,7 +75,6 @@ dlg->ShowModal(); delete dlg; } - event.Skip(); } BEGIN_EVENT_TABLE(DetachedFrame, wxFrame) @@ -1008,7 +1006,7 @@ ); if (GetMenuBar() == NULL) { m_config->Write( - wxT("/General/Show MenuBar"), + wxT("/General/Show MenuBar"), true ); CreateMyMenuBar(); |
|
From: <ma...@us...> - 2004-02-28 03:05:02
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10867 Modified Files: GUISettingsDlg.cpp GUISettingsDlg.h MainDlg.cpp MainDlg.h SearchWnd.cpp SearchWnd.h ServerWnd.cpp ServerWnd.h TransferWnd.cpp TransferWnd.h Log Message: wxWidgets 2.5.1 compatibility: Fixed events handling issues. Index: GUISettingsDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- GUISettingsDlg.cpp 22 Feb 2004 23:54:37 -0000 1.38 +++ GUISettingsDlg.cpp 28 Feb 2004 02:48:01 -0000 1.39 @@ -66,16 +66,18 @@ * Handles GUI Settings dialog Ok button event - Saves the settings and * closes the dialog. */ -void CGUISettingsDlg::OnOk(const wxCommandEvent &event) { +void CGUISettingsDlg::OnOk(wxCommandEvent &event) { SaveSettings(); EndModal(0); + event.Skip(); } /* * Handles GUI Settings dialog Cancel button event - closes the dialog. */ -void CGUISettingsDlg::OnCancel(const wxCommandEvent &event) { +void CGUISettingsDlg::OnCancel(wxCommandEvent &event) { EndModal(0); + event.Skip(); } /* @@ -277,12 +279,13 @@ * Handles checking/unchecking Remember Last checkbox - enables/disables * startpage selection combobox as neccesery. */ -void CGUISettingsDlg::OnCheckRememberLast(const wxCommandEvent &event) { +void CGUISettingsDlg::OnCheckRememberLast(wxCommandEvent &event) { if (GetRememberLast()->GetValue()) { GetStartPage()->Disable(); } else { GetStartPage()->Enable(); } + event.Skip(); } /** @@ -290,11 +293,12 @@ * is being disabled, make sure that toolbar is enabled, otherwise user * loses all ways to control the application. */ -void CGUISettingsDlg::OnCheckShowMenu(const wxCommandEvent &event) { +void CGUISettingsDlg::OnCheckShowMenu(wxCommandEvent &event) { if (!GetShowMenu()->GetValue() && !GetShowTool()->GetValue()) { GetShowTool()->SetValue(true); GetToolAlign()->Enable(); } + event.Skip(); } /** @@ -304,7 +308,7 @@ * Also, if toolbar displaying is disabled, also disable toolbar alignment * choice. */ -void CGUISettingsDlg::OnCheckShowTool(const wxCommandEvent &event) { +void CGUISettingsDlg::OnCheckShowTool(wxCommandEvent &event) { if (!GetShowTool()->GetValue()) { if (!GetShowMenu()->GetValue()) { GetShowMenu()->SetValue(true); @@ -313,12 +317,13 @@ } else { GetToolAlign()->Enable(); } + event.Skip(); } /** * Constructs a new dialog to collect new language data. */ -void CGUISettingsDlg::AddLang(const wxCommandEvent &event) { +void CGUISettingsDlg::AddLang(wxCommandEvent &event) { CAddLanguageDlg *addlangdlg = new CAddLanguageDlg( NULL, -1, _("Add new language") ); @@ -327,12 +332,13 @@ GetLang()->SetSelection(GetLang()->GetCount()-1); } delete addlangdlg; + event.Skip(); } /** * Removes a language from the languages list */ -void CGUISettingsDlg::RemoveLang(const wxCommandEvent &event) { +void CGUISettingsDlg::RemoveLang(wxCommandEvent &event) { wxString confirmtext; confirmtext.Format( @@ -347,12 +353,13 @@ GetLang()->Delete(GetLang()->GetSelection()); } GetLang()->SetSelection(0); + event.Skip(); } /** * Constructs a new dialog to collect new iconset data. */ -void CGUISettingsDlg::AddIconSet(const wxCommandEvent &event) { +void CGUISettingsDlg::AddIconSet(wxCommandEvent &event) { CAddIconSetDlg *addiconsetdlg = new CAddIconSetDlg( NULL, -1, _("Add new iconset") ); @@ -361,12 +368,13 @@ GetIconSet()->SetSelection(GetIconSet()->GetCount()-1); } delete addiconsetdlg; + event.Skip(); } /** * Removes current selected item from list of known iconsets. */ -void CGUISettingsDlg::RemoveIconSet(const wxCommandEvent &event) { +void CGUISettingsDlg::RemoveIconSet(wxCommandEvent &event) { wxString confirmtext; confirmtext.Format( @@ -382,6 +390,7 @@ GetIconSet()->Delete(GetIconSet()->GetSelection()); } GetIconSet()->SetSelection(0); + event.Skip(); } void CGUISettingsDlg::CreateControls() { @@ -662,7 +671,7 @@ * (and exists, for that matter), and if everything works as expected, * add the new language to language choice box. */ -void CAddLanguageDlg::AddLangOk(const wxCommandEvent &event) { +void CAddLanguageDlg::AddLangOk(wxCommandEvent &event) { wxString name; /* Get the name and ID from dialog. */ @@ -709,14 +718,16 @@ ); EndModal(true); + event.Skip(); } /** * Handles cancel button event in Language adding dialog. * Destroys the above-mentioed dialog, plain and simple. */ -void CAddLanguageDlg::AddLangCancel(const wxCommandEvent &event) { +void CAddLanguageDlg::AddLangCancel(wxCommandEvent &event) { EndModal(false); + event.Skip(); } /************** @@ -741,13 +752,15 @@ /** * Should we do some checking for the new iconset here? */ -void CAddIconSetDlg::BtnOk(const wxCommandEvent &event) { +void CAddIconSetDlg::BtnOk(wxCommandEvent &event) { EndModal(true); + event.Skip(); } /** * Cancel pressed - return false, causing us abort all changes. */ -void CAddIconSetDlg::BtnCancel(const wxCommandEvent &event) { +void CAddIconSetDlg::BtnCancel(wxCommandEvent &event) { EndModal(false); + event.Skip(); } Index: GUISettingsDlg.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- GUISettingsDlg.h 22 Feb 2004 23:54:37 -0000 1.13 +++ GUISettingsDlg.h 28 Feb 2004 02:48:01 -0000 1.14 @@ -44,15 +44,15 @@ ); private: /* Event handler functions */ - void OnOk(const wxCommandEvent &event); - void OnCancel(const wxCommandEvent &event); - void OnCheckRememberLast(const wxCommandEvent &event); - void OnCheckShowTool(const wxCommandEvent &event); - void OnCheckShowMenu(const wxCommandEvent &event); - void AddLang(const wxCommandEvent &event); - void RemoveLang(const wxCommandEvent &event); - void AddIconSet(const wxCommandEvent &event); - void RemoveIconSet(const wxCommandEvent &event); + void OnOk(wxCommandEvent &event); + void OnCancel(wxCommandEvent &event); + void OnCheckRememberLast(wxCommandEvent &event); + void OnCheckShowTool(wxCommandEvent &event); + void OnCheckShowMenu(wxCommandEvent &event); + void AddLang(wxCommandEvent &event); + void RemoveLang(wxCommandEvent &event); + void AddIconSet(wxCommandEvent &event); + void RemoveIconSet(wxCommandEvent &event); /* Other functions */ void SaveSettings(); @@ -103,8 +103,8 @@ } private: DECLARE_EVENT_TABLE() - void AddLangOk(const wxCommandEvent &event); - void AddLangCancel(const wxCommandEvent &event); + void AddLangOk(wxCommandEvent &event); + void AddLangCancel(wxCommandEvent &event); }; /** @@ -124,8 +124,8 @@ wxTextCtrl* GetIconSet() { return (wxTextCtrl*) FindWindow(ID_ICONSET);} private: DECLARE_EVENT_TABLE() - void BtnOk(const wxCommandEvent &event); - void BtnCancel(const wxCommandEvent &event); + void BtnOk(wxCommandEvent &event); + void BtnCancel(wxCommandEvent &event); }; #endif Index: MainDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- MainDlg.cpp 22 Feb 2004 23:54:37 -0000 1.64 +++ MainDlg.cpp 28 Feb 2004 02:48:01 -0000 1.65 @@ -64,17 +64,19 @@ /* This method is called from event table whenever user right-clicks on */ /* toolbar. We call CMainDlg::ShowToolPopupMenu() to handle the event. */ /******************************************************************************/ -void MyToolBar::RightClick(const wxMouseEvent &event) { +void MyToolBar::RightClick(wxMouseEvent &event) { mainframe->ShowToolPopupMenu(); + event.Skip(); } /* .... */ -void MyToolBar::MiddleDClick(const wxMouseEvent &event) { +void MyToolBar::MiddleDClick(wxMouseEvent &event) { if (event.ControlDown()) { CAboutDlg *dlg = new CAboutDlg(NULL, -1, wxT("About...")); dlg->ShowModal(); delete dlg; } + event.Skip(); } BEGIN_EVENT_TABLE(DetachedFrame, wxFrame) @@ -110,7 +112,7 @@ /******************************************************************** OnClose */ /* Frame close event - sends content back to main frame */ /******************************************************************************/ -void DetachedFrame::OnClose(wxCommandEvent &event) { +void DetachedFrame::OnClose(wxCloseEvent &event) { cnt->content->Hide(); Hide(); if (wxGetApp().mainframe_active) { @@ -126,7 +128,7 @@ EVT_CLOSE(CMainDlg::OnCloseWindow) /* Shutdown event */ EVT_TOOL(-1, CMainDlg::MenuOrToolEvent) /* Menu/Toolbar events */ EVT_BUTTON(ID_BTN_GUISETTINGS, CMainDlg::ShowGUISettingsDlg) - EVT_BUTTON(ID_QUIT, CMainDlg::OnCloseWindow) + EVT_BUTTON(ID_QUIT, CMainDlg::OnBtnQuit) END_EVENT_TABLE() #include <wx/listimpl.cpp> @@ -524,13 +526,14 @@ /********************************************************* ShowGUISettingsDlg */ /* Displays GUI settings dialog and delets it after its finished. */ /******************************************************************************/ -void CMainDlg::ShowGUISettingsDlg() { +void CMainDlg::ShowGUISettingsDlg(wxCommandEvent &event) { CGUISettingsDlg *guisettings = new CGUISettingsDlg( NULL, -1, _("Preferences"), wxDefaultPosition, wxDefaultSize ); guisettings->ShowModal(); delete guisettings; + event.Skip(); } /***************************************************** LoadAndShowDialogPages */ @@ -698,9 +701,11 @@ case ID_BTN_CONNECT: ConnectToAnyServer(); break; - case ID_BTN_GUISETTINGS: - ShowGUISettingsDlg(); + case ID_BTN_GUISETTINGS: { + wxCommandEvent evt; + ShowGUISettingsDlg(evt); break; + } default: break; } @@ -767,10 +772,12 @@ Close(); event.Skip(); break; - case ID_EDIT_GUI_SETTINGS: - ShowGUISettingsDlg(); + case ID_EDIT_GUI_SETTINGS: { + wxCommandEvent evt; + ShowGUISettingsDlg(evt); event.Skip(); break; + } case ID_VIEW_MENUBAR: if ( !(GetViewMenuBar()->IsChecked()) && @@ -1029,10 +1036,12 @@ DetachCurPage(); event.Skip(); break; - case ID_EDIT_GUI_SETTINGS: - ShowGUISettingsDlg(); + case ID_EDIT_GUI_SETTINGS: { + wxCommandEvent evt; + ShowGUISettingsDlg(evt); event.Skip(); break; + } case ID_FULLSCREEN: ShowFullScreen( !IsFullScreen(), @@ -1239,3 +1248,11 @@ _("Options"), wxT("btn_guisettings") ); } + +/** + * Handles events on ID_QUIT button -> Closes the main dialog frame. + */ +void CMainDlg::OnBtnQuit(wxCommandEvent &event) { + Close(); + event.Skip(); +} Index: MainDlg.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- MainDlg.h 22 Feb 2004 23:54:37 -0000 1.22 +++ MainDlg.h 28 Feb 2004 02:48:01 -0000 1.23 @@ -73,8 +73,8 @@ ); /* Constructor */ private: DECLARE_EVENT_TABLE() /* Event table declaration */ - void RightClick(const wxMouseEvent &event); /* Mouse Rclick events */ - void MiddleDClick(const wxMouseEvent &event); /* ... */ + void RightClick(wxMouseEvent &event); /* Mouse Rclick events */ + void MiddleDClick(wxMouseEvent &event); /* ... */ }; /**************************** DetachedFrame class *****************************/ @@ -93,7 +93,7 @@ wxLocale &m_locale; /* Localization variable */ private: DECLARE_EVENT_TABLE() /* Event table declaration */ - void OnClose(wxCommandEvent &event); /* Window closing event */ + void OnClose(wxCloseEvent &event); /* Window closing event */ Page *cnt; /* Contents of the frame */ }; @@ -169,13 +169,14 @@ void ToolEvent(wxCommandEvent &event); /* Toolbar events */ void OnCloseWindow(wxCloseEvent &event); /* Window closing event */ void PopUpMenuEvents(wxCommandEvent &event);/* Tbar popup-menu events */ + void OnBtnQuit(wxCommandEvent &event); /* Quit button */ /* Member functions */ void CreateSysTray(); /* Creates system tray icon */ void LoadAndShowDialogPages(); /* Loads dialog pages */ void ConnectToAnyServer(); /* Sends "connect" command to core */ - bool SetActivePage(const wxString &to_show); /* Displays page */ - void ShowGUISettingsDlg(); /* Displays GUI settings dialog */ + bool SetActivePage(const wxString &to_show); /* Displays page */ + void ShowGUISettingsDlg(wxCommandEvent &event); /* Show settings dlg */ void UpdateToolBar(); /* Updates toolbar buttons */ void UpdateMenuBar(); /* Updates menubar objects */ void RemovePage( /* Removes page `to_remove` */ Index: SearchWnd.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchWnd.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- SearchWnd.cpp 13 Jan 2004 23:10:26 -0000 1.18 +++ SearchWnd.cpp 28 Feb 2004 02:48:01 -0000 1.19 @@ -360,7 +360,7 @@ /* If its shown, remove it from mainsizer and hide it, otherwise, prepend it */ /* to mainsizer and show it. Refresh() to avoid wierd visual leftovers. */ /******************************************************************************/ -void CSearchWnd::ToggleSidebar(const wxCommandEvent &event) { +void CSearchWnd::ToggleSidebar(wxCommandEvent &event) { #ifdef __HAVE_REMOVE_GROWABLE_COL__ if (sidebar->IsShown()) { mainsizer->Remove(sidebar); @@ -385,6 +385,7 @@ } Layout(); Refresh(); + event.Skip(); #endif } @@ -393,14 +394,14 @@ /* place, rather than having separate method for each of them (hei, they'r */ /* not THAT important :P). Anyway, nothing of interest to see here - move on. */ /******************************************************************************/ -void CSearchWnd::HandleCheckEvents(const wxCommandEvent &event) { - switch (event.GetId()) { - case ID_FLT_ALL: - CreateFilterChecks( - GetCheckFilterAll()->GetParent(), - s_filters, - !GetCheckFilterAll()->GetValue() - ); +void CSearchWnd::HandleCheckEvents(wxCommandEvent &event) { + switch (event.GetId()) { + case ID_FLT_ALL: + CreateFilterChecks( + GetCheckFilterAll()->GetParent(), + s_filters, + !GetCheckFilterAll()->GetValue() + ); break; case ID_CHK_FLT_SIZE_L: GetTextFilterSizeL()->Enable( @@ -425,6 +426,7 @@ default: break; } + event.Skip(); } /********************************************************* CreateFiltersPanel */ Index: SearchWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchWnd.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- SearchWnd.h 22 Feb 2004 23:54:37 -0000 1.11 +++ SearchWnd.h 28 Feb 2004 02:48:01 -0000 1.12 @@ -68,9 +68,9 @@ void SaveSettings(); /* Save various settings, like check states etc */ /* Event handlers */ - void ToggleSidebar(const wxCommandEvent &event);/* Toggles sidebar :) */ + void ToggleSidebar(wxCommandEvent &event); /* Toggles sidebar :) */ void HandleCheckEvents( /* Handles checkbox on/off switching events */ - const wxCommandEvent &event + wxCommandEvent &event ); /* Getters */ Index: ServerWnd.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- ServerWnd.cpp 22 Feb 2004 23:54:37 -0000 1.59 +++ ServerWnd.cpp 28 Feb 2004 02:48:01 -0000 1.60 @@ -100,14 +100,16 @@ /* * Add new server to servers list. */ -void CServerWnd::AddNewServer() { +void CServerWnd::AddNewServer(wxCommandEvent &event) { + event.Skip(); } /* * Downloads the server.met file from given URL and adds any new servers found * to server list. */ -void CServerWnd::UpdateFromURL() { +void CServerWnd::UpdateFromURL(wxCommandEvent &event) { + event.Skip(); } /* Creates server page controls */ Index: ServerWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- ServerWnd.h 22 Feb 2004 23:54:37 -0000 1.35 +++ ServerWnd.h 28 Feb 2004 02:48:01 -0000 1.36 @@ -64,8 +64,8 @@ void OnAddLogLine(wxCommandEvent &event); /* Member function declarations */ - void AddNewServer(); - void UpdateFromURL(); + void AddNewServer(wxCommandEvent &event); + void UpdateFromURL(wxCommandEvent &event); void CreateControls(); wxSizer* SettingsPanel( wxWindow *parent, bool call_fit = true, bool set_sizer = true Index: TransferWnd.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/TransferWnd.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- TransferWnd.cpp 22 Feb 2004 23:54:37 -0000 1.28 +++ TransferWnd.cpp 28 Feb 2004 02:48:01 -0000 1.29 @@ -75,7 +75,7 @@ /* * Changes the content of lower splitterwindow frame from Upload to Queue. */ -void CTransferWnd::ChangeToQueue() { +void CTransferWnd::ChangeToQueue(wxCommandEvent &event) { queue = new wxPanel( splatter, -1, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL @@ -83,12 +83,13 @@ QueuePanel(queue); splatter->ReplaceWindow(upload, queue); delete upload; + event.Skip(); } /* * Changes the content of lower splitterwindow frame from Upload to Known. */ -void CTransferWnd::ChangeToKnown() { +void CTransferWnd::ChangeToKnown(wxCommandEvent &event) { known = new wxPanel( splatter, -1, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL @@ -96,12 +97,13 @@ KnownPanel(known); splatter->ReplaceWindow(queue, known); delete queue; + event.Skip(); } /* * Changes the content of lower splitterwindow frame from Known to Upload. */ -void CTransferWnd::ChangeToUpload() { +void CTransferWnd::ChangeToUpload(wxCommandEvent &event) { upload = new wxPanel( splatter, -1, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL @@ -109,6 +111,7 @@ UploadPanel(upload); splatter->ReplaceWindow(known, upload); delete known; + event.Skip(); } /* Index: TransferWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/TransferWnd.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- TransferWnd.h 22 Feb 2004 23:54:37 -0000 1.13 +++ TransferWnd.h 28 Feb 2004 02:48:01 -0000 1.14 @@ -60,9 +60,9 @@ DECLARE_EVENT_TABLE() /* Member event handler functions */ - void ChangeToQueue(); - void ChangeToKnown(); - void ChangeToUpload(); + void ChangeToQueue(wxCommandEvent &event); + void ChangeToKnown(wxCommandEvent &event); + void ChangeToUpload(wxCommandEvent &event); /* Member layout generation functions */ void CreateControls(); |
|
From: <ma...@us...> - 2004-02-28 03:03:59
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10709 Modified Files: SysTray.cpp Log Message: wxWidgets 2.5.1 compatibility: Fixed wxMBConv issues. Index: SysTray.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SysTray.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- SysTray.cpp 28 Dec 2003 05:34:17 -0000 1.13 +++ SysTray.cpp 28 Feb 2004 02:46:46 -0000 1.14 @@ -132,7 +132,7 @@ { wxString ip=wxT("Not Detected"); char interface[10]="eth"; - wxMBConv convert; + wxMBConvUTF8 convert; int index; index=0; int sfd; @@ -197,7 +197,7 @@ char* temp; long int speed; - wxMBConv convert; + wxMBConvUTF8 convert; GtkWidget *label = GTK_BIN (widget)->child; gtk_label_get (GTK_LABEL(label), &temp); @@ -218,7 +218,7 @@ char* temp; long int speed; - wxMBConv convert; + wxMBConvUTF8 convert; GtkWidget *label = GTK_BIN (widget)->child; gtk_label_get (GTK_LABEL(label), &temp); @@ -302,7 +302,7 @@ { //sets gtk objects GtkWidget *status_menu,*item,*down_speed,*up_speed,*info_menu; - wxMBConv convert; + wxMBConvUTF8 convert; wxString upl_speed,dl_speed; wxString temp; int tempspeed; |
|
From: <mik...@us...> - 2004-02-27 14:30:04
|
Update of /cvsroot/sharedaemon/ui-web/src/server/http/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23576/src/server/http/servlet Modified Files: HttpServletRequest.h HttpServletRequest.cpp HttpSession.h Log Message: 27/02/2004 Mikael Barbeaux * Starting to implement session generation. Index: HttpServletRequest.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-web/src/server/http/servlet/HttpServletRequest.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- HttpServletRequest.h 30 Dec 2003 17:11:59 -0000 1.2 +++ HttpServletRequest.h 27 Feb 2004 14:13:28 -0000 1.3 @@ -65,7 +65,12 @@ * * @return bool */ - bool isSessionIdValid(); + bool isSessionValid(); + + private: + + // session associated to this servlet request + HttpSession *session; }; Index: HttpServletRequest.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-web/src/server/http/servlet/HttpServletRequest.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- HttpServletRequest.cpp 31 Dec 2003 10:43:58 -0000 1.3 +++ HttpServletRequest.cpp 27 Feb 2004 14:13:28 -0000 1.4 @@ -23,12 +23,15 @@ * Creates a HttpServletRequest object. */ HttpServletRequest::HttpServletRequest() : HttpRequest() { + session = 0; } /** * Destructor for HttpServlet object. */ HttpServletRequest::~HttpServletRequest() { + if(session != 0) + delete session; } /** @@ -37,7 +40,13 @@ * if not yet done. */ HttpSession *HttpServletRequest::getSession(bool create) { - return 0; + // session exists and is valid ? ok + if((session != 0) && (session->isValid())) + return session; + + session = 0; + + return session; } /** @@ -45,14 +54,14 @@ * client. */ string HttpServletRequest::getSessionId() { - return ""; + return session->getId(); } /** * Tests if the session associated to this request is * still valid or not. */ -bool HttpServletRequest::isSessionIdValid() { - return true; +bool HttpServletRequest::isSessionValid() { + return session->isValid(); } Index: HttpSession.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-web/src/server/http/servlet/HttpSession.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- HttpSession.h 1 Jan 2004 14:21:10 -0000 1.3 +++ HttpSession.h 27 Feb 2004 14:13:28 -0000 1.4 @@ -113,6 +113,13 @@ * @param value */ void setAttribute(string name, void *value); + + /** + * Tests if the session is valid + * + * @return bool + */ + bool isValid() { return valid; } }; |
|
From: <mik...@us...> - 2004-02-27 14:30:03
|
Update of /cvsroot/sharedaemon/ui-web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23576 Modified Files: .cdtbuild ChangeLog Log Message: 27/02/2004 Mikael Barbeaux * Starting to implement session generation. Index: .cdtbuild =================================================================== RCS file: /cvsroot/sharedaemon/ui-web/.cdtbuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .cdtbuild 28 Dec 2003 12:52:38 -0000 1.5 +++ .cdtbuild 27 Feb 2004 14:13:28 -0000 1.6 @@ -27,6 +27,7 @@ <optionReference id="cygwin.link.ld.paths"> <listOptionValue builtIn="false" value=""G:/MinGW/lib/""/> </optionReference> + <optionReference defaultValue="true" id="cygwin.gnu.linker.options.noshared"/> </toolReference> </configuration> <configuration id="cygwin.exec.debug.490083026" name="Debug" parent="cygwin.exec.debug"> Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/ui-web/ChangeLog,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ChangeLog 1 Jan 2004 14:51:00 -0000 1.31 +++ ChangeLog 27 Feb 2004 14:13:28 -0000 1.32 @@ -23,6 +23,9 @@ ----------------------------------------------------------- +27/02/2004 Mikael Barbeaux + * Starting to implement session generation. + 01/01/2004 Mikael Barbeaux * Fixed a bug while parsing query string of http request. * Basic implementation for method processors ( GET, HEAD and POST ). |
|
From: <ma...@us...> - 2004-02-23 02:27:03
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22191 Modified Files: MBitmapButton.cpp defines.h Log Message: Win32 compile fixes. Index: MBitmapButton.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- MBitmapButton.cpp 22 Feb 2004 23:54:37 -0000 1.14 +++ MBitmapButton.cpp 23 Feb 2004 02:13:53 -0000 1.15 @@ -30,14 +30,15 @@ #include "MBitmapButton.h" -#include <wx/dcmemory.h> -#include <wx/settings.h> - /** * wxMac and wxMSW buttons can have children, use wxButton as base and put * a static bitmap in there. */ #if defined(__WXMSW__) || defined(__WXMAC__) +#include <wx/sizer.h> +#include <wx/statbmp.h> +#include <wx/stattext.h> + BEGIN_EVENT_TABLE(MBitmapButton, wxButton) EVT_BUTTON(-1, MBitmapButton::OnClick) END_EVENT_TABLE() @@ -95,6 +96,8 @@ /* Other (GTK) buttons can't breed, thus we do it in wxBitmapButton */ #else +#include <wx/dcmemory.h> +#include <wx/settings.h> IMPLEMENT_DYNAMIC_CLASS(MBitmapButton, wxBitmapButton) Index: defines.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/defines.h,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- defines.h 14 Jan 2004 13:02:24 -0000 1.48 +++ defines.h 23 Feb 2004 02:13:53 -0000 1.49 @@ -31,7 +31,6 @@ #include <wx/taskbar.h> /* Some defines to make accessing dialog controls easier */ -#define GetDlgItem(X) ((wxTextCtrl*)FindWindowById(X)) #define m_logbook ((wxNotebook*)FindWindowById(ID_LOGBOOK)) #define prefs_ctrl ((wxListCtrl*)FindWindowById(ID_PREFSCTRL)) #define prefs_panel ((wxPanel*)FindWindowById(ID_PREFSPANEL)) |
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30716 Modified Files: AboutDlg.cpp AboutDlg.h DownloadListCtrl.cpp DownloadListCtrl.h GUISettingsDlg.cpp GUISettingsDlg.h Images.cpp Images.h KnownListCtrl.cpp KnownListCtrl.h MBitmapButton.cpp MBitmapButton.h MListCtrl.cpp MListCtrl.h MMultiButton.cpp MMultiButton.h MainDlg.cpp MainDlg.h MessagesWnd.h QueueListCtrl.cpp QueueListCtrl.h SBPanel.cpp SBPanel.h SearchListCtrl.cpp SearchListCtrl.h SearchWnd.h ServerListCtrl.h ServerWnd.cpp ServerWnd.h SharedFilesListCtrl.cpp SharedFilesListCtrl.h SharedFilesWnd.h StatisticsTreeCtrl.h StatisticsWnd.cpp StatisticsWnd.h SysTray.h TransferWnd.cpp TransferWnd.h UploadListCtrl.cpp UploadListCtrl.h wxInterface.cpp wxInterface.h wxInterface.wdr wxInterface_wdr.cpp wxInterface_wdr.h Log Message: Cleaned up headers mess - now only neccesery headers are being included. Index: AboutDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/AboutDlg.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AboutDlg.cpp 14 Jan 2004 13:02:24 -0000 1.1 +++ AboutDlg.cpp 22 Feb 2004 23:54:37 -0000 1.2 @@ -1,749 +1,753 @@ -/* - * This file is part of wxInterface. - * Copyright (C) 2003 Alo Sarv <ma...@us...> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of [...1471 lines suppressed...] + ); + t_title->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD)); + t_title->SetSize(t_title->GetBestSize()); + s_top->Add(t_title, 0, wxLEFT|wxRIGHT|wxTOP, 5); + + wxStaticText *t_desc = new wxStaticText( + this, -1, + wxT("Written by Madcat <ma...@us...>\n" + "Contributions and translations by various other people :)") + ); + s_main->Add(t_desc); + + wxButton *b_close = new wxButton(this, wxID_OK, wxT("Close")); + s_main->Add(b_close, 0, wxALIGN_RIGHT|wxALL, 5); + + SetAutoLayout(true); + SetSizer(s_main); + s_main->Fit(this); + s_main->SetSizeHints(this); +} Index: AboutDlg.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/AboutDlg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AboutDlg.h 14 Jan 2004 13:02:24 -0000 1.1 +++ AboutDlg.h 22 Feb 2004 23:54:37 -0000 1.2 @@ -1,48 +1,48 @@ -/* - * This file is part of wxInterface. - * Copyright (C) 2003 Alo Sarv <ma...@us...> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __ABOUTDLG_H__ -#define __ABOUTDLG_H__ - -#ifdef __GNUG__ - #pragma interface "AboutDlg.cpp" -#endif - -#ifndef WX_PRECOMP - #include "wx/wx.h" - #include "wx/image.h" -#endif - -#include "defines.h" - -/************************** CAboutDlg class ***********************************/ -/* The About... box of the interface - displays my logo and stuff. */ -/******************************************************************************/ -class CAboutDlg : public wxDialog { -public: - CAboutDlg( /* Constructor */ - wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, long style = - wxDEFAULT_DIALOG_STYLE, const wxString &name = wxEmptyString - ); - void CreateControls(); /* Creates controls */ -}; - -#endif +/* + * This file is part of wxInterface. + * Copyright (C) 2003 Alo Sarv <ma...@us...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __ABOUTDLG_H__ +#define __ABOUTDLG_H__ + +#ifdef __GNUG__ + #pragma interface "AboutDlg.cpp" +#endif + +#ifndef WX_PRECOMP + #include <wx/dialog.h> + #include <wx/image.h> +#endif + +#include "defines.h" + +/************************** CAboutDlg class ***********************************/ +/* The About... box of the interface - displays my logo and stuff. */ +/******************************************************************************/ +class CAboutDlg : public wxDialog { +public: + CAboutDlg( /* Constructor */ + wxWindow *parent, wxWindowID id, const wxString &title, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, long style = + wxDEFAULT_DIALOG_STYLE, const wxString &name = wxEmptyString + ); + void CreateControls(); /* Creates controls */ +}; + +#endif Index: DownloadListCtrl.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/DownloadListCtrl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- DownloadListCtrl.cpp 20 Nov 2003 01:27:26 -0000 1.8 +++ DownloadListCtrl.cpp 22 Feb 2004 23:54:37 -0000 1.9 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + #ifdef __GNUG__ #pragma implementation "DownloadListCtrl.cpp" #endif @@ -29,6 +29,7 @@ #endif #include "DownloadListCtrl.h" +#include <wx/intl.h> BEGIN_EVENT_TABLE(CDownloadListCtrl, CMListCtrl) END_EVENT_TABLE() @@ -49,9 +50,9 @@ * if not present, -1 is used. */ wxString col_headers[] = { - _("File Name"), _("Size"), _("Transferred"), _("Completed"), - _("Speed"), _("Progress"), _("Sources"), _("Priority"), - _("Status"), _("Remaining"), _("Last Seen Complete"), + _("File Name"), _("Size"), _("Transferred"), _("Completed"), + _("Speed"), _("Progress"), _("Sources"), _("Priority"), + _("Status"), _("Remaining"), _("Last Seen Complete"), _("Last Reception"), _("Category") }; int widths[13]; Index: DownloadListCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/DownloadListCtrl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- DownloadListCtrl.h 24 Nov 2003 16:06:31 -0000 1.7 +++ DownloadListCtrl.h 22 Feb 2004 23:54:37 -0000 1.8 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wxInterface_wdr.h" Index: GUISettingsDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- GUISettingsDlg.cpp 13 Jan 2004 23:10:26 -0000 1.37 +++ GUISettingsDlg.cpp 22 Feb 2004 23:54:37 -0000 1.38 @@ -31,6 +31,10 @@ #include "GUISettingsDlg.h" #include "MainDlg.h" +#include <wx/textctrl.h> +#include <wx/msgdlg.h> +#include <wx/statbox.h> + /********************* * CGUISettingsDlg class *********************/ @@ -81,7 +85,7 @@ int font, iconset, tool_align, numlang, numiconsets; bool show_splash, prompt_exit, show_toolbar, show_menubar, remember_last; - wxString tmpname, startpage; + wxString tmpname, startpage; short i; /* Read from config. If no value found, &<field> remains unchanged */ Index: GUISettingsDlg.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- GUISettingsDlg.h 24 Nov 2003 16:06:31 -0000 1.12 +++ GUISettingsDlg.h 22 Feb 2004 23:54:37 -0000 1.13 @@ -25,7 +25,9 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include <wx/dialog.h> + #include <wx/choice.h> + #include <wx/checkbox.h> #endif #include "wxInterface_wdr.h" Index: Images.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- Images.cpp 14 Jan 2004 10:21:22 -0000 1.57 +++ Images.cpp 22 Feb 2004 23:54:37 -0000 1.58 @@ -30,6 +30,12 @@ #include "Images.h" +#include <wx/statbmp.h> +#include <wx/dcmemory.h> +#include <wx/settings.h> +#include <wx/app.h> +#include <wx/log.h> + /* List to store all bitmaps in */ #include <wx/listimpl.cpp> WX_DEFINE_LIST(ListOfBitmaps); Index: Images.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Images.h 29 Dec 2003 04:34:33 -0000 1.22 +++ Images.h 22 Feb 2004 23:54:37 -0000 1.23 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "defines.h" Index: KnownListCtrl.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/KnownListCtrl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- KnownListCtrl.cpp 20 Nov 2003 01:27:26 -0000 1.8 +++ KnownListCtrl.cpp 22 Feb 2004 23:54:37 -0000 1.9 @@ -30,6 +30,8 @@ #include "KnownListCtrl.h" +#include <wx/intl.h> + BEGIN_EVENT_TABLE(CKnownListCtrl, CMListCtrl) END_EVENT_TABLE() Index: KnownListCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/KnownListCtrl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- KnownListCtrl.h 24 Nov 2003 16:06:31 -0000 1.7 +++ KnownListCtrl.h 22 Feb 2004 23:54:37 -0000 1.8 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wxInterface_wdr.h" Index: MBitmapButton.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- MBitmapButton.cpp 31 Dec 2003 10:24:26 -0000 1.13 +++ MBitmapButton.cpp 22 Feb 2004 23:54:37 -0000 1.14 @@ -30,6 +30,9 @@ #include "MBitmapButton.h" +#include <wx/dcmemory.h> +#include <wx/settings.h> + /** * wxMac and wxMSW buttons can have children, use wxButton as base and put * a static bitmap in there. Index: MBitmapButton.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- MBitmapButton.h 30 Dec 2003 13:33:36 -0000 1.9 +++ MBitmapButton.h 22 Feb 2004 23:54:37 -0000 1.10 @@ -25,7 +25,8 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include <wx/button.h> + #include <wx/bmpbuttn.h> #endif #include "Images.h" Index: MListCtrl.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MListCtrl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- MListCtrl.cpp 13 Jan 2004 01:06:07 -0000 1.8 +++ MListCtrl.cpp 22 Feb 2004 23:54:37 -0000 1.9 @@ -30,6 +30,7 @@ #include "MListCtrl.h" +#include <wx/menu.h> BEGIN_EVENT_TABLE(CMListCtrl,wxListCtrl) EVT_LIST_COL_RIGHT_CLICK(-1, CMListCtrl::ColumnRightClick) Index: MListCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MListCtrl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- MListCtrl.h 20 Nov 2003 01:27:26 -0000 1.4 +++ MListCtrl.h 22 Feb 2004 23:54:37 -0000 1.5 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wxInterface_wdr.h" Index: MMultiButton.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MMultiButton.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MMultiButton.cpp 27 Dec 2003 07:18:20 -0000 1.5 +++ MMultiButton.cpp 22 Feb 2004 23:54:37 -0000 1.6 @@ -30,6 +30,8 @@ #include "MMultiButton.h" +#include <wx/sizer.h> + BEGIN_EVENT_TABLE(MMultiButton, wxControl) EVT_PAINT(MMultiButton::OnPaint) END_EVENT_TABLE() Index: MMultiButton.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MMultiButton.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MMultiButton.h 27 Dec 2003 07:18:20 -0000 1.2 +++ MMultiButton.h 22 Feb 2004 23:54:37 -0000 1.3 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "MBitmapButton.h" Index: MainDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- MainDlg.cpp 15 Feb 2004 16:54:34 -0000 1.63 +++ MainDlg.cpp 22 Feb 2004 23:54:37 -0000 1.64 @@ -30,6 +30,9 @@ #include "MainDlg.h" +#include <wx/log.h> +#include <wx/msgdlg.h> + /* Forward delcaration of globally available classes */ class CServerWnd *serverwnd; class CTransferWnd *transferwnd; Index: MainDlg.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- MainDlg.h 14 Jan 2004 13:26:44 -0000 1.21 +++ MainDlg.h 22 Feb 2004 23:54:37 -0000 1.22 @@ -26,7 +26,8 @@ // Include wxWindows' headers #ifndef WX_PRECOMP - #include <wx/wx.h> + #include <wx/toolbar.h> + #include <wx/menu.h> #endif /* Include local headers */ Index: MessagesWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MessagesWnd.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- MessagesWnd.h 24 Nov 2003 16:06:32 -0000 1.8 +++ MessagesWnd.h 22 Feb 2004 23:54:37 -0000 1.9 @@ -25,7 +25,7 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include <wx/statbmp.h> #endif #include "wxInterface_wdr.h" Index: QueueListCtrl.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/QueueListCtrl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- QueueListCtrl.cpp 20 Nov 2003 01:27:26 -0000 1.8 +++ QueueListCtrl.cpp 22 Feb 2004 23:54:37 -0000 1.9 @@ -30,6 +30,8 @@ #include "QueueListCtrl.h" +#include <wx/intl.h> + BEGIN_EVENT_TABLE(CQueueListCtrl, CMListCtrl) END_EVENT_TABLE() Index: QueueListCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/QueueListCtrl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- QueueListCtrl.h 24 Nov 2003 16:06:32 -0000 1.7 +++ QueueListCtrl.h 22 Feb 2004 23:54:37 -0000 1.8 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wxInterface_wdr.h" Index: SBPanel.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- SBPanel.cpp 13 Jan 2004 23:10:26 -0000 1.20 +++ SBPanel.cpp 22 Feb 2004 23:54:37 -0000 1.21 @@ -30,6 +30,8 @@ #include "SBPanel.h" +#include <wx/statbox.h> + BEGIN_EVENT_TABLE(CSBPanel, wxPanel) EVT_BUTTON(-1, CSBPanel::Toggle) END_EVENT_TABLE() Index: SBPanel.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- SBPanel.h 29 Dec 2003 04:34:33 -0000 1.8 +++ SBPanel.h 22 Feb 2004 23:54:37 -0000 1.9 @@ -27,7 +27,8 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP - #include "wx/wx.h" + #include <wx/sizer.h> + #include <wx/panel.h> #endif #include "defines.h" Index: SearchListCtrl.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchListCtrl.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- SearchListCtrl.cpp 13 Jan 2004 23:10:26 -0000 1.9 +++ SearchListCtrl.cpp 22 Feb 2004 23:54:37 -0000 1.10 @@ -30,6 +30,8 @@ #include "SearchListCtrl.h" +#include <wx/intl.h> + BEGIN_EVENT_TABLE(CSearchListCtrl, CMListCtrl) EVT_SIZE(CSearchListCtrl::OnSize) END_EVENT_TABLE() Index: SearchListCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchListCtrl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- SearchListCtrl.h 13 Jan 2004 23:10:26 -0000 1.7 +++ SearchListCtrl.h 22 Feb 2004 23:54:37 -0000 1.8 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wxInterface_wdr.h" Index: SearchWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchWnd.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- SearchWnd.h 13 Jan 2004 23:10:26 -0000 1.10 +++ SearchWnd.h 22 Feb 2004 23:54:37 -0000 1.11 @@ -25,7 +25,11 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include <wx/radiobut.h> + #include <wx/sizer.h> + #include <wx/checkbox.h> + #include <wx/button.h> + #include <wx/textctrl.h> #endif /* Private headers */ Index: ServerListCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerListCtrl.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ServerListCtrl.h 10 Jan 2004 18:59:00 -0000 1.10 +++ ServerListCtrl.h 22 Feb 2004 23:54:37 -0000 1.11 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #include "wx/imaglist.h" #endif Index: ServerWnd.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- ServerWnd.cpp 13 Jan 2004 23:10:26 -0000 1.58 +++ ServerWnd.cpp 22 Feb 2004 23:54:37 -0000 1.59 @@ -32,6 +32,8 @@ #include "ServerListCtrl.h" class CServerListCtrl *serverlistctrl; +#include <wx/log.h> + /* * CServerWnd class. */ Index: ServerWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- ServerWnd.h 29 Dec 2003 09:52:38 -0000 1.34 +++ ServerWnd.h 22 Feb 2004 23:54:37 -0000 1.35 @@ -25,7 +25,9 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include <wx/statbmp.h> + #include <wx/stattext.h> + #include <wx/checkbox.h> #endif /* wxWindows headers */ Index: SharedFilesListCtrl.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SharedFilesListCtrl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- SharedFilesListCtrl.cpp 20 Nov 2003 01:27:26 -0000 1.8 +++ SharedFilesListCtrl.cpp 22 Feb 2004 23:54:37 -0000 1.9 @@ -30,6 +30,8 @@ #include "SharedFilesListCtrl.h" +#include <wx/intl.h> + BEGIN_EVENT_TABLE(CSharedFilesListCtrl, CMListCtrl) END_EVENT_TABLE() Index: SharedFilesListCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SharedFilesListCtrl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- SharedFilesListCtrl.h 24 Nov 2003 16:06:32 -0000 1.7 +++ SharedFilesListCtrl.h 22 Feb 2004 23:54:37 -0000 1.8 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wxInterface_wdr.h" Index: SharedFilesWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SharedFilesWnd.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- SharedFilesWnd.h 24 Nov 2003 16:06:32 -0000 1.9 +++ SharedFilesWnd.h 22 Feb 2004 23:54:37 -0000 1.10 @@ -25,7 +25,9 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include <wx/gauge.h> + #include <wx/stattext.h> + #include <wx/statbmp.h> #endif #include "wxInterface_wdr.h" Index: StatisticsTreeCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/StatisticsTreeCtrl.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- StatisticsTreeCtrl.h 10 Jan 2004 18:59:00 -0000 1.9 +++ StatisticsTreeCtrl.h 22 Feb 2004 23:54:37 -0000 1.10 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #include "wx/imaglist.h" #endif Index: StatisticsWnd.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/StatisticsWnd.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- StatisticsWnd.cpp 20 Nov 2003 01:27:26 -0000 1.8 +++ StatisticsWnd.cpp 22 Feb 2004 23:54:37 -0000 1.9 @@ -30,6 +30,8 @@ #include "StatisticsWnd.h" +#include <wx/menu.h> + BEGIN_EVENT_TABLE(CStatisticsWnd,wxPanel) EVT_BUTTON(BTN_STAT, CStatisticsWnd::StatisticsMenu) END_EVENT_TABLE() Index: StatisticsWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/StatisticsWnd.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- StatisticsWnd.h 30 Nov 2003 23:07:27 -0000 1.9 +++ StatisticsWnd.h 22 Feb 2004 23:54:37 -0000 1.10 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wxInterface_wdr.h" Index: SysTray.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SysTray.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- SysTray.h 30 Dec 2003 05:43:52 -0000 1.8 +++ SysTray.h 22 Feb 2004 23:54:37 -0000 1.9 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "defines.h" Index: TransferWnd.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/TransferWnd.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- TransferWnd.cpp 27 Nov 2003 08:23:12 -0000 1.27 +++ TransferWnd.cpp 22 Feb 2004 23:54:37 -0000 1.28 @@ -30,6 +30,11 @@ #include "TransferWnd.h" +#include <wx/sizer.h> +#include <wx/statbmp.h> +#include <wx/stattext.h> +#include <wx/intl.h> + BEGIN_EVENT_TABLE(CTransferWnd,wxPanel) /* Button events for changing the content of splitter frame content */ EVT_BUTTON(ID_UPLOAD, CTransferWnd::ChangeToQueue) Index: TransferWnd.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/TransferWnd.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- TransferWnd.h 24 Nov 2003 16:06:32 -0000 1.12 +++ TransferWnd.h 22 Feb 2004 23:54:37 -0000 1.13 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif /* Global includes for resources */ Index: UploadListCtrl.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/UploadListCtrl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- UploadListCtrl.cpp 20 Nov 2003 01:27:26 -0000 1.8 +++ UploadListCtrl.cpp 22 Feb 2004 23:54:37 -0000 1.9 @@ -30,6 +30,8 @@ #include "UploadListCtrl.h" +#include <wx/intl.h> + BEGIN_EVENT_TABLE(CUploadListCtrl, CMListCtrl) END_EVENT_TABLE() Index: UploadListCtrl.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/UploadListCtrl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- UploadListCtrl.h 24 Nov 2003 16:06:32 -0000 1.7 +++ UploadListCtrl.h 22 Feb 2004 23:54:37 -0000 1.8 @@ -25,7 +25,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" #endif #include "wxInterface_wdr.h" Index: wxInterface.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- wxInterface.cpp 10 Jan 2004 18:59:00 -0000 1.17 +++ wxInterface.cpp 22 Feb 2004 23:54:37 -0000 1.18 @@ -31,6 +31,8 @@ #include "wxInterface.h" #include "MainDlg.h" +#include <wx/log.h> + /* * Base class for wxInterface. Everything else starts from here. */ Index: wxInterface.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- wxInterface.h 18 Dec 2003 04:25:36 -0000 1.4 +++ wxInterface.h 22 Feb 2004 23:54:37 -0000 1.5 @@ -26,7 +26,8 @@ // Include wxWindows' headers #ifndef WX_PRECOMP - #include <wx/wx.h> + #include <wx/app.h> + #include <wx/intl.h> #endif // Include private headers Index: wxInterface.wdr =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.wdr,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 Binary files /tmp/cvsZEQ2TA and /tmp/cvsZRaz08 differ Index: wxInterface_wdr.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_wdr.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- wxInterface_wdr.cpp 13 Jan 2004 23:10:26 -0000 1.11 +++ wxInterface_wdr.cpp 22 Feb 2004 23:54:37 -0000 1.12 @@ -44,6 +44,9 @@ #include "StatisticsTreeCtrl.h" #include "ColorFrameCtrl.h" +#include <wx/sizer.h> +#include <wx/statbox.h> + // Implement window functions Index: wxInterface_wdr.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_wdr.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- wxInterface_wdr.h 13 Jan 2004 23:10:26 -0000 1.6 +++ wxInterface_wdr.h 22 Feb 2004 23:54:38 -0000 1.7 @@ -13,7 +13,7 @@ // Include wxWindows' headers #ifndef WX_PRECOMP - #include <wx/wx.h> +// #include <wx/wx.h> #endif #include <wx/image.h> |
|
From: <ma...@us...> - 2004-02-19 01:21:36
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27890/src Modified Files: functions Log Message: Now compile-time messages are compatible with BSD echo. Index: functions =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/functions,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- functions 19 Feb 2004 01:01:17 -0000 1.1 +++ functions 19 Feb 2004 01:11:39 -0000 1.2 @@ -21,15 +21,15 @@ # Get a sane screen width [ -z "${COLUMNS:-}" ] && COLUMNS=80 # Get console type -[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="`/sbin/consoletype`" +#[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="`/sbin/consoletype`" # Set some variables RES_COL=60 -MOVE_TO_COL="echo -en \\033[${RES_COL}G" -SETCOLOR_SUCCESS="echo -en \\033[1;32m" -SETCOLOR_FAILURE="echo -en \\033[1;31m" -SETCOLOR_WARNING="echo -en \\033[1;33m" -SETCOLOR_NORMAL="echo -en \\033[0;39m" +MOVE_TO_COL="echo -e \\033[${RES_COL}G\\c" +SETCOLOR_SUCCESS="echo -e \\033[1;32m\\c" +SETCOLOR_FAILURE="echo -e \\033[1;31m\\c" +SETCOLOR_WARNING="echo -e \\033[1;33m\\c" +SETCOLOR_NORMAL="echo -e \\033[0;39m\\c" if [ "$CONSOLETYPE" = "serial" ]; then BOOTUP=serial MOVE_TO_COL= |
|
From: <ma...@us...> - 2004-02-19 01:11:14
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25831/src Modified Files: Makefile.am Added Files: functions Log Message: Nicer compile-time output. --- NEW FILE: functions --- #!/bin/sh ################################################################################ # This file is part of wxInterface. # # Copyright (C) 2003 Alo Sarv <ma...@us...> # # # # This program is free software; you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation; either version 2 of the License, or # # (at your option) any later version. # # # # This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # # along with this program; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # ################################################################################ # Get a sane screen width [ -z "${COLUMNS:-}" ] && COLUMNS=80 # Get console type [ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="`/sbin/consoletype`" # Set some variables RES_COL=60 MOVE_TO_COL="echo -en \\033[${RES_COL}G" SETCOLOR_SUCCESS="echo -en \\033[1;32m" SETCOLOR_FAILURE="echo -en \\033[1;31m" SETCOLOR_WARNING="echo -en \\033[1;33m" SETCOLOR_NORMAL="echo -en \\033[0;39m" if [ "$CONSOLETYPE" = "serial" ]; then BOOTUP=serial MOVE_TO_COL= SETCOLOR_SUCCESS= SETCOLOR_FAILURE= SETCOLOR_WARNING= SETCOLOR_NORMAL= fi success() { $MOVE_TO_COL echo -n "[" $SETCOLOR_SUCCESS echo -n " OK " $SETCOLOR_NORMAL echo -e "]\\r\\c" } failure() { $MOVE_TO_COL echo -n "[" $SETCOLOR_FAILURE echo -n "FAILED" $SETCOLOR_NORMAL echo -e "]\\r" } passed() { $MOVE_TO_COL echo -n "[" $SETCOLOR_SUCCESS echo -n "PASSED" $SETCOLOR_NORMAL echo -e "]\\r\\c" } warning() { $MOVE_TO_COL echo -n "[" $SETCOLOR_WARNING echo -n " WARN " $SETCOLOR_NORMAL echo -e "]\\r" } action() { STRING=$1 echo -e "$STRING \\c" shift rm -f .err if ($* 2> .err); then if (test -s .err); then warning "STRING" $SETCOLOR_WARNING cat .err $SETCOLOR_NORMAL else success "STRING" fi else failure "STRING" $SETCOLOR_FAILURE cat .err $SETCOLOR_NORMAL return 1 fi rm -f .err echo } Index: Makefile.am =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.am 14 Jan 2004 13:02:24 -0000 1.16 +++ Makefile.am 19 Feb 2004 01:01:17 -0000 1.17 @@ -31,90 +31,31 @@ all: $(PROGRAM) .c.o: - @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to \\c" - @echo -e "$(OUTPUTCOLOR)$@$(ACTIONCOLOR) @PRINT_CPP_FLAGS@: $(ATTENTIONCOLOR)\\c" - @if cc @CFLAGS@ @CPP_FLAGS@ @INCLUDE@ -c -o $@ $< 2>.err; then \ - if test -s .err; then \ - echo -e "$(WARNINGCOLOR)ok, but warnings:"; \ - cat .err; \ - rm -f .err; \ - echo -e "$(ACTIONCOLOR)"; \ - else \ - echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ - fi; \ - else \ - echo -e "failed:"; \ - cat .err; \ - rm -f .err; \ - echo -e "$(ACTIONCOLOR)"; \ + @if . ./functions && ! action "Compiling $<" cc @CFLAGS@ @CPP_FLAGS@ @INCLUDE@ -c -o $@ $<; then \ false; \ fi; .cpp.o: - @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to \\c" - @echo -e "$(OUTPUTCOLOR)$@$(ACTIONCOLOR)@PRINT_CPP_FLAGS@: $(ATTENTIONCOLOR)\\c" - @if @CXX@ @CXX_FLAGS@ @CPP_FLAGS@ @INCLUDE@ -c -o $@ $< 2>.err; then \ - if test -s .err; then \ - echo -e "$(WARNINGCOLOR)ok, but warnings:"; \ - cat .err; \ - rm -f .err; \ - echo -e "$(ACTIONCOLOR)"; \ - else \ - echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ - fi; \ - else \ - echo -e "failed:"; \ - cat .err; \ - rm -f .err; \ - echo -e "$(ACTIONCOLOR)"; \ + @if . ./functions && ! action "Compiling $<" @CXX@ @CXX_FLAGS@ @CPP_FLAGS@ @INCLUDE@ -c -o $@ $<; then \ false; \ fi; @RES@: - @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)wxInterface_private.rc$(ACTIONCOLOR) to \\c"; - @echo -e "$(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)\\c"; - @if windres -i wxInterface_private.rc -I rc -o $@ -O coff --include-dir=@RES_INCLUDE@ 2>.err; then \ - if test -s .err; then \ - echo -e "$(WARNINGCOLOR)ok, but warnings:"; \ - cat .err; \ - rm -f .err; \ - echo -e "$(ACTIONCOLOR)"; \ - else \ - echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ - fi; \ - else \ - echo -e "failed:"; \ - cat .err; \ - rm -f .err; \ - echo -e "$(ACTIONCOLOR)"; \ + @if . ./functions && ! action "Compiling wxInterface_private.rc" windres -i wxInterface_private.rc -I rc -o $@ -O coff --include-dir=@RES_INCLUDE@; then \ false; \ fi; wxInterface: $(WXINTERFACE_OBJECTS) @TRAY_OBJECTS@ - @echo -e "$(ACTIONCOLOR)Linking $(INPUTCOLOR)$(WXINTERFACE_OBJECTS)@TRAY_OBJECTS@ \\c" - @echo -e "$(ACTIONCOLOR)to $(OUTPUTCOLOR)$@$(ACTIONCOLOR)@PRINT_LINK_FLAGS@: \\c" - @echo -e "$(ATTENTIONCOLOR)\\c" - @if @CXX@ -o $(PROGRAM) $(WXINTERFACE_OBJECTS) @TRAY_OBJECTS@ @LIBS@ 2>.err; then \ - echo -e "$(WELLCOLOR)ok."; \ - echo -e "$(ACTIONCOLOR)\\c"; \ - echo -e "$(WELLCOLOR)Successfully compiled \\c"; \ - echo -e "$(WARNINGCOLOR)$(BUILD)\\c"; \ - echo -e "$(OUTPUTCOLOR)$@$(WELLCOLOR) binary!$(ACTIONCOLOR)"; \ - echo -e "$(ACTIONCOLOR)Now cd to src/ dir and type $(OUTPUTCOLOR)./$@$(ACTIONCOLOR) to start the application."; \ - echo -e "$(ACTIONCOLOR)or if you are under Mac OS X, type $(OUTPUTCOLOR)make dist$(ACTIONCOLOR) to build $(OUTPUTCOLOR)$@.app$(DEFAULTCOLOR)"; \ - else \ - echo -e "failed:"; \ - cat .err; \ - echo -e "$(ACTIONCOLOR)"; \ + @if . ./functions && ! action "Linking wxInterface" @CXX@ -o $(PROGRAM) $(WXINTERFACE_OBJECTS) @TRAY_OBJECTS@ @LIBS@; then \ false; \ - fi + fi; clean: - @echo -e "Cleaning up...\\c"; - @rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe @TRAY_OBJECTS@; - @echo -e "$(WELLCOLOR) ok.$(ACTIONCOLOR)"; + @if . ./functions && ! action "Cleaning up" rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe @TRAY_OBJECTS@; then \ + false; \ + fi; distclean: - @echo -e "Cleaning up...\\c"; - @rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe Makefile @TRAY_OBJECTS@; - @echo -e "$(WELLCOLOR) ok.$(ACTIONCOLOR)"; + @if . ./functions && ! action "Cleaning up" rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe Makefile src/Makefile @TRAY_OBJECTS@; then \ + false; \ + fi; |
|
From: <ma...@us...> - 2004-02-15 17:07:20
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4987 Modified Files: Changelog Log Message: Two fixes by Avi. Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- Changelog 13 Jan 2004 23:10:26 -0000 1.126 +++ Changelog 15 Feb 2004 16:59:59 -0000 1.127 @@ -25,6 +25,10 @@ # This also helps in backtracking changes, or reviewing development history. # ############################################################################### +2004/02/15 Alo Sarv + * Fixed maximized state saving between sessions. Credits: Avi. + * Fixed shutdown freeze reported by Avi. Credits: Avi. + 2003/11/14 Alo Sarv * Search page implemented. * Sidebar width is now correctly updated according to widest content. |
|
From: <ma...@us...> - 2004-02-15 17:01:55
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3814 Modified Files: MainDlg.cpp Log Message: Fixes shutdown freeze reported by Avi. Moved systray removal code from CMainDlg::~CMainDlg() to CMainDlg::OnCloseWindow(). Credits: Avi. Index: MainDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- MainDlg.cpp 15 Feb 2004 16:46:21 -0000 1.62 +++ MainDlg.cpp 15 Feb 2004 16:54:34 -0000 1.63 @@ -240,13 +240,6 @@ pages.Find(GetCurPage())->GetKeyString()); } -#ifdef wxHAS_TASK_BAR_ICON - #ifdef __WXMSW__ - systray->RemoveIcon(); - #endif - delete systray; -#endif - wxMenuBar *mb = GetMenuBar(); if (mb != NULL) { SetMenuBar(NULL); @@ -475,7 +468,7 @@ images.Clear(); names.Clear(); /* Anywhere else, custom controls in toolbar aren't supported at all */ -#else +#else tb->AddSeparator(); tb->AddTool( ID_BTN_GUISETTINGS, _("Options"), @@ -508,6 +501,14 @@ return; } } + +#ifdef wxHAS_TASK_BAR_ICON /* Removes tray icon. Do this here instead of */ + #ifdef __WXMSW__ /* destructor to prevent freezes. Credits: Avi */ + systray->RemoveIcon(); + #endif + delete systray; +#endif + event.Skip(); } |
|
From: <ma...@us...> - 2004-02-15 16:54:01
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2407 Modified Files: MainDlg.cpp Log Message: Remember Maximized() state between sessions. Needed in case user closes maximized wxInterface on 800x600 res but starts it up on 1024x768 res for example. Thanks to Avi for this patch. Index: MainDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- MainDlg.cpp 14 Jan 2004 13:26:44 -0000 1.61 +++ MainDlg.cpp 15 Feb 2004 16:46:21 -0000 1.62 @@ -142,6 +142,7 @@ : wxFrame( parent, id, title, position, size, style ), m_locale(l) { int height, width, posx, posy; /* For storing values read from config */ bool isreadx, isready; /* For checking if value was read from config */ +bool maximized; /* Checking if we'r maximized */ start_up = true; cur_page = NULL; @@ -164,6 +165,11 @@ m_config->Read(wxT("/Frame/Width"), &width, 800); SetSize(width, height); /* Do this before loading pages! */ + m_config->Read(wxT("/Frame/Maximized"), &maximized, false); + if (maximized) { /* Separate check if we'r maximized, cos if */ + Maximize(); /* user closes ui maximized on 800x600 res & */ + } /* starts on 1024x768, it won't get maximized otherwise */ + isreadx = m_config->Read(wxT("/Frame/PosX"), &posx, 20); isready = m_config->Read(wxT("/Frame/PosY"), &posy, 20); if (!isreadx && !isready) { @@ -173,7 +179,7 @@ } wxPanel *statusbar = new wxPanel( - this, -1, wxDefaultPosition, wxDefaultSize, + this, -1, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE ); StatusBar(statusbar, true, true); @@ -224,6 +230,7 @@ m_config->Write(wxT("Width"), GetSize().GetWidth()); m_config->Write(wxT("PosX"), GetPosition().x); m_config->Write(wxT("PosY"), GetPosition().y); + m_config->Write(wxT("Maximized"), IsMaximized()); } m_config->SetPath(wxT("/General")); |
|
From: <ma...@us...> - 2004-02-14 01:37:47
|
Update of /cvsroot/sharedaemon/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27208 Modified Files: modules Log Message: Applied patch: [ 893300 ] This is a patch file for CVSROOT/modules. It adds the name of the modules used in ShareDaemon, so now it will be easier to download them (you don\'t need to browse sourceforge\'s CVS for discovering the name of the modules). Index: modules =================================================================== RCS file: /cvsroot/sharedaemon/CVSROOT/modules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- modules 17 Nov 2003 14:13:07 -0000 1.1 +++ modules 14 Feb 2004 01:31:42 -0000 1.2 @@ -24,3 +24,6 @@ # character to interpose another module into the current module. This # can be useful for creating a module that consists of many directories # spread out over the entire source repository. +core core +ui-web ui-web +ui-wx ui-wx |
Update of /cvsroot/sharedaemon/core/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21601 Modified Files: Addr.cpp Addr.h Array.h Client.cpp Client.h ClientList.cpp ClientList.h ClientShadow.cpp ClientShadow.h Ed2kConnection.cpp Ed2kConnection.h Ed2kPacket.cpp Ed2kPacket.h Ed2kSocket.cpp Ed2kSocket.h File.h Makefile.cvs MultiLevelBitmap.cpp MultiLevelBitmap.h Packet.h ParseClass.cpp ParseClass.h Socket.cpp Socket.h bttypes.h debug.h main-c.c main-c.h mprintf.c mprintf.h osdep.cpp osdep.h parse-ed2k-xmule2.h parse-ed2k.c parse-ed2k.h test.cpp util.cpp util.h xmuletypes.h Log Message: Updated copyright to 2004 Index: Addr.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Addr.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Addr.cpp 20 Nov 2003 16:27:24 -0000 1.5 +++ Addr.cpp 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * Addr.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Addr.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Addr.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Addr.h 20 Nov 2003 16:27:25 -0000 1.6 +++ Addr.h 2 Feb 2004 11:03:38 -0000 1.7 @@ -1,7 +1,7 @@ /* * Addr.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Array.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Array.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Array.h 20 Nov 2003 16:27:25 -0000 1.6 +++ Array.h 2 Feb 2004 11:03:38 -0000 1.7 @@ -1,7 +1,7 @@ /* * Array.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Client.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Client.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Client.cpp 20 Nov 2003 16:27:25 -0000 1.10 +++ Client.cpp 2 Feb 2004 11:03:38 -0000 1.11 @@ -1,7 +1,7 @@ /* * Client.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Client.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Client.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Client.h 20 Nov 2003 16:27:25 -0000 1.7 +++ Client.h 2 Feb 2004 11:03:38 -0000 1.8 @@ -1,7 +1,7 @@ /* * Client.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: ClientList.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/ClientList.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ClientList.cpp 20 Nov 2003 16:27:25 -0000 1.5 +++ ClientList.cpp 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * ClientList.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: ClientList.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/ClientList.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ClientList.h 20 Nov 2003 16:27:25 -0000 1.5 +++ ClientList.h 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * ClientList.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: ClientShadow.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/ClientShadow.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ClientShadow.cpp 20 Nov 2003 16:27:25 -0000 1.5 +++ ClientShadow.cpp 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * ClientShadow.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: ClientShadow.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/ClientShadow.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ClientShadow.h 20 Nov 2003 16:27:25 -0000 1.5 +++ ClientShadow.h 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * ClientShadow.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Ed2kConnection.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Ed2kConnection.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Ed2kConnection.cpp 20 Nov 2003 16:27:25 -0000 1.3 +++ Ed2kConnection.cpp 2 Feb 2004 11:03:38 -0000 1.4 @@ -1,7 +1,7 @@ /* * Ed2kConnection.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Ed2kConnection.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Ed2kConnection.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Ed2kConnection.h 12 Jan 2004 21:39:55 -0000 1.5 +++ Ed2kConnection.h 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * Ed2kConnection.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Ed2kPacket.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Ed2kPacket.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Ed2kPacket.cpp 12 Jan 2004 21:32:42 -0000 1.4 +++ Ed2kPacket.cpp 2 Feb 2004 11:03:38 -0000 1.5 @@ -1,7 +1,7 @@ /* * Ed2kPacket.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Ed2kPacket.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Ed2kPacket.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Ed2kPacket.h 20 Nov 2003 16:27:25 -0000 1.5 +++ Ed2kPacket.h 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * Ed2kPacket.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Ed2kSocket.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Ed2kSocket.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Ed2kSocket.cpp 22 Nov 2003 02:56:06 -0000 1.7 +++ Ed2kSocket.cpp 2 Feb 2004 11:03:38 -0000 1.8 @@ -1,7 +1,7 @@ /* * Ed2kSocket.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Ed2kSocket.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Ed2kSocket.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Ed2kSocket.h 20 Nov 2003 16:27:25 -0000 1.4 +++ Ed2kSocket.h 2 Feb 2004 11:03:38 -0000 1.5 @@ -1,7 +1,7 @@ /* * Ed2kSocket.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: File.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/File.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- File.h 20 Nov 2003 16:27:25 -0000 1.4 +++ File.h 2 Feb 2004 11:03:38 -0000 1.5 @@ -1,7 +1,7 @@ /* * File.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Makefile.cvs =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Makefile.cvs,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.cvs 4 Jan 2004 18:25:53 -0000 1.16 +++ Makefile.cvs 2 Feb 2004 11:03:38 -0000 1.17 @@ -1,7 +1,7 @@ # # Makefile.cvs. Part of the ShareDaemon project. # -# Copyright (C) 2003 Bodo Thiesen <bo...@gm...> +# Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by Index: MultiLevelBitmap.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/MultiLevelBitmap.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- MultiLevelBitmap.cpp 20 Nov 2003 16:27:25 -0000 1.6 +++ MultiLevelBitmap.cpp 2 Feb 2004 11:03:38 -0000 1.7 @@ -1,7 +1,7 @@ /* * MultiLevelBitmap.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: MultiLevelBitmap.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/MultiLevelBitmap.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MultiLevelBitmap.h 20 Nov 2003 16:27:25 -0000 1.5 +++ MultiLevelBitmap.h 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * MultiLevelBitmap.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Packet.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Packet.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Packet.h 20 Nov 2003 16:27:25 -0000 1.6 +++ Packet.h 2 Feb 2004 11:03:38 -0000 1.7 @@ -1,7 +1,7 @@ /* * Packet.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: ParseClass.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/ParseClass.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ParseClass.cpp 6 Jan 2004 05:59:55 -0000 1.17 +++ ParseClass.cpp 2 Feb 2004 11:03:38 -0000 1.18 @@ -1,7 +1,7 @@ /* * ParseClass.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: ParseClass.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/ParseClass.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ParseClass.h 6 Jan 2004 05:59:55 -0000 1.13 +++ ParseClass.h 2 Feb 2004 11:03:38 -0000 1.14 @@ -1,7 +1,7 @@ /* * ParseClass.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Socket.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Socket.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Socket.cpp 20 Nov 2003 16:27:25 -0000 1.11 +++ Socket.cpp 2 Feb 2004 11:03:38 -0000 1.12 @@ -1,7 +1,7 @@ /* * Socket.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: Socket.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/Socket.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Socket.h 20 Nov 2003 16:27:25 -0000 1.10 +++ Socket.h 2 Feb 2004 11:03:38 -0000 1.11 @@ -1,7 +1,7 @@ /* * Socket.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: bttypes.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/bttypes.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- bttypes.h 26 Nov 2003 02:05:02 -0000 1.1 +++ bttypes.h 2 Feb 2004 11:03:38 -0000 1.2 @@ -1,7 +1,7 @@ /* * bttypes.h. Part of the bothie-utils. * - * Copyright (C) 2001, 2002, 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2001-2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: debug.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/debug.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- debug.h 6 Jan 2004 01:23:16 -0000 1.7 +++ debug.h 2 Feb 2004 11:03:38 -0000 1.8 @@ -1,7 +1,7 @@ /* * debug.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: main-c.c =================================================================== RCS file: /cvsroot/sharedaemon/core/src/main-c.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- main-c.c 9 Dec 2003 17:53:12 -0000 1.2 +++ main-c.c 2 Feb 2004 11:03:38 -0000 1.3 @@ -1,7 +1,7 @@ /* * main-c.c. Part of the bothie-utils. * - * Copyright (C) 2001, 2002, 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2001-2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: main-c.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/main-c.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- main-c.h 26 Nov 2003 02:05:02 -0000 1.1 +++ main-c.h 2 Feb 2004 11:03:38 -0000 1.2 @@ -1,7 +1,7 @@ /* * main-c.h. Part of the bothie-utils. * - * Copyright (C) 2001, 2002, 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2001-2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: mprintf.c =================================================================== RCS file: /cvsroot/sharedaemon/core/src/mprintf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mprintf.c 20 Nov 2003 16:27:25 -0000 1.2 +++ mprintf.c 2 Feb 2004 11:03:38 -0000 1.3 @@ -1,7 +1,7 @@ /* * mprintf.c. Part of the bothie-utils. * - * Copyright (C) 2002, 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2002-2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: mprintf.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/mprintf.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mprintf.h 20 Nov 2003 16:27:25 -0000 1.2 +++ mprintf.h 2 Feb 2004 11:03:38 -0000 1.3 @@ -1,7 +1,7 @@ /* * mprintf.h. Part of the bothie-utils. * - * Copyright (C) 2002, 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2002-2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: osdep.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/osdep.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- osdep.cpp 20 Nov 2003 16:27:25 -0000 1.8 +++ osdep.cpp 2 Feb 2004 11:03:38 -0000 1.9 @@ -1,7 +1,7 @@ /* * osdep.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: osdep.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/osdep.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- osdep.h 6 Jan 2004 05:59:55 -0000 1.16 +++ osdep.h 2 Feb 2004 11:03:38 -0000 1.17 @@ -1,7 +1,7 @@ /* * osdep.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: parse-ed2k-xmule2.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/parse-ed2k-xmule2.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- parse-ed2k-xmule2.h 20 Nov 2003 16:27:25 -0000 1.3 +++ parse-ed2k-xmule2.h 2 Feb 2004 11:03:38 -0000 1.4 @@ -1,7 +1,7 @@ /* * parse-ed2k.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: parse-ed2k.c =================================================================== RCS file: /cvsroot/sharedaemon/core/src/parse-ed2k.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- parse-ed2k.c 12 Jan 2004 21:32:42 -0000 1.16 +++ parse-ed2k.c 2 Feb 2004 11:03:38 -0000 1.17 @@ -1,7 +1,7 @@ /* * parse-ed2k.c. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: parse-ed2k.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/parse-ed2k.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- parse-ed2k.h 12 Jan 2004 21:32:42 -0000 1.10 +++ parse-ed2k.h 2 Feb 2004 11:03:38 -0000 1.11 @@ -1,7 +1,7 @@ /* * parse-ed2k.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: test.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/test.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- test.cpp 15 Jan 2004 20:22:00 -0000 1.33 +++ test.cpp 2 Feb 2004 11:03:38 -0000 1.34 @@ -1,7 +1,7 @@ /* * test.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: util.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/util.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- util.cpp 20 Nov 2003 16:27:25 -0000 1.5 +++ util.cpp 2 Feb 2004 11:03:38 -0000 1.6 @@ -1,7 +1,7 @@ /* * util.cpp. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: util.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/util.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- util.h 20 Nov 2003 16:27:25 -0000 1.8 +++ util.h 2 Feb 2004 11:03:38 -0000 1.9 @@ -1,7 +1,7 @@ /* * util.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Index: xmuletypes.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/xmuletypes.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- xmuletypes.h 22 Nov 2003 02:46:55 -0000 1.6 +++ xmuletypes.h 2 Feb 2004 11:03:38 -0000 1.7 @@ -1,7 +1,7 @@ /* * xmuletypes.h. Part of the ShareDaemon project. * - * Copyright (C) 2003 Bodo Thiesen <bo...@gm...> + * Copyright (C) 2003,2004 Bodo Thiesen <bo...@gm...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |
|
From: <ma...@us...> - 2004-01-19 20:13:39
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv10032 Modified Files: Hungarian.po German.po Log Message: Updated German/Hungarian translations by reviczky. Index: Hungarian.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Hungarian.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Hungarian.po 10 Jan 2004 18:53:40 -0000 1.2 +++ Hungarian.po 19 Jan 2004 20:13:35 -0000 1.3 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-31 16:27+0200\n" -"PO-Revision-Date: 2004-01-10 03:38+0200\n" +"POT-Creation-Date: 2004-01-16 20:24+0100\n" +"PO-Revision-Date: 2004-01-19 22:11+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ #: ../DownloadListCtrl.cpp:52 #: ../UploadListCtrl.cpp:52 -#: ../wxInterface_wdr.cpp:285 -#: ../wxInterface_wdr.cpp:333 +#: ../wxInterface_wdr.cpp:91 +#: ../wxInterface_wdr.cpp:139 msgid "Transferred" msgstr "Letöltve" @@ -246,8 +246,8 @@ msgstr "MenuBár (fájl/nézet stb.) \t\tmegjelenÃtése illetve elrejtése" #: ../GUISettingsDlg.cpp:610 -#: ../wxInterface_wdr.cpp:668 -#: ../wxInterface_wdr.cpp:710 +#: ../wxInterface_wdr.cpp:474 +#: ../wxInterface_wdr.cpp:516 msgid "OK" msgstr "MegerÅsÃt" @@ -256,9 +256,8 @@ msgstr "BeállÃtásokat elmenti és bezár" #: ../GUISettingsDlg.cpp:619 -#: ../wxInterface_wdr.cpp:199 -#: ../wxInterface_wdr.cpp:672 -#: ../wxInterface_wdr.cpp:714 +#: ../wxInterface_wdr.cpp:478 +#: ../wxInterface_wdr.cpp:520 msgid "Cancel" msgstr "Mégsem" @@ -360,6 +359,7 @@ msgid "Connect" msgstr "Kapcsolódás" +# or "Opciók" #: ../MainDlg.cpp:340 #: ../MainDlg.cpp:447 #: ../MainDlg.cpp:453 @@ -367,7 +367,7 @@ #: ../MainDlg.cpp:473 #: ../MainDlg.cpp:485 msgid "Options" -msgstr "Opciók" +msgstr "BeállÃtások" #: ../MainDlg.cpp:384 #: ../MainDlg.cpp:404 @@ -391,9 +391,10 @@ msgid "Help" msgstr "SegÃtseg" +# or "ShareDaemon wxInterface bezárása?" #: ../MainDlg.cpp:508 msgid "Close ShareDaemon wxInterface?" -msgstr "ShareDaemon wxInterface bezárása?" +msgstr "Be akarja zárni a ShareDaemon wxInterface -t?" #: ../MainDlg.cpp:509 msgid "Question" @@ -414,7 +415,7 @@ msgstr "Kiszolgálólista" #: ../MainDlg.cpp:561 -#: ../wxInterface_wdr.cpp:61 +#: ../SearchWnd.cpp:141 msgid "Search" msgstr "Keresés" @@ -432,7 +433,7 @@ #: ../MainDlg.cpp:569 #: ../MainDlg.cpp:570 -#: ../wxInterface_wdr.cpp:255 +#: ../wxInterface_wdr.cpp:61 msgid "Shared Files" msgstr "Megosztott fájlok" @@ -445,13 +446,13 @@ msgstr "Csevegés" #: ../MainDlg.cpp:577 -#: ../wxInterface_wdr.cpp:263 +#: ../wxInterface_wdr.cpp:69 msgid "Statistics" msgstr "Statisztika" #: ../MainDlg.cpp:578 msgid "Show live statistics" -msgstr "Ãlo statisztika mutatása" +msgstr "ÃlÅ statisztika mutatása" #: ../MainDlg.cpp:611 #: ../SysTray.cpp:71 @@ -532,13 +533,11 @@ #: ../SearchListCtrl.cpp:56 #: ../ServerWnd.cpp:505 -#: ../wxInterface_wdr.cpp:64 msgid "Name" msgstr "Név" #: ../SearchListCtrl.cpp:56 #: ../SharedFilesListCtrl.cpp:52 -#: ../wxInterface_wdr.cpp:75 msgid "Type" msgstr "TÃpus" @@ -547,6 +546,173 @@ msgid "Hash" msgstr "Hash" +#: ../SearchWnd.cpp:106 +msgid "Results Filtering" +msgstr "Eredmények szűrése" + +# or "Keresési mód" +#: ../SearchWnd.cpp:113 +msgid "Search Method" +msgstr "Keresési módszer" + +# or you can use "Oldalbar" too ... +#: ../SearchWnd.cpp:128 +msgid "Toggle sidebar on/off." +msgstr "Sidebar be/ki kapcsolása" + +# maybe a better translation for "string" +#: ../SearchWnd.cpp:148 +msgid "Enter search string here. Regular expressions (AND/OR etc)are supported. Alternativly, enter ed2k://file link todirectly start a download (multiple links supported)." +msgstr "Adja meg a keresendÅ szöveget. Reguláris kifejezések (ÃS/VAGY stb) támogatottak. Továbbá megadhat egy ed2k://fájl hivatkozást azonnali letöltéshez (többszöri hivatkozás támogatott)." + +#: ../SearchWnd.cpp:187 +msgid "All types" +msgstr "Minden tÃpus" + +#: ../SearchWnd.cpp:201 +msgid "If checked, no search results filtering will accour." +msgstr "Ha ki van választva, akkor a keresési találatok nem lessznek szűrve." + +#: ../SearchWnd.cpp:210 +msgid "Size larger than" +msgstr "Méret nagyobb mint" + +#: ../SearchWnd.cpp:220 +msgid "Size smaller than" +msgstr "Méret kisebb mint" + +#: ../SearchWnd.cpp:230 +msgid "More than ... sources" +msgstr "Több mint ... forrás" + +# "number" missing in translation, but not worry ... +#: ../SearchWnd.cpp:240 +msgid "Limit number of results" +msgstr "Keresési találatok korlátozása" + +#: ../SearchWnd.cpp:251 +msgid "Check to show only files with size larger than ..." +msgstr "Kiválasztása csak azokat a fájlokat mutatja, melyek nagyobbak, mint ..." + +#: ../SearchWnd.cpp:254 +msgid "The size (in MB's) of the smallest file to be shown." +msgstr "A legkisebb fájlméret (MB -ban), amit megmutasson." + +#: ../SearchWnd.cpp:257 +msgid "Check to show only files with size smaller than ..." +msgstr "Kiválasztása csak azokat a fájlokat mutatja, melyek kisebbek, mint ..." + +#: ../SearchWnd.cpp:260 +msgid "The size (in MB's) of the largest file to be shown." +msgstr "A legnagyobb fájlméret (MB -ban), amit megmutasson." + +#: ../SearchWnd.cpp:263 +msgid "Check to show only files with at least ... sources." +msgstr "Kiválasztása csak azokat a fájlokat mutatja, melyeknek legalább ... forrása van" + +# maybe a better translation ? +#: ../SearchWnd.cpp:266 +msgid "Minimal amount of sources a file needs to be shown." +msgstr "Minimális forrásszám egy fájlnak, amelyet megmutasson." + +#: ../SearchWnd.cpp:269 +msgid "If checked, only ... first search results will be shown." +msgstr "Ha ki van választva, akkor csak az elsÅ ... keresési találat lesz megmutatva." + +#: ../SearchWnd.cpp:272 +msgid "Enter the maximum number of search results to be displayed." +msgstr "Adja meg a keresési találatok maximum számát, amelyet megmutasson." + +#: ../SearchWnd.cpp:314 +msgid "Current Server" +msgstr "Jelenlegi kiszolgáló" + +#: ../SearchWnd.cpp:318 +msgid "All Servers" +msgstr "Minden kiszolgáló" + +#: ../SearchWnd.cpp:322 +msgid "Jigle Database" +msgstr "Jigle adatbázis" + +#: ../SearchWnd.cpp:326 +msgid "FileDonkey Database" +msgstr "FileDonkey adatbázis" + +#: ../SearchWnd.cpp:331 +msgid "Search only the currently connected server." +msgstr "Keresés csak a jelenleg kapcsolt kiszolgálón." + +#: ../SearchWnd.cpp:332 +msgid "Search all servers in server list." +msgstr "Keresés a kiszolgálólistán levŠösszes kiszolgálón." + +#: ../SearchWnd.cpp:333 +msgid "Search the Jigle web database." +msgstr "Keresés a Jigle web adatbázisban." + +#: ../SearchWnd.cpp:334 +msgid "Search the FileDonkey web database." +msgstr "Keresés a FileDonkey adatbázisban." + +#: ../SearchWnd.cpp:444 +msgid "Audio" +msgstr "Audió" + +#: ../SearchWnd.cpp:448 +msgid "Video" +msgstr "Videó" + +# i not known the exactly translation :( +#: ../SearchWnd.cpp:452 +msgid "Archives" +msgstr "TömörÃtett" + +# very bad translation, but this was mostly used in other appz too ... +#: ../SearchWnd.cpp:456 +msgid "CD Images" +msgstr "ISO" + +#: ../SearchWnd.cpp:460 +msgid "Pictures" +msgstr "Képek" + +#: ../SearchWnd.cpp:464 +msgid "Applications" +msgstr "Alkalmazások" + +#: ../SearchWnd.cpp:468 +msgid "Documents" +msgstr "Dokumentumok" + +#: ../SearchWnd.cpp:474 +msgid "UNcheck to filter OUT files with mp3/ogg/wav/ape etc extensions." +msgstr "Leválasztása KIszűri az mp3/ogg/wav/ape stb. végzÅdésű fájlokat" + +#: ../SearchWnd.cpp:478 +msgid "UNcheck to filter OUT files with avi/mpg/ogm etc extensions." +msgstr "Leválasztása KIszűri az avi/mpg/ogm stb. végzÅdésű fájlokat" + +#: ../SearchWnd.cpp:482 +msgid "UNcheck to filter OUT files with zip/rar/ace etc extensions." +msgstr "Leválasztása KIszűri a zip/rar/ace stb. végzÅdésű fájlokat" + +#: ../SearchWnd.cpp:486 +msgid "UNcheck to filter OUT files with bin/ccd/iso etc extensions." +msgstr "Leválasztása KIszűri a bin/ccd/iso stb. végzÅdésű fájlokat" + +#: ../SearchWnd.cpp:490 +msgid "UNcheck to filter OUT files with jpg/png/bmp etc extensions." +msgstr "Leválasztása KIszűri a jpg/png/bmp stb. végzÅdésű fájlokat" + +#: ../SearchWnd.cpp:494 +msgid "UNcheck to filter OUT files with exe/com/bat etc extensions." +msgstr "Leválasztása KIszűri az exe/com/bat stb. végzÅdésű fájlokat" + +#: ../SearchWnd.cpp:498 +msgid "UNcheck to filter OUT files with doc/pdf/txt etc extensions." +msgstr "Leválasztása KIszűri a doc/pdf/txt stb. végzÅdésű fájlokat" + #: ../ServerListCtrl.cpp:54 msgid "Server Name" msgstr "Kiszolgáló neve" @@ -742,8 +908,8 @@ msgstr "Jogosultság" #: ../SharedFilesListCtrl.cpp:53 -#: ../wxInterface_wdr.cpp:279 -#: ../wxInterface_wdr.cpp:327 +#: ../wxInterface_wdr.cpp:85 +#: ../wxInterface_wdr.cpp:133 msgid "Requests" msgstr "Kérések" @@ -772,7 +938,7 @@ #: ../SysTray.cpp:473 #: ../SysTray.cpp:516 msgid "Unlimited" -msgstr "Korlátlan" +msgstr "korlátlan" # translate Interface? #: ../SysTray.cpp:243 @@ -872,11 +1038,11 @@ msgstr "" "\n" "Aktuális sebességkorlátozás:\n" -"letöltés: " +"Letöltés: " #: ../SysTray.cpp:459 msgid " kb/s UP: " -msgstr "kb/mp feltöltés: " +msgstr "kb/mp Feltöltés: " #: ../SysTray.cpp:460 msgid " kb/s" @@ -932,7 +1098,6 @@ msgstr "Letöltések" #: ../TransferWnd.cpp:208 -#: ../wxInterface_wdr.cpp:225 msgid "All" msgstr "Mind" @@ -956,166 +1121,85 @@ msgid "Upload Time" msgstr "Feltöltési idÅ" -#: ../wxInterface_wdr.cpp:72 -msgid "Method" -msgstr "Metódus" - -#: ../wxInterface_wdr.cpp:82 -msgid "Global" -msgstr "Globális" - -#: ../wxInterface_wdr.cpp:83 -msgid "Server" -msgstr "Kiszolgáló" - -#: ../wxInterface_wdr.cpp:90 -msgid "Any" -msgstr "Bármely" - -#: ../wxInterface_wdr.cpp:91 -msgid "Video" -msgstr "Videó" - -#: ../wxInterface_wdr.cpp:92 -msgid "Audio" -msgstr "Audió" - -# i not known the exactly translation :( -#: ../wxInterface_wdr.cpp:93 -msgid "Archive" -msgstr "TömörÃtett" - -#: ../wxInterface_wdr.cpp:94 -msgid "Text" -msgstr "Szöveg" - -#: ../wxInterface_wdr.cpp:95 -msgid "Image" -msgstr "Kép" - -#: ../wxInterface_wdr.cpp:100 -msgid "Reset" -msgstr "Nulláz" - -#: ../wxInterface_wdr.cpp:107 -msgid "Filter" -msgstr "SzűrÅ" - -#: ../wxInterface_wdr.cpp:114 -msgid "min Size" -msgstr "min. méret" - -#: ../wxInterface_wdr.cpp:127 -msgid "max Size" -msgstr "max. méret" - -#: ../wxInterface_wdr.cpp:144 -msgid "Availability" -msgstr "ElérhetÅség" - -#: ../wxInterface_wdr.cpp:156 -msgid "Extension" -msgstr "Kiterjesztés" - -#: ../wxInterface_wdr.cpp:168 -msgid "Direct Download" -msgstr "Közvetlen letöltés" - -#: ../wxInterface_wdr.cpp:171 -msgid "ED2K Link(s)" -msgstr "ED2K hivatkozás(ok)" - -#: ../wxInterface_wdr.cpp:189 -msgid "Search Results" -msgstr "Keresési eredmény" - -#: ../wxInterface_wdr.cpp:196 -msgid "Start" -msgstr "IndÃtás" - -#: ../wxInterface_wdr.cpp:215 -msgid "Download Selected" -msgstr "Letöltés kiválasztva" - # Session = "Menet" or "Ãlés"" here too, but not use it for that ... -#: ../wxInterface_wdr.cpp:272 +#: ../wxInterface_wdr.cpp:78 msgid "Current Session" msgstr "Jelenlegi Session" -#: ../wxInterface_wdr.cpp:282 -#: ../wxInterface_wdr.cpp:330 +#: ../wxInterface_wdr.cpp:88 +#: ../wxInterface_wdr.cpp:136 msgid "Accepted Uploads" msgstr "Elfogadott feltöltések" -#: ../wxInterface_wdr.cpp:320 +#: ../wxInterface_wdr.cpp:126 msgid "Total" msgstr "Ãsszesen" -#: ../wxInterface_wdr.cpp:383 +#: ../wxInterface_wdr.cpp:189 msgid "Friends" msgstr "Barátok" -#: ../wxInterface_wdr.cpp:402 +#: ../wxInterface_wdr.cpp:208 msgid "Messages" msgstr "Ãzenetek" -#: ../wxInterface_wdr.cpp:411 +#: ../wxInterface_wdr.cpp:217 msgid "Page" msgstr "Oldal" -#: ../wxInterface_wdr.cpp:422 +#: ../wxInterface_wdr.cpp:228 msgid "Send" msgstr "Küldés" -#: ../wxInterface_wdr.cpp:426 +#: ../wxInterface_wdr.cpp:232 msgid "Close" msgstr "Bezár" -#: ../wxInterface_wdr.cpp:461 +#: ../wxInterface_wdr.cpp:267 msgid "Statistics last reset: Unknown" msgstr "tatisztika legutóbbi nullázása: Ismeretlen" -#: ../wxInterface_wdr.cpp:474 +#: ../wxInterface_wdr.cpp:280 msgid "Connection Statistics" msgstr "Kapcsolat statisztikája" -#: ../wxInterface_wdr.cpp:483 +#: ../wxInterface_wdr.cpp:289 msgid "active downloads" -msgstr "aktÃv letöltés" +msgstr "AktÃv letöltés" -#: ../wxInterface_wdr.cpp:498 +#: ../wxInterface_wdr.cpp:304 msgid "active connections (1:3)" -msgstr "aktÃv kapcsolatok (1:3)" +msgstr "AktÃv kapcsolatok (1:3)" -#: ../wxInterface_wdr.cpp:509 +#: ../wxInterface_wdr.cpp:315 msgid "active uploads" -msgstr "aktÃv feltöltés" +msgstr "AktÃv feltöltés" -#: ../wxInterface_wdr.cpp:533 +#: ../wxInterface_wdr.cpp:339 msgid "Download-Speed" msgstr "Letöltési-Sebesség" # "Menetatlag" or "Ãlésátlag", but i think not for that ... -#: ../wxInterface_wdr.cpp:542 -#: ../wxInterface_wdr.cpp:595 +#: ../wxInterface_wdr.cpp:348 +#: ../wxInterface_wdr.cpp:401 msgid "session average" msgstr "Sessionátlag" -#: ../wxInterface_wdr.cpp:558 -#: ../wxInterface_wdr.cpp:611 +#: ../wxInterface_wdr.cpp:364 +#: ../wxInterface_wdr.cpp:417 msgid "current" -msgstr "jelenlegi" +msgstr "Jelenlegi" -#: ../wxInterface_wdr.cpp:569 -#: ../wxInterface_wdr.cpp:622 +#: ../wxInterface_wdr.cpp:375 +#: ../wxInterface_wdr.cpp:428 msgid "average (5 mins)" -msgstr "átlag (5 perc)" +msgstr "Ãtlag (5 perc)" -#: ../wxInterface_wdr.cpp:586 +#: ../wxInterface_wdr.cpp:392 msgid "Upload-Speed" msgstr "Feltöltési-Sebesség" -#: ../wxInterface_wdr.cpp:656 +#: ../wxInterface_wdr.cpp:462 msgid "" "Please speciy the name for your new language. \n" "File with this name and extension .mo must exist \n" @@ -1128,7 +1212,7 @@ "figyelemmel a csomag könyvtárában lévÅ TRANSLATION fájlt." # I translated the youriconsetname and MyNewIconSet, but you can replace it with the original ... -#: ../wxInterface_wdr.cpp:696 +#: ../wxInterface_wdr.cpp:502 msgid "" "Please enter the name of your new icon set in the box below.\n" "The iconset files must be in PNG format and filenames must\n" @@ -1143,15 +1227,15 @@ "images/sajaticonsetnev (kisbetukkel!) -ben fogja keresni. Ãgy ha a saját\n" "iconset-ed neve SajatUjIconSetem, akkor azt az images/sajatujiconsetem könyvtárban fogja keresni." -#: ../wxInterface_wdr.cpp:743 +#: ../wxInterface_wdr.cpp:549 msgid "ShareDaemon wxInterface ready!" msgstr "ShareDaemon wxInterface készenléti állapotban!" -#: ../wxInterface_wdr.cpp:779 +#: ../wxInterface_wdr.cpp:585 msgid "0 kb/s" msgstr "0 kb/mp" -#: ../wxInterface_wdr.cpp:788 +#: ../wxInterface_wdr.cpp:594 msgid "Disconnected" msgstr "Szétkapcsolva" Index: German.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/German.po,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- German.po 10 Jan 2004 18:53:40 -0000 1.8 +++ German.po 19 Jan 2004 20:13:35 -0000 1.9 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-31 16:43+0200\n" -"PO-Revision-Date: 2004-01-10 15:19+0200\n" +"POT-Creation-Date: 2004-01-16 20:24+0100\n" +"PO-Revision-Date: 2004-01-19 22:11+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ #: ../DownloadListCtrl.cpp:52 #: ../UploadListCtrl.cpp:52 -#: ../wxInterface_wdr.cpp:285 -#: ../wxInterface_wdr.cpp:333 +#: ../wxInterface_wdr.cpp:91 +#: ../wxInterface_wdr.cpp:139 msgid "Transferred" msgstr "Ãbertragen" @@ -240,8 +240,8 @@ msgstr "Menubar (Datei/Ansicht etc) \t\tanzeigen oder nicht." #: ../GUISettingsDlg.cpp:610 -#: ../wxInterface_wdr.cpp:668 -#: ../wxInterface_wdr.cpp:710 +#: ../wxInterface_wdr.cpp:474 +#: ../wxInterface_wdr.cpp:516 msgid "OK" msgstr "OK" @@ -251,9 +251,8 @@ msgstr "Einstellungen speichern und Dialog schlieÃen" #: ../GUISettingsDlg.cpp:619 -#: ../wxInterface_wdr.cpp:199 -#: ../wxInterface_wdr.cpp:672 -#: ../wxInterface_wdr.cpp:714 +#: ../wxInterface_wdr.cpp:478 +#: ../wxInterface_wdr.cpp:520 msgid "Cancel" msgstr "Abbruch" @@ -385,9 +384,10 @@ msgid "Help" msgstr "Hilfe" +# i think "beenden" with lowercase letter at start, or not ?! #: ../MainDlg.cpp:508 msgid "Close ShareDaemon wxInterface?" -msgstr "ShareDaemon wxInterface Beenden?" +msgstr "ShareDaemon wxInterface beenden?" #: ../MainDlg.cpp:509 msgid "Question" @@ -409,7 +409,7 @@ msgstr "Serverliste" #: ../MainDlg.cpp:561 -#: ../wxInterface_wdr.cpp:61 +#: ../SearchWnd.cpp:141 msgid "Search" msgstr "Suche" @@ -429,7 +429,7 @@ #: ../MainDlg.cpp:569 #: ../MainDlg.cpp:570 -#: ../wxInterface_wdr.cpp:255 +#: ../wxInterface_wdr.cpp:61 msgid "Shared Files" msgstr "Dateien" @@ -442,7 +442,7 @@ msgstr "Chatten" #: ../MainDlg.cpp:577 -#: ../wxInterface_wdr.cpp:263 +#: ../wxInterface_wdr.cpp:69 msgid "Statistics" msgstr "Statistik" @@ -531,13 +531,11 @@ #: ../SearchListCtrl.cpp:56 #: ../ServerWnd.cpp:505 -#: ../wxInterface_wdr.cpp:64 msgid "Name" msgstr "Name" #: ../SearchListCtrl.cpp:56 #: ../SharedFilesListCtrl.cpp:52 -#: ../wxInterface_wdr.cpp:75 msgid "Type" msgstr "Typ" @@ -546,6 +544,172 @@ msgid "Hash" msgstr "Hash" +#: ../SearchWnd.cpp:106 +msgid "Results Filtering" +msgstr "Filter Ergebnisse" + +#: ../SearchWnd.cpp:113 +msgid "Search Method" +msgstr "Suchmethode" + +#: ../SearchWnd.cpp:128 +msgid "Toggle sidebar on/off." +msgstr "Sidebar an/aus schalten." + +# "Zeichenkette" looks very bad, but this is the translation for string! +#: ../SearchWnd.cpp:148 +msgid "Enter search string here. Regular expressions (AND/OR etc)are supported. Alternativly, enter ed2k://file link todirectly start a download (multiple links supported)." +msgstr "Geben sie hier eine Zeichenkette ein. Reguläre Ausdrücke (UND/ODER etc) werden unterstützt. Andernfalls geben sie einen ed2k://Datei Link ein um einen Download direkt zu starten (mehrere Links werden unterstützt)." + +#: ../SearchWnd.cpp:187 +msgid "All types" +msgstr "Alle Typen" + +#: ../SearchWnd.cpp:201 +msgid "If checked, no search results filtering will accour." +msgstr "Wenn ausgewählt, dann werden die Suchergebnisse nicht gefiltert." + +# "GröÃe gröÃer als" but this looks bad ... +#: ../SearchWnd.cpp:210 +msgid "Size larger than" +msgstr "Datei gröÃer als" + +# "GröÃe kleiner als" looks bad too ... +#: ../SearchWnd.cpp:220 +msgid "Size smaller than" +msgstr "Datei kleiner als" + +#: ../SearchWnd.cpp:230 +msgid "More than ... sources" +msgstr "Mehr als ... Quellen" + +# maybe better translation +#: ../SearchWnd.cpp:240 +msgid "Limit number of results" +msgstr "Limit für Anzahl der Suchergebnisse" + +#: ../SearchWnd.cpp:251 +msgid "Check to show only files with size larger than ..." +msgstr "Auswählen, um nur die Daten anzuzeigen, die gröÃer sind als ..." + +# maybe another word for "GröÃe" +#: ../SearchWnd.cpp:254 +msgid "The size (in MB's) of the smallest file to be shown." +msgstr "GröÃe (in MB's) der kleinsten Datei, die angezeigt werden soll." + +#: ../SearchWnd.cpp:257 +msgid "Check to show only files with size smaller than ..." +msgstr "Auswählen, um nur die Daten anzuzeigen, die kleiner sind als ..." + +# here too for "GröÃe" +#: ../SearchWnd.cpp:260 +msgid "The size (in MB's) of the largest file to be shown." +msgstr "GröÃe (in MB's) der gröÃten Datei, die angezeigt werden soll." + +#: ../SearchWnd.cpp:263 +msgid "Check to show only files with at least ... sources." +msgstr "Auswählen, um nur die Daten anzuzeigen, die mindestens ... Datenquellen haben." + +#: ../SearchWnd.cpp:266 +msgid "Minimal amount of sources a file needs to be shown." +msgstr "Mindestanzahl der Quellen einer Datei die angezeigt werden sollen." + +#: ../SearchWnd.cpp:269 +msgid "If checked, only ... first search results will be shown." +msgstr "Wenn ausgewählt, werden nur die ersten ... Suchergebnisse angezeigt." + +#: ../SearchWnd.cpp:272 +msgid "Enter the maximum number of search results to be displayed." +msgstr "Geben sie den max. Zahl der Suchergebnisse an, die angezeigt werden sollen." + +#: ../SearchWnd.cpp:314 +msgid "Current Server" +msgstr "Aktueller Server" + +#: ../SearchWnd.cpp:318 +msgid "All Servers" +msgstr "Alle Server" + +#: ../SearchWnd.cpp:322 +msgid "Jigle Database" +msgstr "Jigle Datenbank" + +#: ../SearchWnd.cpp:326 +msgid "FileDonkey Database" +msgstr "FileDonkey Datenbank" + +#: ../SearchWnd.cpp:331 +msgid "Search only the currently connected server." +msgstr "Suche nur auf dem aktuell verbundenen Server." + +#: ../SearchWnd.cpp:332 +msgid "Search all servers in server list." +msgstr "Suche in allen Serven der Serverliste." + +#: ../SearchWnd.cpp:333 +msgid "Search the Jigle web database." +msgstr "Jigle Web Datenbank durchsuchen." + +#: ../SearchWnd.cpp:334 +msgid "Search the FileDonkey web database." +msgstr "FileDonkey Web Datenbank durchsuchen." + +#: ../SearchWnd.cpp:444 +msgid "Audio" +msgstr "Audio" + +#: ../SearchWnd.cpp:448 +msgid "Video" +msgstr "Video" + +#: ../SearchWnd.cpp:452 +msgid "Archives" +msgstr "Archive" + +#: ../SearchWnd.cpp:456 +msgid "CD Images" +msgstr "CD Images" + +#: ../SearchWnd.cpp:460 +msgid "Pictures" +msgstr "Bilder" + +#: ../SearchWnd.cpp:464 +msgid "Applications" +msgstr "Anwendungen" + +#: ../SearchWnd.cpp:468 +msgid "Documents" +msgstr "Dokumente" + +#: ../SearchWnd.cpp:474 +msgid "UNcheck to filter OUT files with mp3/ogg/wav/ape etc extensions." +msgstr "ABWÃHLEN, um Daten mit mp3/ogg/wav/ape und ähnlichen Erweiterungen AUS zu filtern." + +#: ../SearchWnd.cpp:478 +msgid "UNcheck to filter OUT files with avi/mpg/ogm etc extensions." +msgstr "ABWÃHLEN, um Daten mit avi/mpg/ogm und ähnlichen Erweiterungen AUS zu filtern." + +#: ../SearchWnd.cpp:482 +msgid "UNcheck to filter OUT files with zip/rar/ace etc extensions." +msgstr "ABWÃHLEN, um Daten mit zip/rar/ace und ähnlichen Erweiterungen AUS zu filtern." + +#: ../SearchWnd.cpp:486 +msgid "UNcheck to filter OUT files with bin/ccd/iso etc extensions." +msgstr "ABWÃHLEN, um Daten mit bin/ccd/iso und ähnlichen Erweiterungen AUS zu filtern." + +#: ../SearchWnd.cpp:490 +msgid "UNcheck to filter OUT files with jpg/png/bmp etc extensions." +msgstr "ABWÃHLEN, um Daten mit jpg/png/bmp und ähnlichen Erweiterungen AUS zu filtern." + +#: ../SearchWnd.cpp:494 +msgid "UNcheck to filter OUT files with exe/com/bat etc extensions." +msgstr "ABWÃHLEN, um Daten mit exe/com/bat und ähnlichen Erweiterungen AUS zu filtern." + +#: ../SearchWnd.cpp:498 +msgid "UNcheck to filter OUT files with doc/pdf/txt etc extensions." +msgstr "ABWÃHLEN, um Daten mit doc/pdf/txt und ähnlichen Erweiterungen AUS zu filtern." + #: ../ServerListCtrl.cpp:54 msgid "Server Name" msgstr "Server Name" @@ -745,8 +909,8 @@ msgstr "Erlaubnis" #: ../SharedFilesListCtrl.cpp:53 -#: ../wxInterface_wdr.cpp:279 -#: ../wxInterface_wdr.cpp:327 +#: ../wxInterface_wdr.cpp:85 +#: ../wxInterface_wdr.cpp:133 msgid "Requests" msgstr "Anfragen" @@ -898,11 +1062,11 @@ #: ../SysTray.cpp:587 msgid "Show" -msgstr "anzeigen" +msgstr "Anzeigen" #: ../SysTray.cpp:597 msgid "Hide" -msgstr "verbergen" +msgstr "Verbergen" #: ../SysTray.cpp:607 msgid "All To Max Speed" @@ -937,7 +1101,6 @@ msgstr "Downloads" #: ../TransferWnd.cpp:208 -#: ../wxInterface_wdr.cpp:225 msgid "All" msgstr "Alle" @@ -961,166 +1124,85 @@ msgid "Upload Time" msgstr "Upload Zeit" -#: ../wxInterface_wdr.cpp:72 -msgid "Method" -msgstr "Methode" - -#: ../wxInterface_wdr.cpp:82 -msgid "Global" -msgstr "Global" - -#: ../wxInterface_wdr.cpp:83 -msgid "Server" -msgstr "Server" - -#: ../wxInterface_wdr.cpp:90 -msgid "Any" -msgstr "Alle" - -#: ../wxInterface_wdr.cpp:91 -msgid "Video" -msgstr "Video" - -#: ../wxInterface_wdr.cpp:92 -msgid "Audio" -msgstr "Audio" - -#: ../wxInterface_wdr.cpp:93 -msgid "Archive" -msgstr "Archive" - -#: ../wxInterface_wdr.cpp:94 -msgid "Text" -msgstr "Text" - -#: ../wxInterface_wdr.cpp:95 -msgid "Image" -msgstr "Bilder" - -#: ../wxInterface_wdr.cpp:100 -msgid "Reset" -msgstr "Zurücksetzen" - -#: ../wxInterface_wdr.cpp:107 -msgid "Filter" -msgstr "Filter" - -#: ../wxInterface_wdr.cpp:114 -msgid "min Size" -msgstr "min. GröÃe" - -#: ../wxInterface_wdr.cpp:127 -msgid "max Size" -msgstr "max. GröÃe" - -#: ../wxInterface_wdr.cpp:144 -msgid "Availability" -msgstr "Verfügbarkeit" - -#: ../wxInterface_wdr.cpp:156 -msgid "Extension" -msgstr "Dateiendung" - -#: ../wxInterface_wdr.cpp:168 -msgid "Direct Download" -msgstr "Direkt downloaden" - -#: ../wxInterface_wdr.cpp:171 -msgid "ED2K Link(s)" -msgstr "ED2K Link(s)" - -# or only "Ergebnisse" -#: ../wxInterface_wdr.cpp:189 -msgid "Search Results" -msgstr "Suchergebnisse" - -#: ../wxInterface_wdr.cpp:196 -msgid "Start" -msgstr "Start" - -#: ../wxInterface_wdr.cpp:215 -msgid "Download Selected" -msgstr "Ausgewählte downloaden" - -#: ../wxInterface_wdr.cpp:272 +#: ../wxInterface_wdr.cpp:78 msgid "Current Session" msgstr "Aktuelle Sitzung" -#: ../wxInterface_wdr.cpp:282 -#: ../wxInterface_wdr.cpp:330 +#: ../wxInterface_wdr.cpp:88 +#: ../wxInterface_wdr.cpp:136 msgid "Accepted Uploads" msgstr "Akzeptierte Uploads" -#: ../wxInterface_wdr.cpp:320 +#: ../wxInterface_wdr.cpp:126 msgid "Total" msgstr "Gesamt" -#: ../wxInterface_wdr.cpp:383 +#: ../wxInterface_wdr.cpp:189 msgid "Friends" msgstr "Freunde" -#: ../wxInterface_wdr.cpp:402 +#: ../wxInterface_wdr.cpp:208 msgid "Messages" msgstr "Nachrichten" -#: ../wxInterface_wdr.cpp:411 +#: ../wxInterface_wdr.cpp:217 msgid "Page" msgstr "Seite" # or "Abschicken" -#: ../wxInterface_wdr.cpp:422 +#: ../wxInterface_wdr.cpp:228 msgid "Send" msgstr "Senden" -#: ../wxInterface_wdr.cpp:426 +#: ../wxInterface_wdr.cpp:232 msgid "Close" msgstr "SchlieÃen" -#: ../wxInterface_wdr.cpp:461 +#: ../wxInterface_wdr.cpp:267 msgid "Statistics last reset: Unknown" msgstr "Statistik letztens zurückgesetzt: Unbekannt" -#: ../wxInterface_wdr.cpp:474 +#: ../wxInterface_wdr.cpp:280 msgid "Connection Statistics" msgstr "Verbindungs Statistiken" -#: ../wxInterface_wdr.cpp:483 +#: ../wxInterface_wdr.cpp:289 msgid "active downloads" msgstr "Aktive Downloads" -#: ../wxInterface_wdr.cpp:498 +#: ../wxInterface_wdr.cpp:304 msgid "active connections (1:3)" msgstr "Aktive Verbindungen (1:3)" -#: ../wxInterface_wdr.cpp:509 +#: ../wxInterface_wdr.cpp:315 msgid "active uploads" msgstr "Aktive Uploads" -#: ../wxInterface_wdr.cpp:533 +#: ../wxInterface_wdr.cpp:339 msgid "Download-Speed" msgstr "Download-Geschwindigkeit" # or "Durchschnitt Sitzung" -#: ../wxInterface_wdr.cpp:542 -#: ../wxInterface_wdr.cpp:595 +#: ../wxInterface_wdr.cpp:348 +#: ../wxInterface_wdr.cpp:401 msgid "session average" msgstr "Sitzungsdurchschnitt" -#: ../wxInterface_wdr.cpp:558 -#: ../wxInterface_wdr.cpp:611 +#: ../wxInterface_wdr.cpp:364 +#: ../wxInterface_wdr.cpp:417 msgid "current" msgstr "Aktuell" -#: ../wxInterface_wdr.cpp:569 -#: ../wxInterface_wdr.cpp:622 +#: ../wxInterface_wdr.cpp:375 +#: ../wxInterface_wdr.cpp:428 msgid "average (5 mins)" msgstr "Durchschnitt (5 min.)" -#: ../wxInterface_wdr.cpp:586 +#: ../wxInterface_wdr.cpp:392 msgid "Upload-Speed" msgstr "Upload-Geschwindigkeit" -#: ../wxInterface_wdr.cpp:656 +#: ../wxInterface_wdr.cpp:462 msgid "" "Please speciy the name for your new language. \n" "File with this name and extension .mo must exist \n" @@ -1133,7 +1215,7 @@ "die TRANSLATION Datei im Packetverzeichnis." # translate Box ?! -#: ../wxInterface_wdr.cpp:696 +#: ../wxInterface_wdr.cpp:502 msgid "" "Please enter the name of your new icon set in the box below.\n" "The iconset files must be in PNG format and filenames must\n" @@ -1149,16 +1231,16 @@ "Iconset Name also MeinNeuerIconSet ist, wird dies im\n" "images/meinneuericonset Verzeichnis gesucht." -#: ../wxInterface_wdr.cpp:743 +#: ../wxInterface_wdr.cpp:549 msgid "ShareDaemon wxInterface ready!" msgstr "ShareDaemon wxInterface bereit!" -#: ../wxInterface_wdr.cpp:779 +#: ../wxInterface_wdr.cpp:585 msgid "0 kb/s" msgstr "0 kb/s" # or "Verbindung verloren" is good too -#: ../wxInterface_wdr.cpp:788 +#: ../wxInterface_wdr.cpp:594 msgid "Disconnected" msgstr "Getrennt" |
|
From: <bo...@us...> - 2004-01-15 20:22:04
|
Update of /cvsroot/sharedaemon/core/src In directory sc8-pr-cvs1:/tmp/cvs-serv8197 Modified Files: test.cpp Log Message: Corrected the nasty bug, that a non-existent server.met wasn't reported as an error Index: test.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/test.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- test.cpp 12 Jan 2004 21:39:55 -0000 1.32 +++ test.cpp 15 Jan 2004 20:22:00 -0000 1.33 @@ -557,7 +557,7 @@ struct tag * tp; u32 nt; - ServerMet->Read(server_met); + if (!ServerMet->Read(server_met)) return false; ServerMet->Get(server_met_magic,"magic"); ServerMet->Get(num_servers,"num_servers"); |
|
From: <ma...@us...> - 2004-01-14 13:26:52
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27376
Modified Files:
MainDlg.cpp MainDlg.h
Log Message:
Fixed toolbar images (re)generation if toolbar is not visible at the time of iconset change.
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- MainDlg.cpp 14 Jan 2004 13:02:24 -0000 1.60
+++ MainDlg.cpp 14 Jan 2004 13:26:44 -0000 1.61
@@ -316,7 +316,6 @@
void CMainDlg::CreateMyToolBar(bool gen_images) {
int tool_align; /* For storing values read from configuration */
bool show_tool; /* For storing values read from configuration */
-unsigned int i; /* Loop counter */
wxArrayString names; /* Names for multibutton controls */
wxArrayString images; /* Images for multibutton controls */
@@ -326,6 +325,10 @@
show_tool = true;
+ if (start_up || gen_images) { /* Gen them before anything else */
+ GenToolBarImages();
+ }
+
m_config->Read(wxT("/General/Show ToolBar"), &show_tool, true);
if (!show_tool) {
return;
@@ -339,19 +342,6 @@
tool_align|wxNO_BORDER|wxTB_3DBUTTONS|wxTB_FLAT|wxCLIP_CHILDREN
);
- if (start_up || gen_images) {
- for (i=0;i<pages.GetCount();i++) {
- if (pages.IsEmpty()) {
- break;
- }
- names.Add(pages[i]->short_title);
- }
- names.Add(_("Connect"));
- names.Add(_("Options"));
- img->CalcToolBitmapSize(names);
- names.Clear();
- }
-
tb->SetToolBitmapSize(
wxSize(img->tool_img_width, img->tool_img_height)
);
@@ -383,10 +373,6 @@
int ids[2]; /* Identifiers for multibutton controls */
unsigned int i; /* Loop counter */
- if (gen_images) {
- img->MakeToolImage(_("Connect"), wxT("btn_connect"));
- }
-
/* On wxMSW, only use custom control in horizontal toolbar. */
#ifdef __WXMSW__
if (tool_align == wxTB_HORIZONTAL) {
@@ -437,12 +423,6 @@
if (pages.IsEmpty()){
break;
}
- if (gen_images) {
- img->MakeToolImage(
- pages.Item(i)->GetData()->short_title,
- pages.Item(i)->GetData()->image
- );
- }
tb->AddTool(
pages.Item(i)->GetData()->id,
pages.Item(i)->GetData()->short_title,
@@ -454,11 +434,6 @@
);
}
- if (gen_images) {
- img->MakeToolImage(
- _("Options"), wxT("btn_guisettings")
- );
- }
/* On wxMSW, only use custom control in horizontal toolbar. */
#ifdef __WXMSW__
if (tool_align == wxTB_HORIZONTAL) {
@@ -1220,3 +1195,36 @@
systray->SetIcon(icon);
#endif
}
+
+/*********************************************************** GenToolBarImages */
+/* This method iterates on the pages list and calls correct functions for */
+/* (re)generating toolbar button images. */
+/******************************************************************************/
+void CMainDlg::GenToolBarImages() {
+unsigned int i; /* Loop counter */
+wxArrayString names; /* Names for button texts */
+
+ for (i=0;i<pages.GetCount();i++) {
+ if (pages.IsEmpty()) {
+ break;
+ }
+ names.Add(pages[i]->short_title);
+ }
+ names.Add(_("Connect"));
+ names.Add(_("Options"));
+ img->CalcToolBitmapSize(names);
+ names.Clear();
+ for (i=0;i<pages.GetCount();i++) {
+ if (pages.IsEmpty()) {
+ break;
+ }
+ img->MakeToolImage(
+ pages.Item(i)->GetData()->short_title,
+ pages.Item(i)->GetData()->image
+ );
+ }
+ img->MakeToolImage(_("Connect"), wxT("btn_connect"));
+ img->MakeToolImage(
+ _("Options"), wxT("btn_guisettings")
+ );
+}
Index: MainDlg.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- MainDlg.h 14 Jan 2004 13:02:24 -0000 1.20
+++ MainDlg.h 14 Jan 2004 13:26:44 -0000 1.21
@@ -185,6 +185,7 @@
void GenerateToolBarButtons( /* There the actual buttons are created */
MyToolBar *tb, bool gen_images, int tool_align
);
+ void GenToolBarImages(); /* (re)generates toolbar button images */
/* Getters - small methods for retreiving various kinds of data */
Page* GetCurPage() { return cur_page;} /* Returns current active page */
|
|
From: <ma...@us...> - 2004-01-14 13:02:28
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22788
Modified Files:
MainDlg.cpp MainDlg.h Makefile.am defines.h
Added Files:
AboutDlg.cpp AboutDlg.h
Log Message:
Aboutbox(tm)
--- NEW FILE: AboutDlg.cpp ---
/*
* This file is part of wxInterface.
* Copyright (C) 2003 Alo Sarv <ma...@us...>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifdef __GNUG__
#pragma implementation "AboutDlg.h"
#endif
// For compilers that support precompilation
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "AboutDlg.h"
/**
* Constructor for about dialog - calls CreateControls().
*/
CAboutDlg::CAboutDlg(
wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint
&pos, const wxSize &size, long style, const wxString &name
) : wxDialog(parent, id, title, pos, size, style, name) {
CreateControls();
}
/************************************************************* CreateControls */
/* Create controls for da about dlg. logo array contains the logo ofcourse. */
/******************************************************************************/
void CAboutDlg::CreateControls() {
static const unsigned char logo[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
2,0,0,2,0,0,2,0,0,2,0,0,4,0,0,4,3,0,4,3,0,4,4,0,4,
4,0,4,7,0,4,7,0,4,8,0,5,8,0,5,8,0,5,6,0,4,3,0,2,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,0,4,1,0,5,
1,0,5,1,0,5,1,0,4,1,0,4,1,0,4,1,0,4,0,0,4,0,0,4,0,
0,4,0,0,4,0,0,2,0,0,2,0,0,2,0,0,0,0,0,0,0,1,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
1,1,3,1,1,3,2,2,4,2,1,6,2,1,6,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,2,0,0,2,
0,0,2,0,0,2,1,0,2,1,0,2,3,0,2,4,0,2,4,0,2,6,0,2,6,
0,4,7,0,4,7,0,4,6,0,2,1,0,2,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,4,0,0,4,1,0,4,0,0,4,1,0,2,0,
0,2,1,0,2,0,0,2,0,0,2,0,0,2,0,0,2,0,0,2,0,0,2,0,0,
0,0,0,2,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,1,3,1,1,3,2,2,4,2,
1,6,2,1,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,1,0,0,2,0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,
0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,3,0,0,3,0,0,3,0,
0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,
0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,
0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,2,1,1,3,1,1,3,2,2,4,2,1,6,2,1,6,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,
1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,
0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,1,0,0,1,
0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,
0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,1,3,1,1,
3,2,2,4,2,1,6,2,1,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,
0,0,2,0,0,2,0,0,2,0,0,2,0,0,3,0,0,3,0,0,3,0,0,3,0,
0,3,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,1,0,0,2,0,0,2,0,0,2,0,0,2,0,0,2,0,0,2,0,0,2,0,
0,2,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,
0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,2,1,1,3,1,1,3,2,2,4,2,1,6,2,1,6,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,2,0,0,2,0,
0,3,0,0,3,0,0,4,0,0,4,0,0,4,0,0,4,0,0,4,0,0,1,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,2,0,
0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
1,1,3,1,1,3,2,2,4,2,1,6,2,1,6,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,1,0,0,3,0,0,3,0,0,3,0,2,3,0,0,
3,0,0,1,0,0,0,0,0,0,1,0,0,1,0,0,2,0,0,2,0,0,2,0,0,
3,0,0,3,0,0,3,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,1,0,
0,1,0,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,1,3,1,1,3,2,2,4,2,
1,6,2,1,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,3,0,2,4,0,2,4,0,2,4,0,2,3,0,2,3,0,2,1,0,2,0,
0,2,0,0,2,0,0,2,0,1,2,0,1,2,0,2,2,0,2,2,0,2,0,0,1,
0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,
0,0,3,0,0,3,0,2,3,0,2,3,0,2,3,0,2,3,0,2,3,0,2,3,0,
2,3,0,2,3,0,2,3,0,2,3,0,2,3,0,2,3,0,2,1,0,0,1,0,0,
0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,2,1,1,3,1,1,3,2,2,4,2,1,6,2,1,6,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,1,1,1,1,1,0,0,0,0,0,0,1,1,1,4,2,3,3,0,2,5,0,5,4,
0,4,4,0,4,4,0,4,3,0,4,3,0,4,1,0,4,1,0,4,0,0,4,0,0,
5,0,0,5,0,0,5,0,0,5,0,0,5,0,0,4,0,0,2,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,1,0,2,6,0,6,8,0,7,7,0,6,7,0,
6,4,0,5,4,0,5,4,0,4,4,0,4,5,0,5,4,0,4,4,0,4,4,0,4,
4,0,4,4,0,4,3,0,4,3,1,4,1,0,0,1,2,0,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,2,0,0,2,0,0,
2,0,0,2,0,0,4,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,0,
0,0,1,1,1,1,1,1,1,0,0,2,0,3,3,1,4,1,0,2,2,0,3,6,4,
7,5,3,8,1,0,4,2,0,6,2,0,6,2,0,8,1,0,7,1,0,7,1,0,7,
1,0,7,1,0,5,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,1,0,2,6,0,5,7,0,7,7,0,7,6,0,7,6,0,7,4,0,7,4,0,5,
4,0,5,3,0,4,3,0,4,4,0,3,2,0,3,1,0,2,1,0,2,2,0,3,1,
1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,
1,0,0,0,0,0,0,0,0,2,0,0,2,0,0,2,0,0,2,0,0,4,0,0,4,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
2,2,1,1,1,0,0,0,0,0,0,2,2,2,2,2,2,1,1,1,0,1,0,0,2,
0,0,3,0,0,4,0,0,2,0,0,3,0,2,4,1,1,3,2,0,0,2,2,1,6,
2,1,7,3,0,9,3,0,9,3,0,11,4,0,10,4,0,10,4,0,8,2,0,3,1,
1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,2,0,3,6,0,7,7,0,9,
6,0,9,6,0,9,4,0,7,3,0,7,3,0,5,1,0,4,0,0,2,0,0,0,0,
1,0,0,3,0,0,3,0,0,4,0,0,3,0,0,2,0,0,1,0,0,1,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
0,0,2,0,0,2,0,0,2,0,0,4,0,0,4,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,
0,1,1,1,2,2,2,2,2,2,0,2,0,0,8,0,0,13,0,0,13,0,0,8,0,
0,6,0,0,7,0,0,6,0,0,4,0,0,2,1,0,1,3,1,2,6,2,1,7,4,
1,8,7,1,11,7,1,13,7,1,11,3,1,4,1,1,1,1,1,1,1,1,1,1,1,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
1,1,1,1,1,1,3,1,4,7,0,10,6,0,11,6,0,9,4,0,6,1,0,5,0,
0,4,0,0,2,0,1,0,1,8,1,0,8,0,0,8,0,0,10,0,0,12,0,0,12,
0,0,11,0,0,7,0,0,5,0,2,3,0,1,1,0,1,1,0,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,2,0,0,2,0,
0,4,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,5,5,5,
0,10,1,0,23,0,0,31,0,0,29,0,0,22,0,0,18,0,0,18,0,0,19,0,0,
17,0,0,13,0,0,11,1,2,8,4,2,6,5,3,4,6,4,3,8,4,1,8,4,2,
7,3,3,5,2,2,2,2,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,2,2,2,2,2,2,3,3,5,2,
1,6,3,2,8,2,3,7,1,5,6,1,7,5,0,9,4,0,11,1,0,13,0,2,23,
4,0,22,0,0,21,0,0,23,0,0,26,0,0,28,0,0,27,0,0,23,0,3,14,0,
6,7,2,2,2,0,1,1,0,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,2,0,0,2,0,0,2,0,0,2,0,0,4,0,0,4,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,4,4,4,12,12,12,10,24,9,0,39,0,0,48,0,0,
47,0,0,39,0,0,33,0,0,32,0,0,32,0,1,30,0,2,26,2,4,23,4,5,19,
6,4,14,5,3,10,3,1,6,2,2,2,2,1,1,3,3,3,3,3,3,3,3,3,3,
2,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,
1,1,2,2,2,3,3,3,3,3,3,2,4,3,0,2,3,0,5,3,0,8,3,1,12,
4,4,17,7,4,22,8,3,26,6,2,30,5,0,31,0,0,31,0,0,32,0,0,36,0,
0,43,0,0,46,0,0,45,0,0,38,0,11,24,7,12,13,8,5,5,3,1,1,0,2,
2,0,2,2,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,
2,0,0,2,0,0,4,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,0,0,0,0,0,0,6,
6,6,20,20,20,22,39,21,14,64,11,10,77,8,13,78,12,8,68,6,2,57,0,1,51,
0,0,46,0,3,41,0,1,35,2,5,31,4,5,27,6,5,22,4,5,17,5,4,14,5,
5,10,4,4,9,5,4,4,4,4,4,4,3,3,3,2,2,2,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,2,2,2,3,3,3,4,4,
4,1,5,4,0,11,5,0,14,4,1,17,6,3,21,7,3,26,6,3,31,8,2,35,6,
1,38,4,0,43,0,0,46,0,0,52,0,7,62,5,12,72,10,13,78,12,9,74,6,15,
63,11,15,32,13,17,18,13,7,7,5,1,1,0,1,1,0,3,3,1,2,2,2,0,0,
0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,2,0,0,2,0,0,4,0,0,4,
0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,3,3,3,3,5,4,0,2,0,0,2,0,5,12,5,22,29,22,26,52,25,34,96,
33,27,113,24,22,120,17,8,114,3,0,101,0,0,87,0,0,72,0,0,60,0,0,42,0,
0,37,0,0,35,0,0,32,0,0,29,1,6,24,8,11,20,15,15,16,18,4,6,5,3,
5,4,2,4,3,2,4,3,2,2,2,1,1,1,0,0,0,0,0,0,0,0,0,0,0,
0,1,1,1,1,3,0,3,3,1,2,4,1,3,5,2,4,6,1,13,18,11,10,22,10,
3,26,8,0,30,7,0,35,3,0,39,0,0,43,0,0,47,0,0,70,0,0,78,0,0,
94,0,1,110,5,13,119,18,20,120,22,22,111,19,32,94,27,16,41,12,17,22,15,5,
10,4,0,3,0,0,2,0,2,4,1,1,3,0,1,1,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,5,0,0,5,0,0,4,0,0,
2,0,0,1,0,0,0,0,0,0,0,1,0,2,3,3,5,0,1,0,0,2,0,0,9,
0,0,10,0,0,13,0,10,32,11,21,62,22,64,136,62,64,175,57,53,208,44,31,213,
17,8,202,0,1,182,0,6,150,1,8,122,9,4,91,10,0,54,0,0,57,0,0,40,0,0,
42,0,0,20,0,3,10,18,26,22,39,31,32,36,20,25,21,7,12,8,0,2,0,0,2,
1,5,7,6,3,5,2,0,1,0,0,1,0,2,4,1,2,4,1,0,3,0,4,6,1,
12,17,11,19,24,17,24,25,19,25,16,11,12,14,3,0,19,0,0,33,2,0,40,0,0,
54,0,0,84,0,0,98,0,0,126,0,7,163,1,1,190,10,0,196,12,20,207,38,55,215,
67,55,175,52,35,113,27,14,51,10,12,26,9,0,10,0,0,5,0,0,5,0,0,4,0,
0,3,0,1,3,0,0,2,0,0,2,0,0,2,0,0,2,0,0,2,0,0,3,0,0,
2,0,0,3,0,0,5,0,0,5,0,0,4,0,0,2,0,0,0,0,1,0,2,3,0,
4,3,0,4,5,0,7,0,0,4,0,2,1,0,9,1,0,9,0,0,11,0,5,29,5,
12,58,12,29,114,31,43,177,42,43,233,35,19,246,6,1,245,0,12,241,0,32,217,
28,40,186,43,47,160,52,2,103,9,0,94,0,0,71,0,0,64,0,0,38,0,0,16,13,6,6,
18,10,16,14,10,20,12,10,20,12,7,13,9,3,9,5,1,5,4,1,3,0,0,1,0,
1,3,0,3,5,2,2,7,1,2,9,1,6,14,3,10,20,9,14,25,11,17,26,9,9,
11,0,10,25,0,0,42,1,0,60,6,0,73,2,0,87,0,16,126,11,43,170,27,43,204,
26,35,231,25,14,249,24,4,248,26,22,249,46,44,235,61,39,176,36,18,105,10,
8,47,3,8,22,7,0,9,0,0,5,0,0,5,0,0,3,0,0,2,0,2,2,2,1,1,1,1,
1,1,2,0,1,1,1,0,1,1,0,1,2,0,1,2,0,0,3,0,0,1,0,0,1,
0,0,0,0,1,0,2,4,0,5,6,0,7,7,0,9,7,0,9,8,0,12,4,0,9,
4,0,6,3,4,6,0,4,0,0,6,0,3,19,6,2,47,8,3,102,12,26,179,35,35,
243,37,12,254,9,0,254,0,14,255,6,42,243,40,52,217,53,54,188,57,22,144,25
,36,161,33,19,137,14,0,100,0,0,58,0,0,33,0,0,10,0,0,16,0,9,25,12,22,36,
23,23,35,25,13,22,17,3,9,5,0,3,2,3,5,4,1,3,2,3,8,4,9,16,9,15,
25,14,19,31,17,16,31,12,10,28,6,5,29,0,0,28,0,0,52,0,0,73,0,0,107,
12,19,146,41,17,151,30,23,159,17,55,205,38,52,228,33,33,238,21,7,247,16,
1,248,20,18,244,40,26,217,41,15,152,10,0,85,0,1,35,0,6,13,6,0,4,0,0,2,0,
2,2,4,2,0,5,4,0,5,5,0,6,5,0,6,5,0,6,7,0,6,5,0,5,5,0,
5,5,0,3,5,0,3,4,0,1,0,0,0,0,0,0,1,0,2,3,0,4,6,0,7,
7,0,9,8,0,11,8,0,11,8,0,11,6,0,11,5,0,9,4,3,8,0,2,1,0,
4,0,1,13,3,0,37,1,0,96,9,13,164,23,23,225,25,7,246,3,0,248,0,3,248,
0,25,233,23,37,216,37,17,172,19,5,151,6,56,207,50,55,205,46,26,164,16,0,
116,0,0,82,0,0,35,0,0,22,0,0,22,0,8,29,10,15,33,19,11,24,15,1,10,5,0,
4,3,6,8,7,0,2,1,3,8,4,10,20,11,19,33,18,14,33,13,1,24,0,0,17,
0,0,23,0,0,56,0,0,98,0,4,133,7,25,172,40,58,217,75,29,192,39,0,154,0,
27,193,9,42,230,22,23,233,10,3,241,8,4,245,19,18,236,36,20,202,31,10,142
,4,6,87,0,0,27,0,2,7,3,0,1,0,0,1,0,4,2,7,4,0,6,4,0,5,7,0,
8,7,0,8,7,0,8,8,0,8,7,0,6,8,0,6,7,0,5,7,0,5,5,0,5,
0,1,0,0,0,0,1,0,2,3,0,4,4,0,5,6,0,7,6,0,9,6,0,9,6,
0,9,4,0,7,3,0,7,2,3,5,0,3,0,0,4,0,0,11,1,0,29,0,0,78,
0,0,127,0,11,189,5,21,236,11,20,254,7,16,249,7,26,233,21,35,224,34,0,166
,0,0,149,0,25,214,24,42,236,41,41,228,37,28,200,26,13,159,16,0,89,0,0,46
,0,0,21,0,0,12,0,0,17,0,0,18,4,0,9,1,0,4,2,2,6,7,0,4,3,0,6,
2,3,15,5,4,23,4,0,19,0,0,13,0,0,19,0,0,46,0,0,103,0,18,164,1,
39,209,40,44,228,56,52,243,67,5,194,12,0,141,0,8,190,0,38,233,19,27,239,
15,18,249,23,20,249,34,21,224,36,8,177,16,0,118,0,0,72,0,0,22,0,0,6,0,0,
2,0,0,2,1,3,3,5,2,0,5,3,0,5,5,0,6,5,0,6,5,0,6,7,0,6,
5,0,6,7,0,6,5,0,5,5,0,5,4,0,3,0,2,0,0,2,0,0,1,0,0,
0,0,1,0,2,3,0,4,3,0,5,3,0,5,3,0,5,1,0,5,2,3,5,0,4,
2,0,5,0,0,8,0,0,14,1,0,27,0,0,55,0,0,87,0,3,147,0,29,209,13,
40,246,24,35,245,22,35,230,29,40,226,39,0,163,0,0,162,0,17,226,20,23,242
,26,25,244,28,26,235,30,29,216,37,24,169,32,31,109,33,12,55,12,0,21,0,0,
19,0,4,25,8,4,17,8,0,6,3,0,2,3,3,7,6,0,8,3,1,15,2,0,22,1,0,20,0,
0,27,0,23,67,18,46,125,36,36,174,16,38,215,21,42,238,42,27,233,36,36,244
,47,3,205,7,0,145,0,1,186,0,32,221,13,30,230,20,25,237,30,21,226,33,9,
189,22,0,135,0,0,80,0,0,43,0,0,23,0,0,10,0,0,6,0,0,7,0,1,6,2,0,2,1,
0,0,2,3,1,6,4,0,5,4,0,5,4,0,5,4,0,3,4,0,3,2,0,1,2,
0,1,2,0,1,0,4,0,0,4,0,0,3,0,0,2,0,0,2,0,0,1,0,0,1,
0,0,1,0,0,1,0,0,4,2,0,7,0,0,7,0,0,8,0,0,14,0,0,19,0,
0,27,0,2,40,0,0,59,0,0,101,0,11,151,0,29,194,12,38,215,25,44,217,39,44,
216,44,0,154,0,0,178,0,30,243,37,16,244,23,10,242,18,7,235,18,26,238,40,
52,220,65,63,155,68,33,83,34,0,32,0,0,28,0,12,37,16,12,28,17,2,11,8,0,4,
4,3,9,9,3,12,7,9,25,12,8,34,9,0,29,0,0,41,0,49,100,44,90,177,80,68,
221,51,39,233,25,28,236,30,8,221,17,31,242,41,22,224,28,0,155,0,0,174,0,
48,221,33,44,220,34,29,210,33,13,183,24,0,143,8,0,101,0,0,63,0,0,40,0,0,
26,0,0,17,0,0,12,0,0,11,0,0,8,0,0,4,0,0,2,0,0,5,1,0,2,1,0,
2,1,0,2,0,0,2,0,0,2,0,0,3,0,0,3,0,0,3,0,0,3,0,0,3,
0,0,3,0,0,3,0,0,2,0,0,2,0,0,1,0,0,1,0,0,2,0,0,6,1,
0,7,0,0,7,0,0,8,0,0,15,0,1,22,3,4,28,4,7,32,2,0,43,0,0,
64,0,0,96,0,7,140,0,36,183,30,59,205,58,62,212,65,0,149,0,4,177,10,39,
234,44,25,234,29,28,245,34,25,238,32,28,232,39,49,212,59,54,146,59,17,
70,18,0,19,0,0,20,0,11,36,15,15,33,21,6,17,13,3,9,9,2,8,8,6,17,11,15,33,
17,11,37,12,0,23,0,0,25,0,29,83,25,73,163,67,62,215,49,38,229,29,41,241,
44,21,222,28,37,233,47,33,218,37,0,153,0,10,165,1,72,220,61,61,205,55,
29,174,33,0,131,8,0,91,0,0,65,0,0,48,0,6,37,3,3,27,3,0,18,2,0,14,0,0,12,
0,0,9,0,0,3,0,0,2,0,0,5,1,0,2,1,0,2,1,0,2,1,0,2,0,0,2,
0,0,3,0,0,3,0,0,3,0,0,0,0,0,0,0,0,0,2,0,0,2,2,0,5,
3,1,6,4,3,8,4,3,8,9,10,14,0,1,2,0,4,3,0,8,3,0,4,0,2,
15,6,16,29,20,5,23,11,7,30,14,2,41,10,0,58,0,0,71,0,0,88,0,0,113,
0,25,141,30,43,164,51,7,132,12,37,175,40,54,209,55,44,211,43,34,205,31,
33,201,30,22,181,19,17,146,17,0,80,1,0,40,0,0,26,0,0,30,0,0,26,3,3,21,7,
7,18,12,3,12,9,3,12,9,0,11,3,0,18,2,0,26,0,0,25,0,0,26,0,0,48,
0,2,85,0,22,160,15,22,190,17,34,207,37,38,210,46,41,209,52,43,200,51,35,
173,34,21,146,16,42,157,36,23,131,20,0,100,1,0,81,0,0,65,4,0,51,10,12,
37,15,18,32,19,11,25,12,8,21,11,0,9,1,0,3,0,0,6,4,1,2,4,0,0,2,5,3,
8,8,3,10,7,2,8,6,1,7,4,2,5,4,2,5,4,2,3,4,4,4,4,4,4,
7,5,10,6,4,9,5,3,8,4,2,7,3,0,7,2,0,6,2,0,6,1,0,6,5,
4,10,0,0,4,1,5,6,5,11,11,3,12,9,8,17,14,13,24,18,11,24,17,10,30,
21,7,38,20,0,50,12,0,58,1,0,63,0,0,71,0,0,83,3,1,93,10,0,94,3,
1,108,4,1,120,0,0,125,0,0,127,0,0,128,0,0,117,0,0,97,0,6,73,6,0,
44,0,0,42,4,16,51,21,23,48,27,21,39,25,16,29,20,6,17,11,11,20,15,14,27,
17,21,39,23,25,51,24,12,48,12,0,42,0,3,51,1,4,76,0,0,108,0,0,129,0,
0,135,0,0,129,0,0,123,0,0,120,4,3,110,4,2,98,1,10,95,10,0,78,2,0,
63,0,0,54,3,0,47,11,5,37,16,13,26,17,16,22,18,21,30,25,15,26,18,10,19,
14,8,14,12,3,7,8,0,1,5,1,0,5,3,0,5,6,0,9,6,0,9,6,0,7,
6,1,8,6,1,7,5,3,8,6,4,7,7,5,8,7,4,11,6,3,10,5,3,8,4,
2,7,3,1,6,1,0,5,0,0,4,0,0,4,1,2,6,0,4,5,2,6,7,12,18,
18,21,30,27,13,24,20,4,15,9,7,20,13,3,18,11,5,28,12,8,40,16,8,50,14,
2,53,10,0,53,4,0,52,0,0,52,0,0,65,1,0,59,0,0,58,0,0,71,0,0,
86,0,0,90,0,0,89,0,5,81,6,9,61,12,4,41,7,11,44,13,28,56,31,32,55,
37,29,47,33,23,36,27,10,23,14,20,31,23,25,38,28,33,51,35,36,60,36,26,55,
24,11,45,8,9,48,4,8,63,5,0,83,0,0,96,0,0,94,0,0,80,0,0,67,0,0,
64,0,0,63,0,0,58,0,0,52,0,0,46,0,0,44,5,5,46,16,10,42,21,9,31,
18,8,21,14,8,17,12,4,15,9,1,12,4,15,24,19,21,27,25,6,10,11,8,9,13,
17,14,21,8,5,12,4,0,8,4,0,8,5,0,7,5,0,7,6,1,7,4,2,7,4,
2,5,4,4,6,0,7,0,0,8,0,0,9,0,0,9,0,0,9,0,0,10,0,0,9,
0,0,9,0,0,10,0,0,10,0,0,10,0,4,29,7,27,55,30,13,43,17,0,19,0,
0,19,0,0,15,0,0,22,0,10,34,8,19,48,18,23,56,25,21,58,24,13,55,17,5,
53,11,1,57,8,0,56,2,0,61,0,3,72,7,14,83,18,18,87,22,17,83,21,18,75,
22,11,48,14,1,29,6,2,27,5,11,34,14,14,32,16,16,32,19,19,32,22,13,26,16,
21,34,24,21,35,22,21,38,22,19,38,18,9,33,7,2,28,0,5,34,3,10,48,7,16,
73,18,19,85,23,18,87,24,12,78,17,2,68,7,1,61,7,0,56,5,0,49,4,10,55,
16,12,52,18,17,51,24,19,51,27,14,43,21,3,30,11,0,21,2,0,19,0,0,23,0,
0,26,0,22,51,23,25,51,26,0,14,0,0,8,0,0,9,0,0,7,0,0,9,0,0,
9,0,0,9,0,0,9,0,0,8,0,0,8,0,0,8,0,0,8,0,0,32,0,0,34,
0,0,35,0,0,37,0,0,37,0,0,37,0,0,37,0,0,36,0,0,44,0,0,47,0,
0,48,0,4,69,1,33,98,30,19,86,17,0,52,0,0,40,0,0,27,0,0,26,0,3,
29,0,10,36,0,16,43,10,16,46,12,11,47,11,5,46,6,3,50,8,12,64,18,18,70,
24,11,64,20,6,59,15,8,59,18,2,53,12,0,40,8,6,31,12,0,12,1,0,9,0,
0,11,0,0,10,0,2,16,3,10,24,11,8,22,9,12,26,13,8,22,7,4,18,3,0,
15,0,0,10,0,0,10,0,1,18,0,8,30,9,5,38,9,9,46,13,16,53,19,18,58,
21,20,60,23,18,60,22,12,54,18,6,46,11,18,55,22,15,52,21,13,48,18,8,45,12
,0,36,1,0,27,0,0,25,0,0,30,0,0,42,0,0,57,0,24,91,20,27,93,22,0,
53,0,0,44,0,0,53,0,0,39,0,0,34,0,0,34,0,0,36,0,0,37,0,0,38,
0,0,38,0,0,37,0,0,37,0,44,140,33,45,141,34,46,142,35,45,143,34,44,143,
34,40,142,30,38,140,28,36,140,25,35,142,26,33,140,24,28,137,18,36,145,26
,49,158,39,37,146,27,5,116,0,0,89,0,0,55,0,0,45,0,0,37,0,0,32,0,0,31,0,
0,32,0,0,34,0,0,35,0,0,37,0,8,49,9,11,48,14,0,31,2,0,20,0,0,22,0,
0,21,0,0,12,0,4,13,8,0,3,1,0,3,0,0,7,0,0,5,0,0,11,0,3,
17,2,0,13,0,0,14,0,0,13,0,0,11,0,0,8,0,0,5,0,0,6,0,2,9,
1,4,14,5,0,12,2,0,14,1,0,17,1,4,23,3,8,32,6,9,38,8,6,39,10,
3,38,6,4,41,8,0,37,2,0,33,0,0,34,0,0,37,0,0,41,0,0,50,0,0,
62,0,0,94,0,7,119,0,41,151,30,48,156,37,31,135,20,34,136,24,49,148,39,
44,142,33,41,137,30,43,139,32,45,141,34,48,144,36,48,146,37,48,146,35,
47,147,35,47,147,33,45,187,27,44,189,26,46,191,28,46,193,27,44,194,27,42
,194,24,40,192,22,38,191,21,57,213,41,54,210,38,52,210,37,48,206,33,42,
200,27,41,199,26,28,186,14,10,156,0,0,117,0,3,102,0,1,86,0,0,69,0,0,56,
0,0,50,0,0,48,0,0,48,0,1,43,0,0,32,0,0,18,0,0,7,0,1,3,0,9,4,0,13,5,2,11,
6,3,8,3,9,2,0,6,4,5,9,3,7,6,0,5,0,0,9,0,0,14,0,0,9,0,0,9,0,0,10,
0,0,9,0,0,8,0,1,6,0,4,6,3,6,4,5,4,4,6,7,8,10,2,6,5,
0,5,0,0,8,0,0,13,0,0,23,0,4,35,4,7,44,10,3,45,7,0,43,0,0,
46,0,0,58,0,2,74,0,5,91,2,7,109,9,6,129,4,34,182,23,40,201,23,52,210,
35,48,205,30,44,198,26,48,200,30,51,201,34,48,194,31,44,188,28,45,190,
27,47,192,29,49,194,29,48,195,29,47,194,26,45,192,24,44,191,23,21,195,2,
23,197,4,26,200,6,30,204,11,32,205,17,31,206,17,29,207,11,29,207,11,25,
205,10,26,208,12,35,217,20,27,212,14,18,200,4,35,216,23,45,224,34,31,
200,21,35,183,25,38,169,31,33,146,28,21,122,18,10,99,7,2,84,0,0,78,0,5,
73,0,12,66,4,0,33,0,0,8,0,1,3,0,14,6,4,12,0,2,8,0,0,9,0,1,10,3,10,5,0,7,
6,4,9,3,4,6,0,2,2,0,4,3,0,11,11,0,5,3,0,8,0,0,10,0,0,9,0,0,7,0,2,5,0,
5,5,3,7,4,13,7,1,11,3,1,2,2,3,0,2,3,0,0,5,0,0,10,0,0,
24,0,8,46,5,16,66,15,14,74,12,6,76,4,7,84,4,18,103,12,31,126,24,40,146,
35,50,165,44,48,186,39,35,203,19,34,217,15,28,209,10,21,199,1,33,207,13,
44,215,23,42,210,26,38,206,22,35,204,17,36,205,16,35,206,16,34,204,17,29
,201,17,25,198,8,23,196,0,21,195,0,19,207,8,21,208,7,25,208,4,24,204,8,
30,203,26,1,173,0,25,202,12,26,206,13,11,190,10,24,206,25,16,201,9,12,
197,5,29,211,30,31,210,33,21,195,20,27,195,22,39,196,29,36,182,23,9,142,
0,35,161,26,44,163,33,47,164,34,21,136,7,22,
125,8,15,96,3,0,52,0,0,18,0,7,14,7,5,4,9,1,5,8,2,19,9,0,7,
0,0,1,0,10,6,5,12,10,11,0,0,4,14,16,29,0,1,24,0,0,30,0,0,28,
0,8,21,0,4,0,15,28,2,3,14,0,2,10,0,0,2,0,13,10,27,4,2,16,5,
7,0,17,22,0,1,5,0,0,9,0,0,12,0,2,34,0,5,56,0,33,106,24,36,129,
25,34,143,24,34,153,27,30,154,22,30,154,22,38,160,26,48,169,32,47,182,
30,22,187,5,30,210,15,28,201,11,29,198,11,37,202,14,33,195,14,32,192,22,
29,189,19,31,196,14,21,191,4,17,190,4,26,199,21,34,205,39,29,203,20,24,
203,0,26,209,0,17,198,7,13,193,0,26,199,9,32,200,17,35,196,32,47,206,44,
41,202,28,45,207,33,38,200,36,43,208,43,
28,195,20,15,182,7,24,184,24,18,175,22,6,159,7,8,156,6,2,146,0,22,161,
16,16,153,13,26,163,24,6,141,3,2,132,0,0,123,0,23,133,12,32,118,19,13,
75,2,0,29,0,3,22,0,12,25,16,0,10,4,0,9,0,0,12,2,0,2,0,1,0,0,3,5,0,
0,3,0,3,12,7,0,3,7,0,6,22,0,11,27,7,22,29,0,6,0,0,14,0,0,
9,0,0,9,0,0,6,0,10,10,22,0,2,11,0,5,0,0,12,0,6,19,0,7,23,
0,13,38,6,11,50,6,19,79,15,26,108,23,26,132,21,13,137,7,11,147,5,20,156,
10,20,151,9,16,141,5,31,143,15,42,164,29,12,158,0,15,171,2,19,170,3,28,
175,7,38,181,11,39,180,14,45,183,35,45,188,38,50,201,34,57,214,37,40,201
,23,28,189,21,36,196,48,31,192,34,19,186,0,26,196,0,25,178,10,14,165,2,
23,167,10,24,163,10,6,139,0,33,163,13,0,126,0,0,125,0,0,121,0,2,132,0,0,
128,0,0,123,0,9,128,0,17,131,9,20,131,10,28,136,24,7,113,15,0,108,13,0,
106,0,0,127,17,6,138,26,23,146,39,15,121,23,16,104,17,19,88,8,45,101,28,
28,75,7,0,35,0,4,36,0,15,40,18,2,21,17,0,8,14,13,12,18,4,3,0,14,22,0,14,
31,0,11,38,0,0,28,0,3,40,0,3,43,6,2,41,12,2,37,13,3,33,9,0,22,0,13,31,9,
5,16,0,5,11,1,0,7,0,6,23,4,0,18,0,19,43,7,15,43,2,13,49,5,7,53,6,32,94,
43,28,109,43,0,94,8,4,120,13,16,141,13,15,141,5,10,129,0,10,121,1,13,111
,12,7,107,9,12,122,9,10,126,3,17,129,1,13,125,0,10,122,0,23,132,0,27,136
,11,20,131,10,4,125,0,20,149,0,8,145,0,0,137,0,22,157,29,34,169,49,30,
167,38,37,175,40,34,151,19,25,140,13,28,137,20,29,134,15,5,109,0,19,120,
0,23,120,0,29,125,0,38,132,0,41,134,0,35,127,0,27,114,0,23,103,0,17,95,0
,16,90,0,17,90,0,54,127,45,36,120,45,19,123,36,0,111,20,0,91,3,0,94,14,8
,93,26,37,103,41,56,109,41,26,73,0,19,70,0,40,90,0,53,96,14,38,70,7,25,
40,9,44,52,31,29,35,7,16,27,0,27,44,0,27,53,0,13,49,0,12,54,0,27,72,0,23
,67,0,31,72,6,34,71,20,14,46,5,15,43,5,33,58,16,25,47,0,31,49,0,39,59,0,
41,70,6,20,52,0,37,69,4,48,82,21,26,63,9,29,73,24,40,96,49,18,88,34,44,
129,61,23,121,34,1,106,1,0,99,0,8,107,0,27,119,8,38,120,22,38,115,21,29,
107,6,19,96,0,34,110,1,30,108,0,22,101,0,38,120,0,41,122,0,25,109,0,18,
110,0,16,116,0,20,129,0,21,133,0,18,128,5,26,133,37,31,136,54,26,130,55,
18,94,6,27,102,17,37,108,32,56,126,38,45,116,0,31,101,0,102,168,36,109,
171,38,118,179,39,110,169,15,111,169,0,122,176,4,134,179,34,140,181,41,
137,178,24,123,166,25,34,78,0,10,63,0,27,100,18,32,116,39,33,118,53,33,
110,58,20,78,37,14,60,14,40,79,14,42,81,0,80,126,4,89,137,1,92,136,1,113
,147,24,100,117,21,69,84,0,137,164,57,127,161,38,131,165,27,132,167,15,
118,154,0,136,171,7,154,185,32,149,177,41,118,144,35,75,98,10,6,28,0,24,
50,0,77,107,17,99,135,25,117,159,25,130,174,25,133,176,24,118,159,19,120
,157,44,140,174,88,70,102,39,70,107,56,50,94,45,24,78,26,0,65,3,1,74,5,
19,96,18,39,115,27,39,111,12,38,105,0,67,129,4,107,162,34,93,138,19,52,
92,0,92,132,18,131,173,47,125,175,18,129,182,14,128,184,25,127,187,29,
130,197,32,107,180,5,131,212,21,126,210,34,55,136,5,23,102,10,37,111,50,
24,97,52,29,84,26,20,75,18,0,44,0,0,46,0,0,54,0,20,80,0,173,230,87,204,
255,110,207,255,113,192,240,78,194,243,40,208,252,51,213,249,87,215,249,
92,208,244,60,187,225,54,112,150,29,47,90,0,37,90,10,0,58,0,0,36,0,0,37,
0,0,51,9,26,75,20,58,103,22,21,68,0,77,129,0,160,213,47,208,255,85,198,
242,69,126,160,1,83,120,0,199,248,79,196,250,76,200,249,72,212,255,78,
204,244,60,216,252,68,215,246,67,212,239,72,201,226,82,118,143,16,25,53,
0,82,116,6,159,201,77,191,243,98,201,255,87,196,255,69,206,255,69,217,
255,89,205,248,107,190,229,122,47,84,7,27,65,8,16,58,8,29,77,27,0,53,
0,0,62,0,0,60,0,0,57,0,25,89,0,95,157,20,163,223,63,200,252,89,177,215,
70,96,127,0,145,174,58,214,247,117,207,248,82,192,241,53,189,240,51,204,
255,70,203,255,78,179,241,54,207,255,81,184,254,80,67,134,5,4,68,0,15,
75,23,8,68,32,0,40,0,0,54,9,0,58,8,25,88,17,34,103,0,83,155,17,181,255,
87,172,244,72,154,217,68,164,226,57,192,255,29,201,255,31,177,230,52,
170,222,51,188,247,35,197,255,52,143,197,51,31,80,0,8,52,0,0,36,0,12,62,
13,25,82,31,19,86,17,16,91,0,7,83,0,94,168,23,184,249,83,184,245,62,189,
249,53,184,248,37,127,197,0,129,204,0,188,255,49,173,244,44,152,216,32,
172,230,57,171,223,53,172,220,48,167,212,31,193,237,54,212,255,78,148,
191,24,86,132,0,160,212,68,186,244,98,169,234,78,163,236,61,155,229,44,
155,219,34,168,226,53,157,211,61,131,183,59,6,56,0,0,35,0,0,41,0,16,69,
23,32,91,37,14,80,8,2,72,0,33,109,0,118,194,33,194,255,84,204,255,75,176
,243,42,198,252,78,104,150,2,135,178,60,170,219,91,157,215,42,174,239,35
,181,251,33,183,254,36,162,230,31,152,221,34,159,228,51,130,199,46,50,
117,2,0,62,0,0,57,0,0,58,10,56,103,67,56,107,66,46,103,52,53,117,43,43,
115,7,119,198,55,162,245,67,132,211,34,59,128,0,105,173,12,163,239,7,161
,235,2,100,163,0,81,145,0,133,207,0,180,253,52,127,188,49,39,89,0,60,97,
27,58,91,36,65,104,51,55,108,40,39,113,16,40,129,3,107,200,49,162,249,82
,170,244,69,129,198,11,175,243,42,182,255,38,110,199,0,139,227,0,172,240
,43,126,183,16,61,115,0,67,120,0,66,119,0,70,127,0,86,148,0,152,216,31,
174,240,46,148,213,25,127,190,21,191,251,101,140,198,62,68,125,0,66,126,
0,82,139,6,73,126,0,62,113,0,60,111,0,78,130,20,52,102,13,55,107,35,42,
95,39,28,83,28,41,102,35,35,101,13,80,152,27,152,229,71,167,248,58,131,
216,3,132,217,0,176,252,40,162,221,51,80,132,0,91,142,39,75,132,19,63,
129,0,139,212,17,169,245,35,146,219,16,61,125,0,70,130,0,64,121,0,58,114
,5,62,116,38,55,110,52,45,103,55,52,110,69,0,32,0,0,34,0,0,21,0,0,40,0,
26,95,0,141,219,73,147,229,59,71,149,0,20,89,0,110,177,36,169,243,42,132
,206,7,8,75,0,10,80,0,140,219,52,165,241,81,63,120,25,29,70,10,43,73,23,
38,65,12,0,35,0,12,61,0,66,138,10,121,208,52,146,240,66,141,232,51,146,
224,50,139,212,35,149,223,40,149,231,33,81,176,0,155,235,42,164,198,75,
37,52,0,10,32,0,0,24,0,3,50,0,39,104,4,37,119,0,124,217,40,145,241,45,70
,162,0,155,232,64,161,223,88,66,110,15,0,26,0,7,23,0,25,39,3,40,63,21,23
,50,5,0,15,0,0,20,0,6,46,0,18,62,0,31,80,15,10,62,0,21,77,0,91,154,40,
152,221,76,162,239,65,146,228,29,133,218,1,140,228,2,164,242,44,108,164,
27,3,50,0,0,24,0,0,44,0,27,92,0,133,203,45,166,232,70,94,154,7,15,62,0,9
,45,0,0,29,0,0,18,0,0,16,0,0,21,6,0,29,12,0,34,16,0,13,0,0,23,0,0,30,0,0
,43,0,53,123,0,136,216,65,131,215,57,51,131,0,26,98,0,118,190,56,143,220
,46,78,155,0,0,70,0,39,117,8,140,230,83,124,208,71,40,102,25,4,52,2,3,44
,0,0,39,0,14,61,0,82,139,22,139,213,68,162,247,84,149,241,68,142,237,59,
140,233,57,139,232,56,133,226,47,91,190,3,89,193,0,154,235,70,127,156,66
,30,37,0,1,20,0,0,18,0,9,63,11,6,81,0,57,155,20,125,237,65,92,205,11,65,
175,0,144,235,69,126,197,67,28,73,0,0,13,0,0,8,0,15,20,14,44,60,50,29,54
,35,0,23,0,0,21,0,0,25,0,0,34,0,23,76,0,37,94,0,120,182,71,142,209,80,
163,235,87,164,243,74,154,239,50,148,240,35,147,244,27,149,235,50,73,131
,19,10,57,0,0,34,0,0,39,0,34,103,0,141,214,73,144,209,79,57,110,6,37,72,
16,49,72,44,54,68,51,39,50,44,12,23,25,0,9,9,0,12,2,0,21,6,13,35,0,22,50
,1,33,72,25,38,95,16,115,194,53,131,222,59,74,163,19,0,61,0,36,118,0,131
,213,69,122,202,51,32,115,0,0,85,0,79,170,49,134,238,91,72,169,36,0,60,0
,0,30,0,0,56,0,27,100,0,86,161,34,145,219,80,132,205,62,84,162,16,65,149
,0,63,161,0,79,191,19,119,243,59,113,239,51,50,175,0,110,227,37,139,233,
77,55,104,13,1,34,0,0,25,0,0,32,0,24,97,24,0,84,0,96,204,66,130,252,83,
60,182,0,80,199,11,128,234,64,79,167,28,0,54,0,0,33,0,0,21,0,0,22,0,2,
37,0,18,59,15,7,52,9,0,36,0,0,26,0,0,55,0,64,135,33,115,188,70,138,213,
86,110,186,54,84,164,31,68,152,12,66,160,2,98,201,24,120,232,32,115,215,
41,25,89,0,21,73,11,5,64,0,0,68,0,69,151,15,150,231,90,101,169,56,1,53,0
,0,22,0,12,29,21,36,46,37,52,60,49,52,62,54,41,55,42,24,47,21,14,39,9,47
,79,30,31,71,21,12,65,19,31,104,23,108,206,57,105,214,47,33,139,5,0,70,0
,45,145,0,124,220,68,90,182,47,9,104,0,19,120,0,93,204,65,97,220,67,17,
135,0,0,49,0,0,58,0,29,129,13,90,193,60,118,217,75,105,196,57,40,119,0,0
,60,0,0,67,0,0,84,0,15,146,0,80,228,46,68,222,30,35,185,0,101,237,51,98,
214,55,10,99,0,0,68,0,0,66,0,0,74,0,35,133,32,10,117,1,90,208,70,84,209,
53,25,153,0,68,195,18,88,207,39,40,151,0,0,78,0,0,93,0,0,75,0,0,66,0,0,
66,0,18,85,6,9,82,3,0,67,0,0,83,0,50,138,36,106,196,83,129,220,101,69,
157,37,36,124,4,8,99,0,0,83,0,0,101,0,59,174,19,92,219,42,73,188,33,0,68
,0,18,80,15,9,84,0,13,101,0,91,189,40,127,225,78,46,129,23,0,41,0,0,28,0
,0,17,1,0,16,0,7,27,0,23,46,20,35,62,29,31,69,20,26,67,11,39,97,49,23,89
,41,0,76,28,38,140,57,84,211,59,69,206,38,1,134,7,0,118,0,78,204,45,104,
224,65,53,163,40,9,120,0,52,176,30,97,232,68,62,207,40,0,141,0,0,135,0,
35,165,31,89,220,78,90,217,76,54,169,38,22,125,8,3,88,0,3,87,1,0,94,0,0,
115,0,35,181,34,72,239,64,29,204,15,41,215,21,81,241,55,73,224,47,74,221
,55,67,211,53,69,208,55,69,202,57,93,221,84,90,216,81,97,221,89,57,182,
46,30,156,10,84,213,58,104,237,70,86,226,55,59,202,32,81,228,62,67,215,
57,75,213,68,77,189,63,52,158,36,26,139,5,30,148,8,68,190,53,96,217,88,
75,191,80,45,155,58,8,112,25,4,107,18,6,110,11,2,115,1,21,145,15,79,211,
73,82,224,78,26,157,27,0,87,0,11,94,12,6,103,0,29,140,9,97,221,61,94,218
,62,21,131,16,7,101,17,16,90,31,26,86,34,32,84,20,31,81,18,27,80,26,26,
86,26,26,98,16,29,105,14,2,57,18,10,72,31,5,84,39,59,157,80,69,194,54,40
,174,25,0,114,5,7,128,22,92,209,69,71,179,44,13,108,18,2,98,9,59,169,44,
79,201,56,34,166,21,0,133,0,56,189,44,75,203,64,81,200,72,30,136,25,0,82
,0,0,69,0,2,65,10,15,80,26,0,78,12,20,118,31,69,192,75,74,212,73,17,166,
14,50,202,42,60,208,50,62,210,51,66,219,51,67,219,49,72,217,52,75,210,56
,70,192,58,78,189,71,37,139,37,0,92,0,0,90,0,37,147,26,72,191,49,82,212,
54,71,213,49,67,218,53,57,212,56,74,217,75,88,201,83,53,153,41,
41,150,23,66,179,45,87,204,72,68,181,63,10,115,20,0,78,1,0,70,7,0,73,11,
2,85,13,12,101,17,41,141,42,82,194,86,59,182,68,0,110,8,0,67,0,0,67,0,7,
91,3,46,145,36,92,205,73,64,176,50,6,107,11,27,115,39,7,79,13,12,72,8,16
,67,0,13,61,0,6,57,14,0,58,8,0,64,0,0,67,0,0,8,0,0,19,0,0,36,0,14,
83,20,31,120,12,16,113,0,1,92,12,26,108,34,37,110,18,19,80,0,0,32,0,0,31
,0,21,80,12,27,97,11,2,81,0,3,92,0,36,135,19,28,117,7,21,81,9,0,30,0,
0,11,0,9,15,11,0,4,0,0,8,0,0,14,0,9,56,1,52,109,41,32,100,23,0,
77,0,16,102,13,15,111,14,13,116,7,2,111,0,13,118,0,22,121,0,40,130,17,20
,96,8,11,78,9,0,46,0,0,23,0,0,28,0,0,56,0,16,92,0,30,116,5,36,131,15,
9,111,1,2,107,14,10,104,28,12,77,21,4,58,8,18,79,20,28,95,28,33,103,31,
23,91,18,0,43,0,0,28,0,0,27,0,0,19,0,0,16,0,0,28,0,19,61,11,39,93,
31,31,98,21,15,74,6,0,24,0,0,14,0,0,37,3,23,75,27,39,103,42,11,80,17,
0,37,0,0,51,5,44,82,31,38,64,16,24,40,1,7,21,0,0,11,16,0,15,12,0,
29,0,0,38,0,1,11,0,0,15,0,7,37,9,10,56,9,41,101,27,20,84,8,0,58,
4,0,33,0,0,29,0,0,29,0,0,18,5,0,10,0,0,26,0,0,32,0,0,42,0,
27,82,24,19,80,2,0,49,0,0,22,0,1,4,0,18,4,17,17,0,16,4,0,2,13,
16,5,18,32,6,33,55,17,36,58,20,0,17,0,0,19,0,0,17,0,0,37,0,0,36,
0,0,42,0,0,56,0,0,60,0,29,83,8,6,49,0,0,14,0,0,16,2,0,18,9,
0,21,2,0,13,0,0,26,0,0,45,0,16,74,0,0,49,0,0,47,0,0,28,0,0,
14,0,0,13,0,0,27,7,0,15,0,1,38,4,38,75,34,15,48,5,0,19,0,4,19,
0,2,10,0,0,3,0,1,4,0,6,17,0,6,25,0,19,47,6,50,75,36,36,45,26,
12,20,9,0,18,4,0,17,0,0,21,0,0,20,0,0,14,0,0,23,0,0,20,0,34,
46,10,64,68,45,62,63,57,31,34,51,1,11,23,0,12,0,0,21,0,7,25,9,33,54,
35,49,74,53,31,61,33,1,35,0,0,21,0,0,19,0,0,22,0,0,19,0,0,20,0,
0,16,0,0,19,0,2,36,3,19,57,18,28,69,29,32,68,30,0,20,0,0,15,0,0,
7,0,0,3,0,3,6,0,7,13,3,4,17,0,0,15,0,51,71,44,29,52,23,7,26,
0,0,11,0,0,7,0,0,10,0,0,13,0,0,15,0,0,22,0,0,23,0,44,77,30,
23,49,10,0,16,0,0,6,0,4,9,3,2,4,3,3,5,0,0,6,0,7,21,0,0,
19,0,49,77,37,28,60,19,0,19,0,0,28,0,0,11,0,1,8,1,0,8,0,0,8,
0,0,15,0,8,32,10,29,53,29,44,68,44,0,13,0,0,13,0,2,13,5,2,11,6,
0,6,2,0,4,0,4,11,4,9,21,9,56,75,55,31,57,32,4,32,7,0,20,0,0,
17,0,0,15,0,0,13,0,0,11,0,0,12,0,0,12,0,7,20,2,29,43,30,51,66,
61,52,69,61,25,46,29,0,20,0,27,52,30,30,55,33,25,50,29,11,34,14,0,18,0,
0,11,0,0,11,0,0,14,0,0,23,3,0,14,0,0,11,0,0,24,0,19,52,21,29,
64,31,10,46,10,0,16,0,0,10,0,0,6,0,0,7,0,0,10,0,0,9,0,0,11,
0,0,24,0,7,38,7,25,56,25,13,42,12,0,23,0,0,13,0,0,9,0,0,10,0,
1,7,0,0,9,0,0,13,0,0,24,0,39,66,35,13,36,10,0,11,0,0,4,0,0,
2,0,0,0,0,1,1,0,2,4,0,0,9,0,0,8,0,33,56,30,27,54,21,0,16,
0,0,21,0,0,7,0,0,5,0,0,5,0,0,7,0,0,8,0,0,21,0,10,38,13,
22,52,26,6,36,12,0,18,0,0,10,0,0,9,0,0,9,0,0,3,0,0,2,0,0,
9,1,0,15,0,21,56,24,35,68,37,8,39,8,0,14,0,0,18,0,0,19,0,0,9,
0,6,25,3,0,17,0,0,11,0,0,15,0,9,30,11,27,50,30,44,67,49,54,77,59,
37,66,38,23,52,24,9,37,12,8,34,9,10,35,13,10,34,12,9,33,11,9,33,11,9,
33,11,16,41,19,24,52,27,32,62,34,37,70,39,33,68,35,18,54,18,4,38,5,14,
42,17,15,40,18,15,43,18,13,46,17,5,42,9,0,42,6,14,60,23,36,82,45,9,55,
18,5,49,13,2,42,8,0,37,6,4,34,10,5,33,10,10,31,12,5,33,8,0,41,1,19,
66,20,44,89,50,16,56,22,13,46,19,13,38,19,12,34,21,17,37,26,15,35,24,20,
42,29,10,35,16,5,38,11,28,68,34,42,87,46,6,53,9,6,49,4,11,41,7,14,39,7,
13,40,5,6,41,1,5,42,1,7,48,4,14,60,14,20,67,21,38,85,39,12,59,15,0,
39,0,4,42,5,13,46,15,12,41,13,10,36,9,11,40,12,18,49,18,16,49,18,34,65,
34,52,83,52,43,72,42,15,41,12,6,29,3,15,38,12,2,25,0,3,25,2,9,31,8,
13,37,15,10,34,12,7,32,10,19,44,22,35,60,38,52,83,52,42,73,42,40,69,39,
49,78,50,56,82,55,52,78,53,51,75,53,55,79,57,49,73,51,61,86,64,71,97,72,
62,91,63,46,77,46,38,69,37,41,75,42,49,83,50,47,77,49,44,74,46,40,73,44,
39,76,43,41,81,46,44,88,52,49,95,56,53,101,61,38,84,47,40,84,49,43,83,
49,45,82,51,46,78,54,49,77,54,53,76,56,50,80,54,26,71,30,56,108,60,60,
107,65,34,76,40,42,76,49,45,74,52,41,65,49,50,74,60,42,64,51,52,76,60,
34,63,41,36,70,43,42,84,48,71,118,76,45,94,47,31,77,31,41,71,35,45,71,
36,43,73,35,39,74,34,36,75,31,34,77,31,35,81,34,38,86,38,56,104,56,48,
96,48,40,86,40,38,79,37,38,76,37,38,72,37,41,72,40,42,73,41,47,78,47,49,
80,49,48,77,49,47,76,46,61,87,58,72,97,68,63,86,60,44,67,41,59,82,56,54,
77,51,55,78,52,57,81,55,50,76,51,41,67,40,43,71,46,55,84,56,0,15,0,0,14,
0,0,15,0,0,18,0,0,13,0,0,11,0,0,17,0,10,32,9,45,67,46,29,53,31,11,35,11,
0,24,0,0,22,0,0,22,0,0,21,0,0,19,0,0,23,0,0,20,0,0,16,0,0,21,0,11,40,9,
26,57,23,13,47,14,0,25,0,0,14,0,0,16,0,0,15,0,0,12,0,0,9,0,0,9,0,0,10,0,
0,16,0,0,30,0,27,65,24,9,43,6,0,18,0,0,22,0,2,21,2,0,9,0,5,19,6,
0,10,0,8,22,7,0,12,0,0,21,0,0,21,0,25,61,23,17,55,14,0,25,0,0,
14,0,1,12,0,1,16,0,0,17,0,0,18,0,0,19,0,0,20,0,0,23,0,0,26,
0,14,48,15,25,56,24,9,38,8,0,18,0,0,15,0,0,20,0,0,21,0,0,14,0,
0,23,0,0,23,0,0,16,0,0,20,0,18,38,13,36,56,31,44,64,39,5,25,0,0,
12,0,0,10,0,0,12,0,0,19,0,0,18,0,0,17,0,0,18,0,0,23,0,0,23,
0,0,21,0,0,17,0,0,13,0,0,20,0,22,41,21,44,63,43,38,57,38,14,33,14,
0,9,0,0,8,0,0,13,0,0,16,0,0,10,0,0,9,0,0,9,0,0,8,0,0,
8,0,5,21,0,25,44,16,35,54,26,13,33,6,0,9,0,0,15,0,0,14,0,0,13,
0,2,10,0,4,7,0,6,8,0,10,10,2,8,14,0,20,40,12,39,66,31,3,26,0,
0,11,0,0,10,0,0,6,0,0,2,0,0,3,0,0,2,0,3,9,0,0,6,0,0,
13,0,0,9,0,20,44,12,34,61,26,4,24,0,0,3,0,1,0,0,0,1,0,0,3,
0,0,5,0,0,6,0,0,7,0,0,7,0,0,8,0,17,36,17,38,55,37,24,41,23,
2,16,1,0,6,0,0,8,0,0,10,0,0,14,0,0,8,0,0,8,0,1,18,0,0,
15,0,0,7,0,14,29,8,53,68,47,32,47,24,14,32,8,0,15,0,0,11,0,0,17,
0,0,21,0,0,17,0,0,12,0,0,13,0,0,13,0,0,11,0,0,12,0,4,23,3,
22,39,21,34,48,33,37,49,35,7,19,7,0,11,0,0,5,0,0,7,0,0,8,0,0,
6,0,0,8,0,0,12,0,1,8,0,3,8,0,16,21,1,37,42,22,40,47,29,24,31,
13,6,13,0,0,7,0,0,3,0,0,2,0,1,1,0,4,0,0,6,0,0,7,0,0,
7,0,0,4,0,0,44,53,32,49,63,37,3,15,0,7,14,0,4,6,0,2,1,0,4,
0,0,9,1,0,9,1,0,6,1,0,9,6,1,6,8,0,0,5,0,17,29,7,57,71,
46,25,34,15,8,2,4,10,0,8,10,0,8,9,0,7,8,1,8,5,3,6,4,4,4,
2,4,1,1,6,2,14,19,15,33,38,34,41,46,42,32,34,29,13,15,10,4,6,1,3,
8,2,0,4,0,4,16,4,2,14,2,0,5,0,0,5,0,10,18,5,15,23,8,3,14,
0,57,68,51,47,60,42,23,38,17,0,12,0,0,8,0,0,10,0,0,19,0,0,20,0,
0,17,0,0,16,0,0,17,0,11,28,10,37,51,36,50,60,49,35,42,34,8,15,7,5,
10,4,0,4,0,0,2,0,2,7,1,2,7,1,0,3,0,0,3,0,0,6,0,2,8,
0,3,10,0,27,34,18,54,61,45,40,44,30,0,2,0,0,2,0,7,10,1,3,4,0,
3,2,0,5,1,0,7,2,0,9,3,3,12,3,4,10,1,2,4,1,0,45,53,38,41,
54,34,0,5,0,8,14,2,0,3,0,1,0,0,3,0,0,9,3,5,7,1,3,3,0,
0,5,4,2,0,2,0,0,3,0,5,16,0,63,76,56,31,39,24,10,6,7,11,1,10,
9,0,7,7,0,7,7,0,7,7,2,6,5,3,4,4,4,2,8,10,7,0,1,0,11,
13,8,42,44,39,45,50,44,20,25,18,1,6,0,3,8,1,1,6,2,0,2,0,0,2,
0,8,13,7,8,10,5,0,2,0,0,2,0,11,14,5,3,6,0,32,38,26,50,58,45,
34,47,30,13,27,10,3,20,1,0,15,0,0,8,0,0,7,0,5,22,4,33,47,32,45,
57,45,35,45,36,16,21,15,2,4,1,0,0,0,7,5,8,6,4,7,3,1,4,0,0,
0,0,0,0,2,2,2,3,5,4,2,8,4,0,5,0,26,44,30,48,64,51,25,41,28,
0,11,1,0,6,0,0,9,1,0,8,2,6,15,10,0,3,1,9,15,13,0,3,1,0,
2,0,4,10,8,0,2,0,4,13,8,55,73,59,15,36,19,0,11,0,0,9,0,0,7,
0,0,7,3,0,7,9,0,2,5,0,5,8,0,6,5,0,3,2,0,9,2,0,14,4,
0,14,0,15,36,19,53,71,55,0,4,0,4,11,3,0,6,0,0,3,0,6,13,5,0,
7,0,0,4,0,2,13,0,0,9,0,0,12,0,0,10,0,1,16,0,26,44,22,47,65,
43,23,43,18,0,7,0,0,2,0,7,7,9,9,7,10,3,1,2,5,1,2,11,7,6,
10,6,5,1,0,0,1,0,0,0,1,0,23,26,19,54,60,50,52,60,49,18,30,18,0,
13,0,4,18,5,17,31,16,27,41,26,38,48,37,32,42,33,15,20,14,0,1,0,2,2,
4,14,12,15,3,1,6,1,0,4,1,0,4,1,0,2,3,1,4,4,4,4,5,5,5,
1,7,3,13,30,20,23,45,32,23,43,31,5,22,12,0,6,0,0,6,0,0,7,3,0,
4,0,0,5,4,0,3,2,0,9,8,0,3,2,0,6,2,0,12,8,0,7,3,19,34,
27,42,62,50,9,31,18,0,12,1,0,10,2,0,7,2,0,6,4,0,8,9,0,4,5,
0,7,9,0,6,7,0,4,2,0,7,2,0,12,4,0,14,3,13,35,22,49,70,55,4,
21,5,2,16,1,0,7,0,0,5,0,0,10,0,0,5,0,0,6,0,0,8,0,0,6,
0,0,8,0,0,7,0,0,10,0,9,29,4,27,50,22,22,47,18,7,25,3,0,2,0,
4,4,6,7,5,10,4,2,5,4,0,3,4,0,1,3,0,0,3,0,0,10,6,5,6,
5,3,1,2,0,7,9,4,31,36,29,50,57,49,34,44,35,4,16,6,49,63,50,32,46,
33,16,26,17,7,17,8,7,12,6,4,9,5,4,5,7,6,6,8,8,8,10,7,7,9,
5,5,7,3,4,6,3,5,4,3,8,4,5,10,6,3,13,5,45,61,51,29,46,36,8,
24,14,0,7,0,0,5,0,4,10,8,5,9,8,1,5,6,0,4,5,0,6,6,2,8,
6,0,3,0,1,12,6,0,12,5,1,14,5,39,55,45,30,46,35,7,23,12,0,12,2,
0,13,6,0,8,4,0,6,5,2,8,8,0,5,5,1,6,9,0,6,6,0,3,2,0,
6,2,0,12,5,0,13,3,14,30,19,45,61,48,23,39,26,1,15,2,0,6,0,0,10,
0,0,9,0,0,6,0,2,9,1,4,9,2,1,6,0,3,9,0,1,9,0,0,8,0,
3,17,0,17,34,15,32,51,31,43,57,40,0,5,1,0,2,1,2,2,4,5,5,5,7,
5,6,4,2,3,4,2,3,7,6,4,4,3,1,13,13,11,8,9,4,0,1,0,7,12,
6,39,46,39,46,56,48,32,42,34,31,48,32,9,26,10,0,6,0,0,5,0,0,10,1,
2,12,4,0,2,0,0,2,0,0,5,1,1,7,3,0,6,2,0,6,0,0,5,0,0,
11,1,11,23,11,19,33,20,42,55,45,18,31,21,0,6,0,0,3,0,0,2,0,3,5,
2,5,3,4,3,1,2,0,0,0,3,5,2,0,2,0,0,3,0,2,14,2,0,11,0,
6,23,7,52,69,53,11,25,10,0,9,0,0,6,0,0,8,0,0,2,0,0,2,0,0,
2,0,0,1,0,0,1,0,0,1,0,0,2,0,0,3,0,0,6,0,0,5,0,3,15,
3,26,40,27,40,56,43,1,17,4,0,5,0,0,9,1,0,3,0,0,2,0,6,8,5,
2,2,0,4,3,1,3,3,1,4,5,0,0,4,0,0,5,0,4,16,4,26,40,27,47,
61,48,17,29,19,3,13,5,0,4,0,0,5,0,0,7,0,0,2,0,0,2,0,3,6,
0,0,2,0,0,3,0,6,11,4,5,12,4,0,4,0,0,6,0,13,25,15,34,47,37,
0,18,0,0,18,0,0,18,0,0,18,0,0,11,0,0,6,0,0,8,0,1,15,2,0,
6,0,0,9,0,0,12,0,0,12,0,0,13,0,3,27,5,23,49,24,42,66,42,16,30,
13,6,17,1,0,6,0,1,4,0,4,5,0,3,3,0,6,1,0,9,4,0,3,0,0,
4,6,0,0,3,0,1,10,0,6,20,0,2,20,0,20,43,15,58,78,51,6,18,0,0,
7,0,2,9,0,5,11,0,2,4,0,2,4,0,6,7,0,3,4,0,3,4,0,6,8,
0,4,6,0,5,9,0,9,13,0,1,8,0,2,9,0,14,25,8,55,73,57,13,34,19,
0,15,4,4,15,7,0,3,0,0,2,1,6,6,8,3,0,2,8,1,8,6,1,5,6,
1,5,4,4,4,0,2,0,0,6,0,12,22,14,28,41,31,43,64,45,18,42,20,0,20,
0,0,14,0,0,13,0,0,8,0,0,6,0,0,8,0,2,15,0,0,6,0,0,6,0,
0,17,0,1,18,0,0,8,0,0,8,0,2,23,6,0,26,0,0,26,0,0,29,1,2,
30,5,1,27,2,0,22,0,1,25,3,7,31,9,0,24,2,1,27,2,0,29,1,0,29,
0,0,30,0,5,41,5,19,57,20,33,67,32,0,24,0,3,22,0,8,25,6,13,26,8,
11,22,6,9,17,2,10,16,2,15,21,7,10,19,2,11,23,3,3,18,0,5,28,0,0,
29,0,0,32,0,20,59,15,31,66,26,5,29,0,4,20,0,7,23,0,9,25,0,5,19,
0,8,20,0,12,24,4,7,19,0,7,19,0,11,23,3,9,21,1,10,24,1,13,28,5,
6,22,0,2,18,0,7,30,2,37,70,39,13,50,19,0,32,5,0,26,3,0,20,1,6,
20,5,12,22,11,10,17,9,10,15,9,10,15,9,10,17,9,9,19,10,6,18,6,2,19,
3,5,24,5,7,32,10,35,68,37,19,54,21,4,38,5,0,30,0,0,28,0,0,26,0,
1,26,0,2,27,0,9,32,6,2,25,0,0,20,0,0,22,0,3,27,3,5,31,6,1,
26,4,0,22,0,50,86,50,42,78,42,37,73,37,42,77,44,50,84,51,50,83,52,46,79,
48,44,78,45,50,85,52,48,84,48,47,85,46,49,90,48,51,96,53,51,99,51,48,96,
48,43,90,44,36,81,42,43,85,49,47,87,53,48,83,51,47,80,51,49,79,51,51,80,
52,51,80,52,53,84,53,46,81,48,39,80,40,44,91,45,28,82,30,31,92,33,55,
121,59,37,98,39,43,89,43,41,79,40,42,80,41,43,81,42,40,76,40,44,80,44,
50,84,51,44,78,45,44,78,45,47,81,46,42,78,42,42,78,40,47,85,46,42,80,41,
38,76,37,41,87,41,49,110,51,47,113,49,36,97,38,28,83,28,36,84,36,45,86,
42,48,85,44,53,85,48,49,79,45,52,82,48,51,83,46,47,81,44,45,82,41,43,84,
40,42,85,39,38,84,37,45,92,46,52,98,52,54,100,54,50,93,48,47,85,44,47,
84,43,49,83,46,50,84,47,47,78,44,55,86,52,55,86,52,44,78,45,41,75,42,48,
82,49,51,84,53,46,81,49,1,32,1,5,36,
5,13,42,14,15,44,16,11,37,12,3,32,4,6,35,7,13,44,13,6,40,7,2,38,2,
3,41,2,15,56,14,30,71,29,29,72,29,13,54,12,0,37,0,4,45,11,7,46,15,5,
41,13,0,34,7,2,34,10,10,40,16,11,41,17,6,36,10,4,37,8,0,32,0,0,36,
0,6,55,10,0,45,0,2,62,8,32,98,37,0,56,2,6,51,10,3,40,6,3,40,6,
3,40,6,0,35,2,6,41,9,12,45,14,5,38,7,6,39,8,8,41,10,1,36,4,0,
34,1,5,42,8,4,41,7,2,39,5,4,49,6,11,72,13,22,88,24,9,70,10,0,47,
0,0,48,0,3,46,0,0,37,0,5,40,0,8,40,3,14,46,9,14,46,9,7,42,2,
5,42,1,6,47,3,5,48,2,0,43,0,0,38,0,19,60,20,33,74,34,24,65,23,10,
48,7,4,41,0,3,37,0,3,34,0,9,38,7,9,35,6,8,34,7,10,36,9,11,37,
12,8,36,11,6,34,9,5,33,8,0,6,0,0,6,0,0,6,0,0,7,0,1,6,2,
0,7,0,0,8,0,0,9,0,0,9,0,0,10,0,8,34,5,32,58,29,24,48,22,5,
24,4,0,13,0,0,9,0,0,8,0,0,7,0,0,6,0,0,5,0,0,5,0,0,6,
0,0,6,0,0,7,0,5,17,7,0,6,0,0,15,0,0,17,0,0,14,0,39,73,40,
18,54,18,0,23,0,0,9,0,0,6,0,0,6,0,0,6,0,0,6,0,0,6,0,0,
6,0,0,6,0,0,6,0,0,6,0,0,6,0,0,7,0,0,7,0,0,8,0,0,8,
0,0,11,0,0,26,0,42,82,45,3,38,5,0,17,0,0,18,0,0,8,0,0,10,0,
0,10,0,0,6,0,0,6,0,0,6,0,0,7,0,0,7,0,0,9,0,0,10,0,0,
9,0,0,12,0,0,7,0,13,32,13,36,60,36,23,49,22,0,22,0,0,12,0,0,13,
0,0,10,0,0,7,0,0,4,0,0,2,1,0,3,0,0,3,0,0,5,0,0,7,0,
0,2,0,2,2,2,4,2,5,6,1,7,8,1,9,7,2,8,4,4,4,0,7,0,0,
9,0,1,20,0,22,41,19,33,52,30,19,33,16,3,13,2,3,5,2,4,4,4,3,3,
3,2,2,2,3,1,4,2,0,3,2,0,3,3,1,4,3,1,4,3,3,3,6,6,6,
0,2,0,3,10,2,0,12,0,2,16,0,49,68,46,19,38,16,0,14,0,0,3,0,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,2,2,2,2,2,2,3,3,3,3,3,3,0,6,0,0,18,1,38,63,41,
22,45,25,1,19,3,0,12,0,0,3,0,0,2,0,1,1,0,3,1,2,3,1,2,3,
1,2,2,2,2,2,2,2,0,3,2,0,4,0,0,4,0,5,6,8,0,1,0,8,18,
9,30,44,29,27,46,26,11,33,10,3,20,2,0,10,0,1,6,2,3,3,5,5,0,7,
5,0,8,4,0,6,2,0,5,1,1,3,1,3,2,1,3,0,2,2,2,3,1,4,6,
1,7,7,0,8,7,2,8,4,4,4,0,7,0,1,13,0,18,37,15,34,53,31,24,43,
21,5,19,2,0,4,0,0,2,0,4,4,4,3,3,3,2,2,2,3,1,4,2,0,3,
2,0,3,3,1,4,3,1,4,3,3,3,0,0,0,0,3,0,2,9,1,0,10,0,12,
26,9,50,69,47,6,25,3,0,10,0,0,3,0,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,
3,3,3,3,3,3,0,6,0,0,16,0,19,44,22,39,62,42,10,28,12,0,9,0,0,
7,0,0,1,0,0,0,0,3,1,2,3,1,2,3,1,2,2,2,2,2,2,2,0,3,
2,0,4,0,0,4,0,5,6,8,0,1,0,0,8,0,13,27,12,23,42,22,28,50,27,
19,36,18,0,10,0,1,6,2,3,3,5,5,0,7,5,0,8,4,0,6,2,0,5,1,
1,3,1,3,2,1,3,0,2,2,2,3,1,4,5,0,6,7,0,8,6,1,7,4,4,
4,1,8,0,5,17,3,32,51,29,39,58,36,13,32,10,0,9,0,0,4,0,1,3,0,
4,4,4,3,3,3,2,2,2,3,1,4,2,0,3,2,0,3,3,1,4,3,1,4,3,
3,3,0,0,0,3,8,2,0,7,0,0,6,0,19,33,16,50,69,47,0,15,0,0,9,
0,0,3,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,3,3,3,3,3,3,0,6,0,0,
17,0,4,29,7,54,77,57,14,32,16,0,5,0,1,8,0,0,1,0,0,0,0,2,0,
1,2,0,1,2,0,1,1,1,1,1,1,1,0,2,1,0,3,0,0,3,0,4,5,7,
0,1,0,0,4,0,0,13,0,16,35,15,38,60,37,31,48,30,0,10,0,1,6,2,3,
3,5,5,0,7,5,0,8,4,0,6,2,0,5,1,1,3,1,3,2
};
wxBoxSizer *s_main = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *s_top = new wxBoxSizer(wxHORIZONTAL);
s_main->Add(s_top);
wxBitmap bmp_logo(wxImage(80,68, (unsigned char*)logo, true));
wxStaticBitmap *b_logo = new wxStaticBitmap(
this, -1, bmp_logo, wxDefaultPosition, wxSize(80,67)
);
s_top->Add(b_logo, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxStaticText *t_title = new wxStaticText(
this, -1,
wxString::Format(wxT("ShareDaemon wxInterface\n%s"), APPVER)
);
t_title->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD));
t_title->SetSize(t_title->GetBestSize());
s_top->Add(t_title, 0, wxLEFT|wxRIGHT|wxTOP, 5);
wxStaticText *t_desc = new wxStaticText(
this, -1,
wxT("Written by Madcat <ma...@us...>\n"
"Contributions and translations by various other people :)")
);
s_main->Add(t_desc);
wxButton *b_close = new wxButton(this, wxID_OK, wxT("Close"));
s_main->Add(b_close, 0, wxALIGN_RIGHT|wxALL, 5);
SetAutoLayout(true);
SetSizer(s_main);
s_main->Fit(this);
s_main->SetSizeHints(this);
}
--- NEW FILE: AboutDlg.h ---
/*
* This file is part of wxInterface.
* Copyright (C) 2003 Alo Sarv <ma...@us...>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __ABOUTDLG_H__
#define __ABOUTDLG_H__
#ifdef __GNUG__
#pragma interface "AboutDlg.cpp"
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/image.h"
#endif
#include "defines.h"
/************************** CAboutDlg class ***********************************/
/* The About... box of the interface - displays my logo and stuff. */
/******************************************************************************/
class CAboutDlg : public wxDialog {
public:
CAboutDlg( /* Constructor */
wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, long style =
wxDEFAULT_DIALOG_STYLE, const wxString &name = wxEmptyString
);
void CreateControls(); /* Creates controls */
};
#endif
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- MainDlg.cpp 14 Jan 2004 10:21:22 -0000 1.59
+++ MainDlg.cpp 14 Jan 2004 13:02:24 -0000 1.60
@@ -45,6 +45,7 @@
BEGIN_EVENT_TABLE(MyToolBar, wxToolBar)
EVT_RIGHT_DOWN(MyToolBar::RightClick) /* Toolbar Right-click */
+ EVT_MIDDLE_DCLICK(MyToolBar::MiddleDClick)
END_EVENT_TABLE()
/****************************************************************** MyToolBar */
@@ -60,10 +61,19 @@
/* This method is called from event table whenever user right-clicks on */
/* toolbar. We call CMainDlg::ShowToolPopupMenu() to handle the event. */
/******************************************************************************/
-void MyToolBar::RightClick(wxMouseEvent &event) {
+void MyToolBar::RightClick(const wxMouseEvent &event) {
mainframe->ShowToolPopupMenu();
}
+/* .... */
+void MyToolBar::MiddleDClick(const wxMouseEvent &event) {
+ if (event.ControlDown()) {
+ CAboutDlg *dlg = new CAboutDlg(NULL, -1, wxT("About..."));
+ dlg->ShowModal();
+ delete dlg;
+ }
+}
+
BEGIN_EVENT_TABLE(DetachedFrame, wxFrame)
EVT_CLOSE(DetachedFrame::OnClose)
END_EVENT_TABLE()
@@ -953,7 +963,7 @@
menu->Append(ID_EDIT_GUI_SETTINGS, _("Preferences"));
menu->Append(ID_FULLSCREEN, _("Fullscreen"));
- menu->Append(ID_ABOUT, _("About..."));
+ menu->Append(wxID_ABOUT, _("About..."));
menu->Append(ID_QUIT, _("Exit"));
#ifdef __WXMSW__
@@ -1043,8 +1053,12 @@
wxFULLSCREEN_NOBORDER|wxFULLSCREEN_NOCAPTION
);
break;
- case ID_ABOUT:
+ case wxID_ABOUT: {
+ CAboutDlg *dlg = new CAboutDlg(NULL, -1, _("About..."));
+ dlg->ShowModal();
+ delete dlg;
break;
+ }
case ID_QUIT:
Close();
break;
Index: MainDlg.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- MainDlg.h 30 Dec 2003 09:09:30 -0000 1.19
+++ MainDlg.h 14 Jan 2004 13:02:24 -0000 1.20
@@ -43,6 +43,7 @@
#include "Images.h"
#include "GUISettingsDlg.h"
#include "MMultiButton.h"
+#include "AboutDlg.h"
/* Constants for MainDlg */
#define ID_QUIT 100
@@ -71,7 +72,8 @@
); /* Constructor */
private:
DECLARE_EVENT_TABLE() /* Event table declaration */
- void RightClick(wxMouseEvent &event); /* Right mouse clicks events */
+ void RightClick(const wxMouseEvent &event); /* Mouse Rclick events */
+ void MiddleDClick(const wxMouseEvent &event); /* ... */
};
/**************************** DetachedFrame class *****************************/
Index: Makefile.am
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am 13 Jan 2004 20:54:07 -0000 1.15
+++ Makefile.am 14 Jan 2004 13:02:24 -0000 1.16
@@ -1,6 +1,7 @@
PROGRAM = wxInterface
-WXINTERFACE_OBJECTS = ColorFrameCtrl.o \
+WXINTERFACE_OBJECTS = AboutDlg.o \
+ ColorFrameCtrl.o \
DownloadListCtrl.o \
GUISettingsDlg.o \
Images.o \
Index: defines.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/defines.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- defines.h 13 Jan 2004 23:10:26 -0000 1.47
+++ defines.h 14 Jan 2004 13:02:24 -0000 1.48
@@ -21,7 +21,7 @@
#define __defines_H__
/* Version strings for easier modification */
-#define APPVER wxT("CVS")
+#define APPVER wxT("CVS Version")
#define APPVER_LONG wxT("ShareDaemon wxInterface CVS Version")
/* Include wx headers */
|
|
From: <ma...@us...> - 2004-01-14 10:21:25
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28801
Modified Files:
Images.cpp MainDlg.cpp
Log Message:
Tweaked toolbar button size calculation algorithm.
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- Images.cpp 13 Jan 2004 23:10:26 -0000 1.56
+++ Images.cpp 14 Jan 2004 10:21:22 -0000 1.57
@@ -217,14 +217,16 @@
wxBitmap tmp(100, 100);
mdc.SelectObject(tmp);
- wxFont fnt = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
- fnt.SetWeight(wxBOLD);
+ wxFont fnt = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
mdc.SetFont(fnt);
for (i=0;i<names.GetCount();i++) {
mdc.GetTextExtent(names.Item(i), &x, &y);
- x+=6;
+ x+=15;
y+=36;
+ if (y > x) { /* Don't allow buttons with height > width */
+ x = y;
+ }
x>tool_img_width ? tool_img_width=x : x=tool_img_width;
y>tool_img_height ? tool_img_height=y : y=tool_img_width;
}
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- MainDlg.cpp 14 Jan 2004 10:05:50 -0000 1.58
+++ MainDlg.cpp 14 Jan 2004 10:21:22 -0000 1.59
@@ -334,7 +334,7 @@
if (pages.IsEmpty()) {
break;
}
- names.Add(pages.Item(i)->GetKeyString());
+ names.Add(pages[i]->short_title);
}
names.Add(_("Connect"));
names.Add(_("Options"));
|
