Edit book properties from reader

4 files changed, 16 insertions, 3 deletions

diff --git a/sources/MyRuLib/dialogs/FbTitleDlg.h b/sources/MyRuLib/dialogs/FbTitleDlg.h
index 3acdb663..4f1fd722 100644
--- a/sources/MyRuLib/dialogs/FbTitleDlg.h
+++ b/sources/MyRuLib/dialogs/FbTitleDlg.h
@@ -199,9 +199,9 @@ protected:
 	public:

 		MainPanel(wxWindow* parent, int book, wxSQLite3Database &database, wxSQLite3ResultSet &result);

 	private:

-		wxCheckBox * m_auth;

-		wxCheckBox * m_seqn;

-		wxCheckBox * m_genr;

+		wxCheckBox * cb_auth;

+		wxCheckBox * cb_seqn;

+		wxCheckBox * cb_genr;

 	};

 

 public:

diff --git a/sources/MyRuLib/frames/FbCoolReader.cpp b/sources/MyRuLib/frames/FbCoolReader.cpp
index f10b88d5..51001e08 100644
--- a/sources/MyRuLib/frames/FbCoolReader.cpp
+++ b/sources/MyRuLib/frames/FbCoolReader.cpp
@@ -17,6 +17,7 @@
 #include "FbMainFrame.h"

 #include "MyRuLibApp.h"

 #include "FbString.h"

+#include "dialogs/FbTitleDlg.h"

 

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

 //  FbContentModel

@@ -181,6 +182,7 @@ BEGIN_EVENT_TABLE( FbCoolReader, wxWindow )
 	EVT_MENU( ID_READER_ZOOM_IN, FbCoolReader::OnCommand )

 	EVT_MENU( ID_READER_ZOOM_OUT, FbCoolReader::OnCommand )

 	EVT_MENU( ID_READER_HEADER, FbCoolReader::OnShowHeader )

+	EVT_MENU(wxID_PROPERTIES, FbCoolReader::OnEditBook)

 	EVT_UPDATE_UI(ID_READER_HEADER, FbCoolReader::OnShowHeaderUI )

 	EVT_MENU(ID_MODE_TREE, FbCoolReader::OnShowContent)

 	EVT_MENU(ID_MODE_LIST, FbCoolReader::OnShowContent)

@@ -517,6 +519,7 @@ void FbCoolReader::OnCopy( wxCommandEvent& event )
 

 FbCoolReader::MenuBook::MenuBook()

 {

+	Append( wxID_DOWN, _("Next page") + (wxString)wxT("\tSpace"));

 	Append( ID_READER_CONTENT, _("Table of Contents") );

 	Append( wxID_FIND, _("Find text...") );

 	AppendSeparator();

@@ -528,6 +531,7 @@ FbCoolReader::MenuBook::MenuBook()
 	Append( wxID_SAVE, wxT( "&Save...\tCtrl+S" ) );

 	AppendSeparator();

 	Append( ID_READER_OPTIONS, (wxString)_("Cool Reader options") + wxT( "\tF9" ) );

+	Append(wxID_PROPERTIES, _("Properties"));

 };

 

 void FbCoolReader::OnMouseRDown( wxMouseEvent & event )

@@ -857,6 +861,11 @@ void FbCoolReader::OnFindClose( wxFindDialogEvent& event )
 {

 }

 

+void FbCoolReader::OnEditBook( wxCommandEvent & event )

+{

+	if (m_book) FbSingleTitleDlg::Execute(m_book);

+}

+

 /*

 bool SearchDialog::findText( lString16 pattern, int origin, bool reverse, bool caseInsensitive )

 {

diff --git a/sources/MyRuLib/frames/FbCoolReader.h b/sources/MyRuLib/frames/FbCoolReader.h
index 675c4e45..3fdac549 100644
--- a/sources/MyRuLib/frames/FbCoolReader.h
+++ b/sources/MyRuLib/frames/FbCoolReader.h
@@ -105,6 +105,7 @@ class FbCoolReader: public wxWindow, public LVDocViewCallback
 		void OnFindFirst( wxFindDialogEvent& event );

 		void OnFindNext( wxFindDialogEvent& event );

 		void OnFindClose( wxFindDialogEvent& event );

+		void OnEditBook( wxCommandEvent & event );

 	private:

 		void SetupPageHeader();

 		bool LoadDocument( const wxString & fname );

diff --git a/sources/config.h.in b/sources/config.h.in
index 3172b1e9..e96dffc3 100644
--- a/sources/config.h.in
+++ b/sources/config.h.in
@@ -131,6 +131,9 @@
 /* Define extended version information for W32. */
 #undef BUILD_VERSION
 
+/* Define if include links to the online collections. */
+#undef FB_INCLUDE_LINKS
+
 /* Define if used Cool Reader Engine. */
 #undef FB_INCLUDE_READER