[ShareDaemon-CVS] ui-wx/src MainDlg.cpp,NONE,1.1 MainDlg.h,NONE,1.1 wxInterface.cpp,NONE,1.1 wxInterface.dev,NONE,1.1 wxInterface.h,NONE,1.1 wxInterface.ico,NONE,1.1 wxInterface.wdr,NONE,1.1 wxInterface_private.h,NONE,1.1 wxInterface_private.rc,NONE,1.1 wxInterface_wdr.cpp,NONE,1.1 wxInterface_wdr.h,NONE,1.1 ColorFrameCtrl.cpp,1.1,1.2 ColorFrameCtrl.h,1.5,1.6 DownloadListCtrl.cpp,1.7,1.8 DownloadListCtrl.h,1.5,1.6 GUISettingsDlg.cpp,1.15,1.16 GUISettingsDlg.h,1.10,1.11 Images.cpp,1.11,1.12 Images.h,1.9,1.10 KnownListCtrl.cpp,1.7,1.8 KnownListCtrl.h,1.5,1.6 MListCtrl.cpp,1.6,1.7 MListCtrl.h,1.3,1.4 Makefile,1.26,1.27 Makefile.b32,1.18,1.19 MessagesWnd.cpp,1.8,1.9 MessagesWnd.h,1.6,1.7 QueueListCtrl.cpp,1.7,1.8 QueueListCtrl.h,1.5,1.6 SBPanel.cpp,1.1,1.2 SBPanel.h,1.1,1.2 SearchListCtrl.cpp,1.7,1.8 SearchListCtrl.h,1.4,1.5 SearchWnd.cpp,1.13,1.14 SearchWnd.h,1.8,1.9 ServerListCtrl.cpp,1.9,1.10 ServerListCtrl.h,1.6,1.7 ServerWnd.cpp,1.36,1.37 ServerWnd.h,1.25,1.26 SharedFilesListCtrl.cpp,1.7,1.8 SharedFilesListCtrl.h,1.5,1.6 SharedFilesWnd.cpp,1.8,1.9 SharedFilesWnd.h,1.7,1.8 StatisticsTreeCtrl.cpp,1.16,1.17 StatisticsTreeCtrl.h,1.5,1.6 StatisticsWnd.cpp,1.7,1.8 StatisticsWnd.h,1.6,1.7 StatusBar.cpp,1.14,1.15 StatusBar.h,1.7,1.8 SysTray.cpp,1.7,1.8 SysTray.h,1.3,1.4 TransferWnd.cpp,1.25,1.26 TransferWnd.h,1.10,1.11 UploadListCtrl.cpp,1.7,1.8 UploadListCtrl.h,1.5,1.6 defines.h,1.32,1.33 xMuleDlg.cpp,1.56,NONE xMuleDlg.h,1.30,NONE xMuleGUI.cpp,1.24,NONE xMuleGUI.h,1.16,NONE xMuleGUI.wdr,1.104,NONE xMuleGUI_wdr.cpp,1.106,NONE xMuleGUI_wdr.h,1.66,NONE xmule2-ui-wx.dev,1.21,NONE xmule2-ui-wx.ico,1.1,NONE xmule2-ui-wx_private.h,1.1,NONE xmule2-ui-wx_private.rc,1.6,NONE

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31500/src

Modified Files:
	ColorFrameCtrl.cpp ColorFrameCtrl.h DownloadListCtrl.cpp 
	DownloadListCtrl.h GUISettingsDlg.cpp GUISettingsDlg.h 
	Images.cpp Images.h KnownListCtrl.cpp KnownListCtrl.h 
	MListCtrl.cpp MListCtrl.h Makefile Makefile.b32 
	MessagesWnd.cpp MessagesWnd.h QueueListCtrl.cpp 
	QueueListCtrl.h SBPanel.cpp SBPanel.h SearchListCtrl.cpp 
	SearchListCtrl.h SearchWnd.cpp SearchWnd.h ServerListCtrl.cpp 
	ServerListCtrl.h ServerWnd.cpp ServerWnd.h 
	SharedFilesListCtrl.cpp SharedFilesListCtrl.h 
	SharedFilesWnd.cpp SharedFilesWnd.h StatisticsTreeCtrl.cpp 
	StatisticsTreeCtrl.h StatisticsWnd.cpp StatisticsWnd.h 
	StatusBar.cpp StatusBar.h SysTray.cpp SysTray.h 
	TransferWnd.cpp TransferWnd.h UploadListCtrl.cpp 
	UploadListCtrl.h defines.h 
Added Files:
	MainDlg.cpp MainDlg.h wxInterface.cpp wxInterface.dev 
	wxInterface.h wxInterface.ico wxInterface.wdr 
	wxInterface_private.h wxInterface_private.rc 
	wxInterface_wdr.cpp wxInterface_wdr.h 
Removed Files:
	xMuleDlg.cpp xMuleDlg.h xMuleGUI.cpp xMuleGUI.h xMuleGUI.wdr 
	xMuleGUI_wdr.cpp xMuleGUI_wdr.h xmule2-ui-wx.dev 
	xmule2-ui-wx.ico xmule2-ui-wx_private.h 
	xmule2-ui-wx_private.rc 
Log Message:
Renamed xMule* files to wxInterface*, renamed xMuleGUI class to wxInterface, xMuleDlg to CMainFrame and changed all xmule2 stuff in source to wxInterface.

--- NEW FILE: MainDlg.cpp ---
/*
 *  This file is part of wxInterface.
 *  Copyright (C) 2003 Alo Sarv <ma...@us...>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifdef __GNUG__
	#pragma implementation "MainDlg.h"
#endif

// For compilers that support precompilation
#include "wx/wxprec.h"

#ifdef __BORLANDC__
	#pragma hdrstop
#endif

#include "MainDlg.h"

/* Global classes */
class CServerWnd *serverwnd;
class CTransferWnd *transferwnd;
class CSearchWnd *searchwnd;
class CSharedFilesWnd *sharedfileswnd;
class CMessagesWnd *messageswnd;
class CStatisticsWnd *statisticswnd;
#ifdef __WXMSW__
	class CSysTray *systray;
#endif
class CStatusBar *statusbar;
/*
 * MainDlg class. The main dialog functions like Toolbar and Statusbar
 * stuff go in here.
 */

BEGIN_EVENT_TABLE(CMainDlg,wxFrame)
	/* Shutdown events */
	EVT_CLOSE(CMainDlg::OnCloseWindow)
	
	/* Main toolbar button events */
	EVT_TOOL(ID_BTN_CONNECT, CMainDlg::ConnectToAnyServer)
	EVT_TOOL(ID_BTN_SERVERS, CMainDlg::ShowServerWnd)
	EVT_TOOL(ID_BTN_TRANSFER, CMainDlg::ShowTransferWnd)
	EVT_TOOL(ID_BTN_SEARCH, CMainDlg::ShowSearchWnd)
	EVT_TOOL(ID_BTN_SHARED_FILES, CMainDlg::ShowSharedFilesWnd)
	EVT_TOOL(ID_BTN_MESSAGES, CMainDlg::ShowMessagesWnd)
	EVT_TOOL(ID_BTN_STATISTICS, CMainDlg::ShowStatisticsWnd)
	EVT_TOOL(ID_BTN_GUISETTINGS, CMainDlg::ShowGUISettingsDlg)

	/* Menubar events */
	EVT_MENU(ID_FILE_CONNECT, CMainDlg::ConnectToAnyServer)
	EVT_MENU(ID_FILE_EXIT, CMainDlg::OnCloseWindow)
	EVT_MENU(ID_EDIT_GUI_SETTINGS, CMainDlg::ShowGUISettingsDlg)
	EVT_MENU(ID_VIEW_SERVERS, CMainDlg::ShowServerWnd)
	EVT_MENU(ID_VIEW_TRANSFER, CMainDlg::ShowTransferWnd)
	EVT_MENU(ID_VIEW_SEARCH, CMainDlg::ShowSearchWnd)
	EVT_MENU(ID_VIEW_SHARED_FILES, CMainDlg::ShowSharedFilesWnd)
	EVT_MENU(ID_VIEW_MESSAGES, CMainDlg::ShowMessagesWnd)
	EVT_MENU(ID_VIEW_STATISTICS, CMainDlg::ShowStatisticsWnd)
END_EVENT_TABLE()

/*
 * Main dialog constructor. Creates toolbar on the top, statusbar on the
 * bottom and loads the sub-dialogs (serverwnd, searchwnd etc).
 */
CMainDlg::CMainDlg(
	wxWindow *parent, wxWindowID id, const wxString &title,
	const wxPoint &position, const wxSize& size, long style,
	wxLocale &l
)
: wxFrame( parent, id, title, position, size, style ), m_locale(l) {
	int height, width, posx, posy;
	start_up = true;

	/* Create toolbar */
	show_tool = true;
	m_config->Read(wxT("/General/Show toolbar"), &show_tool, true);
	if (show_tool) {
		CreateMyToolBar();
	}

	/* Create status bar */
	statusbar = new CStatusBar(this);
	SetStatusBar(statusbar);

	/* Create menu bar */
	bool show_menu;
	m_config->Read(wxT("/General/Show menubar"), &show_menu, false);
	if (show_menu) {
		CreateMenuBar();
	}

	/* Set application icon */
	wxIcon icon;
	icon.CopyFromBitmap(img->mule);
	SetIcon(icon);

	#ifdef __WXMSW__
		systray = new CSysTray();
	#endif

	/* This adds a new sizer in the frame to make switching pages easier. */
	m_mainsizer = ContentSizer(this, true);

	/**
	 * 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);
	SetSize(width, height);

	/**
	 * If X and Y positions were not found in config object, we will not
	 * use default values, but instead center the dialog (20,20 values
	 * 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);
	if (!isreadx && !isready) {
		Center();
	} else {
		Move(posx, posy);
	}

	/* Everything else should be done now, finally load the pages itself. */
	LoadAndShowDialogPages();

}

/*
 * Destructor for MainDlg.
 */
CMainDlg::~CMainDlg() {
	/**
	 * Don't save the settings if we are iconized, otherwise we save our
	 * size and position to nulls or smth, and it seriously screws us on
	 * next startup.
	 */
	if (!IsIconized()) {
		m_config->SetPath(wxT("/Frame"));
		m_config->Write(wxT("Height"), GetSize().GetHeight());
		m_config->Write(wxT("Width"), GetSize().GetWidth());
		m_config->Write(wxT("PosX"), GetPosition().x);
		m_config->Write(wxT("PosY"), GetPosition().y);
	}

	/*
	 * If we are instructed to remember the last open page between sessions,
	 * write current active page to config file. This is done by determining
	 * which toolbar button is currently selected (stored in m_lastbtn
	 * variable) and substracting 1001 from that value to get 0 for
	 * serverwnd, 1 for transferwnd etc, thus matching the codes we use
	 * from CGUISettingsDlg class.
	 */
	int remember_last;
	m_config->Read(wxT("/General/Remember last"), &remember_last, true);
	if (remember_last) {
		m_config->Write(wxT("/General/Start page"), m_lastbtn-1001);
	}

	#ifdef __WXMSW__
		systray->RemoveIcon();
		delete systray;
	#endif

	/* Clean up our mess before leaving */
	delete serverwnd;
	delete transferwnd;
	delete searchwnd;
	delete sharedfileswnd;
	delete messageswnd;
	delete statisticswnd;
}

/*
 * Changes content of the main frame by removing the old panel from m_mainsizer
 * and attaching new one. [start_up] defaults to false, and is required true
 * if we are calling this function on application start-up (don't hide old
 * (nonexistent) frame then).
 */
void CMainDlg::SetActiveDialog(wxWindow* dlg) {
	/**
	 * On startup, we don't have activewnd
	 * here yet, so don't hide anything.
	 */
	if (!start_up) {
		activewnd->Show(FALSE);
		m_mainsizer->Remove(activewnd);
	}
	m_mainsizer->Add(dlg,1,wxALIGN_LEFT|wxEXPAND|wxALL);
	dlg->Show(TRUE);
	activewnd=dlg;
	Layout();
	start_up = false;
}

/*
 * Creates the toolbar on the top end of the main dialog.
 */
void CMainDlg::CreateMyToolBar() {
	int tool_align;
	m_config->Read(
		wxT("/General/Toolbar alignment"), &tool_align, wxTB_HORIZONTAL
	);
	/* Construct the toolbar object */
	tb = CreateToolBar(
 		tool_align|wxNO_BORDER|wxTB_TEXT|wxTB_FLAT|wxTB_3DBUTTONS
   	);
	tb->SetToolBitmapSize(wxSize(32, 32));
	tb->SetMargins( 2, 2 );

	/* Add the buttons */
	tb->AddTool(
		ID_BTN_CONNECT, _("Connect"), img->btn_connect,
		wxNullBitmap, wxITEM_NORMAL, _("Connect to any server")
	);
	tb->AddSeparator();
	tb->AddTool(
		ID_BTN_SERVERS, _("Servers"), img->btn_servers, 
		wxNullBitmap, wxITEM_CHECK, _("Server list")
	);
	tb->AddTool( 
		ID_BTN_SEARCH, _("Search"), img->btn_search, 
		wxNullBitmap, wxITEM_CHECK, _("Search files") 
	);
	tb->AddTool(
		ID_BTN_TRANSFER, _("Transfer"), img->btn_transfer, 
		wxNullBitmap, wxITEM_CHECK, _("File Transfer")
	);
	tb->AddTool(
		ID_BTN_SHARED_FILES, _("Shared Files"), img->btn_shared, 
		wxNullBitmap, wxITEM_CHECK, _("Show shared files")
	);
	tb->AddTool(
		ID_BTN_MESSAGES, _("Messages"), img->btn_messages, 
		wxNullBitmap, wxITEM_CHECK, _("Chatting") 
	);
	tb->AddTool(
		ID_BTN_STATISTICS, _("Statistics"), img->btn_statistics, 
		wxNullBitmap, wxITEM_CHECK, _("Show live statistics") );
	tb->AddSeparator();
	tb->AddTool(
		ID_BTN_GUISETTINGS, _("Preferences"), img->btn_guisettings, 
		wxNullBitmap, wxITEM_NORMAL, _("Modify settings")
	);

	/* And go live */
	tb->Realize();
}

/*
 * CloseWindow event function. This should destroy all open dialogs.
 */
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); 

	if (prompt_exit) {
		if (wxMessageBox(_("Close xmule2-ui-wx?"), _("Question"), 
			wxYES_NO|wxCENTRE|wxICON_QUESTION) == wxNO) 
		{
			return;
		}
	}
	/* We reach this line if prompt_exit was false, 
	 * or Yes was clicked in messagebox 
	 */
	Destroy();
}

/**
 * Shows server page
 */
void CMainDlg::ShowServerWnd(wxCommandEvent &event) {
	if (show_tool) {
		tb->ToggleTool(m_lastbtn, false);
		tb->ToggleTool(ID_BTN_SERVERS, true);
	}
	m_lastbtn = ID_BTN_SERVERS;
	SetActiveDialog(serverwnd);
	/**
	 * We send the server page a sizeevent to get the log boxes columns get
	 * correct column widths (they are calculated dynamically according to
	 * listctrl width.
	 */
	wxSizeEvent null_event;
	serverwnd->OnSize(null_event);

	/**
	 * Force toolbar refresh to fix OS X drawing problems
	 */
	tb->Refresh();
}

/**
 * Shows transfer page
 */
void CMainDlg::ShowTransferWnd(wxCommandEvent &event) {
	if (show_tool) {
		tb->ToggleTool(m_lastbtn, false);
		tb->ToggleTool(ID_BTN_TRANSFER, true);
	}
	m_lastbtn = ID_BTN_TRANSFER;
	SetActiveDialog(transferwnd);

	/**
	 * Force toolbar refresh to fix OS X drawing problems
	 */
	tb->Refresh();
}

/**
 * Shows search page
 */
void CMainDlg::ShowSearchWnd(wxCommandEvent &event) {
	if (show_tool) {
		tb->ToggleTool(m_lastbtn, false);
		tb->ToggleTool(ID_BTN_SEARCH, true);
	}
	m_lastbtn = ID_BTN_SEARCH;
	SetActiveDialog(searchwnd);
	/**
	 * Force toolbar refresh to fix OS X drawing problems
	 */
	tb->Refresh();
}

/**
 * Shows shared files page
 */
void CMainDlg::ShowSharedFilesWnd(wxCommandEvent &event) {
	if (show_tool) {
		tb->ToggleTool(m_lastbtn, false);
		tb->ToggleTool(ID_BTN_SHARED_FILES, true);
	}
	m_lastbtn = ID_BTN_SHARED_FILES;
	SetActiveDialog(sharedfileswnd);
	/**
	 * Force toolbar refresh to fix OS X drawing problems
	 */
	tb->Refresh();
}

/**
 * Shows messages page
 */
void CMainDlg::ShowMessagesWnd(wxCommandEvent &event) {
	if (show_tool) {
		tb->ToggleTool(m_lastbtn, false);
		tb->ToggleTool(ID_BTN_MESSAGES, true);
	}
	m_lastbtn = ID_BTN_MESSAGES;
	SetActiveDialog(messageswnd);
	/**
	 * Force toolbar refresh to fix OS X drawing problems
	 */
	tb->Refresh();
}

/**
 * Shows statistics page
 */
void CMainDlg::ShowStatisticsWnd(wxCommandEvent &event) {
	if (show_tool) {
		tb->ToggleTool(m_lastbtn, false);
		tb->ToggleTool(ID_BTN_STATISTICS, true);
	}
	m_lastbtn = ID_BTN_STATISTICS;
	SetActiveDialog(statisticswnd);
	/**
	 * Force toolbar refresh to fix OS X drawing problems
	 */
	tb->Refresh();
}

/**
 * Sends command to core to connect to any server
 */
void CMainDlg::ConnectToAnyServer(wxCommandEvent &event) {
	/**
	 * Force toolbar refresh to fix OS X drawing problems
	 */
	 tb->Refresh();
}

/**
 * Displays GUI settings dialog
 */
void CMainDlg::ShowGUISettingsDlg(wxCommandEvent &event) {
	CGUISettingsDlg *guisettings = new CGUISettingsDlg(
		NULL, -1, _("Preferences"),
		wxDefaultPosition, wxDefaultSize
	);
	guisettings->ShowModal();
	delete guisettings;
	/**
	 * Force toolbar refresh to fix OS X drawing problems
	 */
	tb->Refresh();
}

/**
 * Loads all dialog pages, and displays either the one set from preferences,
 * last one, or default (server) page.
 */
void CMainDlg::LoadAndShowDialogPages() {
	int start_page;

	serverwnd = new CServerWnd(this);
	searchwnd = new CSearchWnd(this);
	transferwnd = new CTransferWnd(this);
	sharedfileswnd = new CSharedFilesWnd(this);
	messageswnd = new CMessagesWnd(this);
	statisticswnd = new CStatisticsWnd(this);

	m_config->Read(wxT("/General/Start page"), &start_page, 0);
	wxCommandEvent null_event;
	switch (start_page) {
		case 0:	ShowServerWnd(null_event); break;
		case 1:	ShowTransferWnd(null_event); break;
		case 2: ShowSearchWnd(null_event); break;
		case 3: ShowSharedFilesWnd(null_event); break;
		case 4: ShowMessagesWnd(null_event); break;
		case 5: ShowStatisticsWnd(null_event); break;
		default: ShowServerWnd(null_event); break;
	}
}

/**
 * Generates our menubar.
 */
void CMainDlg::CreateMenuBar() {

	wxMenu *file_menu = new wxMenu();
	file_menu->Append(ID_FILE_CONNECT, _("Connect"));
	file_menu->Append(ID_FILE_EXIT, _("Quit"));
	
	wxMenu *edit_menu = new wxMenu();
	edit_menu->Append(ID_EDIT_GUI_SETTINGS, _("Preferences"));

	wxMenu *view_menu = new wxMenu();
	view_menu->Append(ID_VIEW_SERVERS, _("Servers"));
	view_menu->Append(ID_VIEW_TRANSFER, _("Transfer"));
	view_menu->Append(ID_VIEW_SEARCH, _("Search"));
	view_menu->Append(ID_VIEW_SHARED_FILES, _("Shared Files"));
	view_menu->Append(ID_VIEW_MESSAGES, _("Messages"));
	view_menu->Append(ID_VIEW_STATISTICS, _("Statistics"));

	wxMenu *help_menu = new wxMenu();
	help_menu->Append(ID_HELP_HELP, _("Help"));
	help_menu->Append(ID_HELP_ABOUT, _("About..."));

	wxMenuBar *menubar = new wxMenuBar();
	menubar->Append(file_menu, _("File"));
	menubar->Append(edit_menu, _("Edit"));
	menubar->Append(view_menu, _("View"));
	menubar->Append(help_menu, _("Help"));

	SetMenuBar(menubar);
}

--- NEW FILE: MainDlg.h ---
/*
 *  This file is part of wxInterface.
 *  Copyright (C) 2003 Alo Sarv <ma...@us...>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef __MAINDLG_H__
#define __MAINDLG_H__

#ifdef __GNUG__
    #pragma interface "MainDlg.h"
#endif

// Include wxWindows' headers
#ifndef WX_PRECOMP
    #include <wx/wx.h>
#endif

/* Include local headers */
#include "wxInterface_wdr.h"
#include "defines.h"
#include "StatusBar.h"
#include "ServerWnd.h"
#include "TransferWnd.h"
#include "SearchWnd.h"
#include "SharedFilesWnd.h"
#include "MessagesWnd.h"
#include "StatisticsWnd.h"
#include "SysTray.h"

/*
 * Constants for MainDlg
 */

#define ID_QUIT     100
#define ID_ABOUT    101

/*
 * MainDlg class. The main dialog functions like Toolbar and Statusbar
 * stuff go in here.
 */
extern class CMainDlg *mainframe;
class CMainDlg: public wxFrame
{
public:
	/* Constructors and destructors */
	CMainDlg( wxWindow *parent, wxWindowID id, const wxString &title,
		const wxPoint& pos, const wxSize& size,
		long style, wxLocale &m_locale
	);
	~CMainDlg();

	wxLocale &m_locale;

private:
	DECLARE_EVENT_TABLE()
	
	/* Member event handler functions */
	void OnCloseWindow( wxCloseEvent &event );	
	void OnBtnGUIOk(wxCommandEvent &event);
	void OnBtnGUICancel(wxCommandEvent &event);
	
	/* Member functions */	
	void SetActiveDialog(wxWindow* dlg);
	void CreateMyToolBar();
	void CreateSysTray();
	void CreateMenuBar();
	void LoadAndShowDialogPages();

	void ConnectToAnyServer(wxCommandEvent &event);

	void ShowServerWnd(wxCommandEvent &event);
	void ShowTransferWnd(wxCommandEvent &event);
	void ShowSearchWnd(wxCommandEvent &event);
	void ShowSharedFilesWnd(wxCommandEvent &event);
	void ShowMessagesWnd(wxCommandEvent &event);
	void ShowStatisticsWnd(wxCommandEvent &event);
	void ShowGUISettingsDlg(wxCommandEvent &event);

	/* 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.
	wxToolBar *tb;		// Main toolbar
	wxWindow *activewnd;	// Current active dialog page
};

#endif

--- NEW FILE: wxInterface.cpp ---
/*
 *  This file is part of wxInterface.
 *  Copyright (C) 2003 Alo Sarv <ma...@us...>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifdef __GNUG__
	#pragma implementation "wxInterface.h"
#endif

// For compilers that support precompilation
#include "wx/wxprec.h"

#ifdef __BORLANDC__
	#pragma hdrstop
#endif

#include "wxInterface.h"
#include "MainDlg.h"

/*
 * Base class for wxInterface. Everything else starts from here.
 */

IMPLEMENT_APP(wxInterface)

class CImages *img;
wxConfigBase *m_config;
class CMainDlg *mainframe;

/*
 * Main program initialization. Command arguments should be checked here, and
 * main wxInterface Dialog drawn.
 */
bool wxInterface::OnInit() {
	int show_splash;

	SetVendorName(wxT("ShareDaemon"));
	SetAppName(wxT("wxInterface"));
	
	::wxInitAllImageHandlers();

	m_config = wxConfigBase::Get();
	CheckAndAddSupportedIconSets();

	img = new CImages();

	m_config->Read(wxT("/General/Show splashscreen"), &show_splash);

	if (show_splash) {
		/* Display the splash screen */
		splash = new wxSplashScreen(
			img->logo, wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT, 
			2000, NULL, -1
		);
	}

	Localize();
	
	/* Display the main dialog */
	mainframe = new CMainDlg(
		NULL, -1, APPVER_LONG, wxDefaultPosition,
		wxDefaultSize, wxDEFAULT_FRAME_STYLE|
			wxNO_FULL_REPAINT_ON_RESIZE,
		m_locale
	);
	mainframe->Show( TRUE );

	if (show_splash) {
		splash->Raise();
	}

	return TRUE;
}

/*
 * Main program shutdown function. If anything needs to be cleaned up, do it 
 * here.
 */
int wxInterface::OnExit() {
	/* Save configuration object to disk */
	delete m_config->Set(NULL);
	
	/* Delete images class (it doesn't get automatically deleted by wx */
	delete img;
	
	/* Return true :) */
	return 0;
}

/**
 * First we call CheckAndAddSupportedLangs() to add built-in languages to config
 * object. Then we add catalog prefixes (note that we need ::Resources:lang also
 * to be compatible with Mac OS packaging standards). Then simply read active
 * language from config object, and add the catalog.
 */
void wxInterface::Localize() {
	wxString curlang;

	CheckAndAddSupportedLangs();

	/* Set localization files directories */
	m_locale.AddCatalogLookupPathPrefix(wxT("lang/"));
	#if defined(__WXMAC__) && !defined(__MACH__)
		m_locale.AddCatalogLookupPathPrefix(wxT("::Resources:lang"));
	#endif

	m_config->SetPath(wxT("/General/Lang"));
	m_config->Read(wxT("CurLang"), &curlang);

	m_locale.Init(GetLangType(curlang));
	m_locale.AddCatalog(curlang);
}

/**
 * This method's purpose is ensuring that all supported languages
 * (translations shipped with releases) are added to config file. This is done
 * by creating a list of supported languages (supportedlangs), then reading
 * all languages from config object (conflangs), and then comparing those two
 * arrays, adding missing elements to conflangs. Finally, the new languages
 * array (conflangs) is written back into config object.
 */
void wxInterface::CheckAndAddSupportedLangs() {
	wxArrayString conflangs, supportedlangs;
	wxString tmpname;
	int numlang;
	int i; // loop counter

	/* List of supported langs - add new ones to the bottom */
	supportedlangs.Add(wxT("Default"));
	supportedlangs.Add(wxT("German"));
	supportedlangs.Add(wxT("Estonian"));

	m_config->SetPath(wxT("/General/Lang"));

	m_config->Read(wxT("NumLang"), &numlang, 1);

	/* Loop through config and read all languages to conflangs array */
	for (i=0; i<numlang; i++) {
		m_config->Read(
			wxString::Format(wxT("%d"), i),
			&tmpname,
			wxT("Default")
		);
		conflangs.Add(tmpname);
	}

	/**
	 * Loop through supportedlangs array
	 * and add missing items to conflangs
	 */
	for (i=0; i<(int)supportedlangs.GetCount(); i++) {
		if (conflangs.Index(supportedlangs.Item(i)) == wxNOT_FOUND) {
			conflangs.Add(supportedlangs.Item(i));
		}
	}

	/* Write conflangs array back to config */
	for (i=0; i<(int)conflangs.GetCount(); i++) {
		m_config->Write(
			wxString::Format(wxT("%d"), i),
			conflangs.Item(i)
		);
	}
	m_config->Write(wxT("NumLang"), (int)conflangs.GetCount());
}

/**
 * Same as above in CheckAndAddSupportedLangs() function, we loop through our
 * built-in iconsets list and add the missing elements to config object.
 */
void wxInterface::CheckAndAddSupportedIconSets() {
	wxArrayString conficonsets, supportediconsets;
	wxString tmpname;
	int numiconsets;
	int i; // loop counter

	/* List of supported langs - add new ones to the bottom */
	supportediconsets.Add(wxT("Default"));
	supportediconsets.Add(wxT("eMule_Greyscale"));
	supportediconsets.Add(wxT("eMule_Inverted"));

	m_config->SetPath(wxT("/General/IconSets"));

	m_config->Read(wxT("NumIconSets"), &numiconsets, 1);

	/* Loop through config and read all languages to conflangs array */
	for (i=0; i<numiconsets; i++) {
		m_config->Read(
			wxString::Format(wxT("%d"), i),
			&tmpname,
			wxT("Default")
		);
		conficonsets.Add(tmpname);
	}

	/**
	 * Loop through supportedlangs array and
	 *add missing items to conflangs
	 */
	for (i=0; i<(int)supportediconsets.GetCount(); i++) {
		if (conficonsets.Index(supportediconsets.Item(i))
			== wxNOT_FOUND)
		{
			conficonsets.Add(supportediconsets.Item(i));
		}
	}

	/* Write conflangs array back to config */
	for (i=0; i<(int)conficonsets.GetCount(); i++) {
		m_config->Write(
			wxString::Format(wxT("%d"), i),
			conficonsets.Item(i)
		);
	}
	m_config->Write(wxT("NumIconSets"), (int)conficonsets.GetCount());
}

/**
 * This method's purpose is to determine the wxWindows constant for given
 * language (affects dates/times/currencies etc). Input variable [lang]
 * should be any language name. On success, correct localization setting
 * is returned, while if no match is found, wxLANGUAGE_DEFAULT is
 * returned (use system setting).
 */
int wxInterface::GetLangType(const wxString lang) {
	if (lang == wxT("German")) {
		return wxLANGUAGE_GERMAN;
	} else if (lang == wxT("Estonian")) {
		return wxLANGUAGE_ESTONIAN;
	} else {
		return wxLANGUAGE_DEFAULT;
	}
}

--- NEW FILE: wxInterface.dev ---
[Project]
FileName=xmule2-ui-wx.dev
Name=xmule2-ui-wx
UnitCount=55
Type=0
Ver=1
ObjFiles=
Includes=
Libs=
PrivateResource=xmule2-ui-wx_private.rc
ResourceIncludes=G:\Dev-Cpp\include
MakeIncludes=
Compiler=
CppCompiler=-D__HAVE_REMOVE_GROWABLE_COL__ -D_X86_=1 -DWIN32 -DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__ -mthreads -DSTRICT  -D__WXMSW__ -D__WINDOWS__ -Wall -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions_@@_
Linker=-lwxmsw241 -lstdc++ -lgcc -lodbc32 -lwsock32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lopengl32 -lglu32 -lole32 -loleaut32 -luuid  _@@_
IsCpp=1
Icon=xmule2-ui-wx.ico
ExeOutput=
ObjectOutput=
OverrideOutput=0
OverrideOutputName=xmule2-ui-wx.exe
HostApplication=
Folders=doc,src
CommandLine=
IncludeVersionInfo=0
SupportXPThemes=1
CompilerSet=0
CompilerSettings=000000000100100000

[Unit1]
FileName=defines.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit2]
FileName=SearchListCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit3]
FileName=SearchListCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit4]
FileName=SearchWnd.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit5]
FileName=SearchWnd.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit6]
FileName=ServerListCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit7]
FileName=ServerListCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit8]
FileName=ServerWnd.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit9]
FileName=ServerWnd.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit10]
FileName=StatusBar.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit11]
FileName=StatusBar.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit12]
FileName=xMuleDlg.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit13]
FileName=xMuleDlg.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit14]
FileName=xMuleGUI.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit15]
FileName=xMuleGUI.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit16]
FileName=xMuleGUI_wdr.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit17]
FileName=xMuleGUI_wdr.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit18]
FileName=xmule2-ui-wx_private.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit19]
FileName=xmule2-ui-wx_private.rc
CompileCpp=1
Folder=src
Compile=1
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[VersionInfo]
Major=0
Minor=1
Release=1
Build=1
LanguageID=1033
CharsetID=1252
CompanyName=
FileVersion=
FileDescription=Developed using the Dev-C++ IDE
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=
AutoIncBuildNr=0

[Unit20]
FileName=..\TODO
CompileCpp=1
Folder=
Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit21]
FileName=..\INSTALL
Folder=
Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit22]
FileName=..\LICENCE
Folder=
Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit23]
FileName=..\Changelog
Folder=
Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit24]
FileName=..\doc\Source
Folder=doc
Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit25]
FileName=TransferWnd.cpp
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
CompileCpp=1

[Unit26]
FileName=TransferWnd.h
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
CompileCpp=1

[Unit27]
FileName=SharedFilesWnd.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit28]
FileName=SharedFilesWnd.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit29]
FileName=MessagesWnd.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit30]
FileName=MessagesWnd.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit31]
FileName=StatisticsWnd.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit32]
FileName=StatisticsWnd.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit33]
FileName=ColorFrameCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit34]
FileName=ColorFrameCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit35]
FileName=StatisticsTreeCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit36]
FileName=StatisticsTreeCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit37]
FileName=SharedFilesListCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit38]
FileName=SharedFilesListCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit39]
FileName=DownloadListCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit40]
FileName=DownloadListCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit42]
FileName=UploadListCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit41]
FileName=UploadListCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit44]
FileName=QueueListCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit43]
FileName=QueueListCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit45]
FileName=KnownListCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit46]
FileName=KnownListCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit47]
FileName=GUISettingsDlg.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit48]
FileName=GUISettingsDlg.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit49]
FileName=MListCtrl.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit50]
FileName=MListCtrl.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit51]
FileName=SysTray.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit52]
FileName=SysTray.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit53]
FileName=..\TRANSLATION
CompileCpp=1
Folder=
Compile=0
Link=0
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit54]
FileName=Images.h
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

[Unit55]
FileName=Images.cpp
CompileCpp=1
Folder=src
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=


--- NEW FILE: wxInterface.h ---
/*
 *  This file is part of wxInterface.
 *  Copyright (C) 2003 Alo Sarv <ma...@us...>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef __WXINTERFACE_H__
#define __WXINTERFACE_H__

#ifdef __GNUG__
    #pragma interface "wxInterface.h"
#endif

// Include wxWindows' headers
#ifndef WX_PRECOMP
    #include <wx/wx.h>
#endif

// Include private headers
#include "wxInterface_wdr.h"
#include "wxInterface.h"
#include "defines.h"

/* 
 * Base class for wxInterface. Everything else starts from here.
 */
class wxInterface: public wxApp {
public:
	virtual bool OnInit();
	virtual int OnExit();

protected:
	wxLocale m_locale;

private:
	wxSplashScreen *splash;
	void Localize();
	void CheckAndAddSupportedLangs();
	void CheckAndAddSupportedIconSets();
	int GetLangType(const wxString lang);
};
#endif

--- NEW FILE: wxInterface.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: wxInterface.wdr ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: wxInterface_private.h ---
// THIS FILE WILL BE OVERWRITTEN BY DEV-C++!
// DO NOT EDIT!

#ifndef XMULE2-UI-WX_PRIVATE_H
#define XMULE2-UI-WX_PRIVATE_H

// VERSION DEFINITIONS
#define VER_STRING	"0.1.1.1"
#define VER_MAJOR	0
#define VER_MINOR	1
#define VER_RELEASE	1
#define VER_BUILD	1
#define COMPANY_NAME	""
#define FILE_VERSION	""
#define FILE_DESCRIPTION	"Developed using the Dev-C++ IDE"
#define INTERNAL_NAME	""
#define LEGAL_COPYRIGHT	""
#define LEGAL_TRADEMARKS	""
#define ORIGINAL_FILENAME	""
#define PRODUCT_NAME	""
#define PRODUCT_VERSION	""

#endif //XMULE2-UI-WX_PRIVATE_H

--- NEW FILE: wxInterface_private.rc ---
// THIS FILE WILL BE OVERWRITTEN BY DEV-C++!
// DO NOT EDIT!

//#include "xmule2-ui-wx_private.rc"
#include <wx/msw/wx.rc>
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "xmule2-ui-wx.ico"

//
// SUPPORT FOR WINDOWS XP THEMES:
// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
// LIBRARY VERSION 6.0 (IF IT IS AVAILABLE)
//
1 24 "wxInterface.exe.Manifest"

--- NEW FILE: wxInterface_wdr.cpp ---
//------------------------------------------------------------------------------
// Source code generated by wxDesigner from file: wxInterface.wdr
// Do not modify this file, all changes will be lost!
//------------------------------------------------------------------------------

#ifdef __GNUG__
    #pragma implementation "wxInterface_wdr.h"
#endif

// For compilers that support precompilation
#include "wx/wxprec.h"

#ifdef __BORLANDC__
    #pragma hdrstop
#endif

// Include private header
#include "wxInterface_wdr.h"

[...1358 lines suppressed...]
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa",
        "aaaaaaaaaaaaaaaa"
        };
        wxBitmap bitmap( xpm_data );
        return bitmap;
    }
    return wxNullBitmap;
}


// End of generated file

--- NEW FILE: wxInterface_wdr.h ---
//------------------------------------------------------------------------------
// Header generated by wxDesigner from file: wxInterface.wdr
// Do not modify this file, all changes will be lost!
//------------------------------------------------------------------------------

#ifndef __WDR_wxInterface_H__
#define __WDR_wxInterface_H__

#if defined(__GNUG__) && !defined(__APPLE__)
    #pragma interface "wxInterface_wdr.h"
#endif

// Include wxWindows' headers

#ifndef WX_PRECOMP
    #include <wx/wx.h>
#endif

#include <wx/image.h>
#include <wx/statline.h>
#include <wx/spinbutt.h>
#include <wx/spinctrl.h>
#include <wx/splitter.h>
#include <wx/listctrl.h>
#include <wx/treectrl.h>
#include <wx/notebook.h>
#include <wx/grid.h>

// Declare window functions

#define ID_SERVERS_IMAGE 10000
#define ID_TXT_SERVER 10001
#define ID_SERVERLISTCTRL 10002
wxSizer *Server_List( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_SERVERINFO 10003
wxSizer *ServerInfo( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_LOG 10004
wxSizer *Log( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_DEBUGLOG 10005
wxSizer *DebugLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_TEXT 10006
#define ID_SEARCHSTRING 10007
#define ID_SEARCHMETHOD 10008
#define ID_SEARCHTYPE 10009
#define ID_BTN_RESET 10010
#define ID_MINSIZE 10011
#define ID_MAXSIZE 10012
#define ID_AVAIL 10013
#define ID_EXTENSION 10014
#define ID_TEXTCTRL 10015
#define ID_SEARCH_RESULTS_IMAGE 10016
#define ID_BUTTON 10017
#define ID_SEARCHRESULTS 10018
#define ID_GAUGE 10019
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 10020
#define ID_TXT_SHARED 10021
#define ID_SHAREDLISTCTRL 10022
#define ID_CURSES_REQUESTS 10023
#define ID_CURSES_ACCEPTED_UPLOADS 10024
#define ID_CURSES_TRANSFERRED 10025
#define ID_G_REQUESTS 10026
#define ID_G_UPLOADS 10027
#define ID_G_TRANSFERRED 10028
#define ID_TOTAL_REQUESTS 10029
#define ID_TOTAL_ACCEPTED_UPLOADS 10030
#define ID_TOTAL_TRANSFERRED 10031
wxSizer *SharedFilesWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_FRIEND_IMAGE 10032
#define ID_LISTCTRL 10033
#define ID_MESSAGES_IMAGE 10034
#define ID_NOTEBOOK 10035
wxSizer *MessagesWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define BTN_STAT 10036
#define ID_STATSTREECTRL 10037
#define ID_FOREIGN 10038
#define ID_CON_GRAPH 10039
#define ID_DL_SES 10040
#define ID_DL_CUR 10041
#define ID_DL_AVG 10042
#define ID_DL_GRAPH 10043
#define ID_UL_SES 10044
#define ID_UL_CUR 10045
#define ID_UL_AVG 10046
#define ID_UL_GRAPH 10047
wxSizer *StatisticsWnd( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_LANG 10048
#define ID_BTN_ADDLANG 10049
#define ID_BTN_REMOVELANG 10050
#define ID_ICONSET 10051
#define ID_BTN_ADDICONSET 10052
#define ID_BTN_REMOVEICONSET 10053
#define ID_FONT 10054
#define ID_STARTPAGE 10055
#define ID_REMEMBER_LAST 10056
#define ID_SHOWSPLASH 10057
#define ID_PROMPTEXIT 10058
#define ID_SHOWTOOL 10059
#define ID_TOOLALIGN 10060
#define ID_SHOWMENU 10061
#define GUI_OK 10062
#define GUI_CANCEL 10063
wxSizer *Dlg_GUI_Settings( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_LOGBOOK 10064
wxSizer *Server_Logs( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

extern wxSizer *sizer_updateserver;
#define ID_BTN_SHOW_UPDATELIST 10065
extern wxSizer *sizer_serversettings;
#define ID_BTN_SHOW_SERVERSETTINGS 10066
extern wxSizer *sizer_portsettings;
#define ID_BTN_SHOW_PORT_OPTIONS 10067
extern wxSizer *sizer_addserver;
#define ID_BTN_SHOW_ADDSERVER 10068
extern wxSizer *sizer_logoptions;
#define ID_BTN_SHOW_LOGGINGOPTIONS 10069
wxSizer *Server_Sidebar( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_SERVER_IP 10070
#define ID_SERVERIP 10071
#define ID_ADDTOLIST 10072
wxSizer *Server_AddServerPanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_SERVERLISTURL 10073
#define ID_UPDATE 10074
wxSizer *Server_UpdatePanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_SS_AUTO_CONNECT 10075
#define ID_SS_AC_STATIC_ONLY 10076
#define ID_LINE 10077
#define ID_SS_SERVER_IMG 10078
#define ID_SS_SERVER_NAME 10079
#define ID_CHECK_SS_STATIC 10080
#define ID_SS_PRIO 10081
wxSizer *Server_SettingsPanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_CHECK_LINE_LIMIT 10082
#define ID_TXT_LINE_LIMIT 10083
#define ID_CHECK_SAVE_TO_DISK 10084
#define ID_BTN_CLEAR_LOGS 10085
wxSizer *Server_LogOptionsPanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_LANG_NAME 10086
#define ID_BTN_ADD_LANG_OK 10087
#define ID_BTN_ADD_LANG_CANCEL 10088
wxSizer *Dlg_AddLanguage( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_CHECKBOX 10089
wxSizer *Server_PortSettingsPanel( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

#define ID_BTN_ADDICONSET_OK 10090
#define ID_BTN_ADDICONSET_CANCEL 10091
wxSizer *Dlg_AddIconSet( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );

// Declare menubar functions

// Declare toolbar functions

// Declare bitmap functions

#define ID_NULL_BMP 10092
wxBitmap Icons( size_t index );

#endif

// End of generated file

Index: ColorFrameCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ColorFrameCtrl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ColorFrameCtrl.cpp	7 Aug 2003 21:38:06 -0000	1.1
+++ ColorFrameCtrl.cpp	20 Nov 2003 01:27:26 -0000	1.2
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Timo Kujala <ti...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: ColorFrameCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ColorFrameCtrl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ColorFrameCtrl.h	17 Nov 2003 22:30:45 -0000	1.5
+++ ColorFrameCtrl.h	20 Nov 2003 01:27:26 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Timo Kujala <ti...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: DownloadListCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/DownloadListCtrl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DownloadListCtrl.cpp	6 Sep 2003 12:14:23 -0000	1.7
+++ DownloadListCtrl.cpp	20 Nov 2003 01:27:26 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: DownloadListCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/DownloadListCtrl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DownloadListCtrl.h	5 Sep 2003 20:58:27 -0000	1.5
+++ DownloadListCtrl.h	20 Nov 2003 01:27:26 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 // WDR: class declarations

Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- GUISettingsDlg.cpp	17 Nov 2003 03:59:54 -0000	1.15
+++ GUISettingsDlg.cpp	20 Nov 2003 01:27:26 -0000	1.16
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #endif
 
 #include "GUISettingsDlg.h"
-#include "xMuleDlg.h"
+#include "MainDlg.h"
 
 /*********************
  * CGUISettingsDlg class 

Index: GUISettingsDlg.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- GUISettingsDlg.h	17 Nov 2003 03:59:54 -0000	1.10
+++ GUISettingsDlg.h	20 Nov 2003 01:27:26 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 class CGUISettingsDlg: public wxDialog {

Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Images.cpp	17 Nov 2003 21:41:27 -0000	1.11
+++ Images.cpp	20 Nov 2003 01:27:26 -0000	1.12
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: Images.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Images.h	17 Nov 2003 21:41:27 -0000	1.9
+++ Images.h	20 Nov 2003 01:27:26 -0000	1.10
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: KnownListCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/KnownListCtrl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- KnownListCtrl.cpp	6 Sep 2003 12:14:23 -0000	1.7
+++ KnownListCtrl.cpp	20 Nov 2003 01:27:26 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: KnownListCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/KnownListCtrl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- KnownListCtrl.h	5 Sep 2003 20:58:27 -0000	1.5
+++ KnownListCtrl.h	20 Nov 2003 01:27:26 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 // WDR: class declarations

Index: MListCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MListCtrl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MListCtrl.cpp	17 Nov 2003 03:59:54 -0000	1.6
+++ MListCtrl.cpp	20 Nov 2003 01:27:26 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: MListCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MListCtrl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MListCtrl.h	23 Aug 2003 17:27:10 -0000	1.3
+++ MListCtrl.h	20 Nov 2003 01:27:26 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 class CMListCtrl: public wxListCtrl {

Index: Makefile
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile	9 Sep 2003 18:13:12 -0000	1.26
+++ Makefile	20 Nov 2003 01:27:26 -0000	1.27
@@ -1,16 +1,18 @@
 WXCONFIG = wx-config
 CXX = $(shell $(WXCONFIG) --cxx)
 
-PROGRAM = xmule2-ui-wx
+PROGRAM = wxInterface
 
 OBJECTS =	ColorFrameCtrl.o \
 		DownloadListCtrl.o \
 		GUISettingsDlg.o \
 		Images.o \
 		KnownListCtrl.o \
+		MainDlg.o \
 		MessagesWnd.o \
 		MListCtrl.o \
 		QueueListCtrl.o \
+		SBPanel.o \
 		SearchListCtrl.o \
 		SearchWnd.o \
 		ServerListCtrl.o \
@@ -23,10 +25,9 @@
 		SysTray.o \
 		TransferWnd.o \
 		UploadListCtrl.o \
-		xMuleDlg.o \
-		xMuleGUI.o \
-		xMuleGUI_wdr.o \
-#		xmule2-ui-wx_private.res \
+		wxInterface.o \
+		wxInterface_wdr.o \
+#		wxInterface_private.res \
 # uncomment xmule2-ui-wx_private.res file under win32, 
 # comment out on all other systems.
 		

Index: Makefile.b32
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.b32,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.b32	27 Aug 2003 00:45:20 -0000	1.18
+++ Makefile.b32	20 Nov 2003 01:27:26 -0000	1.19
@@ -2,14 +2,15 @@
 
 TARGET=xmule2-ui-wx
 OBJECTS =	ColorFrameCtrl.obj \
-		CoreSettingsDlg.obj \
 		DownloadListCtrl.obj \
 		GUISettingsDlg.obj \
 		KnownListCtrl.obj \
+		MainDlg.obj \
 		MessagesWnd.obj \
 		MListCtrl.obj \
 		TransferWnd.obj \
 		QueueListCtrl.obj \
+		SBPanel.obj \
 		SearchListCtrl.obj \
 		SearchWnd.obj \
 		ServerListCtrl.obj \
@@ -21,8 +22,7 @@
 		StatusBar.obj \
 		SysTray.obj \
 		UploadListCtrl.obj \
-		xMuleDlg.obj \
-		xMuleGUI.obj \
-		xMuleGUI_wdr.obj \ 
+		wxInterface.obj \
+		wxInterface_wdr.obj
 
 !include $(WXDIR)\src\makeprog.b32

Index: MessagesWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MessagesWnd.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MessagesWnd.cpp	5 Sep 2003 20:58:27 -0000	1.8
+++ MessagesWnd.cpp	20 Nov 2003 01:27:26 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: MessagesWnd.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MessagesWnd.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- MessagesWnd.h	17 Nov 2003 03:59:54 -0000	1.6
+++ MessagesWnd.h	20 Nov 2003 01:27:26 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 class CMessagesWnd: public wxPanel {

Index: QueueListCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/QueueListCtrl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- QueueListCtrl.cpp	6 Sep 2003 12:14:23 -0000	1.7
+++ QueueListCtrl.cpp	20 Nov 2003 01:27:26 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: QueueListCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/QueueListCtrl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- QueueListCtrl.h	5 Sep 2003 20:58:27 -0000	1.5
+++ QueueListCtrl.h	20 Nov 2003 01:27:26 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 // WDR: class declarations

Index: SBPanel.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SBPanel.cpp	19 Nov 2003 23:22:07 -0000	1.1
+++ SBPanel.cpp	20 Nov 2003 01:27:26 -0000	1.2
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: SBPanel.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SBPanel.h	19 Nov 2003 23:22:07 -0000	1.1
+++ SBPanel.h	20 Nov 2003 01:27:26 -0000	1.2
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: SearchListCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchListCtrl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SearchListCtrl.cpp	17 Nov 2003 03:59:54 -0000	1.7
+++ SearchListCtrl.cpp	20 Nov 2003 01:27:26 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: SearchListCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchListCtrl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SearchListCtrl.h	20 Aug 2003 12:47:48 -0000	1.4
+++ SearchListCtrl.h	20 Nov 2003 01:27:26 -0000	1.5
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 // WDR: class declarations

Index: SearchWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchWnd.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SearchWnd.cpp	5 Sep 2003 20:50:59 -0000	1.13
+++ SearchWnd.cpp	20 Nov 2003 01:27:26 -0000	1.14
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #endif
 
 #include "SearchWnd.h"
-#include "xMuleDlg.h"
+#include "MainDlg.h"
 
 /*
  * CSearchWnd class.

Index: SearchWnd.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchWnd.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- SearchWnd.h	17 Nov 2003 03:59:54 -0000	1.8
+++ SearchWnd.h	20 Nov 2003 01:27:26 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #endif
 
 /* Private headers */
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 /*

Index: ServerListCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerListCtrl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ServerListCtrl.cpp	6 Sep 2003 12:14:23 -0000	1.9
+++ ServerListCtrl.cpp	20 Nov 2003 01:27:26 -0000	1.10
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: ServerListCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerListCtrl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ServerListCtrl.h	5 Sep 2003 01:22:20 -0000	1.6
+++ ServerListCtrl.h	20 Nov 2003 01:27:26 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 #include "ServerWnd.h"
 

Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ServerWnd.cpp	19 Nov 2003 23:22:07 -0000	1.36
+++ ServerWnd.cpp	20 Nov 2003 01:27:26 -0000	1.37
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: ServerWnd.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ServerWnd.h	19 Nov 2003 23:22:07 -0000	1.25
+++ ServerWnd.h	20 Nov 2003 01:27:26 -0000	1.26
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -32,10 +32,10 @@
 #include <wx/datetime.h>
 
 /* Private headers */
-#include "xMuleGUI_wdr.h"
 #include "defines.h"
+#include "wxInterface_wdr.h"
 #include "ServerListCtrl.h"
-#include "xMuleDlg.h"
+#include "MainDlg.h"
 #include "SBPanel.h"
 
 /*

Index: SharedFilesListCtrl.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SharedFilesListCtrl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SharedFilesListCtrl.cpp	6 Sep 2003 12:14:23 -0000	1.7
+++ SharedFilesListCtrl.cpp	20 Nov 2003 01:27:26 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify

Index: SharedFilesListCtrl.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SharedFilesListCtrl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SharedFilesListCtrl.h	5 Sep 2003 20:58:27 -0000	1.5
+++ SharedFilesListCtrl.h	20 Nov 2003 01:27:26 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- *  This file is part of xMule2.
+ *  This file is part of wxInterface.
  *  Copyright (C) 2003 Alo Sarv <ma...@us...>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 	#include "wx/wx.h"
 #endif
 
-#include "xMuleGUI_wdr.h"
+#include "wxInterface_wdr.h"
 #include "defines.h"
 
 // WDR: class declarations

...
 
[truncated message content]