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-08 01:39:05
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3164
Modified Files:
wxInterface.h MainDlg.h
Log Message:
Fixed DECLARE_APP
Index: wxInterface.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wxInterface.h 8 Dec 2003 01:08:10 -0000 1.2
+++ wxInterface.h 8 Dec 2003 01:39:02 -0000 1.3
@@ -31,11 +31,8 @@
// Include private headers
#include "wxInterface_wdr.h"
-#include "wxInterface.h"
#include "defines.h"
-DECLARE_APP(wxInterface)
-
/* Splashscreen class - only needed for OnCloseWindow event handling */
class CSplash: public wxSplashScreen {
public:
@@ -69,5 +66,7 @@
int GetLangType(const wxString lang);
void OnCloseSplash(wxCloseEvent &event);
};
+
+DECLARE_APP(wxInterface)
#endif
Index: MainDlg.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MainDlg.h 30 Nov 2003 23:07:27 -0000 1.8
+++ MainDlg.h 8 Dec 2003 01:39:02 -0000 1.9
@@ -30,6 +30,7 @@
#endif
/* Include local headers */
+#include "wxInterface.h"
#include "wxInterface_wdr.h"
#include "defines.h"
#include "ServerWnd.h"
|
|
From: <ma...@us...> - 2003-12-08 01:11:18
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv31887 Modified Files: Changelog Log Message: Frame size/pos fix and splash fix Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- Changelog 6 Dec 2003 00:19:04 -0000 1.103 +++ Changelog 8 Dec 2003 01:11:15 -0000 1.104 @@ -18,8 +18,13 @@ # in parenthesis. # # # # ALWAYS keep line lenghts UNDER/AT 80 characters. # -# ALL ChangeLog entries end with a dot. +# ALL ChangeLog entries end with a dot. # ############################################################################### + +2003/12/08 Alo Sarv + * Fixed frame size/position saving. + * Fixed wierd behaviour reported by Avi if menubar/preferences are + accessed before splashscreen disappears. 2003/12/06 Alo Sarv * Sidebar memory and speed optimizations. |
|
From: <ma...@us...> - 2003-12-08 01:08:13
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31517
Modified Files:
MainDlg.cpp wxInterface.cpp wxInterface.h
Log Message:
Fixes wierd splashscreen behaviour if menubar/prefs are accessed before it disappears.
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- MainDlg.cpp 7 Dec 2003 21:59:58 -0000 1.22
+++ MainDlg.cpp 8 Dec 2003 01:08:10 -0000 1.23
@@ -671,11 +671,18 @@
/**
* Since EVT_TOOL and EVT_MENU are synonyms, we can't use event table to
* call the right functions for toolbar or menubar events. Instead, we use
- * this helper function to call them both. Both methods then check if the
- * event belongs to them, and abort if not, resulting the event being
- * passed to other one.
+ * this helper function to call them both and then update both as neccesery.
*/
void CMainDlg::MenuOrToolEvent(wxCommandEvent &event) {
+ /**
+ * If we still have active splash at this point, destroy it to avoid
+ * wierd behaviour.
+ */
+ if (wxGetApp().splash_active) {
+ delete wxGetApp().splash;
+ wxGetApp().splash_active = false;
+ }
+
if (event.GetEventType() == wxEVT_COMMAND_TOOL_CLICKED) {
ToolEvent(event);
MenuEvent(event);
Index: wxInterface.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wxInterface.cpp 30 Nov 2003 18:56:45 -0000 1.8
+++ wxInterface.cpp 8 Dec 2003 01:08:10 -0000 1.9
@@ -61,16 +61,18 @@
m_config->Read(wxT("/General/Show splashscreen"), &show_splash);
/* Display the splashscreen if allowed */
+ splash_active = false;
if (show_splash) {
- splash = new wxSplashScreen(
- img->GetImage(wxT("splashscreen")),
- wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
+ splash = new CSplash(
+ img->GetImage(wxT("splashscreen")),
+ wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
2000, NULL, -1
);
+ splash_active = true;
} // No need to delete splash - it will be deleted by wx
Localize();
-
+
/* Display the main dialog */
mainframe = new CMainDlg(
NULL, -1, APPVER_LONG, wxDefaultPosition,
@@ -269,4 +271,31 @@
} else {
return wxLANGUAGE_DEFAULT;
}
+}
+
+/***
+ * Splashscreen class
+ ***/
+/* Event table */
+BEGIN_EVENT_TABLE(CSplash, wxSplashScreen)
+ EVT_CLOSE(CSplash::OnCloseWindow)
+END_EVENT_TABLE()
+
+/* Constructor */
+CSplash::CSplash(
+ const wxBitmap &bitmap, long splashStyle, int milliseconds,
+ wxWindow *parent, wxWindowID id, const wxPoint &pos,
+ const wxSize &size, long style
+) : wxSplashScreen(
+ bitmap, splashStyle, milliseconds, parent, id, pos, size, style
+) {
+}
+
+/**
+ * Close splash window event handler. Set wxInterface splash_active variable
+ * to false.
+ */
+void CSplash::OnCloseWindow(wxCloseEvent &event) {
+ wxGetApp().splash_active = false;
+ event.Skip();
}
Index: wxInterface.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wxInterface.h 20 Nov 2003 01:27:26 -0000 1.1
+++ wxInterface.h 8 Dec 2003 01:08:10 -0000 1.2
@@ -34,22 +34,40 @@
#include "wxInterface.h"
#include "defines.h"
-/*
- * Base class for wxInterface. Everything else starts from here.
- */
+DECLARE_APP(wxInterface)
+
+/* Splashscreen class - only needed for OnCloseWindow event handling */
+class CSplash: public wxSplashScreen {
+public:
+ CSplash(
+ const wxBitmap &bitmap, long splashStyle, int milliseconds,
+ wxWindow *parent, wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition,
+ const wxSize &size = wxDefaultSize,
+ long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP
+ );
+private:
+ DECLARE_EVENT_TABLE()
+ void OnCloseWindow(wxCloseEvent &event);
+};
+
+/* Base class for wxInterface. Everything else starts from here. */
class wxInterface: public wxApp {
public:
- virtual bool OnInit();
- virtual int OnExit();
+ virtual bool OnInit(); // Application initialization
+ virtual int OnExit(); // Application shutdown
+ CSplash *splash; // Pointer to splash screen
+ bool splash_active; // For detecting if splash is active
protected:
wxLocale m_locale;
private:
- wxSplashScreen *splash;
void Localize();
void CheckAndAddSupportedLangs();
void CheckAndAddSupportedIconSets();
int GetLangType(const wxString lang);
+ void OnCloseSplash(wxCloseEvent &event);
};
+
#endif
|
|
From: <ma...@us...> - 2003-12-07 22:00:01
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30802
Modified Files:
MainDlg.cpp
Log Message:
Fixed frame size/pos saving
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- MainDlg.cpp 5 Dec 2003 22:20:49 -0000 1.21
+++ MainDlg.cpp 7 Dec 2003 21:59:58 -0000 1.22
@@ -86,8 +86,8 @@
* Read position and size settings, and apply them before
* loading dialog pages.
*/
- m_config->Read(wxT("Frame/Height"), &height, 600);
- m_config->Read(wxT("Frame/Width"), &width, 800);
+ m_config->Read(wxT("/Frame/Height"), &height, 600);
+ m_config->Read(wxT("/Frame/Width"), &width, 800);
SetSize(width, height);
/**
@@ -96,8 +96,8 @@
* caused problems on OS X, better to center the whole thing and not
* worry about it any more.
*/
- bool isreadx = m_config->Read(wxT("Frame/PosX"), &posx, 20);
- bool isready = m_config->Read(wxT("Frame/PosY"), &posy, 20);
+ bool isreadx = m_config->Read(wxT("/Frame/PosX"), &posx, 20);
+ bool isready = m_config->Read(wxT("/Frame/PosY"), &posy, 20);
if (!isreadx && !isready) {
Center();
} else {
|
|
From: <ma...@us...> - 2003-12-06 00:45:39
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8778
Modified Files:
GUISettingsDlg.cpp ServerWnd.cpp ServerWnd.h
Log Message:
Using textbutton instead of bitmapbutton as sidebar toggler to get nicer look under XP
Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- GUISettingsDlg.cpp 30 Nov 2003 23:07:27 -0000 1.25
+++ GUISettingsDlg.cpp 6 Dec 2003 00:45:36 -0000 1.26
@@ -248,7 +248,6 @@
mainframe->CreateMyToolBar();
/* Update server page logbook */
serverwnd->SetLogBookImages();
- serverwnd->SetToggleSideBarImage();
/* Update statistics tree */
statisticswnd->GetTree()->GetTreeImages();
statisticswnd->GetTree()->GenerateTree();
Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ServerWnd.cpp 6 Dec 2003 00:18:37 -0000 1.44
+++ ServerWnd.cpp 6 Dec 2003 00:45:36 -0000 1.45
@@ -72,7 +72,6 @@
/* Set the images of static bitmaps on this page. */
GetSSBitmapProvider()->SetBitmap(img->GetImage(wxT("provider")));
- SetToggleSideBarImage();
SetLogBookImages();
}
@@ -95,31 +94,6 @@
m_config->Write(wxT("SideBar"), sidebar->IsShown());
}
-void CServerWnd::SetToggleSideBarImage() {
- if (sidebar->IsShown()) {
- GetBtnToggleSidebar()->SetBitmapLabel(
- img->GetImage(wxT("leftarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapSelected(
- img->GetImage(wxT("leftarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapFocus(
- img->GetImage(wxT("leftarrow"))
- );
-
- } else {
- GetBtnToggleSidebar()->SetBitmapLabel(
- img->GetImage(wxT("rightarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapSelected(
- img->GetImage(wxT("rightarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapFocus(
- img->GetImage(wxT("rightarrow"))
- );
- }
-}
-
/* Set log notebook page images */
void CServerWnd::SetLogBookImages() {
m_imagelist = new wxImageList(16, 16);
@@ -251,14 +225,12 @@
logoptions->SetContent(LogOptionsPanel(logoptions, false, false));
sbmain->Add(logoptions, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 0);
- /**
- * Bitmap button between sidebar and splitter
- * window to toggle sidebar on/off
- */
- wxBitmapButton *toggler = new wxBitmapButton(
- this, ID_BTN_TOGGLE_SIDEBAR, img->GetImage(wxT("leftarrow")),
- wxDefaultPosition, wxSize(10,100)
+ /* Button to toggle sidebar on/off */
+ wxButton *toggler = new wxButton(
+ this, ID_BTN_TOGGLE_SIDEBAR, wxT("<"),
+ wxDefaultPosition, wxSize(12, 100)
);
+ toggler->SetFont(wxFont(14, wxNORMAL, wxNORMAL, wxBOLD));
mainsizer->Add(toggler, 0, wxALIGN_CENTER, 5 );
/* Read splitter positions from configuration object. */
@@ -308,15 +280,7 @@
mainsizer->RemoveGrowableCol(2);
mainsizer->AddGrowableCol(1);
sidebar->Hide();
- GetBtnToggleSidebar()->SetBitmapLabel(
- img->GetImage(wxT("rightarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapSelected(
- img->GetImage(wxT("rightarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapFocus(
- img->GetImage(wxT("rightarrow"))
- );
+ GetBtnToggleSidebar()->SetLabel(wxT(">"));
} else {
mainsizer->Prepend(
sidebar, 0, wxGROW|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5
@@ -324,15 +288,7 @@
mainsizer->RemoveGrowableCol(1);
mainsizer->AddGrowableCol(2);
sidebar->Show();
- GetBtnToggleSidebar()->SetBitmapLabel(
- img->GetImage(wxT("leftarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapSelected(
- img->GetImage(wxT("leftarrow"))
- );
- GetBtnToggleSidebar()->SetBitmapFocus(
- img->GetImage(wxT("leftarrow"))
- );
+ GetBtnToggleSidebar()->SetLabel(wxT("<"));
}
Layout();
Refresh();
Index: ServerWnd.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ServerWnd.h 27 Nov 2003 08:23:12 -0000 1.30
+++ ServerWnd.h 6 Dec 2003 00:45:36 -0000 1.31
@@ -57,7 +57,6 @@
void AddLogLine(wxString text, bool status = false);
void AddDebugLine(wxString text, bool status = false);
void AddServerLogLine(wxString text, bool status = false);
- void SetToggleSideBarImage();
void SetLogBookImages();
private:
@@ -124,8 +123,8 @@
return (wxSplitterWindow*)
FindWindow(ID_SERVER_SPLITTER_HORIZONTAL);
}
- wxBitmapButton* GetBtnToggleSidebar() {
- return (wxBitmapButton*) FindWindow(ID_BTN_TOGGLE_SIDEBAR);
+ wxButton* GetBtnToggleSidebar() {
+ return (wxButton*) FindWindow(ID_BTN_TOGGLE_SIDEBAR);
}
wxStaticBitmap* GetSSBitmapProvider() {
return (wxStaticBitmap*) FindWindow(ID_SS_SERVER_IMG);
|
|
From: <ma...@us...> - 2003-12-06 00:19:07
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv5015 Modified Files: Changelog Log Message: 2 updates Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- Changelog 30 Nov 2003 18:57:47 -0000 1.102 +++ Changelog 6 Dec 2003 00:19:04 -0000 1.103 @@ -21,6 +21,15 @@ # ALL ChangeLog entries end with a dot. ############################################################################### +2003/12/06 Alo Sarv + * Sidebar memory and speed optimizations. + +2003/12/05 Alo Sarv + * Hide main frame before shutdown (workaround for shutdown delay + reported by Avi). + +Version 0.1.9 +------------- 2003/11/30 Alo Sarv * Spanish translation by Chema Rodriguez (thorero). |
|
From: <ma...@us...> - 2003-12-06 00:18:43
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4913
Modified Files:
SBPanel.cpp SBPanel.h ServerWnd.cpp
Log Message:
Sidebar speed/memory optimizations
Index: SBPanel.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SBPanel.cpp 21 Nov 2003 02:55:55 -0000 1.3
+++ SBPanel.cpp 6 Dec 2003 00:18:37 -0000 1.4
@@ -45,9 +45,9 @@
wxWindow *parent, wxWindowID id, const
wxString &title, const wxString &name
) : wxPanel(
- parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, name)
+ parent, id, wxDefaultPosition, wxDefaultSize,
+ wxTAB_TRAVERSAL, name)
{
-
wxStaticBox *box = new wxStaticBox(this, -1, wxT(""));
mainsizer = new wxStaticBoxSizer(box, wxVERTICAL);
@@ -55,19 +55,24 @@
this, -1, title, wxDefaultPosition, wxDefaultSize, 0
);
headerbtn->SetFont( wxFont( 12, wxROMAN, wxNORMAL, wxBOLD ) );
- mainsizer->Add( headerbtn, 0, wxGROW, 5 );
+ mainsizer->Add( headerbtn, 0, wxGROW|wxADJUST_MINSIZE, 5 );
SetAutoLayout(true);
SetSizer(mainsizer);
mainsizer->Fit(this);
mainsizer->SetSizeHints(this);
-
+
+ shown = false;
}
+/**
+ * Destructor. Save content displayment bool into config object under
+ * /ParentName/ThisName
+ */
CSBPanel::~CSBPanel() {
m_config->Write(
wxT("/")+GetParent()->GetName()+wxT("/")+GetName(),
- content->IsShown()
+ shown
);
}
@@ -78,56 +83,50 @@
* Layout() as neccesery.
*/
void CSBPanel::Toggle(wxCommandEvent &event) {
-
if (event.GetId() != headerbtn->GetId()) {
event.Skip();
return;
}
- if (content->IsShown()) {
+ if (shown) {
mainsizer->Hide(content);
- content->Hide();
+ shown = false;
} else {
mainsizer->Show(content);
- content->Show();
+ shown = true;
}
- mainsizer->SetMinSize(GetParent()->GetSize().GetWidth()-5, -1);
- mainsizer->Fit(this);
-
- GetParent()->GetSizer()->Layout();
- ::wxGetTopLevelParent(this)->Layout();
- GetParent()->Refresh();
+ GetParent()->Layout();
}
/**
- * This method adds contents (a panel) into the section. We store
- * the pointer to the content panel locally for easier access.
+ * This method adds contents (a sizer) into the section. We store
+ * the pointer to the content sizer locally for easier access.
* If there is any existing content in CSBPAnel, it is removed.
* And last, read from config under section /ParentWindowName/SectionName
* if the new section should be shown or not (default: true)
*/
-void CSBPanel::SetContent(wxPanel *data) {
- bool shown;
+void CSBPanel::SetContent(wxSizer *data) {
+ bool tmp;
- if (content) {
+ if (shown) {
mainsizer->Remove(content);
}
content = data;
mainsizer->Add(content, 0, wxGROW|wxALL, 5);
- mainsizer->Fit(this);
mainsizer->Layout();
+ shown = true;
m_config->Read(
- wxT("/")+GetParent()->GetName()+wxT("/")+GetName(), &shown, true
+ wxT("/")+GetParent()->GetName()+wxT("/")+GetName(), &tmp, true
);
- if (!shown) {
- /**
- * We create an empty event with headerbtn ID and send it to
- * Toggle, since Toggle doesn't accept events with any other IDs
- */
+ /**
+ * If config instructs us to NOT show the contents, call Toggle()
+ * method with nullevent .
+ */
+ if (!tmp) {
wxCommandEvent nullevent;
nullevent.SetId(headerbtn->GetId());
Toggle(nullevent);
Index: SBPanel.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SBPanel.h 20 Nov 2003 01:27:26 -0000 1.2
+++ SBPanel.h 6 Dec 2003 00:18:37 -0000 1.3
@@ -49,13 +49,13 @@
);
virtual ~CSBPanel();
- void SetContent(wxPanel *data);
+ void SetContent(wxSizer *data);
void Toggle(wxCommandEvent &event);
private:
DECLARE_EVENT_TABLE();
wxStaticBoxSizer *mainsizer;
- wxPanel *content;
+ wxSizer *content;
wxButton *headerbtn;
bool shown;
};
Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ServerWnd.cpp 30 Nov 2003 23:07:27 -0000 1.43
+++ ServerWnd.cpp 6 Dec 2003 00:18:37 -0000 1.44
@@ -212,16 +212,13 @@
/**
* Create new CSBPanel object which provides framework for
- * opening/closing the section. Then create a new panel to store
- * the contents of the section, and attach it to CSBPanel.
- * Finally, append the CSBPanel to our sidebar panel.
+ * opening/closing the section, set its content and add to
+ * sidebar.
*/
CSBPanel *addserver = new CSBPanel(
sidebar, -1, _("Add new server"), wxT("SideBar_AddServer")
);
- wxPanel *addserver_cnt = new wxPanel(addserver, -1);
- AddServerPanel(addserver_cnt);
- addserver->SetContent(addserver_cnt);
+ addserver->SetContent(AddServerPanel(addserver, false, false));
/* Need to use border 0 on wxMSW to have correct layout */
#ifdef __WXMSW__
@@ -233,33 +230,25 @@
CSBPanel *updatelist = new CSBPanel(
sidebar, -1, _("Update from URL"), wxT("SideBar_UpdateServer")
);
- wxPanel *updatelist_cnt = new wxPanel(updatelist, -1);
- UpdatePanel(updatelist_cnt);
- updatelist->SetContent(updatelist_cnt);
+ updatelist->SetContent(UpdatePanel(updatelist, false, false));
sbmain->Add(updatelist, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 0);
CSBPanel *serversettings = new CSBPanel(
sidebar, -1, _("Server settings"), wxT("SideBar_ServerSettings")
);
- wxPanel *serversettings_cnt = new wxPanel(serversettings, -1);
- SettingsPanel(serversettings_cnt);
- serversettings->SetContent(serversettings_cnt);
+ serversettings->SetContent(SettingsPanel(serversettings, false, false));
sbmain->Add(serversettings, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 0);
CSBPanel *portsettings = new CSBPanel(
sidebar, -1, _("Port settings"), wxT("SideBar_PortSettings")
);
- wxPanel *portsettings_cnt = new wxPanel(portsettings, -1);
- PortSettingsPanel(portsettings_cnt);
- portsettings->SetContent(portsettings_cnt);
+ portsettings->SetContent(PortSettingsPanel(portsettings, false, false));
sbmain->Add(portsettings, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 0);
CSBPanel *logoptions = new CSBPanel(
sidebar, -1, _("Log options"), wxT("SideBar_LoggingOptions")
);
- wxPanel *logoptions_cnt = new wxPanel(logoptions, -1);
- LogOptionsPanel(logoptions_cnt);
- logoptions->SetContent(logoptions_cnt);
+ logoptions->SetContent(LogOptionsPanel(logoptions, false, false));
sbmain->Add(logoptions, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 0);
/**
|
|
From: <ma...@us...> - 2003-12-05 22:40:18
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv21533 Modified Files: Makefile Log Message: Abort compilation if one file fails Index: Makefile =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Makefile 4 Dec 2003 19:04:22 -0000 1.31 +++ Makefile 5 Dec 2003 22:40:15 -0000 1.32 @@ -130,6 +130,8 @@ endif @if $(CXX) $(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS) -o $@ $<; then \ echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ + else \ + false; \ fi; # Resource files @@ -142,6 +144,8 @@ @rm -f $(PIPENAME) $(STDERROR) @if $(WINDRES) -i $< -I rc -o $@ -O coff --include-dir=$(INCLUDE_DIR); then \ echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ + else \ + false; \ fi; # Linking @@ -154,6 +158,8 @@ echo -e -n "$(WARNINGCOLOR)$(BUILD)"; \ echo -e -n "$(OUTPUTCOLOR)$@$(WELLCOLOR) binary!\n"; \ echo -e "$(DEFAULTCOLOR)Now type $(OUTPUTCOLOR)./$@$(DEFAULTCOLOR) to start the application."; \ + else \ + false; \ fi # All builds program with default settings. |
|
From: <ma...@us...> - 2003-12-05 22:20:52
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17893
Modified Files:
MainDlg.cpp
Log Message:
Hide main frame before destroying (makes shutdown seem faster)
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- MainDlg.cpp 30 Nov 2003 23:07:27 -0000 1.20
+++ MainDlg.cpp 5 Dec 2003 22:20:49 -0000 1.21
@@ -315,10 +315,15 @@
}
/**
- * CloseWindow event function. Actual data deletion is done in destructor.
+ * Normally called when user attempts to close the main frame, this function
+ * checks if we should show confirmation dialog upon closing (by reading the
+ * corresponding value from config object). If so, display a messagebox,
+ * and abort shutdown if No is clicked. Otherwise, if prompt_exit is false
+ * or Yes is clicked in confirmation dialog, hide and destroy the frame.
+ * Hiding is needed to make shutdown process seem faster and avoid any
+ * delays Destroy() call produces.
*/
void CMainDlg::OnCloseWindow( wxCloseEvent &event ){
- /* Read from config if we should ask for permission before closing. */
bool prompt_exit;
m_config->Read(wxT("/General/Prompt on exit"), &prompt_exit, true);
@@ -326,15 +331,14 @@
if (
wxMessageBox(
_("Close ShareDaemon wxInterface?"),
- _("Question"), wxYES_NO|wxCENTRE|wxICON_QUESTION
+ _("Question"),
+ wxYES_NO|wxCENTRE|wxICON_QUESTION
) == wxNO) {
return;
}
}
- /* We reach this line if prompt_exit was false,
- * or Yes was clicked in messagebox
- */
+ Hide();
Destroy();
}
|
|
From: <ma...@us...> - 2003-12-04 19:04:26
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv13931 Modified Files: Makefile Log Message: System-independant Makefile Index: Makefile =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Makefile 24 Nov 2003 14:21:58 -0000 1.30 +++ Makefile 4 Dec 2003 19:04:22 -0000 1.31 @@ -35,8 +35,17 @@ # with debugging information (useful for developers). Debug compilation takes # significently less time, but produces slower output binary. Recommended for # developers. -#CPP_FLAGS = -O3 -pipe -I. -c -DEBUG_FLAGS = -pipe -I. -c -Wall -g -ggdb +CPP_FLAGS = -O3 -pipe -I. -c +#DEBUG_FLAGS = -pipe -I. -c -Wall -g -ggdb + +# Uncomment this on win32 systems, adds resources file to compilation objects. +#RES = wxInterface_private.res + +## +# Our own defines. Only one of meaning is -D__HAVE_REMOVE_GROWABLE_COL__, +# which should only be enabled if you have patched wxWindows with +# flexgridsizer.patch +#DEFINES = -D__HAVE_REMOVE_GROWABLE_COL__ ## # Uncomment this line to enable compilation flags showing during compilation. @@ -52,37 +61,23 @@ # Only relevant on win32 - Location of windres.exe file WINDRES = windres.exe -# Uncomment this on win32 systems, adds resources file to compilation objects. -#RES = wxInterface_private.res - -## -# Our own defines. Only one of meaning is -D__HAVE_REMOVE_GROWABLE_COL__, -# which should only be enabled if you have patched wxWindows with -# flexgridsizer.patch -#DEFINES = -D__HAVE_REMOVE_GROWABLE_COL__ - # Output colours. Comment out to disable output colouring. -DEFAULTCOLOR =\33[0;40;37;22m -ACTIONCOLOR =\33[0;40;37;2m -ATTENTIONCOLOR=\33[0;40;31;22m +DEFAULTCOLOR =\33[0;22m +ACTIONCOLOR = \33[0;2m +ATTENTIONCOLOR=\33[31;22m FAILEDCOLOR = -WARNINGCOLOR =\33[0;40;33;22m -NOTICEGCOLOR =\33[0;40;33;2m -WELLCOLOR =\33[0;40;32;22m -OUTPUTCOLOR =\33[0;40;33;1m -INPUTCOLOR =\33[0;40;34;1m -FLAGCOLOR =\33[0;40;37;1m +WARNINGCOLOR =\33[33;22m +NOTICEGCOLOR =\33[33;2m +WELLCOLOR =\33[32;22m +OUTPUTCOLOR =\33[35;1m +INPUTCOLOR =\33[34;1m +FLAGCOLOR =\33[37;1m # Don't modify these - automatically generated from WXCONFIG CXX = $(CCACHE) $(shell $(WXCONFIG) --cxx) CXX_FLAGS = $(shell $(WXCONFIG) --cxxflags) LIBS = $(shell $(WXCONFIG) --libs) -# Filenames for pattern rules. These are used for -# temporary data storage, usually not needed to modify. -PIPENAME = Makefile.pipe -STDERROR = Makefile.stderr - # Any extra include directives needed INCLUDE_DIR = /local/include @@ -126,32 +121,18 @@ # Compilation # ############### +# CPP Files .cpp.o : ifndef PRINTFLAGS @echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to $(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)" else @echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to $(OUTPUTCOLOR)$@$(ACTIONCOLOR) with flags $(FLAGCOLOR)$(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS)$(ACTIONCOLOR): $(ATTENTIONCOLOR)" endif - @rm -f $(PIPENAME) $(STDERROR) - @mknod $(PIPENAME) p - @cat $(PIPENAME) > $(STDERROR) & - @if ! $(CXX) $(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS) -o $@ $< 2>$(PIPENAME); then \ - echo -e "$(FAILEDCOLOR)failed:"; \ - cat $(STDERROR); \ - echo -e -n "$(DEFAULTCOLOR)"; \ - rm $(PIPENAME) $(STDERROR); \ - false; \ - else \ - if test -s $(STDERROR); then \ - echo -e "$(WARNINGCOLOR)ok, but warnings:"; \ - cat $(STDERROR); \ - echo -e -n "$(DEFAULTCOLOR)"; \ - else \ - echo -e "$(WELLCOLOR)ok.$(DEFAULTCOLOR)"; \ - fi; \ - fi - @rm $(PIPENAME) $(STDERROR) + @if $(CXX) $(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS) -o $@ $<; then \ + echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ + fi; +# Resource files .rc.res: ifndef PRINTFLAGS @echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to $(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)" @@ -159,40 +140,15 @@ @echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to $(OUTPUTCOLOR)$@$(ACTIONCOLOR) with flags $(FLAGCOLOR)$(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS)$(ACTIONCOLOR): $(ATTENTIONCOLOR)" endif @rm -f $(PIPENAME) $(STDERROR) - @mknod $(PIPENAME) p - @cat $(PIPENAME) > $(STDERROR) & - @if ! $(WINDRES -i $< -I rc -o $@ -O coff --include-dir=$(INCLUDE_DIR) 2>$(PIPENAME); then \ - echo -e "$(FAILEDCOLOR)failed:"; \ - cat $(STDERROR); \ - echo -e -n "$(DEFAULTCOLOR)"; \ - rm $(PIPENAME) $(STDERROR); \ - false; \ - else \ - if test -s $(STDERROR); then \ - echo -e "$(WARNINGCOLOR)ok, but warnings:"; \ - cat $(STDERROR); \ - echo -e -n "$(DEFAULTCOLOR)"; \ - else \ - echo -e "$(WELLCOLOR)ok.$(DEFAULTCOLOR)"; \ - fi; \ - fi - @rm $(PIPENAME) $(STDERROR) + @if $(WINDRES) -i $< -I rc -o $@ -O coff --include-dir=$(INCLUDE_DIR); then \ + echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \ + fi; +# Linking $(PROGRAM): $(OBJECTS) @echo -e -n "$(ACTIONCOLOR)Linking $(INPUTCOLOR)$(OBJECTS)$(ACTIONCOLOR)to $(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)" - @rm -f $(PIPENAME) $(STDERROR) - @mknod $(PIPENAME) p - @cat $(PIPENAME) > $(STDERROR) & - @if ! $(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS) 2>$(PIPENAME) || \ - test -s $(STDERROR); then \ - echo -e "$(FAILEDCOLOR)failed:"; \ - cat $(STDERROR); \ - rm $(PIPENAME) $(STDERROR); \ - echo -e -n "$(DEFAULTCOLOR)"; \ - false; \ - else \ + @if $(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS); then \ echo -e "$(WELLCOLOR)ok."; \ - rm $(PIPENAME) $(STDERROR); \ echo -e -n "$(DEFAULTCOLOR)"; \ echo -e -n "$(WELLCOLOR)Successfully compiled "; \ echo -e -n "$(WARNINGCOLOR)$(BUILD)"; \ @@ -203,10 +159,29 @@ # All builds program with default settings. all: $(PROGRAM) -debug: $(PROGRAM_DEBUG) +help: + @echo "ShareDaemon wxInterface"; + @echo "Copyright (c) 2003 Alo Sarv"; + @echo ""; + @echo "1. You need to have wxWindows (http://www.wxwindows.org) library installed for"; + @echo " your system (wxGTK for linux, wxMSW for windows, wxMac for Mac and the "; + @echo " WX_CONFIG variable in this Makefile pointing to your wx-config script "; + @echo " (usually at /usr/local/bin)."; + @echo "2. Windows (mingw/cygwin) compilation: Uncomment the "; + @echo " `RES=wxInterface_private.res` line in this Makefile."; + @echo "3. To make debug build, comment out CPP_FLAGS line in this makefile and "; + @echo " uncomment DEBUG_FLAGS line."; + @echo "4. To enable sidebar hiding, you need to patch wxWindows library using "; + @echo " flexgridsizer.patch file and uncomment the "; + @echo " \`-D__HAVE_REMOVE_GROWABLE_COL\` line in this Makefile. For further "; + @echo " instructions, see the INSTALL file."; + @echo "5. To enable complete column hiding in list controls under wxGTK, you need"; + @echo " to patch wxWindows library with listctrl.patch file. For further"; + @echo " instructions, see the INSTALL file."; + # Cleanup command clean: @echo -e -n "Cleaning up..." - @rm -f $(OBJECTS) $(PROGRAM) + @rm -f $(OBJECTS) $(PROGRAM) $(PROGRAM).exe @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)" |
|
From: <ma...@us...> - 2003-12-01 20:39:52
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv21928 Modified Files: Estonian.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.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Estonian.po 25 Nov 2003 04:18:59 -0000 1.3 +++ Estonian.po 1 Dec 2003 20:39:48 -0000 1.4 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-11-24 20:00+0200\n" +"POT-Creation-Date: 2003-12-01 22:36+0200\n" "PO-Revision-Date: 2003-09-09 01:10+0300\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #: DownloadListCtrl.cpp:52 SharedFilesListCtrl.cpp:52 msgid "File Name" @@ -68,210 +68,207 @@ msgid "Category" msgstr "Kategooria" -#: GUISettingsDlg.cpp:289 GUISettingsDlg.cpp:372 +#: GUISettingsDlg.cpp:312 GUISettingsDlg.cpp:402 msgid "Add new language" msgstr "Lisa uus keel" -#: GUISettingsDlg.cpp:305 +#: GUISettingsDlg.cpp:328 #, c-format msgid "" "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 "" -#: GUISettingsDlg.cpp:310 +#: GUISettingsDlg.cpp:333 msgid "Confirm remove language" msgstr "" -#: GUISettingsDlg.cpp:323 GUISettingsDlg.cpp:400 +#: GUISettingsDlg.cpp:346 GUISettingsDlg.cpp:439 #, fuzzy msgid "Add new iconset" msgstr "Lisa uus keel" -#: GUISettingsDlg.cpp:339 +#: GUISettingsDlg.cpp:362 #, c-format msgid "" "Are you sure you wish to remove iconset \t\t%s from the list of iconsets?\n" "\t\tThe actual iconset files will not be deleted." msgstr "" -#: GUISettingsDlg.cpp:345 +#: GUISettingsDlg.cpp:368 msgid "Confirm remove iconset" msgstr "" -#: GUISettingsDlg.cpp:358 +#: GUISettingsDlg.cpp:381 msgid "Language" msgstr "Keel" -#: GUISettingsDlg.cpp:364 +#: GUISettingsDlg.cpp:390 #, fuzzy msgid "" -"Change the language of the interface. Requires interface restart to take " +"Change the language of the interface. Requires interface \t\trestart to take " "effect" msgstr "" "Menüü ja nupurea seadete muutmine vajab\n" "kasutajaliidese taaskäivitamist." -#: GUISettingsDlg.cpp:370 GUISettingsDlg.cpp:398 +#: GUISettingsDlg.cpp:398 GUISettingsDlg.cpp:435 #, fuzzy msgid "Add" msgstr "Lisa uus" -#: GUISettingsDlg.cpp:376 GUISettingsDlg.cpp:404 +#: GUISettingsDlg.cpp:407 GUISettingsDlg.cpp:444 msgid "Remove" msgstr "" -#: GUISettingsDlg.cpp:378 +#: GUISettingsDlg.cpp:411 msgid "Remove currently selected language" msgstr "" -#: GUISettingsDlg.cpp:386 +#: GUISettingsDlg.cpp:419 msgid "Icon set" msgstr "Ikoonid" -#: GUISettingsDlg.cpp:392 -msgid "" -"Change the iconet the interface should use. Requires restart to take effect" +#: GUISettingsDlg.cpp:428 +msgid "Change the iconet the interface should use." msgstr "" -#: GUISettingsDlg.cpp:406 +#: GUISettingsDlg.cpp:448 msgid "Remove currently selected iconset" msgstr "" -#: GUISettingsDlg.cpp:418 +#: GUISettingsDlg.cpp:460 msgid "Font" msgstr "Font" -#: GUISettingsDlg.cpp:422 +#: GUISettingsDlg.cpp:464 msgid "Default" msgstr "Standard" -#: GUISettingsDlg.cpp:426 +#: GUISettingsDlg.cpp:471 msgid "Change the font" msgstr "" -#: GUISettingsDlg.cpp:430 +#: GUISettingsDlg.cpp:476 msgid "Font Test :)" msgstr "" -#: GUISettingsDlg.cpp:435 +#: GUISettingsDlg.cpp:483 msgid "Startup page" msgstr "Algus-leht" -#: GUISettingsDlg.cpp:439 wxInterface_wdr.cpp:158 +#: GUISettingsDlg.cpp:487 wxInterface_wdr.cpp:158 msgid "Server" msgstr "Server" -#: GUISettingsDlg.cpp:440 Images.cpp:150 MainDlg.cpp:267 MainDlg.cpp:419 -#: MainDlg.cpp:426 +#: GUISettingsDlg.cpp:488 Images.cpp:293 MainDlg.cpp:278 MainDlg.cpp:420 +#: MainDlg.cpp:427 msgid "Transfer" msgstr "Ülekanne" -#: GUISettingsDlg.cpp:441 Images.cpp:149 MainDlg.cpp:263 MainDlg.cpp:418 -#: MainDlg.cpp:425 wxInterface_wdr.cpp:136 +#: GUISettingsDlg.cpp:489 Images.cpp:291 MainDlg.cpp:272 MainDlg.cpp:419 +#: MainDlg.cpp:426 wxInterface_wdr.cpp:136 msgid "Search" msgstr "Otsing" -#: GUISettingsDlg.cpp:442 Images.cpp:151 MainDlg.cpp:271 MainDlg.cpp:420 -#: MainDlg.cpp:427 wxInterface_wdr.cpp:350 +#: GUISettingsDlg.cpp:490 Images.cpp:295 MainDlg.cpp:284 MainDlg.cpp:421 +#: MainDlg.cpp:428 wxInterface_wdr.cpp:350 msgid "Shared Files" msgstr "Jagatud Failid" -#: GUISettingsDlg.cpp:443 MainDlg.cpp:275 MainDlg.cpp:421 MainDlg.cpp:428 +#: GUISettingsDlg.cpp:491 MainDlg.cpp:290 MainDlg.cpp:422 MainDlg.cpp:429 #: wxInterface_wdr.cpp:497 msgid "Messages" msgstr "Sõnumid" -#: GUISettingsDlg.cpp:444 Images.cpp:153 MainDlg.cpp:279 MainDlg.cpp:422 -#: MainDlg.cpp:429 wxInterface_wdr.cpp:358 +#: GUISettingsDlg.cpp:492 Images.cpp:299 MainDlg.cpp:296 MainDlg.cpp:423 +#: MainDlg.cpp:430 wxInterface_wdr.cpp:358 msgid "Statistics" msgstr "Statistika" -#: GUISettingsDlg.cpp:448 +#: GUISettingsDlg.cpp:500 msgid "Set which page will be displayed on program startup" msgstr "" -#: GUISettingsDlg.cpp:452 +#: GUISettingsDlg.cpp:506 msgid "Remember last" msgstr "Mäleta viimast" -#: GUISettingsDlg.cpp:454 -msgid "Automatically remember which page was open between sessions" +#: GUISettingsDlg.cpp:511 +msgid "Automatically remember which page was \t\topen between sessions" msgstr "" -#: GUISettingsDlg.cpp:464 +#: GUISettingsDlg.cpp:523 msgid "Show splashscreen" msgstr "Näita algus-logo" -#: GUISettingsDlg.cpp:467 +#: GUISettingsDlg.cpp:529 msgid "" -"Toggle wether splashscreen should be shown on program startup or not. Speeds " -"up application starting if turned off. Default: On" +"Toggle wether splashscreen should be shown on program \t\tstartup or not. " +"Speeds up application starting if turned off. \t\tDefault: On" msgstr "" -#: GUISettingsDlg.cpp:471 +#: GUISettingsDlg.cpp:537 msgid "Prompt on exit" msgstr "Küsi väljumisel" -#: GUISettingsDlg.cpp:473 -msgid "Toggle wether confirmation is requested when closing program." +#: GUISettingsDlg.cpp:542 +msgid "Toggle wether confirmation is requested \t\twhen closing program." msgstr "" -#: GUISettingsDlg.cpp:479 MainDlg.cpp:437 +#: GUISettingsDlg.cpp:554 MainDlg.cpp:438 #, fuzzy msgid "Show ToolBar" msgstr "Näita nupurida" -#: GUISettingsDlg.cpp:482 +#: GUISettingsDlg.cpp:559 #, fuzzy -msgid "Toggle wether toolbar is shown or not. Requires restart to take effect." +msgid "Toggle wether toolbar is shown or not." msgstr "" "Menüü ja nupurea seadete muutmine vajab\n" "kasutajaliidese taaskäivitamist." -#: GUISettingsDlg.cpp:487 MainDlg.cpp:444 MainDlg.cpp:456 +#: GUISettingsDlg.cpp:567 MainDlg.cpp:445 MainDlg.cpp:459 msgid "Horizontal" msgstr "Horisontaalne" -#: GUISettingsDlg.cpp:488 MainDlg.cpp:447 MainDlg.cpp:457 +#: GUISettingsDlg.cpp:568 MainDlg.cpp:448 MainDlg.cpp:460 msgid "Vertical" msgstr "Vertikaalne" -#: GUISettingsDlg.cpp:492 +#: GUISettingsDlg.cpp:576 msgid "" -"Horizontal tooltip is shown on top of window (default), vertical is shown on " -"the left side of window. Requires restart to take effect." +"Horizontal tooltip is shown on top of window (default),\t\tvertical is shown " +"on the left side of window." msgstr "" -#: GUISettingsDlg.cpp:498 MainDlg.cpp:433 +#: GUISettingsDlg.cpp:587 MainDlg.cpp:434 #, fuzzy msgid "Show MenuBar" msgstr "Näita menüüd" -#: GUISettingsDlg.cpp:500 -msgid "" -"Toggle wether menubar (file/view etc) should be shown or not. Requires " -"restart to take effect." +#: GUISettingsDlg.cpp:592 +msgid "Toggle wether menubar (file/view etc) \t\tshould be shown or not." msgstr "" -#: GUISettingsDlg.cpp:508 wxInterface_wdr.cpp:796 wxInterface_wdr.cpp:838 +#: GUISettingsDlg.cpp:606 wxInterface_wdr.cpp:796 wxInterface_wdr.cpp:838 msgid "OK" msgstr "Okei" -#: GUISettingsDlg.cpp:511 +#: GUISettingsDlg.cpp:610 msgid "Save settings and close dialog" msgstr "" -#: GUISettingsDlg.cpp:515 wxInterface_wdr.cpp:274 wxInterface_wdr.cpp:800 +#: GUISettingsDlg.cpp:615 wxInterface_wdr.cpp:274 wxInterface_wdr.cpp:800 #: wxInterface_wdr.cpp:842 msgid "Cancel" msgstr "Katkesta" -#: GUISettingsDlg.cpp:517 +#: GUISettingsDlg.cpp:619 msgid "Abort changes and close dialog" msgstr "" -#: GUISettingsDlg.cpp:564 +#: GUISettingsDlg.cpp:666 #, fuzzy msgid "" "You need to enter the name for your new language!\n" @@ -280,16 +277,16 @@ "Palun sisestage uue keele nimi. Kui te enam\n" "ei soovi keelt lisada, klikkige 'Katkesta'." -#: GUISettingsDlg.cpp:567 +#: GUISettingsDlg.cpp:669 msgid "Missing information" msgstr "Puuduv informatsioon" -#: GUISettingsDlg.cpp:579 +#: GUISettingsDlg.cpp:681 #, c-format msgid "The file %s does not exist.\n" msgstr "Fail %s ei eksisteeri.\n" -#: GUISettingsDlg.cpp:581 +#: GUISettingsDlg.cpp:683 #, fuzzy msgid "" "Please make sure you specified correct name, and\t\t\t the\n" @@ -299,37 +296,37 @@ "nime ja tõlgitud ja kompileeritud .mo fail eksisteerib\n" "lang/ alamkataloogis." -#: GUISettingsDlg.cpp:584 +#: GUISettingsDlg.cpp:686 msgid "File not found" msgstr "Faili ei leitud" -#: GUISettingsDlg.cpp:595 +#: GUISettingsDlg.cpp:697 #, c-format msgid "New language %s added.\n" msgstr "Uus keel %s lisatud.\n" -#: GUISettingsDlg.cpp:596 +#: GUISettingsDlg.cpp:698 msgid "Please restart the interface to test your new language!" msgstr "Palun taaskäivita kasutajaliides testimaks oma uut keelt!" -#: GUISettingsDlg.cpp:597 +#: GUISettingsDlg.cpp:699 msgid "Success!" msgstr "Õnnestus!" -#: Images.cpp:147 MainDlg.cpp:254 MainDlg.cpp:407 +#: Images.cpp:287 MainDlg.cpp:259 MainDlg.cpp:408 msgid "Connect" msgstr "Ühenda" -#: Images.cpp:148 MainDlg.cpp:259 MainDlg.cpp:417 MainDlg.cpp:424 +#: Images.cpp:289 MainDlg.cpp:266 MainDlg.cpp:418 MainDlg.cpp:425 msgid "Servers" msgstr "Serverid" -#: Images.cpp:152 +#: Images.cpp:297 #, fuzzy msgid "Messaging" msgstr "Sõnumid" -#: Images.cpp:154 MainDlg.cpp:283 MainDlg.cpp:351 MainDlg.cpp:412 +#: Images.cpp:301 MainDlg.cpp:303 MainDlg.cpp:352 MainDlg.cpp:413 msgid "Preferences" msgstr "Seaded" @@ -361,71 +358,71 @@ msgid "Userhash" msgstr "Kasutajakood" -#: MainDlg.cpp:255 +#: MainDlg.cpp:262 msgid "Connect to any server" msgstr "Ühenda suvalise serveriga" -#: MainDlg.cpp:260 +#: MainDlg.cpp:269 msgid "Server list" msgstr "Serverite nimekiri" -#: MainDlg.cpp:264 +#: MainDlg.cpp:275 msgid "Search files" msgstr "Failide otsimine" -#: MainDlg.cpp:268 +#: MainDlg.cpp:281 msgid "File Transfer" msgstr "Failide Ülekanne" -#: MainDlg.cpp:272 +#: MainDlg.cpp:287 msgid "Show shared files" msgstr "Näita jagatud faile" -#: MainDlg.cpp:276 +#: MainDlg.cpp:293 msgid "Chatting" msgstr "Sõnumite saatmine teistele kasutajatele" -#: MainDlg.cpp:280 +#: MainDlg.cpp:299 msgid "Show live statistics" msgstr "Näita statistikat" -#: MainDlg.cpp:284 +#: MainDlg.cpp:306 msgid "Modify settings" msgstr "Muuda seadeid" -#: MainDlg.cpp:327 +#: MainDlg.cpp:328 msgid "Close ShareDaemon wxInterface?" msgstr "" -#: MainDlg.cpp:328 +#: MainDlg.cpp:329 msgid "Question" msgstr "Küsimus" -#: MainDlg.cpp:408 SysTray.cpp:70 +#: MainDlg.cpp:409 SysTray.cpp:70 msgid "Quit" msgstr "Sulge" -#: MainDlg.cpp:460 +#: MainDlg.cpp:463 msgid "ToolBar Alignment" msgstr "" -#: MainDlg.cpp:464 MainDlg.cpp:471 SysTray.cpp:69 +#: MainDlg.cpp:467 MainDlg.cpp:474 SysTray.cpp:69 msgid "Help" msgstr "Abi" -#: MainDlg.cpp:465 +#: MainDlg.cpp:468 msgid "About..." msgstr "Info" -#: MainDlg.cpp:468 QueueListCtrl.cpp:52 UploadListCtrl.cpp:52 +#: MainDlg.cpp:471 QueueListCtrl.cpp:52 UploadListCtrl.cpp:52 msgid "File" msgstr "Fail" -#: MainDlg.cpp:469 +#: MainDlg.cpp:472 msgid "Edit" msgstr "Muuda" -#: MainDlg.cpp:470 +#: MainDlg.cpp:473 msgid "View" msgstr "Vaade" @@ -461,7 +458,7 @@ msgid "Obtained Parts" msgstr "Omab Osi" -#: SearchListCtrl.cpp:56 ServerWnd.cpp:449 wxInterface_wdr.cpp:139 +#: SearchListCtrl.cpp:56 ServerWnd.cpp:561 wxInterface_wdr.cpp:139 msgid "Name" msgstr "Nimi" @@ -509,7 +506,7 @@ msgid "Failed" msgstr "Ebaõnnestunud" -#: ServerListCtrl.cpp:56 ServerWnd.cpp:345 +#: ServerListCtrl.cpp:56 ServerWnd.cpp:418 msgid "Static" msgstr "Staatiline" @@ -525,146 +522,148 @@ msgid "Version" msgstr "Versioon" -#: ServerWnd.cpp:191 +#: ServerWnd.cpp:220 #, fuzzy msgid "Add new server" msgstr "Lisa server" -#: ServerWnd.cpp:199 +#: ServerWnd.cpp:234 msgid "Update from URL" msgstr "Uuenda aadressilt" -#: ServerWnd.cpp:207 +#: ServerWnd.cpp:242 msgid "Server settings" msgstr "Serveri seaded" -#: ServerWnd.cpp:215 +#: ServerWnd.cpp:250 msgid "Port settings" msgstr "Portide seaded" -#: ServerWnd.cpp:223 +#: ServerWnd.cpp:258 #, fuzzy msgid "Log options" msgstr "Loogimise seaded" -#: ServerWnd.cpp:312 +#: ServerWnd.cpp:364 msgid "Autoconnect" msgstr "Autoühenda" -#: ServerWnd.cpp:314 +#: ServerWnd.cpp:369 msgid "" -"Toggle wether application should automatically connect to any server on " +"Toggle wether application should automatically connect \t\tto any server on " "startup" msgstr "" -#: ServerWnd.cpp:320 +#: ServerWnd.cpp:378 msgid "To static only" msgstr "Ainult staatilistesse" -#: ServerWnd.cpp:322 +#: ServerWnd.cpp:383 msgid "" -"Toggle wether application should connect to servers marked as \"static\" only" +"Toggle wether application should connect \t\tto servers marked as \"static\" " +"only" msgstr "" -#: ServerWnd.cpp:347 +#: ServerWnd.cpp:423 msgid "" -"Set server static. Static servers are not removed from list if they do not " -"respond" +"Set server static. Static servers are not \t\tremoved from list if they do " +"not respond" msgstr "" -#: ServerWnd.cpp:355 +#: ServerWnd.cpp:434 msgid "Priority:" msgstr "Tähtsus:" -#: ServerWnd.cpp:359 +#: ServerWnd.cpp:440 msgid "High" msgstr "Kõrge" -#: ServerWnd.cpp:360 +#: ServerWnd.cpp:441 msgid "Normal" msgstr "Tavaline" -#: ServerWnd.cpp:361 +#: ServerWnd.cpp:442 msgid "Low" msgstr "Madal" -#: ServerWnd.cpp:365 +#: ServerWnd.cpp:449 msgid "Change server priority" msgstr "" -#: ServerWnd.cpp:395 +#: ServerWnd.cpp:482 msgid "Line limit" msgstr "Rea limiit" -#: ServerWnd.cpp:397 -msgid "Toggle wether there should be a line limit for log boxes (saves memory)" +#: ServerWnd.cpp:487 +msgid "" +"Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" msgstr "" -#: ServerWnd.cpp:403 +#: ServerWnd.cpp:498 msgid "Maximum number of lines in log boxes" msgstr "" -#: ServerWnd.cpp:409 +#: ServerWnd.cpp:505 msgid "Save to disk" msgstr "Salvesta kettale" -#: ServerWnd.cpp:411 +#: ServerWnd.cpp:509 #, fuzzy msgid "Save logs to disc also" msgstr "Salvesta kettale" -#: ServerWnd.cpp:415 +#: ServerWnd.cpp:514 msgid "Clear" msgstr "Puhasta" -#: ServerWnd.cpp:417 +#: ServerWnd.cpp:518 msgid "Clear all logs" msgstr "" -#: ServerWnd.cpp:440 +#: ServerWnd.cpp:543 msgid "IP address:Port" msgstr "IP aadress:Port" -#: ServerWnd.cpp:445 -msgid "Type in the ip address and port of the new server, separated by :" +#: ServerWnd.cpp:554 +msgid "Type in the ip address and port of the new \t\tserver, separated by `:`" msgstr "" -#: ServerWnd.cpp:454 +#: ServerWnd.cpp:571 msgid "Optional: Enter the name of the new server" msgstr "" -#: ServerWnd.cpp:460 +#: ServerWnd.cpp:578 msgid "Add to List" msgstr "Lisa nimekirja" -#: ServerWnd.cpp:462 +#: ServerWnd.cpp:582 #, fuzzy msgid "Add the server to list" msgstr "Lisa server" -#: ServerWnd.cpp:487 +#: ServerWnd.cpp:619 msgid "Update" msgstr "Uuenda" -#: ServerWnd.cpp:521 +#: ServerWnd.cpp:666 msgid "Enter the TCP port for connections (default: 4662)" msgstr "" -#: ServerWnd.cpp:527 +#: ServerWnd.cpp:677 msgid "Enter the UDP port for connections (default: 4672)" msgstr "" -#: ServerWnd.cpp:537 +#: ServerWnd.cpp:689 msgid "Disable" msgstr "Keela" -#: ServerWnd.cpp:539 +#: ServerWnd.cpp:694 msgid "" -"Disable UDP port. This can somewhat lower traffic, but also results in less " -"sources as client<->client source exchange is done via UDP" +"Disable UDP port. This can somewhat lower traffic, \t\tbut also results in " +"less sources as client<->client source \t\texchange is done via UDP" msgstr "" -#: ServerWnd.cpp:547 +#: ServerWnd.cpp:706 msgid "Apply changes" msgstr "Aktiveeri muudatused" Index: German.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/German.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- German.po 25 Nov 2003 04:18:59 -0000 1.4 +++ German.po 1 Dec 2003 20:39:48 -0000 1.5 @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-11-24 20:00+0200\n" +"POT-Creation-Date: 2003-12-01 22:36+0200\n" "PO-Revision-Date: 2003-09-09 01:25+0300\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #: DownloadListCtrl.cpp:52 SharedFilesListCtrl.cpp:52 msgid "File Name" @@ -68,210 +68,207 @@ msgid "Category" msgstr "Kategorie" -#: GUISettingsDlg.cpp:289 GUISettingsDlg.cpp:372 +#: GUISettingsDlg.cpp:312 GUISettingsDlg.cpp:402 msgid "Add new language" msgstr "Füge neue Sprache hinzu" -#: GUISettingsDlg.cpp:305 +#: GUISettingsDlg.cpp:328 #, c-format msgid "" "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 "" -#: GUISettingsDlg.cpp:310 +#: GUISettingsDlg.cpp:333 msgid "Confirm remove language" msgstr "" -#: GUISettingsDlg.cpp:323 GUISettingsDlg.cpp:400 +#: GUISettingsDlg.cpp:346 GUISettingsDlg.cpp:439 #, fuzzy msgid "Add new iconset" msgstr "Füge neue Sprache hinzu" -#: GUISettingsDlg.cpp:339 +#: GUISettingsDlg.cpp:362 #, c-format msgid "" "Are you sure you wish to remove iconset \t\t%s from the list of iconsets?\n" "\t\tThe actual iconset files will not be deleted." msgstr "" -#: GUISettingsDlg.cpp:345 +#: GUISettingsDlg.cpp:368 msgid "Confirm remove iconset" msgstr "" -#: GUISettingsDlg.cpp:358 +#: GUISettingsDlg.cpp:381 msgid "Language" msgstr "Sprache" -#: GUISettingsDlg.cpp:364 +#: GUISettingsDlg.cpp:390 #, fuzzy msgid "" -"Change the language of the interface. Requires interface restart to take " +"Change the language of the interface. Requires interface \t\trestart to take " "effect" msgstr "" "Veränderungen der Menubar und Toolbar Einstellungen\n" "erfordern eine Neustart vom User Interface." -#: GUISettingsDlg.cpp:370 GUISettingsDlg.cpp:398 +#: GUISettingsDlg.cpp:398 GUISettingsDlg.cpp:435 #, fuzzy msgid "Add" msgstr "Neu hinzufügen" -#: GUISettingsDlg.cpp:376 GUISettingsDlg.cpp:404 +#: GUISettingsDlg.cpp:407 GUISettingsDlg.cpp:444 msgid "Remove" msgstr "" -#: GUISettingsDlg.cpp:378 +#: GUISettingsDlg.cpp:411 msgid "Remove currently selected language" msgstr "" -#: GUISettingsDlg.cpp:386 +#: GUISettingsDlg.cpp:419 msgid "Icon set" msgstr "Icon setzen" -#: GUISettingsDlg.cpp:392 -msgid "" -"Change the iconet the interface should use. Requires restart to take effect" +#: GUISettingsDlg.cpp:428 +msgid "Change the iconet the interface should use." msgstr "" -#: GUISettingsDlg.cpp:406 +#: GUISettingsDlg.cpp:448 msgid "Remove currently selected iconset" msgstr "" -#: GUISettingsDlg.cpp:418 +#: GUISettingsDlg.cpp:460 msgid "Font" msgstr "Font" -#: GUISettingsDlg.cpp:422 +#: GUISettingsDlg.cpp:464 msgid "Default" msgstr "Standart" -#: GUISettingsDlg.cpp:426 +#: GUISettingsDlg.cpp:471 msgid "Change the font" msgstr "" -#: GUISettingsDlg.cpp:430 +#: GUISettingsDlg.cpp:476 msgid "Font Test :)" msgstr "" -#: GUISettingsDlg.cpp:435 +#: GUISettingsDlg.cpp:483 msgid "Startup page" msgstr "Anfang" -#: GUISettingsDlg.cpp:439 wxInterface_wdr.cpp:158 +#: GUISettingsDlg.cpp:487 wxInterface_wdr.cpp:158 msgid "Server" msgstr "Server" -#: GUISettingsDlg.cpp:440 Images.cpp:150 MainDlg.cpp:267 MainDlg.cpp:419 -#: MainDlg.cpp:426 +#: GUISettingsDlg.cpp:488 Images.cpp:293 MainDlg.cpp:278 MainDlg.cpp:420 +#: MainDlg.cpp:427 msgid "Transfer" msgstr "Transfer" -#: GUISettingsDlg.cpp:441 Images.cpp:149 MainDlg.cpp:263 MainDlg.cpp:418 -#: MainDlg.cpp:425 wxInterface_wdr.cpp:136 +#: GUISettingsDlg.cpp:489 Images.cpp:291 MainDlg.cpp:272 MainDlg.cpp:419 +#: MainDlg.cpp:426 wxInterface_wdr.cpp:136 msgid "Search" msgstr "Suche" -#: GUISettingsDlg.cpp:442 Images.cpp:151 MainDlg.cpp:271 MainDlg.cpp:420 -#: MainDlg.cpp:427 wxInterface_wdr.cpp:350 +#: GUISettingsDlg.cpp:490 Images.cpp:295 MainDlg.cpp:284 MainDlg.cpp:421 +#: MainDlg.cpp:428 wxInterface_wdr.cpp:350 msgid "Shared Files" msgstr "Freigaben" -#: GUISettingsDlg.cpp:443 MainDlg.cpp:275 MainDlg.cpp:421 MainDlg.cpp:428 +#: GUISettingsDlg.cpp:491 MainDlg.cpp:290 MainDlg.cpp:422 MainDlg.cpp:429 #: wxInterface_wdr.cpp:497 msgid "Messages" msgstr "Mitteilungen" -#: GUISettingsDlg.cpp:444 Images.cpp:153 MainDlg.cpp:279 MainDlg.cpp:422 -#: MainDlg.cpp:429 wxInterface_wdr.cpp:358 +#: GUISettingsDlg.cpp:492 Images.cpp:299 MainDlg.cpp:296 MainDlg.cpp:423 +#: MainDlg.cpp:430 wxInterface_wdr.cpp:358 msgid "Statistics" msgstr "Statistik" -#: GUISettingsDlg.cpp:448 +#: GUISettingsDlg.cpp:500 msgid "Set which page will be displayed on program startup" msgstr "" -#: GUISettingsDlg.cpp:452 +#: GUISettingsDlg.cpp:506 msgid "Remember last" msgstr "Erinnere das Letzte" -#: GUISettingsDlg.cpp:454 -msgid "Automatically remember which page was open between sessions" +#: GUISettingsDlg.cpp:511 +msgid "Automatically remember which page was \t\topen between sessions" msgstr "" -#: GUISettingsDlg.cpp:464 +#: GUISettingsDlg.cpp:523 msgid "Show splashscreen" msgstr "Zeige Splashscreen" -#: GUISettingsDlg.cpp:467 +#: GUISettingsDlg.cpp:529 msgid "" -"Toggle wether splashscreen should be shown on program startup or not. Speeds " -"up application starting if turned off. Default: On" +"Toggle wether splashscreen should be shown on program \t\tstartup or not. " +"Speeds up application starting if turned off. \t\tDefault: On" msgstr "" -#: GUISettingsDlg.cpp:471 +#: GUISettingsDlg.cpp:537 msgid "Prompt on exit" msgstr "Hinweis beim Beenden" -#: GUISettingsDlg.cpp:473 -msgid "Toggle wether confirmation is requested when closing program." +#: GUISettingsDlg.cpp:542 +msgid "Toggle wether confirmation is requested \t\twhen closing program." msgstr "" -#: GUISettingsDlg.cpp:479 MainDlg.cpp:437 +#: GUISettingsDlg.cpp:554 MainDlg.cpp:438 #, fuzzy msgid "Show ToolBar" msgstr "Zeige Toolbar" -#: GUISettingsDlg.cpp:482 +#: GUISettingsDlg.cpp:559 #, fuzzy -msgid "Toggle wether toolbar is shown or not. Requires restart to take effect." +msgid "Toggle wether toolbar is shown or not." msgstr "" "Veränderungen der Menubar und Toolbar Einstellungen\n" "erfordern eine Neustart vom User Interface." -#: GUISettingsDlg.cpp:487 MainDlg.cpp:444 MainDlg.cpp:456 +#: GUISettingsDlg.cpp:567 MainDlg.cpp:445 MainDlg.cpp:459 msgid "Horizontal" msgstr "Horizontal" -#: GUISettingsDlg.cpp:488 MainDlg.cpp:447 MainDlg.cpp:457 +#: GUISettingsDlg.cpp:568 MainDlg.cpp:448 MainDlg.cpp:460 msgid "Vertical" msgstr "Vertikal" -#: GUISettingsDlg.cpp:492 +#: GUISettingsDlg.cpp:576 msgid "" -"Horizontal tooltip is shown on top of window (default), vertical is shown on " -"the left side of window. Requires restart to take effect." +"Horizontal tooltip is shown on top of window (default),\t\tvertical is shown " +"on the left side of window." msgstr "" -#: GUISettingsDlg.cpp:498 MainDlg.cpp:433 +#: GUISettingsDlg.cpp:587 MainDlg.cpp:434 #, fuzzy msgid "Show MenuBar" msgstr "Zeige Menubar" -#: GUISettingsDlg.cpp:500 -msgid "" -"Toggle wether menubar (file/view etc) should be shown or not. Requires " -"restart to take effect." +#: GUISettingsDlg.cpp:592 +msgid "Toggle wether menubar (file/view etc) \t\tshould be shown or not." msgstr "" -#: GUISettingsDlg.cpp:508 wxInterface_wdr.cpp:796 wxInterface_wdr.cpp:838 +#: GUISettingsDlg.cpp:606 wxInterface_wdr.cpp:796 wxInterface_wdr.cpp:838 msgid "OK" msgstr "OK" -#: GUISettingsDlg.cpp:511 +#: GUISettingsDlg.cpp:610 msgid "Save settings and close dialog" msgstr "" -#: GUISettingsDlg.cpp:515 wxInterface_wdr.cpp:274 wxInterface_wdr.cpp:800 +#: GUISettingsDlg.cpp:615 wxInterface_wdr.cpp:274 wxInterface_wdr.cpp:800 #: wxInterface_wdr.cpp:842 msgid "Cancel" msgstr "Abbrechen" -#: GUISettingsDlg.cpp:517 +#: GUISettingsDlg.cpp:619 msgid "Abort changes and close dialog" msgstr "" -#: GUISettingsDlg.cpp:564 +#: GUISettingsDlg.cpp:666 #, fuzzy msgid "" "You need to enter the name for your new language!\n" @@ -280,16 +277,16 @@ "Sie müssen den Namen für die neue Übersetzung eingeben!\n" "Falls Sie keine Übersetzung mehr hinzufügen wollen, klicken Sie 'Abbrechen'." -#: GUISettingsDlg.cpp:567 +#: GUISettingsDlg.cpp:669 msgid "Missing information" msgstr "Fehlende Information" -#: GUISettingsDlg.cpp:579 +#: GUISettingsDlg.cpp:681 #, c-format msgid "The file %s does not exist.\n" msgstr "Die Datei %s existiert nicht.\n" -#: GUISettingsDlg.cpp:581 +#: GUISettingsDlg.cpp:683 #, fuzzy msgid "" "Please make sure you specified correct name, and\t\t\t the\n" @@ -299,38 +296,38 @@ "haben und die übersetzte und kompilierte .mo Datei im \n" "Unterverzeichnis existiert." -#: GUISettingsDlg.cpp:584 +#: GUISettingsDlg.cpp:686 msgid "File not found" msgstr "Datei nicht gefunden" -#: GUISettingsDlg.cpp:595 +#: GUISettingsDlg.cpp:697 #, c-format msgid "New language %s added.\n" msgstr "Neue Übersetzung %s hinzugefügt.\n" -#: GUISettingsDlg.cpp:596 +#: GUISettingsDlg.cpp:698 msgid "Please restart the interface to test your new language!" msgstr "" "Bitte starten Sie das User Interface neu um die neue Übersetzung zu testen!" -#: GUISettingsDlg.cpp:597 +#: GUISettingsDlg.cpp:699 msgid "Success!" msgstr "Erfolg!" -#: Images.cpp:147 MainDlg.cpp:254 MainDlg.cpp:407 +#: Images.cpp:287 MainDlg.cpp:259 MainDlg.cpp:408 msgid "Connect" msgstr "Verbinden" -#: Images.cpp:148 MainDlg.cpp:259 MainDlg.cpp:417 MainDlg.cpp:424 +#: Images.cpp:289 MainDlg.cpp:266 MainDlg.cpp:418 MainDlg.cpp:425 msgid "Servers" msgstr "Server" -#: Images.cpp:152 +#: Images.cpp:297 #, fuzzy msgid "Messaging" msgstr "Mitteilungen" -#: Images.cpp:154 MainDlg.cpp:283 MainDlg.cpp:351 MainDlg.cpp:412 +#: Images.cpp:301 MainDlg.cpp:303 MainDlg.cpp:352 MainDlg.cpp:413 msgid "Preferences" msgstr "Präferenzen" @@ -362,71 +359,71 @@ msgid "Userhash" msgstr "Benutzer-Hash" -#: MainDlg.cpp:255 +#: MainDlg.cpp:262 msgid "Connect to any server" msgstr "Verbinde zu einem Server" -#: MainDlg.cpp:260 +#: MainDlg.cpp:269 msgid "Server list" msgstr "Server Liste" -#: MainDlg.cpp:264 +#: MainDlg.cpp:275 msgid "Search files" msgstr "Suche Dateien" -#: MainDlg.cpp:268 +#: MainDlg.cpp:281 msgid "File Transfer" msgstr "Datei Transfer" -#: MainDlg.cpp:272 +#: MainDlg.cpp:287 msgid "Show shared files" msgstr "Freigegebene Dateien zeigen" -#: MainDlg.cpp:276 +#: MainDlg.cpp:293 msgid "Chatting" msgstr "Chatten" -#: MainDlg.cpp:280 +#: MainDlg.cpp:299 msgid "Show live statistics" msgstr "Zeige " -#: MainDlg.cpp:284 +#: MainDlg.cpp:306 msgid "Modify settings" msgstr "Einstellungen ändern" -#: MainDlg.cpp:327 +#: MainDlg.cpp:328 msgid "Close ShareDaemon wxInterface?" msgstr "" -#: MainDlg.cpp:328 +#: MainDlg.cpp:329 msgid "Question" msgstr "Frage" -#: MainDlg.cpp:408 SysTray.cpp:70 +#: MainDlg.cpp:409 SysTray.cpp:70 msgid "Quit" msgstr "Verlassen" -#: MainDlg.cpp:460 +#: MainDlg.cpp:463 msgid "ToolBar Alignment" msgstr "" -#: MainDlg.cpp:464 MainDlg.cpp:471 SysTray.cpp:69 +#: MainDlg.cpp:467 MainDlg.cpp:474 SysTray.cpp:69 msgid "Help" msgstr "Hilfe" -#: MainDlg.cpp:465 +#: MainDlg.cpp:468 msgid "About..." msgstr "Über..." -#: MainDlg.cpp:468 QueueListCtrl.cpp:52 UploadListCtrl.cpp:52 +#: MainDlg.cpp:471 QueueListCtrl.cpp:52 UploadListCtrl.cpp:52 msgid "File" msgstr "Datei" -#: MainDlg.cpp:469 +#: MainDlg.cpp:472 msgid "Edit" msgstr "Schreibe" -#: MainDlg.cpp:470 +#: MainDlg.cpp:473 msgid "View" msgstr "Betrachte" @@ -462,7 +459,7 @@ msgid "Obtained Parts" msgstr "Erhaltene Teile" -#: SearchListCtrl.cpp:56 ServerWnd.cpp:449 wxInterface_wdr.cpp:139 +#: SearchListCtrl.cpp:56 ServerWnd.cpp:561 wxInterface_wdr.cpp:139 msgid "Name" msgstr "Name" @@ -510,7 +507,7 @@ msgid "Failed" msgstr "Fehlgeschlagen" -#: ServerListCtrl.cpp:56 ServerWnd.cpp:345 +#: ServerListCtrl.cpp:56 ServerWnd.cpp:418 msgid "Static" msgstr "Statisch" @@ -526,147 +523,149 @@ msgid "Version" msgstr "Version" -#: ServerWnd.cpp:191 +#: ServerWnd.cpp:220 #, fuzzy msgid "Add new server" msgstr "Server hinzufügen" -#: ServerWnd.cpp:199 +#: ServerWnd.cpp:234 msgid "Update from URL" msgstr "Update von URL" -#: ServerWnd.cpp:207 +#: ServerWnd.cpp:242 msgid "Server settings" msgstr "Server Optionen" -#: ServerWnd.cpp:215 +#: ServerWnd.cpp:250 #, fuzzy msgid "Port settings" msgstr "Kern Optionen" -#: ServerWnd.cpp:223 +#: ServerWnd.cpp:258 #, fuzzy msgid "Log options" msgstr "Logging Optionen" -#: ServerWnd.cpp:312 +#: ServerWnd.cpp:364 msgid "Autoconnect" msgstr "Automatisch verbinden" -#: ServerWnd.cpp:314 +#: ServerWnd.cpp:369 msgid "" -"Toggle wether application should automatically connect to any server on " +"Toggle wether application should automatically connect \t\tto any server on " "startup" msgstr "" -#: ServerWnd.cpp:320 +#: ServerWnd.cpp:378 msgid "To static only" msgstr "Nur zu statischen" -#: ServerWnd.cpp:322 +#: ServerWnd.cpp:383 msgid "" -"Toggle wether application should connect to servers marked as \"static\" only" +"Toggle wether application should connect \t\tto servers marked as \"static\" " +"only" msgstr "" -#: ServerWnd.cpp:347 +#: ServerWnd.cpp:423 msgid "" -"Set server static. Static servers are not removed from list if they do not " -"respond" +"Set server static. Static servers are not \t\tremoved from list if they do " +"not respond" msgstr "" -#: ServerWnd.cpp:355 +#: ServerWnd.cpp:434 msgid "Priority:" msgstr "Priorität:" -#: ServerWnd.cpp:359 +#: ServerWnd.cpp:440 msgid "High" msgstr "Hoch" -#: ServerWnd.cpp:360 +#: ServerWnd.cpp:441 msgid "Normal" msgstr "Normal" -#: ServerWnd.cpp:361 +#: ServerWnd.cpp:442 msgid "Low" msgstr "Gering" -#: ServerWnd.cpp:365 +#: ServerWnd.cpp:449 msgid "Change server priority" msgstr "" -#: ServerWnd.cpp:395 +#: ServerWnd.cpp:482 msgid "Line limit" msgstr "Liniengrenze" -#: ServerWnd.cpp:397 -msgid "Toggle wether there should be a line limit for log boxes (saves memory)" +#: ServerWnd.cpp:487 +msgid "" +"Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" msgstr "" -#: ServerWnd.cpp:403 +#: ServerWnd.cpp:498 msgid "Maximum number of lines in log boxes" msgstr "" -#: ServerWnd.cpp:409 +#: ServerWnd.cpp:505 msgid "Save to disk" msgstr "Speichern" -#: ServerWnd.cpp:411 +#: ServerWnd.cpp:509 #, fuzzy msgid "Save logs to disc also" msgstr "Speichern" -#: ServerWnd.cpp:415 +#: ServerWnd.cpp:514 msgid "Clear" msgstr "Clear" -#: ServerWnd.cpp:417 +#: ServerWnd.cpp:518 msgid "Clear all logs" msgstr "" -#: ServerWnd.cpp:440 +#: ServerWnd.cpp:543 msgid "IP address:Port" msgstr "IP Adresse:Port" -#: ServerWnd.cpp:445 -msgid "Type in the ip address and port of the new server, separated by :" +#: ServerWnd.cpp:554 +msgid "Type in the ip address and port of the new \t\tserver, separated by `:`" msgstr "" -#: ServerWnd.cpp:454 +#: ServerWnd.cpp:571 msgid "Optional: Enter the name of the new server" msgstr "" -#: ServerWnd.cpp:460 +#: ServerWnd.cpp:578 msgid "Add to List" msgstr "Zur Liste hinzufügen" -#: ServerWnd.cpp:462 +#: ServerWnd.cpp:582 #, fuzzy msgid "Add the server to list" msgstr "Server hinzufügen" -#: ServerWnd.cpp:487 +#: ServerWnd.cpp:619 msgid "Update" msgstr "Update" -#: ServerWnd.cpp:521 +#: ServerWnd.cpp:666 msgid "Enter the TCP port for connections (default: 4662)" msgstr "" -#: ServerWnd.cpp:527 +#: ServerWnd.cpp:677 msgid "Enter the UDP port for connections (default: 4672)" msgstr "" -#: ServerWnd.cpp:537 +#: ServerWnd.cpp:689 msgid "Disable" msgstr "" -#: ServerWnd.cpp:539 +#: ServerWnd.cpp:694 msgid "" -"Disable UDP port. This can somewhat lower traffic, but also results in less " -"sources as client<->client source exchange is done via UDP" +"Disable UDP port. This can somewhat lower traffic, \t\tbut also results in " +"less sources as client<->client source \t\texchange is done via UDP" msgstr "" -#: ServerWnd.cpp:547 +#: ServerWnd.cpp:706 msgid "Apply changes" msgstr "" Index: Spanish.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Spanish.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Spanish.po 30 Nov 2003 18:19:53 -0000 1.1 +++ Spanish.po 1 Dec 2003 20:39:48 -0000 1.2 @@ -10,14 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: spanish\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-11-24 20:00+0200\n" +"POT-Creation-Date: 2003-12-01 22:36+0200\n" "PO-Revision-Date: 2003-12-01 18:40+0100\n" -"Last-Translator: José MarÃa RodrÃguez Gutiérrez (thorero) <tho...@ho...>\n" +"Last-Translator: José MarÃa RodrÃguez Gutiérrez (thorero) <thorerocs@hotmail." +"com>\n" "Language-Team: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.3\n" #: DownloadListCtrl.cpp:52 SharedFilesListCtrl.cpp:52 @@ -73,249 +74,277 @@ msgid "Category" msgstr "CategorÃa" -#: GUISettingsDlg.cpp:289 GUISettingsDlg.cpp:372 +#: GUISettingsDlg.cpp:312 GUISettingsDlg.cpp:402 msgid "Add new language" msgstr "Añadir nuevo idioma" -#: GUISettingsDlg.cpp:305 +#: GUISettingsDlg.cpp:328 #, c-format msgid "" "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 "¿Estás seguro de quitar este idioma? \t\t%s de la lista de idiomas?\n\t\tEl idioma actual no sera borrado" +msgstr "" +"¿Estás seguro de quitar este idioma? \t\t%s de la lista de idiomas?\n" +"\t\tEl idioma actual no sera borrado" -#: GUISettingsDlg.cpp:310 +#: GUISettingsDlg.cpp:333 msgid "Confirm remove language" msgstr "Confirmar borrar idioma" -#: GUISettingsDlg.cpp:323 GUISettingsDlg.cpp:400 +#: GUISettingsDlg.cpp:346 GUISettingsDlg.cpp:439 msgid "Add new iconset" msgstr "Añadir nuevo icono" -#: GUISettingsDlg.cpp:339 +#: GUISettingsDlg.cpp:362 #, c-format msgid "" "Are you sure you wish to remove iconset \t\t%s from the list of iconsets?\n" "\t\tThe actual iconset files will not be deleted." -msgstr "¿Estas seguro de borrar este icono? \t\t%s de la lista de icono?\n\t\tEl icono actual no será borrado" +msgstr "" +"¿Estas seguro de borrar este icono? \t\t%s de la lista de icono?\n" +"\t\tEl icono actual no será borrado" -#: GUISettingsDlg.cpp:345 +#: GUISettingsDlg.cpp:368 msgid "Confirm remove iconset" msgstr "Confirmar borrar idioma" -#: GUISettingsDlg.cpp:358 +#: GUISettingsDlg.cpp:381 msgid "Language" msgstr "Idioma" -#: GUISettingsDlg.cpp:364 +#: GUISettingsDlg.cpp:390 +#, fuzzy msgid "" -"Change the language of the interface. Requires interface restart to take " +"Change the language of the interface. Requires interface \t\trestart to take " "effect" -msgstr "Cambiar el idioma del interface. Debes reiniciar el interface para que tenga efecto" +msgstr "" +"Cambiar el idioma del interface. Debes reiniciar el interface para que tenga " +"efecto" -#: GUISettingsDlg.cpp:370 GUISettingsDlg.cpp:398 +#: GUISettingsDlg.cpp:398 GUISettingsDlg.cpp:435 msgid "Add" msgstr "Añadir" -#: GUISettingsDlg.cpp:376 GUISettingsDlg.cpp:404 +#: GUISettingsDlg.cpp:407 GUISettingsDlg.cpp:444 msgid "Remove" msgstr "Borrar" -#: GUISettingsDlg.cpp:378 +#: GUISettingsDlg.cpp:411 msgid "Remove currently selected language" msgstr "Borrar idioma seleccionado actualmente" -#: GUISettingsDlg.cpp:386 +#: GUISettingsDlg.cpp:419 msgid "Icon set" msgstr "Elegir icono" -#: GUISettingsDlg.cpp:392 -msgid "Change the iconet the interface should use. Requires restart to take effect" -msgstr "Cambiar el icono que usa el interface. Debes reiniciar para que tenga efecto" +#: GUISettingsDlg.cpp:428 +#, fuzzy +msgid "Change the iconet the interface should use." +msgstr "" +"Cambiar el icono que usa el interface. Debes reiniciar para que tenga efecto" -#: GUISettingsDlg.cpp:406 +#: GUISettingsDlg.cpp:448 msgid "Remove currently selected iconset" msgstr "Borrar último iconset seleccionado" -#: GUISettingsDlg.cpp:418 +#: GUISettingsDlg.cpp:460 msgid "Font" msgstr "Fuente" -#: GUISettingsDlg.cpp:422 +#: GUISettingsDlg.cpp:464 msgid "Default" msgstr "Predeterminado" -#: GUISettingsDlg.cpp:426 +#: GUISettingsDlg.cpp:471 msgid "Change the font" msgstr "Cambiar la fuente" -#: GUISettingsDlg.cpp:430 +#: GUISettingsDlg.cpp:476 msgid "Font Test :)" msgstr "Probar fuente :)" -#: GUISettingsDlg.cpp:435 +#: GUISettingsDlg.cpp:483 msgid "Startup page" msgstr "Iniciar página" -#: GUISettingsDlg.cpp:439 wxInterface_wdr.cpp:158 +#: GUISettingsDlg.cpp:487 wxInterface_wdr.cpp:158 msgid "Server" msgstr "Servidor" -#: GUISettingsDlg.cpp:440 Images.cpp:150 MainDlg.cpp:267 MainDlg.cpp:419 -#: MainDlg.cpp:426 +#: GUISettingsDlg.cpp:488 Images.cpp:293 MainDlg.cpp:278 MainDlg.cpp:420 +#: MainDlg.cpp:427 msgid "Transfer" msgstr "Transferencia" -#: GUISettingsDlg.cpp:441 Images.cpp:149 MainDlg.cpp:263 MainDlg.cpp:418 -#: MainDlg.cpp:425 wxInterface_wdr.cpp:136 +#: GUISettingsDlg.cpp:489 Images.cpp:291 MainDlg.cpp:272 MainDlg.cpp:419 +#: MainDlg.cpp:426 wxInterface_wdr.cpp:136 msgid "Search" msgstr "Buscar" -#: GUISettingsDlg.cpp:442 Images.cpp:151 MainDlg.cpp:271 MainDlg.cpp:420 -#: MainDlg.cpp:427 wxInterface_wdr.cpp:350 +#: GUISettingsDlg.cpp:490 Images.cpp:295 MainDlg.cpp:284 MainDlg.cpp:421 +#: MainDlg.cpp:428 wxInterface_wdr.cpp:350 msgid "Shared Files" msgstr "Compartidos" -#: GUISettingsDlg.cpp:443 MainDlg.cpp:275 MainDlg.cpp:421 MainDlg.cpp:428 +#: GUISettingsDlg.cpp:491 MainDlg.cpp:290 MainDlg.cpp:422 MainDlg.cpp:429 #: wxInterface_wdr.cpp:497 msgid "Messages" msgstr "Mensages" -#: GUISettingsDlg.cpp:444 Images.cpp:153 MainDlg.cpp:279 MainDlg.cpp:422 -#: MainDlg.cpp:429 wxInterface_wdr.cpp:358 +#: GUISettingsDlg.cpp:492 Images.cpp:299 MainDlg.cpp:296 MainDlg.cpp:423 +#: MainDlg.cpp:430 wxInterface_wdr.cpp:358 msgid "Statistics" msgstr "EstadÃsticas" -#: GUISettingsDlg.cpp:448 +#: GUISettingsDlg.cpp:500 msgid "Set which page will be displayed on program startup" msgstr "Elegir que página debe ser mostrada al inciar el programa" -#: GUISettingsDlg.cpp:452 +#: GUISettingsDlg.cpp:506 msgid "Remember last" msgstr "Recordar útimo" -#: GUISettingsDlg.cpp:454 -msgid "Automatically remember which page was open between sessions" +#: GUISettingsDlg.cpp:511 +#, fuzzy +msgid "Automatically remember which page was \t\topen between sessions" msgstr "Recordar automaticamente que páginas se abren en las sesiones" -#: GUISettingsDlg.cpp:464 +#: GUISettingsDlg.cpp:523 msgid "Show splashscreen" msgstr "Mostrar imagen de incio" -#: GUISettingsDlg.cpp:467 +#: GUISettingsDlg.cpp:529 +#, fuzzy msgid "" -"Toggle wether splashscreen should be shown on program startup or not. Speeds " -"up application starting if turned off. Default: On" -msgstr "Elegir si la la pantalla de inicio debe ser mostrada al iniciar o no. La aplicación se iniciará mas rápisi si eliges no. Predeterminado. Si" +"Toggle wether splashscreen should be shown on program \t\tstartup or not. " +"Speeds up application starting if turned off. \t\tDefault: On" +msgstr "" +"Elegir si la la pantalla de inicio debe ser mostrada al iniciar o no. La " +"aplicación se iniciará mas rápisi si eliges no. Predeterminado. Si" -#: GUISettingsDlg.cpp:471 +#: GUISettingsDlg.cpp:537 msgid "Prompt on exit" msgstr "Preguntar al salir" -#: GUISettingsDlg.cpp:473 -msgid "Toggle wether confirmation is requested when closing program." +#: GUISettingsDlg.cpp:542 +#, fuzzy +msgid "Toggle wether confirmation is requested \t\twhen closing program." msgstr "Elegir si se pide confirmación al cerrar el programa" -#: GUISettingsDlg.cpp:479 MainDlg.cpp:437 +#: GUISettingsDlg.cpp:554 MainDlg.cpp:438 msgid "Show ToolBar" msgstr "Mostrar barra de herramientas" -#: GUISettingsDlg.cpp:482 -msgid "Toggle wether toolbar is shown or not. Requires restart to take effect." -msgstr "Elegir si se muestra la barra de herramientas o no. Debes reiniciar para que tome efecto" +#: GUISettingsDlg.cpp:559 +#, fuzzy +msgid "Toggle wether toolbar is shown or not." +msgstr "" +"Elegir si se muestra la barra de herramientas o no. Debes reiniciar para que " +"tome efecto" -#: GUISettingsDlg.cpp:487 MainDlg.cpp:444 MainDlg.cpp:456 +#: GUISettingsDlg.cpp:567 MainDlg.cpp:445 MainDlg.cpp:459 msgid "Horizontal" msgstr "Horizontal" -#: GUISettingsDlg.cpp:488 MainDlg.cpp:447 MainDlg.cpp:457 +#: GUISettingsDlg.cpp:568 MainDlg.cpp:448 MainDlg.cpp:460 msgid "Vertical" msgstr "Vertical" -#: GUISettingsDlg.cpp:492 +#: GUISettingsDlg.cpp:576 +#, fuzzy msgid "" -"Horizontal tooltip is shown on top of window (default), vertical is shown on " -"the left side of window. Requires restart to take effect." -msgstr "El tooltip horizontal se muestra en la parte superior de la ventana (predeterminado) el bertical se muestra a la izquierda de la ventana. Debes reiniciar para que toma efecto" +"Horizontal tooltip is shown on top of window (default),\t\tvertical is shown " +"on the left side of window." +msgstr "" +"El tooltip horizontal se muestra en la parte superior de la ventana " +"(predeterminado) el bertical se muestra a la izquierda de la ventana. Debes " +"reiniciar para que toma efecto" -#: GUISettingsDlg.cpp:498 MainDlg.cpp:433 +#: GUISettingsDlg.cpp:587 MainDlg.cpp:434 msgid "Show MenuBar" msgstr "Mostrar barra de menu" -#: GUISettingsDlg.cpp:500 -msgid "" -"Toggle wether menubar (file/view etc) should be shown or not. Requires " -"restart to take effect." -msgstr "Elegir si se muestra la barra de menu (archivo/vista/etc) o no. Debes reiniciar para que tome efecto" +#: GUISettingsDlg.cpp:592 +#, fuzzy +msgid "Toggle wether menubar (file/view etc) \t\tshould be shown or not." +msgstr "" +"Elegir si se muestra la barra de menu (archivo/vista/etc) o no. Debes " +"reiniciar para que tome efecto" -#: GUISettingsDlg.cpp:508 wxInterface_wdr.cpp:796 wxInterface_wdr.cpp:838 +#: GUISettingsDlg.cpp:606 wxInterface_wdr.cpp:796 wxInterface_wdr.cpp:838 msgid "OK" msgstr "OK" -#: GUISettingsDlg.cpp:511 +#: GUISettingsDlg.cpp:610 msgid "Save settings and close dialog" msgstr "Salvar opciones y cerrar" -#: GUISettingsDlg.cpp:515 wxInterface_wdr.cpp:274 wxInterface_wdr.cpp:800 +#: GUISettingsDlg.cpp:615 wxInterface_wdr.cpp:274 wxInterface_wdr.cpp:800 #: wxInterface_wdr.cpp:842 msgid "Cancel" msgstr "Cancelar" -#: GUISettingsDlg.cpp:517 +#: GUISettingsDlg.cpp:619 msgid "Abort changes and close dialog" msgstr "Deshacer cambios y cerrar" -#: GUISettingsDlg.cpp:564 +#: GUISettingsDlg.cpp:666 msgid "" "You need to enter the name for your new language!\n" "\t\t\tIf you no longer wish to add a language, click\t\t\t'Cancel'" -msgstr "Debes introducir el nombre del nuevo idioma\n\t\t\tsi no tienes ningún deseo más para añadir el idioma, marca\t\t\t'Cancelar'" +msgstr "" +"Debes introducir el nombre del nuevo idioma\n" +"\t\t\tsi no tienes ningún deseo más para añadir el idioma, marca\t\t" +"\t'Cancelar'" -#: GUISettingsDlg.cpp:567 +#: GUISettingsDlg.cpp:669 msgid "Missing information" msgstr "Información desconocida" -#: GUISettingsDlg.cpp:579 +#: GUISettingsDlg.cpp:681 #, c-format msgid "The file %s does not exist.\n" msgstr "El archivo %s no existe \n" -#: GUISettingsDlg.cpp:581 +#: GUISettingsDlg.cpp:683 msgid "" "Please make sure you specified correct name, and\t\t\t the\n" "translated and compiled .mo file exists in\t\t\t lang subdir." -msgstr "Por favor comprueba que el nombre especificado es correcto, y\t\t\t el\n archivo de traducción .mo existe y está compilado en\t\t\t el subdirectorio lang" +msgstr "" +"Por favor comprueba que el nombre especificado es correcto, y\t\t\t el\n" +" archivo de traducción .mo existe y está compilado en\t\t\t el subdirectorio " +"lang" -#: GUISettingsDlg.cpp:584 +#: GUISettingsDlg.cpp:686 msgid "File not found" msgstr "Archivo no encontrado" -#: GUISettingsDlg.cpp:595 +#: GUISettingsDlg.cpp:697 #, c-format msgid "New language %s added.\n" msgstr "Nuevo idioma %s añadido.\n" -#: GUISettingsDlg.cpp:596 +#: GUISettingsDlg.cpp:698 msgid "Please restart the interface to test your new language!" msgstr "Por favor reincie el interface para probar el nuevo idioma!" -#: GUISettingsDlg.cpp:597 +#: GUISettingsDlg.cpp:699 msgid "Success!" msgstr "Echo!" -#: Images.cpp:147 MainDlg.cpp:254 MainDlg.cpp:407 +#: Images.cpp:287 MainDlg.cpp:259 MainDlg.cpp:408 msgid "Connect" msgstr "Conectar" -#: Images.cpp:148 MainDlg.cpp:259 MainDlg.cpp:417 MainDlg.cpp:424 +#: Images.cpp:289 MainDlg.cpp:266 MainDlg.cpp:418 MainDlg.cpp:425 msgid "Servers" msgstr "Servidores" -#: Images.cpp:152 +#: Images.cpp:297 msgid "Messaging" msgstr "Mensajes" -#: Images.cpp:154 MainDlg.cpp:283 MainDlg.cpp:351 MainDlg.cpp:412 +#: Images.cpp:301 MainDlg.cpp:303 MainDlg.cpp:352 MainDlg.cpp:413 msgid "Preferences" msgstr "Opciones" @@ -347,71 +376,71 @@ msgid "Userhash" msgstr "Hash de usuario" -#: MainDlg.cpp:255 +#: MainDlg.cpp:262 msgid "Connect to any server" msgstr "Conectar con cualquier servidor" -#: MainDlg.cpp:260 +#: MainDlg.cpp:269 msgid "Server list" msgstr "Lista de servidores" -#: MainDlg.cpp:264 +#: MainDlg.cpp:275 msgid "Search files" msgstr "Buscar archivos" -#: MainDlg.cpp:268 +#: MainDlg.cpp:281 msgid "File Transfer" msgstr "Archivo transferido" -#: MainDlg.cpp:272 +#: MainDlg.cpp:287 msgid "Show shared files" msgstr "Mostrar archivos compartidos" -#: MainDlg.cpp:276 +#: MainDlg.cpp:293 msgid "Chatting" msgstr "Conversar" -#: MainDlg.cpp:280 +#: MainDlg.cpp:299 msgid "Show live statistics" msgstr "Mostrar estadÃsticas activas" -#: MainDlg.cpp:284 +#: MainDlg.cpp:306 msgid "Modify settings" msgstr "Cambiar opciones" -#: MainDlg.cpp:327 +#: MainDlg.cpp:328 msgid "Close ShareDaemon wxInterface?" msgstr "¿Cerrar ShareDaemon wxInterface?" -#: MainDlg.cpp:328 +#: MainDlg.cpp:329 msgid "Question" msgstr "Pregunta" -#: MainDlg.cpp:408 SysTray.cpp:70 +#: MainDlg.cpp:409 SysTray.cpp:70 msgid "Quit" msgstr "Salir" -#: MainDlg.cpp:460 +#: MainDlg.cpp:463 msgid "ToolBar Alignment" msgstr "Alineamiento de la barra de herramientas" -#: MainDlg.cpp:464 MainDlg.cpp:471 SysTray.cpp:69 +#: MainDlg.cpp:467 MainDlg.cpp:474 SysTray.cpp:69 msgid "Help" msgstr "Ayuda" -#: MainDlg.cpp:465 +#: MainDlg.cpp:468 msgid "About..." msgstr "Sobre.." -#: MainDlg.cpp:468 QueueListCtrl.cpp:52 UploadListCtrl.cpp:52 +#: MainDlg.cpp:471 QueueListCtrl.cpp:52 UploadListCtrl.cpp:52 msgid "File" msgstr "Archivo" -#: MainDlg.cpp:469 +#: MainDlg.cpp:472 msgid "Edit" msgstr "Editar" -#: MainDlg.cpp:470 +#: MainDlg.cpp:473 msgid "View" msgstr "Ver" @@ -447,7 +476,7 @@ msgid "Obtained Parts" msgstr "Partes Obtenidas" -#: SearchListCtrl.cpp:56 ServerWnd.cpp:449 wxInterface_wdr.cpp:139 +#: SearchListCtrl.cpp:56 ServerWnd.cpp:561 wxInterface_wdr.cpp:139 msgid "Name" msgstr "Nombre" @@ -495,7 +524,7 @@ msgid "Failed" msgstr "Fallo" -#: ServerListCtrl.cpp:56 ServerWnd.cpp:345 +#: ServerListCtrl.cpp:56 ServerWnd.cpp:418 msgid "Static" msgstr "Fijo" @@ -511,141 +540,157 @@ msgid "Version" msgstr "Versión" -#: ServerWnd.cpp:191 +#: ServerWnd.cpp:220 msgid "Add new server" msgstr "Añadir nuevo servidor" -#: ServerWnd.cpp:199 +#: ServerWnd.cpp:234 msgid "Update from URL" msgstr "Actualizar desde una URL" -#: ServerWnd.cpp:207 +#: ServerWnd.cpp:242 msgid "Server settings" msgstr "Ajustes del servidor" -#: ServerWnd.cpp:215 +#: ServerWnd.cpp:250 msgid "Port settings" msgstr "Ajustes del puerto" -#: ServerWnd.cpp:223 +#: ServerWnd.cpp:258 msgid "Log options" msgstr "Opciones del log" -#: ServerWnd.cpp:312 +#: ServerWnd.cpp:364 msgid "Autoconnect" msgstr "Autoconectar" -#: ServerWnd.cpp:314 +#: ServerWnd.cpp:369 +#, fuzzy msgid "" -"Toggle wether application should automatically connect to any server on " +"Toggle wether application should automatically connect \t\tto any server on " "startup" msgstr "Elegir si el programa debe autoconectarse a un servidor al inciarse" -#: ServerWnd.cpp:320 +#: ServerWnd.cpp:378 msgid "To static only" msgstr "Solo a fijos" -#: ServerWnd.cpp:322 -msgid "Toggle wether application should connect to servers marked as \"static\" only" +#: ServerWnd.cpp:383 +#, fuzzy +msgid "" +"Toggle wether application should connect \t\tto servers marked as \"static\" " +"only" msgstr "Elegir si el programa debe conectar solo a servidores \"fijos\"" -#: ServerWnd.cpp:347 +#: ServerWnd.cpp:423 +#, fuzzy msgid "" -"Set server static. Static servers are not removed from list if they do not " -"respond" -msgstr "Marcar servidor fijo. Servidores fijos no son borrados de la lista aunque no respondan" +"Set server static. Static servers are not \t\tremoved from list if they do " +"not respond" +msgstr "" +"Marcar servidor fijo. Servidores fijos no son borrados de la lista aunque no " +"respondan" -#: ServerWnd.cpp:355 +#: ServerWnd.cpp:434 msgid "Priority:" msgstr "Prioridad" -#: ServerWnd.cpp:359 +#: ServerWnd.cpp:440 msgid "High" msgstr "Alta" -#: ServerWnd.cpp:360 +#: ServerWnd.cpp:441 msgid "Normal" msgstr "Normal" -#: ServerWnd.cpp:361 +#: ServerWnd.cpp:442 msgid "Low" msgstr "Baja" -#: ServerWnd.cpp:365 +#: ServerWnd.cpp:449 msgid "Change server priority" msgstr "Cambiar la prioridad del servidor" -#: ServerWnd.cpp:395 +#: ServerWnd.cpp:482 msgid "Line limit" msgstr "LÃmite de lÃnea" -#: ServerWnd.cpp:397 -msgid "Toggle wether there should be a line limit for log boxes (saves memory)" -msgstr "Elegir si debe haber un lÃmite de lÃnea si para las ventanas del registro (ahorra memoria)" +#: ServerWnd.cpp:487 +#, fuzzy +msgid "" +"Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" +msgstr "" +"Elegir si debe haber un lÃmite de lÃnea si para las ventanas del registro " +"(ahorra memoria)" -#: ServerWnd.cpp:403 +#: ServerWnd.cpp:498 msgid "Maximum number of lines in log boxes" msgstr "Número máximo de lÃneas en la ventana del registro" -#: ServerWnd.cpp:409 +#: ServerWnd.cpp:505 msgid "Save to disk" msgstr "Salvar al disco" -#: ServerWnd.cpp:411 +#: ServerWnd.cpp:509 msgid "Save logs to disc also" msgstr "Salvar también el registro al disco" -#: ServerWnd.cpp:415 +#: ServerWnd.cpp:514 msgid "Clear" msgstr "Limpiar" -#: ServerWnd.cpp:417 +#: ServerWnd.cpp:518 msgid "Clear all logs" msgstr "Limpiar todos los registros" -#: ServerWnd.cpp:440 +#: ServerWnd.cpp:543 msgid "IP address:Port" msgstr "Dirección IP:Puerto" -#: ServerWnd.cpp:445 -msgid "Type in the ip address and port of the new server, separated by :" -msgstr "Escriba la dirección ip y el puerto del nuevo servidor, serparado por :" +#: ServerWnd.cpp:554 +#, fuzzy +msgid "Type in the ip address and port of the new \t\tserver, separated by `:`" +msgstr "" +"Escriba la dirección ip y el puerto del nuevo servidor, serparado por :" -#: ServerWnd.cpp:454 +#: ServerWnd.cpp:571 msgid "Optional: Enter the name of the new server" msgstr "Opcional: Introduzca el nombre del servidor" -#: ServerWnd.cpp:460 +#: ServerWnd.cpp:578 msgid "Add to List" msgstr "Añadir a la lista" -#: ServerWnd.cpp:462 +#: ServerWnd.cpp:582 msgid "Add the server to list" msgstr "Añadir el servidor a la lista" -#: ServerWnd.cpp:487 +#: ServerWnd.cpp:619 msgid "Update" msgstr "Actualizar" -#: ServerWnd.cpp:521 +#: ServerWnd.cpp:666 msgid "Enter the TCP port for connections (default: 4662)" msgstr "Introduzca el puerto de conexión TCP (predeterminado: 4662)" -#: ServerWnd.cpp:527 +#: ServerWnd.cpp:677 msgid "Enter the UDP port for connections (default: 4672)" msgstr "Introduzca el puerto de conexión UDP (predeterminado: 4672)" -#: ServerWnd.cpp:537 +#: ServerWnd.cpp:689 msgid "Disable" msgstr "Desactivar" -#: ServerWnd.cpp:539 +#: ServerWnd.cpp:694 +#, fuzzy msgid "" -"Disable UDP port. This can somewhat lower traffic, but also results in less " -"sources as client<->client source exchange is done via UDP" -msgstr "Desactivar el puerto UDP. Esto puede reducir el tráfico, pero también da lugar a menos fuentes <->el intercambio de fientes se hace vÃa UDP" +"Disable UDP port. This can somewhat lower traffic, \t\tbut also results in " +"less sources as client<->client source \t\texchange is done via UDP" +msgstr "" +"Desactivar el puerto UDP. Esto puede reducir el tráfico, pero también da " +"lugar a menos fuentes <->el intercambio de fientes se hace vÃa UDP" -#: ServerWnd.cpp:547 +#: ServerWnd.cpp:706 msgid "Apply changes" msgstr "Aplicar cambios" @@ -882,7 +927,8 @@ "iconset name is MyNewIconSet, it will be looked for in\n" "images/mynewiconset dir." msgstr "" -"Por favor introduzca el nombre paea su nuevo icono elegido en el bloque de abajo\n" +"Por favor introduzca el nombre paea su nuevo icono elegido en el bloque de " +"abajo\n" "Los archivos de icono deben ser formato PNG y los nombres deben\n" "coincidir con los que hay en otros paquetes. Los archivos deben observarse\n" "en /imágenes/tuiconoelegidonombre (minúsculas!!). Asi que si tu\n" @@ -900,4 +946,3 @@ #: wxInterface_wdr.cpp:916 msgid "Disconnected" msgstr "Desconectado" - Index: empty.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/empty.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- empty.po 25 Nov 2003 04:18:59 -0000 1.2 +++ empty.po 1 Dec 2003 20:39:48 -0000 1.3 @@ -7,8 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-11-24 20:00+0200\n" +"POT-Creation-Date: 2003-12-01 22:36+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" @@ -69,250 +68,247 @@ msgid "Category" msgstr "" -#: GUISettingsDlg.cpp:289 GUISettingsDlg.cpp:372 +#: GUISettingsDlg.cpp:312 GUISettingsDlg.cpp:402 msgid "Add new language" msgstr "" -#: GUISettingsDlg.cpp:305 +#: GUISettingsDlg.cpp:328 #, c-format msgid "" "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 "" -#: GUISettingsDlg.cpp:310 +#: GUISettingsDlg.cpp:333 msgid "Confirm remove language" msgstr "" -#: GUISettingsDlg.cpp:323 GUISettingsDlg.cpp:400 +#: GUISettingsDlg.cpp:346 GUISettingsDlg.cpp:439 msgid "Add new iconset" msgstr "" -#: GUISettingsDlg.cpp:339 +#: GUISettingsDlg.cpp:362 #, c-format msgid "" "Are you sure you wish to remove iconset \t\t%s from the list of iconsets?\n" "\t\tThe actual iconset files will not be deleted." msgstr "" -#: GUISettingsDlg.cpp:345 +#: GUISettingsDlg.cpp:368 msgid "Confirm remove iconset" msgstr "" -#: GUISettingsDlg.cpp:358 +#: GUISettingsDlg.cpp:381 msgid "Language" msgstr "" -#: GUISettingsDlg.cpp:364 +#: GUISettingsDlg.cpp:390 msgid "" -"Change the language of the interface. Requires interface restart to take " +"Change the language of the interface. Requires interface \t\trestart to take " "effect" msgstr "" -#: GUISettingsDlg.cpp:370 GUISettingsDlg.cpp:398 +#: GUISettingsDlg.cpp:398 GUISettingsDlg.cpp:435 msgid "Add" msgstr "" -#: GUISettingsDlg.cpp:376 GUISettingsDlg.cpp:404 +#: GUISettingsDlg.cpp:407 GUISettingsDlg.cpp:444 msgid "Remove" msgstr "" -#: GUISettingsDlg.cpp:378 +#: GUISettingsDlg.cpp:411 msgid "Remove currently selected language" msgstr "" -#: GUISettingsDlg.cpp:386 +#: GUISettingsDlg.cpp:419 msgid "Icon set" msgstr "" -#: GUISettingsDlg.cpp:392 -msgid "" -"Change the iconet the interface should use. Requires restart to take effect" +#: GUISettingsDlg.cpp:428 +msgid "Change the iconet the interface should use." msgstr "" -#: GUISettingsDlg.cpp:406 +#: GUISettingsDlg.cpp:448 msgid "Remove currently selected iconset" msgstr "" -#: GUISettingsDlg.cpp:418 +#: GUISettingsDlg.cpp:460 msgid "Font" msgstr "" -#: GUISettingsDlg.cpp:422 +#: GUISettingsDlg.cpp:464 msgid "Default" msgstr "" -#: GUISettingsDlg.cpp:426 +#: GUISettingsDlg.cpp:471 msgid "Change the font" msgstr "" -#: GUISettingsDlg.cpp:430 +#: GUISettingsDlg.cpp:476 msgid "Font Test :)" msgstr "" -#: GUISettingsDlg.cpp:435 +#: GUISettingsDlg.cpp:483 msgid "Startup page" msgstr "" -#: GUISettingsDlg.cpp:439 wxInterface_wdr.cpp:158 +#: GUISettingsDlg.cpp:487 wxInterface_wdr.cpp:158 msgid "Server" msgstr "" -#: GUISettingsDlg.cpp:440 Images.cpp:150 MainDlg.cpp:267 MainDlg.cpp:419 -#: MainDlg.cpp:426 +#: GUISettingsDlg.cpp:488 Images.cpp:293 MainDlg.cpp:278 MainDlg.cpp:420 +#: MainDlg.cpp:427 msgid "Transfer" msgstr "" -#: GUISettingsDlg.cpp:441 Images.cpp:149 MainDlg.cpp:263 MainDlg.cpp:418 -#: MainDlg.cpp:425 wxInterface_wdr.cpp:136 +#: GUISettingsDlg.cpp:489 Images.cpp:291 MainDlg.cpp:272 MainDlg.cpp:419 +#: MainDlg.cpp:426 wxInterface_wdr.cpp:136 msgid "Search" msgstr "" -#: GUISettingsDlg.cpp:442 Images.cpp:151 MainDlg.cpp:271 MainDlg.cpp:420 -#: MainDlg.cpp:427 wxInterface_wdr.cpp:350 +#: GUISettingsDlg.cpp:490 Images.cpp:295 MainDlg.cpp:284 MainDlg.cpp:421 +#: MainDlg.cpp:428 wxInterface_wdr.cpp:350 msgid "Shared Files" msgstr "" -#: GUISettingsDlg.cpp:443 MainDlg.cpp:275 MainDlg.cpp:421 MainDlg.cpp:428 +#: GUISettingsDlg.cpp:491 MainDlg.cpp:290 MainDlg.cpp:422 MainDlg.cpp:429 #: wxInterface_wdr.cpp:497 msgid "Messages" msgstr "" -#: GUISettingsDlg.cpp:444 Images.cpp:153 MainDlg.cpp:279 MainDlg.cpp:422 -#: MainDlg.cpp:429 wxInterface_wdr.cpp:358 +#: GUISettingsDlg.cpp:492 Images.cpp:299 MainDlg.cpp:296 MainDlg.cpp:423 +#: MainDlg.cpp:430 wxInterface_wdr.cpp:358 msgid "Statistics" msgstr "" -#: GUISettingsDlg.cpp:448 +#: GUISettingsDlg.cpp:500 msgid "Set which page will be displayed on program startup" msgstr "" -#: GUISettingsDlg.cpp:452 +#: GUISettingsDlg.cpp:506 msgid "Remember last" msgstr "" -#: GUISettingsDlg.cpp:454 -msgid "Automatically remember which page was open between sessions" +#: GUISettingsDlg.cpp:511 +msgid "Automatically remember which page was \t\topen between sessions" msgstr "" -#: GUISettingsDlg.cpp:464 +#: GUISettingsDlg.cpp:523 msgid "Show splashscreen" msgstr "" -#: GUISettingsDlg.cpp:467 +#: GUISettingsDlg.cpp:529 msgid "" -"Toggle wether splashscreen should be shown on program startup or not. Speeds " -"up application starting if turned off. Default: On" +"Toggle wether splashscreen should be shown on program \t\tstartup or not. " +"Speeds up application starting if turned off. \t\tDefault: On" msgstr "" -#: GUISettingsDlg.cpp:471 +#: GUISettingsDlg.cpp:537 msgid "Prompt on exit" msgstr "" -#: GUISettingsDlg.cpp:473 -msgid "Toggle wether confirmation is requested when closing program." +#: GUISettingsDlg.cpp:542 +msgid "Toggle wether confirmation is requested \t\twhen closing program." msgstr "" -#: GUISettingsDlg.cpp:479 MainDlg.cpp:437 +#: GUISettingsDlg.cpp:554 MainDlg.cpp:438 msgid "Show ToolBar" msgstr "" -#: GUISettingsDlg.cpp:482 -msgid "Toggle wether toolbar is shown or not. Requires restart to take effect." +#: GUISettingsDlg.cpp:559 +msgid "Toggle wether toolbar is shown or not." msgstr "" -#: GUISettingsDlg.cpp:487 MainDlg.cpp:444 MainDlg.cpp:456 +#: GUISettingsDlg.cpp:567 MainDlg.cpp:445 MainDlg.cpp:459 msgid "Horizontal" msgstr "" -#: GUISettingsDlg.cpp:488 MainDlg.cpp:447 MainDlg.cpp:457 +#: GUISettingsDlg.cpp:... [truncated message content] |
|
From: <ma...@us...> - 2003-12-01 18:35:05
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv27742 Modified Files: AUTHORS Log Message: Added translators Index: AUTHORS =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/AUTHORS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AUTHORS 24 Nov 2003 17:34:02 -0000 1.1 +++ AUTHORS 1 Dec 2003 18:35:02 -0000 1.2 @@ -4,3 +4,9 @@ Original code author: Alo Sarv <ma...@us...> +Translators: +------------ +Estonian: Alo Sarv +Spanish: Chema Rodriguez +German: Seneca + |
|
From: <ma...@us...> - 2003-12-01 13:05:18
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27158
Modified Files:
ColorFrameCtrl.h
Log Message:
Fixed win32 type definition issues
Index: ColorFrameCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ColorFrameCtrl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ColorFrameCtrl.h 20 Nov 2003 01:27:26 -0000 1.6
+++ ColorFrameCtrl.h 1 Dec 2003 13:05:14 -0000 1.7
@@ -28,12 +28,12 @@
#define RGB(a,b,c) ((a&0xff)<<16|(b&0xff)<<8|(c&0xff))
#endif
typedef unsigned int UINT;
-typedef unsigned long DWORD;
-typedef UINT* UINT_PTR;
-typedef struct _RECT {
+typedef unsigned long DWORD;
+
+typedef struct _rectangle {
UINT left,top,right,bottom;
-} RECT;
-typedef RECT* LPRECT;
+} rectangle;
+typedef rectangle* lprectangle;
class CColorFrameCtrl : public wxControl {
public:
@@ -50,7 +50,7 @@
void OnPaint(wxPaintEvent& evt);
void OnSize(wxSizeEvent& evt);
DECLARE_EVENT_TABLE()
- RECT m_rectClient;
+ rectangle m_rectClient;
wxBrush m_brushBack,m_brushFrame;
};
|
|
From: <ma...@us...> - 2003-11-30 23:20:02
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28415
Modified Files:
Images.cpp
Log Message:
Font fix for wxMac
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Images.cpp 30 Nov 2003 23:07:27 -0000 1.31
+++ Images.cpp 30 Nov 2003 23:19:59 -0000 1.32
@@ -308,8 +308,18 @@
tmp = wxBitmap(100, 100);
mdc.SelectObject(tmp);
+ /**
+ * Set font to what it will be in final bitmaps and measre the lengths
+ * of all button labels to find out the final width of the image.
+ * wxMac seems to have problems with wxDECORATIVE and/or wxBOLD
+ * fonts, we fall back to wxDEFAULT/wxNORMAL.
+ */
mdc.SetTextForeground(wxColour(10, 10, 10));
- mdc.SetFont(wxFont(10, wxDECORATIVE, wxNORMAL, wxBOLD));
+ #ifdef __WXMAC__
+ mdc.SetFont(wxFont(10, wxDEFAULT, wxNORMAL, wxNORMAL));
+ #else
+ mdc.SetFont(wxFont(10, wxDECORATIVE, wxNORMAL, wxBOLD));
+ #endif
for (unsigned int i=0;i<btntxt.GetCount();i++) {
mdc.GetTextExtent(btntxt.Item(i), &x, &y);
if (x > width) {
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26282
Modified Files:
GUISettingsDlg.cpp Images.cpp MainDlg.cpp MainDlg.h
ServerWnd.cpp StatisticsTreeCtrl.cpp StatisticsWnd.h
Log Message:
Reformatted code to fit in 80-char-per-line limit.
Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- GUISettingsDlg.cpp 30 Nov 2003 21:04:38 -0000 1.24
+++ GUISettingsDlg.cpp 30 Nov 2003 23:07:27 -0000 1.25
@@ -382,21 +382,31 @@
wxStaticBoxSizer *item2 = new wxStaticBoxSizer( item3, wxVERTICAL );
wxString *strs4 = (wxString*) NULL;
- wxChoice *item4 = new wxChoice( this, ID_LANG, wxDefaultPosition, wxSize(100,-1), 0, strs4, 0 );
+ wxChoice *item4 = new wxChoice(
+ this, ID_LANG, wxDefaultPosition, wxSize(100,-1), 0, strs4, 0
+ );
#ifndef __WXX11__
- item4->SetToolTip( _("Change the language of the interface. Requires interface restart to take effect") );
+ item4->SetToolTip(
+ _("Change the language of the interface. Requires interface \
+ restart to take effect") );
#endif
item2->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|border_style, 5 );
wxGridSizer *item5 = new wxGridSizer( 2, 0, 0 );
- wxButton *item6 = new wxButton( this, ID_BTN_ADDLANG, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item6 = new wxButton(
+ this, ID_BTN_ADDLANG, _("Add"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
#ifndef __WXX11__
item6->SetToolTip( _("Add new language") );
#endif
item5->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- wxButton *item7 = new wxButton( this, ID_BTN_REMOVELANG, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item7 = new wxButton(
+ this, ID_BTN_REMOVELANG, _("Remove"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
#ifndef __WXX11__
item7->SetToolTip( _("Remove currently selected language") );
#endif
@@ -410,7 +420,10 @@
wxStaticBoxSizer *item8 = new wxStaticBoxSizer( item9, wxVERTICAL );
wxString *strs10 = (wxString*) NULL;
- wxChoice *item10 = new wxChoice( this, ID_ICONSET, wxDefaultPosition, wxSize(100,-1), 0, strs10, 0 );
+ wxChoice *item10 = new wxChoice(
+ this, ID_ICONSET, wxDefaultPosition, wxSize(100,-1), 0,
+ strs10, 0
+ );
#ifndef __WXX11__
item10->SetToolTip( _("Change the iconet the interface should use.") );
#endif
@@ -418,13 +431,19 @@
wxGridSizer *item11 = new wxGridSizer( 2, 0, 0 );
- wxButton *item12 = new wxButton( this, ID_BTN_ADDICONSET, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item12 = new wxButton(
+ this, ID_BTN_ADDICONSET, _("Add"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
#ifndef __WXX11__
item12->SetToolTip( _("Add new iconset") );
#endif
item11->Add( item12, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- wxButton *item13 = new wxButton( this, ID_BTN_REMOVEICONSET, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item13 = new wxButton(
+ this, ID_BTN_REMOVEICONSET, _("Remove"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
#ifndef __WXX11__
item13->SetToolTip( _("Remove currently selected iconset") );
#endif
@@ -444,13 +463,19 @@
wxString strs17[] = {
_("Default")
};
- wxChoice *item17 = new wxChoice( this, ID_FONT, wxDefaultPosition, wxSize(100,-1), 1, strs17, 0 );
+ wxChoice *item17 = new wxChoice(
+ this, ID_FONT, wxDefaultPosition,
+ wxSize(100,-1), 1, strs17, 0
+ );
#ifndef __WXX11__
item17->SetToolTip( _("Change the font") );
#endif
- item15->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL|border_style, 5 );
+ item15->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL|border_style, 5);
- wxStaticText *item18 = new wxStaticText( this, ID_TEXT, _("Font Test :)"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText *item18 = new wxStaticText(
+ this, ID_TEXT, _("Font Test :)"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
item15->Add( item18, 0, wxALIGN_CENTER|wxALL, 5 );
item14->Add( item15, 0, wxGROW|wxLEFT|wxRIGHT, 5 );
@@ -466,17 +491,27 @@
_("Messages"),
_("Statistics")
};
- wxChoice *item21 = new wxChoice( this, ID_STARTPAGE, wxDefaultPosition, wxSize(100,-1), 6, strs21, 0 );
+ wxChoice *item21 = new wxChoice(
+ this, ID_STARTPAGE, wxDefaultPosition, wxSize(100,-1),
+ 6, strs21, 0
+ );
#ifndef __WXX11__
- item21->SetToolTip( _("Set which page will be displayed on program startup") );
+ item21->SetToolTip(
+ _("Set which page will be displayed on program startup")
+ );
#endif
item19->Add( item21, 0, wxGROW|border_style, 5 );
- wxCheckBox *item22 = new wxCheckBox( this, ID_REMEMBER_LAST, _("Remember last"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item22 = new wxCheckBox(
+ this, ID_REMEMBER_LAST, _("Remember last"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
#ifndef __WXX11__
- item22->SetToolTip( _("Automatically remember which page was open between sessions") );
+ item22->SetToolTip(
+ _("Automatically remember which page was \
+ open between sessions"));
#endif
- item19->Add( item22, 0, wxGROW|wxALIGN_CENTER_VERTICAL|border_style, 5 );
+ item19->Add(item22, 0, wxGROW|wxALIGN_CENTER_VERTICAL|border_style, 5);
item14->Add( item19, 0, wxLEFT|wxRIGHT, 5 );
@@ -484,58 +519,102 @@
wxBoxSizer *item23 = new wxBoxSizer( wxVERTICAL );
- wxCheckBox *item24 = new wxCheckBox( this, ID_SHOWSPLASH, _("Show splashscreen"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item24 = new wxCheckBox(
+ this, ID_SHOWSPLASH, _("Show splashscreen"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
item24->SetValue( TRUE );
#ifndef __WXX11__
- item24->SetToolTip( _("Toggle wether splashscreen should be shown on program startup or not. Speeds up application starting if turned off. Default: On") );
+ item24->SetToolTip(
+ _("Toggle wether splashscreen should be shown on program \
+ startup or not. Speeds up application starting if turned off. \
+ Default: On")
+ );
#endif
item23->Add( item24, 0, wxGROW|wxLEFT|border_style, 5 );
- wxCheckBox *item25 = new wxCheckBox( this, ID_PROMPTEXIT, _("Prompt on exit"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item25 = new wxCheckBox(
+ this, ID_PROMPTEXIT, _("Prompt on exit"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
#ifndef __WXX11__
- item25->SetToolTip( _("Toggle wether confirmation is requested when closing program.") );
+ item25->SetToolTip(
+ _("Toggle wether confirmation is requested \
+ when closing program.")
+ );
#endif
- item23->Add( item25, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|border_style, 5 );
+ item23->Add(
+ item25, 0, wxGROW|wxALIGN_CENTER_VERTICAL
+ |wxLEFT|border_style, 5
+ );
wxBoxSizer *item26 = new wxBoxSizer( wxHORIZONTAL );
- wxCheckBox *item27 = new wxCheckBox( this, ID_SHOWTOOL, _("Show ToolBar"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item27 = new wxCheckBox(
+ this, ID_SHOWTOOL, _("Show ToolBar"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
item27->SetValue( TRUE );
#ifndef __WXX11__
item27->SetToolTip( _("Toggle wether toolbar is shown or not.") );
#endif
- item26->Add( item27, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|border_style, 5 );
+ item26->Add(
+ item27, 0, wxGROW|wxALIGN_CENTER_VERTICAL|
+ wxLEFT|border_style, 5
+ );
wxString strs28[] = {
_("Horizontal"),
_("Vertical")
};
- wxChoice *item28 = new wxChoice( this, ID_TOOLALIGN, wxDefaultPosition, wxSize(100,-1), 2, strs28, 0 );
+ wxChoice *item28 = new wxChoice(
+ this, ID_TOOLALIGN, wxDefaultPosition, wxSize(100,-1),
+ 2, strs28, 0
+ );
#ifndef __WXX11__
- item28->SetToolTip( _("Horizontal tooltip is shown on top of window (default), vertical is shown on the left side of window.") );
+ item28->SetToolTip(
+ _("Horizontal tooltip is shown on top of window (default),\
+ vertical is shown on the left side of window.") );
#endif
- item26->Add( item28, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|border_style, 5 );
+ item26->Add(
+ item28, 0, wxALIGN_RIGHT|
+ wxALIGN_CENTER_VERTICAL|border_style, 5
+ );
item23->Add( item26, 0, wxALIGN_CENTER_VERTICAL, 5 );
- wxCheckBox *item29 = new wxCheckBox( this, ID_SHOWMENU, _("Show MenuBar"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item29 = new wxCheckBox(
+ this, ID_SHOWMENU, _("Show MenuBar"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
#ifndef __WXX11__
- item29->SetToolTip( _("Toggle wether menubar (file/view etc) should be shown or not.") );
+ item29->SetToolTip(
+ _("Toggle wether menubar (file/view etc) \
+ should be shown or not.")
+ );
#endif
- item23->Add( item29, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|border_style, 5 );
+ item23->Add(
+ item29, 0, wxGROW|wxALIGN_CENTER_VERTICAL|
+ wxLEFT|border_style, 5
+ );
item0->Add( item23, 0, wxGROW, 5 );
wxBoxSizer *item30 = new wxBoxSizer( wxHORIZONTAL );
- wxButton *item31 = new wxButton( this, GUI_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item31 = new wxButton(
+ this, GUI_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0
+ );
item31->SetDefault();
#ifndef __WXX11__
item31->SetToolTip( _("Save settings and close dialog") );
#endif
item30->Add( item31, 0, wxALIGN_CENTER|wxALL, 5 );
- wxButton *item32 = new wxButton( this, GUI_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item32 = new wxButton(
+ this, GUI_CANCEL, _("Cancel"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
#ifndef __WXX11__
item32->SetToolTip( _("Abort changes and close dialog") );
#endif
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Images.cpp 30 Nov 2003 21:05:50 -0000 1.30
+++ Images.cpp 30 Nov 2003 23:07:27 -0000 1.31
@@ -98,48 +98,174 @@
path.Prepend(wxT("::Resources"));
#endif
- 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("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)
+ );
}
/**
@@ -149,7 +275,7 @@
* corresponding image object (note that we should never save it to disc!).
* The main reason for this was wxMac where toolbar button texts were not
* supported, but eventually, this approach proves nicer quality because of
- * added background colour and surrounding border to button images.
+ * possibility to later add custom background colour/borders to the images.
*/
void CImages::MakeToolImages() {
wxBitmap tmp, tmp_new;
@@ -175,7 +301,10 @@
btntxt.Add(_("Preferences"));
btnimg.Add(wxT("btn_guisettings"));
- /* Temporary bitmap for measuring text lengths. 100 pixels should be enuff. */
+ /**
+ * Temporary bitmap for measuring text lengths.
+ * 100 pixels should be enough.
+ */
tmp = wxBitmap(100, 100);
mdc.SelectObject(tmp);
@@ -194,25 +323,37 @@
tool_img_width = width;
tool_img_height = height;
+ /**
+ * This forloop goes through all images previously named in btnimg
+ * string array. It creates a new image with previously calculated
+ * height and width, draws the found bitmap on it and the corresponding
+ * text from imgtxt arraystring. To make the final image transparent,
+ * wxLIGHT_GREY colour pointer is used on wxMSW which seems to give
+ * system background colour on windows, on other platforms we use
+ * simple transparency mask. Finally, the generated image is saved
+ * back to images list by removing old image, creating new wxBitmap
+ * type object and storing the pointer in the list.
+ */
mdc.BeginDrawing();
- /* Loop through our lists of texts/images and draw images for toolbar */
for (unsigned int i=0;i<btntxt.GetCount();i++) {
tmp_new = wxBitmap(width, height);
mdc.SelectObject(tmp_new);
- /* On wxMSW, wxLIGHT_GREY colour pointer gives system background colour */
#ifdef __WXMSW__
mdc.SetPen(*wxTRANSPARENT_PEN);
mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));
- /* Elsewhere 0,0,0 colour works for background */
#else
mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID));
#endif
- mdc.DrawRectangle(0, 0, tmp_new.GetWidth(), tmp_new.GetHeight());
- mdc.DrawBitmap(GetImage(btnimg.Item(i)), (tmp_new.GetWidth()-32)/2, 2, true);
+ mdc.DrawRectangle(
+ 0, 0, tmp_new.GetWidth(), tmp_new.GetHeight()
+ );
+ mdc.DrawBitmap(
+ GetImage(btnimg.Item(i)),
+ (tmp_new.GetWidth()-32)/2, 2, true
+ );
mdc.SetTextForeground( wxColour(1,1,1));
mdc.GetTextExtent(btntxt.Item(i), &x, &y);
mdc.DrawText(btntxt.Item(i), (tmp_new.GetWidth()-x)/2, 36);
- /* Can't (and dont need to) use transparency mask on wxMSW */
#ifndef __WXMSW__
wxMask *tmp_mask;
tmp_mask = new wxMask(tmp_new, wxColour(0,0,0));
@@ -235,7 +376,7 @@
if (tmp == NULL) {
wxFAIL_MSG(wxString::Format(
- wxT("Requested image `%s` could not be found!"),
+ wxT("Requested image `%s` could not be found!"),
name.c_str()
));
}
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- MainDlg.cpp 30 Nov 2003 21:04:38 -0000 1.19
+++ MainDlg.cpp 30 Nov 2003 23:07:27 -0000 1.20
@@ -108,7 +108,11 @@
wxPanel *statusbar = new wxPanel(this, -1);
StatusBar(statusbar, true, true);
m_mainsizer->Add(statusbar, 0, wxGROW|wxEXPAND, 0);
- wxASSERT_MSG(statusbar, wxT("CMainDlg::CMainDlg() - StatusBar object not ready for accessing."));
+ wxASSERT_MSG(
+ statusbar,
+ wxT("CMainDlg::CMainDlg() - StatusBar object \
+ not ready for accessing.")
+ );
GetBmpStatusConnection()->SetBitmap(img->GetImage(wxT("disconnected")));
GetBmpStatusConnection()->SetName(wxT("disconnected"));
@@ -245,42 +249,61 @@
tool_align|wxNO_BORDER|wxTB_3DBUTTONS|wxTB_FLAT
);
- tb->SetToolBitmapSize(wxSize(img->tool_img_width, img->tool_img_height));
+ tb->SetToolBitmapSize(
+ wxSize(img->tool_img_width, img->tool_img_height)
+ );
tb->SetMargins(2, 2);
/* Add the buttons */
tb->AddTool(
- ID_BTN_CONNECT, _("Connect"), img->GetImage(wxT("btn_connect")),
- img->GetImage(wxT("btn_connect")), wxITEM_NORMAL, _("Connect to any server")
+ ID_BTN_CONNECT, _("Connect"),
+ img->GetImage(wxT("btn_connect")),
+ img->GetImage(wxT("btn_connect")), wxITEM_NORMAL,
+ _("Connect to any server")
);
tb->AddSeparator();
tb->AddTool(
- ID_BTN_SERVERS, _("Servers"), img->GetImage(wxT("btn_servers")),
- img->GetImage(wxT("btn_servers")), wxITEM_CHECK, _("Server list")
+ ID_BTN_SERVERS, _("Servers"),
+ img->GetImage(wxT("btn_servers")),
+ img->GetImage(wxT("btn_servers")), wxITEM_CHECK,
+ _("Server list")
);
tb->AddTool(
- ID_BTN_SEARCH, _("Search"), img->GetImage(wxT("btn_search")),
- img->GetImage(wxT("btn_search")), wxITEM_CHECK, _("Search files")
+ ID_BTN_SEARCH, _("Search"),
+ img->GetImage(wxT("btn_search")),
+ img->GetImage(wxT("btn_search")), wxITEM_CHECK,
+ _("Search files")
);
tb->AddTool(
- ID_BTN_TRANSFER, _("Transfer"), img->GetImage(wxT("btn_transfer")),
- img->GetImage(wxT("btn_transfer")), wxITEM_CHECK, _("File Transfer")
+ ID_BTN_TRANSFER, _("Transfer"),
+ img->GetImage(wxT("btn_transfer")),
+ img->GetImage(wxT("btn_transfer")), wxITEM_CHECK,
+ _("File Transfer")
);
tb->AddTool(
- ID_BTN_SHARED_FILES, _("Shared Files"), img->GetImage(wxT("btn_shared")),
- img->GetImage(wxT("btn_shared")), wxITEM_CHECK, _("Show shared files")
+ ID_BTN_SHARED_FILES, _("Shared Files"),
+ img->GetImage(wxT("btn_shared")),
+ img->GetImage(wxT("btn_shared")), wxITEM_CHECK,
+ _("Show shared files")
);
tb->AddTool(
- ID_BTN_MESSAGES, _("Messages"), img->GetImage(wxT("btn_messages")),
- img->GetImage(wxT("btn_messages")), wxITEM_CHECK, _("Chatting")
+ ID_BTN_MESSAGES, _("Messages"),
+ img->GetImage(wxT("btn_messages")),
+ img->GetImage(wxT("btn_messages")), wxITEM_CHECK,
+ _("Chatting")
);
tb->AddTool(
- ID_BTN_STATISTICS, _("Statistics"), img->GetImage(wxT("btn_statistics")),
- img->GetImage(wxT("btn_statistics")), wxITEM_CHECK, _("Show live statistics"));
+ ID_BTN_STATISTICS, _("Statistics"),
+ img->GetImage(wxT("btn_statistics")),
+ img->GetImage(wxT("btn_statistics")), wxITEM_CHECK,
+ _("Show live statistics")
+ );
tb->AddSeparator();
tb->AddTool(
- ID_BTN_GUISETTINGS, _("Preferences"), img->GetImage(wxT("btn_guisettings")),
- img->GetImage(wxT("btn_guisettings")), wxITEM_NORMAL, _("Modify settings")
+ ID_BTN_GUISETTINGS, _("Preferences"),
+ img->GetImage(wxT("btn_guisettings")),
+ img->GetImage(wxT("btn_guisettings")), wxITEM_NORMAL,
+ _("Modify settings")
);
/* And go live */
@@ -426,9 +449,11 @@
);
m_config->Read(wxT("/General/Toolbar Alignment"), &tmp, 0);
if (tmp) {
- view_tbar_menu->FindItem(ID_VIEW_TBAR_ALIGN_HOR)->Check();
+ view_tbar_menu->
+ FindItem(ID_VIEW_TBAR_ALIGN_HOR)->Check();
} else {
- view_tbar_menu->FindItem(ID_VIEW_TBAR_ALIGN_VER)->Check();
+ view_tbar_menu->
+ FindItem(ID_VIEW_TBAR_ALIGN_VER)->Check();
}
#else
view_tbar_menu->Append(ID_VIEW_TBAR_ALIGN_HOR, _("Horizontal"));
Index: MainDlg.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MainDlg.h 25 Nov 2003 04:21:14 -0000 1.7
+++ MainDlg.h 30 Nov 2003 23:07:27 -0000 1.8
@@ -110,20 +110,46 @@
wxWindow* GetCurPage() { return activewnd; }
/* Getters */
- wxMenuItem* GetViewMenuBar() {return GetMenuBar()->FindItem(ID_VIEW_MENUBAR);}
- wxMenuItem* GetViewToolBar() {return GetMenuBar()->FindItem(ID_VIEW_TOOLBAR);}
- wxMenuItem* GetViewServerWnd() {return GetMenuBar()->FindItem(ID_VIEW_SERVERS);}
- wxMenuItem* GetViewSearchWnd() {return GetMenuBar()->FindItem(ID_VIEW_SEARCH);}
- wxMenuItem* GetViewTransferWnd() {return GetMenuBar()->FindItem(ID_VIEW_TRANSFER);}
- wxMenuItem* GetViewSharedWnd() {return GetMenuBar()->FindItem(ID_VIEW_SHARED_FILES);}
- wxMenuItem* GetViewMessagesWnd() {return GetMenuBar()->FindItem(ID_VIEW_MESSAGES);}
- wxMenuItem* GetViewStatisticsWnd() {return GetMenuBar()->FindItem(ID_VIEW_STATISTICS);}
+ wxMenuItem* GetViewMenuBar() {
+ return GetMenuBar()->FindItem(ID_VIEW_MENUBAR);
+ }
+ wxMenuItem* GetViewToolBar() {
+ return GetMenuBar()->FindItem(ID_VIEW_TOOLBAR);
+ }
+ wxMenuItem* GetViewServerWnd() {
+ return GetMenuBar()->FindItem(ID_VIEW_SERVERS);
+ }
+ wxMenuItem* GetViewSearchWnd() {
+ return GetMenuBar()->FindItem(ID_VIEW_SEARCH);
+ }
+ wxMenuItem* GetViewTransferWnd() {
+ return GetMenuBar()->FindItem(ID_VIEW_TRANSFER);
+ }
+ wxMenuItem* GetViewSharedWnd() {
+ return GetMenuBar()->FindItem(ID_VIEW_SHARED_FILES);
+ }
+ wxMenuItem* GetViewMessagesWnd() {
+ return GetMenuBar()->FindItem(ID_VIEW_MESSAGES);
+ }
+ wxMenuItem* GetViewStatisticsWnd() {
+ return GetMenuBar()->FindItem(ID_VIEW_STATISTICS);
+ }
- wxStaticBitmap* GetBmpStatusConnection() { return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_CONNECTION ); }
- wxStaticBitmap* GetBmpStatusDload() { return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_DLOAD ); }
- wxStaticBitmap* GetBmpStatusUpload() { return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_UPLOAD ); }
- wxStaticBitmap* GetBmpStatusFiles() { return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_FILES ); }
- wxStaticBitmap* GetBmpStatusUsers() { return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_USERS ); }
+ wxStaticBitmap* GetBmpStatusConnection() {
+ return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_CONNECTION );
+ }
+ wxStaticBitmap* GetBmpStatusDload() {
+ return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_DLOAD );
+ }
+ wxStaticBitmap* GetBmpStatusUpload() {
+ return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_UPLOAD );
+ }
+ wxStaticBitmap* GetBmpStatusFiles() {
+ return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_FILES );
+ }
+ wxStaticBitmap* GetBmpStatusUsers() {
+ return (wxStaticBitmap*) FindWindow( ID_BMP_STATUS_USERS );
+ }
/* Member variables */
bool show_tool; // Wether toolbar should be shown or not.
Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ServerWnd.cpp 28 Nov 2003 18:35:10 -0000 1.42
+++ ServerWnd.cpp 30 Nov 2003 23:07:27 -0000 1.43
@@ -97,14 +97,26 @@
void CServerWnd::SetToggleSideBarImage() {
if (sidebar->IsShown()) {
- GetBtnToggleSidebar()->SetBitmapLabel(img->GetImage(wxT("leftarrow")));
- GetBtnToggleSidebar()->SetBitmapSelected(img->GetImage(wxT("leftarrow")));
- GetBtnToggleSidebar()->SetBitmapFocus(img->GetImage(wxT("leftarrow")));
+ GetBtnToggleSidebar()->SetBitmapLabel(
+ img->GetImage(wxT("leftarrow"))
+ );
+ GetBtnToggleSidebar()->SetBitmapSelected(
+ img->GetImage(wxT("leftarrow"))
+ );
+ GetBtnToggleSidebar()->SetBitmapFocus(
+ img->GetImage(wxT("leftarrow"))
+ );
} else {
- GetBtnToggleSidebar()->SetBitmapLabel(img->GetImage(wxT("rightarrow")));
- GetBtnToggleSidebar()->SetBitmapSelected(img->GetImage(wxT("rightarrow")));
- GetBtnToggleSidebar()->SetBitmapFocus(img->GetImage(wxT("rightarrow")));
+ GetBtnToggleSidebar()->SetBitmapLabel(
+ img->GetImage(wxT("rightarrow"))
+ );
+ GetBtnToggleSidebar()->SetBitmapSelected(
+ img->GetImage(wxT("rightarrow"))
+ );
+ GetBtnToggleSidebar()->SetBitmapFocus(
+ img->GetImage(wxT("rightarrow"))
+ );
}
}
@@ -255,7 +267,7 @@
* window to toggle sidebar on/off
*/
wxBitmapButton *toggler = new wxBitmapButton(
- this, ID_BTN_TOGGLE_SIDEBAR, img->GetImage(wxT("leftarrow")),
+ this, ID_BTN_TOGGLE_SIDEBAR, img->GetImage(wxT("leftarrow")),
wxDefaultPosition, wxSize(10,100)
);
mainsizer->Add(toggler, 0, wxALIGN_CENTER, 5 );
@@ -307,17 +319,31 @@
mainsizer->RemoveGrowableCol(2);
mainsizer->AddGrowableCol(1);
sidebar->Hide();
- GetBtnToggleSidebar()->SetBitmapLabel(img->GetImage(wxT("rightarrow")));
- GetBtnToggleSidebar()->SetBitmapSelected(img->GetImage(wxT("rightarrow")));
- GetBtnToggleSidebar()->SetBitmapFocus(img->GetImage(wxT("rightarrow")));
+ GetBtnToggleSidebar()->SetBitmapLabel(
+ img->GetImage(wxT("rightarrow"))
+ );
+ GetBtnToggleSidebar()->SetBitmapSelected(
+ img->GetImage(wxT("rightarrow"))
+ );
+ GetBtnToggleSidebar()->SetBitmapFocus(
+ img->GetImage(wxT("rightarrow"))
+ );
} else {
- mainsizer->Prepend(sidebar, 0, wxGROW|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5);
+ mainsizer->Prepend(
+ sidebar, 0, wxGROW|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5
+ );
mainsizer->RemoveGrowableCol(1);
mainsizer->AddGrowableCol(2);
sidebar->Show();
- GetBtnToggleSidebar()->SetBitmapLabel(img->GetImage(wxT("leftarrow")));
- GetBtnToggleSidebar()->SetBitmapSelected(img->GetImage(wxT("leftarrow")));
- GetBtnToggleSidebar()->SetBitmapFocus(img->GetImage(wxT("leftarrow")));
+ GetBtnToggleSidebar()->SetBitmapLabel(
+ img->GetImage(wxT("leftarrow"))
+ );
+ GetBtnToggleSidebar()->SetBitmapSelected(
+ img->GetImage(wxT("leftarrow"))
+ );
+ GetBtnToggleSidebar()->SetBitmapFocus(
+ img->GetImage(wxT("leftarrow"))
+ );
}
Layout();
Refresh();
@@ -329,7 +355,9 @@
* wxInterface_wdr.cpp to fix wxCheckBox borders (need wxALL on wxMSW and none
* on wxGTK.
*/
-wxSizer* CServerWnd::SettingsPanel( wxWindow *parent, bool call_fit, bool set_sizer ) {
+wxSizer* CServerWnd::SettingsPanel(
+ wxWindow *parent, bool call_fit, bool set_sizer
+) {
wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
wxCheckBox *item1 = new wxCheckBox(
@@ -337,29 +365,47 @@
wxDefaultPosition, wxDefaultSize, 0
);
#ifndef __WXX11__
- item1->SetToolTip(_("Toggle wether application should automatically connect to any server on startup") );
+ item1->SetToolTip(
+ _("Toggle wether application should automatically connect \
+ to any server on startup")
+ );
#endif
item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|border_style, 5 );
wxBoxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
- wxCheckBox *item3 = new wxCheckBox( parent, ID_SS_AC_STATIC_ONLY, _("To static only"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item3 = new wxCheckBox(
+ parent, ID_SS_AC_STATIC_ONLY, _("To static only"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
#ifndef __WXX11__
- item3->SetToolTip( _("Toggle wether application should connect to servers marked as \"static\" only") );
+ item3->SetToolTip(
+ _("Toggle wether application should connect \
+ to servers marked as \"static\" only")
+ );
#endif
item2->Add( item3, 0, wxALIGN_CENTER_VERTICAL|border_style, 5 );
item0->Add( item2, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 15 );
- wxStaticLine *item4 = new wxStaticLine( parent, ID_LINE, wxDefaultPosition, wxSize(20,-1), wxLI_HORIZONTAL );
+ wxStaticLine *item4 = new wxStaticLine(
+ parent, ID_LINE, wxDefaultPosition, wxSize(20,-1),
+ wxLI_HORIZONTAL
+ );
item0->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
wxBoxSizer *item5 = new wxBoxSizer( wxHORIZONTAL );
- wxStaticBitmap *item6 = new wxStaticBitmap( parent, ID_SS_SERVER_IMG, Icons( 0 ), wxDefaultPosition, wxDefaultSize, 0, wxT("provider") );
+ wxStaticBitmap *item6 = new wxStaticBitmap(
+ parent, ID_SS_SERVER_IMG, Icons( 0 ), wxDefaultPosition,
+ wxDefaultSize, 0, wxT("provider")
+ );
item5->Add( item6, 0, wxALIGN_CENTER|wxLEFT, 5 );
- wxStaticText *item7 = new wxStaticText( parent, ID_SS_SERVER_NAME, wxT(""), wxDefaultPosition, wxSize(110,-1), 0 );
+ wxStaticText *item7 = new wxStaticText(
+ parent, ID_SS_SERVER_NAME, wxT(""),
+ wxDefaultPosition, wxSize(110,-1), 0
+ );
item5->Add( item7, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
@@ -368,9 +414,15 @@
wxBoxSizer *item9 = new wxBoxSizer( wxHORIZONTAL );
- wxCheckBox *item10 = new wxCheckBox( parent, ID_CHECK_SS_STATIC, _("Static"), wxDefaultPosition, wxSize(130,-1), 0 );
+ wxCheckBox *item10 = new wxCheckBox(
+ parent, ID_CHECK_SS_STATIC, _("Static"),
+ wxDefaultPosition, wxSize(130,-1), 0
+ );
#ifndef __WXX11__
- item10->SetToolTip( _("Set server static. Static servers are not removed from list if they do not respond") );
+ item10->SetToolTip(
+ _("Set server static. Static servers are not \
+ removed from list if they do not respond")
+ );
#endif
item9->Add( item10, 0, wxALIGN_CENTER|border_style, 5 );
@@ -378,7 +430,10 @@
wxBoxSizer *item11 = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *item12 = new wxStaticText( parent, ID_TEXT, _("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText *item12 = new wxStaticText(
+ parent, ID_TEXT, _("Priority:"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
item11->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxString strs13[] = {
@@ -386,7 +441,10 @@
_("Normal"),
_("Low")
};
- wxChoice *item13 = new wxChoice( parent, ID_SS_PRIO, wxDefaultPosition, wxSize(80,-1), 3, strs13, 0 );
+ wxChoice *item13 = new wxChoice(
+ parent, ID_SS_PRIO, wxDefaultPosition,
+ wxSize(80,-1), 3, strs13, 0
+ );
#ifndef __WXX11__
item13->SetToolTip( _("Change server priority") );
#endif
@@ -413,18 +471,29 @@
* wxInterface_wdr.cpp to fix wxCheckBox borders (need wxALL on wxMSW and none
* on wxGTK.
*/
-wxSizer* CServerWnd::LogOptionsPanel( wxWindow *parent, bool call_fit, bool set_sizer ) {
+wxSizer* CServerWnd::LogOptionsPanel(
+ wxWindow *parent, bool call_fit, bool set_sizer
+) {
wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
- wxCheckBox *item2 = new wxCheckBox( parent, ID_CHECK_LINE_LIMIT, _("Line limit"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item2 = new wxCheckBox(
+ parent, ID_CHECK_LINE_LIMIT, _("Line limit"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
#ifndef __WXX11__
- item2->SetToolTip( _("Toggle wether there should be a line limit for log boxes (saves memory)") );
+ item2->SetToolTip(
+ _("Toggle wether there should be a line limit \
+ for log boxes (saves memory)")
+ );
#endif
item1->Add( item2, 0, wxGROW|border_style, 5 );
- wxTextCtrl *item3 = new wxTextCtrl( parent, ID_TXT_LINE_LIMIT, wxT(""), wxDefaultPosition, wxSize(40,-1), 0 );
+ wxTextCtrl *item3 = new wxTextCtrl(
+ parent, ID_TXT_LINE_LIMIT, wxT(""),
+ wxDefaultPosition, wxSize(40,-1), 0
+ );
#ifndef __WXX11__
item3->SetToolTip( _("Maximum number of lines in log boxes") );
#endif
@@ -432,13 +501,19 @@
item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
- wxCheckBox *item4 = new wxCheckBox( parent, ID_CHECK_SAVE_TO_DISK, _("Save to disk"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item4 = new wxCheckBox(
+ parent, ID_CHECK_SAVE_TO_DISK, _("Save to disk"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
#ifndef __WXX11__
item4->SetToolTip( _("Save logs to disc also") );
#endif
item0->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|border_style, 5 );
- wxButton *item5 = new wxButton( parent, ID_BTN_CLEAR_LOGS, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item5 = new wxButton(
+ parent, ID_BTN_CLEAR_LOGS, _("Clear"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
#ifndef __WXX11__
item5->SetToolTip( _("Clear all logs") );
#endif
@@ -456,26 +531,42 @@
return item0;
}
-wxSizer* CServerWnd::AddServerPanel( wxWindow *parent, bool call_fit, bool set_sizer )
-{
+wxSizer* CServerWnd::AddServerPanel(
+ wxWindow *parent, bool call_fit, bool set_sizer
+) {
wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
wxFlexGridSizer *item1 = new wxFlexGridSizer( 4, 0, 0, 0 );
item1->AddGrowableCol( 0 );
- wxStaticText *item2 = new wxStaticText( parent, ID_SERVER_IP, _("IP address:Port"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText *item2 = new wxStaticText(
+ parent, ID_SERVER_IP, _("IP address:Port"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
item1->Add( item2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
- wxTextCtrl *item3 = new wxTextCtrl( parent, ID_SERVER_IP, wxT(""), wxDefaultPosition, wxSize(110,-1), 0 );
+ wxTextCtrl *item3 = new wxTextCtrl(
+ parent, ID_SERVER_IP, wxT(""),
+ wxDefaultPosition, wxSize(110,-1), 0
+ );
#ifndef __WXX11__
- item3->SetToolTip( _("Type in the ip address and port of the new server, separated by :") );
+ item3->SetToolTip(
+ _("Type in the ip address and port of the new \
+ server, separated by `:`")
+ );
#endif
item1->Add( item3, 0, wxGROW, 5 );
- wxStaticText *item4 = new wxStaticText( parent, ID_TEXT, _("Name"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText *item4 = new wxStaticText(
+ parent, ID_TEXT, _("Name"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
- wxTextCtrl *item5 = new wxTextCtrl( parent, ID_TEXTCTRL, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+ wxTextCtrl *item5 = new wxTextCtrl(
+ parent, ID_TEXTCTRL, wxT(""), wxDefaultPosition,
+ wxSize(80,-1), 0
+ );
#ifndef __WXX11__
item5->SetToolTip( _("Optional: Enter the name of the new server") );
#endif
@@ -483,11 +574,17 @@
item0->Add( item1, 0, wxGROW|wxRIGHT, 5 );
- wxButton *item6 = new wxButton( parent, ID_ADDTOLIST, _("Add to List"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item6 = new wxButton(
+ parent, ID_ADDTOLIST, _("Add to List"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
#ifndef __WXX11__
item6->SetToolTip( _("Add the server to list") );
#endif
- item0->Add( item6, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 );
+ item0->Add(
+ item6, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|
+ wxLEFT|wxRIGHT|wxTOP, 5
+ );
if (set_sizer) {
parent->SetAutoLayout( TRUE );
@@ -501,16 +598,27 @@
return item0;
}
-wxSizer* CServerWnd::UpdatePanel( wxWindow *parent, bool call_fit, bool set_sizer ) {
+wxSizer* CServerWnd::UpdatePanel(
+ wxWindow *parent, bool call_fit, bool set_sizer
+) {
wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
- wxTextCtrl *item1 = new wxTextCtrl( parent, ID_SERVERLISTURL, wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-best.met"), wxDefaultPosition, wxSize(-1,100), wxTE_MULTILINE|wxTE_PROCESS_TAB );
+ wxTextCtrl *item1 = new wxTextCtrl(
+ parent, ID_SERVERLISTURL,
+ wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/server.met\
+ ?download/server-best.met"), wxDefaultPosition,
+ wxSize(-1,100), wxTE_MULTILINE|wxTE_PROCESS_TAB
+ );
#ifndef __WXX11__
- item1->SetToolTip( wxT("Enter the URL or .met file location to update list from") );
+ item1->SetToolTip(
+ wxT("Enter the URL or .met file location to update list from"));
#endif
item0->Add( item1, 0, wxGROW, 5 );
- wxButton *item2 = new wxButton( parent, ID_UPDATE, _("Update"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item2 = new wxButton(
+ parent, ID_UPDATE, _("Update"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
item0->Add( item2, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 5 );
if (set_sizer) {
@@ -525,32 +633,49 @@
return item0;
}
-wxSizer* CServerWnd::PortSettingsPanel( wxWindow *parent, bool call_fit, bool set_sizer ) {
+wxSizer* CServerWnd::PortSettingsPanel(
+ wxWindow *parent, bool call_fit, bool set_sizer
+) {
wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer *item2 = new wxBoxSizer( wxVERTICAL );
- wxStaticText *item3 = new wxStaticText( parent, ID_TEXT, wxT("TCP"), wxDefaultPosition, wxDefaultSize, 0 );
- item2->Add( item3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5 );
+ wxStaticText *item3 = new wxStaticText(
+ parent, ID_TEXT, wxT("TCP"), wxDefaultPosition,
+ wxDefaultSize, 0
+ );
+ item2->Add(item3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
- wxStaticText *item4 = new wxStaticText( parent, ID_TEXT, wxT("UDP"), wxDefaultPosition, wxDefaultSize, 0 );
- item2->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5 );
+ wxStaticText *item4 = new wxStaticText(
+ parent, ID_TEXT, wxT("UDP"), wxDefaultPosition, wxDefaultSize, 0
+ );
+ item2->Add(item4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
item1->Add( item2, 0, wxALIGN_CENTER, 5 );
wxBoxSizer *item5 = new wxBoxSizer( wxVERTICAL );
- wxTextCtrl *item6 = new wxTextCtrl( parent, ID_TEXTCTRL, wxT(""), wxDefaultPosition, wxSize(40,-1), 0 );
+ wxTextCtrl *item6 = new wxTextCtrl(
+ parent, ID_TEXTCTRL, wxT(""),
+ wxDefaultPosition, wxSize(40,-1), 0
+ );
#ifndef __WXX11__
- item6->SetToolTip( _("Enter the TCP port for connections (default: 4662)") );
+ item6->SetToolTip(
+ _("Enter the TCP port for connections (default: 4662)")
+ );
#endif
item5->Add( item6, 0, wxALIGN_CENTER, 5 );
- wxTextCtrl *item7 = new wxTextCtrl( parent, ID_TEXTCTRL, wxT(""), wxDefaultPosition, wxSize(40,-1), 0 );
+ wxTextCtrl *item7 = new wxTextCtrl(
+ parent, ID_TEXTCTRL, wxT(""),
+ wxDefaultPosition, wxSize(40,-1), 0
+ );
#ifndef __WXX11__
- item7->SetToolTip( _("Enter the UDP port for connections (default: 4672)") );
+ item7->SetToolTip(
+ _("Enter the UDP port for connections (default: 4672)")
+ );
#endif
item5->Add( item7, 0, wxALIGN_CENTER, 5 );
@@ -560,9 +685,16 @@
item8->Add( 10, 20, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 5 );
- wxCheckBox *item9 = new wxCheckBox( parent, ID_CHECK_DISABLE_UDP, _("Disable"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item9 = new wxCheckBox(
+ parent, ID_CHECK_DISABLE_UDP, _("Disable"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
#ifndef __WXX11__
- item9->SetToolTip( _("Disable UDP port. This can somewhat lower traffic, but also results in less sources as client<->client source exchange is done via UDP") );
+ item9->SetToolTip(
+ _("Disable UDP port. This can somewhat lower traffic, \
+ but also results in less sources as client<->client source \
+ exchange is done via UDP")
+ );
#endif
item8->Add( item9, 0, wxALIGN_CENTER|wxALL, 5 );
@@ -570,7 +702,10 @@
item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
- wxButton *item10 = new wxButton( parent, ID_BUTTON, _("Apply changes"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item10 = new wxButton(
+ parent, ID_BUTTON, _("Apply changes"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
item0->Add( item10, 0, wxALIGN_CENTER|wxALL, 5 );
if (set_sizer) {
Index: StatisticsTreeCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/StatisticsTreeCtrl.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- StatisticsTreeCtrl.cpp 27 Nov 2003 08:23:12 -0000 1.18
+++ StatisticsTreeCtrl.cpp 30 Nov 2003 23:07:27 -0000 1.19
@@ -48,27 +48,30 @@
/* This loads the correct images for the tree and assigns as imagelist. */
void CStatisticsTreeCtrl::GetTreeImages() {
wxImageList *tree_images = new wxImageList(16, 16);
- tree_images->Add(img->GetImage(wxT("updown11"))); // 0 Up/Down
- tree_images->Add(img->GetImage(wxT("connectedhigh"))); // 1 Connection
- tree_images->Add(img->GetImage(wxT("clock"))); // 2 Clock
- tree_images->Add(img->GetImage(wxT("user"))); // 3 User
- tree_images->Add(img->GetImage(wxT("server"))); // 4 Server
- tree_images->Add(img->GetImage(wxT("sharedfiles"))); // 5 Shared Files
- tree_images->Add(img->GetImage(wxT("arrow"))); // 6 Arrow Item
- tree_images->Add(img->GetImage(wxT("statistics"))); // 7 Statistics
- tree_images->Add(img->GetImage(wxT("upload"))); // 8 Uploads
- tree_images->Add(img->GetImage(wxT("download"))); // 9 Downloads
- tree_images->Add(img->GetImage(wxT("partstats"))); // 10 Statistics Session
- tree_images->Add(img->GetImage(wxT("fullstats"))); // 11 Statistics Total
- tree_images->Add(img->GetImage(wxT("exclamation"))); // 12 Records
- tree_images->Add(img->GetImage(wxT("connection"))); // 13 Prefs.Connection
- tree_images->Add(img->GetImage(wxT("daily"))); // 14 Daily
- tree_images->Add(img->GetImage(wxT("monthly"))); // 15 Monthly
- tree_images->Add(img->GetImage(wxT("yearly"))); // 16 Yearly
+ tree_images->Add(img->GetImage(wxT("updown11"))); // 0
+ tree_images->Add(img->GetImage(wxT("connectedhigh"))); // 1
+ tree_images->Add(img->GetImage(wxT("clock"))); // 2
+ tree_images->Add(img->GetImage(wxT("user"))); // 3
+ tree_images->Add(img->GetImage(wxT("server"))); // 4
+ tree_images->Add(img->GetImage(wxT("sharedfiles"))); // 5
+ tree_images->Add(img->GetImage(wxT("arrow"))); // 6
+ tree_images->Add(img->GetImage(wxT("statistics"))); // 7
+ tree_images->Add(img->GetImage(wxT("upload"))); // 8
+ tree_images->Add(img->GetImage(wxT("download"))); // 9
+ tree_images->Add(img->GetImage(wxT("partstats"))); // 10
+ tree_images->Add(img->GetImage(wxT("fullstats"))); // 11
+ tree_images->Add(img->GetImage(wxT("exclamation"))); // 12
+ tree_images->Add(img->GetImage(wxT("connection"))); // 13
+ tree_images->Add(img->GetImage(wxT("daily"))); // 14
+ tree_images->Add(img->GetImage(wxT("monthly"))); // 15
+ tree_images->Add(img->GetImage(wxT("yearly"))); // 16
AssignImageList(tree_images);
}
-/* This method generates the tree by calling a submethod for each of the branches. */
+/**
+ * This method generates the tree by calling
+ * a submethod for each of the branches.
+ */
void CStatisticsTreeCtrl::GenerateTree() {
/* Clean up if theres anything already in tree */
DeleteAllItems();
@@ -95,23 +98,52 @@
/* Transfer branch */
AppendItem(t_transfer, wxT("Session UL:DL Ratio: 1:1"), 6);
AppendItem(t_transfer, wxT("Comulative UL:DL Ratio: 1:1"), 6);
- wxTreeItemId t_uploads = AppendItem(t_transfer, wxT("Uploads"), 8);
+ wxTreeItemId t_uploads = AppendItem(
+ t_transfer, wxT("Uploads"), 8
+ );
SetItemBold(t_uploads);
- wxTreeItemId t_session = AppendItem(t_uploads, wxT("Session"), 10);
+ wxTreeItemId t_session = AppendItem(
+ t_uploads, wxT("Session"), 10
+ );
SetItemBold(t_session);
/* Transfer->Uploads->Session branch */
- AppendItem(t_session, wxT("Uploaded Data: 0.0 MB"), 6);
- AppendItem(t_session, wxT("Active Uploads: 0"), 6);
- AppendItem(t_session, wxT("Waiting Uploads: 0"), 6);
- AppendItem(t_session, wxT("Upload Sessions: 0"), 6);
- AppendItem(t_session, wxT("Total Overhead (Packets): 0.0 MB (0.0 MB)"), 6);
- wxTreeItemId t_comulative = AppendItem(t_uploads, wxT("Comulative"), 11);
+ AppendItem(
+ t_session,wxT("Uploaded Data: 0.0 MB"),6
+ );
+ AppendItem(
+ t_session, wxT("Active Uploads: 0"), 6
+ );
+ AppendItem(
+ t_session, wxT("Waiting Uploads: 0"), 6
+ );
+ AppendItem(
+ t_session, wxT("Upload Sessions: 0"), 6
+ );
+ AppendItem(
+ t_session,
+ wxT("Total Overhead (Packets): \
+ 0.0 MB (0.0 MB)"), 6
+ );
+ wxTreeItemId t_comulative = AppendItem(
+ t_uploads, wxT("Comulative"), 11
+ );
SetItemBold(t_comulative);
/* Transfer->Uploads->Comulative branch */
- AppendItem(t_comulative, wxT("Uploaded Data: 0.0 MB"), 6);
- AppendItem(t_comulative, wxT("Upload Sessions"), 6);
- AppendItem(t_comulative, wxT("Total Overhead (Packets): 0.0 MB, (0.0 MB)"), 6);
- wxTreeItemId t_downloads = AppendItem(t_transfer, wxT("Downloads"), 9);
+ AppendItem(
+ t_comulative,
+ wxT("Uploaded Data: 0.0 MB"), 6
+ );
+ AppendItem(
+ t_comulative, wxT("Upload Sessions"), 6
+ );
+ AppendItem(
+ t_comulative,
+ wxT("Total Overhead (Packets): \
+ 0.0 MB, (0.0 MB)"), 6
+ );
+ wxTreeItemId t_downloads = AppendItem(
+ t_transfer, wxT("Downloads"), 9
+ );
SetItemBold(t_downloads);
/* Transfer->Downloads branch */
AppendItem(t_downloads, wxT("Session"), 10);
@@ -124,48 +156,150 @@
void CStatisticsTreeCtrl::CreateConnectionBranch(wxTreeItemId root) {
wxTreeItemId t_connection = AppendItem(root, wxT("Connection"), 1);
SetItemBold(t_connection);
- wxTreeItemId t_sess = AppendItem(t_connection, wxT("Session"), 10);
+ wxTreeItemId t_sess = AppendItem(
+ t_connection, wxT("Session"), 10
+ );
SetItemBold(t_sess);
- wxTreeItemId t_sess_gen = AppendItem(t_sess, wxT("General"), 13);
+ wxTreeItemId t_sess_gen = AppendItem(
+ t_sess, wxT("General"), 13
+ );
SetItemBold(t_sess_gen);
- AppendItem(t_sess_gen, wxT("Reconnects: 0"), 6);
- AppendItem(t_sess_gen, wxT("Active Connections (estimate): 0"), 6);
- AppendItem(t_sess_gen, wxT("Average Connections (estimate): 0"), 6);
- AppendItem(t_sess_gen, wxT("Peak Connections (estimate): 0"), 6);
- AppendItem(t_sess_gen, wxT("Max Connection Limit Reached: 0"), 6);
- wxTreeItemId t_sess_up = AppendItem(t_sess, wxT("Upload"), 8);
+ AppendItem(
+ t_sess_gen, wxT("Reconnects: 0"), 6
+ );
+ AppendItem(
+ t_sess_gen,
+ wxT("Active Connections (estimate): 0"),
+ 6
+ );
+ AppendItem(
+ t_sess_gen,
+ wxT("Average Connections \
+ (estimate): 0"), 6
+ );
+ AppendItem(
+ t_sess_gen,
+ wxT("Peak Connections (estimate): 0"), 6
+ );
+ AppendItem(
+ t_sess_gen,
+ wxT("Max Connection Limit Reached: 0"),
+ 6
+ );
+ wxTreeItemId t_sess_up = AppendItem(
+ t_sess, wxT("Upload"), 8
+ );
SetItemBold(t_sess_up);
- AppendItem(t_sess_up, wxT("Upload-Speed: 0.0 kb/s"), 6);
- AppendItem(t_sess_up, wxT("Average Uploadrate: 0.0 kb/s"), 6);
- AppendItem(t_sess_up, wxT("Max Upload Rate: 0.0 kb/s"), 6);
- AppendItem(t_sess_up, wxT("Max Average Upload Rate: 0.0 kb/s"), 6);
- wxTreeItemId t_sess_down = AppendItem(t_sess, wxT("Download"), 9);
+ AppendItem(
+ t_sess_up,
+ wxT("Upload-Speed: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_sess_up,
+ wxT("Average Uploadrate: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_sess_up,
+ wxT("Max Upload Rate: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_sess_up,
+ wxT("Max Average Upload Rate: \
+ 0.0 kb/s"), 6
+ );
+ wxTreeItemId t_sess_down = AppendItem(
+ t_sess, wxT("Download"), 9
+ );
SetItemBold(t_sess_down);
- AppendItem(t_sess_down, wxT("Download-Speed: 0.0 kb/s"), 6);
- AppendItem(t_sess_down, wxT("Average Downloadrate: 0.0 kb/s"), 6);
- AppendItem(t_sess_down, wxT("Max Download Rate: 0.0 kb/s"), 6);
- AppendItem(t_sess_down, wxT("Max Average Download Rate: 0.0 kb/s"), 6);
- wxTreeItemId t_com = AppendItem(t_connection, wxT("Comulative"), 11);
+ AppendItem(
+ t_sess_down,
+ wxT("Download-Speed: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_sess_down,
+ wxT("Average Downloadrate: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_sess_down,
+ wxT("Max Download Rate: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_sess_down,
+ wxT("Max Average Download \
+ Rate: 0.0 kb/s"), 6
+ );
+ wxTreeItemId t_com = AppendItem(
+ t_connection, wxT("Comulative"), 11
+ );
SetItemBold(t_com);
- wxTreeItemId t_com_gen = AppendItem(t_com, wxT("General"), 13);
+ wxTreeItemId t_com_gen = AppendItem(
+ t_com, wxT("General"), 13
+ );
SetItemBold(t_com_gen);
AppendItem(t_com_gen, wxT("Reconnects: 0"), 6);
- AppendItem(t_com_gen, wxT("Active Connections (estimate): 0"), 6);
- AppendItem(t_com_gen, wxT("Average Connections (estimate): 0"), 6);
- AppendItem(t_com_gen, wxT("Peak Connections (estimate): 0"), 6);
- AppendItem(t_com_gen, wxT("Max Connection Limit Reached: 0"), 6);
- wxTreeItemId t_com_up = AppendItem(t_com, wxT("Upload"), 8);
+ AppendItem(
+ t_com_gen,
+ wxT("Active Connections (estimate): 0"),
+ 6
+ );
+ AppendItem(
+ t_com_gen,
+ wxT("Average Connections \
+ (estimate): 0"), 6
+ );
+ AppendItem(
+ t_com_gen,
+ wxT("Peak Connections (estimate): 0"),
+ 6
+ );
+ AppendItem(
+ t_com_gen,
+ wxT("Max Connection Limit Reached: 0"),
+ 6
+ );
+ wxTreeItemId t_com_up = AppendItem(
+ t_com, wxT("Upload"), 8
+ );
SetItemBold(t_com_up);
- AppendItem(t_com_up, wxT("Upload-Speed: 0.0 kb/s"), 6);
- AppendItem(t_com_up, wxT("Average Uploadrate: 0.0 kb/s"), 6);
- AppendItem(t_com_up, wxT("Max Upload Rate: 0.0 kb/s"), 6);
- AppendItem(t_com_up, wxT("Max Average Upload Rate: 0.0 kb/s"), 6);
- wxTreeItemId t_com_down = AppendItem(t_com, wxT("Download"), 9);
+ AppendItem(
+ t_com_up,
+ wxT("Upload-Speed: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_com_up,
+ wxT("Average Uploadrate: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_com_up,
+ wxT("Max Upload Rate: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_com_up,
+ wxT("Max Average Upload Rate: \
+ 0.0 kb/s"), 6
+ );
+ wxTreeItemId t_com_down = AppendItem(
+ t_com, wxT("Download"), 9
+ );
SetItemBold(t_com_down);
- AppendItem(t_com_down, wxT("Download-Speed: 0.0 kb/s"), 6);
- AppendItem(t_sess_down, wxT("Average Downloadrate: 0.0 kb/s"), 6);
- AppendItem(t_com_down, wxT("Max Download Rate: 0.0 kb/s"), 6);
- AppendItem(t_com_down, wxT("Max Average Download Rate: 0.0 kb/s"), 6);
+ AppendItem(
+ t_com_down,
+ wxT("Download-Speed: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_sess_down,
+ wxT("Average Downloadrate: 0.0 kb/s"),
+ 6
+ );
+ AppendItem(
+ t_com_down,
+ wxT("Max Download Rate: 0.0 kb/s"), 6
+ );
+ AppendItem(
+ t_com_down,
+ wxT("Max Average Download Rate: \
+ 0.0 kb/s"), 6
+ );
}
/*
@@ -174,24 +308,66 @@
void CStatisticsTreeCtrl::CreateTimeStatisticsBranch(wxTreeItemId root) {
wxTreeItemId t_statistics = AppendItem(root, wxT("Time Statistics"), 2);
SetItemBold(t_statistics);
- AppendItem(t_statistics, wxT("Statistics last reset: Unknown"), 6);
- AppendItem(t_statistics, wxT("Time since last reset: Unknown"), 6);
- wxTreeItemId t_sess = AppendItem(t_statistics, wxT("Session"), 10);
+ AppendItem(
+ t_statistics,
+ wxT("Statistics last reset: Unknown"), 6
+ );
+ AppendItem(
+ t_statistics,
+ wxT("Time since last reset: Unknown"), 6
+ );
+ wxTreeItemId t_sess = AppendItem(
+ t_statistics, wxT("Session"), 10
+ );
SetItemBold(t_sess);
AppendItem(t_sess, wxT("Runtime: 0 minutes"), 6);
- wxTreeItemId t_sess_ttime = AppendItem(t_sess, wxT("Transfer Time: 0 minutes (0.0%)"), 6);
- AppendItem(t_sess_ttime, wxT("Upload Time: 0:00 hours (0.0%)"), 6);
- AppendItem(t_sess_ttime, wxT("Download Time: 0:00 hours (0.0%)"), 6);
- AppendItem(t_sess, wxT("Current Server Duration: 0:00 hours (0.0%)"), 6);
- AppendItem(t_sess, wxT("Total Server Duration: 0:00 hours (0.0%)"), 6);
- wxTreeItemId t_com = AppendItem(t_statistics, wxT("Comulative"), 11);
+ wxTreeItemId t_sess_ttime = AppendItem(
+ t_sess, wxT("Transfer Time: 0 minutes (0.0%)"),6
+ );
+ AppendItem(
+ t_sess_ttime,
+ wxT("Upload Time: 0:00 hours (0.0%)"), 6
+ );
+ AppendItem(
+ t_sess_ttime,
+ wxT("Download Time: 0:00 hours (0.0%)"),
+ 6
+ );
+ AppendItem(
+ t_sess,
+ wxT("Current Server Duration: \
+ 0:00 hours (0.0%)"), 6
+ );
+ AppendItem(
+ t_sess,
+ wxT("Total Server Duration: 0:00 hours (0.0%)"),
+ 6
+ );
+ wxTreeItemId t_com = AppendItem(
+ t_statistics, wxT("Comulative"), 11
+ );
SetItemBold(t_com);
AppendItem(t_com, wxT("Runtime: 0 minutes"), 6);
- wxTreeItemId t_com_ttime = AppendItem(t_com, wxT("Transfer Time: 0 minutes (0.0%)"), 6);
- AppendItem(t_com_ttime, wxT("Upload Time: 0:00 hours (0.0%)"), 6);
- AppendItem(t_com_ttime, wxT("Download Time: 0:00 hours (0.0%)"), 6);
- AppendItem(t_com, wxT("Total Server Duration: 0:00 hours (0.0%)"), 6);
- wxTreeItemId t_avg = AppendItem(t_statistics, wxT("Projected Averages"), 7);
+ wxTreeItemId t_com_ttime = AppendItem(
+ t_com, wxT("Transfer Time: 0 minutes (0.0%)"), 6
+ );
+ AppendItem(
+ t_com_ttime,
+ wxT("Upload Time: 0:00 hours (0.0%)"), 6
+ );
+ AppendItem(
+ t_com_ttime,
+ wxT("Download Time: 0:00 hours (0.0%)"),
+ 6
+ );
+ AppendItem(
+ t_com,
+ wxT("Total Server Duration: 0:00 hours (0.0%)"),
+ 6
+ );
+ wxTreeItemId t_avg = AppendItem(
+ t_statistics, wxT("Projected Averages"), 7
+ );
SetItemBold(t_avg);
AppendItem(t_avg, wxT("Daily"), 14);
AppendItem(t_avg, wxT("Monthly"), 15);
@@ -204,33 +380,85 @@
void CStatisticsTreeCtrl::CreateClientsBranch(wxTreeItemId root) {
wxTreeItemId t_clients = AppendItem(root, wxT("Clients"), 3);
SetItemBold(t_clients);
- wxTreeItemId t_soft = AppendItem(t_clients, wxT("Client Software"), 6);
- wxTreeItemId t_emule = AppendItem(t_soft, wxT("eMule: 0 (0.0%)"), 6);
+ wxTreeItemId t_soft = AppendItem(
+ t_clients, wxT("Client Software"), 6
+ );
+ wxTreeItemId t_emule = AppendItem(
+ t_soft, wxT("eMule: 0 (0.0%)"), 6
+ );
AppendItem(t_emule, wxT("v0.30: 0 (0.0%)"), 6);
AppendItem(t_emule, wxT("v0.29: 0 (0.0%)"), 6);
AppendItem(t_emule, wxT("v0.28: 0 (0.0%)"), 6);
AppendItem(t_emule, wxT("v0.27: 0 (0.0%)"), 6);
- wxTreeItemId t_mule_old = AppendItem(t_emule, wxT("Old 0 (0.0%)"), 6);
- AppendItem(t_mule_old, wxT("v0.26: 0 (0.0%)"), 6);
- AppendItem(t_mule_old, wxT("v0.25: 0 (0.0%)"), 6);
- AppendItem(t_mule_old, wxT("v0.24: 0 (0.0%)"), 6);
- AppendItem(t_mule_old, wxT("v0.23: 0 (0.0%)"), 6);
- wxTreeItemId t_hybrid = AppendItem(t_soft, wxT("eD Hybrid: 0 (0.0%)"), 6);
- AppendItem(t_hybrid, wxT("v50.1: 0 (0.0%)"), 6);
- AppendItem(t_hybrid, wxT("v50.0: 0 (0.0%)"), 6);
- AppendItem(t_hybrid, wxT("v49.9: 0 (0.0%)"), 6);
- AppendItem(t_hybrid, wxT("v49.5: 0 (0.0%)"), 6);
- wxTreeItemId t_hybrid_old = AppendItem(t_hybrid, wxT("Old: 0 (0.0%)"), 6);
- AppendItem(t_hybrid_old, wxT("v49.4: 0 (0.0)"), 6);
- AppendItem(t_hybrid_old, wxT("v48.1: 0 (0.0)"), 6);
- AppendItem(t_hybrid_old, wxT("v48.0: 0 (0.0)"), 6);
- AppendItem(t_hybrid_old, wxT("v47.0: 0 (0.0)"), 6);
- wxTreeItemId t_donkey = AppendItem(t_soft, wxT("eDonkey: 0 (0.0%)"), 6);
- AppendItem(t_donkey, wxT("v61.0: 0 (0.0%)"), 6);
- AppendItem(t_donkey, wxT("v60.0: 0 (0.0%)"), 6);
- AppendItem(t_donkey, wxT("v59.0: 0 (0.0%)"), 6);
- wxTreeItemId t_xmule = AppendItem(t_soft, wxT("xMule: 0 (0.0%)"), 6);
- AppendItem(t_xmule, wxT("xMule: 0 (0.0%)"), 6);
+ wxTreeItemId t_mule_old = AppendItem(
+ t_emule, wxT("Old 0 (0.0%)"), 6
+ );
+ AppendItem(
+ t_mule_old,
+ wxT("v0.26: 0 (0.0%)"), 6
+ );
+ AppendItem(
+ t_mule_old,
+ wxT("v0.25: 0 (0.0%)"), 6
+ );
+ AppendItem(
+ t_mul...
[truncated message content] |
|
From: <ma...@us...> - 2003-11-30 21:05:53
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv31749 Modified Files: Images.cpp Log Message: Removed extra commented line Index: Images.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- Images.cpp 30 Nov 2003 21:04:38 -0000 1.29 +++ Images.cpp 30 Nov 2003 21:05:50 -0000 1.30 @@ -221,7 +221,6 @@ images.DeleteObject(&(GetImage(btnimg.Item(i)))); wxBitmap *new_image = new wxBitmap(tmp_new); images.Append(btnimg.Item(i), new_image); -// GetImage(btnimg.Item(i)) = tmp_new; } mdc.EndDrawing(); } |
|
From: <ma...@us...> - 2003-11-30 21:04:41
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv31402 Modified Files: GUISettingsDlg.cpp Images.cpp MainDlg.cpp Log Message: Fixed `ToolBar Images get broken when changing iconset` bug. Index: GUISettingsDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- GUISettingsDlg.cpp 27 Nov 2003 10:00:02 -0000 1.23 +++ GUISettingsDlg.cpp 30 Nov 2003 21:04:38 -0000 1.24 @@ -244,6 +244,7 @@ /* Update static bitmaps */ img->UpdateImages(mainframe); /* Recreate toolbar */ + img->MakeToolImages(); mainframe->CreateMyToolBar(); /* Update server page logbook */ serverwnd->SetLogBookImages(); Index: Images.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- Images.cpp 29 Nov 2003 06:51:42 -0000 1.28 +++ Images.cpp 30 Nov 2003 21:04:38 -0000 1.29 @@ -218,7 +218,10 @@ tmp_mask = new wxMask(tmp_new, wxColour(0,0,0)); tmp_new.SetMask(tmp_mask); #endif - GetImage(btnimg.Item(i)) = tmp_new; + images.DeleteObject(&(GetImage(btnimg.Item(i)))); + wxBitmap *new_image = new wxBitmap(tmp_new); + images.Append(btnimg.Item(i), new_image); +// GetImage(btnimg.Item(i)) = tmp_new; } mdc.EndDrawing(); } Index: MainDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- MainDlg.cpp 30 Nov 2003 20:38:36 -0000 1.18 +++ MainDlg.cpp 30 Nov 2003 21:04:38 -0000 1.19 @@ -63,9 +63,10 @@ int height, width, posx, posy; start_up = true; - /** - * Create toolbar and menubar - */ + /* Generate toolbar images */ + img->MakeToolImages(); + + /* Create toolbar and menubar */ CreateMyToolBar(); CreateMyMenuBar(); @@ -243,9 +244,6 @@ this, -1, wxDefaultPosition, wxDefaultSize, tool_align|wxNO_BORDER|wxTB_3DBUTTONS|wxTB_FLAT ); - - /* Generate toolbar images */ - img->MakeToolImages(); tb->SetToolBitmapSize(wxSize(img->tool_img_width, img->tool_img_height)); tb->SetMargins(2, 2); |
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27214
Modified Files:
MainDlg.cpp MessagesWnd.cpp SearchWnd.cpp SharedFilesWnd.cpp
wxInterface.wdr wxInterface_wdr.cpp
Log Message:
Unicode compatibility fix.
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- MainDlg.cpp 27 Nov 2003 13:52:51 -0000 1.17
+++ MainDlg.cpp 30 Nov 2003 20:38:36 -0000 1.18
@@ -110,10 +110,15 @@
wxASSERT_MSG(statusbar, wxT("CMainDlg::CMainDlg() - StatusBar object not ready for accessing."));
GetBmpStatusConnection()->SetBitmap(img->GetImage(wxT("disconnected")));
+ GetBmpStatusConnection()->SetName(wxT("disconnected"));
GetBmpStatusUsers()->SetBitmap(img->GetImage(wxT("user")));
+ GetBmpStatusUsers()->SetName(wxT("user"));
GetBmpStatusFiles()->SetBitmap(img->GetImage(wxT("sharedfiles")));
+ GetBmpStatusFiles()->SetName(wxT("sharedfiles"));
GetBmpStatusUpload()->SetBitmap(img->GetImage(wxT("upload")));
+ GetBmpStatusUpload()->SetName(wxT("upload"));
GetBmpStatusDload()->SetBitmap(img->GetImage(wxT("download")));
+ GetBmpStatusDload()->SetName(wxT("download"));
/* Load dialog pages */
LoadAndShowDialogPages();
Index: MessagesWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MessagesWnd.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MessagesWnd.cpp 27 Nov 2003 08:23:11 -0000 1.10
+++ MessagesWnd.cpp 30 Nov 2003 20:38:36 -0000 1.11
@@ -41,7 +41,9 @@
/* Set images of dialog static bitmaps */
GetFriendImage()->SetBitmap(img->GetImage(wxT("friend")));
+ GetFriendImage()->SetName(wxT("friend"));
GetMessagesImage()->SetBitmap(img->GetImage(wxT("messages")));
+ GetMessagesImage()->SetName(wxT("messages"));
Hide();
}
Index: SearchWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchWnd.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- SearchWnd.cpp 27 Nov 2003 08:23:11 -0000 1.15
+++ SearchWnd.cpp 30 Nov 2003 20:38:36 -0000 1.16
@@ -49,6 +49,7 @@
SearchWnd( this, TRUE );
GetSearchResultsImage()->SetBitmap(img->GetImage(wxT("searchresults")));
+ GetSearchResultsImage()->SetName(wxT("searchresults"));
Hide();
Index: SharedFilesWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SharedFilesWnd.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SharedFilesWnd.cpp 27 Nov 2003 08:23:12 -0000 1.10
+++ SharedFilesWnd.cpp 30 Nov 2003 20:38:36 -0000 1.11
@@ -40,6 +40,7 @@
SharedFilesWnd( this, TRUE );
GetSharedFilesImage()->SetBitmap(img->GetImage(wxT("sharedfiles")));
+ GetSharedFilesImage()->SetName(wxT("sharedfiles"));
Hide();
}
Index: wxInterface.wdr
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.wdr,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
Binary files /tmp/cvs83vPDQ and /tmp/cvs29YaXw differ
Index: wxInterface_wdr.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_wdr.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wxInterface_wdr.cpp 27 Nov 2003 08:23:12 -0000 1.8
+++ wxInterface_wdr.cpp 30 Nov 2003 20:38:36 -0000 1.9
@@ -259,7 +259,6 @@
wxBoxSizer *item35 = new wxBoxSizer( wxHORIZONTAL );
wxStaticBitmap *item36 = new wxStaticBitmap( parent, ID_SEARCH_RESULTS_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item36->SetName( "searchresults" );
item35->Add( item36, 0, wxALIGN_CENTER|wxALL, 5 );
wxStaticText *item37 = new wxStaticText( parent, ID_TEXT, _("Search Results"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -346,7 +345,6 @@
wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
wxStaticBitmap *item2 = new wxStaticBitmap( parent, ID_SHARED_FILES_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item2->SetName( "sharedfiles" );
item1->Add( item2, 0, wxALIGN_CENTER|wxTOP|wxBOTTOM, 5 );
wxStaticText *item3 = new wxStaticText( parent, ID_TXT_SHARED, _("Shared Files"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -475,7 +473,6 @@
wxBoxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
wxStaticBitmap *item3 = new wxStaticBitmap( parent, ID_FRIEND_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item3->SetName( "friend" );
item2->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
wxStaticText *item4 = new wxStaticText( parent, ID_TEXT, _("Friends"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -495,7 +492,6 @@
wxBoxSizer *item7 = new wxBoxSizer( wxHORIZONTAL );
wxStaticBitmap *item8 = new wxStaticBitmap( parent, ID_MESSAGES_IMAGE, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item8->SetName( "messages" );
item7->Add( item8, 0, wxALIGN_CENTER|wxALL, 5 );
wxStaticText *item9 = new wxStaticText( parent, ID_TEXT, _("Messages"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -879,7 +875,6 @@
item2->Add( item4, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item5 = new wxStaticBitmap( parent, ID_BMP_STATUS_USERS, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item5->SetName( "user" );
item2->Add( item5, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item6 = new wxStaticText( parent, ID_STATUS_USERS, wxT("0(0)"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -889,7 +884,6 @@
item2->Add( item7, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item8 = new wxStaticBitmap( parent, ID_BMP_STATUS_FILES, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item8->SetName( "sharedfiles" );
item2->Add( item8, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item9 = new wxStaticText( parent, ID_STATUS_FILES, wxT("0(0)"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -899,7 +893,6 @@
item2->Add( item10, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item11 = new wxStaticBitmap( parent, ID_BMP_STATUS_UPLOAD, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item11->SetName( "upload" );
item2->Add( item11, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item12 = new wxStaticText( parent, ID_STATUS_UPLOAD, wxT("0 kb/s"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -909,7 +902,6 @@
item2->Add( item13, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item14 = new wxStaticBitmap( parent, ID_BMP_STATUS_DLOAD, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item14->SetName( "download" );
item2->Add( item14, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item15 = new wxStaticText( parent, ID_STATUS_DLOAD, _("0 kb/s"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -919,7 +911,6 @@
item2->Add( item16, 0, wxALIGN_CENTER, 5 );
wxStaticBitmap *item17 = new wxStaticBitmap( parent, ID_BMP_STATUS_CONNECTION, Icons( 0 ), wxDefaultPosition, wxDefaultSize );
- item17->SetName( "disconnected" );
item2->Add( item17, 0, wxALIGN_CENTER|wxLEFT, 5 );
wxStaticText *item18 = new wxStaticText( parent, ID_STATUS_CONNECTION, _("Disconnected"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
From: <ma...@us...> - 2003-11-30 18:57:50
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv7297 Modified Files: Changelog Log Message: Spanish transl Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- Changelog 29 Nov 2003 09:18:06 -0000 1.101 +++ Changelog 30 Nov 2003 18:57:47 -0000 1.102 @@ -21,6 +21,9 @@ # ALL ChangeLog entries end with a dot. ############################################################################### +2003/11/30 Alo Sarv + * Spanish translation by Chema Rodriguez (thorero). + 2003/11/29 Alo Sarv * Support for Windows XP Visual Themes. |
|
From: <ma...@us...> - 2003-11-30 18:56:49
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7171
Modified Files:
wxInterface.cpp
Log Message:
Spanish added to SupportedLangs()
Index: wxInterface.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wxInterface.cpp 27 Nov 2003 08:23:12 -0000 1.7
+++ wxInterface.cpp 30 Nov 2003 18:56:45 -0000 1.8
@@ -165,6 +165,7 @@
supportedlangs.Add(wxT("Default"));
supportedlangs.Add(wxT("German"));
supportedlangs.Add(wxT("Estonian"));
+ supportedlangs.Add(wxT("Spanish"));
m_config->SetPath(wxT("/General/Lang"));
@@ -263,6 +264,8 @@
return wxLANGUAGE_GERMAN;
} else if (lang == wxT("Estonian")) {
return wxLANGUAGE_ESTONIAN;
+ } else if (lang == wxT("Spanish")) {
+ return wxLANGUAGE_SPANISH;
} else {
return wxLANGUAGE_DEFAULT;
}
|
|
From: <ma...@us...> - 2003-11-30 18:19:56
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv31919 Added Files: Spanish.po Log Message: Spanish translation by thorero --- NEW FILE: Spanish.po --- (This appears to be a binary file; contents omitted.) |
|
From: <ma...@us...> - 2003-11-29 09:18:15
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv15636 Modified Files: Changelog Log Message: Support for Windows XP Visual Themes. Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- Changelog 28 Nov 2003 18:41:44 -0000 1.100 +++ Changelog 29 Nov 2003 09:18:06 -0000 1.101 @@ -18,7 +18,11 @@ # in parenthesis. # # # # ALWAYS keep line lenghts UNDER/AT 80 characters. # +# ALL ChangeLog entries end with a dot. ############################################################################### + +2003/11/29 Alo Sarv + * Support for Windows XP Visual Themes. 2003/11/27 Alo Sarv * Images class rewritten to provide dynamic reloading and name-based |
|
From: <ma...@us...> - 2003-11-29 09:16:43
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15438
Modified Files:
wxInterface_private.rc
Added Files:
wxInterface.Manifest
Log Message:
Support for Windows XP Visual Themes.
--- NEW FILE: wxInterface.Manifest ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly
xmlns="urn:schemas-microsoft-com:asm.v1"
manifestVersion="1.0">
<assemblyIdentity
processorArchitecture="x86"
version="5.1.0.0"
type="win32"
name="wxInterface.exe"/>
<description>ShareDaemon wxInterface</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
publicKeyToken="6595b64144ccf1df"
language="*"
processorArchitecture="x86"/>
</dependentAssembly>
</dependency>
</assembly>
Index: wxInterface_private.rc
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_private.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wxInterface_private.rc 21 Nov 2003 03:01:32 -0000 1.2
+++ wxInterface_private.rc 29 Nov 2003 09:16:40 -0000 1.3
@@ -10,4 +10,4 @@
// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE)
//
-//1 24 "wxInterface.exe.Manifest"
+1 24 "wxInterface.Manifest"
|
|
From: <ma...@us...> - 2003-11-29 06:51:45
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25966
Modified Files:
Images.cpp
Log Message:
SetTextForeground to 10,10,10 in toobuttonimages
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Images.cpp 28 Nov 2003 17:42:25 -0000 1.27
+++ Images.cpp 29 Nov 2003 06:51:42 -0000 1.28
@@ -179,6 +179,7 @@
tmp = wxBitmap(100, 100);
mdc.SelectObject(tmp);
+ mdc.SetTextForeground(wxColour(10, 10, 10));
mdc.SetFont(wxFont(10, wxDECORATIVE, wxNORMAL, wxBOLD));
for (unsigned int i=0;i<btntxt.GetCount();i++) {
mdc.GetTextExtent(btntxt.Item(i), &x, &y);
|
|
From: <ma...@us...> - 2003-11-28 18:41:47
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv3914 Modified Files: Changelog Log Message: Typo fix Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- Changelog 27 Nov 2003 14:00:34 -0000 1.99 +++ Changelog 28 Nov 2003 18:41:44 -0000 1.100 @@ -9,8 +9,8 @@ # * @CHANGE # # # # @DATE is date of commiting to CVS (changes that are not commited to # -# CVS should NEVER be added to Changelog # -# @PERSON is the full REAL name of the one commiting to CVS (not neccesery # +# CVS should NEVER be added to Changelog). Local time is ok. # +# @PERSON is the full REAL name of the one commiting to CVS (not necceserely # # the code author). If you wish to add your nick/handle, add it after your # # name in parenthesis. # # @CHANGE is a short description of the modification done. If you are not # |
