From db2bc1dc5c79c7c74483acf221a973d22e5d72ca Mon Sep 17 00:00:00 2001
From: yuki <kimaira7@gmail.com>
Date: Tue, 21 May 2013 14:58:23 +0900
Subject: [PATCH] Revert "Merge branch 'restoreTabs' into develop"

This reverts commit eacabce5620ada62d09893f65d382a818ae8e8cb, reversing
changes made to 9ebab62072bd313be2da96f7409ae184a37a71d7.
---
 src/cx/fbn/nevernote/Global.java               |  51 -----------
 src/cx/fbn/nevernote/NeverNote.java            | 122 ++++++-------------------
 src/cx/fbn/nevernote/gui/TabBrowserWidget.java |   7 --
 3 files changed, 29 insertions(+), 151 deletions(-)

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 331d5b0..6d00824 100644
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -2303,56 +2303,5 @@ public class Global {
 		settings.endGroup();
 		return value;
 	}
-	
-	// 最後に開いていたノート群を取得
-	public static HashMap<Integer, String> getLastViewedTabs() {
-		settings.beginGroup("General");
-		
-		@SuppressWarnings("unchecked")
-		HashMap<Integer, String> tabWindows = (HashMap<Integer, String>) settings.value("lastViewedTabs", null);
-		
-		settings.endGroup();
-		return tabWindows;
-	}
-	
-	// 最後に開いていたノート群を保存
-	public static void saveLastViewedTabs(HashMap<Integer, String> tabs) {
-		settings.beginGroup("General");
-		if (tabs != null) {
-			settings.setValue("lastViewedTabs", tabs);
-		} else {
-			settings.setValue("lastViewedTabs", "");
-		}
-		settings.endGroup();
-	}
-	
-    // 最後に開いていたタブのインデックスを取得
-    public static int getLastViewedTabIndex() {
-		settings.beginGroup("General");
-		Integer index;
-		try {
-			String val = (String) settings.value("lastViewedTabIndex", 0);
-			index = new Integer(val.trim());
-		} catch (Exception e) {
-			try {
-				index = (Integer) settings.value("lastViewedTabIndex", 0);
-			} catch (Exception e1) {
-				index = 0;
-			}
-		}
-		settings.endGroup();
-		return index;
-    }
-    
-    // 最後に開いていたタブのインデックスを保存
-    public static void saveLastViewedTabIndex(Integer index) {
-		settings.beginGroup("General");
-		if (index != null) {
-			settings.setValue("lastViewedTabIndex", index);
-		} else {
-			settings.setValue("lastViewedTabIndex", 0);
-		}
-		settings.endGroup();
-    }
 }
 
diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index b34251d..08793af 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -600,12 +600,25 @@ public class NeverNote extends QMainWindow{
 		tabBrowser = new TabBrowserWidget(this);
 		tabBrowser.setStyleSheet("QTabBar::tab{width:150px;}");
 		tabBrowser.setMovable(true);
+		TabBrowse tab = new TabBrowse(conn, tabBrowser, cbObserver);
+		browserWindow = tab.getBrowserWindow();
+		int index = tabBrowser.addNewTab(tab, "");
+		tabWindows.put(index, tab);
 		tabBrowser.setTabsClosable(true);
 		tabBrowser.currentChanged.connect(this, "tabWindowChanged(int)");
 		tabBrowser.tabCloseRequested.connect(this, "tabWindowClosing(int)");
 		
+		noteDirty = new HashMap<Integer, Boolean>();
+		noteDirty.put(index, false);
+		
 		inkNote = new HashMap<Integer, Boolean>();
 		readOnly = new HashMap<Integer, Boolean>();
+
+		// ICHANGED
+		// 履歴記録のハッシュマップを初期化
+		historyGuids.put(index, new ArrayList<String>());
+		historyPosition.put(index, 0);
+		fromHistory.put(index, false);
 		
         mainLeftRightSplitter.addWidget(leftSplitter1);
         mainLeftRightSplitter.addWidget(browserIndexSplitter);
@@ -779,60 +792,21 @@ public class NeverNote extends QMainWindow{
 		trayIcon.setToolTip(tr("NeighborNote"));
 		trayIcon.setContextMenu(trayMenu);
 		trayIcon.activated.connect(this, "trayActivated(com.trolltech.qt.gui.QSystemTrayIcon$ActivationReason)");
-		
-		// 前回のタブを復元
-		noteTableView.load(true);
-		HashMap<Integer, String> tabs = new HashMap<Integer, String>();
-		if (Global.getLastViewedTabs() != null) {
-			tabs.putAll(Global.getLastViewedTabs());
-		}
-		
-		Collection<String>		guids = tabs.values();
-		Iterator<String>		guidIterator = guids.iterator();
-		Collection<Integer>		indexes = tabs.keySet();
-		Iterator<Integer>		indexIterator = indexes.iterator();
-		noteDirty = new HashMap<Integer, Boolean>();
-		
-		while (guidIterator.hasNext()) {
-			String guid = guidIterator.next();
-			int tabIndex = indexIterator.next();
-			
-			currentNoteGuid = guid;
-			noteDirty.put(tabIndex, false);
-			if (!currentNoteGuid.trim().equals("")) {
-				currentNote = conn.getNoteTable().getNote(currentNoteGuid, true, true, false, false, true);
-				if (currentNote != null) {
-					openTabEditor(guid, tabIndex);
-				}
-			}
-		}
-		
-		// タブが0個だったら作る
-		if (tabBrowser.count() <= 0) {
-			TabBrowse tab = new TabBrowse(conn, tabBrowser, cbObserver);
-			browserWindow = tab.getBrowserWindow();
-			tabBrowser.currentChanged.disconnect();
-			int index = tabBrowser.addNewTab(tab, "");
-			tabBrowser.currentChanged.connect(this, "tabWindowChanged(int)");
-			tabWindows.put(index, tab);
-			noteDirty.put(index, false);
-			
-			// 履歴記録のハッシュマップを初期化
-			historyGuids.put(index, new ArrayList<String>());
-			historyPosition.put(index, 0);
-			fromHistory.put(index, false);
-		}
-		
+
+		currentNoteGuid="";
 		currentNoteGuid = Global.getLastViewedNoteGuid();
-		if (currentNoteGuid.trim().equals("")) {
+		if (currentNoteGuid.equals(""))
 			currentNote = new Note();
-		} else {
-			currentNote = conn.getNoteTable().getNote(currentNoteGuid, true,true,false,false,true);
-		}
 		
-		// タブのフォーカスをlastViewedTabIndexに移す
-		if (tabBrowser.count() >= 2) {
-			tabBrowser.setCurrentIndex(Global.getLastViewedTabIndex());
+		// ICHANGED
+		/* 上に移動したので要らない
+		historyGuids = new ArrayList<String>();
+		historyPosition = 0;
+		fromHistory = false;
+		*/
+		
+		if (!currentNoteGuid.trim().equals("")) {
+			currentNote = conn.getNoteTable().getNote(currentNoteGuid, true,true,false,false,true);
 		}
 		
 		noteIndexUpdated(true);
@@ -1304,23 +1278,6 @@ public class NeverNote extends QMainWindow{
 		
 		Global.saveWindowMaximized(isMaximized());
 		Global.saveCurrentNoteGuid(currentNoteGuid);
-		Global.saveLastViewedTabIndex(tabBrowser.currentIndex());
-		
-		// 開いていたタブ群をsettingsに保存しておく
-		Collection<TabBrowse>		tabBrowsers = tabWindows.values();
-		Iterator<TabBrowse>			tabIterator = tabBrowsers.iterator();
-		Collection<Integer>			tabIndexes = tabWindows.keySet();
-		Iterator<Integer>			indexIterator = tabIndexes.iterator();
-		HashMap<Integer, String>	tabs = new HashMap<Integer, String>();
-		while (tabIterator.hasNext()) {
-			TabBrowse tab = tabIterator.next();
-			int index = indexIterator.next();
-			if (tab.getBrowserWindow() != null && tab.getBrowserWindow().getNote() != null) {
-				String guid = tab.getBrowserWindow().getNote().getGuid();
-				tabs.put(index, guid);
-			}
-		}
-		Global.saveLastViewedTabs(tabs);
 			
 		int sortCol = noteTableView.proxyModel.sortColumn();
 		int sortOrder = noteTableView.proxyModel.sortOrder().value();
@@ -4832,36 +4789,17 @@ public class NeverNote extends QMainWindow{
 			conn.getHistoryTable().addHistory("rensoItemClick", prevCurrentNoteGuid, rensoNotePressedItemGuid);
 		}
 	}
-	
-	private void openTabEditor(String guid) {
-		openTabEditor(guid, -1);
-	}
 
-	// オーバーロード insertIndex < 0 ならば普通に追加
-	private void openTabEditor(String guid, int insertIndex) {
+	// ICHANGED
+	private void openTabEditor(String guid) {
+		
 		Note note = conn.getNoteTable().getNote(guid, true, true, false, true, true);
 		// 新しいタブエディタを作成
 		TabBrowse newBrowser = new TabBrowse(conn, tabBrowser, cbObserver);
 		showEditorButtons(newBrowser.getBrowserWindow());
 		
 		String noteTitle = note.getTitle();
-		int index;
-		// 最初のタブだけ、追加後に自動的にフォーカスが移ってしまうので、一度切断する
-		if (tabBrowser.count() == 0) {
-			tabBrowser.currentChanged.disconnect();
-			if (insertIndex < 0) {
-				index = tabBrowser.addNewTab(newBrowser, noteTitle);
-			} else {
-				index = tabBrowser.insertNewTab(insertIndex, newBrowser, noteTitle);
-			}
-			tabBrowser.currentChanged.connect(this, "tabWindowChanged(int)");
-		} else {
-			if (insertIndex < 0) {
-				index = tabBrowser.addNewTab(newBrowser, noteTitle);
-			} else {
-				index = tabBrowser.insertNewTab(insertIndex, newBrowser, noteTitle);
-			}
-		}
+		int index = tabBrowser.addNewTab(newBrowser, noteTitle);
 		tabWindows.put(index, newBrowser);
 		noteDirty.put(index, false);
 		
@@ -4897,8 +4835,6 @@ public class NeverNote extends QMainWindow{
 				addBrowseHistory();
 			}
 		}
-		
-		rensoNoteList.refreshRensoNoteList(currentNoteGuid);
 	}
 
 	// ICHANGED タブが閉じられた
diff --git a/src/cx/fbn/nevernote/gui/TabBrowserWidget.java b/src/cx/fbn/nevernote/gui/TabBrowserWidget.java
index 3232e30..83debac 100644
--- a/src/cx/fbn/nevernote/gui/TabBrowserWidget.java
+++ b/src/cx/fbn/nevernote/gui/TabBrowserWidget.java
@@ -48,12 +48,5 @@ public class TabBrowserWidget extends QTabWidget {
 		bar.setTabTitle(index, title);
 		this.setTabToolTip(index, title);
 	}
-
-	public int insertNewTab(int index, QWidget widget, String title) {
-		int trueIndex = this.insertTab(index, widget, new String());
-		bar.addNewTab(trueIndex, title);
-		this.setTabToolTip(trueIndex, title);
-		return trueIndex;
-	}
 	
 }
-- 
2.11.0