From f54bcd2a034be72ffafc5bf7f4b4215c03e71d66 Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Wed, 8 Sep 2010 08:27:29 -0400
Subject: [PATCH] Add logic to remember if the QToolBar for the main menu is
 hidden or visible. Also add the option for hiding to the main menu.

---
 shortcuts_sample.txt                      |  1 +
 src/cx/fbn/nevernote/NeverNote.java       | 14 ++++++++++++--
 src/cx/fbn/nevernote/gui/MainMenuBar.java |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/shortcuts_sample.txt b/shortcuts_sample.txt
index db9afa4..a61f1e4 100644
--- a/shortcuts_sample.txt
+++ b/shortcuts_sample.txt
@@ -47,6 +47,7 @@ View_Show_SavedSearches				// Show the saved search tree
 View_Show_Trash					// Show the trash window
 View_Show_Editor_Button_Bar			// Hide the editor button bar
 View_Show_Left_Side		F11		// Hide all left hand windows
+View_Toolbar					// Show/hide the toolbar
 
 Format_Bold			Ctrl+B		// Bold (duh)
 Format_Underline		Ctrl+U		// Underline
diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index df96eac..4152b9b 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -188,7 +188,7 @@ public class NeverNote extends QMainWindow{
     TableView	 			noteTableView;				// 	List of notes (the widget).
 
     public BrowserWindow	browserWindow;				// Window containing browser & labels
-    QToolBar 				toolBar;					// The tool bar under the menu
+    public QToolBar 		toolBar;					// The tool bar under the menu
 //    QLineEdit 				searchField;				// The search filter bar on the toolbar
     QComboBox				searchField;				// search filter bar on the toolbar;
     boolean					searchPerformed = false;	// Search was done?
@@ -1925,10 +1925,20 @@ public class NeverNote extends QMainWindow{
     	searchPerformed = true;
     	logger.log(logger.HIGH, "Leaving NeverNote.searchFieldChanged");
     }
+
+    // 
+    @SuppressWarnings("unused")
+	private void toolbarViewToggle() {
+    	Global.saveWindowVisible("toolBar", toolBar.isHidden());
+    }
     // Build the window tool bar
     private void setupToolBar() {
     	logger.log(logger.HIGH, "Entering NeverNote.setupToolBar");
-    	toolBar = addToolBar(tr("toolBar"));	
+    	toolBar = addToolBar(tr("Tool Bar"));	
+    	
+    	toolBar.setVisible(Global.isWindowVisible("toolBar"));
+    	toolBar.toggleViewAction().changed.connect(this, "toolbarViewToggle()");
+    	menuBar.setupToolBarVisible();
 
     	prevButton = toolBar.addAction("Previous");
     	QIcon prevIcon = new QIcon(iconPath+"back.png");
diff --git a/src/cx/fbn/nevernote/gui/MainMenuBar.java b/src/cx/fbn/nevernote/gui/MainMenuBar.java
index a1b5e3f..375a5da 100644
--- a/src/cx/fbn/nevernote/gui/MainMenuBar.java
+++ b/src/cx/fbn/nevernote/gui/MainMenuBar.java
@@ -667,6 +667,10 @@ public class MainMenuBar extends QMenuBar {
 
 	}
 
+	public void setupToolBarVisible() {
+		viewMenu.addAction(parent.toolBar.toggleViewAction());
+		setupShortcut(parent.toolBar.toggleViewAction(), "View_Toolbar");
+	}
 	
 	private void setupShortcut(QAction action, String text) {
 		if (!Global.shortcutKeys.containsAction(text))
-- 
2.11.0