strip out unfinished product, review and market stuff,

enable _() instead of wxT() in uiproject.fbp so it uses wxGetTranslation for the wxFormBuilder generated part of the UI

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@64 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 15 insertions, 272 deletions

diff --git a/uibase.h b/uibase.h
index faef982989..2dfc2af14d 100644
--- a/uibase.h
+++ b/uibase.h
@@ -11,6 +11,8 @@
 #ifndef __uibase__

 #define __uibase__

 

+#include <wx/intl.h>

+

 #include <wx/string.h>

 #include <wx/bitmap.h>

 #include <wx/image.h>

@@ -37,8 +39,6 @@
 #include <wx/spinctrl.h>

 #include <wx/scrolwin.h>

 #include <wx/statbmp.h>

-#include <wx/combobox.h>

-#include <wx/richtext/richtextctrl.h>

 

 ///////////////////////////////////////////////////////////////////////////

 

@@ -49,8 +49,8 @@
 #define wxID_BUTTONSEND 1004

 #define wxID_BUTTONRECEIVE 1005

 #define wxID_TEXTCTRLADDRESS 1006

-#define wxID_BUTTONCOPY 1007

-#define wxID_BUTTONCHANGE 1008

+#define wxID_BUTTONCHANGE 1007

+#define wxID_BUTTONCOPY 1008

 #define wxID_TRANSACTIONFEE 1009

 #define wxID_PROXYIP 1010

 #define wxID_PROXYPORT 1011

@@ -64,33 +64,7 @@
 #define wxID_BUTTONNEW 1019

 #define wxID_BUTTONEDIT 1020

 #define wxID_BUTTONDELETE 1021

-#define wxID_DEL0 1022

-#define wxID_DEL1 1023

-#define wxID_DEL2 1024

-#define wxID_DEL3 1025

-#define wxID_DEL4 1026

-#define wxID_DEL5 1027

-#define wxID_DEL6 1028

-#define wxID_DEL7 1029

-#define wxID_DEL8 1030

-#define wxID_DEL9 1031

-#define wxID_DEL10 1032

-#define wxID_DEL11 1033

-#define wxID_DEL12 1034

-#define wxID_DEL13 1035

-#define wxID_DEL14 1036

-#define wxID_DEL15 1037

-#define wxID_DEL16 1038

-#define wxID_DEL17 1039

-#define wxID_DEL18 1040

-#define wxID_DEL19 1041

-#define wxID_BUTTONPREVIEW 1042

-#define wxID_BUTTONSAMPLE 1043

-#define wxID_CANCEL2 1044

-#define wxID_BUTTONBACK 1045

-#define wxID_BUTTONNEXT 1046

-#define wxID_SUBMIT 1047

-#define wxID_TEXTCTRL 1048

+#define wxID_TEXTCTRL 1022

 

 ///////////////////////////////////////////////////////////////////////////////

 /// Class CMainFrameBase

@@ -109,8 +83,8 @@ class CMainFrameBase : public wxFrame
 		

 		wxStaticText* m_staticText32;

 		wxTextCtrl* m_textCtrlAddress;

+		wxButton* m_buttonNew;

 		wxButton* m_buttonCopy;

-		wxButton* m_button91;

 		

 		wxPanel* m_panel14;

 		wxStaticText* m_staticText41;

@@ -137,8 +111,8 @@ class CMainFrameBase : public wxFrame
 		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }

 		virtual void OnMouseEventsAddress( wxMouseEvent& event ){ event.Skip(); }

 		virtual void OnSetFocusAddress( wxFocusEvent& event ){ event.Skip(); }

-		virtual void OnButtonCopy( wxCommandEvent& event ){ event.Skip(); }

 		virtual void OnButtonChange( wxCommandEvent& event ){ event.Skip(); }

+		virtual void OnButtonCopy( wxCommandEvent& event ){ event.Skip(); }

 		virtual void OnListColBeginDrag( wxListEvent& event ){ event.Skip(); }

 		virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }

 		virtual void OnPaintListCtrl( wxPaintEvent& event ){ event.Skip(); }

@@ -147,7 +121,7 @@ class CMainFrameBase : public wxFrame
 	public:

 		wxMenu* m_menuOptions;

 		wxListCtrl* m_listCtrl;

-		CMainFrameBase( wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = wxT("Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 712,484 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );

+		CMainFrameBase( wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = _("Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 712,484 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );

 		~CMainFrameBase();

 	

 };

@@ -168,7 +142,7 @@ class CTxDetailsDialogBase : public wxDialog
 		

 	

 	public:

-		CTxDetailsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Transaction Details"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 620,450 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

+		CTxDetailsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Transaction Details"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 620,450 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

 		~CTxDetailsDialogBase();

 	

 };

@@ -223,7 +197,7 @@ class COptionsDialogBase : public wxDialog
 		

 	

 	public:

-		COptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 540,360 ), long style = wxDEFAULT_DIALOG_STYLE );

+		COptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 540,360 ), long style = wxDEFAULT_DIALOG_STYLE );

 		~COptionsDialogBase();

 	

 };

@@ -251,7 +225,7 @@ class CAboutDialogBase : public wxDialog
 	

 	public:

 		wxStaticText* m_staticTextVersion;

-		CAboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 532,329 ), long style = wxDEFAULT_DIALOG_STYLE );

+		CAboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 532,329 ), long style = wxDEFAULT_DIALOG_STYLE );

 		~CAboutDialogBase();

 	

 };

@@ -298,7 +272,7 @@ class CSendDialogBase : public wxDialog
 		

 	

 	public:

-		CSendDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Send Coins"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 675,312 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

+		CSendDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Send Coins"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 675,312 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

 		~CSendDialogBase();

 	

 };

@@ -325,7 +299,7 @@ class CSendingDialogBase : public wxDialog
 		

 	

 	public:

-		CSendingDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Sending..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 442,151 ), long style = wxDEFAULT_DIALOG_STYLE );

+		CSendingDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Sending..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 442,151 ), long style = wxDEFAULT_DIALOG_STYLE );

 		~CSendingDialogBase();

 	

 };

@@ -361,7 +335,7 @@ class CYourAddressDialogBase : public wxDialog
 		

 	

 	public:

-		CYourAddressDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Your Bitcoin Addresses"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,390 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

+		CYourAddressDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Your Bitcoin Addresses"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,390 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

 		~CYourAddressDialogBase();

 	

 };

@@ -397,243 +371,12 @@ class CAddressBookDialogBase : public wxDialog
 	

 	public:

 		wxButton* m_buttonCancel;

-		CAddressBookDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Address Book"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,390 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

+		CAddressBookDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Address Book"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,390 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

 		~CAddressBookDialogBase();

 	

 };

 

 ///////////////////////////////////////////////////////////////////////////////

-/// Class CProductsDialogBase

-///////////////////////////////////////////////////////////////////////////////

-class CProductsDialogBase : public wxDialog 

-{

-	private:

-	

-	protected:

-		wxComboBox* m_comboBoxCategory;

-		wxTextCtrl* m_textCtrlSearch;

-		wxButton* m_buttonSearch;

-		wxListCtrl* m_listCtrl;

-		

-		// Virtual event handlers, overide them in your derived class

-		virtual void OnCombobox( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }

-		virtual void OnButtonSearch( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }

-		

-	

-	public:

-		CProductsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Marketplace"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 708,535 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

-		~CProductsDialogBase();

-	

-};

-

-///////////////////////////////////////////////////////////////////////////////

-/// Class CEditProductDialogBase

-///////////////////////////////////////////////////////////////////////////////

-class CEditProductDialogBase : public wxFrame 

-{

-	private:

-	

-	protected:

-		wxScrolledWindow* m_scrolledWindow;

-		wxStaticText* m_staticText106;

-		wxComboBox* m_comboBoxCategory;

-		wxStaticText* m_staticText108;

-		wxTextCtrl* m_textCtrlTitle;

-		wxStaticText* m_staticText107;

-		wxTextCtrl* m_textCtrlPrice;

-		wxStaticText* m_staticText22;

-		wxTextCtrl* m_textCtrlDescription;

-		wxStaticText* m_staticText23;

-		wxTextCtrl* m_textCtrlInstructions;

-		wxStaticText* m_staticText24;

-		wxStaticText* m_staticText25;

-		

-		wxTextCtrl* m_textCtrlLabel0;

-		wxTextCtrl* m_textCtrlField0;

-		wxButton* m_buttonDel0;

-		wxTextCtrl* m_textCtrlLabel1;

-		wxTextCtrl* m_textCtrlField1;

-		wxButton* m_buttonDel1;

-		wxTextCtrl* m_textCtrlLabel2;

-		wxTextCtrl* m_textCtrlField2;

-		wxButton* m_buttonDel2;

-		wxTextCtrl* m_textCtrlLabel3;

-		wxTextCtrl* m_textCtrlField3;

-		wxButton* m_buttonDel3;

-		wxTextCtrl* m_textCtrlLabel4;

-		wxTextCtrl* m_textCtrlField4;

-		wxButton* m_buttonDel4;

-		wxTextCtrl* m_textCtrlLabel5;

-		wxTextCtrl* m_textCtrlField5;

-		wxButton* m_buttonDel5;

-		wxTextCtrl* m_textCtrlLabel6;

-		wxTextCtrl* m_textCtrlField6;

-		wxButton* m_buttonDel6;

-		wxTextCtrl* m_textCtrlLabel7;

-		wxTextCtrl* m_textCtrlField7;

-		wxButton* m_buttonDel7;

-		wxTextCtrl* m_textCtrlLabel8;

-		wxTextCtrl* m_textCtrlField8;

-		wxButton* m_buttonDel8;

-		wxTextCtrl* m_textCtrlLabel9;

-		wxTextCtrl* m_textCtrlField9;

-		wxButton* m_buttonDel9;

-		wxTextCtrl* m_textCtrlLabel10;

-		wxTextCtrl* m_textCtrlField10;

-		wxButton* m_buttonDel10;

-		wxTextCtrl* m_textCtrlLabel11;

-		wxTextCtrl* m_textCtrlField11;

-		wxButton* m_buttonDel11;

-		wxTextCtrl* m_textCtrlLabel12;

-		wxTextCtrl* m_textCtrlField12;

-		wxButton* m_buttonDel12;

-		wxTextCtrl* m_textCtrlLabel13;

-		wxTextCtrl* m_textCtrlField13;

-		wxButton* m_buttonDel13;

-		wxTextCtrl* m_textCtrlLabel14;

-		wxTextCtrl* m_textCtrlField14;

-		wxButton* m_buttonDel14;

-		wxTextCtrl* m_textCtrlLabel15;

-		wxTextCtrl* m_textCtrlField15;

-		wxButton* m_buttonDel15;

-		wxTextCtrl* m_textCtrlLabel16;

-		wxTextCtrl* m_textCtrlField16;

-		wxButton* m_buttonDel16;

-		wxTextCtrl* m_textCtrlLabel17;

-		wxTextCtrl* m_textCtrlField17;

-		wxButton* m_buttonDel17;

-		wxTextCtrl* m_textCtrlLabel18;

-		wxTextCtrl* m_textCtrlField18;

-		wxButton* m_buttonDel18;

-		wxTextCtrl* m_textCtrlLabel19;

-		wxTextCtrl* m_textCtrlField19;

-		wxButton* m_buttonDel19;

-		wxButton* m_buttonAddField;

-		wxButton* m_buttonOK;

-		wxButton* m_buttonPreview;

-		wxButton* m_buttonCancel;

-		

-		// Virtual event handlers, overide them in your derived class

-		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel0( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel1( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel2( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel3( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel4( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel5( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel6( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel7( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel8( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel9( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel10( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel11( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel12( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel13( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel14( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel15( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel16( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel17( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel18( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonDel19( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonAddField( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonSend( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonPreview( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }

-		

-	

-	public:

-		wxFlexGridSizer* fgSizer5;

-		CEditProductDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Edit Product"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 660,640 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );

-		~CEditProductDialogBase();

-	

-};

-

-///////////////////////////////////////////////////////////////////////////////

-/// Class CViewProductDialogBase

-///////////////////////////////////////////////////////////////////////////////

-class CViewProductDialogBase : public wxFrame 

-{

-	private:

-	

-	protected:

-		wxHtmlWindow* m_htmlWinReviews;

-		wxScrolledWindow* m_scrolledWindow;

-		wxRichTextCtrl* m_richTextHeading;

-		wxStaticText* m_staticTextInstructions;

-		wxButton* m_buttonSubmitForm;

-		wxButton* m_buttonCancelForm;

-		wxButton* m_buttonBack;

-		wxButton* m_buttonNext;

-		wxButton* m_buttonCancel;

-		

-		// Virtual event handlers, overide them in your derived class

-		virtual void OnButtonSubmitForm( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonCancelForm( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonBack( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonNext( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }

-		

-	

-	public:

-		CViewProductDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Order Form"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,520 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );

-		~CViewProductDialogBase();

-	

-};

-

-///////////////////////////////////////////////////////////////////////////////

-/// Class CViewOrderDialogBase

-///////////////////////////////////////////////////////////////////////////////

-class CViewOrderDialogBase : public wxFrame 

-{

-	private:

-	

-	protected:

-		wxHtmlWindow* m_htmlWin;

-		wxButton* m_buttonOK;

-		

-		// Virtual event handlers, overide them in your derived class

-		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }

-		

-	

-	public:

-		CViewOrderDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("View Order"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,520 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );

-		~CViewOrderDialogBase();

-	

-};

-

-///////////////////////////////////////////////////////////////////////////////

-/// Class CEditReviewDialogBase

-///////////////////////////////////////////////////////////////////////////////

-class CEditReviewDialogBase : public wxFrame 

-{

-	private:

-	

-	protected:

-		

-		wxStaticText* m_staticTextSeller;

-		

-		wxStaticText* m_staticText110;

-		wxChoice* m_choiceStars;

-		wxStaticText* m_staticText43;

-		wxTextCtrl* m_textCtrlReview;

-		wxButton* m_buttonSubmit;

-		wxButton* m_buttonCancel;

-		

-		// Virtual event handlers, overide them in your derived class

-		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }

-		virtual void OnButtonSubmit( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }

-		

-	

-	public:

-		CEditReviewDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Enter Review"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,440 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );

-		~CEditReviewDialogBase();

-	

-};

-

-///////////////////////////////////////////////////////////////////////////////

 /// Class CGetTextFromUserDialogBase

 ///////////////////////////////////////////////////////////////////////////////

 class CGetTextFromUserDialogBase : public wxDialog