Remove function: FbFrameBase::GetTitle()

16 files changed, 9 insertions, 18 deletions

diff --git a/sources/MyRuLib/frames/FbFrameAuth.cpp b/sources/MyRuLib/frames/FbFrameAuth.cpp
index 2025c73b..e16f1648 100644
--- a/sources/MyRuLib/frames/FbFrameAuth.cpp
+++ b/sources/MyRuLib/frames/FbFrameAuth.cpp
@@ -117,7 +117,7 @@ BEGIN_EVENT_TABLE(FbFrameAuth, FbFrameBase)
 END_EVENT_TABLE()

 

 FbFrameAuth::FbFrameAuth(wxAuiNotebook * parent, bool select)

-	: FbFrameBase(parent, ID_FRAME_AUTH, GetTitle(), select)

+	: FbFrameBase(parent, ID_FRAME_AUTH,  _("Authors"), select)

 

 {

 	wxPanel * panel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );

diff --git a/sources/MyRuLib/frames/FbFrameBase.h b/sources/MyRuLib/frames/FbFrameBase.h
index da6adb75..de6d181b 100644
--- a/sources/MyRuLib/frames/FbFrameBase.h
+++ b/sources/MyRuLib/frames/FbFrameBase.h
@@ -48,8 +48,6 @@ public:
 		GetEventHashTable().HandleEvent(event, this);

 	}

 

-	virtual wxString GetTitle() { return _("Authors"); }

-

 	public:

 		virtual void UpdateMaster();

 		virtual void UpdateMaster(FbMasterEvent & event);

diff --git a/sources/MyRuLib/frames/FbFrameDate.cpp b/sources/MyRuLib/frames/FbFrameDate.cpp
index dd4907d4..68809d8e 100644
--- a/sources/MyRuLib/frames/FbFrameDate.cpp
+++ b/sources/MyRuLib/frames/FbFrameDate.cpp
@@ -20,7 +20,7 @@ BEGIN_EVENT_TABLE(FbFrameDate, FbFrameBase)
 END_EVENT_TABLE()

 

 FbFrameDate::FbFrameDate(wxAuiNotebook * parent, bool select)

-	: FbFrameBase(parent, ID_FRAME_DATE, GetTitle(), select)

+	: FbFrameBase(parent, ID_FRAME_DATE, _("Calendar"), select)

 {

 	m_MasterList = new FbMasterViewCtrl;

 	m_MasterList->Create(this, ID_MASTER_LIST, wxDefaultPosition, wxDefaultSize, FbParams.Style());

diff --git a/sources/MyRuLib/frames/FbFrameDate.h b/sources/MyRuLib/frames/FbFrameDate.h
index 4aa38f7f..3d925de8 100644
--- a/sources/MyRuLib/frames/FbFrameDate.h
+++ b/sources/MyRuLib/frames/FbFrameDate.h
@@ -13,7 +13,6 @@ class FbFrameDate : public FbFrameBase
 {

 	public:

 		FbFrameDate(wxAuiNotebook * parent, bool select = false);

-		virtual wxString GetTitle() const { return _("Calendar"); };

 	protected:

 		void CreateColumns();

 		virtual wxString GetCountSQL();

diff --git a/sources/MyRuLib/frames/FbFrameDown.cpp b/sources/MyRuLib/frames/FbFrameDown.cpp
index 019377cb..b5447180 100644
--- a/sources/MyRuLib/frames/FbFrameDown.cpp
+++ b/sources/MyRuLib/frames/FbFrameDown.cpp
@@ -29,7 +29,7 @@ END_EVENT_TABLE()
 #endif

 

 FbFrameDown::FbFrameDown(wxAuiNotebook * parent, bool select)

-	: FbFrameBase(parent, ID_FRAME_DOWN, GetTitle(), select)

+	: FbFrameBase(parent, ID_FRAME_DOWN, _("Downloads"), select)

 {

 	wxPanel * panel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );

 	wxBoxSizer * sizer = new wxBoxSizer( wxVERTICAL );

diff --git a/sources/MyRuLib/frames/FbFrameDown.h b/sources/MyRuLib/frames/FbFrameDown.h
index 1e063558..d949138b 100644
--- a/sources/MyRuLib/frames/FbFrameDown.h
+++ b/sources/MyRuLib/frames/FbFrameDown.h
@@ -7,7 +7,6 @@ class FbFrameDown : public FbFrameBase
 {

 	public:

 		FbFrameDown(wxAuiNotebook * parent, bool select = false);

-		wxString GetTitle() const { return _("Downloads"); };

 		void UpdateFolder(const int iFolder, const FbFolderType type);

 	protected:

 		virtual void UpdateBooklist();

diff --git a/sources/MyRuLib/frames/FbFrameFldr.cpp b/sources/MyRuLib/frames/FbFrameFldr.cpp
index becca37a..ef66a7d3 100644
--- a/sources/MyRuLib/frames/FbFrameFldr.cpp
+++ b/sources/MyRuLib/frames/FbFrameFldr.cpp
@@ -23,7 +23,7 @@ BEGIN_EVENT_TABLE(FbFrameFldr, FbFrameBase)
 END_EVENT_TABLE()

 

 FbFrameFldr::FbFrameFldr(wxAuiNotebook * parent, bool select)

-	: FbFrameBase(parent, ID_FRAME_FLDR, GetTitle(), select)

+	: FbFrameBase(parent, ID_FRAME_FLDR, _("My folders"), select)

 {

 	wxPanel * panel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );

 	wxBoxSizer * sizer = new wxBoxSizer( wxVERTICAL );

diff --git a/sources/MyRuLib/frames/FbFrameFldr.h b/sources/MyRuLib/frames/FbFrameFldr.h
index 07b3de43..1c06bc41 100644
--- a/sources/MyRuLib/frames/FbFrameFldr.h
+++ b/sources/MyRuLib/frames/FbFrameFldr.h
@@ -7,7 +7,6 @@ class FbFrameFldr : public FbFrameBase
 {

 	public:

 		FbFrameFldr(wxAuiNotebook * parent, bool select = false);

-		virtual wxString GetTitle() const { return _("My folders"); };

 		void UpdateFolder(const int iFolder, const FbFolderType type);

 	private:

 		void CreateColumns();

diff --git a/sources/MyRuLib/frames/FbFrameGenr.cpp b/sources/MyRuLib/frames/FbFrameGenr.cpp
index 1cbce0c3..676fc381 100644
--- a/sources/MyRuLib/frames/FbFrameGenr.cpp
+++ b/sources/MyRuLib/frames/FbFrameGenr.cpp
@@ -15,7 +15,7 @@ BEGIN_EVENT_TABLE(FbFrameGenr, FbFrameBase)
 END_EVENT_TABLE()

 

 FbFrameGenr::FbFrameGenr(wxAuiNotebook * parent, bool select)

-	: FbFrameBase(parent, ID_FRAME_GENR, GetTitle(), select)

+	: FbFrameBase(parent, ID_FRAME_GENR, _("Genres"), select)

 {

 	m_MasterList = new FbMasterViewCtrl;

 	m_MasterList->Create(this, ID_MASTER_LIST, wxDefaultPosition, wxDefaultSize, FbParams.Style());

diff --git a/sources/MyRuLib/frames/FbFrameGenr.h b/sources/MyRuLib/frames/FbFrameGenr.h
index f492c952..eee05c98 100644
--- a/sources/MyRuLib/frames/FbFrameGenr.h
+++ b/sources/MyRuLib/frames/FbFrameGenr.h
@@ -17,7 +17,6 @@ class FbFrameGenr : public FbFrameBase
 {

 	public:

 		FbFrameGenr(wxAuiNotebook * parent, bool select = false);

-		virtual wxString GetTitle() const { return _("Genres"); };

 	protected:

 		virtual FbFrameThread * CreateCounter();

 		virtual wxString GetCountSQL();

diff --git a/sources/MyRuLib/frames/FbFrameHtml.cpp b/sources/MyRuLib/frames/FbFrameHtml.cpp
index b8dc8192..e07d65cd 100644
--- a/sources/MyRuLib/frames/FbFrameHtml.cpp
+++ b/sources/MyRuLib/frames/FbFrameHtml.cpp
@@ -32,7 +32,7 @@ FbFrameHtml::FbFrameHtml(wxAuiNotebook * parent, int id)
 	: wxSplitterWindow(parent, ID_FRAME_HTML, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxTAB_TRAVERSAL),

 		m_id(id), m_md5sum( FbCommonDatabase().GetMd5(id)), m_thread(NULL)

 {

-	parent->AddPage( this, GetTitle(), true );

+	parent->AddPage( this, _("Comments"), true );

 	static bool bNotLoaded = true;

 	if (bNotLoaded) {

 		wxMemoryFSHandler::AddFile(wxT("modify"), wxBitmap(modify_xpm), wxBITMAP_TYPE_PNG);

diff --git a/sources/MyRuLib/frames/FbFrameHtml.h b/sources/MyRuLib/frames/FbFrameHtml.h
index bc705a35..15e7fbc2 100644
--- a/sources/MyRuLib/frames/FbFrameHtml.h
+++ b/sources/MyRuLib/frames/FbFrameHtml.h
@@ -16,7 +16,6 @@ class FbFrameHtml :
 	public:

 		FbFrameHtml(wxAuiNotebook * parent, int id);

 		virtual ~FbFrameHtml();

-		virtual wxString GetTitle() const { return _("Comments"); };

 		void Load(const wxString & html);

 		static void Execute();

 		virtual void UpdateFonts(bool refresh = true);

diff --git a/sources/MyRuLib/frames/FbFrameInfo.cpp b/sources/MyRuLib/frames/FbFrameInfo.cpp
index 17badd03..7dab6602 100644
--- a/sources/MyRuLib/frames/FbFrameInfo.cpp
+++ b/sources/MyRuLib/frames/FbFrameInfo.cpp
@@ -18,7 +18,7 @@ FbFrameInfo::FbFrameInfo(wxAuiNotebook * parent, bool select)
 	: FbHtmlWindow(parent, ID_FRAME_INFO)

 {

 	UpdateFonts(false);

-	parent->AddPage( this, GetTitle(), select );

+	parent->AddPage( this, _("Information"), select );

 	Update();

 }

 

diff --git a/sources/MyRuLib/frames/FbFrameInfo.h b/sources/MyRuLib/frames/FbFrameInfo.h
index 1798a74e..770439de 100644
--- a/sources/MyRuLib/frames/FbFrameInfo.h
+++ b/sources/MyRuLib/frames/FbFrameInfo.h
@@ -13,7 +13,6 @@ class FbFrameInfo
 	public:

 		static void Execute(wxEvtHandler * owner);

 		FbFrameInfo(wxAuiNotebook * parent, bool select);

-		virtual wxString GetTitle() const { return _("Information"); };

 		void Load(const wxString & html);

 		virtual void UpdateFonts(bool refresh = true);

 	public:

diff --git a/sources/MyRuLib/frames/FbFrameSeqn.cpp b/sources/MyRuLib/frames/FbFrameSeqn.cpp
index a9e8a9d5..83dae93b 100644
--- a/sources/MyRuLib/frames/FbFrameSeqn.cpp
+++ b/sources/MyRuLib/frames/FbFrameSeqn.cpp
@@ -91,7 +91,7 @@ BEGIN_EVENT_TABLE(FbFrameSeqn, FbFrameBase)
 END_EVENT_TABLE()

 

 FbFrameSeqn::FbFrameSeqn(wxAuiNotebook * parent, bool select)

-	: FbFrameBase(parent, ID_FRAME_SEQN, GetTitle(), select),

+	: FbFrameBase(parent, ID_FRAME_SEQN, _("Series"), select),

 		m_FindText(NULL), m_FindInfo(NULL), m_SequenceCode(0)

 {

 	wxPanel * panel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );

diff --git a/sources/MyRuLib/frames/FbFrameSeqn.h b/sources/MyRuLib/frames/FbFrameSeqn.h
index 733eac79..99004aee 100644
--- a/sources/MyRuLib/frames/FbFrameSeqn.h
+++ b/sources/MyRuLib/frames/FbFrameSeqn.h
@@ -27,12 +27,11 @@ class FbFrameSeqn : public FbFrameBase
 {

 	public:

 		FbFrameSeqn(wxAuiNotebook * parent, bool select = false);

-		virtual wxString GetTitle() const { return _("Series"); };

 		void FindSequence(const wxString &text);

 		void OpenSequence(const int sequence, const int book);

 	protected:

 		virtual wxString GetCountSQL();

-		class MasterMenu: public wxMenu { 

+		class MasterMenu: public wxMenu {

 			public: MasterMenu(int id);

 		};

 		void CreateColumns();