/*
- * This file is part of NeverNote
+ * This file is part of NixNote/NeighborNote
* Copyright 2009 Randy Baumgarte
+ * Copyright 2013 Yuki Takahashi
*
* This file may be licensed under the terms of of the
* GNU General Public License Version 2 (the ``GPL'').
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.security.MessageDigest;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.SortedMap;
import java.util.Vector;
-import org.apache.thrift.TException;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.h2.tools.ChangeFileEncryption;
+import com.evernote.edam.error.EDAMErrorCode;
import com.evernote.edam.error.EDAMNotFoundException;
import com.evernote.edam.error.EDAMSystemException;
import com.evernote.edam.error.EDAMUserException;
import com.evernote.edam.notestore.NoteFilter;
import com.evernote.edam.notestore.NoteVersionId;
import com.evernote.edam.type.Data;
+import com.evernote.edam.type.LinkedNotebook;
import com.evernote.edam.type.Note;
import com.evernote.edam.type.NoteAttributes;
import com.evernote.edam.type.Notebook;
import com.evernote.edam.type.SavedSearch;
import com.evernote.edam.type.Tag;
import com.evernote.edam.type.User;
+import com.evernote.thrift.TException;
import com.trolltech.qt.QThread;
import com.trolltech.qt.core.QByteArray;
import com.trolltech.qt.core.QDateTime;
import com.trolltech.qt.core.QIODevice;
import com.trolltech.qt.core.QIODevice.OpenModeFlag;
import com.trolltech.qt.core.QLocale;
+import com.trolltech.qt.core.QMimeData;
import com.trolltech.qt.core.QModelIndex;
import com.trolltech.qt.core.QSize;
import com.trolltech.qt.core.QTemporaryFile;
import com.trolltech.qt.core.QTextCodec;
+import com.trolltech.qt.core.QTextStream;
import com.trolltech.qt.core.QThreadPool;
import com.trolltech.qt.core.QTimer;
import com.trolltech.qt.core.QTranslator;
import com.trolltech.qt.core.QUrl;
import com.trolltech.qt.core.Qt;
import com.trolltech.qt.core.Qt.BGMode;
+import com.trolltech.qt.core.Qt.DockWidgetArea;
import com.trolltech.qt.core.Qt.ItemDataRole;
+import com.trolltech.qt.core.Qt.KeyboardModifier;
+import com.trolltech.qt.core.Qt.MouseButton;
import com.trolltech.qt.core.Qt.SortOrder;
import com.trolltech.qt.core.Qt.WidgetAttribute;
import com.trolltech.qt.gui.QAbstractItemView;
import com.trolltech.qt.gui.QAbstractItemView.ScrollHint;
import com.trolltech.qt.gui.QAction;
import com.trolltech.qt.gui.QApplication;
+import com.trolltech.qt.gui.QClipboard;
import com.trolltech.qt.gui.QCloseEvent;
import com.trolltech.qt.gui.QColor;
import com.trolltech.qt.gui.QComboBox;
-import com.trolltech.qt.gui.QComboBox.InsertPolicy;
import com.trolltech.qt.gui.QCursor;
import com.trolltech.qt.gui.QDesktopServices;
import com.trolltech.qt.gui.QDialog;
import com.trolltech.qt.gui.QHBoxLayout;
import com.trolltech.qt.gui.QIcon;
import com.trolltech.qt.gui.QImage;
+import com.trolltech.qt.gui.QKeySequence;
import com.trolltech.qt.gui.QLabel;
-import com.trolltech.qt.gui.QListWidget;
+import com.trolltech.qt.gui.QListWidgetItem;
import com.trolltech.qt.gui.QMainWindow;
import com.trolltech.qt.gui.QMenu;
import com.trolltech.qt.gui.QMessageBox;
import com.trolltech.qt.gui.QPixmap;
import com.trolltech.qt.gui.QPrintDialog;
import com.trolltech.qt.gui.QPrinter;
+import com.trolltech.qt.gui.QShortcut;
import com.trolltech.qt.gui.QSizePolicy;
import com.trolltech.qt.gui.QSizePolicy.Policy;
import com.trolltech.qt.gui.QSpinBox;
import com.trolltech.qt.gui.QTextEdit;
import com.trolltech.qt.gui.QToolBar;
import com.trolltech.qt.gui.QTreeWidgetItem;
+import com.trolltech.qt.network.QNetworkAccessManager;
+import com.trolltech.qt.network.QNetworkProxy;
+import com.trolltech.qt.network.QNetworkProxy.ProxyType;
+import com.trolltech.qt.network.QNetworkReply;
+import com.trolltech.qt.network.QNetworkRequest;
import com.trolltech.qt.webkit.QWebPage.WebAction;
import com.trolltech.qt.webkit.QWebSettings;
+import cx.fbn.nevernote.clipboard.ClipBoardObserver;
import cx.fbn.nevernote.config.InitializationException;
import cx.fbn.nevernote.config.StartupConfig;
import cx.fbn.nevernote.dialog.AccountDialog;
import cx.fbn.nevernote.dialog.DatabaseLoginDialog;
import cx.fbn.nevernote.dialog.DatabaseStatus;
import cx.fbn.nevernote.dialog.FindDialog;
-import cx.fbn.nevernote.dialog.LoginDialog;
+import cx.fbn.nevernote.dialog.IgnoreSync;
+import cx.fbn.nevernote.dialog.LogFileDialog;
import cx.fbn.nevernote.dialog.NotebookArchive;
import cx.fbn.nevernote.dialog.NotebookEdit;
import cx.fbn.nevernote.dialog.OnlineNoteHistory;
import cx.fbn.nevernote.dialog.SavedSearchEdit;
import cx.fbn.nevernote.dialog.SetIcon;
import cx.fbn.nevernote.dialog.ShareNotebook;
+import cx.fbn.nevernote.dialog.SharedNotebookSyncError;
import cx.fbn.nevernote.dialog.StackNotebook;
+import cx.fbn.nevernote.dialog.SynchronizationRequiredWarning;
import cx.fbn.nevernote.dialog.TagEdit;
+import cx.fbn.nevernote.dialog.TagMerge;
import cx.fbn.nevernote.dialog.ThumbnailViewer;
+import cx.fbn.nevernote.dialog.UpgradeAvailableDialog;
import cx.fbn.nevernote.dialog.WatchFolder;
+import cx.fbn.nevernote.evernote.NoteMetadata;
+import cx.fbn.nevernote.filters.FilterEditorNotebooks;
+import cx.fbn.nevernote.filters.FilterEditorTags;
import cx.fbn.nevernote.gui.AttributeTreeWidget;
import cx.fbn.nevernote.gui.BrowserWindow;
import cx.fbn.nevernote.gui.DateAttributeFilterTable;
import cx.fbn.nevernote.gui.ExternalBrowse;
import cx.fbn.nevernote.gui.MainMenuBar;
import cx.fbn.nevernote.gui.NotebookTreeWidget;
+import cx.fbn.nevernote.gui.RensoNoteList;
+import cx.fbn.nevernote.gui.RensoNoteListDock;
import cx.fbn.nevernote.gui.SavedSearchTreeWidget;
+import cx.fbn.nevernote.gui.SearchPanel;
+import cx.fbn.nevernote.gui.TabBrowse;
+import cx.fbn.nevernote.gui.TabBrowserWidget;
import cx.fbn.nevernote.gui.TableView;
import cx.fbn.nevernote.gui.TagTreeWidget;
import cx.fbn.nevernote.gui.Thumbnailer;
import cx.fbn.nevernote.gui.TrashTreeWidget;
import cx.fbn.nevernote.gui.controls.QuotaProgressBar;
+import cx.fbn.nevernote.oauth.OAuthTokenizer;
+import cx.fbn.nevernote.oauth.OAuthWindow;
import cx.fbn.nevernote.sql.DatabaseConnection;
import cx.fbn.nevernote.sql.WatchFolderRecord;
import cx.fbn.nevernote.threads.IndexRunner;
import cx.fbn.nevernote.utilities.SyncTimes;
import cx.fbn.nevernote.xml.ExportData;
import cx.fbn.nevernote.xml.ImportData;
+import cx.fbn.nevernote.xml.ImportEnex;
import cx.fbn.nevernote.xml.NoteFormatter;
QAction trayExitAction; // Exit the application
QAction trayShowAction; // toggle the show/hide action
QAction trayAddNoteAction; // Add a note from the system tray
+ QNetworkAccessManager versionChecker; // Used when checking for new versions
NotebookTreeWidget notebookTree; // List of notebooks
AttributeTreeWidget attributeTree; // List of note attributes
public BrowserWindow browserWindow; // Window containing browser & labels
public QToolBar toolBar; // The tool bar under the menu
QComboBox searchField; // search filter bar on the toolbar;
+ QShortcut searchShortcut; // Shortcut to search bar
boolean searchPerformed = false; // Search was done?
QuotaProgressBar quotaBar; // The current quota usage
ApplicationLogger logger;
List<String> selectedNotebookGUIDs; // List of notebook GUIDs
List<String> selectedTagGUIDs; // List of selected tag GUIDs
- String previousSelectedTag; // Tag that was selected last time
List<String> selectedNoteGUIDs; // List of selected notes
- String previousSelectedNotebook; // Notebook selected last time
String selectedSavedSearchGUID; // Currently selected saved searches
private final HashMap<String, ExternalBrowse> externalWindows; // Notes being edited by an external window;
NoteFilter filter; // Note filter
String currentNoteGuid; // GUID of the current note
Note currentNote; // The currently viewed note
- boolean noteDirty; // Has the note been changed?
- boolean inkNote; // if this is an ink note, it is read only
+ HashMap<Integer, Boolean> noteDirty; // Has the note been changed?
+ HashMap<Integer, Boolean> inkNote; // if this is an ink note, it is read only
+ HashMap<Integer, Boolean> readOnly; // Is this note read-only?
+
ListManager listManager; // DB runnable task
QTimer authTimer; // Refresh authentication
QTimer externalFileSaveTimer; // Save files altered externally
QTimer thumbnailTimer; // Wakeup & scan for thumbnails
+ QTimer debugTimer;
List<String> externalFiles; // External files to save later
List<String> importFilesKeep; // Auto-import files to save later
List<String> importFilesDelete; // Auto-import files to save later
QAction synchronizeButton; // Synchronize with Evernote
QAction allNotesButton; // Reset & view all notes
QTimer synchronizeAnimationTimer; // Timer to change animation button
- double synchronizeIconAngle; // Used to rotate sync icon
+ int synchronizeIconAngle; // Used to rotate sync icon
QAction printButton; // Print Button
QAction tagButton; // Tag edit button
QAction attributeButton; // Attribute information button
QSpinBox zoomSpinner; // Zoom zoom
QAction searchClearButton; // Clear the search field
+ SearchPanel searchLayout; // Widget to hold search field, zoom, & quota
+
QSplitter mainLeftRightSplitter; // main splitter for left/right side
QSplitter leftSplitter1; // first left hand splitter
QSplitter browserIndexSplitter; // splitter between note index & note text
int tagDeadCount=0; // number of consecutive dead times for the tag thread
int trashDeadCount=0; // number of consecutive dead times for the trash thread
int saveThreadDeadCount=0; // number of consecutive dead times for the save thread
+ int enRelatedNotesThreadDeadCount=0; // number of consecutive dead times for the EvernoteRelatedNotes Thread
+ boolean disableTagThreadCheck=false;
+ boolean disableNotebookThreadCheck=false;
+ boolean disableTrashThreadCheck=false;
+ boolean disableSaveThreadCheck=false;
+ boolean disableSyncThreadCheck=false;
+ boolean disableIndexThreadCheck=false;
+ boolean disableENRelatedNotesThreadCheck=false;
HashMap<String, String> noteCache; // Cash of note content
- HashMap<String, Boolean> readOnlyCache; // List of cash notes that are read-only
- List<String> historyGuids; // GUIDs of previously viewed items
- int historyPosition; // Position within the viewed items
- boolean fromHistory; // Is this from the history queue?
+ HashMap<String, Boolean> readOnlyCache; // List of cashe notes that are read-only
+ HashMap<String, Boolean> inkNoteCache; // List of cache notes that are ink notes
+ HashMap<Integer, ArrayList<String>> historyGuids; // タブごとの以前見たノートのGUID
+ HashMap<Integer, Integer> historyPosition; // Position within the viewed items
+ HashMap<Integer, Boolean> fromHistory; // Is this from the history queue?
+
String trashNoteGuid; // Guid to restore / set into or out of trash to save position
List<Thumbnailer> thumbGenerators; // generate preview image
ThumbnailViewer thumbnailViewer; // View preview thumbnail;
boolean encryptOnShutdown; // should I encrypt when I close?
boolean decryptOnShutdown; // should I decrypt on shutdown;
String encryptCipher; // What cipher should I use?
- Signal0 minimizeToTray;
+ //Signal0 minimizeToTray;
boolean windowMaximized = false; // Keep track of the window state for restores
List<String> pdfReadyQueue; // Queue of PDFs that are ready to be rendered.
+ List<QPixmap> syncIcons; // Array of icons used in sync animation
+ private boolean closeAction = false; // Used to say when to close or when to minimize
+ private static Logger log = Logger.getLogger(NeverNote.class);
+ private String saveLastPath; // last path we used
+ private final QTimer messageTimer; // Timer to clear the status message.
+ private QTimer blockTimer;
+ BrowserWindow blockingWindow;
-
+ private final TabBrowserWidget tabBrowser; // ブラウザウィンドウをタブ化
+ private final HashMap<Integer, TabBrowse> tabWindows; // タブウィンドウ
+ private final RensoNoteListDock rensoNoteListDock; // 連想ノートリストドックウィジェット
+ ClipBoardObserver cbObserver;
+ String rensoNotePressedItemGuid;
+
String iconPath = new String("classpath:cx/fbn/nevernote/icons/");
// Application Constructor
@SuppressWarnings("static-access")
public NeverNote(DatabaseConnection dbConn) {
+ cbObserver = new ClipBoardObserver();
+
conn = dbConn;
if (conn.getConnection() == null) {
String msg = new String(tr("Unable to connect to the database.\n\nThe most probable reason is that some other process\n" +
- "is accessing the database or NeverNote is already running.\n\n" +
- "Please end any other process or shutdown the other NeverNote before starting.\n\nExiting program."));
+ "is accessing the database or NeighborNote is already running.\n\n" +
+ "Please end any other process or shutdown the other NeighborNote before starting.\n\nExiting program."));
QMessageBox.critical(null, tr("Database Connection Error") ,msg);
System.exit(16);
}
-
- thread().setPriority(Thread.MAX_PRIORITY);
+ setObjectName("mainWindow");
+// thread().setPriority(Thread.MAX_PRIORITY);
logger = new ApplicationLogger("nevernote.log");
logger.log(logger.HIGH, "Starting Application");
logger.log(logger.EXTREME, "Starting GUI build");
QTranslator nevernoteTranslator = new QTranslator();
- nevernoteTranslator.load(Global.getFileManager().getTranslateFilePath("nevernote_" + QLocale.system().name() + ".qm"));
+ nevernoteTranslator.load(Global.getFileManager().getTranslateFilePath("neighbornote_" + QLocale.system().name() + ".qm"));
QApplication.instance().installTranslator(nevernoteTranslator);
Global.originalPalette = QApplication.palette();
QApplication.setStyle(Global.getStyle());
if (Global.useStandardPalette())
QApplication.setPalette(QApplication.style().standardPalette());
- setWindowTitle("NeverNote");
+ setWindowTitle(tr("NeighborNote"));
mainLeftRightSplitter = new QSplitter();
+ mainLeftRightSplitter.setOrientation(Qt.Orientation.Horizontal);
+
setCentralWidget(mainLeftRightSplitter);
leftSplitter1 = new QSplitter();
leftSplitter1.setOrientation(Qt.Orientation.Vertical);
browserIndexSplitter.setOrientation(Qt.Orientation.Vertical);
//* Setup threads & thread timers
- int indexRunnerCount = Global.getIndexThreads();
- indexRunnerCount = 1;
- QThreadPool.globalInstance().setMaxThreadCount(indexRunnerCount+5); // increase max thread count
+// int indexRunnerCount = Global.getIndexThreads();
+// indexRunnerCount = 1;
+ QThreadPool.globalInstance().setMaxThreadCount(Global.threadCount); // increase max thread count
logger.log(logger.EXTREME, "Building list manager");
listManager = new ListManager(conn, logger);
logger.log(logger.EXTREME, "Building index runners & timers");
- indexRunner = new IndexRunner("indexRunner.log", Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
+ indexRunner = new IndexRunner("indexRunner.log",
+ Global.getDatabaseUrl(), Global.getIndexDatabaseUrl(),
+ Global.getResourceDatabaseUrl(),
+ Global.getBehaviorDatabaseUrl(), Global.getDatabaseUserid(),
+ Global.getDatabaseUserPassword(), Global.cipherPassword);
+
indexThread = new QThread(indexRunner, "Index Thread");
+ indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
+ indexRunner.indexImageRecognition = Global.indexImageRecognition();
+// indexRunner.indexNoteBody = Global.indexNoteBody();
+// indexRunner.indexNoteTitle = Global.indexNoteTitle();
+// indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
indexThread.start();
synchronizeAnimationTimer = new QTimer();
logger.log(logger.EXTREME, "Setting sync thread & timers");
syncThreadsReady=1;
- syncRunner = new SyncRunner("syncRunner.log", Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
+ syncRunner = new SyncRunner("syncRunner.log", Global.getDatabaseUrl(),
+ Global.getIndexDatabaseUrl(), Global.getResourceDatabaseUrl(),
+ Global.getBehaviorDatabaseUrl(), Global.getDatabaseUserid(),
+ Global.getDatabaseUserPassword(), Global.cipherPassword);
+
syncTime = new SyncTimes().timeValue(Global.getSyncInterval());
syncTimer = new QTimer();
syncTimer.timeout.connect(this, "syncTimer()");
syncRunner.status.message.connect(this, "setMessage(String)");
syncRunner.syncSignal.finished.connect(this, "syncThreadComplete(Boolean)");
syncRunner.syncSignal.errorDisconnect.connect(this, "remoteErrorDisconnect()");
+ syncRunner.limitSignal.rateLimitReached.connect(this, "informRateLimit(Integer)");
syncRunning = false;
if (syncTime > 0) {
automaticSync = true;
logger.log(logger.EXTREME, "Starting thumnail thread");
pdfReadyQueue = new ArrayList<String>();
- thumbnailRunner = new ThumbnailRunner("thumbnailRunner.log", Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
+ thumbnailRunner = new ThumbnailRunner("thumbnailRunner.log",
+ Global.getDatabaseUrl(), Global.getIndexDatabaseUrl(),
+ Global.getResourceDatabaseUrl(),
+ Global.getBehaviorDatabaseUrl(), Global.getDatabaseUserid(),
+ Global.getDatabaseUserPassword(), Global.cipherPassword);
+
thumbnailThread = new QThread(thumbnailRunner, "Thumbnail Thread");
thumbnailRunner.noteSignal.thumbnailPageReady.connect(this, "thumbnailHTMLReady(String,QByteArray,Integer)");
thumbnailThread.start();
thumbnailTimer = new QTimer();
thumbnailTimer.timeout.connect(this, "thumbnailTimer()");
thumbnailTimer();
- thumbnailTimer.setInterval(60*1000); // Thumbnail every minute
+ thumbnailTimer.setInterval(500*1000); // Thumbnail every minute
thumbnailTimer.start();
+// debugTimer = new QTimer();
+// debugTimer.timeout.connect(this, "debugDirty()");
+// debugTimer.start(1000*60);
+
logger.log(logger.EXTREME, "Starting authentication timer");
authTimer = new QTimer();
authTimer.timeout.connect(this, "authTimer()");
tagTree = new TagTreeWidget(conn);
savedSearchTree = new SavedSearchTreeWidget();
trashTree = new TrashTreeWidget();
- noteTableView = new TableView(logger, listManager);
+ noteTableView = new TableView(logger, listManager, this);
+
+ searchField = new QComboBox();
+ searchField.setObjectName("searchField");
+ //setStyleSheet("QComboBox#searchField { background-color: yellow }");
+ searchField.setEditable(true);
+ searchField.activatedIndex.connect(this, "searchFieldChanged()");
+ searchField.setDuplicatesEnabled(false);
+ searchField.editTextChanged.connect(this,"searchFieldTextChanged(String)");
+ searchShortcut = new QShortcut(this);
+ setupShortcut(searchShortcut, "Focus_Search");
+ searchShortcut.activated.connect(this, "focusSearch()");
+
+ quotaBar = new QuotaProgressBar();
+ // Setup the zoom
+ zoomSpinner = new QSpinBox();
+ zoomSpinner.setMinimum(10);
+ zoomSpinner.setMaximum(1000);
+ zoomSpinner.setAccelerated(true);
+ zoomSpinner.setSingleStep(10);
+ zoomSpinner.setValue(100);
+ zoomSpinner.valueChanged.connect(this, "zoomChanged()");
+
+ searchLayout = new SearchPanel(searchField, quotaBar, notebookTree, zoomSpinner);
+
QGridLayout leftGrid = new QGridLayout();
+ leftSplitter1.setContentsMargins(5, 0, 0, 7);
leftSplitter1.setLayout(leftGrid);
- leftGrid.addWidget(notebookTree, 1, 1);
+ leftGrid.addWidget(searchLayout,1,1);
leftGrid.addWidget(tagTree,2,1);
leftGrid.addWidget(attributeTree,3,1);
leftGrid.addWidget(savedSearchTree,4,1);
- leftGrid.addWidget(trashTree, 5, 1);
+ leftGrid.addWidget(trashTree,5, 1);
// Setup the browser window
noteCache = new HashMap<String,String>();
readOnlyCache = new HashMap<String, Boolean>();
- browserWindow = new BrowserWindow(conn);
-
+ inkNoteCache = new HashMap<String, Boolean>();
+ browserWindow = new BrowserWindow(conn, cbObserver);
+
+ // 下から移動してきた。
+ historyGuids = new HashMap<Integer, ArrayList<String>>();
+ historyPosition = new HashMap<Integer, Integer>();
+ fromHistory = new HashMap<Integer, Boolean>();
+
+ // タブブラウザ作成
+ tabWindows = new HashMap<Integer, TabBrowse>();
+ tabBrowser = new TabBrowserWidget(this);
+ tabBrowser.setStyleSheet("QTabBar::tab{width:150px;}");
+ tabBrowser.setMovable(true);
+ tabBrowser.setTabsClosable(true);
+ TabBrowse tab = new TabBrowse(conn, tabBrowser, cbObserver);
+ browserWindow = tab.getBrowserWindow();
+ int index = tabBrowser.addNewTab(tab, "");
+ tabWindows.put(index, tab);
+ tabBrowser.currentChanged.connect(this, "tabWindowChanged(int)");
+ tabBrowser.tabCloseRequested.connect(this, "tabCloseRequested(int)");
+
+ noteDirty = new HashMap<Integer, Boolean>();
+ noteDirty.put(index, false);
+
+ inkNote = new HashMap<Integer, Boolean>();
+ readOnly = new HashMap<Integer, Boolean>();
+
+ // 履歴記録のハッシュマップを初期化
+ historyGuids.put(index, new ArrayList<String>());
+ historyPosition.put(index, 0);
+ fromHistory.put(index, false);
+
mainLeftRightSplitter.addWidget(leftSplitter1);
mainLeftRightSplitter.addWidget(browserIndexSplitter);
- if (Global.getListView() == Global.View_List_Wide) {
- browserIndexSplitter.addWidget(noteTableView);
- browserIndexSplitter.addWidget(browserWindow);
- } else {
- mainLeftRightSplitter.addWidget(noteTableView);
- mainLeftRightSplitter.addWidget(browserWindow);
- }
-
- searchField = new QComboBox();
- searchField.setEditable(true);
- searchField.activatedIndex.connect(this, "searchFieldChanged()");
- searchField.setDuplicatesEnabled(false);
- searchField.editTextChanged.connect(this,"searchFieldTextChanged(String)");
-
- quotaBar = new QuotaProgressBar();
+ // 連想ノートリストをセットアップ
+ rensoNoteListDock = new RensoNoteListDock(conn, this, syncRunner, iconPath, tr("Renso Note List"));
+ addDockWidget(DockWidgetArea.RightDockWidgetArea, rensoNoteListDock);
+
+ if (Global.getListView() == Global.View_List_Wide) {
+ browserIndexSplitter.addWidget(noteTableView);
+ browserIndexSplitter.addWidget(tabBrowser);
+ } else {
+ mainLeftRightSplitter.addWidget(noteTableView);
+ mainLeftRightSplitter.addWidget(tabBrowser);
+ }
// Setup the thumbnail viewer
thumbnailViewer = new ThumbnailViewer();
emitLog = new ArrayList<String>();
tagTree.setDeleteAction(menuBar.tagDeleteAction);
+ tagTree.setMergeAction(menuBar.tagMergeAction);
tagTree.setEditAction(menuBar.tagEditAction);
tagTree.setAddAction(menuBar.tagAddAction);
tagTree.setIconAction(menuBar.tagIconAction);
tagTree.setVisible(Global.isWindowVisible("tagTree"));
+ leftSplitter1.setVisible(Global.isWindowVisible("leftPanel"));
tagTree.noteSignal.tagsAdded.connect(this, "tagsAdded(String, String)");
menuBar.hideTags.setChecked(Global.isWindowVisible("tagTree"));
listManager.tagSignal.listChanged.connect(this, "reloadTagTree()");
+
+ if (!Global.isWindowVisible("zoom")) {
+ searchLayout.hideZoom();
+ menuBar.hideZoom.setChecked(false);
+ }
notebookTree.setDeleteAction(menuBar.notebookDeleteAction);
notebookTree.setEditAction(menuBar.notebookEditAction);
notebookTree.setShareAction(menuBar.notebookShareAction);
notebookTree.setVisible(Global.isWindowVisible("notebookTree"));
notebookTree.noteSignal.notebookChanged.connect(this, "updateNoteNotebook(String, String)");
+ notebookTree.noteSignal.tagsChanged.connect(this, "updateNoteTags(String, List)");
+ notebookTree.noteSignal.tagsChanged.connect(this, "updateListTags(String, List)");
menuBar.hideNotebooks.setChecked(Global.isWindowVisible("notebookTree"));
savedSearchTree.setAddAction(menuBar.savedSearchAddAction);
savedSearchTree.itemSelectionChanged.connect(this, "updateSavedSearchSelection()");
savedSearchTree.setVisible(Global.isWindowVisible("savedSearchTree"));
menuBar.hideSavedSearches.setChecked(Global.isWindowVisible("savedSearchTree"));
+
+ // noteTableViewに新しいタブで開くを追加
+ noteTableView.setOpenNewTabAction(menuBar.noteOpenNewTab);
noteTableView.setAddAction(menuBar.noteAdd);
+
+ // noteTableViewに新しいタブでノート追加を追加
+ noteTableView.setAddNoteNewTabAction(menuBar.noteAddNewTab);
+
noteTableView.setDeleteAction(menuBar.noteDelete);
noteTableView.setRestoreAction(menuBar.noteRestoreAction);
noteTableView.setNoteDuplicateAction(menuBar.noteDuplicateAction);
noteTableView.setNoteHistoryAction(menuBar.noteOnlineHistoryAction);
noteTableView.noteSignal.titleColorChanged.connect(this, "titleColorChanged(Integer)");
+ noteTableView.noteSignal.notePinned.connect(this, "notePinned()");
noteTableView.setMergeNotesAction(menuBar.noteMergeAction);
- noteTableView.rowChanged.connect(this, "scrollToGuid(String)");
- noteTableView.resetViewport.connect(this, "scrollToCurrentGuid()");
+ noteTableView.setCopyAsUrlAction(menuBar.noteCopyAsUrlAction);
noteTableView.doubleClicked.connect(this, "listDoubleClick()");
listManager.trashSignal.countChanged.connect(trashTree, "updateCounts(Integer)");
noteTableView.setVisible(Global.isWindowVisible("noteList"));
menuBar.hideNoteList.setChecked(Global.isWindowVisible("noteList"));
- if (!Global.isWindowVisible("editorButtonBar"))
+ if (!Global.isWindowVisible("editorButtonBar")) {
+ menuBar.showEditorBar.setChecked(false);
toggleEditorButtonBar();
+ }
+
if (!Global.isWindowVisible("leftPanel"))
menuBar.hideLeftSide.setChecked(true);
- if (Global.isWindowVisible("noteInformation"))
+
+ if (Global.isWindowVisible("noteInformation")) {
+ menuBar.noteAttributes.setChecked(true);
toggleNoteInformation();
+ }
+
+ quotaBar.setVisible(Global.isWindowVisible("quota"));
+ // IFIXED quotaBar.isVisible() → Global.isWindowVisible("quota")
+ // なぜかquotaBar.isVisible()が常にfalseを返すようなので修正
+ if (!Global.isWindowVisible("quota"))
+ menuBar.hideQuota.setChecked(false);
+
+ searchField.setVisible(Global.isWindowVisible("searchField"));
+ // IFIXED !searchField.isVisible() → !Global.isWindowVisible("searchField")
+ // なぜかsearchField.isVisible()が常にfalseを返すようなので修正
+ if (!Global.isWindowVisible("searchField"))
+ menuBar.hideSearch.setChecked(false);
+
+ if (searchField.isHidden() && quotaBar.isHidden() && zoomSpinner.isHidden() && notebookTree.isHidden())
+ searchLayout.hide();
setMenuBar(menuBar);
setupToolBar();
find.getOkButton().clicked.connect(this, "doFindText()");
// Setup the tray icon menu bar
- trayShowAction = new QAction("Show/Hide", this);
- trayExitAction = new QAction("Exit", this);
- trayAddNoteAction = new QAction("Add Note", this);
+ trayShowAction = new QAction(tr("Show/Hide"), this);
+ trayExitAction = new QAction(tr("Exit"), this);
+ trayAddNoteAction = new QAction(tr("Add Note"), this);
- trayExitAction.triggered.connect(this, "close()");
+ trayExitAction.triggered.connect(this, "closeNeverNote()");
trayAddNoteAction.triggered.connect(this, "addNote()");
trayShowAction.triggered.connect(this, "trayToggleVisible()");
trayIcon = new QSystemTrayIcon(this);
- trayIcon.setToolTip("NeverNote");
+ trayIcon.setToolTip(tr("NeighborNote"));
trayIcon.setContextMenu(trayMenu);
trayIcon.activated.connect(this, "trayActivated(com.trolltech.qt.gui.QSystemTrayIcon$ActivationReason)");
currentNoteGuid="";
currentNoteGuid = Global.getLastViewedNoteGuid();
- historyGuids = new ArrayList<String>();
- historyPosition = 0;
- fromHistory = false;
- noteDirty = false;
+ if (currentNoteGuid.equals(""))
+ currentNote = new Note();
+
+ /* 上に移動したのでここには不要
+ * historyGuids = new ArrayList<String>();
+ * historyPosition = 0;
+ * fromHistory = false;
+ */
+
if (!currentNoteGuid.trim().equals("")) {
currentNote = conn.getNoteTable().getNote(currentNoteGuid, true,true,false,false,true);
}
tagTree.showAllTags(true);
QIcon appIcon = new QIcon(iconPath+"nevernote.png");
- setWindowIcon(appIcon);
- trayIcon.setIcon(appIcon);
- if (Global.showTrayIcon())
- trayIcon.show();
- else
- trayIcon.hide();
+ if (QSystemTrayIcon.isSystemTrayAvailable()) {
+ setWindowIcon(appIcon);
+ trayIcon.setIcon(appIcon);
+ if (Global.showTrayIcon() || Global.minimizeOnClose())
+ trayIcon.show();
+ else
+ trayIcon.hide();
+ }
scrollToGuid(currentNoteGuid);
if (Global.automaticLogin()) {
threadMonitorTimer.timeout.connect(this, "threadMonitorCheck()");
threadMonitorTimer.start(1000*10); // Check for threads every 10 seconds;
- historyGuids.add(currentNoteGuid);
- historyPosition = 1;
+ // IFIXED 恐らく不要なのでコメントアウト
+ /*
+ * historyGuids.add(currentNoteGuid);
+ * historyPosition = 1;
+ */
+ menuBar.blockSignals(true);
+ menuBar.narrowListView.blockSignals(true);
+ menuBar.wideListView.blockSignals(true);
if (Global.getListView() == Global.View_List_Narrow) {
menuBar.narrowListView.setChecked(true);
-// narrowListView();
}
else{
menuBar.wideListView.setChecked(true);
-// wideListView();
- }
-
- if (Global.getListView() == Global.View_List_Wide) {
- browserIndexSplitter.addWidget(noteTableView);
- browserIndexSplitter.addWidget(browserWindow);
- } else {
- mainLeftRightSplitter.addWidget(noteTableView);
- mainLeftRightSplitter.addWidget(browserWindow);
}
+ menuBar.blockSignals(false);
+ menuBar.narrowListView.blockSignals(false);
+ menuBar.wideListView.blockSignals(false);
+
+ // IFIXED 上に同じコードがあるのでコメントアウト
+ /*
+ * if (Global.getListView() == Global.View_List_Wide) {
+ * browserIndexSplitter.addWidget(noteTableView);
+ * browserIndexSplitter.addWidget(tabBrowser);
+ * browserIndexSplitter.addWidget(browserWindow); } else {
+ * mainLeftRightSplitter.addWidget(noteTableView);
+ * mainLeftRightSplitter.addWidget(tabBrowser);
+ * mainLeftRightSplitter.addWidget(browserWindow); }
+ */
+
+ messageTimer = new QTimer();
+ messageTimer.timeout.connect(this, "clearMessage()");
+ messageTimer.setInterval(1000*15);
+ clearMessage();
int sortCol = Global.getSortColumn();
int sortOrder = Global.getSortOrder();
+ noteTableView.proxyModel.blocked = true;
+ // We sort the table twice to fix a bug. For some reaosn the table won't sort properly if it is in narrow
+ // list view and sorted descending on the date created. By sorting it twice it forces the proper sort. Ugly.
+ if (sortCol == 0 && sortOrder == 1 && Global.getListView() == Global.View_List_Narrow)
+ noteTableView.sortByColumn(sortCol, SortOrder.resolve(0));
noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
-
+ noteTableView.proxyModel.blocked = false;
+ noteTableView.proxyModel.sortChanged.connect(this, "tableSortOrderChanged(Integer,Integer)");
+
+ // Set the startup notebook
+ String defaultNotebook = Global.getStartupNotebook();
+ if (!defaultNotebook.equals("AllNotebooks") && !defaultNotebook.equals("")) {
+ for (int k=0; k<listManager.getNotebookIndex().size(); k++) {
+ if (listManager.getNotebookIndex().get(k).isDefaultNotebook()) {
+ notebookTree.clearSelection();
+ notebookTree.selectGuid(listManager.getNotebookIndex().get(k).getGuid());
+ notebookTree.selectionSignal.emit();
+ }
+ }
+ }
+
+ if (Global.checkVersionUpgrade()) {
+ checkForUpdates();
+ }
+
+ if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+ menuBar.noteAddNewTab.setEnabled(false);
+ }
}
-
+
+ public void debugDirty() {
+ List<Note> dirty = conn.getNoteTable().getDirty();
+ logger.log(logger.LOW, "------ Dirty Notes List Begin ------");
+ for (int i=0; i<dirty.size(); i++) {
+ logger.log(logger.LOW, "GUID: " +dirty.get(i).getGuid() + " Title:" + dirty.get(i).getTitle());
+ }
+ logger.log(logger.LOW, "------ Dirty Notes List End ------");
+ }
+
// Main entry point
public static void main(String[] args) {
+ log.setLevel(Level.FATAL);
QApplication.initialize(args);
QPixmap pixmap = new QPixmap("classpath:cx/fbn/nevernote/icons/splash_logo.png");
QSplashScreen splash = new QSplashScreen(pixmap);
QMessageBox.critical(null, "Startup error", "Aborting: " + e.getMessage());
return;
}
+
+ // Setup proxy crap
+ String proxyUrl = Global.getProxyValue("url");
+ String proxyPort = Global.getProxyValue("port");
+ String proxyUserid = Global.getProxyValue("userid");
+ String proxyPassword = Global.getProxyValue("password");
+ boolean proxySet = false;
+ QNetworkProxy proxy = new QNetworkProxy();
+ proxy.setType(ProxyType.HttpProxy);
+ if (!proxyUrl.trim().equals("")) {
+ System.out.println("Proxy URL found: " +proxyUrl);
+ proxySet = true;
+ proxy.setHostName(proxyUrl);
+ }
+ if (!proxyPort.trim().equals("")) {
+ System.out.println("Proxy Port found: " +proxyPort);
+ proxySet = true;
+ proxy.setPort(Integer.parseInt(proxyPort));
+ }
+ if (!proxyUserid.trim().equals("")) {
+ System.out.println("Proxy Userid found: " +proxyUserid);
+ proxySet = true;
+ proxy.setUser(proxyUserid);
+ }
+ if (!proxyPassword.trim().equals("")) {
+ System.out.println("Proxy URL found: " +proxyPassword);
+ proxySet = true;
+ proxy.setPassword(proxyPassword);
+ }
+ if (proxySet) {
+ QNetworkProxy.setApplicationProxy(proxy);
+ }
+
NeverNote application = new NeverNote(dbConn);
+ if (Global.syncOnly) {
+ System.out.println("Performing synchronization only.");
+ application.remoteConnect();
+ if (Global.isConnected) {
+ application.syncRunner.syncNeeded = true;
+ application.syncRunner.addWork("SYNC");
+ application.syncRunner.addWork("STOP");
+ while(!application.syncRunner.isIdle());
+ application.closeNeverNote();
+ }
+ return;
+ }
application.setAttribute(WidgetAttribute.WA_DeleteOnClose, true);
if (Global.startMinimized())
ApplicationLogger logger = new ApplicationLogger("nevernote-database.log");
File f = Global.getFileManager().getDbDirFile(Global.databaseName + ".h2.db");
- boolean dbExists = f.exists();
- if (!dbExists)
+ File fr = Global.getFileManager().getDbDirFile(Global.resourceDatabaseName + ".h2.db");
+ // IFIXED resourceDatabaseNameになっていたので修正
+ File fi = Global.getFileManager().getDbDirFile(Global.indexDatabaseName + ".h2.db");
+ File fb = Global.getFileManager().getDbDirFile(Global.behaviorDatabaseName + ".h2.db");
+
+ if (!f.exists())
Global.setDatabaseUrl("");
+ if (!fr.exists())
+ Global.setResourceDatabaseUrl("");
+ if (!fi.exists())
+ Global.setIndexDatabaseUrl("");
+ if (!fb.exists())
+ Global.setBehaviorDatabaseUrl("");
if (Global.getDatabaseUrl().toUpperCase().indexOf("CIPHER=") > -1) {
boolean goodCheck = false;
Global.getDatabaseUserPassword(), Global.cipherPassword);
}
}
- DatabaseConnection dbConn = new DatabaseConnection(logger,Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword);
+ DatabaseConnection dbConn = new DatabaseConnection(logger,Global.getDatabaseUrl(),
+ Global.getIndexDatabaseUrl(), Global.getResourceDatabaseUrl(), Global.getBehaviorDatabaseUrl(),
+ Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword, 0);
return dbConn;
}
// Encrypt the database upon shutdown
private void encryptOnShutdown() {
String dbPath= Global.getFileManager().getDbDirPath("");
- String dbName = "NeverNote";
try {
+
Statement st = conn.getConnection().createStatement();
st.execute("shutdown");
- if (QMessageBox.question(this, "Are you sure",
- "Are you sure you wish to encrypt the database?",
+ st = conn.getResourceConnection().createStatement();
+ st.execute("shutdown");
+ st = conn.getIndexConnection().createStatement();
+ st.execute("shutdown");
+ st = conn.getBehaviorConnection().createStatement();
+ st.execute("shutdown");
+
+ if (QMessageBox.question(this, tr("Are you sure"),
+ tr("Are you sure you wish to encrypt the database?"),
QMessageBox.StandardButton.Yes,
QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
- ChangeFileEncryption.execute(dbPath, dbName, encryptCipher, null, Global.cipherPassword.toCharArray(), true);
+ ChangeFileEncryption.execute(dbPath, "NeverNote", encryptCipher, null, Global.cipherPassword.toCharArray(), true);
+ ChangeFileEncryption.execute(dbPath, "Resources", encryptCipher, null, Global.cipherPassword.toCharArray(), true);
+ ChangeFileEncryption.execute(dbPath, "Index", encryptCipher, null, Global.cipherPassword.toCharArray(), true);
+ ChangeFileEncryption.execute(dbPath, "Behavior", encryptCipher, null, Global.cipherPassword.toCharArray(), true);
+
Global.setDatabaseUrl(Global.getDatabaseUrl() + ";CIPHER="+encryptCipher);
- QMessageBox.information(this, "Encryption Complete", "Encryption is complete");
+ Global.setResourceDatabaseUrl(Global.getResourceDatabaseUrl() + ";CIPHER="+encryptCipher);
+ Global.setIndexDatabaseUrl(Global.getIndexDatabaseUrl() + ";CIPHER="+encryptCipher);
+ Global.setBehaviorDatabaseUrl(Global.getBehaviorDatabaseUrl() + ";CIPHER=" + encryptCipher);
+
+ QMessageBox.information(this, tr("Encryption Complete"), tr("Encryption is complete"));
}
} catch (SQLException e) {
e.printStackTrace();
ChangeFileEncryption.execute(dbPath, dbName, encryptCipher, Global.cipherPassword.toCharArray(), null, true);
Global.setDatabaseUrl("");
+ Global.setResourceDatabaseUrl("");
+ Global.setIndexDatabaseUrl("");
QMessageBox.information(this, tr("Decryption Complete"), tr("Decryption is complete"));
}
} catch (SQLException e) {
}
} else {
DBEncryptDialog dialog = new DBEncryptDialog();
- dialog.setWindowTitle("Database Decryption");
+ dialog.setWindowTitle(tr("Database Decryption"));
dialog.hideEncryption();
dialog.exec();
if (dialog.okPressed()) {
startupConfig.setHomeDirPath(arg.substring(arg.indexOf('=') + 1));
if (lower.startsWith("--disable-viewing"))
startupConfig.setDisableViewing(true);
+ if (lower.startsWith("--sync-only=true"))
+ startupConfig.setSyncOnly(true);
}
- Global.setup(startupConfig);
+ Global.setup(startupConfig);
+
}
// Exit point
@Override
public void closeEvent(QCloseEvent event) {
+ if (Global.minimizeOnClose() && !closeAction) {
+ event.ignore();
+ hide();
+ return;
+ }
logger.log(logger.HIGH, "Entering NeverNote.closeEvent");
waitCursor(true);
- if (currentNote!= null & browserWindow!=null) {
- if (!currentNote.getTitle().equals(browserWindow.getTitle()))
- conn.getNoteTable().updateNoteTitle(currentNote.getGuid(), browserWindow.getTitle());
+ if (currentNote != null & browserWindow != null) {
+ if (currentNote.getTitle() != null && browserWindow != null
+ && !currentNote.getTitle().equals(browserWindow.getTitle()))
+ conn.getNoteTable().updateNoteTitle(currentNote.getGuid(),
+ browserWindow.getTitle());
}
+
saveNote();
setMessage(tr("Beginning shutdown."));
browser.close();
}
+ // タブブラウザに対してクローズ処理を行う
+ Collection<TabBrowse> win = tabWindows.values();
+ Iterator<TabBrowse> it = win.iterator();
+ tabBrowser.currentChanged.disconnect();
+ tabBrowser.tabCloseRequested.disconnect();
+ while (it.hasNext()) {
+ TabBrowse browser = it.next();
+ browser.close();
+ }
externalFileEditedSaver();
if (Global.isConnected && Global.synchronizeOnClose()) {
setMessage(tr("Performing synchronization before closing."));
+ syncRunner.syncNeeded = true;
syncRunner.addWork("SYNC");
+ } else {
+ syncRunner.keepRunning = false;
}
+ syncRunner.addWork("STOP");
setMessage("Closing Program.");
threadMonitorTimer.stop();
- syncRunner.addWork("STOP");
- syncRunner.keepRunning = false;
thumbnailRunner.addWork("STOP");
- syncRunner.keepRunning = false;
indexRunner.addWork("STOP");
- syncRunner.keepRunning = false;
saveNote();
listManager.stop();
saveWindowState();
+
+ // 連想ノートリストのEvernote関連ノート取得スレッドを終了
+ rensoNoteListDock.getRensoNoteList().stopThread();
if (tempFiles != null)
tempFiles.clear();
Global.keepRunning = false;
try {
logger.log(logger.MEDIUM, "Waiting for indexThread to stop");
- indexRunner.thread().join(50);
- logger.log(logger.MEDIUM, "Index thread has stopped");
+ if (indexRunner.thread().isAlive())
+ indexRunner.thread().join(50);
+ if (!indexRunner.thread().isAlive())
+ logger.log(logger.MEDIUM, "Index thread has stopped");
+ else {
+ logger.log(logger.MEDIUM, "Index thread still running - interrupting");
+ indexRunner.thread().interrupt();
+ }
} catch (InterruptedException e1) {
e1.printStackTrace();
}
- if (!syncRunner.isIdle()) {
- try {
- logger.log(logger.MEDIUM, "Waiting for syncThread to stop");
- syncThread.join();
- logger.log(logger.MEDIUM, "Sync thread has stopped");
- } catch (InterruptedException e1) {
- e1.printStackTrace();
+
+ if (!syncRunner.thread().isAlive()) {
+ logger.log(logger.MEDIUM, "Waiting for syncThread to stop");
+ if (syncRunner.thread().isAlive()) {
+ System.out.println(tr("Synchronizing. Please be patient."));
+ for(;syncRunner.thread().isAlive();) {
+ try {
+ wait(10);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
}
+ logger.log(logger.MEDIUM, "Sync thread has stopped");
}
if (encryptOnShutdown) {
if (decryptOnShutdown) {
decryptOnShutdown();
}
+ try {
+ Global.getFileManager().purgeResDirectory(false);
+ } catch (InitializationException e) {
+ System.out.println(tr("Empty res directory purge failed"));
+ e.printStackTrace();
+ }
logger.log(logger.HIGH, "Leaving NeverNote.closeEvent");
}
+
+ private void closeNeverNote() {
+ closeAction = true;
+ close();
+ }
public void setMessage(String s) {
- logger.log(logger.HIGH, "Entering NeverNote.setMessage");
- logger.log(logger.HIGH, "Message: " +s);
- statusBar.showMessage(s);
- emitLog.add(s);
- logger.log(logger.HIGH, "Leaving NeverNote.setMessage");
+ if (logger != null)
+ logger.log(logger.HIGH, "Entering NeverNote.setMessage");
+ else
+ System.out.println("*** ERROR *** " +s);
+
+ if (statusBar != null) {
+ statusBar.show();
+ if (logger != null)
+ logger.log(logger.HIGH, "Message: " +s);
+ statusBar.showMessage(s);
+ if (emitLog != null)
+ emitLog.add(s);
+
+ if (messageTimer != null) {
+ messageTimer.stop();
+ messageTimer.setSingleShot(true);
+ messageTimer.start();
+ }
+ }
+
+ if (logger != null)
+ logger.log(logger.HIGH, "Leaving NeverNote.setMessage");
+ }
+
+ private void clearMessage() {
+ statusBar.clearMessage();
+ statusBar.hide();
}
private void waitCursor(boolean wait) {
QApplication.setOverrideCursor(new QCursor(Qt.CursorShape.WaitCursor));
}
else {
- while (QApplication.overrideCursor() != null)
+ if (QApplication.overrideCursor() != null)
QApplication.restoreOverrideCursor();
+ else
+ QApplication.setOverrideCursor(new QCursor(Qt.CursorShape.ArrowCursor));
}
+ listManager.refreshCounters();
}
private void setupIndexListeners() {
- indexRunner.noteSignal.noteIndexed.connect(this, "indexThreadComplete(String)");
- indexRunner.resourceSignal.resourceIndexed.connect(this, "indexThreadComplete(String)");
-// indexRunner.threadSignal.indexNeeded.connect(listManager, "setIndexNeeded(String, String, Boolean)");
+// indexRunner.noteSignal.noteIndexed.connect(this, "indexThreadComplete(String)");
+// indexRunner.resourceSignal.resourceIndexed.connect(this, "indexThreadComplete(String)");
+ indexRunner.signal.indexStarted.connect(this, "indexStarted()");
+ indexRunner.signal.indexFinished.connect(this, "indexComplete()");
}
private void setupSyncSignalListeners() {
syncRunner.tagSignal.listChanged.connect(this, "tagIndexUpdated()");
syncRunner.noteSignal.noteChanged.connect(this, "invalidateNoteCache(String, String)");
syncRunner.resourceSignal.resourceGuidChanged.connect(this, "noteResourceGuidChanged(String,String,String)");
syncRunner.noteSignal.noteDownloaded.connect(listManager, "noteDownloaded(Note)");
+ syncRunner.noteSignal.notebookChanged.connect(this, "updateNoteNotebook(String, String)");
syncRunner.syncSignal.refreshLists.connect(this, "refreshLists()");
}
browser.noteSignal.geoChanged.connect(listManager, "updateNoteGeoTag(String, Double,Double,Double)");
browser.noteSignal.geoChanged.connect(this, "setNoteDirty()");
browser.noteSignal.sourceUrlChanged.connect(listManager, "updateNoteSourceUrl(String, String)");
+ browser.blockApplication.connect(this, "blockApplication(BrowserWindow)");
+ browser.unblockApplication.connect(this, "unblockApplication()");
if (master) browser.focusLost.connect(this, "saveNote()");
browser.resourceSignal.contentChanged.connect(this, "externalFileEdited(String)");
+ browser.evernoteLinkClicked.connect(this, "evernoteLinkClick(String, String)");
}
+ //**************************************************
+ //* Setup shortcuts
+ //**************************************************
+ private void setupShortcut(QShortcut action, String text) {
+ if (!Global.shortcutKeys.containsAction(text))
+ return;
+ action.setKey(new QKeySequence(Global.shortcutKeys.getShortcut(text)));
+ }
+
//***************************************************************
//***************************************************************
//* Settings and look & feel
@SuppressWarnings("unused")
private void settings() {
logger.log(logger.HIGH, "Entering NeverNote.settings");
+
saveNoteColumnPositions();
saveNoteIndexWidth();
showColumns();
- ConfigDialog settings = new ConfigDialog(this);
+ ConfigDialog settings = new ConfigDialog(this, conn);
String dateFormat = Global.getDateFormat();
String timeFormat = Global.getTimeFormat();
indexTimer.start(indexTime); // reset indexing timer
settings.exec();
- if (Global.showTrayIcon())
+ indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally();
+// indexRunner.indexNoteBody = Global.indexNoteBody();
+// indexRunner.indexNoteTitle = Global.indexNoteTitle();
+// indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
+ indexRunner.indexImageRecognition = Global.indexImageRecognition();
+ if (Global.showTrayIcon() || Global.minimizeOnClose())
trayIcon.show();
else
trayIcon.hide();
showColumns();
- if (menuBar.showEditorBar.isChecked())
- showEditorButtons(browserWindow);
+ if (menuBar.showEditorBar.isChecked()){
+ for(int i = 0; i < tabBrowser.count(); i++){
+ BrowserWindow browser = ((TabBrowse) tabBrowser.widget(i)).getBrowserWindow();
+ showEditorButtons(browser);
+ }
+
+ }
// Reset the save timer
if (Global.getAutoSaveInterval() > 0)
else
saveTimer.stop();
- // This is a hack to force a reload of the index in case the date or time changed.
-// if (!dateFormat.equals(Global.getDateFormat()) ||
-// !timeFormat.equals(Global.getTimeFormat())) {
- noteCache.clear();
- readOnlyCache.clear();
- noteIndexUpdated(true);
-// }
+ // Set special reloads
+ if (settings.getDebugPage().reloadSharedNotebooksClicked()) {
+ conn.executeSql("Delete from LinkedNotebook");
+ conn.executeSql("delete from SharedNotebook");
+ conn.executeSql("Delete from Notebook where linked=true");
+ conn.executeSql("Insert into Sync (key, value) values ('FullLinkedNotebookSync', 'true')");
+ conn.executeSql("Insert into Sync (key, value) values ('FullSharedNotebookSync', 'true')");
+ }
+
+ // Reload user data
+ noteCache.clear();
+ readOnlyCache.clear();
+ inkNoteCache.clear();
+ noteIndexUpdated(true);
+
logger.log(logger.HIGH, "Leaving NeverNote.settings");
}
// Restore things to the way they were
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");
+ leftSplitter1.setObjectName("leftSplitter1");
+ rensoNoteListDock.setObjectName("rensoNoteListDock");
// Restore the actual positions.
if (mainWindow)
mainLeftRightSplitter.restoreState(Global.restoreState(mainLeftRightSplitter.objectName()));
browserIndexSplitter.restoreState(Global.restoreState(browserIndexSplitter.objectName()));
leftSplitter1.restoreState(Global.restoreState(leftSplitter1.objectName()));
+ rensoNoteListDock.restoreGeometry(Global.restoreGeometry(rensoNoteListDock.objectName()));
}
// Save window positions for the next start
Global.saveState(mainLeftRightSplitter.objectName(), mainLeftRightSplitter.saveState());
Global.saveState(browserIndexSplitter.objectName(), browserIndexSplitter.saveState());
Global.saveState(leftSplitter1.objectName(), leftSplitter1.saveState());
+ Global.saveState(objectName(), saveState());
+ Global.saveGeometry(rensoNoteListDock.objectName(), rensoNoteListDock.saveGeometry());
}
// Load the style sheet
private void loadStyleSheet() {
- String fileName = Global.getFileManager().getQssDirPath("default.qss");
+ String styleSheetName = "default.qss";
+ if (Global.getStyle().equalsIgnoreCase("cleanlooks"))
+ styleSheetName = "default-cleanlooks.qss";
+ String fileName = Global.getFileManager().getQssDirPathUser("default.qss");
QFile file = new QFile(fileName);
+
+ // If a user default.qss doesn't exist, we use the one shipped with NeverNote
+ if (!file.exists()) {
+ fileName = Global.getFileManager().getQssDirPath(styleSheetName);
+ file = new QFile(fileName);
+ }
file.open(OpenModeFlag.ReadOnly);
String styleSheet = file.readAll().toString();
file.close();
Global.setColumnPosition("noteTableGuidPosition", position);
position = noteTableView.header.visualIndex(Global.noteTableThumbnailPosition);
Global.setColumnPosition("noteTableThumbnailPosition", position);
+ position = noteTableView.header.visualIndex(Global.noteTablePinnedPosition);
+ Global.setColumnPosition("noteTablePinnedPosition", position);
}
// Save column widths for the next time
Global.setColumnWidth("noteTableThumbnailPosition", width);
width = noteTableView.getColumnWidth(Global.noteTableGuidPosition);
Global.setColumnWidth("noteTableGuidPosition", width);
+ width = noteTableView.getColumnWidth(Global.noteTablePinnedPosition);
+ Global.setColumnWidth("noteTablePinnedPosition", width);
}
+ @SuppressWarnings("unused")
+ private void toggleSearchWindow() {
+ logger.log(logger.HIGH, "Entering NeverNote.toggleSearchWindow");
+ searchLayout.toggleSearchField();
+ menuBar.hideSearch.setChecked(searchField.isVisible());
+ Global.saveWindowVisible("searchField", searchField.isVisible());
+ logger.log(logger.HIGH, "Leaving NeverNote.toggleSearchWindow");
+ }
+ @SuppressWarnings("unused")
+ private void toggleQuotaWindow() {
+ logger.log(logger.HIGH, "Entering NeverNote.toggleQuotaWindow");
+ searchLayout.toggleQuotaBar();
+ menuBar.hideQuota.setChecked(quotaBar.isVisible());
+ Global.saveWindowVisible("quota", quotaBar.isVisible());
+ logger.log(logger.HIGH, "Leaving NeverNote.toggleQuotaWindow");
+ }
+ @SuppressWarnings("unused")
+ private void toggleZoomWindow() {
+ logger.log(logger.HIGH, "Entering NeverNote.toggleZoomWindow");
+ searchLayout.toggleZoom();
+ menuBar.hideZoom.setChecked(zoomSpinner.isVisible());
+ Global.saveWindowVisible("zoom", zoomSpinner.isVisible());
+ logger.log(logger.HIGH, "Leaving NeverNote.toggleZoomWindow");
+ }
+
+
//***************************************************************
//***************************************************************
// Setup the tree containing the user's notebooks.
private void initializeNotebookTree() {
logger.log(logger.HIGH, "Entering NeverNote.initializeNotebookTree");
- notebookTree.itemClicked.connect(this, "notebookTreeSelection()");
+// notebookTree.itemClicked.connect(this, "notebookTreeSelection()");
+ notebookTree.selectionSignal.connect(this, "notebookTreeSelection()");
listManager.notebookSignal.refreshNotebookTreeCounts.connect(notebookTree, "updateCounts(List, List)");
logger.log(logger.HIGH, "Leaving NeverNote.initializeNotebookTree");
}
// Listener when a notebook is selected
private void notebookTreeSelection() {
logger.log(logger.HIGH, "Entering NeverNote.notebookTreeSelection");
-
+ noteTableView.proxyModel.blocked = true;
+
clearTrashFilter();
clearAttributeFilter();
clearSavedSearchFilter();
if (Global.mimicEvernoteInterface) {
clearTagFilter();
- searchField.clear();
+ //searchField.clear();
+ searchField.clearEditText();
}
menuBar.noteRestoreAction.setVisible(false);
menuBar.notebookEditAction.setEnabled(true);
menuBar.notebookShareAction.setEnabled(true);
menuBar.notebookIconAction.setEnabled(true);
menuBar.notebookStackAction.setEnabled(true);
+
+ // ゴミ箱から元の画面に戻す。連想ノートリストをONに。
+ if (!rensoNoteListDock.isEnabled()) {
+ rensoNoteListDock.setEnabled(true);
+ }
+
List<QTreeWidgetItem> selections = notebookTree.selectedItems();
- QTreeWidgetItem currentSelection;
selectedNotebookGUIDs.clear();
- if (!Global.mimicEvernoteInterface) {
- for (int i=0; i<selections.size(); i++) {
- currentSelection = selections.get(i);
- if (!currentSelection.text(2).equals("STACK"))
- selectedNotebookGUIDs.add(currentSelection.text(2));
- else {
- String stackName = currentSelection.text(0);
- for (int j=0; j<listManager.getNotebookIndex().size(); j++) {
- Notebook book = listManager.getNotebookIndex().get(j);
- if (book.getStack()!=null && book.getStack().equalsIgnoreCase(stackName))
- selectedNotebookGUIDs.add(book.getGuid());
- }
- }
- }
-
-
- // There is the potential for no notebooks to be selected if this
- // happens then we make it look like all notebooks were selecetd.
- // If that happens, just select the "all notebooks"
- selections = notebookTree.selectedItems();
- if (selections.size()==0) {
- selectedNotebookGUIDs.clear();
- menuBar.notebookEditAction.setEnabled(false);
- menuBar.notebookDeleteAction.setEnabled(false);
- menuBar.notebookIconAction.setEnabled(false);
- menuBar.notebookStackAction.setEnabled(false);
- }
- if (selectedNotebookGUIDs.size() == 1 && selectedNotebookGUIDs.get(0).equals(previousSelectedNotebook)) {
- previousSelectedNotebook = selectedNotebookGUIDs.get(0);
- previousSelectedNotebook = "";
- notebookTree.clearSelection();
- notebookTreeSelection();
- return;
- }
- if (selectedNotebookGUIDs.size() == 1)
- previousSelectedNotebook = selectedNotebookGUIDs.get(0);
- if (selectedNotebookGUIDs.size() > 1)
- previousSelectedNotebook = "";
+ String guid = "";
+ String stackName = "";
+ if (selections.size() > 0) {
+ guid = (selections.get(0).text(2));
+ stackName = selections.get(0).text(0);
+ }
+ if (!Global.mimicEvernoteInterface) {
+ // If no notebooks are selected, we make it look like the "all notebooks" one was selected
+ if (selections.size()==0) {
+ selectedNotebookGUIDs.clear();
+ for (int i=0; i < listManager.getNotebookIndex().size(); i++) {
+ selectedNotebookGUIDs.add(listManager.getNotebookIndex().get(i).getGuid());
+ }
+ menuBar.notebookEditAction.setEnabled(false);
+ menuBar.notebookDeleteAction.setEnabled(false);
+ menuBar.notebookStackAction.setEnabled(false);
+ menuBar.notebookIconAction.setEnabled(false);
+ }
+ }
+ if (!guid.equals("") && !guid.equals("STACK")) {
+ selectedNotebookGUIDs.add(guid);
+ menuBar.notebookIconAction.setEnabled(true);
} else {
- String guid = "";
- String stackName = "";
- if (selections.size() > 0) {
- guid = (selections.get(0).text(2));
- stackName = selections.get(0).text(0);
- }
- if (!guid.equals("") && !guid.equals("STACK")) {
- selectedNotebookGUIDs.add(guid);
- menuBar.notebookIconAction.setEnabled(true);
- }
- else {
- menuBar.notebookIconAction.setEnabled(true);
- for (int j=0; j<listManager.getNotebookIndex().size(); j++) {
- Notebook book = listManager.getNotebookIndex().get(j);
- if (book.getStack() != null && book.getStack().equalsIgnoreCase(stackName))
- selectedNotebookGUIDs.add(book.getGuid());
- }
- }
+ menuBar.notebookIconAction.setEnabled(true);
+ for (int j=0; j<listManager.getNotebookIndex().size(); j++) {
+ Notebook book = listManager.getNotebookIndex().get(j);
+ if (book.getStack() != null && book.getStack().equalsIgnoreCase(stackName))
+ selectedNotebookGUIDs.add(book.getGuid());
+ }
}
listManager.setSelectedNotebooks(selectedNotebookGUIDs);
listManager.loadNotesIndex();
noteIndexUpdated(false);
+ refreshEvernoteNote(true);
+ listManager.refreshCounters = true;
+ listManager.refreshCounters();
+ if (selectedNotebookGUIDs.size() == 1) {
+ int col = conn.getNotebookTable().getSortColumn(selectedNotebookGUIDs.get(0));
+ int order = conn.getNotebookTable().getSortOrder(selectedNotebookGUIDs.get(0));
+ if (col != -1) {
+ noteTableView.proxyModel.blocked = true;
+ if (order == 1)
+ noteTableView.sortByColumn(col, Qt.SortOrder.DescendingOrder);
+ else
+ noteTableView.sortByColumn(col, Qt.SortOrder.AscendingOrder);
+ }
+ }
+ noteTableView.proxyModel.blocked = false;
logger.log(logger.HIGH, "Leaving NeverNote.notebookTreeSelection");
}
if (!found)
selectedNotebookGUIDs.remove(i);
}
+ listManager.refreshCounters = true;
+ listManager.refreshCounters();
notebookTree.blockSignals(false);
logger.log(logger.HIGH, "Leaving NeverNote.notebookIndexUpdated");
}
// Show/Hide note information
+ @SuppressWarnings("unused")
private void toggleNotebookWindow() {
logger.log(logger.HIGH, "Entering NeverNote.toggleNotebookWindow");
- if (notebookTree.isVisible())
- notebookTree.hide();
- else
- notebookTree.show();
+ searchLayout.toggleNotebook();
menuBar.hideNotebooks.setChecked(notebookTree.isVisible());
Global.saveWindowVisible("notebookTree", notebookTree.isVisible());
logger.log(logger.HIGH, "Leaving NeverNote.toggleNotebookWindow");
if (guid.equalsIgnoreCase("STACK")) {
conn.getNotebookTable().renameStacks(currentSelection.text(0), edit.getNotebook());
for (int j=0; j<listManager.getNotebookIndex().size(); j++) {
- if (listManager.getNotebookIndex().get(j).getStack().equalsIgnoreCase(currentSelection.text(0)))
+ if (listManager.getNotebookIndex().get(j).getStack() != null &&
+ listManager.getNotebookIndex().get(j).getStack().equalsIgnoreCase(currentSelection.text(0)))
listManager.getNotebookIndex().get(j).setStack(edit.getNotebook());
}
conn.getNotebookTable().renameStacks(currentSelection.text(0), edit.getNotebook());
conn.getNotebookTable().setDefaultNotebook(listManager.getNotebookIndex().get(i).getGuid());
}
conn.getNotebookTable().updateNotebook(listManager.getNotebookIndex().get(i), true);
+ if (conn.getNotebookTable().isLinked(listManager.getNotebookIndex().get(i).getGuid())) {
+ LinkedNotebook linkedNotebook = conn.getLinkedNotebookTable().getByNotebookGuid(listManager.getNotebookIndex().get(i).getGuid());
+ linkedNotebook.setShareName(edit.getNotebook());
+ conn.getLinkedNotebookTable().updateNotebook(linkedNotebook, true);
+ }
i=listManager.getNotebookIndex().size();
}
}
nbooks.add(listManager.getNotebookIndex().get(i));
}
- browserWindow.setNotebookList(nbooks);
+
+ FilterEditorNotebooks notebookFilter = new FilterEditorNotebooks(conn, logger);
+ List<Notebook> filteredBooks = notebookFilter.getValidNotebooks(currentNote, listManager.getNotebookIndex());
+ browserWindow.setNotebookList(filteredBooks);
+ Iterator<String> set = externalWindows.keySet().iterator();
+ while(set.hasNext())
+ externalWindows.get(set.next()).getBrowserWindow().setNotebookList(filteredBooks);
+
+ Iterator<Integer>it = tabWindows.keySet().iterator();
+ while (it.hasNext()) {
+ tabWindows.get(it.next()).getBrowserWindow()
+ .setNotebookList(filteredBooks);
+ }
+
logger.log(logger.HIGH, "Leaving NeverNote.editNotebook");
}
// Publish a notebook
}
}
- notebookTreeSelection();
- notebookTree.load(listManager.getNotebookIndex(), listManager.getLocalNotebooks());
- listManager.countNotebookResults(listManager.getNoteIndex());
+ notebookIndexUpdated();
+// notebookTreeSelection();
+// notebookTree.load(listManager.getNotebookIndex(), listManager.getLocalNotebooks());
+// listManager.countNotebookResults(listManager.getNoteIndex());
logger.log(logger.HIGH, "Entering NeverNote.deleteNotebook");
}
// A note's notebook has been updated
@SuppressWarnings("unused")
private void updateNoteNotebook(String guid, String notebookGuid) {
+ // 同じノートブックに入れられたノート間の履歴を登録
+ conn.getHistoryTable().addSameNotebookHistory(guid, notebookGuid);
// Update the list manager
listManager.updateNoteNotebook(guid, notebookGuid);
listManager.loadNotesIndex();
notebookIndexUpdated();
noteIndexUpdated(false);
+ reloadTagTree(true);
// noteIndexUpdated(false);
// Build a list of non-closed notebooks
if (!found)
nbooks.add(listManager.getNotebookIndex().get(i));
}
+
+ FilterEditorNotebooks notebookFilter = new FilterEditorNotebooks(conn, logger);
+ List<Notebook> filteredBooks = notebookFilter.getValidNotebooks(currentNote, listManager.getNotebookIndex());
+ browserWindow.setNotebookList(filteredBooks);
+
+ // Update any external windows
+ Iterator<String> set = externalWindows.keySet().iterator();
+ while(set.hasNext())
+ externalWindows.get(set.next()).getBrowserWindow().setNotebookList(filteredBooks);
+
+ // 全てのタブウィンドウを更新
+ Iterator<Integer> it = tabWindows.keySet().iterator();
+ while (it.hasNext()) {
+ tabWindows.get(it.next()).getBrowserWindow()
+ .setNotebookList(filteredBooks);
+ }
+
waitCursor(false);
- browserWindow.setNotebookList(nbooks);
}
// Change the notebook's icon
@SuppressWarnings("unused")
if (!stackSelected && !allNotebookSelected) {
icon = conn.getNotebookTable().getIcon(guid);
if (icon == null) {
- dialog = new SetIcon(currentIcon);
+ dialog = new SetIcon(currentIcon, saveLastPath);
dialog.setUseDefaultIcon(true);
} else {
- dialog = new SetIcon(icon);
+ dialog = new SetIcon(icon, saveLastPath);
dialog.setUseDefaultIcon(false);
}
} else {
icon = conn.getSystemIconTable().getIcon(currentSelection.text(0), "ALLNOTEBOOK");
}
if (icon == null) {
- dialog = new SetIcon(currentIcon);
+ dialog = new SetIcon(currentIcon, saveLastPath);
dialog.setUseDefaultIcon(true);
} else {
- dialog = new SetIcon(icon);
+ dialog = new SetIcon(icon, saveLastPath);
dialog.setUseDefaultIcon(false);
}
}
dialog.exec();
if (dialog.okPressed()) {
+ saveLastPath = dialog.getPath();
+
QIcon newIcon = dialog.getIcon();
if (stackSelected) {
conn.getSystemIconTable().setIcon(currentSelection.text(0), "STACK", newIcon, dialog.getFileType());
logger.log(logger.HIGH, "Inside NeverNote.addTag");
TagEdit edit = new TagEdit();
edit.setTagList(listManager.getTagIndex());
+
+ List<QTreeWidgetItem> selections = tagTree.selectedItems();
+ QTreeWidgetItem currentSelection = null;
+ if (selections.size() > 0) {
+ currentSelection = selections.get(0);
+ edit.setParentTag(currentSelection.text(0));
+ }
+
edit.exec();
if (!edit.okPressed())
newTag.setUpdateSequenceNum(0);
newTag.setGuid(randint);
newTag.setName(edit.getTag());
+ if (edit.getParentTag().isChecked()) {
+ newTag.setParentGuid(currentSelection.text(2));
+ newTag.setParentGuidIsSet(true);
+ currentSelection.setExpanded(true);
+ }
conn.getTagTable().addTag(newTag, true);
listManager.getTagIndex().add(newTag);
reloadTagTree(true);
logger.log(logger.HIGH, "Entering NeverNote.reloadTagTree");
tagIndexUpdated(reload);
boolean filter = false;
- listManager.countTagResults(listManager.getNoteIndex());
+ if (reload)
+ listManager.countTagResults(listManager.getNoteIndex());
if (notebookTree.selectedItems().size() > 0
&& !notebookTree.selectedItems().get(0).text(0).equalsIgnoreCase("All Notebooks"))
filter = true;
if (tagTree.selectedItems().size() > 0)
filter = true;
tagTree.showAllTags(!filter);
+ tagIndexUpdated(false);
logger.log(logger.HIGH, "Leaving NeverNote.reloadTagTree");
}
// Edit an existing tag
if (currentNote != null && currentNote.getTagGuids().contains(guid))
browserWindow.setTag(getTagNamesForNote(currentNote));
logger.log(logger.HIGH, "Leaving NeverNote.editTag");
- return;
+ //return;
}
}
+ listManager.reloadNoteTagNames(guid, edit.getTag());
+ noteIndexUpdated(true);
+ refreshEvernoteNote(true);
browserWindow.setTag(getTagNamesForNote(currentNote));
logger.log(logger.HIGH, "Leaving NeverNote.editTag...");
}
private void initializeTagTree() {
logger.log(logger.HIGH, "Entering NeverNote.initializeTagTree");
// tagTree.itemSelectionChanged.connect(this, "tagTreeSelection()");
- tagTree.itemClicked.connect(this, "tagTreeSelection()");
+// tagTree.itemClicked.connect(this, "tagTreeSelection()");
+ tagTree.selectionSignal.connect(this, "tagTreeSelection()");
listManager.tagSignal.refreshTagTreeCounts.connect(tagTree, "updateCounts(List)");
logger.log(logger.HIGH, "Leaving NeverNote.initializeTagTree");
}
menuBar.noteRestoreAction.setVisible(false);
+ // ゴミ箱から元の画面に戻す。連想ノートリストをONに。
+ if (!rensoNoteListDock.isEnabled()) {
+ rensoNoteListDock.setEnabled(true);
+ }
+
List<QTreeWidgetItem> selections = tagTree.selectedItems();
QTreeWidgetItem currentSelection;
selectedTagGUIDs.clear();
menuBar.tagDeleteAction.setEnabled(false);
menuBar.tagIconAction.setEnabled(true);
}
- if (selectedTagGUIDs.size() == 1 && selectedTagGUIDs.get(0).equals(previousSelectedTag)) {
- previousSelectedTag = selectedTagGUIDs.get(0);
- previousSelectedTag = "";
- tagTree.clearSelection();
- tagTreeSelection();
- return;
- }
- if (selectedTagGUIDs.size() == 1)
- previousSelectedTag = selectedTagGUIDs.get(0);
- if (selectedTagGUIDs.size() > 1)
- previousSelectedTag = "";
+ if (selections.size() > 1)
+ menuBar.tagMergeAction.setEnabled(true);
+ else
+ menuBar.tagMergeAction.setEnabled(false);
listManager.setSelectedTags(selectedTagGUIDs);
listManager.loadNotesIndex();
noteIndexUpdated(false);
+ refreshEvernoteNote(true);
+ listManager.refreshCounters = true;
+ listManager.refreshCounters();
logger.log(logger.HIGH, "Leaving NeverNote.tagTreeSelection");
}
// trigger the tag index to be refreshed
logger.log(logger.HIGH, "Entering NeverNote.tagIndexUpdated");
if (selectedTagGUIDs == null)
selectedTagGUIDs = new ArrayList<String>();
-// selectedTagGUIDs.clear(); // clear out old entries
+ if (reload)
+ listManager.reloadTagIndex();
tagTree.blockSignals(true);
if (reload) {
tagTree.setIcons(conn.getTagTable().getAllIcons());
tagTree.load(listManager.getTagIndex());
}
+
for (int i=selectedTagGUIDs.size()-1; i>=0; i--) {
boolean found = tagTree.selectGuid(selectedTagGUIDs.get(i));
if (!found)
logger.log(logger.HIGH, "Leaving NeverNote.tagIndexUpdated");
}
// Show/Hide note information
+ @SuppressWarnings("unused")
private void toggleTagWindow() {
logger.log(logger.HIGH, "Entering NeverNote.toggleTagWindow");
if (tagTree.isVisible())
newTags.add(tags.get(i));
}
- listManager.saveNoteTags(guid, tags);
+ listManager.saveNoteTags(guid, tags, true);
listManager.countTagResults(listManager.getNoteIndex());
StringBuffer names = new StringBuffer("");
for (int i=0; i<tags.size(); i++) {
}
}
browserWindow.setTag(names.toString());
- noteDirty = true;
+
+ for (TabBrowse tab: tabWindows.values()) {
+ if (tab.getBrowserWindow().getNote().getGuid().equals(guid)) {
+ int index = tabBrowser.indexOf(tab);
+ noteDirty.put(index, true);
+ break;
+ }
+ }
// Now, we need to add any new tags to the tag tree
for (int i=0; i<newTags.size(); i++)
tagTree.clearSelection();
menuBar.noteRestoreAction.setVisible(false);
menuBar.tagEditAction.setEnabled(false);
+ menuBar.tagMergeAction.setEnabled(false);
menuBar.tagDeleteAction.setEnabled(false);
menuBar.tagIconAction.setEnabled(false);
selectedTagGUIDs.clear();
QIcon icon = conn.getTagTable().getIcon(guid);
SetIcon dialog;
if (icon == null) {
- dialog = new SetIcon(currentIcon);
+ dialog = new SetIcon(currentIcon, saveLastPath);
dialog.setUseDefaultIcon(true);
} else {
- dialog = new SetIcon(icon);
+ dialog = new SetIcon(icon, saveLastPath);
dialog.setUseDefaultIcon(false);
}
dialog.exec();
if (dialog.okPressed()) {
+ saveLastPath = dialog.getPath();
QIcon newIcon = dialog.getIcon();
conn.getTagTable().setIcon(guid, newIcon, dialog.getFileType());
if (newIcon == null)
}
}
+ // Merge tags
+ @SuppressWarnings("unused")
+ private void mergeTags() {
+ List<Tag> tags = new ArrayList<Tag>();
+ List<QTreeWidgetItem> selections = tagTree.selectedItems();
+ for (int i=0; i<selections.size(); i++) {
+ Tag record = new Tag();
+ record.setGuid(selections.get(i).text(2));
+ record.setName(selections.get(i).text(0));
+ tags.add(record);
+ }
+ TagMerge mergeDialog = new TagMerge(tags);
+ mergeDialog.exec();
+ if (!mergeDialog.okClicked())
+ return;
+ String newGuid = mergeDialog.getNewTagGuid();
+
+ for (int i=0; i<tags.size(); i++) {
+ if (!tags.get(i).getGuid().equals(newGuid)) {
+ List<String> noteGuids = conn.getNoteTable().noteTagsTable.getTagNotes(tags.get(i).getGuid());
+ for (int j=0; j<noteGuids.size(); j++) {
+ String noteGuid = noteGuids.get(j);
+ conn.getNoteTable().noteTagsTable.deleteNoteTag(noteGuid);
+ if (!conn.getNoteTable().noteTagsTable.checkNoteNoteTags(noteGuid, newGuid))
+ conn.getNoteTable().noteTagsTable.saveNoteTag(noteGuid, newGuid, true);
+ }
+ }
+ }
+ listManager.reloadIndexes();
+ }
//***************************************************************
//***************************************************************
private void deleteSavedSearch() {
logger.log(logger.HIGH, "Entering NeverNote.deleteSavedSearch");
- if (QMessageBox.question(this, "Confirmation", "Delete the selected search?",
+ if (QMessageBox.question(this, tr("Confirmation"), tr("Delete the selected search?"),
QMessageBox.StandardButton.Yes,
QMessageBox.StandardButton.No)==StandardButton.No.value()) {
return;
menuBar.savedSearchEditAction.setEnabled(true);
menuBar.savedSearchDeleteAction.setEnabled(true);
menuBar.savedSearchIconAction.setEnabled(true);
+
+ // ゴミ箱から元の画面に戻す。連想ノートリストをONに。
+ if (!rensoNoteListDock.isEnabled()) {
+ rensoNoteListDock.setEnabled(true);
+ }
+
List<QTreeWidgetItem> selections = savedSearchTree.selectedItems();
QTreeWidgetItem currentSelection;
selectedSavedSearchGUID = "";
}
// Show/Hide note information
+ @SuppressWarnings("unused")
private void toggleSavedSearchWindow() {
logger.log(logger.HIGH, "Entering NeverNote.toggleSavedSearchWindow");
if (savedSearchTree.isVisible())
QIcon icon = conn.getSavedSearchTable().getIcon(guid);
SetIcon dialog;
if (icon == null) {
- dialog = new SetIcon(currentIcon);
+ dialog = new SetIcon(currentIcon, saveLastPath);
dialog.setUseDefaultIcon(true);
} else {
- dialog = new SetIcon(icon);
+ dialog = new SetIcon(icon, saveLastPath);
dialog.setUseDefaultIcon(false);
}
dialog.exec();
if (dialog.okPressed()) {
+ saveLastPath = dialog.getPath();
QIcon newIcon = dialog.getIcon();
conn.getSavedSearchTable().setIcon(guid, newIcon, dialog.getFileType());
if (newIcon == null)
@SuppressWarnings("unused")
private void databaseStatus() {
waitCursor(true);
+ indexRunner.interrupt = true;
int dirty = conn.getNoteTable().getDirtyCount();
int unindexed = conn.getNoteTable().getUnindexedCount();
DatabaseStatus status = new DatabaseStatus();
status.setUnindexed(unindexed);
status.setNoteCount(conn.getNoteTable().getNoteCount());
status.setNotebookCount(listManager.getNotebookIndex().size());
+ status.setUnindexedResourceCount(conn.getNoteTable().noteResourceTable.getUnindexedCount());
status.setSavedSearchCount(listManager.getSavedSearchIndex().size());
status.setTagCount(listManager.getTagIndex().size());
status.setResourceCount(conn.getNoteTable().noteResourceTable.getResourceCount());
status.setWordCount(conn.getWordsTable().getWordCount());
+ status.setHistoryCount(conn.getHistoryTable().getHistoryCount());
+ status.setRensoClickCount(conn.getHistoryTable().getRensoClickCount());
waitCursor(false);
status.exec();
}
logger.log(logger.HIGH, "Entering NeverNote.compactDatabase");
if (QMessageBox.question(this, tr("Confirmation"), tr("This will free unused space in the database, "+
"but please be aware that depending upon the size of your database this can be time consuming " +
- "and NeverNote will be unresponsive until it is complete. Do you wish to continue?"),
+ "and NeighborNote will be unresponsive until it is complete. Do you wish to continue?"),
QMessageBox.StandardButton.Yes,
QMessageBox.StandardButton.No)==StandardButton.No.value() && Global.verifyDelete() == true) {
return;
QTextEdit textBox = new QTextEdit();
layout.addWidget(textBox);
textBox.setReadOnly(true);
- QFile file = new QFile(Global.getFileManager().getHomeDirPath("release.txt"));
+ QFile file = new QFile(Global.getFileManager().getProgramDirPath("release.txt"));
if (!file.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.ReadOnly,
QIODevice.OpenModeFlag.Text)))
return;
- textBox.setText(file.readAll().toString());
+ // 日本語文字化け対策
+ QTextCodec codec = QTextCodec.codecForName("UTF-8");
+ QTextStream textStream = new QTextStream(file);
+ textStream.setCodec(codec);
+ textBox.setText(textStream.readAll().toString());
+
file.close();
dialog.setWindowTitle(tr("Release Notes"));
dialog.setLayout(layout);
@SuppressWarnings("unused")
private void logger() {
logger.log(logger.HIGH, "Entering NeverNote.logger");
- QDialog dialog = new QDialog(this);
- QHBoxLayout layout = new QHBoxLayout();
- QListWidget textBox = new QListWidget();
- layout.addWidget(textBox);
- textBox.addItems(emitLog);
-
- dialog.setLayout(layout);
- dialog.setWindowTitle(tr("Mesasge Log"));
- dialog.show();
+ LogFileDialog dialog = new LogFileDialog(emitLog);
+ dialog.exec();
logger.log(logger.HIGH, "Leaving NeverNote.logger");
}
// Menu option "help/about" was selected
private void about() {
logger.log(logger.HIGH, "Entering NeverNote.about");
QMessageBox.about(this,
- tr("About NeverNote"),
- tr("<h4><center><b>NeverNote</b></center></h4><hr><center>Version ")
- +Global.version
- +tr("<hr></center>Evernote"
- +"An Open Source Evernote Client.<br><br>"
+ tr("About NeighborNote"),
+ tr("<h4><center><b>NeighborNote</b></center></h4><hr><center>Version ")
+ +Global.version + "(based on NixNote 1.6)"
+ //+"1.2.120724"
+ +tr("<hr>"
+ +"Open Source Evernote Client.<br><br>"
+"Licensed under GPL v2. <br><hr><br>"
- +"Evernote is copyright 2001-2010 by Evernote Corporation<br>"
+ +"</center>Evernote is copyright 2001-2012 by Evernote Corporation<br>"
+"Jambi and QT are the licensed trademark of Nokia Corporation<br>"
+"PDFRenderer is licened under the LGPL<br>"
+"JTidy is copyrighted under the World Wide Web Consortium<br>"
+"Apache Common Utilities licensed under the Apache License Version 2.0<br>"
+"Jazzy is licened under the LGPL<br>"
- +"Java is a registered trademark of Oracle Corporation.<br><hr>"));
+ +"Java is a registered trademark of Oracle Corporation.<br><hr>"
+ +"Special thanks to:<br>BitRock InstallBuilder for the Windows installer"
+ +"<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering."));
logger.log(logger.HIGH, "Leaving NeverNote.about");
}
// Hide the entire left hand side
hidden = !menuBar.hideLeftSide.isChecked();
menuBar.hideLeftSide.setChecked(!hidden);
- if (notebookTree.isVisible() != hidden)
- toggleNotebookWindow();
- if (savedSearchTree.isVisible() != hidden)
- toggleSavedSearchWindow();
- if (tagTree.isVisible() != hidden)
- toggleTagWindow();
- if (attributeTree.isVisible() != hidden)
- toggleAttributesWindow();
- if (trashTree.isVisible() != hidden)
- toggleTrashWindow();
+ if (!hidden)
+ leftSplitter1.setHidden(true);
+ else
+ leftSplitter1.setHidden(false);
Global.saveWindowVisible("leftPanel", hidden);
}
+ public void checkForUpdates() {
+ // Send off thread to check for a new version
+ versionChecker = new QNetworkAccessManager(this);
+ versionChecker.finished.connect(this, "upgradeFileRead(QNetworkReply)");
+ QNetworkRequest request = new QNetworkRequest();
+ request.setUrl(new QUrl(Global.getUpdatesAvailableUrl()));
+ versionChecker.get(request);
+ }
+ @SuppressWarnings("unused")
+ private void upgradeFileRead(QNetworkReply reply) {
+ if (!reply.isReadable())
+ return;
+
+ String winVersion = Global.version;
+ String osxVersion = Global.version;
+ String linuxVersion = Global.version;
+ String linux64Version = Global.version;
+ String version = Global.version;
+
+ // Determine the versions available
+ QByteArray data = reply.readLine();
+ while (data != null && !reply.atEnd()) {
+ String line = data.toString();
+ String lineVersion;
+ if (line.contains(":"))
+ lineVersion = line.substring(line.indexOf(":")+1).replace(" ", "").replace("\n", "");
+ else
+ lineVersion = "";
+ if (line.toLowerCase().contains("windows"))
+ winVersion = lineVersion;
+ else if (line.toLowerCase().contains("os-x"))
+ osxVersion = lineVersion;
+ else if (line.toLowerCase().contains("linux amd64"))
+ linux64Version = lineVersion;
+ else if (line.toLowerCase().contains("linux i386"))
+ linuxVersion = lineVersion;
+ else if (line.toLowerCase().contains("default"))
+ version = lineVersion;
-
- //***************************************************************
- //***************************************************************
- //** These functions deal with the Toolbar
- //***************************************************************
- //***************************************************************
- // Text in the search bar has been cleared
- private void searchFieldCleared() {
- saveNote();
+ // Read the next line
+ data = reply.readLine();
+ }
+
+ // Now we need to determine what system we are on.
+ if (System.getProperty("os.name").toLowerCase().contains("windows"))
+ version = winVersion;
+ if (System.getProperty("os.name").toLowerCase().contains("mac os"))
+ version = osxVersion;
+ if (System.getProperty("os.name").toLowerCase().contains("Linux")) {
+ if (System.getProperty("os.arch").contains("amd64") ||
+ System.getProperty("os.arch").contains("x86_64"))
+ version = linux64Version;
+ else
+ version = linuxVersion;
+ }
+
+
+ for (String validVersion : Global.validVersions) {
+ if (version.equals(validVersion))
+ return;
+ }
+
+ UpgradeAvailableDialog dialog = new UpgradeAvailableDialog();
+ dialog.exec();
+ if (dialog.remindMe())
+ Global.setCheckVersionUpgrade(true);
+ else
+ Global.setCheckVersionUpgrade(false);
+ }
+
+
+ //***************************************************************
+ //***************************************************************
+ //** These functions deal with the Toolbar
+ //***************************************************************
+ //***************************************************************
+ @SuppressWarnings("unused")
+ private void focusSearch() {
+ searchField.setFocus();
+ }
+
+ // Text in the search bar has been cleared
+ private void searchFieldCleared() {
+ saveNote();
// This is done because we want to force a reload of
// images. Some images we may want to highlight the text.
readOnlyCache.clear();
+ inkNoteCache.clear();
noteCache.clear();
QWebSettings.setMaximumPagesInCache(0);
QWebSettings.setObjectCacheCapacities(0, 0, 0);
searchField.setEditText("");
saveNoteColumnPositions();
saveNoteIndexWidth();
- loadNoteBrowserInformation(browserWindow);
+ noteIndexUpdated(true);
+ if (currentNote == null && listManager.getNoteIndex().size() > 0) {
+ currentNote = listManager.getNoteIndex().get(0);
+ currentNoteGuid = currentNote.getGuid();
+ }
+ refreshEvernoteNote(true);
+ if (currentNote != null)
+ loadNoteBrowserInformation(browserWindow, currentNoteGuid, currentNote);
}
// text in the search bar changed. We only use this to tell if it was cleared,
// otherwise we trigger off searchFieldChanged.
@SuppressWarnings("unused")
private void searchFieldTextChanged(String text) {
+ QWebSettings.setMaximumPagesInCache(0);
+ QWebSettings.setObjectCacheCapacities(0, 0, 0);
+
if (text.trim().equals("")) {
searchFieldCleared();
if (searchPerformed) {
// images. Some images we may want to highlight the text.
noteCache.clear();
readOnlyCache.clear();
- QWebSettings.setMaximumPagesInCache(0);
- QWebSettings.setObjectCacheCapacities(0, 0, 0);
+ inkNoteCache.clear();
listManager.setEnSearch("");
listManager.loadNotesIndex();
refreshEvernoteNote(true);
noteIndexUpdated(false);
+ refreshEvernoteNote(true);
}
searchPerformed = false;
}
logger.log(logger.HIGH, "Entering NeverNote.searchFieldChanged");
noteCache.clear();
readOnlyCache.clear();
+ inkNoteCache.clear();
saveNoteColumnPositions();
saveNoteIndexWidth();
String text = searchField.currentText();
listManager.setEnSearch(text.trim());
listManager.loadNotesIndex();
-//--->>> noteIndexUpdated(true);
noteIndexUpdated(false);
+
refreshEvernoteNote(true);
searchPerformed = true;
+ waitCursor(false);
logger.log(logger.HIGH, "Leaving NeverNote.searchFieldChanged");
}
private void setupToolBar() {
logger.log(logger.HIGH, "Entering NeverNote.setupToolBar");
toolBar = addToolBar(tr("Tool Bar"));
+ toolBar.setObjectName("toolBar");
+ toolBar.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon);
menuBar.setupToolBarVisible();
if (!Global.isWindowVisible("toolBar"))
toolBar.setVisible(false);
else
toolBar.setVisible(true);
- prevButton = toolBar.addAction("Previous");
+// toolBar.addWidget(menuBar);
+// menuBar.setSizePolicy(Policy.Minimum, Policy.Minimum);
+// toolBar.addSeparator();
+ prevButton = toolBar.addAction(tr(""));
+ prevButton.setToolTip(tr("Previous"));
QIcon prevIcon = new QIcon(iconPath+"back.png");
prevButton.setIcon(prevIcon);
prevButton.triggered.connect(this, "previousViewedAction()");
- togglePrevArrowButton(Global.isToolbarButtonVisible("prevArrow"));
+ togglePrevArrowButton(Global.isToolbarButtonVisible("prevArrow", true));
- nextButton = toolBar.addAction("Next");
+ nextButton = toolBar.addAction(tr(""));
+ nextButton.setToolTip(tr("Next"));
QIcon nextIcon = new QIcon(iconPath+"forward.png");
nextButton.setIcon(nextIcon);
nextButton.triggered.connect(this, "nextViewedAction()");
- toggleNextArrowButton(Global.isToolbarButtonVisible("nextArrow"));
+ toggleNextArrowButton(Global.isToolbarButtonVisible("nextArrow", true));
+
+ toolBar.addSeparator();
- upButton = toolBar.addAction("Up");
+ upButton = toolBar.addAction(tr("Up"));
QIcon upIcon = new QIcon(iconPath+"up.png");
upButton.setIcon(upIcon);
upButton.triggered.connect(this, "upAction()");
- toggleUpArrowButton(Global.isToolbarButtonVisible("upArrow"));
+ toggleUpArrowButton(Global.isToolbarButtonVisible("upArrow", false));
- downButton = toolBar.addAction("Down");
+ downButton = toolBar.addAction(tr("Down"));
QIcon downIcon = new QIcon(iconPath+"down.png");
downButton.setIcon(downIcon);
downButton.triggered.connect(this, "downAction()");
- toggleDownArrowButton(Global.isToolbarButtonVisible("downArrow"));
+ toggleDownArrowButton(Global.isToolbarButtonVisible("downArrow", false));
- synchronizeButton = toolBar.addAction("Synchronize");
+ synchronizeButton = toolBar.addAction(tr("Synchronize"));
synchronizeButton.setIcon(new QIcon(iconPath+"synchronize.png"));
synchronizeIconAngle = 0;
synchronizeButton.triggered.connect(this, "evernoteSync()");
- toggleSynchronizeButton(Global.isToolbarButtonVisible("synchronize"));
+ toggleSynchronizeButton(Global.isToolbarButtonVisible("synchronize", true));
- printButton = toolBar.addAction("Print");
+ printButton = toolBar.addAction(tr("Print"));
QIcon printIcon = new QIcon(iconPath+"print.png");
printButton.setIcon(printIcon);
printButton.triggered.connect(this, "printNote()");
- togglePrintButton(Global.isToolbarButtonVisible("print"));
+ togglePrintButton(Global.isToolbarButtonVisible("print", false));
- tagButton = toolBar.addAction("Tag");
+ tagButton = toolBar.addAction(tr("Tag"));
QIcon tagIcon = new QIcon(iconPath+"tag.png");
tagButton.setIcon(tagIcon);
tagButton.triggered.connect(browserWindow, "modifyTags()");
- toggleTagButton(Global.isToolbarButtonVisible("tag"));
+ toggleTagButton(Global.isToolbarButtonVisible("tag", false));
- attributeButton = toolBar.addAction("Attributes");
+ attributeButton = toolBar.addAction(tr("Attributes"));
QIcon attributeIcon = new QIcon(iconPath+"attribute.png");
attributeButton.setIcon(attributeIcon);
- attributeButton.triggered.connect(this, "toggleNoteInformation()");
- toggleAttributeButton(Global.isToolbarButtonVisible("attribute"));
+ attributeButton.triggered.connect(this, "toggleNoteAttributes()");
+ toggleAttributeButton(Global.isToolbarButtonVisible("attribute", true));
- emailButton = toolBar.addAction("Email");
+ emailButton = toolBar.addAction(tr("Email"));
QIcon emailIcon = new QIcon(iconPath+"email.png");
emailButton.setIcon(emailIcon);
emailButton.triggered.connect(this, "emailNote()");
- toggleEmailButton(Global.isToolbarButtonVisible("email"));
+ toggleEmailButton(Global.isToolbarButtonVisible("email", false));
- deleteButton = toolBar.addAction("Delete");
+ deleteButton = toolBar.addAction(tr("Delete"));
QIcon deleteIcon = new QIcon(iconPath+"delete.png");
deleteButton.setIcon(deleteIcon);
deleteButton.triggered.connect(this, "deleteNote()");
- toggleDeleteButton(Global.isToolbarButtonVisible("delete"));
+ toggleDeleteButton(Global.isToolbarButtonVisible("delete", true));
- newButton = toolBar.addAction("New");
+ newButton = toolBar.addAction(tr("New"));
QIcon newIcon = new QIcon(iconPath+"new.png");
- newButton.triggered.connect(this, "addNote()");
+ if (Global.toolBarNewAction()) {
+ newButton.triggered.connect(this, "noteAddNewTab()");
+ } else {
+ newButton.triggered.connect(this, "addNote()");
+ }
+
newButton.setIcon(newIcon);
- toggleNewButton(Global.isToolbarButtonVisible("new"));
+ toggleNewButton(Global.isToolbarButtonVisible("new", true));
- allNotesButton = toolBar.addAction("All Notes");
+ allNotesButton = toolBar.addAction(tr("All Notes"));
QIcon allIcon = new QIcon(iconPath+"books.png");
allNotesButton.triggered.connect(this, "allNotes()");
allNotesButton.setIcon(allIcon);
- toggleAllNotesButton(Global.isToolbarButtonVisible("allNotes"));
+ toggleAllNotesButton(Global.isToolbarButtonVisible("allNotes", true));
- toolBar.addSeparator();
- toolBar.addWidget(new QLabel(tr("Quota:")));
- toolBar.addWidget(quotaBar);
+ //toolBar.addSeparator();
+ //toolBar.addWidget(new QLabel(tr("Quota:")));
+ //toolBar.addWidget(quotaBar);
//quotaBar.setSizePolicy(Policy.Minimum, Policy.Minimum);
updateQuotaBar();
- toolBar.addSeparator();
+ //toolBar.addSeparator();
- // Setup the zoom
- zoomSpinner = new QSpinBox();
- zoomSpinner.setMinimum(10);
- zoomSpinner.setMaximum(1000);
- zoomSpinner.setAccelerated(true);
- zoomSpinner.setSingleStep(10);
- zoomSpinner.setValue(100);
- zoomSpinner.valueChanged.connect(this, "zoomChanged()");
- toolBar.addWidget(new QLabel(tr("Zoom")));
- toolBar.addWidget(zoomSpinner);
+ //toolBar.addWidget(new QLabel(tr("Zoom")));
+ //toolBar.addWidget(zoomSpinner);
//toolBar.addWidget(new QLabel(" "));
- toolBar.addSeparator();
- toolBar.addWidget(new QLabel(tr(" Search:")));
- toolBar.addWidget(searchField);
+ //toolBar.addSeparator();
+ //toolBar.addWidget(new QLabel(tr(" Search:")));
+ //toolBar.addWidget(searchField);
QSizePolicy sizePolicy = new QSizePolicy();
sizePolicy.setHorizontalPolicy(Policy.MinimumExpanding);
- searchField.setSizePolicy(sizePolicy);
- searchField.setInsertPolicy(InsertPolicy.InsertAtTop);
+ QLabel spacer = new QLabel("");
+ spacer.setSizePolicy(sizePolicy);
+ toolBar.addWidget(spacer);
+ //searchField.setInsertPolicy(InsertPolicy.InsertAtTop);
- searchClearButton = toolBar.addAction("Search Clear");
- QIcon searchClearIcon = new QIcon(iconPath+"searchclear.png");
- searchClearButton.setIcon(searchClearIcon);
- searchClearButton.triggered.connect(this, "searchFieldCleared()");
- toggleSearchClearButton(Global.isToolbarButtonVisible("searchClear"));
+ //searchClearButton = toolBar.addAction("Search Clear");
+ //QIcon searchClearIcon = new QIcon(iconPath+"searchclear.png");
+ //searchClearButton.setIcon(searchClearIcon);
+ //searchClearButton.triggered.connect(this, "searchFieldCleared()");
+ //toggleSearchClearButton(Global.isToolbarButtonVisible("searchClear"));
logger.log(logger.HIGH, "Leaving NeverNote.setupToolBar");
}
contextMenu.addAction(allNotesAction);
allNotesAction.triggered.connect(this, "toggleAllNotesButton(Boolean)");
- QAction searchClearAction = addContextAction("searchClear", tr("Search Clear"));
- contextMenu.addAction(searchClearAction);
- searchClearAction.triggered.connect(this, "toggleSearchClearButton(Boolean)");
+// QAction searchClearAction = addContextAction("searchClear", tr("Search Clear"));
+// contextMenu.addAction(searchClearAction);
+// searchClearAction.triggered.connect(this, "toggleSearchClearButton(Boolean)");
return contextMenu;
QAction newAction = new QAction(this);
newAction.setText(name);
newAction.setCheckable(true);
- newAction.setChecked(Global.isToolbarButtonVisible(config));
+ newAction.setChecked(Global.isToolbarButtonVisible(config, true));
return newAction;
}
private void togglePrevArrowButton(Boolean toggle) {
allNotesButton.setVisible(toggle);
Global.saveToolbarButtonsVisible("allNotes", toggle);
}
- private void toggleSearchClearButton(Boolean toggle) {
- searchClearButton.setVisible(toggle);
- Global.saveToolbarButtonsVisible("searchClear", toggle);
- }
+// @SuppressWarnings("unused")
+// private void toggleSearchClearButton(Boolean toggle) {
+// searchClearButton.setVisible(toggle);
+// Global.saveToolbarButtonsVisible("searchClear", toggle);
+// }
@SuppressWarnings("unused")
private void updateSyncButton() {
- /* synchronizeFrame++;
- if (synchronizeFrame == 4)
- synchronizeFrame = 0;
- synchronizeButton.setIcon(synchronizeAnimation.get(synchronizeFrame));
- */
-/*
- QPixmap pix = new QPixmap(iconPath+"synchronize.png");
- QMatrix matrix = new QMatrix();
- synchronizeIconAngle = synchronizeIconAngle + 1.0;
- if (synchronizeIconAngle >= 365.0)
- synchronizeIconAngle = 0.0;
- matrix.translate(pix.size().width()/2, pix.size().height()/2);
- matrix.rotate( synchronizeIconAngle );
- matrix.translate(-pix.size().width()/2, -pix.size().height()/2);
- pix = pix.transformed(matrix, TransformationMode.SmoothTransformation);
- synchronizeButton.setIcon(pix);
-*/
-
-
- QPixmap pix = new QPixmap(iconPath+"synchronize.png");
- QPixmap rotatedPix = new QPixmap(pix.size());
- QPainter p = new QPainter(rotatedPix);
-
- rotatedPix.fill(toolBar.palette().color(ColorRole.Button));
- QSize size = pix.size();
- p.translate(size.width()/2, size.height()/2);
- synchronizeIconAngle = synchronizeIconAngle+1.0;
- if (synchronizeIconAngle >= 359.0)
- synchronizeIconAngle = 0.0;
- p.rotate(synchronizeIconAngle);
- p.setBackgroundMode(BGMode.OpaqueMode);
- p.translate(-size.width()/2, -size.height()/2);
- p.drawPixmap(0,0, pix);
- p.end();
- synchronizeButton.setIcon(rotatedPix);
+
+ if (syncIcons == null) {
+ syncIcons = new ArrayList<QPixmap>();
+ double angle = 0.0;
+ synchronizeIconAngle = 0;
+ QPixmap pix = new QPixmap(iconPath+"synchronize.png");
+ syncIcons.add(pix);
+ for (int i=0; i<=360; i++) {
+ QPixmap rotatedPix = new QPixmap(pix.size());
+ QPainter p = new QPainter(rotatedPix);
+ rotatedPix.fill(toolBar.palette().color(ColorRole.Button));
+ QSize size = pix.size();
+ p.translate(size.width()/2, size.height()/2);
+ angle = angle+1.0;
+ p.rotate(angle);
+ p.setBackgroundMode(BGMode.OpaqueMode);
+ p.translate(-size.width()/2, -size.height()/2);
+ p.drawPixmap(0,0, pix);
+ p.end();
+ syncIcons.add(rotatedPix);
+ }
+ }
+
+ synchronizeIconAngle++;
+ if (synchronizeIconAngle > 359)
+ synchronizeIconAngle=0;
+ synchronizeButton.setIcon(syncIcons.get(synchronizeIconAngle));
}
// Synchronize with Evernote
- @SuppressWarnings("unused")
+
private void evernoteSync() {
logger.log(logger.HIGH, "Entering NeverNote.evernoteSync");
if (!Global.isConnected)
remoteConnect();
if (Global.isConnected)
- synchronizeAnimationTimer.start(10);
+ synchronizeAnimationTimer.start(5);
// synchronizeAnimationTimer.start(200);
syncTimer();
logger.log(logger.HIGH, "Leaving NeverNote.evernoteSync");
Global.showDeleted = false;
menuBar.noteRestoreAction.setEnabled(false);
menuBar.noteRestoreAction.setVisible(false);
+ // ゴミ箱から元の画面に戻す。連想ノートリストをONに。
+ rensoNoteListDock.setEnabled(true);
}
else {
+ trashNoteGuid = tempGuid;
currentNoteGuid = trashNoteGuid;
- trashNoteGuid = tempGuid;
menuBar.noteRestoreAction.setEnabled(true);
menuBar.noteRestoreAction.setVisible(true);
+ // ゴミ箱を開く。連想ノートリストをOFFに。
+ rensoNoteListDock.setEnabled(false);
+
Global.showDeleted = true;
}
+
+ menuBar.noteAddNewTab.setEnabled(newButton.isEnabled());
+ if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+ menuBar.noteAddNewTab.setEnabled(false);
+ }
+
listManager.loadNotesIndex();
noteIndexUpdated(false);
//// browserWindow.setEnabled(newButton.isEnabled());
@SuppressWarnings("unused")
private void emptyTrash() {
// browserWindow.clear();
+ logger.log(logger.EXTREME, "Emptying Trash");
listManager.emptyTrash();
+ logger.log(logger.EXTREME, "Resetting view after trash empty");
if (trashTree.selectedItems().size() > 0) {
listManager.getSelectedNotebooks().clear();
listManager.getSelectedTags().clear();
listManager.setSelectedSavedSearch("");
newButton.setEnabled(!newButton.isEnabled());
menuBar.noteAdd.setEnabled(newButton.isEnabled());
+ menuBar.noteAddNewTab.setEnabled(newButton.isEnabled());
+ if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+ menuBar.noteAddNewTab.setEnabled(false);
+ }
menuBar.noteAdd.setVisible(true);
browserWindow.clear();
menuBar.noteRestoreAction.setVisible(false);
listManager.loadNotesIndex();
-//--->>> noteIndexUpdated(true);
noteIndexUpdated(false);
+
+ // ゴミ箱から元の画面に戻す。連想ノートリストをONに。
+ if (!rensoNoteListDock.isEnabled()) {
+ rensoNoteListDock.setEnabled(true);
+ }
}
}
// Show/Hide trash window
+ @SuppressWarnings("unused")
private void toggleTrashWindow() {
logger.log(logger.HIGH, "Entering NeverNote.toggleTrashWindow");
if (trashTree.isVisible())
Global.showDeleted = false;
newButton.setEnabled(true);
menuBar.noteAdd.setEnabled(true);
+ if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+ menuBar.noteAddNewTab.setEnabled(false);
+ } else {
+ menuBar.noteAddNewTab.setEnabled(true);
+ }
menuBar.noteAdd.setVisible(true);
trashTree.blockSignals(true);
trashTree.clearSelection();
menuBar.connectAction.setText(tr("Connect"));
menuBar.connectAction.setToolTip(tr("Connect to Evernote"));
menuBar.synchronizeAction.setEnabled(false);
+ Global.isConnected = false;
synchronizeAnimationTimer.stop();
return;
}
// Do a manual connect/disconnect
private void remoteConnect() {
+
logger.log(logger.HIGH, "Entering NeverNote.remoteConnect");
+ // If we are already connected, we just disconnect
if (Global.isConnected) {
Global.isConnected = false;
syncRunner.enDisconnect();
return;
}
+ OAuthTokenizer tokenizer = new OAuthTokenizer();
AESEncrypter aes = new AESEncrypter();
try {
- aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("secure.txt")));
+ aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("oauthkey.txt")));
} catch (FileNotFoundException e) {
// File not found, so we'll just get empty strings anyway.
}
- String userid = aes.getUserid();
- String password = aes.getPassword();
- if (!userid.equals("") && !password.equals("")) {
- Global.username = userid;
- Global.password = password;
- }
+
+
+ if (Global.getProxyValue("url").equals("")) {
+ System.setProperty("http.proxyHost","") ;
+ System.setProperty("http.proxyPort", "") ;
+ System.setProperty("https.proxyHost","") ;
+ System.setProperty("https.proxyPort", "") ;
+ } else {
+ // PROXY
+ System.setProperty("http.proxyHost",Global.getProxyValue("url")) ;
+ System.setProperty("http.proxyPort", Global.getProxyValue("port")) ;
+ System.setProperty("https.proxyHost",Global.getProxyValue("url")) ;
+ System.setProperty("https.proxyPort", Global.getProxyValue("port")) ;
+
+ if (Global.getProxyValue("userid").equals("")) {
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new
+ PasswordAuthentication(Global.getProxyValue("userid"),Global.getProxyValue("password").toCharArray());
+ }
+ });
+ }
+ }
- // Show the login dialog box
- if (!Global.automaticLogin() || userid.equals("")|| password.equals("")) {
- LoginDialog login = new LoginDialog();
- login.exec();
-
- if (!login.okPressed()) {
- return;
- }
-
- Global.username = login.getUserid();
- Global.password = login.getPassword();
- }
- syncRunner.username = Global.username;
- syncRunner.password = Global.password;
syncRunner.userStoreUrl = Global.userStoreUrl;
syncRunner.noteStoreUrl = Global.noteStoreUrl;
syncRunner.noteStoreUrlBase = Global.noteStoreUrlBase;
- if (Global.getProxyValue("url").equals("")) {
- System.setProperty("http.proxyHost","") ;
- System.setProperty("http.proxyPort", "") ;
- System.setProperty("https.proxyHost","") ;
- System.setProperty("https.proxyPort", "") ;
- } else {
- // PROXY
- System.setProperty("http.proxyHost",Global.getProxyValue("url")) ;
- System.setProperty("http.proxyPort", Global.getProxyValue("port")) ;
- System.setProperty("https.proxyHost",Global.getProxyValue("url")) ;
- System.setProperty("https.proxyPort", Global.getProxyValue("port")) ;
-
- if (Global.getProxyValue("userid").equals("")) {
- Authenticator.setDefault(new Authenticator() {
- @Override
- protected PasswordAuthentication getPasswordAuthentication() {
- return new
- PasswordAuthentication(Global.getProxyValue("userid"),Global.getProxyValue("password").toCharArray());
- }});
- }
- }
- syncRunner.enConnect();
+ String authString = aes.getString();
+ if (!authString.equals("")) {
+ tokenizer.tokenize(authString);
+ syncRunner.authToken = tokenizer.oauth_token;
+ syncRunner.enConnect();
+ }
+
Global.isConnected = syncRunner.isConnected;
+
+ boolean autoLoginMessageFlag = false;
+ if (!Global.isConnected) {
+ OAuthWindow window = new OAuthWindow(logger);
+ if (window.error) {
+ setMessage(window.errorMessage);
+ return;
+ }
+ window.exec();
+ if (window.error) {
+ setMessage(window.errorMessage);
+ return;
+ }
+ tokenizer.tokenize(window.response);
+ if (tokenizer.oauth_token.equals("")) {
+ setMessage(tr("Invalid authorization token received."));
+ return;
+ }
+ aes.setString(window.response);
+ try {
+ aes.encrypt(new FileOutputStream(Global.getFileManager().getHomeDirFile("oauthkey.txt")));
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ syncRunner.authToken = tokenizer.oauth_token;
+ syncRunner.enConnect();
+ Global.isConnected = syncRunner.isConnected;
+ autoLoginMessageFlag = true;
+ }
+// Global.username = syncRunner.username;
+
+ if (!Global.isConnected)
+ return;
setupOnlineMenu();
setupConnectMenuOptions();
+
+ // 初回ログイン時に自動ログインが無効だったら、有効化するか確認する
+ if (autoLoginMessageFlag && !Global.automaticLogin()) {
+ if (QMessageBox.question(this, tr("Confirmation"), tr("Are you sure you want to enable the auto-login feature?"),
+ QMessageBox.StandardButton.Yes, QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
+ Global.setAutomaticLogin(true);
+ }
+ }
+
logger.log(logger.HIGH, "Leaving NeverNote.remoteConnect");
}
private void setupConnectMenuOptions() {
// clearNotebookFilter();
clearTrashFilter();
// clearSavedSearchFilter();
+
+ // ゴミ箱から元の画面に戻す。連想ノートリストをONに。
+ if (!rensoNoteListDock.isEnabled()) {
+ rensoNoteListDock.setEnabled(true);
+ }
if (attributeTreeSelected == null || item.nativeId() != attributeTreeSelected.nativeId()) {
if (item.childCount() > 0) {
}
// Show/Hide attribute search window
+ @SuppressWarnings("unused")
private void toggleAttributesWindow() {
logger.log(logger.HIGH, "Entering NeverNote.toggleAttributesWindow");
if (attributeTree.isVisible())
@SuppressWarnings("unused")
private void noteTableSelection() {
logger.log(logger.HIGH, "Entering NeverNote.noteTableSelection");
+
saveNote();
- if (historyGuids.size() == 0) {
- historyGuids.add(currentNoteGuid);
- historyPosition = 1;
+
+ // 右クリックだったときの処理
+ if (QApplication.mouseButtons().isSet(MouseButton.RightButton)) {
+ // 選択されたノートのguidをselectedNoteGUIDsにセット
+ List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
+ if(selections.size() > 0){
+ selectedNoteGUIDs.clear();
+ for(int i = 0; i < selections.size(); i++){
+ int row = selections.get(i).row();
+ QModelIndex index = noteTableView.proxyModel.index(row, Global.noteTableGuidPosition);
+ SortedMap<Integer, Object> ix = noteTableView.proxyModel.itemData(index);
+ selectedNoteGUIDs.add((String) ix.values().toArray()[0]);
+ }
+ }
+ return;
+ }
+
+ // If we have more than one selection, then set the merge note action to true.
+ List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
+ if (selections.size() > 1)
+ menuBar.noteMergeAction.setEnabled(true);
+ else
+ menuBar.noteMergeAction.setEnabled(false);
+
+ // If the ctrl key is pressed, then they are selecting multiple
+ // entries and we don't want to change the currently viewed note.
+ // Shiftキーを押しながらの場合の処理も追加
+ if ((QApplication.keyboardModifiers().isSet(KeyboardModifier.ControlModifier) ||
+ QApplication.keyboardModifiers().isSet(KeyboardModifier.ShiftModifier)) &&
+ QApplication.mouseButtons().isSet(MouseButton.LeftButton)){
+ selectedNoteGUIDs.clear();
+ for (int i=0; i<selections.size(); i++) {
+ int row = selections.get(i).row();
+ QModelIndex index = noteTableView.proxyModel.index(row, Global.noteTableGuidPosition);
+ SortedMap<Integer, Object> ix = noteTableView.proxyModel.itemData(index);
+ selectedNoteGUIDs.add((String)ix.values().toArray()[0]);
+ }
+ return;
}
+
+ // IFIXED 恐らく不要なのでコメントアウト
+// if (historyGuids.size() == 0) {
+// historyGuids.add(currentNoteGuid);
+// historyPosition = 1;
+// }
+
noteTableView.showColumn(Global.noteTableGuidPosition);
- List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
if (!Global.isColumnVisible("guid"))
noteTableView.hideColumn(Global.noteTableGuidPosition);
menuBar.noteOnlineHistoryAction.setEnabled(true);
menuBar.noteMergeAction.setEnabled(true);
selectedNoteGUIDs.clear();
+ if (currentNoteGuid != null && !currentNoteGuid.equals("") && !Global.showDeleted) {
+ menuBar.noteAddNewTab.setEnabled(true);
+ }
if (selections.size() != 1 || Global.showDeleted) {
menuBar.noteDuplicateAction.setEnabled(false);
}
downButton.setEnabled(false);
index = noteTableView.proxyModel.index(row, Global.noteTableGuidPosition);
SortedMap<Integer, Object> ix = noteTableView.proxyModel.itemData(index);
- currentNoteGuid = (String)ix.values().toArray()[0];
+
+ currentNoteGuid = (String)ix.values().toArray()[0];
selectedNoteGUIDs.add(currentNoteGuid);
}
}
nextButton.setEnabled(true);
prevButton.setEnabled(true);
- if (!fromHistory) {
- int endPosition = historyGuids.size()-1;
- for (int j=historyPosition; j<=endPosition; j++) {
- historyGuids.remove(historyGuids.size()-1);
- }
- historyGuids.add(currentNoteGuid);
- historyPosition = historyGuids.size();
- }
- if (historyPosition <= 1)
- prevButton.setEnabled(false);
- if (historyPosition == historyGuids.size())
- nextButton.setEnabled(false);
-
- fromHistory = false;
+
+ int currentIndex = tabBrowser.currentIndex();
+ ArrayList<String> histGuids = historyGuids.get(currentIndex);
+ int histPosition = historyPosition.get(currentIndex);
+ boolean fromHist = fromHistory.get(currentIndex);
+
+ if (!fromHist) {
+ int endPosition = histGuids.size() - 1;
+
+ for (int j = histPosition; j <= endPosition; j++) {
+ histGuids.remove(histGuids.size() - 1);
+ }
+ histGuids.add(currentNoteGuid);
+ historyPosition.put(currentIndex, histGuids.size());
+ histPosition = histGuids.size();
+ }
+ if (histPosition <= 1){
+ prevButton.setEnabled(false);
+ }
+ if (histPosition == histGuids.size())
+ nextButton.setEnabled(false);
+ fromHistory.put(currentIndex, false);
+ fromHist = false;
+
scrollToGuid(currentNoteGuid);
refreshEvernoteNote(true);
+
+ if (currentNoteGuid != null && !currentNoteGuid.equals("")) {
+ if (!Global.showDeleted) { // ゴミ箱じゃなければ
+ addBrowseHistory();
+ }
+ }
+
+ // 連想ノートリストを更新
+ rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
+
+ waitCursor(false);
logger.log(logger.HIGH, "Leaving NeverNote.noteTableSelection");
- }
+ }
+
+ // 複数ノートの同時閲覧履歴をデータベースに保存
+ private void addBrowseHistory() {
+ // このノートと他のタブウィンドウノートの関連性を内部データベースのHistoryテーブルに登録
+ if (tabWindows.size() >= 2) {
+ Iterator<Integer> it = tabWindows.keySet().iterator();
+ while (it.hasNext()) {
+ int tabIndex = it.next();
+ String nextGuid = ((TabBrowse) tabBrowser.widget(tabIndex)).getBrowserWindow().getNote().getGuid();
+ // guid1=guid2のデータは登録しない
+ if (!currentNoteGuid.equals(nextGuid)) {
+ conn.getHistoryTable().addHistory("browse", currentNoteGuid, nextGuid);
+ }
+ }
+ }
+ // このノートと他の外部ウィンドウノートの関連性を内部データベースのHistoryテーブルに登録
+ if (externalWindows.size() >= 1) {
+ Iterator<String> it = externalWindows.keySet().iterator();
+ while (it.hasNext()) {
+ String nextGuid = it.next();
+ // guid1=guid2のデータは登録しない
+ if (!currentNoteGuid.equals(nextGuid)) {
+ conn.getHistoryTable().addHistory("browse", currentNoteGuid, nextGuid);
+ }
+ }
+ }
+ }
+
// Trigger a refresh when the note db has been updated
private void noteIndexUpdated(boolean reload) {
logger.log(logger.HIGH, "Entering NeverNote.noteIndexUpdated");
refreshEvernoteNoteList();
logger.log(logger.HIGH, "Calling note table reload in NeverNote.noteIndexUpdated() - "+reload);
noteTableView.load(reload);
- scrollToGuid(currentNoteGuid);
+ if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+ int pos;
+ if (noteTableView.proxyModel.sortOrder() == SortOrder.AscendingOrder)
+ pos = noteTableView.proxyModel.rowCount();
+ else
+ pos = 1;
+ if (noteTableView.proxyModel.rowCount() == 0)
+ pos = 0;
+ if (pos>0) {
+ QModelIndex i = noteTableView.proxyModel.index(pos-1, Global.noteTableGuidPosition);
+ if (i!=null) {
+ currentNoteGuid = (String)i.data();
+ }
+ }
+ }
+ if (!noteTableView.isColumnHidden(Global.noteTableGuidPosition))
+ showColumns();
+ scrollToGuid(currentNoteGuid);
logger.log(logger.HIGH, "Leaving NeverNote.noteIndexUpdated");
}
// Called when the list of notes is updated
String saveCurrentNoteGuid = new String();
String tempNoteGuid = new String();
-
- historyGuids.clear();
- historyPosition = 0;
+
+ int currentIndex = tabBrowser.currentIndex();
+ ArrayList<String> histGuids = historyGuids.get(currentIndex);
+ histGuids.clear();
+ historyPosition.put(currentIndex, 0);
+
prevButton.setEnabled(false);
nextButton.setEnabled(false);
currentNote = null;
browserWindow.clear();
browserWindow.setDisabled(true);
+ waitCursor(false);
}
- if (saveCurrentNoteGuid.equals("") && listManager.getNoteIndex().size() > 0) {
- currentNote = listManager.getNoteIndex().get(listManager.getNoteIndex().size()-1);
- currentNoteGuid = currentNote.getGuid();
+ if (Global.showDeleted && listManager.getNoteIndex().size() > 0 && saveCurrentNoteGuid.equals("")) {
+ currentNoteGuid = listManager.getNoteIndex().get(0).getGuid();
+ saveCurrentNoteGuid = currentNoteGuid;
refreshEvernoteNote(true);
+ }
+
+ if (!saveCurrentNoteGuid.equals("")) {
+ refreshEvernoteNote(false);
} else {
- //we can reload if note not dirty
- refreshEvernoteNote(!noteDirty);
+ currentNoteGuid = "";
}
reloadTagTree(false);
logger.log(logger.HIGH, "Leaving NeverNote.refreshEvernoteNoteList");
}
- // Called when the previous arrow button is clicked
- @SuppressWarnings("unused")
+
+ // Called when the previous arrow button is clicked
+ @SuppressWarnings("unused")
private void previousViewedAction() {
- if (!prevButton.isEnabled())
- return;
- if (historyPosition == 0)
- return;
- historyPosition--;
- if (historyPosition <= 0)
- return;
- String historyGuid = historyGuids.get(historyPosition-1);
- fromHistory = true;
- for (int i=0; i<noteTableView.model().rowCount(); i++) {
- QModelIndex modelIndex = noteTableView.model().index(i, Global.noteTableGuidPosition);
- if (modelIndex != null) {
- SortedMap<Integer, Object> ix = noteTableView.model().itemData(modelIndex);
- String tableGuid = (String)ix.values().toArray()[0];
- if (tableGuid.equals(historyGuid)) {
- noteTableView.selectRow(i);
- return;
- }
- }
- }
- }
+ int currentIndex = tabBrowser.currentIndex();
+ ArrayList<String> histGuids = historyGuids.get(currentIndex);
+ int histPosition = historyPosition.get(currentIndex);
+ boolean fromHist = fromHistory.get(currentIndex);
+ if (!prevButton.isEnabled())
+ return;
+ if (histPosition == 0)
+ return;
+ histPosition--;
+ historyPosition.put(currentIndex, histPosition);
+ if (histPosition <= 0)
+ return;
+ String historyGuid = histGuids.get(histPosition - 1);
+ fromHistory.put(currentIndex, true);
+ fromHist = true;
+ for (int i = 0; i < noteTableView.model().rowCount(); i++) {
+ QModelIndex modelIndex = noteTableView.model().index(i,
+ Global.noteTableGuidPosition);
+ if (modelIndex != null) {
+ SortedMap<Integer, Object> ix = noteTableView.model().itemData(
+ modelIndex);
+ String tableGuid = (String) ix.values().toArray()[0];
+ if (tableGuid.equals(historyGuid)) {
+ noteTableView.selectRow(i);
+ return;
+ }
+ }
+ }
+ }
+
@SuppressWarnings("unused")
private void nextViewedAction() {
if (!nextButton.isEnabled())
return;
- String historyGuid = historyGuids.get(historyPosition);
- historyPosition++;
- fromHistory = true;
- for (int i=0; i<noteTableView.model().rowCount(); i++) {
- QModelIndex modelIndex = noteTableView.model().index(i, Global.noteTableGuidPosition);
- if (modelIndex != null) {
- SortedMap<Integer, Object> ix = noteTableView.model().itemData(modelIndex);
- String tableGuid = (String)ix.values().toArray()[0];
- if (tableGuid.equals(historyGuid)) {
- noteTableView.selectRow(i);
- return;
- }
- }
- }
+
+ int currentIndex = tabBrowser.currentIndex();
+ ArrayList<String> histGuids = historyGuids.get(currentIndex);
+ int histPosition = historyPosition.get(currentIndex);
+ boolean fromHist = fromHistory.get(currentIndex);
+ String historyGuid = histGuids.get(histPosition);
+ histPosition++;
+ historyPosition.put(currentIndex, histPosition);
+ fromHistory.put(currentIndex, true);
+ fromHist = true;
+ for (int i = 0; i < noteTableView.model().rowCount(); i++) {
+ QModelIndex modelIndex = noteTableView.model().index(i,
+ Global.noteTableGuidPosition);
+ if (modelIndex != null) {
+ SortedMap<Integer, Object> ix = noteTableView.model().itemData(
+ modelIndex);
+ String tableGuid = (String) ix.values().toArray()[0];
+ if (tableGuid.equals(historyGuid)) {
+ noteTableView.selectRow(i);
+ return;
+ }
+ }
+ }
}
// Called when the up arrow is clicked
@SuppressWarnings("unused")
String guid = (String)index.model().index(row, Global.noteTableGuidPosition).data();
scrollToGuid(guid);
}
+ // Scroll to the current GUID in tthe list.
// Scroll to a particular index item
private void scrollToGuid(String guid) {
if (currentNote == null || guid == null)
}
}
}
-
if (!currentNote.isActive() && !Global.showDeleted) {
for (int i=0; i<listManager.getNoteIndex().size(); i++) {
if (listManager.getNoteIndex().get(i).isActive()) {
}
}
}
-
QModelIndex index;
for (int i=0; i<noteTableView.model().rowCount(); i++) {
index = noteTableView.model().index(i, Global.noteTableGuidPosition);
if (currentNoteGuid.equals(index.data())) {
-// noteTableView.setCurrentIndex(index);
+// noteTableView.selectionModel().blockSignals(true);
noteTableView.selectRow(i);
+// noteTableView.selectionModel().blockSignals(false);
noteTableView.scrollTo(index, ScrollHint.EnsureVisible); // This should work, but it doesn't
i=listManager.getNoteTableModel().rowCount();
}
noteTableView.setColumnHidden(Global.noteTableSynchronizedPosition, !Global.isColumnVisible("synchronized"));
noteTableView.setColumnHidden(Global.noteTableGuidPosition, !Global.isColumnVisible("guid"));
noteTableView.setColumnHidden(Global.noteTableThumbnailPosition, !Global.isColumnVisible("thumbnail"));
- noteTableView.setColumnHidden(Global.noteTableTitlePosition, !Global.isColumnVisible("title"));
+ noteTableView.setColumnHidden(Global.noteTableTitlePosition, !Global.isColumnVisible("title"));
+ noteTableView.setColumnHidden(Global.noteTablePinnedPosition, !Global.isColumnVisible("pinned"));
}
// Title color has changed
@SuppressWarnings("unused")
private void titleColorChanged(Integer color) {
- logger.log(logger.HIGH, "Entering NeverNote.updateListAuthor");
+ logger.log(logger.HIGH, "Entering NeverNote.titleColorChanged");
+ setNoteDirty();
QColor backgroundColor = new QColor();
QColor foregroundColor = new QColor(QColor.black);
backgroundColor.setRgb(color);
}
}
}
- logger.log(logger.HIGH, "Leaving NeverNote.updateListAuthor");
+ logger.log(logger.HIGH, "Leaving NeverNote.titleColorChanged");
+ }
+ // A note has been pinned or unpinned
+ @SuppressWarnings("unused")
+ private void notePinned() {
+ logger.log(logger.EXTREME, "Entering NeverNote.notePinned()");
+ setNoteDirty();
+
+ for (int j=0; j<selectedNoteGUIDs.size(); j++) {
+ NoteMetadata meta = listManager.getNoteMetadata().get(selectedNoteGUIDs.get(j));
+ boolean pinned = !meta.isPinned();
+ meta.setPinned(pinned); // Toggle the pinned/unpinned
+
+ // Update the list & table
+ listManager.updateNoteMetadata(meta);
+ noteTableView.proxyModel.addGuid(selectedNoteGUIDs.get(j), meta);
+ }
+ logger.log(logger.EXTREME, "Leaving NeverNote.notePinned()");
}
// Wide list was chosen
public void narrowListView() {
saveNoteColumnPositions();
saveNoteIndexWidth();
saveWindowState();
- Global.setListView(Global.View_List_Narrow);
+ int sortCol = noteTableView.proxyModel.sortColumn();
+ int sortOrder = noteTableView.proxyModel.sortOrder().value();
+ Global.setSortColumn(sortCol);
+ Global.setSortOrder(sortOrder);
+
+ Global.setListView(Global.View_List_Narrow);
menuBar.wideListView.blockSignals(true);
menuBar.narrowListView.blockSignals(true);
menuBar.narrowListView.blockSignals(false);
mainLeftRightSplitter.addWidget(noteTableView);
- mainLeftRightSplitter.addWidget(browserWindow);
+ mainLeftRightSplitter.addWidget(tabBrowser);
+
restoreWindowState(false);
noteTableView.repositionColumns();
noteTableView.resizeColumnWidths();
noteTableView.resizeRowHeights();
+
+ sortCol = Global.getSortColumn();
+ sortOrder = Global.getSortOrder();
+ noteTableView.proxyModel.blocked = true;
+ noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
+ noteTableView.proxyModel.blocked = false;
+
+
showColumns();
noteTableView.load(false);
+ refreshEvernoteNote(true);
scrollToCurrentGuid();
}
public void wideListView() {
- saveWindowState();
+ int sortCol = noteTableView.proxyModel.sortColumn();
+ int sortOrder = noteTableView.proxyModel.sortOrder().value();
+ Global.setSortColumn(sortCol);
+ Global.setSortOrder(sortOrder);
+
+ saveWindowState();
saveNoteColumnPositions();
saveNoteIndexWidth();
Global.setListView(Global.View_List_Wide);
menuBar.narrowListView.blockSignals(false);
browserIndexSplitter.setVisible(true);
browserIndexSplitter.addWidget(noteTableView);
- browserIndexSplitter.addWidget(browserWindow);
+ browserIndexSplitter.addWidget(tabBrowser);
+
restoreWindowState(false);
noteTableView.repositionColumns();
noteTableView.resizeColumnWidths();
noteTableView.resizeRowHeights();
+
+ sortCol = Global.getSortColumn();
+ sortOrder = Global.getSortOrder();
+ noteTableView.proxyModel.blocked = true;
+ noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
+ noteTableView.proxyModel.blocked = false;
+
showColumns();
noteTableView.load(false);
scrollToCurrentGuid();
}
+ // Sort order for the notebook has changed
+ public void tableSortOrderChanged(Integer column, Integer order) {
+
+ // Find what notebook (if any) is selected. We ignore stacks & the "All Notebooks".
+ List<QTreeWidgetItem> selectedNotebook = notebookTree.selectedItems();
+ if (selectedNotebook.size() > 0 && !selectedNotebook.get(0).text(0).equalsIgnoreCase("All Notebooks") && !selectedNotebook.get(0).text(2).equalsIgnoreCase("STACK")) {
+ QTreeWidgetItem currentSelectedNotebook = selectedNotebook.get(0);
+ String notebook;
+ notebook = currentSelectedNotebook.text(2);
+ conn.getNotebookTable().setSortOrder(notebook, column, order);
+ }
+ }
-
+ //***************************************************************
+ @SuppressWarnings("unused")
+ private void evernoteLinkClick(String syncGuid, String locGuid) {
+ String guid = null;
+ if (conn.getNoteTable().guidExists(syncGuid)) {
+ guid = syncGuid;
+ } else {
+ // If we didn't find it via the synchronized guid, look under the local guid
+ // Iwe don't find it there, look to see if the GUID is posted under the local GUID, but was
+ // later synchronized (that causes the guid to change so we need to find the new one).
+ if (conn.getNoteTable().guidExists(locGuid))
+ guid = locGuid;
+ else
+ guid = conn.getNoteTable().findAlternateGuid(locGuid);
+ }
+ if (guid != null) {
+ openExternalEditor(guid);
+ return;
+ }
+
+ //If we've gotten this far, we can't find the note
+ QMessageBox.information(this, tr("Note Not Found"), tr("Sorry, but I can't"+
+ " seem to find that note."));
+ }
//***************************************************************
//***************************************************************
//** External editor window functions
//***************************************************************
//***************************************************************
private void listDoubleClick() {
- saveNote();
- if (externalWindows.containsKey(currentNoteGuid)) {
- externalWindows.get(currentNoteGuid).raise();
+ saveNote();
+ openExternalEditor(currentNoteGuid);
+ }
+ private void openExternalEditor(String guid) {
+
+ if (externalWindows.containsKey(guid)) {
+ externalWindows.get(guid).raise();
return;
}
+
+ Note note = conn.getNoteTable().getNote(guid, true, true, false, true, true);
// We have a new external editor to create
QIcon appIcon = new QIcon(iconPath+"nevernote.png");
- ExternalBrowse newBrowser = new ExternalBrowse(conn);
+ ExternalBrowse newBrowser = new ExternalBrowse(conn, cbObserver);
+
newBrowser.setWindowIcon(appIcon);
- externalWindows.put(currentNoteGuid, newBrowser);
+ externalWindows.put(guid, newBrowser);
showEditorButtons(newBrowser.getBrowserWindow());
- loadNoteBrowserInformation(newBrowser.getBrowserWindow());
+ loadNoteBrowserInformation(newBrowser.getBrowserWindow(), guid, note);
setupBrowserWindowListeners(newBrowser.getBrowserWindow(), false);
newBrowser.windowClosing.connect(this, "externalWindowClosing(String)");
- newBrowser.getBrowserWindow().noteSignal.titleChanged.connect(this, "externalWindowTitleEdited(String, String)");
+ //newBrowser.getBrowserWindow().noteSignal.titleChanged.connect(this, "externalWindowTitleEdited(String, String)");
newBrowser.getBrowserWindow().noteSignal.tagsChanged.connect(this, "externalWindowTagsEdited(String, List)");
newBrowser.contentsChanged.connect(this, "saveNoteExternalBrowser(String, String, Boolean, BrowserWindow)");
+ newBrowser.getBrowserWindow().blockApplication.connect(this, "blockApplication(BrowserWindow)");
+ newBrowser.getBrowserWindow().unblockApplication.connect(this, "unblockApplication()");
browserWindow.noteSignal.tagsChanged.connect(newBrowser, "updateTags(String, List)");
browserWindow.noteSignal.titleChanged.connect(newBrowser, "updateTitle(String, String)");
newBrowser.show();
}
- @SuppressWarnings("unused")
- private void externalWindowTitleEdited(String guid, String text) {
- if (guid.equals(currentNoteGuid)) {
- browserWindow.setTitle(text);
- }
- }
@SuppressWarnings({ "rawtypes", "unused" })
private void externalWindowTagsEdited(String guid, List values) {
StringBuffer line = new StringBuffer(100);
externalWindows.remove(guid);
}
-
-
+ // ***************************************************************
+ // ***************************************************************
+ // ** タブウィンドウの機能
+ // ***************************************************************
+ // ***************************************************************
+ @SuppressWarnings("unused")
+ private void openNewTab() {
+ saveNote();
+
+ // selectedNoteGUIDsをディープコピー
+ List<String> copySelected = new ArrayList<String>(selectedNoteGUIDs);
+
+ for (int i=0; i < copySelected.size() ; i++) {
+ openTabEditor(copySelected.get(i));
+ }
+ }
+
+ // 連想ノートリストから新しいタブで開く
+ @SuppressWarnings("unused")
+ private void openNewTabFromRNL(){
+ if(rensoNotePressedItemGuid != null){
+ String prevCurrentNoteGuid = new String(currentNoteGuid);
+
+ saveNote();
+ openTabEditor(rensoNotePressedItemGuid);
+
+ // 連想ノートリストアイテムクリック操作を記録
+ conn.getHistoryTable().addHistory("rensoItemClick", prevCurrentNoteGuid, rensoNotePressedItemGuid);
+ }
+ }
+
+ 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 = tabBrowser.addNewTab(newBrowser, noteTitle);
+ tabWindows.put(index, newBrowser);
+ noteDirty.put(index, false);
+
+ // noteTableViewの選択を変更するとselectionChangedが発生してしまうので一度切断
+ noteTableView.selectionModel().selectionChanged.disconnect(this, "noteTableSelection()");
+ loadNoteBrowserInformation(newBrowser.getBrowserWindow(), guid, note);
+ // 再接続
+ noteTableView.selectionModel().selectionChanged.connect(this, "noteTableSelection()");
+
+ setupBrowserWindowListeners(newBrowser.getBrowserWindow(), false);
+
+ // ExtendedInformationを必要があれば表示する
+ toggleNoteInformation();
+ // Sourceを必要があれば表示する
+ viewSource();
+ // EditorButtonsBarを必要があれば表示する
+ toggleEditorButtonBar();
+
+ // 履歴記録のハッシュマップを初期化
+ ArrayList<String> histGuids = new ArrayList<String>();
+ historyGuids.put(index, histGuids);
+ historyPosition.put(index, 0);
+ fromHistory.put(index, false);
+
+ // 履歴に今開いたノートを追加
+ histGuids.add(guid);
+ historyPosition.put(index, histGuids.size());
+
+ tabBrowser.setCurrentIndex(index);
+
+ if (guid != null && !guid.equals("")) {
+ if (!Global.showDeleted) { // ゴミ箱じゃなければ
+ addBrowseHistory();
+ }
+ }
+ }
+
+ // タブが閉じられた
+ @SuppressWarnings("unused")
+ private void tabCloseRequested(int index) {
+ tabWindowClosing((TabBrowse)tabBrowser.widget(index));
+ }
+
+ // タブが閉じられた
+ private void tabWindowClosing(TabBrowse tab) {
+ // タブが1つしかなかったら閉じない
+ if (tabBrowser.count() <= 1) {
+ return;
+ }
+
+ int index = tabBrowser.indexOf(tab);
+// String guid = tab.getBrowserWindow().getNote().getGuid();
+// String content = tab.getBrowserWindow().getContent();
+ BrowserWindow browser = tab.getBrowserWindow();
+// // ノートが変更されていたら保存
+// if (tab.getNoteDirty()) {
+// saveNoteTabBrowser(guid, content, true, browser);
+// }
+
+ // シグナル切断
+ browser.noteSignal.tagsChanged.disconnect();
+ browser.noteSignal.titleChanged.disconnect();
+ browser.noteSignal.noteChanged.disconnect();
+ browser.noteSignal.notebookChanged.disconnect();
+ browser.noteSignal.createdDateChanged.disconnect();
+ browser.noteSignal.alteredDateChanged.disconnect();
+
+ // ノートを削除
+ tabWindows.remove(index);
+ tabBrowser.removeTab(index);
+ noteDirty.remove(index);
+ inkNote.remove(index);
+ readOnly.remove(index);
+
+ // 履歴記録のハッシュマップを削除
+ historyGuids.remove(index);
+ historyPosition.remove(index);
+ fromHistory.remove(index);
+
+ // タブのインデックスを更新（削除によって空いた部分を詰める）
+ for(int i = index ; tabWindows.containsKey(i + 1) ; i++){
+ // tabWindows
+ TabBrowse nextTab = tabWindows.get(i + 1);
+ tabWindows.put(i, nextTab);
+ tabWindows.remove(i + 1);
+ // noteDirty
+ boolean isNoteDirty = noteDirty.get(i + 1);
+ noteDirty.put(i, isNoteDirty);
+ noteDirty.remove(i + 1);
+ // inkNote
+ boolean isInkNote = inkNote.get(i + 1);
+ inkNote.put(i, isInkNote);
+ inkNote.remove(i + 1);
+ // readOnly
+ boolean isReadOnly = readOnly.get(i + 1);
+ readOnly.put(i, isReadOnly);
+ readOnly.remove(i + 1);
+ // historyGuids
+ ArrayList<String> histGuids = historyGuids.get(i + 1);
+ historyGuids.put(i, histGuids);
+ historyGuids.remove(i + 1);
+ // historyPosition
+ int histPosition = historyPosition.get(i + 1);
+ historyPosition.put(i, histPosition);
+ historyPosition.remove(i + 1);
+ // fromHistory
+ boolean fromHist = fromHistory.get(i + 1);
+ fromHistory.put(i, fromHist);
+ fromHistory.remove(i + 1);
+ }
+
+ // タブが残り1つになったら、閉じるボタンを消す
+ if (tabBrowser.count() == 1) {
+ tabBrowser.hideTabCloseButton(0);
+ }
+
+ // タブの閉じるボタンを押すと、tabWindowClosingより先にtabWindowChangedが呼ばれてしまうので、手動で呼びなおす
+ tabWindowChanged(tabBrowser.currentIndex());
+ }
+
+ @SuppressWarnings("unused")
+ private void noteAddNewTab() {
+ saveNote();
+
+ // ノートを何も開いていないときは現在のタブにノート追加
+ if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+ addNote();
+ return;
+ }
+
+ // ノート追加前に開いていたノートとの関連性を記録するためにguidをとっておく
+ TabBrowse prevTab = (TabBrowse)tabBrowser.currentWidget();
+ String prevTabGuid = null;
+ if (prevTab.getBrowserWindow() != null && prevTab.getBrowserWindow().getNote() != null) {
+ prevTabGuid = prevTab.getBrowserWindow().getNote().getGuid();
+ }
+
+ openEmptyTabEditor();
+ addNote();
+
+ // 追加されたノートのguidを取得し、ノート追加操作履歴としてデータベースに登録
+ if (prevTabGuid != null && !prevTabGuid.equals("")) {
+ TabBrowse addedTab = (TabBrowse)tabBrowser.currentWidget();
+ String addedTabGuid = addedTab.getBrowserWindow().getNote().getGuid();
+ if (addedTabGuid != null && !addedTabGuid.equals("")) {
+ if (!prevTabGuid.equals(addedTabGuid)) {
+ conn.getHistoryTable().addHistory("addNewNote", prevTabGuid, addedTabGuid);
+ }
+ }
+ }
+ }
+
+ private void openEmptyTabEditor() {
+ // 新しいタブエディタを作成
+ TabBrowse newBrowser = new TabBrowse(conn, tabBrowser, cbObserver);
+ showEditorButtons(newBrowser.getBrowserWindow());
+
+ setupBrowserWindowListeners(newBrowser.getBrowserWindow(), false);
+
+ int index = tabBrowser.addNewTab(newBrowser, "");
+ tabWindows.put(index, newBrowser);
+ noteDirty.put(index, false);
+
+ // ExtendedInformationを必要があれば表示する
+ toggleNoteInformation();
+ // Sourceを必要があれば表示する
+ viewSource();
+ // EditorButtonsBarを必要があれば表示する
+ toggleEditorButtonBar();
+
+ // 履歴記録のハッシュマップを初期化
+ ArrayList<String> histGuids = new ArrayList<String>();
+ historyGuids.put(index, histGuids);
+ historyPosition.put(index, 0);
+ fromHistory.put(index, false);
+
+ tabBrowser.setCurrentIndex(index);
+ }
+
//***************************************************************
//***************************************************************
//** These functions deal with Note specific things
//***************************************************************
//***************************************************************
- @SuppressWarnings("unused")
private void setNoteDirty() {
+ for (String guid: selectedNoteGUIDs) {
+ setNoteDirty(guid);
+ }
+ }
+
+ private void setNoteDirty(String targetGuid) {
logger.log(logger.EXTREME, "Entering NeverNote.setNoteDirty()");
+
// Find if the note is being edited externally. If it is, update it.
- if (externalWindows.containsKey(currentNoteGuid)) {
+ if (externalWindows.containsKey(targetGuid)) {
QTextCodec codec = QTextCodec.codecForName("UTF-8");
QByteArray unicode = codec.fromUnicode(browserWindow.getContent());
- ExternalBrowse window = externalWindows.get(currentNoteGuid);
- window.getBrowserWindow().getBrowser().setContent(unicode);
+ ExternalBrowse window = externalWindows.get(targetGuid);
+ window.getBrowserWindow().setContent(unicode);
+ }
+
+ // 他のタブで同じノートを開いていないか探す。もしあったら、内容を更新する。
+ Collection<Integer> tabIndexes = tabWindows.keySet();
+ Iterator<Integer> indexIterator = tabIndexes.iterator();
+
+ for (TabBrowse tab: tabWindows.values()) {
+ int index = indexIterator.next();
+ String guid = tab.getBrowserWindow().getNote().getGuid();
+
+ QTextCodec codec = QTextCodec.codecForName("UTF-8");
+ QByteArray unicode = codec.fromUnicode(browserWindow.getContent());
+
+ if (guid.equals(guid)) {
+ if (index != tabBrowser.currentIndex()) {
+ TabBrowse window = tabWindows.get(index);
+ window.getBrowserWindow().setContent(unicode);
+ }
+ }
}
+ // ターゲットノートがタブで開かれていて、かつDirty = trueかどうかを取得する
// If the note is dirty, then it is unsynchronized by default.
- if (noteDirty)
+ int index = -1;
+ boolean isNoteDirty = false;
+ for (TabBrowse tab: tabWindows.values()) {
+ if (tab.getBrowserWindow().getNote().getGuid().equals(targetGuid)) {
+ index = tabBrowser.indexOf(tab);
+ isNoteDirty = noteDirty.get(index);
+ break;
+ }
+ }
+ if (isNoteDirty) {
return;
+ }
// Set the note as dirty and check if its status is synchronized in the display table
- noteDirty = true;
- for (int i=0; i<listManager.getUnsynchronizedNotes().size(); i++) {
- if (listManager.getUnsynchronizedNotes().get(i).equals(currentNoteGuid))
+ // まだダーティでなく、かつタブで開かれている場合にnoteDirty = trueにする
+ if (index >= 0) {
+ noteDirty.put(index, true);
+ }
+
+ if (listManager.getNoteMetadata().containsKey(targetGuid) &&
+ listManager.getNoteMetadata().get(targetGuid).isDirty()) {
return;
}
// If this wasn't already marked as unsynchronized, then we need to update the table
- listManager.getNoteTableModel().updateNoteSyncStatus(currentNoteGuid, false);
-/* listManager.getUnsynchronizedNotes().add(currentNoteGuid);
+ listManager.getNoteTableModel().updateNoteSyncStatus(targetGuid, false);
+// listManager.getUnsynchronizedNotes().add(targetGuid);
for (int i=0; i<listManager.getNoteTableModel().rowCount(); i++) {
QModelIndex modelIndex = listManager.getNoteTableModel().index(i, Global.noteTableGuidPosition);
if (modelIndex != null) {
SortedMap<Integer, Object> ix = listManager.getNoteTableModel().itemData(modelIndex);
String tableGuid = (String)ix.values().toArray()[0];
- if (tableGuid.equals(currentNoteGuid)) {
- listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false");
+ if (tableGuid.equals(targetGuid)) {
+ listManager.getNoteTableModel().proxyModel.setData(i, Global.noteTableSynchronizedPosition, "false");
return;
}
}
}
- */
+
logger.log(logger.EXTREME, "Leaving NeverNote.setNoteDirty()");
}
@SuppressWarnings("unused")
noteCache.remove(guid);
noteCache.put(guid, unicode.toString());
if (guid.equals(currentNoteGuid)) {
- noteDirty = true;
- browserWindow.getBrowser().setContent(unicode);
+ int index = tabBrowser.currentIndex();
+ noteDirty.put(index, true);
+ browserWindow.setContent(unicode);
}
if (save) {
thumbnailRunner.addWork("GENERATE "+ guid);
}
}
+
+// private void saveNoteTabBrowser(String guid, String content, Boolean save,
+// BrowserWindow browser) {
+// QTextCodec codec = QTextCodec.codecForName("UTF-8");
+// QByteArray unicode = codec.fromUnicode(content);
+// noteCache.remove(guid);
+// noteCache.put(guid, unicode.toString());
+// if (save) {
+// thumbnailRunner.addWork("GENERATE " + guid);
+// saveNote(guid, browser);
+// }
+// }
+
private void saveNote() {
- if (noteDirty) {
- saveNote(currentNoteGuid, browserWindow);
- thumbnailRunner.addWork("GENERATE "+ currentNoteGuid);
- noteDirty = false;
+ // すべてのタブに対して、Dirtyを確認し、trueならセーブする
+ Collection<Integer> dirtyIndex = noteDirty.keySet();
+ Iterator<Integer> indexIterator = dirtyIndex.iterator();
+ for (boolean isNoteDirty: noteDirty.values()) {
+ int index = indexIterator.next();
+ if (isNoteDirty) {
+ if (index < 0) {
+ return;
+ }
+ BrowserWindow b = tabWindows.get(index).getBrowserWindow();
+ String guid = b.getNote().getGuid();
+ saveNote(guid, b);
+ thumbnailRunner.addWork("GENERATE "+ guid);
+ noteDirty.put(index, false);
+ }
}
}
private void saveNote(String guid, BrowserWindow window) {
logger.log(logger.EXTREME, "Inside NeverNote.saveNote()");
- logger.log(logger.EXTREME, "Note is dirty.");
waitCursor(true);
logger.log(logger.EXTREME, "Saving to cache");
// Get a note from Evernote (and put it in the browser)
private void refreshEvernoteNote(boolean reload) {
logger.log(logger.HIGH, "Entering NeverNote.refreshEvernoteNote");
+
if (Global.disableViewing) {
browserWindow.setEnabled(false);
return;
}
- inkNote = false;
- if (!Global.showDeleted)
- browserWindow.setReadOnly(false);
+ inkNote.put(tabBrowser.currentIndex(), false);
+ readOnly.put(tabBrowser.currentIndex(), false);
+
+ if (Global.showDeleted || currentNoteGuid == null || currentNoteGuid.equals("")) {
+ readOnly.put(tabBrowser.currentIndex(), true);
+ }
Global.cryptCounter =0;
- if (currentNoteGuid.equals("")) {
+ if (readOnly.get(tabBrowser.currentIndex())) {
browserWindow.setReadOnly(true);
- return;
}
if (!reload)
browserWindow.loadingData(true);
currentNote = conn.getNoteTable().getNote(currentNoteGuid, true,true,false,false,true);
- if (currentNote == null)
+ if (currentNote == null) {
+ waitCursor(false);
return;
+ }
- loadNoteBrowserInformation(browserWindow);
+ tabBrowser.setTabTitle(tabBrowser.currentIndex(), currentNote.getTitle());
+
+ loadNoteBrowserInformation(browserWindow, currentNoteGuid, currentNote);
}
- private void loadNoteBrowserInformation(BrowserWindow browser) {
+ private void loadNoteBrowserInformation(BrowserWindow browser, String guid, Note note) {
NoteFormatter formatter = new NoteFormatter(logger, conn, tempFiles);
- formatter.setNote(currentNote, Global.pdfPreview());
+ formatter.setNote(note, Global.pdfPreview());
formatter.setHighlight(listManager.getEnSearch());
QByteArray js;
- if (!noteCache.containsKey(currentNoteGuid) || conn.getNoteTable().isThumbnailNeeded(currentNoteGuid)) {
+ int tabIndex = -1;
+
+ // 対象のタブインデックスを取得
+ for (TabBrowse tab: tabWindows.values()) {
+ if (tab.getBrowserWindow() == browser) {
+ tabIndex = tabBrowser.indexOf(tab);
+ break;
+ }
+ }
+
+ if (!noteCache.containsKey(guid)) {
js = new QByteArray();
// We need to prepend the note with <HEAD></HEAD> or encoded characters are ugly
js.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">");
js.append("<style type=\"text/css\">.en-crypt-temp { border-collapse:collapse; border-style:solid; border-color:blue; padding:0.0mm 0.0mm 0.0mm 0.0mm; }</style>");
js.append("<style type=\"text/css\">en-hilight { background-color: rgb(255,255,0) }</style>");
- js.append("<style> img { max-width:100%; }</style>");
+ js.append("<style> img { height:auto; width:auto; max-height:auto; max-width:100%; }</style>");
+ if (Global.displayRightToLeft())
+ js.append("<style> body { direction:rtl; }</style>");
js.append("<style type=\"text/css\">en-spell { text-decoration: none; border-bottom: dotted 1px #cc0000; }</style>");
js.append("</head>");
- formatter.setNote(currentNote, Global.pdfPreview());
+ formatter.setNote(note, Global.pdfPreview());
js.append(formatter.rebuildNoteHTML());
js.append("</HTML>");
js.replace("<!DOCTYPE en-note SYSTEM 'http://xml.evernote.com/pub/enml.dtd'>", "");
js.replace("<!DOCTYPE en-note SYSTEM 'http://xml.evernote.com/pub/enml2.dtd'>", "");
js.replace("<?xml version='1.0' encoding='UTF-8'?>", "");
- browser.getBrowser().setContent(js);
- noteCache.put(currentNoteGuid, js.toString());
+// if (Global.enableHTMLEntitiesFix) {
+// browser.getBrowser().setContent(new QByteArray(StringEscapeUtils.unescapeHtml(js.toString())));
+// } else
+ browser.setContent(js);
+ noteCache.put(guid, js.toString());
if (formatter.resourceError)
- resourceErrorMessage();
- inkNote = formatter.readOnly;
- if (inkNote)
- readOnlyCache.put(currentNoteGuid, true);
+ resourceErrorMessage(tabIndex);
+ if (formatter.formatError) {
+ waitCursor(false);
+ QMessageBox.information(this, tr("Error"),
+ tr("NeighborNote had issues formatting this note." +
+ " To protect your data this note is being marked as read-only."));
+ waitCursor(true);
+ }
+
+ if (tabIndex >= 0) {
+ readOnly.put(tabIndex, formatter.readOnly);
+ inkNote.put(tabIndex, formatter.inkNote);
+ }
+
+ if (tabIndex >= 0 && readOnly.get(tabIndex)) {
+ readOnlyCache.put(guid, true);
+ }
+ if (tabIndex >= 0 && inkNote.get(tabIndex)) {
+ inkNoteCache.put(guid, true);
+ }
+
} else {
logger.log(logger.HIGH, "Note content is being pulled from the cache");
- String cachedContent = formatter.modifyCachedTodoTags(noteCache.get(currentNoteGuid));
+ String cachedContent = formatter.modifyCachedTodoTags(noteCache.get(guid));
js = new QByteArray(cachedContent);
- browser.getBrowser().setContent(js);
- if (readOnlyCache.containsKey(currentNoteGuid))
- inkNote = true;
+ browser.setContent(js);
+ if (readOnlyCache.containsKey(guid) && tabIndex >= 0) {
+ readOnly.put(tabIndex, true);
+ } else {
+ readOnly.put(tabIndex, false);
+ }
+ if (inkNoteCache.containsKey(guid) && tabIndex >= 0) {
+ inkNote.put(tabIndex, true);
+ } else {
+ inkNote.put(tabIndex, false);
+ }
}
- if (conn.getNoteTable().isThumbnailNeeded(currentNoteGuid)) {
- thumbnailHTMLReady(currentNoteGuid, js, Global.calculateThumbnailZoom(js.toString()));
+ if (conn.getNoteTable().isThumbnailNeeded(guid)) {
+ thumbnailHTMLReady(guid, js, Global.calculateThumbnailZoom(js.toString()));
}
-
+ if (tabIndex >= 0 && (readOnly.get(tabIndex) || inkNote.get(tabIndex) ||
+ (note.getAttributes() != null && note.getAttributes().getContentClass() != null && note.getAttributes().getContentClass() != "")))
+ browser.getBrowser().page().setContentEditable(false); // We don't allow editing of ink notes
+ else
+ browser.getBrowser().page().setContentEditable(true);
+ if (tabIndex >= 0) {
+ browser.setReadOnly(readOnly.get(tabIndex));
+ deleteButton.setEnabled(!readOnly.get(tabIndex));
+ tagButton.setEnabled(!readOnly.get(tabIndex));
+ menuBar.noteDelete.setEnabled(!readOnly.get(tabIndex));
+ menuBar.noteTags.setEnabled(!readOnly.get(tabIndex));
+ }
+ browser.setNote(note);
- browser.getBrowser().page().setContentEditable(!inkNote); // We don't allow editing of ink notes
- browser.setNote(currentNote);
+ if (note != null && note.getNotebookGuid() != null &&
+ conn.getNotebookTable().isLinked(note.getNotebookGuid())) {
+ deleteButton.setEnabled(false);
+ menuBar.notebookDeleteAction.setEnabled(false);
+ } else {
+ deleteButton.setEnabled(true);
+ menuBar.notebookDeleteAction.setEnabled(true);
+ }
// Build a list of non-closed notebooks
List<Notebook> nbooks = new ArrayList<Notebook>();
nbooks.add(listManager.getNotebookIndex().get(i));
}
- browser.setNotebookList(nbooks);
- browser.setTitle(currentNote.getTitle());
- browser.setTag(getTagNamesForNote(currentNote));
- browser.setAuthor(currentNote.getAttributes().getAuthor());
-
- browser.setAltered(currentNote.getUpdated());
- browser.setCreation(currentNote.getCreated());
- if (currentNote.getAttributes().getSubjectDate() > 0)
- browser.setSubjectDate(currentNote.getAttributes().getSubjectDate());
+ browser.setTitle(note.getTitle());
+ browser.setTag(getTagNamesForNote(note));
+ browser.setAuthor(note.getAttributes().getAuthor());
+
+ browser.setAltered(note.getUpdated());
+ browser.setCreation(note.getCreated());
+ if (note.getAttributes().getSubjectDate() > 0)
+ browser.setSubjectDate(note.getAttributes().getSubjectDate());
else
- browser.setSubjectDate(currentNote.getCreated());
- browser.setUrl(currentNote.getAttributes().getSourceURL());
- browser.setAllTags(listManager.getTagIndex());
- browser.setCurrentTags(currentNote.getTagNames());
- noteDirty = false;
- scrollToGuid(currentNoteGuid);
+ browser.setSubjectDate(note.getCreated());
+ browser.setUrl(note.getAttributes().getSourceURL());
+
+ FilterEditorTags tagFilter = new FilterEditorTags(conn, logger);
+ List<Tag> tagList = tagFilter.getValidTags(note);
+ browser.setAllTags(tagList);
+
+ browser.setCurrentTags(note.getTagNames());
+ for (TabBrowse tab: tabWindows.values()) {
+ if (tab.getBrowserWindow().getNote().getGuid().equals(guid)) {
+ int index = tabBrowser.indexOf(tab);
+ noteDirty.put(index, false);
+ break;
+ }
+ }
+
+ scrollToGuid(guid);
browser.loadingData(false);
if (thumbnailViewer.isActiveWindow())
thumbnailView();
+
+ FilterEditorNotebooks notebookFilter = new FilterEditorNotebooks(conn, logger);
+ browser.setNotebookList(notebookFilter.getValidNotebooks(note, listManager.getNotebookIndex()));
+
waitCursor(false);
logger.log(logger.HIGH, "Leaving NeverNote.refreshEvernoteNote");
}
+
+ @SuppressWarnings("unused")
+ private void toggleNoteAttributes() {
+ menuBar.noteAttributes.setChecked(!menuBar.noteAttributes.isChecked());
+ toggleNoteInformation();
+ }
+
// Save a generated thumbnail
private void toggleNoteInformation() {
logger.log(logger.HIGH, "Entering NeverNote.toggleNoteInformation");
- browserWindow.toggleInformation();
+
+ boolean isChecked = menuBar.noteAttributes.isChecked();
+
+ for(int i = 0; i < tabBrowser.count(); i++){
+ BrowserWindow browser = ((TabBrowse) tabBrowser.widget(i)).getBrowserWindow();
+ boolean isExtended = browser.isExtended();
+ if((isChecked && !isExtended) || (!isChecked && isExtended)){
+ browser.toggleInformation();
+ }
+ }
+
menuBar.noteAttributes.setChecked(browserWindow.isExtended());
Global.saveWindowVisible("noteInformation", browserWindow.isExtended());
logger.log(logger.HIGH, "Leaving NeverNote.toggleNoteInformation");
}
+
// Listener triggered when a print button is pressed
@SuppressWarnings("unused")
private void printNote() {
@SuppressWarnings("unused")
private void fullReindex() {
logger.log(logger.HIGH, "Entering NeverNote.fullReindex");
- // If we are deleting non-trash notes
- if (currentNote == null) return;
- if (currentNote.getDeleted() == 0) {
- if (QMessageBox.question(this, tr("Confirmation"), tr("This will cause all notes & attachments to be reindexed, "+
- "but please be aware that depending upon the size of your database updating all these records " +
- "can be time consuming and NeverNote will be unresponsive until it is complete. Do you wish to continue?"),
- QMessageBox.StandardButton.Yes,
- QMessageBox.StandardButton.No)==StandardButton.No.value() && Global.verifyDelete() == true) {
- return;
- }
- }
- waitCursor(true);
- setMessage(tr("Marking notes for reindex."));
- conn.getNoteTable().reindexAllNotes();
- conn.getNoteTable().noteResourceTable.reindexAll();
+ indexRunner.addWork("REINDEXALL");
setMessage(tr("Database will be reindexed."));
- waitCursor(false);
- logger.log(logger.HIGH, "Leaving NeverNote.fullRefresh");
+ logger.log(logger.HIGH, "Leaving NeverNote.fullReindex");
}
// Listener when a user wants to reindex a specific note
@SuppressWarnings("unused")
private void reindexNote() {
logger.log(logger.HIGH, "Entering NeverNote.reindexNote");
for (int i=0; i<selectedNoteGUIDs.size(); i++) {
- conn.getNoteTable().setIndexNeeded(selectedNoteGUIDs.get(i), true);
+ indexRunner.addWork("REINDEXNOTE "+selectedNoteGUIDs.get(i));
}
if (selectedNotebookGUIDs.size() > 1)
setMessage(tr("Notes will be reindexed."));
if (currentNoteGuid.equals(""))
return;
+ String title = null;
+ if (selectedNoteGUIDs.size() == 1)
+ title = conn.getNoteTable().getNote(selectedNoteGUIDs.get(0),false,false,false,false,false).getTitle();
+
// If we are deleting non-trash notes
if (currentNote.isActive()) {
if (Global.verifyDelete()) {
- if (QMessageBox.question(this, tr("Confirmation"), tr("Delete selected note(s)?"),
+ String msg;
+ if (selectedNoteGUIDs.size() > 1) {
+ msg = new String(tr("Delete ") +selectedNoteGUIDs.size() +" notes?");
+ } else {
+ if (title != null)
+ msg = new String(tr("Delete note \"") +title +"\"?");
+ else
+ msg = new String(tr("Delete note selected note?"));
+ }
+ if (QMessageBox.question(this, tr("Confirmation"), msg,
QMessageBox.StandardButton.Yes,
QMessageBox.StandardButton.No)==StandardButton.No.value() && Global.verifyDelete() == true) {
return;
}
}
- if (selectedNoteGUIDs.size() == 0 && !currentNoteGuid.equals(""))
+ if (selectedNoteGUIDs.size() == 0 && !currentNoteGuid.equals("")) {
selectedNoteGUIDs.add(currentNoteGuid);
- for (int i=0; i<selectedNoteGUIDs.size(); i++) {
- listManager.deleteNote(selectedNoteGUIDs.get(i));
}
+
+ List<String> deleteNoteGUIDs = new ArrayList<String>(selectedNoteGUIDs); // タブを閉じるとselectedNoteGUIDsが変わってしまうのでその前にコピー
+ closeTabs(selectedNoteGUIDs);
+ for (String guid : deleteNoteGUIDs) {
+ listManager.deleteNote(guid);
+ }
+
+ closeExternalWindows(deleteNoteGUIDs);
} else {
// If we are deleting from the trash.
if (Global.verifyDelete()) {
- if (QMessageBox.question(this, "Confirmation", "Permanently delete selected note(s)?",
+ String msg;
+ if (selectedNoteGUIDs.size() > 1) {
+ msg = new String(tr("Permanently delete ") +selectedNoteGUIDs.size() +" notes?");
+ } else {
+ if (title != null)
+ msg = new String(tr("Permanently delete note \"") +title +"\"?");
+ else
+ msg = new String(tr("Permanently delete note selected note?"));
+ }
+ if (QMessageBox.question(this, "Confirmation", msg,
QMessageBox.StandardButton.Yes,
- QMessageBox.StandardButton.No)==StandardButton.No.value()) {
+ QMessageBox.StandardButton.No)==StandardButton.No.value()) {
return;
}
}
if (selectedNoteGUIDs.size() == 0 && !currentNoteGuid.equals(""))
selectedNoteGUIDs.add(currentNoteGuid);
- for (int i=selectedNoteGUIDs.size()-1; i>=0; i--) {
+
+ List<String> deleteNoteGUIDs = new ArrayList<String>(selectedNoteGUIDs); // タブを閉じるとselectedNoteGUIDsが変わってしまうのでその前にコピー
+ for (int i=deleteNoteGUIDs.size()-1; i>=0; i--) {
for (int j=listManager.getNoteTableModel().rowCount()-1; j>=0; j--) {
QModelIndex modelIndex = listManager.getNoteTableModel().index(j, Global.noteTableGuidPosition);
if (modelIndex != null) {
SortedMap<Integer, Object> ix = listManager.getNoteTableModel().itemData(modelIndex);
String tableGuid = (String)ix.values().toArray()[0];
- if (tableGuid.equals(selectedNoteGUIDs.get(i))) {
+ if (tableGuid.equals(deleteNoteGUIDs.get(i))) {
listManager.getNoteTableModel().removeRow(j);
j=-1;
}
}
}
- listManager.expungeNote(selectedNoteGUIDs.get(i));
+ closeTab(deleteNoteGUIDs.get(i));
+ listManager.expungeNote(deleteNoteGUIDs.get(i));
+
+ conn.getHistoryTable().expungeHistory(deleteNoteGUIDs.get(i));
+ conn.getExcludedTable().expungeExcludedNote(deleteNoteGUIDs.get(i));
+ conn.getStaredTable().expungeStaredNote(deleteNoteGUIDs.get(i));
}
+
+ closeExternalWindows(deleteNoteGUIDs);
}
- currentNoteGuid = "";
+
+ if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+ menuBar.noteAddNewTab.setEnabled(false);
+ }
+
listManager.loadNotesIndex();
noteIndexUpdated(false);
refreshEvernoteNote(true);
scrollToGuid(currentNoteGuid);
logger.log(logger.HIGH, "Leaving NeverNote.deleteNote");
}
+
+ // 対象ノートをタブで開いていたら閉じる
+ private void closeTabs(List<String> noteGUIDs) {
+ for (String guid : noteGUIDs) {
+ closeTab(guid);
+ }
+ }
+
+ // 対象ノートをタブで開いていたら閉じる
+ private void closeTab(String noteGUID) {
+ List<TabBrowse> closeTabs = new ArrayList<TabBrowse>();
+
+ for (TabBrowse tab : tabWindows.values()) {
+ String guid = tab.getBrowserWindow().getNote().getGuid();
+
+ if (guid.equals(noteGUID)) {
+ closeTabs.add(tab);
+ }
+ }
+
+ for (TabBrowse tab : closeTabs) {
+ tabWindowClosing(tab);
+ }
+ }
+
+ // 対象ノートを外部ウィンドウで開いていたら閉じる
+ private void closeExternalWindows(List<String> noteGUIDs) {
+ List<ExternalBrowse> closeWindows = new ArrayList<ExternalBrowse>();
+
+ for (Map.Entry<String, ExternalBrowse> e : externalWindows.entrySet()) {
+ for (String guid : noteGUIDs) {
+ if (guid.equals(e.getKey())) {
+ closeWindows.add(e.getValue());
+ }
+ }
+ }
+
+ for (ExternalBrowse externalBrowse : closeWindows) {
+ externalBrowse.close();
+ }
+ }
+
// Add a new note
- @SuppressWarnings("unused")
private void addNote() {
logger.log(logger.HIGH, "Inside NeverNote.addNote");
// browserWindow.setEnabled(true);
String notebook = null;
listManager.getNotebookIndex().get(0).getGuid();
List<QTreeWidgetItem> selectedNotebook = notebookTree.selectedItems();
- if (selectedNotebook.size() > 0 && !selectedNotebook.get(0).text(0).equalsIgnoreCase("All Notebooks")) {
+ if (selectedNotebook.size() > 0 && !selectedNotebook.get(0).text(0).equalsIgnoreCase("All Notebooks") && !selectedNotebook.get(0).text(2).equalsIgnoreCase("STACK")) {
QTreeWidgetItem currentSelectedNotebook = selectedNotebook.get(0);
notebook = currentSelectedNotebook.text(2);
} else {
}
}
if (!match)
- goodNotebooks.add(listManager.getNotebookIndex().get(i).deepCopy());
+ //goodNotebooks.add(listManager.getNotebookIndex().get(i).deepCopy());
+ goodNotebooks.add((Notebook)Global.deepCopy(listManager.getNotebookIndex().get(i)));
}
// Now we have a list of good notebooks, so we can look for the default
found = false;
newNote.setUpdateSequenceNum(0);
newNote.setGuid(randint);
newNote.setNotebookGuid(notebook);
- newNote.setTitle("");
+ newNote.setTitle("Untitled Note");
newNote.setContent(noteString.toString());
newNote.setDeleted(0);
newNote.setCreated(System.currentTimeMillis());
}
conn.getNoteTable().addNote(newNote, true);
- listManager.getUnsynchronizedNotes().add(newNote.getGuid());
- listManager.addNote(newNote);
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setGuid(newNote.getGuid());
+ metadata.setDirty(true);
+ listManager.addNote(newNote, metadata);
// noteTableView.insertRow(newNote, true, -1);
+ String prevCurrentNoteGuid = new String(currentNoteGuid);
+
currentNote = newNote;
currentNoteGuid = currentNote.getGuid();
+ // IFIXED こいつのせいで、ノート追加時にcurrentNoteGuidが更新されないので消す
+ // noteTableView.clearSelection();
+
+ // 新規に作成したノートとそれまで開いていたノートの関連性を追加
+ if (prevCurrentNoteGuid != null && !prevCurrentNoteGuid.equals("")) {
+ if (currentNoteGuid != null && !currentNoteGuid.equals("")) {
+ conn.getHistoryTable().addHistory("addNewNote", prevCurrentNoteGuid, currentNoteGuid);
+ }
+ }
+
refreshEvernoteNote(true);
listManager.countNotebookResults(listManager.getNoteIndex());
browserWindow.titleLabel.setFocus();
// If the window is hidden, then we want to popup this in an external window &
if (!isVisible())
listDoubleClick();
+ waitCursor(false);
logger.log(logger.HIGH, "Leaving NeverNote.addNote");
}
// Restore a note from the trash;
@SuppressWarnings("unused")
private void updateNoteTitle(String guid, String title) {
listManager.setNoteSynchronized(guid, false);
+
+ // We do this manually because if we've edited the note in an
+ // external window we run into the possibility of signal recursion
+ // looping.
+ if (guid.equals(currentNoteGuid)) {
+ browserWindow.titleLabel.blockSignals(true);
+ browserWindow.titleLabel.setText(title);
+ browserWindow.titleLabel.blockSignals(false);
+ }
}
// Signal received that note content has changed. Normally we just need the guid to remove
// it from the cache.
@SuppressWarnings("unused")
private void invalidateNoteCache(String guid, String content) {
- String v = noteCache.remove(guid);
- if (content != null) {
- //noteCache.put(guid, content);
- }
+ noteCache.remove(guid);
+ refreshEvernoteNote(true);
}
// Signal received that a note guid has changed
@SuppressWarnings("unused")
private void noteGuidChanged(String oldGuid, String newGuid) {
if (noteCache.containsKey(oldGuid)) {
- String cache = noteCache.get(oldGuid);
- noteCache.put(newGuid, cache);
- noteCache.remove(oldGuid);
+ if (!oldGuid.equals(currentNoteGuid)) {
+ String cache = noteCache.get(oldGuid);
+ noteCache.put(newGuid, cache);
+ noteCache.remove(oldGuid);
+ } else {
+ noteCache.remove(oldGuid);
+ noteCache.put(newGuid, browserWindow.getContent());
+ }
}
+
listManager.updateNoteGuid(oldGuid, newGuid, false);
if (currentNoteGuid.equals(oldGuid)) {
if (currentNote != null)
currentNote.setGuid(newGuid);
currentNoteGuid = newGuid;
}
- if (externalWindows.containsKey(oldGuid)) {
+
+ if (externalWindows.containsKey(oldGuid)) {
ExternalBrowse b = externalWindows.get(oldGuid);
externalWindows.remove(oldGuid);
b.getBrowserWindow().getNote().setGuid(newGuid);
externalWindows.put(newGuid, b);
}
+
+ for(int i = 0; i < tabBrowser.count(); i++){
+ TabBrowse b = (TabBrowse)tabBrowser.widget(i);
+ if (b.getBrowserWindow().getNote().getGuid().equals(oldGuid)) {
+ b.getBrowserWindow().getNote().setGuid(newGuid);
+ }
+ }
+
for (int i=0; i<listManager.getNoteIndex().size(); i++) {
if (listManager.getNoteIndex().get(i).getGuid().equals(newGuid)) {
- noteTableView.proxyModel.addGuid(newGuid);
+ noteTableView.proxyModel.addGuid(newGuid, listManager.getNoteMetadata().get(newGuid));
i=listManager.getNoteIndex().size();
}
}
- if (listManager.getNoteTableModel().titleColors.containsKey(oldGuid)) {
- int color = listManager.getNoteTableModel().titleColors.get(oldGuid);
- listManager.getNoteTableModel().titleColors.put(newGuid, color);
- listManager.getNoteTableModel().titleColors.remove(oldGuid);
+
+ if (listManager.getNoteTableModel().metaData.containsKey(oldGuid)) {
+ NoteMetadata meta = listManager.getNoteTableModel().metaData.get(oldGuid);
+ listManager.getNoteTableModel().metaData.put(newGuid, meta);
+ listManager.getNoteTableModel().metaData.remove(oldGuid);
}
}
+
// Toggle the note editor button bar
+ // すべてのタブに
private void toggleEditorButtonBar() {
- if (browserWindow.buttonsVisible) {
- browserWindow.hideButtons();
- menuBar.showEditorBar.setChecked(browserWindow.buttonsVisible);
-// Global.saveWindowVisible("editorButtonBar", browserWindow.buttonsVisible);
- } else {
- browserWindow.buttonsVisible = true;
- showEditorButtons(browserWindow);
+ boolean isChecked = menuBar.showEditorBar.isChecked();
+
+ for(int i = 0; i < tabBrowser.count(); i++){
+ BrowserWindow browser = ((TabBrowse) tabBrowser.widget(i)).getBrowserWindow();
+ boolean isVisible = browser.buttonsVisible;
+
+ if (isChecked && !isVisible) {
+ browser.buttonsVisible = true;
+ showEditorButtons(browser);
+ } else if(!isChecked && isVisible) {
+ browser.hideButtons();
+ }
}
+
Global.saveWindowVisible("editorButtonBar", browserWindow.buttonsVisible);
}
+
// Show editor buttons
private void showEditorButtons(BrowserWindow browser) {
browser.buttonLayout.setVisible(true);
}
private void duplicateNote(String guid) {
- Note oldNote = conn.getNoteTable().getNote(guid, true, true, false, false, false);
+ Note oldNote = conn.getNoteTable().getNote(guid, true, false,false,false,true);
List<Resource> resList = conn.getNoteTable().noteResourceTable.getNoteResources(guid, true);
- oldNote.setContent(conn.getNoteTable().getNoteContentBinary(guid));
+ oldNote.setContent(conn.getNoteTable().getNoteContentNoUTFConversion(guid));
oldNote.setResources(resList);
duplicateNote(oldNote);
}
Long l = new Long(currentTime.getTimeInMillis());
String newGuid = new String(Long.toString(l));
- Note newNote = oldNote.deepCopy();
+// Note newNote = oldNote.deepCopy();
+ Note newNote = (Note)Global.deepCopy(oldNote);
newNote.setUpdateSequenceNum(0);
newNote.setGuid(newGuid);
newNote.setDeleted(0);
newNote.setActive(true);
+
+ /*
+ List<String> tagNames = new ArrayList<String>();
+ List<String> tagGuids = new ArrayList<String>();;
+ for (int i=0; i<oldNote.getTagGuidsSize(); i++) {
+ tagNames.add(oldNote.getTagNames().get(i));
+ tagGuids.add(oldNote.getTagGuids().get(i));
+ }
+
+ // Sort note Tags to make them look nice
+ for (int i=0; i<tagNames.size()-1; i++) {
+ if (tagNames.get(i).compareTo(tagNames.get(i+1))<0) {
+ String n1 = tagNames.get(i);
+ String n2 = tagNames.get(i+1);
+ tagNames.set(i, n2);
+ tagNames.set(i+1, n1);
+ }
+ }
+ newNote.setTagGuids(tagGuids);
+ newNote.setTagNames(tagNames);
+
+ // Add tag guids to note
+ */
+
+ // Duplicate resources
List<Resource> resList = oldNote.getResources();
if (resList == null)
resList = new ArrayList<Resource>();
resList.get(i).setGuid(newResGuid);
resList.get(i).setUpdateSequenceNum(0);
resList.get(i).setActive(true);
- conn.getNoteTable().noteResourceTable.saveNoteResource(new Resource(resList.get(i).deepCopy()), true);
+ conn.getNoteTable().noteResourceTable.saveNoteResource(
+ (Resource)Global.deepCopy(resList.get(i)), true);
}
newNote.setResources(resList);
- listManager.addNote(newNote);
+
+ // 操作履歴と除外ノートとスター付きノートも複製する
+ if(Global.getDuplicateRensoNote()) {
+ conn.getHistoryTable().duplicateHistory(newGuid, oldNote.getGuid());
+ conn.getExcludedTable().duplicateExcludedNotes(newGuid, oldNote.getGuid());
+ conn.getStaredTable().duplicateStaredNotes(newGuid, oldNote.getGuid());
+ }
+
+ // Add note to the database
conn.getNoteTable().addNote(newNote, true);
- listManager.getUnsynchronizedNotes().add(newNote.getGuid());
- noteTableView.insertRow(newNote, true, -1);
+ NoteMetadata metaData = new NoteMetadata();
+ NoteMetadata oldMeta = listManager.getNoteMetadata().get(oldNote.getGuid());
+ metaData.copy(oldMeta);
+ metaData.setGuid(newNote.getGuid());
+ listManager.addNote(newNote, metaData);
+ noteTableView.insertRow(newNote, metaData, true, -1);
+ currentNoteGuid = newNote.getGuid();
+ currentNote = newNote;
+ refreshEvernoteNote(true);
listManager.countNotebookResults(listManager.getNoteIndex());
waitCursor(false);
+
}
// View all notes
@SuppressWarnings("unused")
notebookTree.selectGuid("");
}
notebookTreeSelection();
+ refreshEvernoteNote(true);
+
+ // ゴミ箱から元の画面に戻す。連想ノートリストをONに。
+ if (!rensoNoteListDock.isEnabled()) {
+ rensoNoteListDock.setEnabled(true);
+ }
}
// Merge notes
@SuppressWarnings("unused")
logger.log(logger.EXTREME, "Children count: "+sources.size());
mergeNoteContents(masterGuid, sources);
currentNoteGuid = masterGuid;
+
+ // 操作履歴と除外ノートとスター付きノートをマージ
+ if(Global.getMergeRensoNote()) {
+ for (int i = 0; i < sources.size(); i++) {
+ String childGuid = sources.get(i);
+ if(masterGuid != null && childGuid != null) {
+ if(!masterGuid.equals(childGuid)) {
+ conn.getHistoryTable().mergeHistoryGuid(masterGuid, childGuid);
+ conn.getExcludedTable().mergeHistoryGuid(masterGuid, childGuid);
+ conn.getStaredTable().mergeHistoryGuid(masterGuid, childGuid);
+ }
+ }
+ }
+ }
+
+ // マージしたノート(child)を外部ウィンドウで開いていたら、閉じる
+ Collection<ExternalBrowse> windows = externalWindows.values();
+ Iterator<ExternalBrowse> windowIterator = windows.iterator();
+ Collection<String> guids = externalWindows.keySet();
+ Iterator<String> guidIterator = guids.iterator();
+ List<ExternalBrowse> closeWindows = new ArrayList<ExternalBrowse>();
+
+ while (windowIterator.hasNext()) {
+ ExternalBrowse browser = windowIterator.next();
+ String guid = guidIterator.next();
+
+ for (int i = 0; i < sources.size(); i++) {
+ if (guid.equals(sources.get(i))) {
+ closeWindows.add(browser);
+ }
+ }
+ }
+
+ for (int i = closeWindows.size() - 1; i >= 0; i--) {
+ closeWindows.get(i).close();
+ }
+
+ // マージしたノート（child）をタブで開いていたら、閉じる
+ List<TabBrowse> closeTabs = new ArrayList<TabBrowse>();
+ for (TabBrowse tab : tabWindows.values()) {
+ String guid = tab.getBrowserWindow().getNote().getGuid();
+
+ for (String source : sources) {
+ if (guid.equals(source)) {
+ closeTabs.add(tab);
+ }
+ }
+ }
+ for (TabBrowse tab : closeTabs) {
+ tabWindowClosing(tab);
+ }
+
noteIndexUpdated(false);
+ // IFIXED
+ // マージ後の新しいノートコンテンツを表示するためキャッシュを削除
+ noteCache.remove(masterGuid);
+
refreshEvernoteNote(true);
waitCursor(false);
}
// A resource within a note has had a guid change
@SuppressWarnings("unused")
private void noteResourceGuidChanged(String noteGuid, String oldGuid, String newGuid) {
- if (!oldGuid.equals(newGuid))
+ if (oldGuid != null && !oldGuid.equals(newGuid))
Global.resourceMap.put(oldGuid, newGuid);
}
// View a thumbnail of the note
i=listManager.getMasterNoteIndex().size();
}
}
- msg = "An error has happened while saving the note \"" +title+
- "\".\n\nThis is probably due to a document that is too complex for Nevernote to process. "+
+ msg = tr("An error has happened while saving the note \"") +title+
+ tr("\".\n\nThis is probably due to a document that is too complex for NeighborNote to process. "+
"As a result, changes to the note may not be saved properly in the database."+
"\n\nA cached copy is being preserved so you can recover any data, but data may" +
- "\nbe lost. Please review the note to recover any critical data before restarting.";
+ "\nbe lost. Please review the note to recover any critical data before restarting.");
QMessageBox.information(this, tr("Error Saving Note"), tr(msg));
}
private void setupOnlineMenu() {
if (!Global.isConnected) {
menuBar.noteOnlineHistoryAction.setEnabled(false);
+ menuBar.selectiveSyncAction.setEnabled(false);
return;
} else {
menuBar.noteOnlineHistoryAction.setEnabled(true);
+ menuBar.selectiveSyncAction.setEnabled(true);
}
}
@SuppressWarnings("unused")
versions = null;
try {
if (Global.isPremium())
- versions = syncRunner.noteStore.listNoteVersions(syncRunner.authToken, currentNoteGuid);
+ versions = syncRunner.localNoteStore.listNoteVersions(syncRunner.authToken, currentNoteGuid);
else
versions = new ArrayList<NoteVersionId>();
- currentOnlineNote = syncRunner.noteStore.getNote(syncRunner.authToken, currentNoteGuid, true, true, false, false);
+ currentOnlineNote = syncRunner.localNoteStore.getNote(syncRunner.authToken, currentNoteGuid, true, true, false, false);
} catch (EDAMUserException e) {
setMessage("EDAMUserException: " +e.getMessage());
return;
} catch (EDAMSystemException e) {
+ if (e.getErrorCode() == EDAMErrorCode.RATE_LIMIT_REACHED) {
+ QMessageBox.warning(this, tr("Rate limit reached"), tr("Evernote usage has been temporarily exceeded. Please try again in ") + + e.getRateLimitDuration() + tr(" seconds."));
+ }
setMessage("EDAMSystemException: " +e.getMessage());
return;
} catch (EDAMNotFoundException e) {
setMessage(tr("Note not found on server."));
- QMessageBox.information(this, "Error", "This note could not be found on Evernote's servers.");
+ QMessageBox.information(this, tr("Error"), tr("This note could not be found on Evernote's servers."));
return;
} catch (TException e) {
setMessage("EDAMTransactionException: " +e.getMessage());
// If we've gotten this far, we have a good note.
if (historyWindow == null) {
- historyWindow = new OnlineNoteHistory(logger, conn);
+ historyWindow = new OnlineNoteHistory(logger, conn, cbObserver);
+
historyWindow.historyCombo.activated.connect(this, "reloadHistoryWindow(String)");
historyWindow.restoreAsNew.clicked.connect(this, "restoreHistoryNoteAsNew()");
historyWindow.restore.clicked.connect(this, "restoreHistoryNote()");
try {
if (index > -1) {
usn = versions.get(index).getUpdateSequenceNum();
- historyNote = syncRunner.noteStore.getNoteVersion(syncRunner.authToken, currentNoteGuid, usn, true, true, true);
+ historyNote = syncRunner.localNoteStore.getNoteVersion(syncRunner.authToken, currentNoteGuid, usn, true, true, true);
} else
- historyNote = syncRunner.noteStore.getNote(syncRunner.authToken, currentNoteGuid, true,true,true,true);
+ historyNote = syncRunner.localNoteStore.getNote(syncRunner.authToken, currentNoteGuid, true,true,true,true);
} catch (EDAMUserException e) {
setMessage("EDAMUserException: " +e.getMessage());
waitCursor(false);
return null;
} catch (EDAMSystemException e) {
+ if (e.getErrorCode() == EDAMErrorCode.RATE_LIMIT_REACHED) {
+ QMessageBox.warning(this, tr("Rate limit reached"), tr("Evernote usage has been temporarily exceeded. Please try again in ") + + e.getRateLimitDuration() + tr(" seconds."));
+ }
setMessage("EDAMSystemException: " +e.getMessage());
waitCursor(false);
return null;
n.getResources().get(i).setActive(true);
conn.getNoteTable().noteResourceTable.saveNoteResource(n.getResources().get(i), true);
}
- listManager.addNote(n);
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setGuid(n.getGuid());
+ listManager.addNote(n, metadata);
conn.getNoteTable().addNote(n, true);
refreshEvernoteNote(true);
setMessage(tr("Note has been restored."));
}
-
-
-
- //**********************************************************
- //**********************************************************
- //* XML Modifying methods
- //**********************************************************
- //**********************************************************
- // An error has happended fetching a resource. let the user know
- private void resourceErrorMessage() {
- if (inkNote)
+ @SuppressWarnings("unused")
+ private void setupSelectiveSync() {
+
+ // Get a list of valid notebooks
+ List<Notebook> notebooks = null;
+ List<Tag> tags = null;
+ List<LinkedNotebook> linkedNotebooks = null;
+ try {
+ notebooks = syncRunner.localNoteStore.listNotebooks(syncRunner.authToken);
+ tags = syncRunner.localNoteStore.listTags(syncRunner.authToken);
+ linkedNotebooks = syncRunner.localNoteStore.listLinkedNotebooks(syncRunner.authToken);
+ } catch (EDAMUserException e) {
+ setMessage("EDAMUserException: " +e.getMessage());
return;
- QMessageBox.information(this, tr("DOUGH!!!"), tr("Well, this is embarrassing."+
- "\n\nSome attachments or images for this note appear to be missing from my database.\n"+
- "In a perfect world this wouldn't happen, but it has.\n" +
- "It is embarasing when a program like me, designed to save all your\n"+
- "precious data, has a problem finding data.\n\n" +
+ } catch (EDAMSystemException e) {
+ if (e.getErrorCode() == EDAMErrorCode.RATE_LIMIT_REACHED) {
+ QMessageBox.warning(this, tr("Rate limit reached"), tr("Evernote usage has been temporarily exceeded. Please try again in ") + + e.getRateLimitDuration() + tr(" seconds."));
+ }
+ setMessage("EDAMSystemException: " +e.getMessage());
+ return;
+ } catch (TException e) {
+ setMessage("EDAMTransactionException: " +e.getMessage());
+ return;
+ } catch (EDAMNotFoundException e) {
+ setMessage("EDAMNotFoundException: " +e.getMessage());
+ return;
+ }
+
+ // Split up notebooks into synchronized & non-synchronized
+ List<Notebook> ignoredBooks = new ArrayList<Notebook>();
+ List<String> dbIgnoredNotebooks = conn.getSyncTable().getIgnoreRecords("NOTEBOOK");
+
+ for (int i=notebooks.size()-1; i>=0; i--) {
+ for (int j=0; j<dbIgnoredNotebooks.size(); j++) {
+ if (notebooks.get(i).getGuid().equalsIgnoreCase(dbIgnoredNotebooks.get(j))) {
+ ignoredBooks.add(notebooks.get(i));
+ j=dbIgnoredNotebooks.size();
+ }
+ }
+ }
+
+ // split up tags into synchronized & non-synchronized
+ List<Tag> ignoredTags = new ArrayList<Tag>();
+ List<String> dbIgnoredTags = conn.getSyncTable().getIgnoreRecords("TAG");
+
+ for (int i=tags.size()-1; i>=0; i--) {
+ for (int j=0; j<dbIgnoredTags.size(); j++) {
+ if (tags.get(i).getGuid().equalsIgnoreCase(dbIgnoredTags.get(j))) {
+ ignoredTags.add(tags.get(i));
+ j=dbIgnoredTags.size();
+ }
+ }
+ }
+
+ // split up linked notebooks into synchronized & non-synchronized
+ List<LinkedNotebook> ignoredLinkedNotebooks = new ArrayList<LinkedNotebook>();
+ List<String> dbIgnoredLinkedNotebooks = conn.getSyncTable().getIgnoreRecords("LINKEDNOTEBOOK");
+ for (int i=linkedNotebooks.size()-1; i>=0; i--) {
+ String notebookGuid = linkedNotebooks.get(i).getGuid();
+ for (int j=0; j<dbIgnoredLinkedNotebooks.size(); j++) {
+ if (notebookGuid.equalsIgnoreCase(dbIgnoredLinkedNotebooks.get(j))) {
+ ignoredLinkedNotebooks.add(linkedNotebooks.get(i));
+ j=dbIgnoredLinkedNotebooks.size();
+ }
+ }
+ }
+
+ IgnoreSync ignore = new IgnoreSync(notebooks, ignoredBooks, tags, ignoredTags, linkedNotebooks, ignoredLinkedNotebooks);
+ ignore.exec();
+ if (!ignore.okClicked())
+ return;
+
+ waitCursor(true);
+
+ // Clear out old notebooks & add the new ones
+ List<String> oldIgnoreNotebooks = conn.getSyncTable().getIgnoreRecords("NOTEBOOK");
+ for (int i=0; i<oldIgnoreNotebooks.size(); i++) {
+ conn.getSyncTable().deleteRecord("IGNORENOTEBOOK-"+oldIgnoreNotebooks.get(i));
+ }
+
+ List<String> newNotebooks = new ArrayList<String>();
+ for (int i=ignore.getIgnoredBookList().count()-1; i>=0; i--) {
+ String text = ignore.getIgnoredBookList().takeItem(i).text();
+ for (int j=0; j<notebooks.size(); j++) {
+ if (notebooks.get(j).getName().equalsIgnoreCase(text)) {
+ Notebook n = notebooks.get(j);
+ conn.getSyncTable().addRecord("IGNORENOTEBOOK-"+n.getGuid(), n.getGuid());
+ j=notebooks.size();
+ newNotebooks.add(n.getGuid());
+ }
+ }
+ }
+
+ // Clear out old tags & add new ones
+ List<String> oldIgnoreTags = conn.getSyncTable().getIgnoreRecords("TAG");
+ for (int i=0; i<oldIgnoreTags.size(); i++) {
+ conn.getSyncTable().deleteRecord("IGNORETAG-"+oldIgnoreTags.get(i));
+ }
+
+ List<String> newTags = new ArrayList<String>();
+ for (int i=ignore.getIgnoredTagList().count()-1; i>=0; i--) {
+ String text = ignore.getIgnoredTagList().takeItem(i).text();
+ for (int j=0; j<tags.size(); j++) {
+ if (tags.get(j).getName().equalsIgnoreCase(text)) {
+ Tag t = tags.get(j);
+ conn.getSyncTable().addRecord("IGNORETAG-"+t.getGuid(), t.getGuid());
+ newTags.add(t.getGuid());
+ j=tags.size();
+ }
+ }
+ }
+
+ // Clear out old tags & add new ones
+ List<String> oldIgnoreLinkedNotebooks = conn.getSyncTable().getIgnoreRecords("LINKEDNOTEBOOK");
+ for (int i=0; i<oldIgnoreLinkedNotebooks.size(); i++) {
+ conn.getSyncTable().deleteRecord("IGNORELINKEDNOTEBOOK-"+oldIgnoreLinkedNotebooks.get(i));
+ }
+
+ List<String> newLinked = new ArrayList<String>();
+ for (int i=ignore.getIgnoredLinkedNotebookList().count()-1; i>=0; i--) {
+ String text = ignore.getIgnoredLinkedNotebookList().takeItem(i).text();
+ for (int j=0; j<linkedNotebooks.size(); j++) {
+ if (linkedNotebooks.get(j).getShareName().equalsIgnoreCase(text)) {
+ LinkedNotebook t = linkedNotebooks.get(j);
+ conn.getSyncTable().addRecord("IGNORELINKEDNOTEBOOK-"+t.getGuid(), t.getGuid());
+ newLinked.add(t.getGuid());
+ j=linkedNotebooks.size();
+ }
+ }
+ }
+
+ conn.getNoteTable().expungeIgnoreSynchronizedNotes(newNotebooks, newTags, newLinked);
+ waitCursor(false);
+ refreshLists();
+ }
+
+
+ //**********************************************************
+ //**********************************************************
+ //* XML Modifying methods
+ //**********************************************************
+ //**********************************************************
+ // An error has happended fetching a resource. let the user know
+ private void resourceErrorMessage(int tabIndex) {
+ if (tabIndex < 0) {
+ return;
+ }
+ if (inkNote.get(tabIndex))
+ return;
+ waitCursor(false);
+ QMessageBox.information(this, tr("DOUGH!!!"), tr("Well, this is embarrassing."+
+ "\n\nSome attachments or images for this note appear to be missing from my database.\n"+
+ "In a perfect world this wouldn't happen, but it has.\n" +
+ "It is embarasing when a program like me, designed to save all your\n"+
+ "precious data, has a problem finding data.\n\n" +
"I guess life isn't fair, but I'll survive. Somehow...\n\n" +
"In the mean time, I'm not going to let you make changes to this note.\n" +
"Don't get angry. I'm doing it to prevent you from messing up\n"+
"this note on the Evernote servers. Sorry."+
"\n\nP.S. You might want to re-synchronize to see if it corrects this problem.\nWho knows, you might get lucky."));
- inkNote = true;
+ inkNote.put(tabIndex, true);
browserWindow.setReadOnly(true);
+ waitCursor(true);
}
syncRunner.syncDeletedContent = Global.synchronizeDeletedContent();
if (syncThreadsReady > 0) {
+ thumbnailRunner.interrupt = true;
saveNoteIndexWidth();
saveNoteColumnPositions();
if (syncRunner.addWork("SYNC")) {
if (currentNote == null) {
currentNote = conn.getNoteTable().getNote(currentNoteGuid, false, false, false, false, true);
}
- listManager.setUnsynchronizedNotes(conn.getNoteTable().getUnsynchronizedGUIDs());
- noteIndexUpdated(false);
+ listManager.refreshNoteMetadata();
+ noteIndexUpdated(true);
noteTableView.selectionModel().blockSignals(true);
scrollToGuid(currentNoteGuid);
noteTableView.selectionModel().blockSignals(false);
refreshEvernoteNote(false);
scrollToGuid(currentNoteGuid);
waitCursor(false);
+
+ // Check to see if there were any shared notebook errors
+ if (syncRunner.error && syncRunner.errorSharedNotebooks.size() > 0) {
+ String guid = syncRunner.errorSharedNotebooks.get(0);
+ String notebookGuid = conn.getLinkedNotebookTable().getLocalNotebookGuid(guid);
+ String localName = listManager.getNotebookNameByGuid(notebookGuid);
+ SharedNotebookSyncError syncDialog = new SharedNotebookSyncError(localName);
+ syncDialog.exec();
+ if (syncDialog.okPressed()) {
+ if (syncDialog.doNothing.isChecked()) {
+ syncRunner.errorSharedNotebooksIgnored.put(guid, guid);
+ evernoteSync();
+ }
+ if (syncDialog.deleteNotebook.isChecked()) {
+ conn.getNoteTable().expungeNotesByNotebook(notebookGuid, true, false);
+ conn.getNotebookTable().expungeNotebook(notebookGuid, false);
+ conn.getLinkedNotebookTable().expungeNotebook(guid, false);
+ conn.getLinkedNotebookTable().expungeNotebook(guid, false);
+ evernoteSync();
+ }
+ refreshLists();
+ return;
+ }
+ }
+
+ // Finalize the synchronization
if (!syncRunner.error)
setMessage(tr("Synchronization Complete"));
else
public void refreshLists() {
logger.log(logger.EXTREME, "Entering NeverNote.refreshLists");
updateQuotaBar();
- listManager.refreshLists(currentNote, noteDirty, browserWindow.getContent());
+ // すべてのタブのノートを調べて、Dirtyならばセーブする。その後refreshListsする。
+ Collection<Integer> tabIndex = noteDirty.keySet();
+ Iterator<Integer> indexIterator = tabIndex.iterator();
+ HashMap<Integer, Note> saveNotes = new HashMap<Integer, Note>();
+ HashMap<Integer, String> saveContents = new HashMap<Integer, String>();
+ for (boolean isNoteDirty: noteDirty.values()) {
+ int index = indexIterator.next();
+ if (isNoteDirty) {
+ saveNotes.put(index, tabWindows.get(index).getBrowserWindow().getNote());
+ saveContents.put(index, tabWindows.get(index).getBrowserWindow().getContent());
+ }
+ }
+
+ listManager.saveUpdatedNotes(saveNotes, saveContents);
+ listManager.refreshLists();
+
tagIndexUpdated(true);
notebookIndexUpdated();
savedSearchIndexUpdated();
logger.log(logger.EXTREME, "Index timer activated. Sync running="+syncRunning);
if (syncRunning)
return;
- // Look for any unindexed notes. We only refresh occasionally
- // and do one at a time to keep overhead down.
- if (!indexDisabled && indexRunner.getWorkQueueSize() == 0) {
- List<String> notes = conn.getNoteTable().getNextUnindexed(1);
- String unindexedNote = null;
- if (notes.size() > 0)
- unindexedNote = notes.get(0);
- if (unindexedNote != null && Global.keepRunning) {
- indexNoteContent(unindexedNote);
- }
- if (notes.size()>0) {
- indexTimer.setInterval(100);
- return;
- }
- List<String> unindexedResources = conn.getNoteTable().noteResourceTable.getNextUnindexed(1);
- if (unindexedResources.size() > 0 && indexRunner.getWorkQueueSize() == 0) {
- String unindexedResource = unindexedResources.get(0);
- if (unindexedResource != null && Global.keepRunning) {
- indexNoteResource(unindexedResource);
- }
- }
- if (unindexedResources.size() > 0) {
- indexTimer.setInterval(100);
- return;
- } else {
- indexTimer.setInterval(indexTime);
- }
- if (indexRunning) {
- setMessage(tr("Index completed."));
- logger.log(logger.LOW, "Indexing has completed.");
- indexRunning = false;
- indexTimer.setInterval(indexTime);
- }
+ if (!indexDisabled && indexRunner.idle) {
+ thumbnailRunner.interrupt = true;
+ indexRunner.addWork("SCAN");
}
- logger.log(logger.EXTREME, "Leaving neverNote index timer");
- }
- private synchronized void indexNoteContent(String unindexedNote) {
- logger.log(logger.EXTREME, "Entering NeverNote.indexNoteContent()");
- logger.log(logger.MEDIUM, "Unindexed Note found: "+unindexedNote);
- indexRunner.setIndexType(indexRunner.CONTENT);
- indexRunner.addWork("CONTENT "+unindexedNote);
- if (!indexRunning) {
- setMessage(tr("Indexing notes."));
- logger.log(logger.LOW, "Beginning to index note contents.");
- indexRunning = true;
- }
- logger.log(logger.EXTREME, "Leaving NeverNote.indexNoteContent()");
+ logger.log(logger.EXTREME, "Leaving NeighborNote index timer");
}
- private synchronized void indexNoteResource(String unindexedResource) {
- logger.log(logger.EXTREME, "Leaving NeverNote.indexNoteResource()");
- indexRunner.addWork(new String("RESOURCE "+unindexedResource));
- if (!indexRunning) {
- setMessage(tr("Indexing notes."));
- indexRunning = true;
- }
- logger.log(logger.EXTREME, "Leaving NeverNote.indexNoteResource()");
+
+ @SuppressWarnings("unused")
+ private void indexStarted() {
+ setMessage(tr("Indexing notes"));
}
@SuppressWarnings("unused")
- private void indexThreadComplete(String guid) {
- logger.log(logger.MEDIUM, "Index complete for "+guid);
+ private void indexComplete() {
+ setMessage(tr("Index complete"));
}
@SuppressWarnings("unused")
private synchronized void toggleNoteIndexing() {
alive = listManager.threadCheck(Global.tagCounterThreadId);
if (!alive) {
tagDeadCount++;
- if (tagDeadCount > MAX)
- QMessageBox.information(this, tr("A thread his died."), tr("It appears as the tag counter thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ if (tagDeadCount > MAX && !disableTagThreadCheck) {
+ QMessageBox.information(this, tr("A thread has died."), tr("It appears as the tag counter thread has died. I recommend "+
+ "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry."));
+ disableTagThreadCheck = true;
+ }
} else
tagDeadCount=0;
alive = listManager.threadCheck(Global.notebookCounterThreadId);
if (!alive) {
notebookThreadDeadCount++;
- QMessageBox.information(this, tr("A thread his died."), tr("It appears as the notebook counter thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ if (notebookThreadDeadCount > MAX && !disableNotebookThreadCheck) {
+ QMessageBox.information(this, tr("A thread has died."), tr("It appears as the notebook counter thread has died. I recommend "+
+ "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry."));
+ disableNotebookThreadCheck=true;
+ }
} else
notebookThreadDeadCount=0;
alive = listManager.threadCheck(Global.trashCounterThreadId);
if (!alive) {
trashDeadCount++;
- QMessageBox.information(this, tr("A thread his died."), ("It appears as the trash counter thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ if (trashDeadCount > MAX && !disableTrashThreadCheck) {
+ QMessageBox.information(this, tr("A thread has died."), ("It appears as the trash counter thread has died. I recommend "+
+ "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry."));
+ disableTrashThreadCheck = true;
+ }
} else
trashDeadCount = 0;
alive = listManager.threadCheck(Global.saveThreadId);
if (!alive) {
saveThreadDeadCount++;
- QMessageBox.information(this, tr("A thread his died."), tr("It appears as the note saver thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ if (saveThreadDeadCount > MAX && !disableSaveThreadCheck) {
+ QMessageBox.information(this, tr("A thread has died."), tr("It appears as the note saver thread has died. I recommend "+
+ "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry."));
+ disableSaveThreadCheck = true;
+ }
} else
saveThreadDeadCount=0;
if (!syncThread.isAlive()) {
syncThreadDeadCount++;
- QMessageBox.information(this, tr("A thread his died."), tr("It appears as the synchronization thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ if (syncThreadDeadCount > MAX && !disableSyncThreadCheck) {
+ QMessageBox.information(this, tr("A thread has died."), tr("It appears as the synchronization thread has died. I recommend "+
+ "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry."));
+ disableSyncThreadCheck = true;
+ }
} else
syncThreadDeadCount=0;
if (!indexThread.isAlive()) {
indexThreadDeadCount++;
- QMessageBox.information(this, tr("A thread his died."), tr("It appears as the index thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ if (indexThreadDeadCount > MAX && !disableIndexThreadCheck) {
+ QMessageBox.information(this, tr("A thread has died."), tr("It appears as the index thread has died. I recommend "+
+ "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry."));
+ disableIndexThreadCheck = true;
+ }
} else
indexThreadDeadCount=0;
-
+ if (!rensoNoteListDock.getRensoNoteList().getEnRelatedNotesThread().isAlive()) {
+ enRelatedNotesThreadDeadCount++;
+ if (enRelatedNotesThreadDeadCount > MAX && !disableENRelatedNotesThreadCheck) {
+ QMessageBox.information(this, tr("A thread has died."), tr("It appears as the Evernote Related Notes thread has died. I recommend "+
+ "checking stopping NeighborNote, saving the logs for later viewing, and restarting. Sorry."));
+ disableENRelatedNotesThreadCheck = true;
+ }
+ } else
+ enRelatedNotesThreadDeadCount=0;
}
private void thumbnailTimer() {
- if (Global.enableThumbnails() && conn.getNoteTable().getThumbnailNeededCount() > 1) {
- thumbnailTimer.setInterval(10*1000);
+ if (Global.enableThumbnails() && !syncRunning && indexRunner.idle) {
thumbnailRunner.addWork("SCAN");
- } else {
- thumbnailTimer.setInterval(60*1000);
}
}
fd.setFileMode(FileMode.AnyFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Backup Database"));
- fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptSave);
- fd.setDirectory(System.getProperty("user.home"));
+ if (saveLastPath == null || saveLastPath.equals(""))
+ fd.setDirectory(System.getProperty("user.home"));
+ else
+ fd.setDirectory(saveLastPath);
if (fd.exec() == 0 || fd.selectedFiles().size() == 0) {
return;
}
waitCursor(true);
+ saveLastPath = fd.selectedFiles().get(0);
+ saveLastPath = saveLastPath.substring(0,saveLastPath.lastIndexOf("/"));
setMessage(tr("Backing up database"));
saveNote();
// conn.backupDatabase(Global.getUpdateSequenceNumber(), Global.getSequenceDate());
fd.setFileMode(FileMode.ExistingFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Restore Database"));
- fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptOpen);
- fd.setDirectory(System.getProperty("user.home"));
+ if (saveLastPath == null || saveLastPath.equals(""))
+ fd.setDirectory(System.getProperty("user.home"));
+ else
+ fd.setDirectory(saveLastPath);
if (fd.exec() == 0 || fd.selectedFiles().size() == 0) {
return;
}
waitCursor(true);
+ saveLastPath = fd.selectedFiles().get(0);
+ saveLastPath = saveLastPath.substring(0,saveLastPath.lastIndexOf("/"));
+
setMessage(tr("Restoring database"));
ImportData noteReader = new ImportData(conn, true);
noteReader.importData(fd.selectedFiles().get(0));
fd.setFileMode(FileMode.AnyFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Backup Database"));
- fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptSave);
fd.setDirectory(System.getProperty("user.home"));
if (fd.exec() == 0 || fd.selectedFiles().size() == 0) {
fd.setFileMode(FileMode.ExistingFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Import Notes"));
- fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptOpen);
- fd.setDirectory(System.getProperty("user.home"));
+ if (saveLastPath == null || saveLastPath.equals(""))
+ fd.setDirectory(System.getProperty("user.home"));
+ else
+ fd.setDirectory(saveLastPath);
if (fd.exec() == 0 || fd.selectedFiles().size() == 0) {
return;
}
waitCursor(true);
- setMessage("Importing Notes");
+ setMessage(tr("Importing Notes"));
saveNote();
if (selectedNoteGUIDs.size() == 0 && !currentNoteGuid.equals(""))
selectedNoteGUIDs.add(currentNoteGuid);
- ImportData noteReader = new ImportData(conn, false);
String fileName = fd.selectedFiles().get(0);
+// saveLastPath.substring(0,fileName.lastIndexOf("/"));
- if (!fileName.endsWith(".nnex"))
- fileName = fileName +".nnex";
- if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
- noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
- else
- noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
+ if (fileName.endsWith(".nnex")) {
+ ImportData noteReader = new ImportData(conn, false);
+ if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
+ noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
+ else
+ noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
- noteReader.importData(fileName);
+ noteReader.importData(fileName);
- if (noteReader.lastError != 0) {
- setMessage(noteReader.getErrorMessage());
- logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
- waitCursor(false);
- return;
+ if (noteReader.lastError != 0) {
+ setMessage(noteReader.getErrorMessage());
+ logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
+ waitCursor(false);
+ return;
+ }
+ } else {
+ if (fileName.endsWith(".enex")) {
+ ImportEnex noteReader = new ImportEnex(conn, false);
+ if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
+ noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
+ else
+ noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
+
+ waitCursor(false);
+ if (QMessageBox.question(this, tr("Confirmation"),
+ tr("Create new tags from import?"),
+ QMessageBox.StandardButton.Yes,
+ QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
+ noteReader.createNewTags = true;
+ } else
+ noteReader.createNewTags = false;
+ waitCursor(true);
+ noteReader.importData(fileName);
+
+ if (noteReader.lastError != 0) {
+ setMessage(noteReader.getErrorMessage());
+ logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
+ waitCursor(false);
+ return;
+ }
+ }
}
listManager.loadNoteTitleColors();
setMessage(tr("Notes have been imported."));
waitCursor(false);
- setMessage("Import completed.");
+ setMessage(tr("Import completed."));
waitCursor(false);
duplicateNote(currentNoteGuid);
}
+ //**************************************************
+ //* Action from when a user clicks Copy As URL
+ //**************************************************
+ @SuppressWarnings("unused")
+ private void copyAsUrlClicked() {
+ QClipboard clipboard = QApplication.clipboard();
+ QMimeData mime = new QMimeData();
+ String url;
+ mime.setText(currentNoteGuid);
+ List<QUrl> urls = new ArrayList<QUrl>();
+
+ // Start building the URL
+ User user = Global.getUserInformation();
+
+ // Check that we have everything we need
+ if ((user.getShardId().equals("") || user.getId() == 0) && !Global.bypassSynchronizationWarning()) {
+ SynchronizationRequiredWarning warning = new SynchronizationRequiredWarning(this);
+ warning.exec();
+ if (!warning.neverSynchronize())
+ return;
+ else {
+ Global.setBypassSynchronizationWarning(true);
+ user.setShardId("s0");
+ user.setId(0);
+ }
+ }
+
+
+ // Start building a list of URLs based upon the selected notes
+ noteTableView.showColumn(Global.noteTableGuidPosition);
+
+ List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
+ if (!Global.isColumnVisible("guid"))
+ noteTableView.hideColumn(Global.noteTableGuidPosition);
+
+ // Check that the note is either synchronized, or in a local notebook
+ for (int i=0; i<selections.size(); i++) {
+ QModelIndex index;
+ int row = selections.get(i).row();
+ index = noteTableView.proxyModel.index(row, Global.noteTableGuidPosition);
+ SortedMap<Integer, Object> ix = noteTableView.proxyModel.itemData(index);
+ String selectedGuid = (String)ix.values().toArray()[0];
+
+ Note n = conn.getNoteTable().getNote(selectedGuid, false, false, false, false, false);
+ if (n.getUpdateSequenceNum() == 0 && !conn.getNotebookTable().isNotebookLocal(n.getNotebookGuid())) {
+ QMessageBox.critical(this, tr("Please Synchronize") ,tr("Please either synchronize or move any " +
+ "new notes to a local notebook."));
+ return;
+ }
+ }
+
+ // Start building the URLs
+ for (int i=0; i<selections.size(); i++) {
+ QModelIndex index;
+ int row = selections.get(i).row();
+ index = noteTableView.proxyModel.index(row, Global.noteTableGuidPosition);
+ SortedMap<Integer, Object> ix = noteTableView.proxyModel.itemData(index);
+ String selectedGuid = (String)ix.values().toArray()[0];
+ mime.setText(selectedGuid);
+
+ String lid;
+ String gid;
+ Note selectedNote = conn.getNoteTable().getNote(selectedGuid, false, false, false, false, false);
+ if (selectedNote.getUpdateSequenceNum() > 0) {
+ gid = selectedGuid;
+ lid = selectedGuid;
+ } else {
+ gid = "00000000-0000-0000-0000-000000000000";
+ lid = selectedGuid;
+ }
+ url = new String("evernote://///view/") + new String(user.getId() + "/" +user.getShardId() +"/"
+ +gid+"/"+lid +"/");
+ urls.add(new QUrl(url));
+ }
+ mime.setUrls(urls);
+ clipboard.setMimeData(mime);
+ }
//**************************************************
// importKeepWatcher.addPath(records.get(i).folder.replace('\\', '/'));
for (int i=0; i<records.size(); i++) {
+ logger.log(logger.LOW, "Adding file monitor: " +records.get(i).folder);
if (records.get(i).keep)
importKeepWatcher.addPath(records.get(i).folder);
else
importDeleteWatcher.addPath(records.get(i).folder);
}
+ logger.log(logger.EXTREME, "List of directories being watched (kept)...");
+ List<String> monitorDelete = importKeepWatcher.directories();
+ for (int i=0; i<monitorDelete.size(); i++) {
+ logger.log(logger.EXTREME, monitorDelete.get(i));
+ }
+ logger.log(logger.EXTREME, "<end of list>");
+ logger.log(logger.EXTREME, "List of directories being watched (delete)...");
+ monitorDelete = importDeleteWatcher.directories();
+ for (int i=0; i<monitorDelete.size(); i++) {
+ logger.log(logger.EXTREME, monitorDelete.get(i));
+ }
+ logger.log(logger.EXTREME, "<end of list>");
+
importKeepWatcher.directoryChanged.connect(this, "folderImportKeep(String)");
importDeleteWatcher.directoryChanged.connect(this, "folderImportDelete(String)");
}
}
}
+
+ // Menu folderImport action triggered
public void folderImport() {
List<WatchFolderRecord> recs = conn.getWatchFolderTable().getAll();
WatchFolder dialog = new WatchFolder(recs, listManager.getNotebookIndex());
setupFolderImports();
}
+
public void folderImportKeep(String dirName) throws NoSuchAlgorithmException {
-
+ logger.log(logger.LOW, "Inside folderImportKeep");
String whichOS = System.getProperty("os.name");
if (whichOS.contains("Windows"))
dirName = dirName.replace('/','\\');
String notebook = conn.getWatchFolderTable().getNotebook(dirName);
for (int i=0; i<list.size(); i++){
-
+ logger.log(logger.LOW, "File found: " +list.get(i).fileName());
boolean redundant = false;
// Check if we've already imported this one or if it existed before
for (int j=0; j<importedFiles.size(); j++) {
+ logger.log(logger.LOW, "redundant file list: " +list.get(i).absoluteFilePath());
if (importedFiles.get(j).equals(list.get(i).absoluteFilePath()))
redundant = true;
}
+ logger.log(logger.LOW, "Checking if redundant: " +redundant);
if (!redundant) {
importer.setFileInfo(list.get(i));
importer.setFileName(list.get(i).absoluteFilePath());
+ logger.log(logger.LOW, "File importing is a file: " +list.get(i).isFile());
+ logger.log(logger.LOW, "File importing is a valid: " +importer.isValidType());
if (list.get(i).isFile() && importer.isValidType()) {
if (!importer.importFile()) {
// If we can't get to the file, it is probably locked. We'll try again later.
logger.log(logger.LOW, "Unable to save externally edited file. Saving for later.");
importFilesKeep.add(list.get(i).absoluteFilePath());
- return;
+ } else {
+
+ Note newNote = importer.getNote();
+ newNote.setNotebookGuid(notebook);
+ newNote.setTitle(dir.at(i));
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setDirty(true);
+ metadata.setGuid(newNote.getGuid());
+ listManager.addNote(newNote, metadata);
+ conn.getNoteTable().addNote(newNote, true);
+ noteTableView.insertRow(newNote, metadata, true, -1);
+ listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
+ listManager.countNotebookResults(listManager.getNoteIndex());
+ importedFiles.add(list.get(i).absoluteFilePath());
}
-
- Note newNote = importer.getNote();
- newNote.setNotebookGuid(notebook);
- newNote.setTitle(dir.at(i));
- listManager.addNote(newNote);
- conn.getNoteTable().addNote(newNote, true);
- listManager.getUnsynchronizedNotes().add(newNote.getGuid());
- noteTableView.insertRow(newNote, true, -1);
- listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
- listManager.countNotebookResults(listManager.getNoteIndex());
- importedFiles.add(list.get(i).absoluteFilePath());
}
}
}
}
public void folderImportDelete(String dirName) {
-
+ logger.log(logger.LOW, "Inside folderImportDelete");
String whichOS = System.getProperty("os.name");
if (whichOS.contains("Windows"))
dirName = dirName.replace('/','\\');
String notebook = conn.getWatchFolderTable().getNotebook(dirName);
for (int i=0; i<list.size(); i++){
+ logger.log(logger.LOW, "File found: " +list.get(i).fileName());
importer.setFileInfo(list.get(i));
importer.setFileName(list.get(i).absoluteFilePath());
+ logger.log(logger.LOW, "File importing is a file: " +list.get(i).isFile());
+ logger.log(logger.LOW, "File importing is a valid: " +importer.isValidType());
if (list.get(i).isFile() && importer.isValidType()) {
if (!importer.importFile()) {
// If we can't get to the file, it is probably locked. We'll try again later.
logger.log(logger.LOW, "Unable to save externally edited file. Saving for later.");
importFilesKeep.add(list.get(i).absoluteFilePath());
- return;
- }
+ } else {
- Note newNote = importer.getNote();
- newNote.setNotebookGuid(notebook);
- newNote.setTitle(dir.at(i));
- listManager.addNote(newNote);
- conn.getNoteTable().addNote(newNote, true);
- listManager.getUnsynchronizedNotes().add(newNote.getGuid());
- noteTableView.insertRow(newNote, true, -1);
- listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
- listManager.countNotebookResults(listManager.getNoteIndex());
- dir.remove(dir.at(i));
+ Note newNote = importer.getNote();
+ newNote.setNotebookGuid(notebook);
+ newNote.setTitle(dir.at(i));
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setDirty(true);
+ metadata.setGuid(newNote.getGuid());
+ listManager.addNote(newNote, metadata);
+ conn.getNoteTable().addNote(newNote, true);
+ noteTableView.insertRow(newNote, metadata, true, -1);
+ listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
+ listManager.countNotebookResults(listManager.getNoteIndex());
+ dir.remove(dir.at(i));
+ }
}
}
}
String content = browser.getContent().substring(0,position) +
newSegment +
browser.getContent().substring(endPos);
- browser.getBrowser().setContent(new QByteArray(content));;
+ browser.setContent(new QByteArray(content));;
}
position = browser.getContent().indexOf("en-tag=\"en-media\" guid=\""+guid+"\" type=", position+1);
@Override
public void changeEvent(QEvent e) {
if (e.type() == QEvent.Type.WindowStateChange) {
- if (isMinimized() && Global.showTrayIcon()) {
- e.accept();
- QTimer.singleShot(10, this, "hide()");
- return;
+ if (QSystemTrayIcon.isSystemTrayAvailable()) {
+ if (isMinimized() && (Global.showTrayIcon() || Global.showTrayIcon())) {
+ e.accept();
+ QTimer.singleShot(10, this, "hide()");
+ return;
+ }
+ if (isMaximized())
+ windowMaximized = true;
+ else
+ windowMaximized = false;
}
- if (isMaximized())
- windowMaximized = true;
- else
- windowMaximized = false;
}
}
return true;
}
+ //*************************************************
+ //* View / Hide source HTML for a note
+ //*************************************************
+ public void viewSource() {
+ // すべてのタブに対して
+ for(int i = 0; i < tabBrowser.count(); i++){
+ BrowserWindow browser = ((TabBrowse) tabBrowser.widget(i)).getBrowserWindow();
+ browser.showSource(menuBar.viewSource.isChecked());
+ }
+ }
+ //*************************************************
+ // Block the program. This is used for things
+ // like async web calls.
+ //*************************************************
+ @SuppressWarnings("unused")
+ private void blockApplication(BrowserWindow b) {
+ // Block all signals
+ waitCursor(true);
+ blockSignals(true);
+
+ blockTimer = new QTimer();
+ blockTimer.setSingleShot(true);
+ blockTimer.setInterval(15000);
+ blockTimer.timeout.connect(this, "unblockApplication()");
+ blockingWindow = b;
+ blockTimer.start();
+ }
+
+ @SuppressWarnings("unused")
+ private void unblockApplication() {
+ waitCursor(false);
+ if (blockingWindow != null && new GregorianCalendar().getTimeInMillis() > blockingWindow.unblockTime && blockingWindow.unblockTime != -1) {
+ QMessageBox.critical(null, tr("No Response from CodeCogs") ,tr("Unable to contact CodeCogs for LaTeX formula."));
+ blockingWindow.unblockTime = -1;
+ blockingWindow.awaitingHttpResponse = false;
+ }
+ blockingWindow = null;
+ blockSignals(false);
+ }
+
+ // タブが変更された
+ private void tabWindowChanged(int index) {
+ if (index < 0 || index >= tabBrowser.count()) {
+ return;
+ }
+
+ saveNote();
+
+ TabBrowse tab = (TabBrowse) tabBrowser.widget(index);
+ if (tab.getBrowserWindow().getNote() != null) {
+ currentNoteGuid = tab.getBrowserWindow().getNote().getGuid();
+ currentNote = tab.getBrowserWindow().getNote();
+ } else {
+ currentNoteGuid = "";
+ currentNote = null;
+ }
+
+ // 選択ノートを更新
+ selectedNoteGUIDs.clear();
+ if (currentNoteGuid != null && !currentNoteGuid.equals("")) {
+ selectedNoteGUIDs.add(currentNoteGuid);
+ }
+
+ // browserWindowを更新
+ browserWindow.noteSignal.noteChanged.disconnect(this,"setNoteDirty()");
+ browserWindow.focusLost.disconnect(this, "saveNote()");
+ browserWindow = tab.getBrowserWindow();
+ browserWindow.noteSignal.noteChanged.connect(this, "setNoteDirty()");
+ browserWindow.focusLost.connect(this, "saveNote()");
+ // メニューバーのボタンを新しいbrowserWindowに合わせる
+ menuBar.refreshTargetWindow();
+
+ // 現在ゴミ箱かつ移るタブがアクティブなら通常テーブルに、現在通常テーブルかつこれから非アクティブのタブに移るならゴミ箱を表示させる
+ boolean nextIsActive;
+ if (tab.getBrowserWindow().getNote() != null) {
+ nextIsActive = tab.getBrowserWindow().getNote().isActive();
+ } else {
+ nextIsActive = true;
+ }
+ if (Global.showDeleted && nextIsActive) {
+ switchNoteTable(false);
+ } else if (!Global.showDeleted && !nextIsActive) {
+ switchNoteTable(true);
+ }
+
+ // noteTableViewの選択を変更するとselectionChangedが発生してしまうので一度切断
+ noteTableView.selectionModel().selectionChanged.disconnect(this,"noteTableSelection()");
+ scrollToGuid(currentNoteGuid);
+ // 再接続
+ noteTableView.selectionModel().selectionChanged.connect(this,"noteTableSelection()");
+
+ menuBar.noteDuplicateAction.setEnabled(true);
+ menuBar.noteOnlineHistoryAction.setEnabled(true);
+ menuBar.noteMergeAction.setEnabled(true);
+
+ if (Global.showDeleted) {
+ menuBar.noteDuplicateAction.setEnabled(false);
+ }
+ if (!Global.isConnected) {
+ menuBar.noteOnlineHistoryAction.setEnabled(false);
+ }
+ menuBar.noteMergeAction.setEnabled(false);
+ try {
+ int row = noteTableView.selectionModel().selectedRows().get(0).row();
+ if (row == 0)
+ upButton.setEnabled(false);
+ else
+ upButton.setEnabled(true);
+ if (row < listManager.getNoteTableModel().rowCount() - 1)
+ downButton.setEnabled(true);
+ else
+ downButton.setEnabled(false);
+ } catch (Exception e) {
+ upButton.setEnabled(false);
+ downButton.setEnabled(false);
+ }
+
+ int currentIndex = tabBrowser.currentIndex();
+ ArrayList<String> histGuids = historyGuids.get(currentIndex);
+ int histPosition = historyPosition.get(currentIndex);
+
+ // prev, nextボタンの有効・無効化
+ nextButton.setEnabled(true);
+ prevButton.setEnabled(true);
+
+ if (histPosition <= 1){
+ prevButton.setEnabled(false);
+ }
+ if (histPosition == histGuids.size()){
+ nextButton.setEnabled(false);
+ }
+
+ refreshEvernoteNote(true);
+
+ // 連想ノートリストを更新
+ rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
+ }
+
+ // 生存ノートテーブル→ゴミ箱（またはその逆）に切り替える
+ private void switchNoteTable(boolean toDeleted) {
+ clearNotebookFilter();
+ clearTagFilter();
+ clearAttributeFilter();
+ clearSavedSearchFilter();
+
+ listManager.getSelectedNotebooks().clear();
+ listManager.getSelectedTags().clear();
+ listManager.setSelectedSavedSearch("");
+
+ // toggle the add buttons
+ newButton.setEnabled(!newButton.isEnabled());
+ menuBar.noteAdd.setEnabled(newButton.isEnabled());
+ menuBar.noteAddNewTab.setEnabled(newButton.isEnabled());
+ if (currentNoteGuid == null || currentNoteGuid.equals("")) {
+ menuBar.noteAddNewTab.setEnabled(false);
+ }
+ menuBar.noteAdd.setVisible(true);
+
+ if (!toDeleted) { // 生存ノートテーブルへ
+ trashTree.itemSelectionChanged.disconnect(this, "trashTreeSelection()");
+ trashTree.clearSelection();
+ trashTree.itemSelectionChanged.connect(this, "trashTreeSelection()");
+ Global.showDeleted = false;
+ menuBar.noteRestoreAction.setEnabled(false);
+ menuBar.noteRestoreAction.setVisible(false);
+ // ゴミ箱から元の画面に戻す。連想ノートリストをONに。
+ rensoNoteListDock.setEnabled(true);
+ } else { // ゴミ箱へ
+ trashTree.itemSelectionChanged.disconnect(this, "trashTreeSelection()");
+ trashTree.setCurrentItem(trashTree.getTrashItem());
+ trashTree.itemSelectionChanged.connect(this, "trashTreeSelection()");
+ Global.showDeleted = true;
+ menuBar.noteRestoreAction.setEnabled(true);
+ menuBar.noteRestoreAction.setVisible(true);
+ // ゴミ箱を開く。連想ノートリストをOFFに。
+ rensoNoteListDock.setEnabled(false);
+ }
+
+ listManager.loadNotesIndex();
+ // noteTableViewの選択を変更するとselectionChangedが発生してしまうので一度切断
+ noteTableView.selectionModel().selectionChanged.disconnect(this,"noteTableSelection()");
+ noteIndexUpdated(false);
+ // 再接続
+ noteTableView.selectionModel().selectionChanged.connect(this,"noteTableSelection()");
+
+ browserWindow.setReadOnly(!newButton.isEnabled());
+ }
+
+ // ユーザが連想ノートリストのアイテムを選択した時の処理
+ @SuppressWarnings("unused")
+ private void rensoNoteItemPressed(QListWidgetItem current) {
+ logger.log(logger.HIGH, "Nevernote.rensoNoteSelectionChangeに入った");
+
+ rensoNotePressedItemGuid = rensoNoteListDock.getRensoNoteList().getNoteGuid(current);
+
+ // 右クリックだったら終了
+ if (QApplication.mouseButtons().isSet(MouseButton.RightButton)) {
+ return;
+ }
+
+ saveNote();
+
+ String prevCurrentNoteGuid = new String(currentNoteGuid);
+
+ for (int i = 0; i < noteTableView.model().rowCount(); i++) {
+ QModelIndex modelIndex = noteTableView.model().index(i,
+ Global.noteTableGuidPosition);
+ if (modelIndex != null) {
+ SortedMap<Integer, Object> ix = noteTableView.model().itemData(
+ modelIndex);
+ String tableGuid = (String) ix.values().toArray()[0];
+ if (tableGuid.equals(rensoNotePressedItemGuid)) {
+ noteTableView.selectRow(i);
+ break;
+ }
+ }
+ }
+
+ // 連想ノートリストアイテムクリック操作を記録
+ conn.getHistoryTable().addHistory("rensoItemClick", prevCurrentNoteGuid, currentNoteGuid);
+
+ logger.log(logger.HIGH, "Nevernote.rensoNoteSelectionChangeを出た");
+ }
+
+ // 関連ノートリストからノートを除外する
+ @SuppressWarnings("unused")
+ private void excludeNote() {
+ if (rensoNotePressedItemGuid != null) {
+ saveNote();
+ excludeNote(rensoNotePressedItemGuid);
+ }
+ }
+
+ // 関連ノートリストからノートを除外する
+ private void excludeNote(String guid) {
+ if (Global.verifyExclude()) {
+ String msg;
+ Note note = conn.getNoteTable().getNote(guid, false, false, false, false, false);
+ String title = note.getTitle();
+ if (title != null) {
+ msg = new String(tr("Exclude note \"") +title +"\"?");
+ } else {
+ msg = new String(tr("Exclude note selected note?"));
+ }
+
+ if (QMessageBox.question(this, tr("Confirmation"), msg,
+ QMessageBox.StandardButton.Yes,
+ QMessageBox.StandardButton.No)==StandardButton.No.value() && Global.verifyDelete() == true) {
+ return;
+ }
+ }
+
+ // Historyデータベースから除外するノートのデータを削除
+ conn.getHistoryTable().expungeHistory(guid, currentNoteGuid);
+
+ // 除外ノートテーブルに追加
+ conn.getExcludedTable().addExclusion(guid, currentNoteGuid);
+
+ rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
+ }
+
+ // 関連ノートリストのノートにスターを付ける
+ @SuppressWarnings("unused")
+ private void starNote() {
+ if (rensoNotePressedItemGuid != null) {
+ saveNote();
+ starNote(rensoNotePressedItemGuid);
+ }
+ }
+
+ // 関連ノートリストのノートにスターを付ける
+ private void starNote(String guid) {
+ // スター付きノートテーブルに追加
+ conn.getStaredTable().addStaredItem(currentNoteGuid, guid);
+
+ rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
+ }
+
+ // 関連ノートリストのノートからスターを外す
+ @SuppressWarnings("unused")
+ private void unstarNote() {
+ if (rensoNotePressedItemGuid != null) {
+ saveNote();
+ unstarNote(rensoNotePressedItemGuid);
+ }
+ }
+
+ // 関連ノートリストのノートからスターを外す
+ private void unstarNote(String guid) {
+ // スター付きノートテーブルから削除
+ conn.getStaredTable().removeStaredItem(currentNoteGuid, guid);
+
+ rensoNoteListDock.getRensoNoteList().refreshRensoNoteList(currentNoteGuid);
+ }
+
+ // currentNoteGuidを返す
+ public String getCurrentNoteGuid() {
+ return currentNoteGuid;
+ }
+
+ @SuppressWarnings("unused")
+ // タブ入れ替えによってタブインデックスが変わったので、インデックスで管理しているハッシュマップ達も入れ替える
+ private void tabIndexChanged(int from, int to) {
+ // tabWindows
+ TabBrowse tab = tabWindows.get(from);
+ tabWindows.put(from, tabWindows.get(to));
+ tabWindows.put(to, tab);
+ // noteDirty
+ boolean isNoteDirty = noteDirty.get(from);
+ noteDirty.put(from, noteDirty.get(to));
+ noteDirty.put(to, isNoteDirty);
+ // inkNote
+ boolean isInkNote = inkNote.get(from);
+ inkNote.put(from, inkNote.get(to));
+ inkNote.put(to, isInkNote);
+ // readOnly
+ boolean isReadOnly = readOnly.get(from);
+ readOnly.put(from, readOnly.get(to));
+ readOnly.put(to, isReadOnly);
+ // historyGuids
+ ArrayList<String> histGuids = historyGuids.get(from);
+ historyGuids.put(from, historyGuids.get(to));
+ historyGuids.put(to, histGuids);
+ // historyPosition
+ int histPosition = historyPosition.get(from);
+ historyPosition.put(from, historyPosition.get(to));
+ historyPosition.put(to, histPosition);
+ // fromHistory
+ boolean fromHist = fromHistory.get(from);
+ fromHistory.put(from, fromHistory.get(to));
+ fromHistory.put(to, fromHist);
+ }
+
+ // 連想ノートリストのgetter
+ public RensoNoteList getRensoNoteList() {
+ return rensoNoteListDock.getRensoNoteList();
+ }
+
+ // 帯域制限の超過をユーザに通知
+ @SuppressWarnings("unused")
+ private void informRateLimit(Integer rateLimitDuration) {
+ QMessageBox.warning(this, tr("Rate limit reached"), tr("Evernote usage has been temporarily exceeded. Please try again in ") + + rateLimitDuration + tr(" seconds."));
+ }
+
+ // ツールバーの「新規」ボタンの接続スロットを設定
+ public void connectNewButtonSlot(String slot) {
+ newButton.triggered.disconnect();
+ newButton.triggered.connect(this, slot);
+ }
}
OSDN Git Service
