From f3179ed06b0084b64c3e867f5086e82b391723a2 Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Fri, 18 Mar 2011 15:00:14 -0400
Subject: [PATCH] Save/Restore main window state

---
 src/cx/fbn/nevernote/NeverNote.java             | 5 ++++-
 src/cx/fbn/nevernote/utilities/ListManager.java | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 232c113..4ccdfa9 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -354,7 +354,7 @@ public class NeverNote extends QMainWindow{
             QMessageBox.critical(null, tr("Database Connection Error") ,msg);
 			System.exit(16);
 		}
-
+		setObjectName("mainWindow");
 //		thread().setPriority(Thread.MAX_PRIORITY);
 		
 		logger = new ApplicationLogger("nevernote.log");
@@ -1204,6 +1204,7 @@ public class NeverNote extends QMainWindow{
 	private void restoreWindowState(boolean mainWindow) {
 		// We need to name things or this doesn't work.
 		setObjectName("NeverNote");
+        restoreState(Global.restoreState(objectName()));
 		mainLeftRightSplitter.setObjectName("mainLeftRightSplitter");
 		browserIndexSplitter.setObjectName("browserIndexSplitter");
 		leftSplitter1.setObjectName("leftSplitter1");	
@@ -1222,6 +1223,7 @@ public class NeverNote extends QMainWindow{
 		Global.saveState(mainLeftRightSplitter.objectName(), mainLeftRightSplitter.saveState());
 		Global.saveState(browserIndexSplitter.objectName(), browserIndexSplitter.saveState());
 		Global.saveState(leftSplitter1.objectName(), leftSplitter1.saveState());
+		Global.saveState(objectName(), saveState());
 	}    
 	// Load the style sheet
 	private void loadStyleSheet() {
@@ -2778,6 +2780,7 @@ public class NeverNote extends QMainWindow{
     private void setupToolBar() {
     	logger.log(logger.HIGH, "Entering NeverNote.setupToolBar");
     	toolBar = addToolBar(tr("Tool Bar"));	
+    	toolBar.setObjectName("toolBar");
     	menuBar.setupToolBarVisible();
     	if (!Global.isWindowVisible("toolBar"))
     		toolBar.setVisible(false);
diff --git a/src/cx/fbn/nevernote/utilities/ListManager.java b/src/cx/fbn/nevernote/utilities/ListManager.java
index 9193f96..1edad42 100644
--- a/src/cx/fbn/nevernote/utilities/ListManager.java
+++ b/src/cx/fbn/nevernote/utilities/ListManager.java
@@ -111,7 +111,8 @@ public class ListManager  {
  	public ListManager(DatabaseConnection d, ApplicationLogger l) {
  		conn = d;
  		logger = l;
- 		
+ 			
+ 		conn.getTagTable().cleanupTags();
     	status = new StatusSignal();
 		signals = new ThreadSignal();
 		
@@ -260,7 +261,6 @@ public class ListManager  {
  	}
 
  	public void reloadTagIndex() {
-// 		conn.getTagTable().cleanupTags();
  		setTagIndex(conn.getTagTable().getAll());	
  	}
  	public void reloadIndexes() {
-- 
2.11.0