Menu
▾
▴
[ShareDaemon-CVS] ui-wx/src MainDlg.cpp,1.23,1.24 MainDlg.h,1.9,1.10 ServerListCtrl.cpp,1.11,1.12 ServerListCtrl.h,1.8,1.9 ServerWnd.cpp,1.46,1.47 defines.h,1.39,1.40 wxInterface.wdr,1.9,1.10 wxInterface_wdr.cpp,1.9,1.10 wxInterface_wdr.h,1.4,1.5
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29276
Modified Files:
MainDlg.cpp MainDlg.h ServerListCtrl.cpp ServerListCtrl.h
ServerWnd.cpp defines.h wxInterface.wdr wxInterface_wdr.cpp
wxInterface_wdr.h
Log Message:
.wdr cleanup && minor serverpage look enhancements
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- MainDlg.cpp 8 Dec 2003 01:08:10 -0000 1.23
+++ MainDlg.cpp 17 Dec 2003 05:16:01 -0000 1.24
@@ -80,7 +80,10 @@
#endif
/* This adds a new sizer in the frame to make switching pages easier. */
- m_mainsizer = ContentSizer(this, true);
+ m_mainsizer = new wxFlexGridSizer(1);
+ m_mainsizer->AddGrowableCol(0);
+ m_mainsizer->AddGrowableRow(0);
+ SetSizer(m_mainsizer);
/**
* Read position and size settings, and apply them before
Index: MainDlg.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MainDlg.h 8 Dec 2003 01:39:02 -0000 1.9
+++ MainDlg.h 17 Dec 2003 05:16:01 -0000 1.10
@@ -108,9 +108,9 @@
void ShowGUISettingsDlg();
void UpdateToolButtons();
void UpdateMenuBar();
- wxWindow* GetCurPage() { return activewnd; }
/* Getters */
+ wxWindow* GetCurPage() { return activewnd; }
wxMenuItem* GetViewMenuBar() {
return GetMenuBar()->FindItem(ID_VIEW_MENUBAR);
}
@@ -153,12 +153,11 @@
}
/* Member variables */
- bool show_tool; // Wether toolbar should be shown or not.
- bool start_up; // Should we remember last page
- // between sessions or not
- int m_lastbtn; // Last toggled toolbar button
- wxSizer *m_mainsizer; // Sizer to make dialog pages switching easier.
- wxWindow *activewnd; // Current active dialog page
+ bool show_tool; /* Wether toolbar should be shown or not. */
+ bool start_up; /* Should we remember last page between sessions */
+ int m_lastbtn; /* Last toggled toolbar button */
+ wxFlexGridSizer *m_mainsizer; /* Main frame sizer */
+ wxWindow *activewnd; /* Current active dialog page */
};
#endif
Index: ServerListCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerListCtrl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ServerListCtrl.cpp 27 Nov 2003 08:23:12 -0000 1.11
+++ ServerListCtrl.cpp 17 Dec 2003 05:16:01 -0000 1.12
@@ -39,9 +39,10 @@
* column layout.
*/
CServerListCtrl::CServerListCtrl(
- wxWindow*& parent,int id,const wxPoint& pos,wxSize siz,int flags
+ wxWindow* parent, wxWindowID id, const wxPoint& pos,
+ const wxSize& siz, long style
)
-: CMListCtrl(parent,id,pos,siz,flags) {
+: CMListCtrl(parent, id, pos, siz, style) {
/**
* Generate the columns for this list control. To add or remove
* columns, modify the col_headers array, but make sure the
Index: ServerListCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerListCtrl.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ServerListCtrl.h 24 Nov 2003 16:06:32 -0000 1.8
+++ ServerListCtrl.h 17 Dec 2003 05:16:01 -0000 1.9
@@ -38,8 +38,12 @@
class CServerListCtrl: public CMListCtrl {
public:
- CServerListCtrl(wxWindow*& parent,int id,const wxPoint& pos,
- wxSize siz,int flags);
+ CServerListCtrl(
+ wxWindow* parent, wxWindowID id = -1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize &siz = wxDefaultSize,
+ long style = wxNO_FULL_REPAINT_ON_RESIZE
+ );
virtual ~CServerListCtrl();
void AddItem(wxArrayString fields_data);
Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ServerWnd.cpp 17 Dec 2003 04:05:41 -0000 1.46
+++ ServerWnd.cpp 17 Dec 2003 05:16:01 -0000 1.47
@@ -182,25 +182,15 @@
sbmain->SetSizeHints(sidebar);
/* Add the sidebar to mainsizer. */
- mainsizer->Add(sidebar, 0, wxGROW|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 0);
+ mainsizer->Add(sidebar, 0, wxGROW|wxADJUST_MINSIZE, 5);
- /**
- * Create new CSBPanel object which provides framework for
- * opening/closing the section, set its content and add to
- * sidebar.
- */
+ /* Sidebar sections */
CSBPanel *addserver = new CSBPanel(
sidebar, -1, _("Add new server"), wxT("SideBar_AddServer")
);
addserver->SetContent(AddServerPanel(addserver, false, false));
sbmain->Add(addserver, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 0);
- CSBPanel *updatelist = new CSBPanel(
- sidebar, -1, _("Update from URL"), wxT("SideBar_UpdateServer")
- );
- 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")
);
@@ -221,7 +211,7 @@
/* Button to toggle sidebar on/off */
wxButton *toggler = new wxButton(
- this, ID_BTN_TOGGLE_SIDEBAR, wxT("<"),
+ this, ID_BTN_TOGGLE_SIDEBAR, wxT("<"),
wxDefaultPosition, wxSize(12, 100)
);
toggler->SetFont(wxFont(14, wxNORMAL, wxNORMAL, wxBOLD));
@@ -233,7 +223,7 @@
/* Splitter window */
splatter = new wxSplitterWindow(
- this, ID_SERVER_SPLITTER_HORIZONTAL, wxDefaultPosition,
+ this, ID_SERVER_SPLITTER_HORIZONTAL, wxDefaultPosition,
wxDefaultSize, wxSP_3DSASH|wxSP_NOBORDER|wxSP_LIVE_UPDATE|
wxNO_FULL_REPAINT_ON_RESIZE
);
@@ -244,13 +234,82 @@
wxDefaultPosition, wxDefaultSize,
wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL
);
- Server_List(top_panel, false, true);
+ wxFlexGridSizer *s_top = new wxFlexGridSizer(1);
+ s_top->AddGrowableCol(0);
+ s_top->AddGrowableRow(1);
+
+ wxFlexGridSizer *s_top_v = new wxFlexGridSizer(2);
+ s_top_v->AddGrowableCol(0);
+ wxComboBox *c_url = new wxComboBox(top_panel, ID_SERVERLISTURL);
+ c_url->Append(wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-best.met"));
+ c_url->Append(wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-good.met"));
+ c_url->Append(wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-max.met"));
+ c_url->SetSelection(0);
+#ifndef __WXX11__
+ c_url->SetToolTip(_("Enter the URL or .met file location to update list from"));
+#endif
+ s_top_v->Add(c_url, 0, wxGROW|wxEXPAND|wxALL, 0);
+ wxButton *b_upd = new wxButton(top_panel, ID_UPDATE, _("Update"));
+ s_top_v->Add(b_upd, 0, wxGROW|wxEXPAND|wxRIGHT, 5);
+ s_top->Add(s_top_v, 0, wxGROW|wxEXPAND|wxALL, 0);
+
+ CServerListCtrl *serverlist = new CServerListCtrl(
+ top_panel, -1, wxDefaultPosition, wxDefaultSize,
+ wxLC_REPORT|wxSUNKEN_BORDER|wxNO_FULL_REPAINT_ON_RESIZE
+ );
+ s_top->Add(serverlist, 0, wxGROW|wxEXPAND|wxRIGHT, 5);
+ top_panel->SetSizer(s_top);
/* Bottom Panel */
bottom_panel = new wxPanel(splatter, -1,
wxDefaultPosition, wxDefaultSize,
wxNO_FULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL);
- Server_Logs( bottom_panel, false, true);
+ wxFlexGridSizer *s_bottom = new wxFlexGridSizer(1);
+ s_bottom->AddGrowableCol(0);
+ s_bottom->AddGrowableRow(0);
+ wxNotebook *logs = new wxNotebook(
+ bottom_panel, ID_LOGBOOK, wxDefaultPosition, wxDefaultSize,
+ wxNO_FULL_REPAINT_ON_RESIZE
+ );
+ wxNotebookSizer *s_logs = new wxNotebookSizer(logs);
+ wxImageList *imgs = new wxImageList(16, 16);
+ imgs->Add(img->GetImage(wxT("log")));
+ logs->AssignImageList(imgs);
+
+ /* General logs panel */
+ wxPanel *p_logs = new wxPanel(
+ logs, -1, wxDefaultPosition, wxDefaultSize,
+ wxNO_FULL_REPAINT_ON_RESIZE
+ );
+ wxFlexGridSizer *sf_logs = new wxFlexGridSizer(1);
+ sf_logs->AddGrowableCol(0);
+ sf_logs->AddGrowableRow(0);
+ wxTextCtrl *txt_logs = new wxTextCtrl(
+ p_logs, ID_LOG, wxEmptyString, wxDefaultPosition,
+ wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY
+ );
+ sf_logs->Add(txt_logs, 0, wxGROW|wxALL|wxEXPAND, 0);
+ p_logs->SetSizer(sf_logs);
+ logs->AddPage(p_logs, _("Log"), true, 0);
+
+ /* Debug logs panel */
+ wxPanel *p_dlogs = new wxPanel(
+ logs, -1, wxDefaultPosition, wxDefaultSize,
+ wxNO_FULL_REPAINT_ON_RESIZE
+ );
+ wxFlexGridSizer *sf_dlogs = new wxFlexGridSizer(1);
+ sf_dlogs->AddGrowableCol(0);
+ sf_dlogs->AddGrowableRow(0);
+ wxTextCtrl *txt_dlogs = new wxTextCtrl(
+ p_dlogs, ID_DEBUGLOG, wxEmptyString, wxDefaultPosition,
+ wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY
+ );
+ sf_dlogs->Add(txt_dlogs, 0, wxGROW|wxALL|wxEXPAND, 0);
+ p_dlogs->SetSizer(sf_dlogs);
+ logs->AddPage(p_dlogs, _("Debug Log"), false, 0);
+
+ s_bottom->Add(s_logs, 0, wxGROW|wxEXPAND|wxTOP|wxRIGHT, 5);
+ bottom_panel->SetSizer(s_bottom);
/* Split the window and add to sizer */
splatter->SplitHorizontally( top_panel, bottom_panel,
@@ -532,41 +591,6 @@
item0->Fit( parent );
item0->SetSizeHints( parent );
}
- }
-
- return item0;
-}
-
-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
- );
-#ifndef __WXX11__
- 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
- );
- item0->Add( item2, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 5 );
-
- if (set_sizer) {
- parent->SetAutoLayout( TRUE );
- parent->SetSizer( item0 );
- if (call_fit) {
- item0->Fit( parent );
- item0->SetSizeHints( parent );
- }
}
return item0;
Index: defines.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/defines.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- defines.h 27 Nov 2003 08:23:12 -0000 1.39
+++ defines.h 17 Dec 2003 05:16:01 -0000 1.40
@@ -65,8 +65,9 @@
extern class CToolBar *toolbar;
extern wxConfigBase *m_config;
#ifdef wxHAS_TASK_BAR_ICON
- extern class CSysTray *systray;
+extern class CSysTray *systray;
#endif
+
/* ID codes for our controls */
enum {
ID_BTN_CONNECT = 1000,
@@ -116,6 +117,9 @@
ID_UPDATE,
ID_SERVERLISTURL,
ID_CHECK_DISABLE_UDP,
+ ID_LOGBOOK,
+ ID_LOG,
+ ID_DEBUGLOG,
/* Transfer page */
ID_SPLITTER,
Index: wxInterface.wdr
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.wdr,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
Binary files /tmp/cvs8u8j4d and /tmp/cvsGwZ7Jh differ
Index: wxInterface_wdr.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_wdr.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- wxInterface_wdr.cpp 30 Nov 2003 20:38:36 -0000 1.9
+++ wxInterface_wdr.cpp 17 Dec 2003 05:16:01 -0000 1.10
@@ -48,81 +48,6 @@
// Implement window functions
-wxSizer *Server_List( wxWindow *parent, bool call_fit, bool set_sizer )
-{
- wxFlexGridSizer *item0 = new wxFlexGridSizer( 2, 0, 0 );
- item0->AddGrowableCol( 0 );
- item0->AddGrowableRow( 0 );
-
- wxFlexGridSizer *item1 = new wxFlexGridSizer( 1, 0, 0 );
- item1->AddGrowableCol( 0 );
- item1->AddGrowableRow( 0 );
-
- CServerListCtrl *item2 = new CServerListCtrl( parent, ID_SERVERLISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
- item1->Add( item2, 0, wxGROW|wxRIGHT|wxTOP, 5 );
-
- item0->Add( item1, 0, wxGROW, 5 );
-
- if (set_sizer)
- {
- parent->SetAutoLayout( TRUE );
- parent->SetSizer( item0 );
- if (call_fit)
- {
- item0->Fit( parent );
- item0->SetSizeHints( parent );
- }
- }
-
- return item0;
-}
-
-wxSizer *Log( wxWindow *parent, bool call_fit, bool set_sizer )
-{
- wxFlexGridSizer *item0 = new wxFlexGridSizer( 2, 0, 0 );
- item0->AddGrowableCol( 0 );
- item0->AddGrowableRow( 0 );
-
- wxTextCtrl *item1 = new wxTextCtrl( parent, ID_LOG, wxT(""), wxDefaultPosition, wxSize(80,40), wxTE_MULTILINE|wxTE_READONLY );
- item0->Add( item1, 0, wxGROW, 5 );
-
- if (set_sizer)
- {
- parent->SetAutoLayout( TRUE );
- parent->SetSizer( item0 );
- if (call_fit)
- {
- item0->Fit( parent );
- item0->SetSizeHints( parent );
- }
- }
-
- return item0;
-}
-
-wxSizer *DebugLog( wxWindow *parent, bool call_fit, bool set_sizer )
-{
- wxFlexGridSizer *item0 = new wxFlexGridSizer( 2, 0, 0 );
- item0->AddGrowableCol( 0 );
- item0->AddGrowableRow( 0 );
-
- wxTextCtrl *item1 = new wxTextCtrl( parent, ID_DEBUGLOG, wxT(""), wxDefaultPosition, wxSize(80,40), wxTE_MULTILINE|wxTE_READONLY );
- item0->Add( item1, 0, wxGROW, 5 );
-
- if (set_sizer)
- {
- parent->SetAutoLayout( TRUE );
- parent->SetSizer( item0 );
- if (call_fit)
- {
- item0->Fit( parent );
- item0->SetSizeHints( parent );
- }
- }
-
- return item0;
-}
-
wxSizer *SearchWnd( wxWindow *parent, bool call_fit, bool set_sizer )
{
wxFlexGridSizer *item0 = new wxFlexGridSizer( 6, 0, 0, 0 );
@@ -316,26 +241,6 @@
return item0;
}
-wxSizer *ContentSizer( wxWindow *parent, bool call_fit, bool set_sizer )
-{
- wxFlexGridSizer *item0 = new wxFlexGridSizer( 1, 0, 0 );
- item0->AddGrowableCol( 0 );
- item0->AddGrowableRow( 0 );
-
- if (set_sizer)
- {
- parent->SetAutoLayout( TRUE );
- parent->SetSizer( item0 );
- if (call_fit)
- {
- item0->Fit( parent );
- item0->SetSizeHints( parent );
- }
- }
-
- return item0;
-}
-
wxSizer *SharedFilesWnd( wxWindow *parent, bool call_fit, bool set_sizer )
{
wxFlexGridSizer *item0 = new wxFlexGridSizer( 4, 0, 0, 0 );
@@ -728,39 +633,6 @@
item20->Add( item48, 0, wxGROW|wxTOP, 5 );
item0->Add( item20, 0, wxGROW|wxALL, 5 );
-
- if (set_sizer)
- {
- parent->SetAutoLayout( TRUE );
- parent->SetSizer( item0 );
- if (call_fit)
- {
- item0->Fit( parent );
- item0->SetSizeHints( parent );
- }
- }
-
- return item0;
-}
-
-wxSizer *Server_Logs( wxWindow *parent, bool call_fit, bool set_sizer )
-{
- wxFlexGridSizer *item0 = new wxFlexGridSizer( 2, 0, 0 );
- item0->AddGrowableCol( 0 );
- item0->AddGrowableRow( 0 );
-
- wxNotebook *item2 = new wxNotebook( parent, ID_LOGBOOK, wxDefaultPosition, wxDefaultSize, 0 );
- wxNotebookSizer *item1 = new wxNotebookSizer( item2 );
-
- wxPanel *item3 = new wxPanel( item2, -1, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE );
- Log( item3, FALSE );
- item2->AddPage( item3, _("Log") );
-
- wxPanel *item4 = new wxPanel( item2, -1, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE );
- DebugLog( item4, FALSE );
- item2->AddPage( item4, _("Debug Log") );
-
- item0->Add( item1, 0, wxGROW|wxRIGHT|wxTOP|wxBOTTOM, 5 );
if (set_sizer)
{
Index: wxInterface_wdr.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface_wdr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wxInterface_wdr.h 24 Nov 2003 16:06:32 -0000 1.4
+++ wxInterface_wdr.h 17 Dec 2003 05:16:01 -0000 1.5
@@ -28,91 +28,77 @@
// Declare window functions
-#define ID_SERVERLISTCTRL 10000
-wxSizer *Server_List( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-#define ID_LOG 10001
-wxSizer *Log( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-#define ID_DEBUGLOG 10002
-wxSizer *DebugLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-#define ID_TEXT 10003
-#define ID_SEARCHSTRING 10004
-#define ID_SEARCHMETHOD 10005
-#define ID_SEARCHTYPE 10006
-#define ID_BTN_RESET 10007
-#define ID_MINSIZE 10008
-#define ID_MAXSIZE 10009
-#define ID_AVAIL 10010
-#define ID_EXTENSION 10011
-#define ID_TEXTCTRL 10012
-#define ID_SEARCH_RESULTS_IMAGE 10013
-#define ID_BUTTON 10014
-#define ID_SEARCHRESULTS 10015
-#define ID_GAUGE 10016
+#define ID_TEXT 10000
+#define ID_SEARCHSTRING 10001
+#define ID_SEARCHMETHOD 10002
+#define ID_SEARCHTYPE 10003
+#define ID_BTN_RESET 10004
+#define ID_MINSIZE 10005
+#define ID_MAXSIZE 10006
+#define ID_AVAIL 10007
+#define ID_EXTENSION 10008
+#define ID_TEXTCTRL 10009
+#define ID_SEARCH_RESULTS_IMAGE 10010
+#define ID_BUTTON 10011
+#define ID_SEARCHRESULTS 10012
+#define ID_GAUGE 10013
wxSizer *SearchWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-wxSizer *ContentSizer( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-#define ID_SHARED_FILES_IMAGE 10017
-#define ID_TXT_SHARED 10018
-#define ID_SHAREDLISTCTRL 10019
-#define ID_CURSES_REQUESTS 10020
-#define ID_CURSES_ACCEPTED_UPLOADS 10021
-#define ID_CURSES_TRANSFERRED 10022
-#define ID_G_REQUESTS 10023
-#define ID_G_UPLOADS 10024
-#define ID_G_TRANSFERRED 10025
-#define ID_TOTAL_REQUESTS 10026
-#define ID_TOTAL_ACCEPTED_UPLOADS 10027
-#define ID_TOTAL_TRANSFERRED 10028
+#define ID_SHARED_FILES_IMAGE 10014
+#define ID_TXT_SHARED 10015
+#define ID_SHAREDLISTCTRL 10016
+#define ID_CURSES_REQUESTS 10017
+#define ID_CURSES_ACCEPTED_UPLOADS 10018
+#define ID_CURSES_TRANSFERRED 10019
+#define ID_G_REQUESTS 10020
+#define ID_G_UPLOADS 10021
+#define ID_G_TRANSFERRED 10022
+#define ID_TOTAL_REQUESTS 10023
+#define ID_TOTAL_ACCEPTED_UPLOADS 10024
+#define ID_TOTAL_TRANSFERRED 10025
wxSizer *SharedFilesWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_FRIEND_IMAGE 10029
-#define ID_LISTCTRL 10030
-#define ID_MESSAGES_IMAGE 10031
-#define ID_NOTEBOOK 10032
+#define ID_FRIEND_IMAGE 10026
+#define ID_LISTCTRL 10027
+#define ID_MESSAGES_IMAGE 10028
+#define ID_NOTEBOOK 10029
wxSizer *MessagesWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define BTN_STAT 10033
-#define ID_STATSTREECTRL 10034
-#define ID_FOREIGN 10035
-#define ID_CON_GRAPH 10036
-#define ID_DL_SES 10037
-#define ID_DL_CUR 10038
-#define ID_DL_AVG 10039
-#define ID_DL_GRAPH 10040
-#define ID_UL_SES 10041
-#define ID_UL_CUR 10042
-#define ID_UL_AVG 10043
-#define ID_UL_GRAPH 10044
+#define BTN_STAT 10030
+#define ID_STATSTREECTRL 10031
+#define ID_FOREIGN 10032
+#define ID_CON_GRAPH 10033
+#define ID_DL_SES 10034
+#define ID_DL_CUR 10035
+#define ID_DL_AVG 10036
+#define ID_DL_GRAPH 10037
+#define ID_UL_SES 10038
+#define ID_UL_CUR 10039
+#define ID_UL_AVG 10040
+#define ID_UL_GRAPH 10041
wxSizer *StatisticsWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_LOGBOOK 10045
-wxSizer *Server_Logs( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-#define ID_LANG_NAME 10046
-#define ID_BTN_ADD_LANG_OK 10047
-#define ID_BTN_ADD_LANG_CANCEL 10048
+#define ID_LANG_NAME 10042
+#define ID_BTN_ADD_LANG_OK 10043
+#define ID_BTN_ADD_LANG_CANCEL 10044
wxSizer *Dlg_AddLanguage( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_BTN_ADDICONSET_OK 10049
-#define ID_BTN_ADDICONSET_CANCEL 10050
+#define ID_BTN_ADDICONSET_OK 10045
+#define ID_BTN_ADDICONSET_CANCEL 10046
wxSizer *Dlg_AddIconSet( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-#define ID_LINE 10051
-#define ID_STATUS_TXT 10052
-#define ID_BMP_STATUS_USERS 10053
-#define ID_STATUS_USERS 10054
-#define ID_BMP_STATUS_FILES 10055
-#define ID_STATUS_FILES 10056
-#define ID_BMP_STATUS_UPLOAD 10057
-#define ID_STATUS_UPLOAD 10058
-#define ID_BMP_STATUS_DLOAD 10059
-#define ID_STATUS_DLOAD 10060
-#define ID_BMP_STATUS_CONNECTION 10061
-#define ID_STATUS_CONNECTION 10062
+#define ID_LINE 10047
+#define ID_STATUS_TXT 10048
+#define ID_BMP_STATUS_USERS 10049
+#define ID_STATUS_USERS 10050
+#define ID_BMP_STATUS_FILES 10051
+#define ID_STATUS_FILES 10052
+#define ID_BMP_STATUS_UPLOAD 10053
+#define ID_STATUS_UPLOAD 10054
+#define ID_BMP_STATUS_DLOAD 10055
+#define ID_STATUS_DLOAD 10056
+#define ID_BMP_STATUS_CONNECTION 10057
+#define ID_STATUS_CONNECTION 10058
wxSizer *StatusBar( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
// Declare menubar functions
@@ -121,7 +107,7 @@
// Declare bitmap functions
-#define ID_NULL_BMP 10063
+#define ID_NULL_BMP 10059
wxBitmap Icons( size_t index );
#endif
|
