Imported Upstream version 2.2

1 files changed, 29 insertions, 26 deletions

diff --git a/src/bibletime.h b/src/bibletime.h
index bf27ccd..63d603d 100644
--- a/src/bibletime.h
+++ b/src/bibletime.h
@@ -19,6 +19,7 @@ class CSwordModuleInfo;
 #include <QList>
 #include <QMainWindow>
 
+class BtActionClass;
 class CMDIArea;
 class CDisplayWindow;
 class CMainIndex;
@@ -130,7 +131,7 @@ public:
 	/**
 	 * destructor of BibleTime
 	 */
-	virtual ~BibleTime();
+    ~BibleTime();
 
 	/**
 	* Reads the settings from the configfile and sets the right properties.
@@ -152,6 +153,10 @@ public:
 	* Stores the settings of the mainwindow in the profile p
 	*/
 	void storeProfileSettings( Profile::CProfile* p );
+	/**
+	*  Save the configuration dialog settings, don't open dialog
+	*/
+	void saveConfigSettings();
 
 public slots:
 	/**
@@ -173,11 +178,15 @@ public slots:
 	/**
 	* Sets the plain caption of the main window
 	*/
-	virtual void setPlainCaption( const QString& );
+    void setPlainCaption( const QString& );
 	/**
 	* Processes the commandline options given to BibleTime.
 	*/
 	void processCommandline();
+	/**
+	* Creates QAction's that have keyboard shortcuts
+	*/
+	static void insertKeyboardActions( BtActionCollection* const a );
 
 protected: // Protected methods
 	/**
@@ -203,20 +212,21 @@ protected: // Protected methods
 	/**
 	* Initializes one action object
 	*/
-	QAction* initAction(QAction* action, QString text, QString icon, QKeySequence accel, QString tooltip, const char* slot );
+	QAction* initAction(QAction* action, QString text, QString icon, QKeySequence accel, 
+		const QString& tooltip, const QString& actionName, const char* slot );
 	/**
 	* Refreshes all presenter supporting at least in of the features given as parameter.
 	*/
 	void refreshDisplayWindows();
 	/**
+	* Refresh main window accelerators 
+	*/
+	void refreshBibleTimeAccel();
+	/**
 	* Called before a window is closed
 	*/
 	bool queryClose();
 
-	virtual bool event(QEvent*);
-
-	virtual void closeEvent(QCloseEvent* e);
-
 protected slots:
 	/**
 	 * Creates a new presenter in the MDI area according to the type of the module.
@@ -316,10 +326,14 @@ protected slots:
 	void slotOpenAboutDialog();
 
 private:
-	// docking widgets
-	QDockWidget* m_dock0;
-	QDockWidget* m_dock1;
-	QDockWidget* m_dock2;
+    // Docking widgets and their respective content widgets:
+    QDockWidget* m_bookshelfDock;
+        CBookshelfIndex* m_bookshelfPage;
+    QDockWidget* m_bookmarksDock;
+        CBookmarkIndex* m_bookmarksPage;
+    QDockWidget* m_magDock;
+        InfoDisplay::CInfoDisplay* m_infoDisplay;
+
 	QToolBar* m_mainToolBar;
 	// VIEW menu actions
 	QAction* m_viewToolbar_action;
@@ -327,13 +341,13 @@ private:
 	/** WINDOW menu actions */
 	QAction* m_windowCascade_action;
 	QAction* m_windowTileHorizontal_action;
-	QAction* m_windowTileVertical_action;
-	QMenu* m_windowArrangementModeMenu;
+    QAction* m_windowTileVertical_action;
 	QAction* m_windowManualMode_action;
 	QAction* m_windowAutoCascade_action;
 	QAction* m_windowAutoTileVertical_action;
 	QAction* m_windowAutoTileHorizontal_action;
 	QAction* m_windowCloseAll_action;
+	BtActionCollection* m_actionCollection;
 
 	QMenu* m_windowSaveProfileMenu;
 	QAction* m_windowSaveToNewProfile_action;
@@ -341,24 +355,13 @@ private:
 	QMenu* m_windowDeleteProfileMenu;
 	QAction* m_windowFullscreen_action;
 
-	QList<QAction*> m_windowOpenWindowsList;
-
-	bool m_initialized;
-	/**
-	* The list of installed SWORD modules
-	*/
-	QList<CSwordModuleInfo*>* m_moduleList;
+    /// \todo remove?
+    // QList<QAction*> m_windowOpenWindowsList;
 
-	Profile::CProfile* m_currentProfile;
 	CMDIArea* m_mdi;
 
 	Profile::CProfileMgr m_profileMgr;
 
-	// docking windows
-	CBookmarkIndex* m_bookmarksPage;
-	CBookshelfIndex* m_bookshelfPage;
-	InfoDisplay::CInfoDisplay* m_infoDisplay;
-	
 protected: //DBUS interface implementation
 	void closeAllModuleWindows();
 	void syncAllBibles(const QString& key);