1 files changed, 38 insertions, 18 deletions

diff --git a/src/bibletime.h b/src/bibletime.h
index 42cf04f..89d0473 100644
--- a/src/bibletime.h
+++ b/src/bibletime.h
@@ -156,6 +156,10 @@ class BibleTime : public QMainWindow {
         *  Save the configuration dialog settings, don't open dialog
         */
         void saveConfigSettings();
+        /**
+        *  Get QAction from actionCollection
+        */
+        QAction* getAction(const QString& actionName);
 
     public slots:
         /**
@@ -175,10 +179,6 @@ class BibleTime : public QMainWindow {
         */
         void openOnlineHelp_Howto();
         /**
-        * Sets the plain caption of the main window
-        */
-        void setPlainCaption( const QString& );
-        /**
         * Processes the commandline options given to BibleTime.
         */
         void processCommandline();
@@ -191,11 +191,11 @@ class BibleTime : public QMainWindow {
         /**
         * Catch QMainWindow events
         */
-		bool event(QEvent* event);
+        bool event(QEvent* event);
         /**
         * Initializes the sword.conf in the $HOME\Sword directory
         */
-		void initSwordConfigFile();
+        void initSwordConfigFile();
         /**
         * Initializes the view of this widget
         */
@@ -246,7 +246,7 @@ class BibleTime : public QMainWindow {
         void searchInModule(CSwordModuleInfo *module);
         void moduleUnlock(CSwordModuleInfo *module);
         void moduleAbout(CSwordModuleInfo *module);
-		void quit();
+        void quit();
 
         /**
          * Is called when the window menu is about to show ;-)
@@ -267,23 +267,35 @@ class BibleTime : public QMainWindow {
         /**
          * This slot is connected with the windowAutoCascade_action object
          */
+        void slotAutoTile();
+        /**
+         * This slot is connected with the windowAutoTile_action object
+         */
         void slotAutoCascade();
         void slotUpdateWindowArrangementActions( QAction* );
 
         void slotCascade();
+        void slotTile();
         void slotTileVertical();
         void slotTileHorizontal();
 
         void slotManualArrangementMode();
 
         /**
-        * Is called when a client was selected in the window menu
-        */
-        void slotWindowMenuActivated();
-        /**
          * Shows/hides the toolbar
          */
         void slotToggleToolbar();
+        
+        /**
+        * Shows/hides the text window text area headers and sets
+        * configuration that newly opened windows don't user headers.
+        */
+        void slotToggleTextWindowHeader();
+        
+        void slotToggleTextWindowToolButtons();
+        void slotToggleTextWindowNavigator();
+        void slotToggleTextWindowModuleChooser();
+        
         /**
          * Used to set the active menu
          */
@@ -317,11 +329,7 @@ class BibleTime : public QMainWindow {
         * changed (ok or apply)
         */
         void slotSettingsChanged();
-        /**
-        * Is called when settings in the sword setup dialog have been
-        * changed (ok or apply)
-        */
-        void slotSwordSetupChanged();
+
         /**
          * Called when search button is pressed
          **/
@@ -347,7 +355,16 @@ class BibleTime : public QMainWindow {
         */
         void slotOpenAboutDialog();
 
+    signals:
+        void toggledTextWindowHeader(bool newState);
+        void toggledTextWindowNavigator(bool newState);
+        void toggledTextWindowToolButtons(bool newState);
+        void toggledTextWindowModuleChooser(bool newState);
+
     private:
+        //  True if window was maximized before last toggle to full screen.
+        bool m_WindowWasMaximizedBeforeFullScreen;
+
         // Docking widgets and their respective content widgets:
         BtBookshelfDockWidget* m_bookshelfDock;
         QDockWidget* m_bookmarksDock;
@@ -362,10 +379,12 @@ class BibleTime : public QMainWindow {
         QMenu* m_openWindowsMenu;
         /** WINDOW menu actions */
         QAction* m_windowCascade_action;
+        QAction* m_windowTile_action;
         QAction* m_windowTileHorizontal_action;
         QAction* m_windowTileVertical_action;
         QAction* m_windowManualMode_action;
         QAction* m_windowAutoCascade_action;
+        QAction* m_windowAutoTile_action;
         QAction* m_windowAutoTileVertical_action;
         QAction* m_windowAutoTileHorizontal_action;
         QAction* m_windowClose_action;
@@ -389,6 +408,7 @@ class BibleTime : public QMainWindow {
 
         Profile::CProfileMgr m_profileMgr;
 
+
     protected: //DBUS interface implementation
         void closeAllModuleWindows();
         void syncAllBibles(const QString& key);
@@ -402,8 +422,8 @@ class BibleTime : public QMainWindow {
         QStringList searchInOpenModules(const QString& searchText);
         QStringList searchInDefaultBible(const QString& searchText);
         QStringList getModulesOfType(const QString& type);
-        void reloadModules();
-        //helper function
+
+        // Helper function
         void syncAllModulesByType(const CSwordModuleInfo::ModuleType type, const QString& key);
 };