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: <ma...@us...> - 2003-12-31 10:24:29
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23098
Modified Files:
Images.cpp MBitmapButton.cpp SBPanel.cpp
Log Message:
Dont use bold fonts anymore.
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- Images.cpp 30 Dec 2003 20:18:02 -0000 1.53
+++ Images.cpp 31 Dec 2003 10:24:26 -0000 1.54
@@ -168,8 +168,7 @@
tmp_new = wxBitmap(tool_img_width, tool_img_height);
mdc.SelectObject(tmp_new);
- wxFont fnt = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
- fnt.SetWeight(wxBOLD);
+ wxFont fnt = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
mdc.SetFont(fnt);
mdc.SetPen(*wxTRANSPARENT_PEN);
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- MBitmapButton.cpp 30 Dec 2003 15:47:23 -0000 1.12
+++ MBitmapButton.cpp 31 Dec 2003 10:24:26 -0000 1.13
@@ -170,7 +170,7 @@
wxBitmap bitmap(img->GetImage(m_image));
mdc.SelectObject(wxBitmap(100, 100));
- mdc.SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
+ mdc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
mdc.GetTextExtent(m_name, &x, &y);
x+=bitmap.GetWidth()+LABEL_WIDTH_ADDITION;
Index: SBPanel.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- SBPanel.cpp 29 Dec 2003 04:34:33 -0000 1.18
+++ SBPanel.cpp 31 Dec 2003 10:24:26 -0000 1.19
@@ -65,20 +65,12 @@
this, -1, title, image, wxDefaultPosition,
wxDefaultSize, wxNO_BORDER
);
- wxFont fnt = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
- fnt.SetWeight(wxBOLD);
- headerbmpbtn->SetFont(fnt);
-
header_btn_id = headerbmpbtn->GetId();
mainsizer->Add(headerbmpbtn, 0, wxGROW);
} else {
wxButton *headerbtn = new wxButton(
this, -1, title, wxDefaultPosition, wxDefaultSize, 0
);
- wxFont fnt = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
- fnt.SetWeight(wxBOLD);
- headerbtn->SetFont(fnt);
-
header_btn_id = headerbtn->GetId();
mainsizer->Add(headerbtn, 0, wxGROW|wxADJUST_MINSIZE, 5);
}
|
|
From: <ma...@us...> - 2003-12-30 20:18:06
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14602
Modified Files:
Images.cpp
Log Message:
Cleaned up the LoadImages method.
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- Images.cpp 30 Dec 2003 15:47:23 -0000 1.52
+++ Images.cpp 30 Dec 2003 20:18:02 -0000 1.53
@@ -59,7 +59,32 @@
/* TODO: Put names into temporary wxString array and use for-loop to load 'em.*/
/******************************************************************************/
void CImages::LoadImages() {
- wxString path;
+wxString path;
+wxArrayString names;
+ names.Add(wxT("friend")); names.Add(wxT("messages"));
+ names.Add(wxT("searchresults")); names.Add(wxT("provider"));
+ names.Add(wxT("serverlist")); names.Add(wxT("newserver"));
+ names.Add(wxT("updateservers")); names.Add(wxT("info"));
+ names.Add(wxT("serverinfo")); names.Add(wxT("log"));
+ names.Add(wxT("sharedfiles")); names.Add(wxT("updown11"));
+ names.Add(wxT("updown00")); names.Add(wxT("connectedhigh"));
+ names.Add(wxT("disconnected")); names.Add(wxT("clock"));
+ names.Add(wxT("user")); names.Add(wxT("server"));
+ names.Add(wxT("arrow")); names.Add(wxT("statistics"));
+ names.Add(wxT("upload")); names.Add(wxT("download"));
+ names.Add(wxT("partstats")); names.Add(wxT("fullstats"));
+ names.Add(wxT("exclamation")); names.Add(wxT("connection"));
+ names.Add(wxT("daily")); names.Add(wxT("monthly"));
+ names.Add(wxT("yearly")); names.Add(wxT("mule"));
+ names.Add(wxT("btn_connect")); names.Add(wxT("btn_servers"));
+ names.Add(wxT("btn_transfer")); names.Add(wxT("btn_search"));
+ names.Add(wxT("btn_shared")); names.Add(wxT("btn_messages"));
+ names.Add(wxT("btn_statistics")); names.Add(wxT("btn_guisettings"));
+ names.Add(wxT("btn_preferences")); names.Add(wxT("splashscreen"));
+ names.Add(wxT("leftarrow")); names.Add(wxT("rightarrow"));
+ names.Add(wxT("options")); names.Add(wxT("help"));
+ names.Add(wxT("quit"));
+
tool_img_width = 32;
images.DeleteContents(true);
@@ -67,186 +92,14 @@
path = MakePath();
- images.Append(
- wxT("friend"),
- new wxBitmap(path+wxT("friend.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("messages"),
- new wxBitmap(path+wxT("messages.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("searchresults"),
- new wxBitmap(path+wxT("searchresults.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("provider"),
- new wxBitmap(path+wxT("provider.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("serverlist"),
- new wxBitmap(path+wxT("serverlist.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("newserver"),
- new wxBitmap(path+wxT("newserver.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("updateservers"),
- new wxBitmap(path+wxT("updateservers.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("info"),
- new wxBitmap(path+wxT("info.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("serverinfo"),
- new wxBitmap(path+wxT("serverinfo.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("log"),
- new wxBitmap(path+wxT("log.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("sharedfiles"),
- new wxBitmap(path+wxT("sharedfiles.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("updown11"),
- new wxBitmap(path+wxT("updown11.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("updown00"),
- new wxBitmap(path+wxT("updown00.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("connectedhigh"),
- new wxBitmap(path+wxT("connectedhigh.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("disconnected"),
- new wxBitmap(path+wxT("disconnected.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("clock"),
- new wxBitmap(path+wxT("clock.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("user"),
- new wxBitmap(path+wxT("user.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("server"),
- new wxBitmap(path+wxT("server.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("arrow"),
- new wxBitmap(path+wxT("arrow.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("statistics"),
- new wxBitmap(path+wxT("statistics.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("upload"),
- new wxBitmap(path+wxT("upload.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("download"),
- new wxBitmap(path+wxT("download.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("partstats"),
- new wxBitmap(path+wxT("partstats.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("fullstats"),
- new wxBitmap(path+wxT("fullstats.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("exclamation"),
- new wxBitmap(path+wxT("exclamation.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("connection"),
- new wxBitmap(path+wxT("connection.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("daily"),
- new wxBitmap(path+wxT("daily.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("monthly"),
- new wxBitmap(path+wxT("monthly.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("yearly"),
- new wxBitmap(path+wxT("yearly.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("mule"),
- new wxBitmap(path+wxT("mule.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_connect"),
- new wxBitmap(path+wxT("btn_connect.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_servers"),
- new wxBitmap(path+wxT("btn_servers.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_transfer"),
- new wxBitmap(path+wxT("btn_transfer.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_search"),
- new wxBitmap(path+wxT("btn_search.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_shared"),
- new wxBitmap(path+wxT("btn_shared.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_messages"),
- new wxBitmap(path+wxT("btn_messages.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_statistics"),
- new wxBitmap(path+wxT("btn_statistics.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_guisettings"),
- new wxBitmap(path+wxT("btn_guisettings.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("btn_preferences"),
- new wxBitmap(path+wxT("btn_preferences.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("splashscreen"),
- new wxBitmap(path+wxT("splashscreen.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("leftarrow"),
- new wxBitmap(path+wxT("leftarrow.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("rightarrow"),
- new wxBitmap(path+wxT("rightarrow.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("options"),
- new wxBitmap(path+wxT("options.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("help"),
- new wxBitmap(path+wxT("help.png"), wxBITMAP_TYPE_ANY)
- );
- images.Append(
- wxT("quit"),
- new wxBitmap(path+wxT("quit.png"), wxBITMAP_TYPE_ANY)
- );
+ for (size_t i=0;i<names.GetCount();i++) {
+ images.Append(
+ names[i],
+ new wxBitmap(
+ path+names[i]+wxT(".png"), wxBITMAP_TYPE_ANY
+ )
+ );
+ }
}
/******************************************************************* GetImage */
|
|
From: <mik...@us...> - 2003-12-30 19:51:10
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv8756 Modified Files: configure Log Message: Index: configure =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- configure 30 Dec 2003 15:11:18 -0000 1.9 +++ configure 30 Dec 2003 19:51:06 -0000 1.10 @@ -2,6 +2,7 @@ # Configure script for ShareDaemon Web Interface # +# # This file is part of webInterface. # Copyright (C) 2003 Mikael Barbeaux <mik...@us...> # |
|
From: <mik...@us...> - 2003-12-30 19:50:16
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv8462 Modified Files: ChangeLog Log Message: 30/12/2003 Mikael Barbeaux * Put the configure script as executable into CVS Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChangeLog 30 Dec 2003 17:12:00 -0000 1.25 +++ ChangeLog 30 Dec 2003 19:50:12 -0000 1.26 @@ -24,6 +24,7 @@ ----------------------------------------------------------- 30/12/2003 Mikael Barbeaux + * Put the configure script as executable into CVS * Implemented first version of HttpSession object. * Added optimization checking into configure script * Added auto generation of index from the thread library into configure script |
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv7511/src/server/http/servlet
Modified Files:
HttpServletResponse.h HttpServletResponse.cpp
HttpServletRequest.h HttpServletRequest.cpp
Added Files:
HttpSession.h HttpSession.cpp
Log Message:
30/12/2003 Mikael Barbeaux
* Implemented first version of HttpSession object.
--- NEW FILE: HttpSession.h ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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
*/
#include <time.h>
#include <vector>
#include <string>
using namespace std;
/**
* Defines a session object for managing client informations
* into servlets.
*/
class HttpSession {
public:
/**
* Creates a HttpSession object.
*/
HttpSession();
/**
* Destructor for HttpSession.
*/
~HttpSession();
/**
* Returns the value of a given attribute.
*
* @param name
* @return void*
*/
void *getAttribute(string name);
/**
* Returns a vector of all attribute names.
*
* @return vector<string>
*/
vector<string> getAttributeNames();
/**
* Returns the creation time of this session.
*
* @return time_t
*/
time_t getCreationTime();
/**
* Returns the identifiant of this session.
*
* @return string
*/
string getId();
/**
* Returns the last accessed time to this servlet.
*
* @return time_t
*/
time_t getLastAccessedTime();
/**
* Invalidates this session.
*/
void invalidate();
/**
* Removes the given attribute from the session.
*
* @param name
*/
void removeAttribute(string name);
/**
* Adds a attribute into the session with the given
* name and value.
*
* @param name
* @param value
*/
void setAttribute(string name, void *value);
};
--- NEW FILE: HttpSession.cpp ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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
*/
#include "HttpSession.h"
/**
* Creates a HttpSession object.
*/
HttpSession::HttpSession() {
}
/**
* Destructor for HttpSession.
*/
HttpSession::~HttpSession() {
}
/**
* Returns the value of a given attribute.
*
*/
void *HttpSession::getAttribute(string name) {
return 0;
}
/**
* Returns a vector of all attribute names.
*/
vector<string> HttpSession::getAttributeNames() {
vector<string> v;
return v;
}
/**
* Returns the creation time of this session.
*/
time_t HttpSession::getCreationTime() {
return 0;
}
/**
* Returns the identifiant of this session.
*/
string HttpSession::getId() {
return "";
}
/**
* Returns the last accessed time to this servlet.
*/
time_t HttpSession::getLastAccessedTime() {
return 0;
}
/**
* Invalidates this session.
*/
void HttpSession::invalidate() {
}
/**
* Removes the given attribute from the session.
*/
void HttpSession::removeAttribute(string name) {
}
/**
* Adds a attribute into the session with the given
* name and value.
*/
void HttpSession::setAttribute(string name, void *value) {
}
Index: HttpServletResponse.h
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletResponse.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HttpServletResponse.h 30 Dec 2003 14:33:28 -0000 1.3
+++ HttpServletResponse.h 30 Dec 2003 17:11:59 -0000 1.4
@@ -23,13 +23,38 @@
#include "../HttpResponse.h"
#include "../TextWriter.h"
+/**
+ * Defines a http response for handling servlet.
+ * A Servlet response is the same as a normal
+ * http response, except the fact that only
+ * text informations can be handled and that
+ * it can manage cookies.
+ */
class HttpServletResponse : public HttpResponse {
-public:
- HttpServletResponse(TextWriter *writer);
- ~HttpServletResponse();
+ public:
+
+ /**
+ * Creates a HttpServletResponse object
+ * with the given writer.
+ *
+ * @param writer - a text writer
+ */
+ HttpServletResponse(TextWriter *writer);
- TextWriter *getWriter();
+ /**
+ * Destructor for HttpServletResponse
+ */
+ ~HttpServletResponse();
+
+ /**
+ * Returns the text writer associated to this
+ * servlet.
+ *
+ * @return TextWriter*
+ */
+ TextWriter *getWriter();
+
};
#endif
Index: HttpServletResponse.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletResponse.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HttpServletResponse.cpp 30 Dec 2003 14:33:28 -0000 1.3
+++ HttpServletResponse.cpp 30 Dec 2003 17:11:59 -0000 1.4
@@ -1,12 +1,41 @@
+/*
+ * This file is part of webInterface.
+ * Copyright (C) 2003 Mikael Barbeaux <mik...@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
+ */
+
#include "HttpServletResponse.h"
+/**
+ * Creates a HttpServletResponse object with the given
+ * text writer.
+ */
HttpServletResponse::HttpServletResponse(TextWriter *writer) :
- HttpResponse(writer)
-{}
+ HttpResponse(writer) {
+}
-HttpServletResponse::~HttpServletResponse()
-{}
+/**
+ * Destructor for HttpServletResponse
+ */
+HttpServletResponse::~HttpServletResponse() {
+}
+/**
+ * Returns the text writer associated to this response.
+ */
TextWriter *HttpServletResponse::getWriter() {
return (TextWriter*) writer;
}
Index: HttpServletRequest.h
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletRequest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HttpServletRequest.h 30 Dec 2003 12:08:19 -0000 1.1
+++ HttpServletRequest.h 30 Dec 2003 17:11:59 -0000 1.2
@@ -21,12 +21,52 @@
#define _HTTP_SERVLET_REQUEST_H_
#include "../HttpRequest.h"
+#include "HttpSession.h"
+/**
+ * Defines an object for handling request into http servlets.
+ * It extends a typical http request, mostly by adding
+ * the http sessions feature.
+ */
class HttpServletRequest : public HttpRequest {
-public:
- HttpServletRequest();
- ~HttpServletRequest();
+ public:
+
+ /**
+ * Creates a HttpServletRequest object.
+ */
+ HttpServletRequest();
+
+ /**
+ * Destructor for HttpServlet object.
+ */
+ ~HttpServletRequest();
+
+ /**
+ * Returns the session associated to this request.
+ * If create is true, then the session is created
+ * if not yet done.
+ *
+ * @param create
+ */
+ HttpSession *getSession(bool create = true);
+
+ /**
+ * Returns the session id specified by the
+ * client.
+ *
+ * @return string
+ */
+ string getSessionId();
+
+ /**
+ * Tests if the session associated to this request is
+ * still valid or not.
+ *
+ * @return bool
+ */
+ bool isSessionIdValid();
+
};
#endif
Index: HttpServletRequest.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletRequest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HttpServletRequest.cpp 30 Dec 2003 12:08:19 -0000 1.1
+++ HttpServletRequest.cpp 30 Dec 2003 17:11:59 -0000 1.2
@@ -1,6 +1,58 @@
+/*
+ * This file is part of webInterface.
+ * Copyright (C) 2003 Mikael Barbeaux <mik...@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
+ */
+
#include "HttpServletRequest.h"
-HttpServletRequest::HttpServletRequest()
-{}
-HttpServletRequest::~HttpServletRequest()
-{}
+/**
+ * Creates a HttpServletRequest object.
+ */
+HttpServletRequest::HttpServletRequest() {
+}
+
+/**
+ * Destructor for HttpServlet object.
+ */
+HttpServletRequest::~HttpServletRequest() {
+}
+
+/**
+ * Returns the session associated to this request.
+ * If create is true, then the session is created
+ * if not yet done.
+ */
+HttpSession *HttpServletRequest::getSession(bool create) {
+ return 0;
+}
+
+/**
+ * Returns the session id specified by the
+ * client.
+ */
+string HttpServletRequest::getSessionId() {
+ return "";
+}
+
+/**
+ * Tests if the session associated to this request is
+ * still valid or not.
+ */
+bool HttpServletRequest::isSessionIdValid() {
+ return true;
+}
+
|
|
From: <mik...@us...> - 2003-12-30 17:12:03
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv7511 Modified Files: ChangeLog Log Message: 30/12/2003 Mikael Barbeaux * Implemented first version of HttpSession object. Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ChangeLog 30 Dec 2003 15:11:18 -0000 1.24 +++ ChangeLog 30 Dec 2003 17:12:00 -0000 1.25 @@ -24,6 +24,7 @@ ----------------------------------------------------------- 30/12/2003 Mikael Barbeaux + * Implemented first version of HttpSession object. * Added optimization checking into configure script * Added auto generation of index from the thread library into configure script * Fixed a compilation error for HttpServletResponse |
|
From: <ma...@us...> - 2003-12-30 15:47:26
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv23175 Modified Files: Images.cpp MBitmapButton.cpp Log Message: Fixed toolbar/multibutton text problems on wxGTK2 and wxMac Index: Images.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- Images.cpp 30 Dec 2003 13:33:36 -0000 1.51 +++ Images.cpp 30 Dec 2003 15:47:23 -0000 1.52 @@ -325,7 +325,7 @@ #ifdef __WXMSW__ /* This gives transparent image on wxMSW */ mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID)); #else /* Elsewhere, it will be done with wxMask later */ - mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID)); + mdc.SetBrush(wxBrush(wxColour(255, 255, 255), wxSOLID)); #endif mdc.DrawRectangle( 0, 0, tmp_new.GetWidth(), tmp_new.GetHeight() @@ -338,14 +338,14 @@ mdc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT) ); -#else /* However, it doesn't work anywhere else, so use 50,50,50 instead */ - mdc.SetTextForeground(wxColour(50, 50, 50)); +#else /* However, it doesn't work anywhere else, so use 0, 0, 0 instead */ + mdc.SetTextForeground(wxColour(0, 0, 0)); #endif mdc.GetTextExtent(name, &x, &y); mdc.DrawText(name, (tmp_new.GetWidth()-x)/2, 36); #ifndef __WXMSW__ /* Use wxMask for transparency */ wxMask *tmp_mask; - tmp_mask = new wxMask(tmp_new, wxColour(0,0,0)); + tmp_mask = new wxMask(tmp_new, wxColour(255, 255, 255)); tmp_new.SetMask(tmp_mask); #endif mdc.EndDrawing(); Index: MBitmapButton.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- MBitmapButton.cpp 30 Dec 2003 13:33:36 -0000 1.11 +++ MBitmapButton.cpp 30 Dec 2003 15:47:23 -0000 1.12 @@ -135,17 +135,21 @@ ); mdc.SelectObject(tmp); -#ifdef __WXMSW__ /* This gives transparent image on wxMSW */ mdc.SetPen(*wxTRANSPARENT_PEN); + +#ifdef __WXMSW__ /* This gives transparent image on wxMSW */ mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID)); #else /* Elsewhere, it will be done with wxMask later */ - mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID)); + mdc.SetBrush(wxBrush(wxColour(255, 255, 255), wxSOLID)); #endif + mdc.DrawRectangle(0, 0, tmp.GetWidth(), tmp.GetHeight()); mdc.DrawBitmap(orig_img, 0, 0, true); + #ifndef __WXMSW__ - tmp.SetMask(new wxMask(tmp, wxColour(0, 0, 0))); + tmp.SetMask(new wxMask(tmp, wxColour(255, 255, 255))); #endif + SetBitmapLabel(tmp); event.Skip(); @@ -179,7 +183,7 @@ #ifdef __WXMSW__ /* This gives transparent image on wxMSW */ mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID)); #else /* Elsewhere, it will be done with wxMask later */ - mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID)); + mdc.SetBrush(wxBrush(wxColour(255, 255, 255), wxSOLID)); #endif mdc.DrawRectangle(0, 0, tmp->GetWidth(), tmp->GetHeight()); @@ -187,14 +191,21 @@ bitmap, 5, ((y-bitmap.GetHeight())/2)+BITMAP_Y_POS_OFFSET, true ); - mdc.SetTextForeground(wxColour(50, 50, 50)); +#ifdef __WXMSW__ /* Well, this gives correct colour on MSW */ + mdc.SetTextForeground( + wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT) + ); +#else /* However, it doesn't work anywhere else, so use 0, 0, 0 instead */ + mdc.SetTextForeground(wxColour(0, 0, 0)); +#endif + mdc.DrawText( m_name, bitmap.GetWidth()+10, ((tmp->GetHeight()-GetCharHeight())/2)+TEXT_Y_POS_OFFSET ); #ifndef __WXMSW__ - tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0))); + tmp->SetMask(new wxMask(*tmp, wxColour(255, 255, 255))); #endif SetBitmapLabel(*tmp); orig_img = *tmp; |
|
From: <mik...@us...> - 2003-12-30 15:11:21
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web
In directory sc8-pr-cvs1:/tmp/cvs-serv16726
Modified Files:
configure ChangeLog
Log Message:
30/12/2003 Mikael Barbeaux
* Added optimization checking into configure script
Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure 30 Dec 2003 14:33:29 -0000 1.8
+++ configure 30 Dec 2003 15:11:18 -0000 1.9
@@ -77,7 +77,7 @@
if test -z ${COMM}
then
echo "Checking for $1 not found"
- help_comp;
+ help_comp $1;
else
echo "Checking for $1 ${COMM}"
fi
@@ -168,8 +168,16 @@
else
echo "CCFLAGS =" >> Makefile
fi
- echo "CCFLAGS += -O3 -fexpensive-optimizations" >> Makefile
-
+ if test $optimize = 1
+ then
+ ARCH=`uname -m`
+ if test $ARCH != "unknown"
+ then
+ echo "CCFLAGS += -march=$ARCH" >> Makefile
+ fi
+ echo "CCFLAGS += -O3 -fexpensive-optimizations" >> Makefile
+ fi
+ echo "" >> Makefile
echo "all : clean \$(BIN) strip done" >> Makefile
echo "" >> Makefile
@@ -282,26 +290,14 @@
####
-# Other OS help
-####
-other_os() {
- echo "Your current plateform is : Unknown"
- echo "This script cannot compile the program."
- echo "Contact me for more informations :"
- echo "mik...@us..."
- echo ""
- echo "Exiting."
-}
-
-
-
-####
# Displays help
####
help() {
echo "Available options for configure :"
- echo " --help"
- echo " displays this help"
+ echo " --help : Displays this help"
+ echo " --enable-optimize : Enable optimization"
+ echo " --disable-optimize : Disable optimization"
+ exit;
}
@@ -309,8 +305,10 @@
####
# Displays compilation help
####
-help_comp() {
- echo "compilation help"
+help_comp() {
+ echo ""
+ echo "Compilation error"
+ echo "Unable to find $1"
exit;
}
@@ -330,21 +328,33 @@
# Main script
####
+optimize=0
+while test $# -gt 0;
+do
+ case $1 in
+ --help)
+ help;
+ ;;
+ --disable-optimize)
+ optimize=0;
+ ;;
+ --enable-optimize)
+ optimize=1;
+ ;;
+ esac
+ shift
+done
+
echo "ShareDaemon Web Interface - configure script"
echo "Written by MikaelB"
-CONF_OPTIONS=$1
+
OS=`uname -n`
SYSTEM=`uname -s`
-if test -n "$CONF_OPTIONS" -a "$CONF_OPTIONS" = "--help"
-then
- help;
-else
- check_config;
-fi
-
echo ""
echo "Check system : $OS - $SYSTEM"
+
+check_config;
echo "Building Makefile..."
build_Makefile;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog 30 Dec 2003 14:33:29 -0000 1.23
+++ ChangeLog 30 Dec 2003 15:11:18 -0000 1.24
@@ -24,6 +24,7 @@
-----------------------------------------------------------
30/12/2003 Mikael Barbeaux
+ * Added optimization checking into configure script
* Added auto generation of index from the thread library into configure script
* Fixed a compilation error for HttpServletResponse
* Implemented first versions of HttpServletRequest, HttpServletResponse and
|
|
From: <mik...@us...> - 2003-12-30 14:33:38
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv11175 Modified Files: configure ChangeLog INSTALL Log Message: 30/12/2003 Mikael Barbeaux * Added auto generation of index from the thread library into configure script Index: configure =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- configure 30 Dec 2003 12:08:19 -0000 1.7 +++ configure 30 Dec 2003 14:33:29 -0000 1.8 @@ -44,6 +44,9 @@ check_command ar AR_EXE=$COMM + check_command ranlib + RANLIB_EXE=$COMM + check_command rm RM_EXE=$COMM @@ -117,6 +120,9 @@ echo "# Path to ar binary" >> Makefile echo "AR = $AR_EXE" >> Makefile echo "" >> Makefile + echo "# Path to ranlib binary" >> Makefile + echo "RANLIB = $RANLIB_EXE" >> Makefile + echo "" >> Makefile echo "# Path to rm binary" >> Makefile echo "RM = $RM_EXE" >> Makefile echo "" >> Makefile @@ -193,6 +199,21 @@ echo " @echo \"\"" >> Makefile echo " @echo -e \"Creating libsd_threads.a library : \\\\c\"" >> Makefile echo " @if \$(AR) -r libsd_threads.a \$(THREADS_OBJECTS) 2> .error; then \\" >> Makefile + echo " if test -s .error; then \\" >> Makefile + echo " echo -e \"Created with warnings :\"; \\" >> Makefile + echo " cat .error; \\" >> Makefile + echo " \$(RM) -f .error; \\" >> Makefile + echo " else \\" >> Makefile + echo " echo -e \"ok\"; \\" >> Makefile + echo " fi; \\" >> Makefile + echo " else \\" >> Makefile + echo " echo -e \"Creation failed : \"; \\" >> Makefile + echo " cat .error ; \\" >> Makefile + echo " \$(RM) -f .error; \\" >> Makefile + echo " false; \\" >> Makefile + echo " fi;" >> Makefile + echo " @echo -e \"Generating archive index : \\\\c\"" >> Makefile + echo " @if \$(RANLIB) libsd_threads.a 2> .error; then \\" >> Makefile echo " if test -s .error; then \\" >> Makefile echo " echo -e \"Created with warnings :\"; \\" >> Makefile echo " cat .error; \\" >> Makefile Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ChangeLog 30 Dec 2003 12:33:52 -0000 1.22 +++ ChangeLog 30 Dec 2003 14:33:29 -0000 1.23 @@ -24,6 +24,7 @@ ----------------------------------------------------------- 30/12/2003 Mikael Barbeaux + * Added auto generation of index from the thread library into configure script * Fixed a compilation error for HttpServletResponse * Implemented first versions of HttpServletRequest, HttpServletResponse and ServletException. Index: INSTALL =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/INSTALL,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- INSTALL 30 Dec 2003 10:45:11 -0000 1.5 +++ INSTALL 30 Dec 2003 14:33:29 -0000 1.6 @@ -4,14 +4,15 @@ This version is an early alpha. Compilation has been tester under Win32 ( MinGW -and Cygwin ) and Linux, but should also work on FreeBSD and MacOS X ( Cocoa ). +and Cygwin ) , Linux, FreeBSD and MacOS X ( Cocoa ). It should also work on +Solaris and other Unix like systems. 1) Starting from binaries Download the lastest binary package for your OS ( typically, Windows, Linux, FreeBSD and MacOS X binaries are provided ). - Then gi into the directory where you downloaded ( and unzipped ) + Then go into the directory where you downloaded ( and unzipped ) the binary package and type the following : # if you are on Linux, FreeBSD or MacOS X : @@ -70,7 +71,7 @@ * UNAME command : uname * stdc++ library : libstdc++.a * winsock library : libws2_32.a (Windows MinGW only) - * pthread library : libpthread.a (Linux, MacOSX, FreeBSD only) + * pthread library : libpthread.a (Windows Cygwin, Linux, MacOSX, FreeBSD only) MikaelB |
|
From: <mik...@us...> - 2003-12-30 14:33:37
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv11175/src/server/http/servlet
Modified Files:
HttpServletResponse.h HttpServletResponse.cpp
Log Message:
30/12/2003 Mikael Barbeaux
* Added auto generation of index from the thread library into configure script
Index: HttpServletResponse.h
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletResponse.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HttpServletResponse.h 30 Dec 2003 12:33:51 -0000 1.2
+++ HttpServletResponse.h 30 Dec 2003 14:33:28 -0000 1.3
@@ -21,13 +21,15 @@
#define _HTTP_SERVLET_RESPONSE_H_
#include "../HttpResponse.h"
-#include "../Writer.h"
+#include "../TextWriter.h"
class HttpServletResponse : public HttpResponse {
public:
- HttpServletResponse(Writer *writer);
+ HttpServletResponse(TextWriter *writer);
~HttpServletResponse();
+
+ TextWriter *getWriter();
};
#endif
Index: HttpServletResponse.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletResponse.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HttpServletResponse.cpp 30 Dec 2003 12:33:51 -0000 1.2
+++ HttpServletResponse.cpp 30 Dec 2003 14:33:28 -0000 1.3
@@ -1,8 +1,13 @@
#include "HttpServletResponse.h"
-HttpServletResponse::HttpServletResponse(Writer *writer) :
+HttpServletResponse::HttpServletResponse(TextWriter *writer) :
HttpResponse(writer)
{}
HttpServletResponse::~HttpServletResponse()
{}
+
+TextWriter *HttpServletResponse::getWriter() {
+ return (TextWriter*) writer;
+}
+
|
|
From: <ma...@us...> - 2003-12-30 13:53:04
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv4201 Modified Files: French.po Log Message: Updated french translation from Nicolas Lussier Index: French.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/French.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- French.po 23 Dec 2003 23:38:25 -0000 1.1 +++ French.po 30 Dec 2003 13:53:00 -0000 1.2 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: wxInterface CVS-30-12-2003\n" "POT-Creation-Date: 2003-12-01 22:36+0200\n" "PO-Revision-Date: 2003-12-23 14:53+0100\n" "Last-Translator: Nicolas Lussier\n" @@ -74,12 +74,12 @@ #: DownloadListCtrl.cpp:55 msgid "Category" -msgstr "catégorie" +msgstr "Catégorie" #: GUISettingsDlg.cpp:312 #: GUISettingsDlg.cpp:402 msgid "Add new language" -msgstr "Ajouter un nouveau langage" +msgstr "Ajouter une nouvelle langue" #: GUISettingsDlg.cpp:328 #, c-format @@ -87,8 +87,8 @@ "Are you sure you wish to remove language \t\t%s from the list of languages?\n" "\t\tThe actual language files will not be deleted." msgstr "" -"Etes-vous sur de vouloir enlever \t\t%s de la liste des langues?\n" -"\t\t Le fichier de la langue courante ne sera pas effacé." +"Etes-vous sur de vouloir enlever la langue \t\t%s de la liste des langues?\n" +"\t\tLe fichier de la langue courante ne sera pas éffacé." #: GUISettingsDlg.cpp:333 msgid "Confirm remove language" @@ -106,7 +106,7 @@ "\t\tThe actual iconset files will not be deleted." msgstr "" "Etes-vous sur de vouloir enlever le thème d'icones \t\t%s de la liste ?\n" -"\t\t Le fichier du thème d'icones courant ne sera pas effacé." +"\t\t Le fichier du thème d'icones courant ne sera pas éffacé." #: GUISettingsDlg.cpp:368 msgid "Confirm remove iconset" @@ -152,7 +152,7 @@ #: GUISettingsDlg.cpp:464 msgid "Default" -msgstr "Default" +msgstr "Défaut" #: GUISettingsDlg.cpp:471 msgid "Change the font" @@ -164,7 +164,7 @@ #: GUISettingsDlg.cpp:483 msgid "Startup page" -msgstr "Page de démarrage" +msgstr "Onglet de démarrage" #: GUISettingsDlg.cpp:487 #: wxInterface_wdr.cpp:158 @@ -195,7 +195,7 @@ #: MainDlg.cpp:428 #: wxInterface_wdr.cpp:350 msgid "Shared Files" -msgstr "Fichiers partagés" +msgstr "Partages" #: GUISettingsDlg.cpp:491 #: MainDlg.cpp:290 @@ -216,11 +216,11 @@ #: GUISettingsDlg.cpp:500 msgid "Set which page will be displayed on program startup" -msgstr "Sélectionner la page à afficher au démarrage du programme" +msgstr "Sélectionner l'onglet à afficher au démarrage du programme" #: GUISettingsDlg.cpp:506 msgid "Remember last" -msgstr "Conserver le dernier" +msgstr "Dernier utilisé" #: GUISettingsDlg.cpp:511 msgid "Automatically remember which page was \t\topen between sessions" @@ -232,15 +232,15 @@ #: GUISettingsDlg.cpp:529 msgid "Toggle wether splashscreen should be shown on program \t\tstartup or not. Speeds up application starting if turned off. \t\tDefault: On" -msgstr "Sélectionner si l'ecran de démarrage doit etre montré ou non. \t\tAugmente le démarage si désactivé. \t\tDefult : Oui" +msgstr "Sélectionner si l'ecran de démarrage doit être montré ou non. \t\tAugmente la rapiditée du démarage si désactivé. \t\tDéfaut : Oui" #: GUISettingsDlg.cpp:537 msgid "Prompt on exit" -msgstr "Afficher a la sortie" +msgstr "Afficher à la sortie" #: GUISettingsDlg.cpp:542 msgid "Toggle wether confirmation is requested \t\twhen closing program." -msgstr "Sélectionner si la confirmation est demandée \t\tquand on sort du programme" +msgstr "Sélectionner si une confirmation est demandée \t\tquand on sort du programme" #: GUISettingsDlg.cpp:554 #: MainDlg.cpp:438 @@ -249,7 +249,7 @@ #: GUISettingsDlg.cpp:559 msgid "Toggle wether toolbar is shown or not." -msgstr "Sélectionner si la barre d'outil doit etre montrée ou non." +msgstr "Sélectionner si la barre d'outils doit etre montrée ou non." #: GUISettingsDlg.cpp:567 #: MainDlg.cpp:445 @@ -265,7 +265,7 @@ #: GUISettingsDlg.cpp:576 msgid "Horizontal tooltip is shown on top of window (default),\t\tvertical is shown on the left side of window." -msgstr "Aide pop-up horizontale est affichée en haut de la fenêtre (default),\t\tvertical est affiché sur la gauche de la fenêtre." +msgstr "La barre d'outils est affichée en haut de la fenêtre (default),\t\tvertical est affichée sur la gauche de la fenêtre." #: GUISettingsDlg.cpp:587 #: MainDlg.cpp:434 @@ -371,7 +371,7 @@ #: KnownListCtrl.cpp:53 msgid "Upload Status" -msgstr "Etat de l'upload" +msgstr "Etat de l'envois" #: KnownListCtrl.cpp:53 msgid "Transferred Up" @@ -379,7 +379,7 @@ #: KnownListCtrl.cpp:54 msgid "Download Status" -msgstr "Etat du download" +msgstr "Etat du téléchargement" #: KnownListCtrl.cpp:54 msgid "Client Software" @@ -480,7 +480,7 @@ #: QueueListCtrl.cpp:53 msgid "Asked" -msgstr "Demande" +msgstr "Demandée" #: QueueListCtrl.cpp:53 msgid "Last Seen" @@ -488,7 +488,7 @@ #: QueueListCtrl.cpp:53 msgid "Entered Queue" -msgstr "Entre dans la file" +msgstr "Entré dans la file" #: QueueListCtrl.cpp:54 msgid "Banned" @@ -572,11 +572,11 @@ #: ServerWnd.cpp:220 msgid "Add new server" -msgstr "Ajoute un nouveau serveur" +msgstr "Ajouter un serveur" #: ServerWnd.cpp:234 msgid "Update from URL" -msgstr "Metre à jour depuis l'URL" +msgstr "MAJ depuis l'URL" #: ServerWnd.cpp:242 msgid "Server settings" @@ -588,7 +588,7 @@ #: ServerWnd.cpp:258 msgid "Log options" -msgstr "Options du Log" +msgstr "Options du journal" #: ServerWnd.cpp:364 msgid "Autoconnect" @@ -600,7 +600,7 @@ #: ServerWnd.cpp:378 msgid "To static only" -msgstr "Seulement au statique" +msgstr "Seulement aux statiques" #: ServerWnd.cpp:383 msgid "Toggle wether application should connect \t\tto servers marked as \"static\" only" @@ -608,7 +608,7 @@ #: ServerWnd.cpp:423 msgid "Set server static. Static servers are not \t\tremoved from list if they do not respond" -msgstr "Mettre le serveur en statique. Les serveurs statiques ne sont pas retirés s'ils ne reponde pas" +msgstr "Mettre le serveur en statique. Les serveurs statiques ne sont pas retirés s'ils ne repondent pas" #: ServerWnd.cpp:434 msgid "Priority:" @@ -632,11 +632,11 @@ #: ServerWnd.cpp:482 msgid "Line limit" -msgstr "Limite line" +msgstr "Limite ligne" #: ServerWnd.cpp:487 msgid "Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" -msgstr "Sélectionner il doit y avoir une limite de ligne \t\t pour le journal (economie de mémoire)" +msgstr "Sélectionner s'il doit y avoir une limite de ligne \t\t pour le journal (economie de mémoire)" #: ServerWnd.cpp:498 msgid "Maximum number of lines in log boxes" @@ -648,7 +648,7 @@ #: ServerWnd.cpp:509 msgid "Save logs to disc also" -msgstr "Sauvegarder aussi le journal sur le disque" +msgstr "Sauvegarder aussi les journaux sur le disque" #: ServerWnd.cpp:514 msgid "Clear" @@ -656,7 +656,7 @@ #: ServerWnd.cpp:518 msgid "Clear all logs" -msgstr "Effacer tout les logs" +msgstr "Effacer tout les journaux" #: ServerWnd.cpp:543 msgid "IP address:Port" @@ -700,7 +700,7 @@ #: ServerWnd.cpp:706 msgid "Apply changes" -msgstr "Appliquer les changements" +msgstr "Appliquer" #: SharedFilesListCtrl.cpp:52 msgid "Accepted Requests" @@ -739,7 +739,7 @@ #: TransferWnd.cpp:187 msgid "Downloads" -msgstr "Downloads" +msgstr "Téléchargements" #: TransferWnd.cpp:208 #: wxInterface_wdr.cpp:300 @@ -748,7 +748,7 @@ #: TransferWnd.cpp:251 msgid "Uploads" -msgstr "Uploads" +msgstr "Envois" #: TransferWnd.cpp:294 msgid "On Queue" @@ -764,7 +764,7 @@ #: UploadListCtrl.cpp:53 msgid "Upload Time" -msgstr "Temps d'upload" +msgstr "Temps d'emission" #: wxInterface_wdr.cpp:147 msgid "Method" @@ -824,7 +824,7 @@ #: wxInterface_wdr.cpp:243 msgid "Direct Download" -msgstr "Download directe" +msgstr "Télécharger directement" #: wxInterface_wdr.cpp:246 msgid "ED2K Link(s)" @@ -849,11 +849,11 @@ #: wxInterface_wdr.cpp:377 #: wxInterface_wdr.cpp:425 msgid "Accepted Uploads" -msgstr "Upload acceptés" +msgstr "Envois acceptés" #: wxInterface_wdr.cpp:415 msgid "Total" -msgstr "Totale" +msgstr "Total" #: wxInterface_wdr.cpp:478 msgid "Friends" @@ -881,7 +881,7 @@ #: wxInterface_wdr.cpp:578 msgid "active downloads" -msgstr "Download actif" +msgstr "Téléchargement actif" #: wxInterface_wdr.cpp:593 msgid "active connections (1:3)" @@ -889,7 +889,7 @@ #: wxInterface_wdr.cpp:604 msgid "active uploads" -msgstr "Upload actif" +msgstr "Envois actif" #: wxInterface_wdr.cpp:628 msgid "Download-Speed" @@ -912,7 +912,7 @@ #: wxInterface_wdr.cpp:681 msgid "Upload-Speed" -msgstr "Vitesse d'upload" +msgstr "Vitesse d'envois" #: wxInterface_wdr.cpp:757 msgid "Log" @@ -920,7 +920,7 @@ #: wxInterface_wdr.cpp:761 msgid "Debug Log" -msgstr "Journal debug" +msgstr "Journal de deboguage" #: wxInterface_wdr.cpp:784 msgid "" |
|
From: <ma...@us...> - 2003-12-30 13:33:39
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1295
Modified Files:
Images.cpp MBitmapButton.cpp MBitmapButton.h
Log Message:
Use breeding buttons on wxMac also in addition to wxMSW.
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- Images.cpp 30 Dec 2003 11:34:31 -0000 1.50
+++ Images.cpp 30 Dec 2003 13:33:36 -0000 1.51
@@ -59,7 +59,6 @@
/* TODO: Put names into temporary wxString array and use for-loop to load 'em.*/
/******************************************************************************/
void CImages::LoadImages() {
-TIMER_START(wxT("CImages::LoadImages"));
wxString path;
tool_img_width = 32;
@@ -248,7 +247,6 @@
wxT("quit"),
new wxBitmap(path+wxT("quit.png"), wxBITMAP_TYPE_ANY)
);
-TIMER_STOP();
}
/******************************************************************* GetImage */
@@ -284,7 +282,7 @@
GetImage(parent->GetName())
);
}
-#ifndef __WXMSW__
+#if !defined(__WXMSW__) && !defined(__WXMAC__)
if (parent->GetClassInfo()->IsKindOf(CLASSINFO(MBitmapButton))) {
((MBitmapButton*)parent)->GenImage();
}
@@ -449,7 +447,7 @@
} else {
wxLogDebug(wxT("Images were not found in %s."), path.c_str());
- path = wxT("../images/default");
+ path = wxT("../images/default/");
if (wxDirExists(path)) {
wxLogDebug(
wxT("Found possible images dir at %s instead."),
@@ -458,7 +456,7 @@
return path;
}
- path = wxT("../src/images/default");
+ path = wxT("../src/images/default/");
if (wxDirExists(path)) {
wxLogDebug(
wxT("Found possible images dir at %s instead."),
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MBitmapButton.cpp 27 Dec 2003 08:39:04 -0000 1.10
+++ MBitmapButton.cpp 30 Dec 2003 13:33:36 -0000 1.11
@@ -30,7 +30,11 @@
#include "MBitmapButton.h"
-#if defined(__WXMSW__) /* On wxMSW, use wxButton as base */
+/**
+ * wxMac and wxMSW buttons can have children, use wxButton as base and put
+ * a static bitmap in there.
+ */
+#if defined(__WXMSW__) || defined(__WXMAC__)
BEGIN_EVENT_TABLE(MBitmapButton, wxButton)
EVT_BUTTON(-1, MBitmapButton::OnClick)
END_EVENT_TABLE()
@@ -86,7 +90,8 @@
event.Skip();
}
-#else /* Use wxBitmapButton on other platforms */
+/* Other (GTK) buttons can't breed, thus we do it in wxBitmapButton */
+#else
IMPLEMENT_DYNAMIC_CLASS(MBitmapButton, wxBitmapButton)
Index: MBitmapButton.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MBitmapButton.h 27 Dec 2003 08:39:04 -0000 1.8
+++ MBitmapButton.h 30 Dec 2003 13:33:36 -0000 1.9
@@ -67,8 +67,11 @@
#error Need MBitmapButton constants for your port.
#endif
-
-#if defined(__WXMSW__) /* Need to use wxButton on MSW */
+/**
+ * wxMac and wxMSW buttons can have children, use wxButton as base and put
+ * a static bitmap in there.
+ */
+#if defined(__WXMSW__) || defined(__WXMAC__)
/******************************************************** class MBitmapButton */
/* This class provides functionality of having image AND text on the same */
/* button. This is done by attaching a sizer into the button, with */
@@ -87,7 +90,8 @@
void OnClick(wxCommandEvent &event); /* Skips the events */
};
-#else // !__WXMSW__ /* Use wxBitmapButton elsewhere */
+/* Other (GTK) buttons can't breed, thus we do it in wxBitmapButton */
+#else // !__WXMSW__ && !__WXMAC__
/******************************************************** class MBitmapButton */
/* This class provides functionality of having image AND text on the same */
/* button. This is done by generating a new wxBitmap image from the arguments */
|
|
From: <ma...@us...> - 2003-12-30 13:33:14
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1215
Modified Files:
MainDlg.cpp
Log Message:
Removed extranous timers
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- MainDlg.cpp 30 Dec 2003 11:34:31 -0000 1.56
+++ MainDlg.cpp 30 Dec 2003 13:33:11 -0000 1.57
@@ -304,7 +304,6 @@
/* @gen_images If true, also (re)generates images */
/******************************************************************************/
void CMainDlg::CreateMyToolBar(bool gen_images) {
-TIMER_START(wxT("CMainDlg::CreateMyToolBar"));
int tool_align; /* For storing values read from configuration */
bool show_tool; /* For storing values read from configuration */
unsigned int i; /* Loop counter */
@@ -351,12 +350,11 @@
/* There we create actual buttons */
GenerateToolBarButtons(tb, gen_images, tool_align);
- tb->Realize();
+ tb->Realize(); /* This one takes 300+ms, causing delay :( */
SetToolBar(tb);
tb->Refresh(); /* Fix for wxMac issues */
Layout(); /* Needed after deleting/creation */
UpdateToolBar();
-TIMER_STOP();
}
/***************************************************** GenerateToolBarButtons */
@@ -371,7 +369,6 @@
void CMainDlg::GenerateToolBarButtons(
MyToolBar *tb, bool gen_images, int tool_align
) {
-TIMER_START(wxT("CMainDlg::GenerateToolBarButtons"));
wxArrayString names, images; /* Names/images for multibuttons */
int ids[2]; /* Identifiers for multibutton controls */
unsigned int i; /* Loop counter */
@@ -492,7 +489,6 @@
wxT("Change GUI Settings")
);
#endif
-TIMER_STOP();
}
/************************************************************** OnCloseWindow */
@@ -1187,7 +1183,6 @@
/* through the list of pages and calling images->UpdateImages on each of them.*/
/******************************************************************************/
void CMainDlg::UpdateImages() {
-TIMER_START(wxT("CMainDlg::UpdateImages"));
img->LoadImages();
wxLogDebug(wxT("Updating all pages images..."));
for (size_t i=0;i<pages.GetCount();i++) {
@@ -1206,5 +1201,4 @@
#if defined(wxHAS_TASK_BAR_ICON) && defined(__WXMSW__)
systray->SetIcon(icon);
#endif
-TIMER_STOP();
}
|
|
From: <ma...@us...> - 2003-12-30 13:32:28
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv1103 Modified Files: defines.h Log Message: Added note about nonrecursive usage. Index: defines.h =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/defines.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- defines.h 30 Dec 2003 11:34:31 -0000 1.45 +++ defines.h 30 Dec 2003 13:32:23 -0000 1.46 @@ -60,6 +60,7 @@ * Some debugging macros for measuring time spent in function(s). Call * TIMER_START with function name (wxString) to start the timer, and then * TIMER_STOP to reset the timer and print out elapsed time. + * Note: You can't use these macros recursivly! */ #ifdef __WXDEBUG__ #define TIMER_START(func) wxStartTimer(); wxString cur_func=func |
|
From: <ma...@us...> - 2003-12-30 13:31:53
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv996
Modified Files:
GUISettingsDlg.cpp
Log Message:
Removed extranous timers
Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- GUISettingsDlg.cpp 30 Dec 2003 11:34:31 -0000 1.35
+++ GUISettingsDlg.cpp 30 Dec 2003 13:31:48 -0000 1.36
@@ -78,7 +78,6 @@
* Loads settings from config object and sets up dialog controls values.
*/
void CGUISettingsDlg::LoadSettings() {
-TIMER_START(wxT("CGUISettingsDlg::LoadSettings"));
int font, iconset, tool_align, numlang, numiconsets;
bool show_splash, prompt_exit, show_toolbar, show_menubar,
remember_last;
@@ -166,14 +165,12 @@
if (GetRememberLast()->GetValue()) {
GetStartPage()->Disable();
}
-TIMER_STOP();
}
/*
* Writes control values to config object.
*/
void CGUISettingsDlg::SaveSettings() {
-TIMER_START(wxT("CGUISettingsDlg::SaveSettings"));
int old_tool_align, tool_align, i;
wxString old_icon_set, icon_set;
bool old_show_tool, show_tool;
@@ -270,7 +267,6 @@
if (old_icon_set != icon_set) {
mainframe->UpdateImages();
}
-TIMER_STOP();
}
/*
|
|
From: <ma...@us...> - 2003-12-30 13:22:09
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv31406/src Modified Files: Makefile.am Log Message: Perhaps this works better... Index: Makefile.am =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.am 26 Dec 2003 14:25:29 -0000 1.10 +++ Makefile.am 30 Dec 2003 13:22:06 -0000 1.11 @@ -37,7 +37,7 @@ echo -e "$(WARNINGCOLOR)ok, but warnings:"; \ cat .err; \ rm -f .err; \ - echo -e "$(DEFAULTCOLOR)"; \ + echo -e "$(ACTIONCOLOR)"; \ else \ echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ fi; \ @@ -45,7 +45,7 @@ echo -e "failed:"; \ cat .err; \ rm -f .err; \ - echo -e "$(DEFAULTCOLOR)"; \ + echo -e "$(ACTIONCOLOR)"; \ false; \ fi; @@ -57,7 +57,7 @@ echo -e "$(WARNINGCOLOR)ok, but warnings:"; \ cat .err; \ rm -f .err; \ - echo -e "$(DEFAULTCOLOR)"; \ + echo -e "$(ACTIONCOLOR)"; \ else \ echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ fi; \ @@ -65,19 +65,19 @@ echo -e "failed:"; \ cat .err; \ rm -f .err; \ - echo -e "$(DEFAULTCOLOR)"; \ + echo -e "$(ACTIONCOLOR)"; \ false; \ fi; @RES@: - @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to \\c"; + @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=/local/include 2>.err; then \ if test -s .err; then \ echo -e "$(WARNINGCOLOR)ok, but warnings:"; \ cat .err; \ rm -f .err; \ - echo -e "$(DEFAULTCOLOR)"; \ + echo -e "$(ACTIONCOLOR)"; \ else \ echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ fi; \ @@ -85,7 +85,7 @@ echo -e "failed:"; \ cat .err; \ rm -f .err; \ - echo -e "$(DEFAULTCOLOR)"; \ + echo -e "$(ACTIONCOLOR)"; \ false; \ fi; @@ -95,24 +95,24 @@ @echo -e "$(ATTENTIONCOLOR)\\c" @if @CXX@ -o $(PROGRAM) $(WXINTERFACE_OBJECTS) @TRAY_OBJECTS@ @LIBS@ 2>.err; then \ echo -e "$(WELLCOLOR)ok."; \ - echo -e "$(DEFAULTCOLOR)\\c"; \ + echo -e "$(ACTIONCOLOR)\\c"; \ echo -e "$(WELLCOLOR)Successfully compiled \\c"; \ echo -e "$(WARNINGCOLOR)$(BUILD)\\c"; \ echo -e "$(OUTPUTCOLOR)$@$(WELLCOLOR) binary!"; \ - echo -e "$(DEFAULTCOLOR)Now cd to src/ dir and type $(OUTPUTCOLOR)./$@$(DEFAULTCOLOR) to start the application."; \ + echo -e "$(ACTIONCOLOR)Now cd to src/ dir and type $(OUTPUTCOLOR)./$@$(ACTIONCOLOR) to start the application."; \ else \ echo -e "failed:"; \ cat .err; \ - echo -e "$(DEFAULTCOLOR)"; \ + echo -e "$(ACTIONCOLOR)"; \ false; \ fi clean: @echo -e "Cleaning up...\\c"; @rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe @TRAY_OBJECTS@; - @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)"; + @echo -e "$(WELLCOLOR) ok.$(ACTIONCOLOR)"; distclean: @echo -e "Cleaning up...\\c"; @rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe Makefile @TRAY_OBJECTS@; - @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)"; + @echo -e "$(WELLCOLOR) ok.$(ACTIONCOLOR)"; |
|
From: <mik...@us...> - 2003-12-30 12:33:55
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv23671/src/server/http/servlet
Modified Files:
HttpServletResponse.h HttpServletResponse.cpp
Log Message:
30/12/2003 Mikael Barbeaux
* Fixed a compilation error for HttpServletResponse
Index: HttpServletResponse.h
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletResponse.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HttpServletResponse.h 30 Dec 2003 12:08:19 -0000 1.1
+++ HttpServletResponse.h 30 Dec 2003 12:33:51 -0000 1.2
@@ -21,11 +21,12 @@
#define _HTTP_SERVLET_RESPONSE_H_
#include "../HttpResponse.h"
+#include "../Writer.h"
class HttpServletResponse : public HttpResponse {
public:
- HttpServletResponse();
+ HttpServletResponse(Writer *writer);
~HttpServletResponse();
};
Index: HttpServletResponse.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletResponse.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HttpServletResponse.cpp 30 Dec 2003 12:08:19 -0000 1.1
+++ HttpServletResponse.cpp 30 Dec 2003 12:33:51 -0000 1.2
@@ -1,6 +1,8 @@
#include "HttpServletResponse.h"
-HttpServletResponse::HttpServletResponse()
+HttpServletResponse::HttpServletResponse(Writer *writer) :
+ HttpResponse(writer)
{}
+
HttpServletResponse::~HttpServletResponse()
{}
|
|
From: <mik...@us...> - 2003-12-30 12:33:55
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv23671 Modified Files: ChangeLog Log Message: 30/12/2003 Mikael Barbeaux * Fixed a compilation error for HttpServletResponse Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ChangeLog 30 Dec 2003 12:08:19 -0000 1.21 +++ ChangeLog 30 Dec 2003 12:33:52 -0000 1.22 @@ -24,6 +24,7 @@ ----------------------------------------------------------- 30/12/2003 Mikael Barbeaux + * Fixed a compilation error for HttpServletResponse * Implemented first versions of HttpServletRequest, HttpServletResponse and ServletException. * Implemented HttpServlet object. |
|
From: <mik...@us...> - 2003-12-30 12:08:23
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv19348 Modified Files: configure ChangeLog Log Message: 30/12/2003 Mikael Barbeaux * Implemented first versions of HttpServletRequest, HttpServletResponse and ServletException. * Implemented HttpServlet object. Index: configure =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/configure,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- configure 30 Dec 2003 10:45:11 -0000 1.6 +++ configure 30 Dec 2003 12:08:19 -0000 1.7 @@ -165,7 +165,7 @@ echo "CCFLAGS += -O3 -fexpensive-optimizations" >> Makefile - echo "all : clean \$(BIN) strip" >> Makefile + echo "all : clean \$(BIN) strip done" >> Makefile echo "" >> Makefile @@ -235,6 +235,10 @@ echo " \$(RM) -f .error; \\" >> Makefile echo " fi" >> Makefile echo "" >> Makefile + + echo "done:" >> Makefile + echo " @echo \"\"" >> Makefile + echo " @echo \"Compilation done. Enjoy !\"" >> Makefile echo ".PHONY : clean" >> Makefile echo "" >> Makefile Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ChangeLog 30 Dec 2003 10:45:11 -0000 1.20 +++ ChangeLog 30 Dec 2003 12:08:19 -0000 1.21 @@ -24,6 +24,9 @@ ----------------------------------------------------------- 30/12/2003 Mikael Barbeaux + * Implemented first versions of HttpServletRequest, HttpServletResponse and + ServletException. + * Implemented HttpServlet object. * Implemented a Http processor thread object. * Implemented a Http connections manager object. * Modified configure script for pthread library. |
|
From: <mik...@us...> - 2003-12-30 12:08:23
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/exceptions
In directory sc8-pr-cvs1:/tmp/cvs-serv19348/src/exceptions
Modified Files:
HttpException.cpp
Added Files:
ServletException.h ServletException.cpp
Log Message:
30/12/2003 Mikael Barbeaux
* Implemented first versions of HttpServletRequest, HttpServletResponse and
ServletException.
* Implemented HttpServlet object.
--- NEW FILE: ServletException.h ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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 _SERVLET_EXCEPTION_H_
#define _SERVLET_EXCEPTION_H_
#include "Exception.h"
enum ServletError {
BadServletRequestExcp
};
/**
* Defines a Exception for handling servlet errors.
*/
class ServletException : public Exception {
public:
/**
* Creates a Servlet exception handler.
*
* @param eCode - code of this exception
* @param message - Message to send to this exception
* @param origin - Method who throws the exception
*/
ServletException(ServletError eCode, const string& message,
const string& origin);
/**
* Returns the message sent by this Servlet exception.
*
* @return const string
*/
virtual const string getMessage() const;
};
#endif
--- NEW FILE: ServletException.cpp ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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
*/
#include "ServletException.h"
#include <sstream>
using namespace std;
/**
* Creates a ServletException object with the given error code and
* message.
*/
ServletException::ServletException(ServletError eCode, const string& message,
const string& origin) : Exception(eCode, message, origin) {
}
/**
* Returns the message sent by this exception, depending the
* error code sent.
*/
const string ServletException::getMessage() const {
ostringstream message;
// Build error message depending error code
message << "-----------------------" << endl;
message << "WARNING : ServletException thrown !!" << endl;
message << "| Type : ";
switch(code) {
case BadServletRequestExcp:
message << "BadServletRequest error";
default:
message << "UnknownError";
break;
}
message << endl << "| From : " << origin << endl;
message << "| Message : " << what() << endl;
message << "-----------------------" << endl;
return message.str();
}
Index: HttpException.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/exceptions/HttpException.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HttpException.cpp 26 Dec 2003 22:56:42 -0000 1.1
+++ HttpException.cpp 30 Dec 2003 12:08:19 -0000 1.2
@@ -40,6 +40,9 @@
message << "WARNING : HttpException thrown !!" << endl;
message << "| Type : ";
switch(code) {
+ case NotHttpRequestExcp:
+ message << "BadHttpRequest error";
+ break;
default:
message << "UnknownError";
break;
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv19348/src/server/http/servlet
Added Files:
HttpServletResponse.h HttpServletResponse.cpp
HttpServletRequest.h HttpServlet.cpp HttpServlet.h
HttpServletRequest.cpp
Log Message:
30/12/2003 Mikael Barbeaux
* Implemented first versions of HttpServletRequest, HttpServletResponse and
ServletException.
* Implemented HttpServlet object.
--- NEW FILE: HttpServletResponse.h ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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 _HTTP_SERVLET_RESPONSE_H_
#define _HTTP_SERVLET_RESPONSE_H_
#include "../HttpResponse.h"
class HttpServletResponse : public HttpResponse {
public:
HttpServletResponse();
~HttpServletResponse();
};
#endif
--- NEW FILE: HttpServletResponse.cpp ---
#include "HttpServletResponse.h"
HttpServletResponse::HttpServletResponse()
{}
HttpServletResponse::~HttpServletResponse()
{}
--- NEW FILE: HttpServletRequest.h ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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 _HTTP_SERVLET_REQUEST_H_
#define _HTTP_SERVLET_REQUEST_H_
#include "../HttpRequest.h"
class HttpServletRequest : public HttpRequest {
public:
HttpServletRequest();
~HttpServletRequest();
};
#endif
--- NEW FILE: HttpServlet.cpp ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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
*/
#include "HttpServlet.h"
#include "../HttpConstants.h"
#include "../TextWriter.h"
/**
* Constructor for HttpServlet.
* Does nothing.
*/
HttpServlet::HttpServlet() {
}
/**
* Destructor for HttpServlet.
* Does nothing.
*/
HttpServlet::~HttpServlet() {
}
/**
* Inits the servlet.
* Put here the code you want the servlet to execute at
* loading.
*/
void HttpServlet::init() throw (ServletException) {
}
/**
* Destroys the servlet.
* Put here the code you want the servlet to execute at
* unloading.
*/
void HttpServlet::destroy() throw (ServletException) {
}
/**
* Processes the servlet execution.
* This method is typically used to dispatch requests
* to the doXXX methods, but you can override this method
* if you want the same process to be executed for each
* method.
*/
void HttpServlet::service(HttpServletRequest request,
HttpServletResponse response)
throw (ServletException, WriterException) {
HttpMethod method = request.getMethod();
if(method == GET)
doGet(request, response);
else if(method == POST)
doPost(request, response);
else if(method == HEAD)
doHead(request, response);
else throw ServletException(BadServletRequestExcp,
"The received request isn't Servlet compliant.",
"HttpServlet::service");
}
/**
* Processes a GET http method.
* This method is called by the servlet service() method
* to process the execution of a GET http method.
*/
void HttpServlet::doGet(HttpServletRequest request,
HttpServletResponse response)
throw (ServletException, WriterException) {
// Create a simple response
TextWriter *writer = (TextWriter*) response.getWriter();
*writer << "<html><body>GET method received</body></html>";
writer->close();
}
/**
* Processes a POST http method.
* This method is called by the servlet service() method
* to process the execution of a POST http method.
*/
void HttpServlet::doPost(HttpServletRequest request,
HttpServletResponse response)
throw (ServletException, WriterException) {
// Create a simple response
TextWriter *writer = (TextWriter*) response.getWriter();
*writer << "<html><body>POST method received</body></html>";
writer->close();
}
/**
* Processes a HEAD http method.
* This method is called by the servlet service() method
* to process the execution of a HEAD http method.
*/
void HttpServlet::doHead(HttpServletRequest request,
HttpServletResponse response)
throw (ServletException, WriterException) {
// Create a simple response
TextWriter *writer = (TextWriter*) response.getWriter();
*writer << "<html><body>HEAD method received</body></html>";
writer->close();
}
--- NEW FILE: HttpServlet.h ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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 _HTTP_SERVLET_H_
#define _HTTP_SERVLET_H_
#include "HttpServletRequest.h"
#include "HttpServletResponse.h"
#include "../../../exceptions/ServletException.h"
#include "../../../exceptions/WriterException.h"
/**
* Defines an abstract Http servlet.
* This servlet can respond to GET, HEAD and POST http methods,
* and needs to be extended in another class.
*/
class HttpServlet{
public:
/**
* Constructor for HttpServlet.
* Does nothing.
*/
HttpServlet();
/**
* Destructor for HttpServlet.
* Does nothing.
*/
virtual ~HttpServlet();
/**
* Inits the servlet.
* Put here the code you want the servlet to execute at
* loading.
*/
virtual void init() throw (ServletException);
/**
* Destroys the servlet.
* Put here the code you want the servlet to execute at
* unloading.
*/
virtual void destroy() throw (ServletException);
/**
* Processes the servlet execution.
* This method is typically used to dispatch requests
* to the doXXX methods, but you can override this method
* if you want the same process to be executed for each
* method.
*
* @param request - The request received
* @param response - The response to build
*/
virtual void service(HttpServletRequest request,
HttpServletResponse response)
throw (ServletException, WriterException);
/**
* Processes a GET http method.
* This method is called by the servlet service() method
* to process the execution of a GET http method.
*
* @param request - The request received
* @param response - The response to build
*/
virtual void doGet(HttpServletRequest request,
HttpServletResponse response)
throw (ServletException, WriterException);
/**
* Processes a POST http method.
* This method is called by the servlet service() method
* to process the execution of a POST http method.
*
* @param request - The request received
* @param response - The response to build
*/
virtual void doPost(HttpServletRequest request,
HttpServletResponse response)
throw (ServletException, WriterException);
/**
* Processes a HEAD http method.
* This method is called by the servlet service() method
* to process the execution of a HEAD http method.
*
* @param request - The request received
* @param response - The response to build
*/
virtual void doHead(HttpServletRequest request,
HttpServletResponse response)
throw (ServletException, WriterException);
};
#endif
--- NEW FILE: HttpServletRequest.cpp ---
#include "HttpServletRequest.h"
HttpServletRequest::HttpServletRequest()
{}
HttpServletRequest::~HttpServletRequest()
{}
|
|
From: <mik...@us...> - 2003-12-30 12:08:14
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet In directory sc8-pr-cvs1:/tmp/cvs-serv19332/src/server/http/servlet Log Message: Directory /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet added to the repository |
|
From: <ma...@us...> - 2003-12-30 11:34:35
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14712
Modified Files:
GUISettingsDlg.cpp Images.cpp MainDlg.cpp defines.h
Log Message:
Debugging macro to measure time spent in functions.
Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- GUISettingsDlg.cpp 29 Dec 2003 08:50:50 -0000 1.34
+++ GUISettingsDlg.cpp 30 Dec 2003 11:34:31 -0000 1.35
@@ -78,6 +78,7 @@
* Loads settings from config object and sets up dialog controls values.
*/
void CGUISettingsDlg::LoadSettings() {
+TIMER_START(wxT("CGUISettingsDlg::LoadSettings"));
int font, iconset, tool_align, numlang, numiconsets;
bool show_splash, prompt_exit, show_toolbar, show_menubar,
remember_last;
@@ -165,12 +166,14 @@
if (GetRememberLast()->GetValue()) {
GetStartPage()->Disable();
}
+TIMER_STOP();
}
/*
* Writes control values to config object.
*/
void CGUISettingsDlg::SaveSettings() {
+TIMER_START(wxT("CGUISettingsDlg::SaveSettings"));
int old_tool_align, tool_align, i;
wxString old_icon_set, icon_set;
bool old_show_tool, show_tool;
@@ -267,6 +270,7 @@
if (old_icon_set != icon_set) {
mainframe->UpdateImages();
}
+TIMER_STOP();
}
/*
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Images.cpp 29 Dec 2003 09:12:33 -0000 1.49
+++ Images.cpp 30 Dec 2003 11:34:31 -0000 1.50
@@ -59,6 +59,7 @@
/* TODO: Put names into temporary wxString array and use for-loop to load 'em.*/
/******************************************************************************/
void CImages::LoadImages() {
+TIMER_START(wxT("CImages::LoadImages"));
wxString path;
tool_img_width = 32;
@@ -247,6 +248,7 @@
wxT("quit"),
new wxBitmap(path+wxT("quit.png"), wxBITMAP_TYPE_ANY)
);
+TIMER_STOP();
}
/******************************************************************* GetImage */
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- MainDlg.cpp 30 Dec 2003 10:28:39 -0000 1.55
+++ MainDlg.cpp 30 Dec 2003 11:34:31 -0000 1.56
@@ -304,6 +304,7 @@
/* @gen_images If true, also (re)generates images */
/******************************************************************************/
void CMainDlg::CreateMyToolBar(bool gen_images) {
+TIMER_START(wxT("CMainDlg::CreateMyToolBar"));
int tool_align; /* For storing values read from configuration */
bool show_tool; /* For storing values read from configuration */
unsigned int i; /* Loop counter */
@@ -355,6 +356,7 @@
tb->Refresh(); /* Fix for wxMac issues */
Layout(); /* Needed after deleting/creation */
UpdateToolBar();
+TIMER_STOP();
}
/***************************************************** GenerateToolBarButtons */
@@ -369,6 +371,7 @@
void CMainDlg::GenerateToolBarButtons(
MyToolBar *tb, bool gen_images, int tool_align
) {
+TIMER_START(wxT("CMainDlg::GenerateToolBarButtons"));
wxArrayString names, images; /* Names/images for multibuttons */
int ids[2]; /* Identifiers for multibutton controls */
unsigned int i; /* Loop counter */
@@ -489,6 +492,7 @@
wxT("Change GUI Settings")
);
#endif
+TIMER_STOP();
}
/************************************************************** OnCloseWindow */
@@ -1183,19 +1187,13 @@
/* through the list of pages and calling images->UpdateImages on each of them.*/
/******************************************************************************/
void CMainDlg::UpdateImages() {
+TIMER_START(wxT("CMainDlg::UpdateImages"));
img->LoadImages();
wxLogDebug(wxT("Updating all pages images..."));
for (size_t i=0;i<pages.GetCount();i++) {
if (pages.IsEmpty()) {
break;
}
- wxLogDebug(
- wxT("Count = %d Current = %d"), pages.GetCount(), i
- );
- wxLogDebug(
- wxT("Updating `%s` page images."),
- pages[i]->short_title.c_str()
- );
img->UpdateImages(pages[i]->content);
}
CreateMyToolBar(true);
@@ -1208,5 +1206,5 @@
#if defined(wxHAS_TASK_BAR_ICON) && defined(__WXMSW__)
systray->SetIcon(icon);
#endif
-
+TIMER_STOP();
}
Index: defines.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/defines.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- defines.h 22 Dec 2003 05:04:15 -0000 1.44
+++ defines.h 30 Dec 2003 11:34:31 -0000 1.45
@@ -56,6 +56,23 @@
#define border_style 0
#endif
+/**
+ * Some debugging macros for measuring time spent in function(s). Call
+ * TIMER_START with function name (wxString) to start the timer, and then
+ * TIMER_STOP to reset the timer and print out elapsed time.
+ */
+#ifdef __WXDEBUG__
+ #define TIMER_START(func) wxStartTimer(); wxString cur_func=func
+ #define TIMER_STOP() \
+ wxLogDebug( \
+ wxT("Time spent in `%s`: %dms"), \
+ cur_func.c_str(), wxGetElapsedTime() \
+ )
+#else
+ #define TIMER_START(func)
+ #define TIMER_STOP()
+#endif
+
extern class CServerWnd *serverwnd;
extern class CSearchWnd *searchwnd;
extern class CTransferWnd *transferwnd;
|
|
From: <mik...@us...> - 2003-12-30 10:45:16
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv7723 Modified Files: configure ChangeLog INSTALL Log Message: 30/12/2003 Mikael Barbeaux * Implemented a Http processor thread object. * Implemented a Http connections manager object. * Modified configure script for pthread library. Index: configure =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- configure 30 Dec 2003 09:19:29 -0000 1.5 +++ configure 30 Dec 2003 10:45:11 -0000 1.6 @@ -59,6 +59,8 @@ if test $OS_TEST = "MINGW" then check_lib winsock libws2_32.a + else + check_lib pthread libpthread.a fi } Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChangeLog 30 Dec 2003 09:19:29 -0000 1.19 +++ ChangeLog 30 Dec 2003 10:45:11 -0000 1.20 @@ -24,6 +24,9 @@ ----------------------------------------------------------- 30/12/2003 Mikael Barbeaux + * Implemented a Http processor thread object. + * Implemented a Http connections manager object. + * Modified configure script for pthread library. * Implemented a Http connection manager. 29/12/2003 Mikael Barbeaux Index: INSTALL =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/INSTALL,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- INSTALL 30 Dec 2003 09:19:29 -0000 1.4 +++ INSTALL 30 Dec 2003 10:45:11 -0000 1.5 @@ -7,10 +7,24 @@ and Cygwin ) and Linux, but should also work on FreeBSD and MacOS X ( Cocoa ). -1) Compiling from sources +1) Starting from binaries + + Download the lastest binary package for your OS ( typically, + Windows, Linux, FreeBSD and MacOS X binaries are provided ). + Then gi into the directory where you downloaded ( and unzipped ) + the binary package and type the following : + + # if you are on Linux, FreeBSD or MacOS X : + $> chmod 755 ui-web + $> ./ui-web + # if you are on Windows : + $> ui-web.exe + - Download the lastest sources package ( or retrieve sources from - CVS ). Then, go into the directory where your downloaded ( and +2) Compiling from sources + + Download the lastest sources package ( or retrieve sources from + CVS ). Then, go into the directory where you downloaded ( and unzipped ) the sources and type the following : $> chmod 755 configure @@ -45,6 +59,18 @@ GCC : http://gcc.gnu.org/ MinGW, mSYS & mSYS DTK : http://www.mingw.org Cygwin : http://www.cygwin.com + + The configure script will check : + + * G++ compiler : g++ + * Make command : make (Windows, Linux, MacOSX) - gmake (FreeBSD) + * AR command : ar + * RM command : rm + * STRIP command : strip + * UNAME command : uname + * stdc++ library : libstdc++.a + * winsock library : libws2_32.a (Windows MinGW only) + * pthread library : libpthread.a (Linux, MacOSX, FreeBSD only) MikaelB |
|
From: <mik...@us...> - 2003-12-30 10:45:16
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv7723/src/server/http/manager
Modified Files:
HttpManager.h
Added Files:
HttpProcessor.cpp HttpProcessor.h
Log Message:
30/12/2003 Mikael Barbeaux
* Implemented a Http processor thread object.
* Implemented a Http connections manager object.
* Modified configure script for pthread library.
--- NEW FILE: HttpProcessor.cpp ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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
*/
#include "HttpProcessor.h"
#include "HttpManager.h"
#include "../TextWriter.h"
/**
* Creates a HttpProcessor with the given id.
*/
HttpProcessor::HttpProcessor(int id_proc) : Thread() {
id =id_proc;
}
/**
* Destructor for HttpProcessor.
* Does nothing.
*/
HttpProcessor::~HttpProcessor() throw (ThreadException) {
wait();
}
/**
* Runs the processor.
*/
void HttpProcessor::run() throw (ThreadException) {
while(true) {
// Wait for a job into the manager.
theManager->conn_notEmpty->wait();
// Set the cancellation point
setCancelPoint();
// Retrieve the connection
HttpSocket *socket = theManager->getNextConnection();
// No connection ?
if(socket == 0)
continue;
// Processes the connection.
HttpRequest request;
socket->receiveHttpRequest(request);
TextWriter *writer = new TextWriter;
*writer << "<html><body>Your request has been ";
*writer << "processed by HttpProcessor nb ";
*writer << (int)id;
*writer << "</body></html>\n";
writer->close();
HttpResponse resp(writer);
resp.setContentType("text/html");
// send response
socket->sendHttpResponse(resp);
socket->close();
delete socket;
}
}
--- NEW FILE: HttpProcessor.h ---
/*
* This file is part of webInterface.
* Copyright (C) 2003 Mikael Barbeaux <mik...@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 _HTTP_PROCESSOR_H_
#define _HTTP_PROCESSOR_H_
#include "../../../thread/Thread.h"
#include "../../../exceptions/ThreadException.h"
/**
* Defines a processor for HttpConnection.
* It is a thread than process the request and
* build the response to be sent to the client.
*/
class HttpProcessor : public Thread {
private:
// identifiant for this thread
unsigned int id;
public:
/**
* Creates a HttpProcessor object with the given
* identifiant.
*
* @param id_proc
*/
HttpProcessor(int id_proc);
/**
* Destructor for HttpProcessor
*/
~HttpProcessor() throw (ThreadException);
/**
* Runs the processor.
*/
virtual void run() throw (ThreadException);
};
#endif
Index: HttpManager.h
===================================================================
RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/HttpManager.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HttpManager.h 30 Dec 2003 09:19:29 -0000 1.1
+++ HttpManager.h 30 Dec 2003 10:45:10 -0000 1.2
@@ -23,9 +23,12 @@
#include "../HttpSocket.h"
#include "../../../thread/Semaphore.h"
#include "../../../thread/Mutex.h"
+#include "HttpProcessor.h"
#include <deque>
using namespace std;
+#define theManager HttpManager::getInstance()
+
/**
* Defines a manager for HTTP connections.
* Formely, it's a thread pool where connections
@@ -33,6 +36,9 @@
*/
class HttpManager{
+ // processors are friends :)
+ friend class HttpProcessor;
+
private:
// pool of connections
@@ -81,6 +87,13 @@
* @return HttpManager*
*/
static HttpManager *getInstance();
+
+ /**
+ * Releases the processors.
+ */
+ void release() {
+ conn_notEmpty->sendBroadcastSignal();
+ }
};
#endif
|
