X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fcx%2Ffbn%2Fnevernote%2FNeverNote.java;h=a594d6000b0561c711190bf0653595098c033ea9;hb=1f487f3aafb7821f09a1f1d0a296819c9e077641;hp=2a8e66b9094bcddf50ca9f175b7c83481c70667c;hpb=02ca42ef308034d4352f8908cdffd72007fc3f9e;p=neighbornote%2FNeighborNote.git diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java index 2a8e66b..a594d60 100644 --- a/src/cx/fbn/nevernote/NeverNote.java +++ b/src/cx/fbn/nevernote/NeverNote.java @@ -21,6 +21,8 @@ import java.awt.Desktop; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.net.Authenticator; +import java.net.PasswordAuthentication; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.sql.Connection; @@ -30,15 +32,19 @@ import java.sql.Statement; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.SortedMap; import java.util.Vector; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; import org.apache.thrift.TException; import org.h2.tools.ChangeFileEncryption; @@ -48,9 +54,11 @@ 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.Publishing; import com.evernote.edam.type.QueryFormat; import com.evernote.edam.type.Resource; import com.evernote.edam.type.SavedSearch; @@ -58,7 +66,6 @@ import com.evernote.edam.type.Tag; import com.evernote.edam.type.User; import com.trolltech.qt.QThread; import com.trolltech.qt.core.QByteArray; -import com.trolltech.qt.core.QDataStream; import com.trolltech.qt.core.QDateTime; import com.trolltech.qt.core.QDir; import com.trolltech.qt.core.QEvent; @@ -77,6 +84,7 @@ 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.ItemDataRole; import com.trolltech.qt.core.Qt.SortOrder; import com.trolltech.qt.core.Qt.WidgetAttribute; @@ -88,6 +96,7 @@ 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.QFileDialog; @@ -103,10 +112,11 @@ import com.trolltech.qt.gui.QMainWindow; import com.trolltech.qt.gui.QMenu; import com.trolltech.qt.gui.QMessageBox; import com.trolltech.qt.gui.QMessageBox.StandardButton; +import com.trolltech.qt.gui.QPainter; +import com.trolltech.qt.gui.QPalette.ColorRole; import com.trolltech.qt.gui.QPixmap; import com.trolltech.qt.gui.QPrintDialog; import com.trolltech.qt.gui.QPrinter; -import com.trolltech.qt.gui.QProgressBar; import com.trolltech.qt.gui.QSizePolicy; import com.trolltech.qt.gui.QSizePolicy.Policy; import com.trolltech.qt.gui.QSpinBox; @@ -118,14 +128,12 @@ import com.trolltech.qt.gui.QTableWidgetItem; 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.QNetworkReply; +import com.trolltech.qt.network.QNetworkRequest; import com.trolltech.qt.webkit.QWebPage.WebAction; import com.trolltech.qt.webkit.QWebSettings; -import com.trolltech.qt.xml.QDomAttr; -import com.trolltech.qt.xml.QDomDocument; -import com.trolltech.qt.xml.QDomElement; -import com.trolltech.qt.xml.QDomNodeList; -import cx.fbn.nevernote.config.FileManager; import cx.fbn.nevernote.config.InitializationException; import cx.fbn.nevernote.config.StartupConfig; import cx.fbn.nevernote.dialog.AccountDialog; @@ -134,30 +142,39 @@ import cx.fbn.nevernote.dialog.DBEncryptDialog; import cx.fbn.nevernote.dialog.DatabaseLoginDialog; import cx.fbn.nevernote.dialog.DatabaseStatus; import cx.fbn.nevernote.dialog.FindDialog; +import cx.fbn.nevernote.dialog.IgnoreSync; import cx.fbn.nevernote.dialog.LoginDialog; import cx.fbn.nevernote.dialog.NotebookArchive; import cx.fbn.nevernote.dialog.NotebookEdit; import cx.fbn.nevernote.dialog.OnlineNoteHistory; +import cx.fbn.nevernote.dialog.PublishNotebook; import cx.fbn.nevernote.dialog.SavedSearchEdit; +import cx.fbn.nevernote.dialog.SetIcon; +import cx.fbn.nevernote.dialog.ShareNotebook; +import cx.fbn.nevernote.dialog.StackNotebook; import cx.fbn.nevernote.dialog.TagEdit; import cx.fbn.nevernote.dialog.ThumbnailViewer; +import cx.fbn.nevernote.dialog.UpgradeAvailableDialog; import cx.fbn.nevernote.dialog.WatchFolder; -import cx.fbn.nevernote.filters.EnSearch; +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.PDFPreview; import cx.fbn.nevernote.gui.SavedSearchTreeWidget; 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.sql.DatabaseConnection; import cx.fbn.nevernote.sql.WatchFolderRecord; import cx.fbn.nevernote.threads.IndexRunner; import cx.fbn.nevernote.threads.SyncRunner; +import cx.fbn.nevernote.threads.ThumbnailRunner; import cx.fbn.nevernote.utilities.AESEncrypter; import cx.fbn.nevernote.utilities.ApplicationLogger; import cx.fbn.nevernote.utilities.FileImporter; @@ -166,7 +183,7 @@ import cx.fbn.nevernote.utilities.ListManager; import cx.fbn.nevernote.utilities.SyncTimes; import cx.fbn.nevernote.xml.ExportData; import cx.fbn.nevernote.xml.ImportData; -import cx.fbn.nevernote.xml.XMLInsertHilight; +import cx.fbn.nevernote.xml.NoteFormatter; public class NeverNote extends QMainWindow{ @@ -183,6 +200,7 @@ public class NeverNote extends QMainWindow{ 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 @@ -193,22 +211,24 @@ public class NeverNote extends QMainWindow{ public BrowserWindow browserWindow; // Window containing browser & labels public QToolBar toolBar; // The tool bar under the menu -// QLineEdit searchField; // The search filter bar on the toolbar QComboBox searchField; // search filter bar on the toolbar; boolean searchPerformed = false; // Search was done? - QProgressBar quotaBar; // The current quota usage + QuotaProgressBar quotaBar; // The current quota usage ApplicationLogger logger; List selectedNotebookGUIDs; // List of notebook GUIDs List selectedTagGUIDs; // List of selected tag GUIDs List selectedNoteGUIDs; // List of selected notes String selectedSavedSearchGUID; // Currently selected saved searches + private final HashMap 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 + boolean inkNote; // if this is an ink note, it is read only + boolean readOnly; // Is this note read-only? + ListManager listManager; // DB runnable task @@ -221,11 +241,14 @@ public class NeverNote extends QMainWindow{ QTimer syncTimer; // Sync on an interval QTimer syncDelayTimer; // Sync delay to free up database SyncRunner syncRunner; // thread to do a sync. - QThread syncThread; + QThread syncThread; // Thread which talks to evernote + ThumbnailRunner thumbnailRunner; // Runner for thumbnail thread + QThread thumbnailThread; // Thread that generates pretty pictures QTimer saveTimer; // Timer to save note contents QTimer authTimer; // Refresh authentication QTimer externalFileSaveTimer; // Save files altered externally + QTimer thumbnailTimer; // Wakeup & scan for thumbnails List externalFiles; // External files to save later List importFilesKeep; // Auto-import files to save later List importFilesDelete; // Auto-import files to save later @@ -245,9 +268,9 @@ public class NeverNote extends QMainWindow{ QAction downButton; // Go to the next item in the list QAction upButton; // Go to the prev. item in the list; QAction synchronizeButton; // Synchronize with Evernote - List synchronizeAnimation; // Synchronize movie + QAction allNotesButton; // Reset & view all notes QTimer synchronizeAnimationTimer; // Timer to change animation button - int synchronizeFrame; // Current frame being viewed + int synchronizeIconAngle; // Used to rotate sync icon QAction printButton; // Print Button QAction tagButton; // Tag edit button QAction attributeButton; // Attribute information button @@ -278,17 +301,25 @@ public class NeverNote extends QMainWindow{ int saveThreadDeadCount=0; // number of consecutive dead times for the save thread HashMap noteCache; // Cash of note content + HashMap readOnlyCache; // List of cashe notes that are read-only + HashMap inkNoteCache; // List of cache notes that are ink notes List historyGuids; // GUIDs of previously viewed items int historyPosition; // Position within the viewed items boolean fromHistory; // Is this from the history queue? String trashNoteGuid; // Guid to restore / set into or out of trash to save position - Thumbnailer preview; // generate preview image + List 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; boolean windowMaximized = false; // Keep track of the window state for restores + List pdfReadyQueue; // Queue of PDFs that are ready to be rendered. + List 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 + String iconPath = new String("classpath:cx/fbn/nevernote/icons/"); @@ -299,8 +330,17 @@ public class NeverNote extends QMainWindow{ //*************************************************************** //*************************************************************** // Application Constructor + @SuppressWarnings("static-access") public NeverNote(DatabaseConnection dbConn) { 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.")); + + QMessageBox.critical(null, tr("Database Connection Error") ,msg); + System.exit(16); + } thread().setPriority(Thread.MAX_PRIORITY); @@ -323,12 +363,8 @@ public class NeverNote extends QMainWindow{ logger.log(logger.EXTREME, "Starting GUI build"); - QTranslator qtTranslator = new QTranslator(); - qtTranslator.load("classpath:/translations/qt_" + QLocale.system().name() + ".qm"); - QApplication.instance().installTranslator(qtTranslator); - QTranslator nevernoteTranslator = new QTranslator(); - nevernoteTranslator.load("classpath:/translations/nevernote_"+QLocale.system().name()+ ".qm"); + nevernoteTranslator.load(Global.getFileManager().getTranslateFilePath("nevernote_" + QLocale.system().name() + ".qm")); QApplication.instance().installTranslator(nevernoteTranslator); Global.originalPalette = QApplication.palette(); @@ -336,7 +372,7 @@ public class NeverNote extends QMainWindow{ if (Global.useStandardPalette()) QApplication.setPalette(QApplication.style().standardPalette()); setWindowTitle("NeverNote"); - + mainLeftRightSplitter = new QSplitter(); setCentralWidget(mainLeftRightSplitter); leftSplitter1 = new QSplitter(); @@ -356,6 +392,7 @@ public class NeverNote extends QMainWindow{ logger.log(logger.EXTREME, "Building index runners & timers"); indexRunner = new IndexRunner("indexRunner.log", Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword); indexThread = new QThread(indexRunner, "Index Thread"); + indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally(); indexThread.start(); synchronizeAnimationTimer = new QTimer(); @@ -390,6 +427,19 @@ public class NeverNote extends QMainWindow{ syncThread.start(); + logger.log(logger.EXTREME, "Starting thumnail thread"); + pdfReadyQueue = new ArrayList(); + thumbnailRunner = new ThumbnailRunner("thumbnailRunner.log", Global.getDatabaseUrl(), Global.getDatabaseUserid(), Global.getDatabaseUserPassword(), Global.cipherPassword); + thumbnailThread = new QThread(thumbnailRunner, "Thumbnail Thread"); + thumbnailRunner.noteSignal.thumbnailPageReady.connect(this, "thumbnailHTMLReady(String,QByteArray,Integer)"); + thumbnailThread.start(); + thumbGenerators = new ArrayList(); + thumbnailTimer = new QTimer(); + thumbnailTimer.timeout.connect(this, "thumbnailTimer()"); + thumbnailTimer(); + thumbnailTimer.setInterval(60*1000); // Thumbnail every minute + thumbnailTimer.start(); + logger.log(logger.EXTREME, "Starting authentication timer"); authTimer = new QTimer(); authTimer.timeout.connect(this, "authTimer()"); @@ -401,7 +451,6 @@ public class NeverNote extends QMainWindow{ saveTimer.timeout.connect(this, "saveNote()"); if (Global.getAutoSaveInterval() > 0) { saveTimer.setInterval(1000*60*Global.getAutoSaveInterval()); -// saveTimer.setInterval(1000*10); // auto save every 20 seconds; saveTimer.start(); } listManager.saveRunner.noteSignals.noteSaveRunnerError.connect(this, "saveRunnerError(String, String)"); @@ -415,7 +464,7 @@ public class NeverNote extends QMainWindow{ importFilesKeep = new ArrayList(); externalFileSaveTimer.start(); - notebookTree = new NotebookTreeWidget(); + notebookTree = new NotebookTreeWidget(conn); attributeTree = new AttributeTreeWidget(); tagTree = new TagTreeWidget(conn); savedSearchTree = new SavedSearchTreeWidget(); @@ -432,21 +481,28 @@ public class NeverNote extends QMainWindow{ // Setup the browser window noteCache = new HashMap(); + readOnlyCache = new HashMap(); + inkNoteCache = new HashMap(); browserWindow = new BrowserWindow(conn); - browserIndexSplitter.addWidget(noteTableView); - browserIndexSplitter.addWidget(browserWindow); - 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 QProgressBar(); + quotaBar = new QuotaProgressBar(); // Setup the thumbnail viewer thumbnailViewer = new ThumbnailViewer(); @@ -454,6 +510,9 @@ public class NeverNote extends QMainWindow{ thumbnailViewer.downArrow.connect(this, "downAction()"); thumbnailViewer.leftArrow.connect(this, "nextViewedAction()"); thumbnailViewer.rightArrow.connect(this, "previousViewedAction()"); + + //Setup external browser manager + externalWindows = new HashMap(); listManager.loadNotesIndex(); initializeNotebookTree(); @@ -472,6 +531,7 @@ public class NeverNote extends QMainWindow{ tagTree.setDeleteAction(menuBar.tagDeleteAction); tagTree.setEditAction(menuBar.tagEditAction); tagTree.setAddAction(menuBar.tagAddAction); + tagTree.setIconAction(menuBar.tagIconAction); tagTree.setVisible(Global.isWindowVisible("tagTree")); tagTree.noteSignal.tagsAdded.connect(this, "tagsAdded(String, String)"); menuBar.hideTags.setChecked(Global.isWindowVisible("tagTree")); @@ -480,13 +540,20 @@ public class NeverNote extends QMainWindow{ notebookTree.setDeleteAction(menuBar.notebookDeleteAction); notebookTree.setEditAction(menuBar.notebookEditAction); notebookTree.setAddAction(menuBar.notebookAddAction); + notebookTree.setIconAction(menuBar.notebookIconAction); + notebookTree.setStackAction(menuBar.notebookStackAction); + notebookTree.setPublishAction(menuBar.notebookPublishAction); + 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.setEditAction(menuBar.savedSearchEditAction); savedSearchTree.setDeleteAction(menuBar.savedSearchDeleteAction); + savedSearchTree.setIconAction(menuBar.savedSearchIconAction); savedSearchTree.itemSelectionChanged.connect(this, "updateSavedSearchSelection()"); savedSearchTree.setVisible(Global.isWindowVisible("savedSearchTree")); menuBar.hideSavedSearches.setChecked(Global.isWindowVisible("savedSearchTree")); @@ -502,13 +569,15 @@ public class NeverNote extends QMainWindow{ noteTableView.resetViewport.connect(this, "scrollToCurrentGuid()"); noteTableView.doubleClicked.connect(this, "listDoubleClick()"); listManager.trashSignal.countChanged.connect(trashTree, "updateCounts(Integer)"); + + quotaBar.setMouseClickAction(menuBar.accountAction); + trashTree.load(); trashTree.itemSelectionChanged.connect(this, "trashTreeSelection()"); trashTree.setEmptyAction(menuBar.emptyTrashAction); trashTree.setVisible(Global.isWindowVisible("trashTree")); menuBar.hideTrash.setChecked(Global.isWindowVisible("trashTree")); trashTree.updateCounts(listManager.getTrashCount()); - attributeTree.setVisible(Global.isWindowVisible("attributeTree")); menuBar.hideAttributes.setChecked(Global.isWindowVisible("attributeTree")); @@ -519,6 +588,8 @@ public class NeverNote extends QMainWindow{ toggleEditorButtonBar(); if (!Global.isWindowVisible("leftPanel")) menuBar.hideLeftSide.setChecked(true); + if (Global.isWindowVisible("noteInformation")) + toggleNoteInformation(); setMenuBar(menuBar); setupToolBar(); @@ -530,7 +601,7 @@ public class NeverNote extends QMainWindow{ trayExitAction = new QAction("Exit", this); trayAddNoteAction = new QAction("Add Note", this); - trayExitAction.triggered.connect(this, "close()"); + trayExitAction.triggered.connect(this, "closeNeverNote()"); trayAddNoteAction.triggered.connect(this, "addNote()"); trayShowAction.triggered.connect(this, "trayToggleVisible()"); @@ -559,7 +630,7 @@ public class NeverNote extends QMainWindow{ showColumns(); menuBar.showEditorBar.setChecked(Global.isWindowVisible("editorButtonBar")); if (menuBar.showEditorBar.isChecked()) - showEditorButtons(); + showEditorButtons(browserWindow); tagIndexUpdated(true); savedSearchIndexUpdated(); notebookIndexUpdated(); @@ -589,7 +660,7 @@ public class NeverNote extends QMainWindow{ setupFolderImports(); loadStyleSheet(); - restoreWindowState(); + restoreWindowState(true); if (Global.mimicEvernoteInterface) { notebookTree.selectGuid(""); @@ -602,14 +673,37 @@ public class NeverNote extends QMainWindow{ 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); + } + else{ + menuBar.wideListView.setChecked(true); + } + menuBar.blockSignals(false); + menuBar.narrowListView.blockSignals(false); + menuBar.wideListView.blockSignals(false); + + if (Global.getListView() == Global.View_List_Wide) { + browserIndexSplitter.addWidget(noteTableView); + browserIndexSplitter.addWidget(browserWindow); + } else { + mainLeftRightSplitter.addWidget(noteTableView); + mainLeftRightSplitter.addWidget(browserWindow); + } + int sortCol = Global.getSortColumn(); int sortOrder = Global.getSortOrder(); noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder)); + if (Global.checkVersionUpgrade()) + checkForUpdates(); } - - + // 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); @@ -627,7 +721,7 @@ public class NeverNote extends QMainWindow{ dbConn = setupDatabaseConnection(); // Must be last stage of setup - only safe once DB is open hence we know we are the only instance running - Global.getFileManager().purgeResDirectory(); + Global.getFileManager().purgeResDirectory(true); } catch (InitializationException e) { // Fatal @@ -639,10 +733,15 @@ public class NeverNote extends QMainWindow{ NeverNote application = new NeverNote(dbConn); application.setAttribute(WidgetAttribute.WA_DeleteOnClose, true); - if (Global.wasWindowMaximized()) - application.showMaximized(); - else - application.show(); + if (Global.startMinimized()) + application.showMinimized(); + else { + if (Global.wasWindowMaximized()) + application.showMaximized(); + else + application.show(); + } + if (showSplash) splash.finish(application); QApplication.exec(); @@ -780,6 +879,11 @@ public class NeverNote extends QMainWindow{ // Exit point @Override public void closeEvent(QCloseEvent event) { + if (Global.minimizeOnClose() && !closeAction && Global.showTrayIcon()) { + event.ignore(); + hide(); + return; + } logger.log(logger.HIGH, "Entering NeverNote.closeEvent"); waitCursor(true); @@ -789,7 +893,17 @@ public class NeverNote extends QMainWindow{ } saveNote(); setMessage(tr("Beginning shutdown.")); - + + // Close down external windows + Collection windows = externalWindows.values(); + Iterator iterator = windows.iterator(); + while (iterator.hasNext()) { + ExternalBrowse browser = iterator.next(); + browser.windowClosing.disconnect(); + browser.close(); + } + + externalFileEditedSaver(); if (Global.isConnected && Global.synchronizeOnClose()) { setMessage(tr("Performing synchronization before closing.")); @@ -799,7 +913,11 @@ public class NeverNote extends QMainWindow{ threadMonitorTimer.stop(); syncRunner.addWork("STOP"); + syncRunner.keepRunning = false; + thumbnailRunner.addWork("STOP"); + syncRunner.keepRunning = false; indexRunner.addWork("STOP"); + syncRunner.keepRunning = false; saveNote(); listManager.stop(); saveWindowState(); @@ -818,27 +936,9 @@ public class NeverNote extends QMainWindow{ syncRunner.notebookSignal.listChanged.disconnect(); syncRunner.noteIndexSignal.listChanged.disconnect(); - - int position = noteTableView.header.visualIndex(Global.noteTableCreationPosition); - Global.setColumnPosition("noteTableCreationPosition", position); - position = noteTableView.header.visualIndex(Global.noteTableTagPosition); - Global.setColumnPosition("noteTableTagPosition", position); - position = noteTableView.header.visualIndex(Global.noteTableNotebookPosition); - Global.setColumnPosition("noteTableNotebookPosition", position); - position = noteTableView.header.visualIndex(Global.noteTableChangedPosition); - Global.setColumnPosition("noteTableChangedPosition", position); - position = noteTableView.header.visualIndex(Global.noteTableAuthorPosition); - Global.setColumnPosition("noteTableAuthorPosition", position); - position = noteTableView.header.visualIndex(Global.noteTableSourceUrlPosition); - Global.setColumnPosition("noteTableSourceUrlPosition", position); - position = noteTableView.header.visualIndex(Global.noteTableSubjectDatePosition); - Global.setColumnPosition("noteTableSubjectDatePosition", position); - position = noteTableView.header.visualIndex(Global.noteTableTitlePosition); - Global.setColumnPosition("noteTableTitlePosition", position); - position = noteTableView.header.visualIndex(Global.noteTableSynchronizedPosition); - Global.setColumnPosition("noteTableSynchronizedPosition", position); - - Global.saveWindowVisible("toolBar", toolBar.isVisible()); + if (isVisible()) + Global.saveWindowVisible("toolBar", toolBar.isVisible()); + saveNoteColumnPositions(); saveNoteIndexWidth(); int width = notebookTree.columnWidth(0); @@ -859,8 +959,14 @@ public class NeverNote extends QMainWindow{ 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(); } @@ -880,9 +986,20 @@ public class NeverNote extends QMainWindow{ 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"); } + @SuppressWarnings("unused") + private void closeNeverNote() { + closeAction = true; + close(); + } public void setMessage(String s) { logger.log(logger.HIGH, "Entering NeverNote.setMessage"); logger.log(logger.HIGH, "Message: " +s); @@ -892,16 +1009,21 @@ public class NeverNote extends QMainWindow{ } private void waitCursor(boolean wait) { -// if (wait) -// QApplication.setOverrideCursor(new QCursor(Qt.CursorShape.WaitCursor)); -// else -// QApplication.restoreOverrideCursor(); + if (wait) { + if (QApplication.overrideCursor() == null) + QApplication.setOverrideCursor(new QCursor(Qt.CursorShape.WaitCursor)); + } + else { + while (QApplication.overrideCursor() != null) + QApplication.restoreOverrideCursor(); + } } 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()"); @@ -918,31 +1040,33 @@ public class NeverNote extends QMainWindow{ 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()"); } private void setupBrowserSignalListeners() { - - browserWindow.fileWatcher.fileChanged.connect(this, "externalFileEdited(String)"); - browserWindow.noteSignal.tagsChanged.connect(this, "updateNoteTags(String, List)"); - browserWindow.noteSignal.tagsChanged.connect(this, "updateListTags(String, List)"); - //browserWindow.noteSignal.noteChanged.connect(this, "invalidateNoteCache(String, String)"); - browserWindow.noteSignal.noteChanged.connect(this, "setNoteDirty()"); - browserWindow.noteSignal.titleChanged.connect(listManager, "updateNoteTitle(String, String)"); - browserWindow.noteSignal.notebookChanged.connect(this, "updateNoteNotebook(String, String)"); - browserWindow.noteSignal.createdDateChanged.connect(listManager, "updateNoteCreatedDate(String, QDateTime)"); - browserWindow.noteSignal.alteredDateChanged.connect(listManager, "updateNoteAlteredDate(String, QDateTime)"); - browserWindow.noteSignal.subjectDateChanged.connect(listManager, "updateNoteSubjectDate(String, QDateTime)"); - browserWindow.noteSignal.authorChanged.connect(listManager, "updateNoteAuthor(String, String)"); - browserWindow.noteSignal.geoChanged.connect(listManager, "updateNoteGeoTag(String, Double,Double,Double)"); - browserWindow.noteSignal.geoChanged.connect(this, "setNoteDirty()"); - browserWindow.noteSignal.sourceUrlChanged.connect(listManager, "updateNoteSourceUrl(String, String)"); - browserWindow.focusLost.connect(this, "saveNote()"); - browserWindow.resourceSignal.contentChanged.connect(this, "externalFileEdited(String)"); + setupBrowserWindowListeners(browserWindow, true); } - + private void setupBrowserWindowListeners(BrowserWindow browser, boolean master) { + browser.fileWatcher.fileChanged.connect(this, "externalFileEdited(String)"); + browser.noteSignal.tagsChanged.connect(this, "updateNoteTags(String, List)"); + browser.noteSignal.tagsChanged.connect(this, "updateListTags(String, List)"); + if (master) browser.noteSignal.noteChanged.connect(this, "setNoteDirty()"); + browser.noteSignal.titleChanged.connect(listManager, "updateNoteTitle(String, String)"); + browser.noteSignal.titleChanged.connect(this, "updateNoteTitle(String, String)"); + browser.noteSignal.notebookChanged.connect(this, "updateNoteNotebook(String, String)"); + browser.noteSignal.createdDateChanged.connect(listManager, "updateNoteCreatedDate(String, QDateTime)"); + browser.noteSignal.alteredDateChanged.connect(listManager, "updateNoteAlteredDate(String, QDateTime)"); + browser.noteSignal.subjectDateChanged.connect(listManager, "updateNoteSubjectDate(String, QDateTime)"); + browser.noteSignal.authorChanged.connect(listManager, "updateNoteAuthor(String, String)"); + browser.noteSignal.geoChanged.connect(listManager, "updateNoteGeoTag(String, Double,Double,Double)"); + browser.noteSignal.geoChanged.connect(this, "setNoteDirty()"); + browser.noteSignal.sourceUrlChanged.connect(listManager, "updateNoteSourceUrl(String, String)"); + if (master) browser.focusLost.connect(this, "saveNote()"); + browser.resourceSignal.contentChanged.connect(this, "externalFileEdited(String)"); + } //*************************************************************** //*************************************************************** @@ -952,6 +1076,9 @@ public class NeverNote extends QMainWindow{ @SuppressWarnings("unused") private void settings() { logger.log(logger.HIGH, "Entering NeverNote.settings"); + saveNoteColumnPositions(); + saveNoteIndexWidth(); + showColumns(); ConfigDialog settings = new ConfigDialog(this); String dateFormat = Global.getDateFormat(); String timeFormat = Global.getTimeFormat(); @@ -960,13 +1087,14 @@ public class NeverNote extends QMainWindow{ indexTimer.start(indexTime); // reset indexing timer settings.exec(); + indexRunner.indexAttachmentsLocally = Global.indexAttachmentsLocally(); if (Global.showTrayIcon()) trayIcon.show(); else trayIcon.hide(); showColumns(); if (menuBar.showEditorBar.isChecked()) - showEditorButtons(); + showEditorButtons(browserWindow); // Reset the save timer if (Global.getAutoSaveInterval() > 0) @@ -978,13 +1106,15 @@ public class NeverNote extends QMainWindow{ // if (!dateFormat.equals(Global.getDateFormat()) || // !timeFormat.equals(Global.getTimeFormat())) { 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() { + private void restoreWindowState(boolean mainWindow) { // We need to name things or this doesn't work. setObjectName("NeverNote"); mainLeftRightSplitter.setObjectName("mainLeftRightSplitter"); @@ -992,7 +1122,8 @@ public class NeverNote extends QMainWindow{ leftSplitter1.setObjectName("leftSplitter1"); // Restore the actual positions. - restoreGeometry(Global.restoreGeometry(objectName())); + if (mainWindow) + restoreGeometry(Global.restoreGeometry(objectName())); mainLeftRightSplitter.restoreState(Global.restoreState(mainLeftRightSplitter.objectName())); browserIndexSplitter.restoreState(Global.restoreState(browserIndexSplitter.objectName())); leftSplitter1.restoreState(Global.restoreState(leftSplitter1.objectName())); @@ -1007,13 +1138,46 @@ public class NeverNote extends QMainWindow{ } // Load the style sheet private void loadStyleSheet() { - String fileName = Global.getFileManager().getQssDirPath("default.qss"); + String fileName = Global.getFileManager().getQssDirPathUser("default.qss"); + fileName = Global.getFileManager().getQssDirPath("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("default.qss"); + file = new QFile(fileName); + } file.open(OpenModeFlag.ReadOnly); String styleSheet = file.readAll().toString(); file.close(); setStyleSheet(styleSheet); } + // Save column positions for the next time + private void saveNoteColumnPositions() { + int position = noteTableView.header.visualIndex(Global.noteTableCreationPosition); + Global.setColumnPosition("noteTableCreationPosition", position); + position = noteTableView.header.visualIndex(Global.noteTableTagPosition); + Global.setColumnPosition("noteTableTagPosition", position); + position = noteTableView.header.visualIndex(Global.noteTableNotebookPosition); + Global.setColumnPosition("noteTableNotebookPosition", position); + position = noteTableView.header.visualIndex(Global.noteTableChangedPosition); + Global.setColumnPosition("noteTableChangedPosition", position); + position = noteTableView.header.visualIndex(Global.noteTableAuthorPosition); + Global.setColumnPosition("noteTableAuthorPosition", position); + position = noteTableView.header.visualIndex(Global.noteTableSourceUrlPosition); + Global.setColumnPosition("noteTableSourceUrlPosition", position); + position = noteTableView.header.visualIndex(Global.noteTableSubjectDatePosition); + Global.setColumnPosition("noteTableSubjectDatePosition", position); + position = noteTableView.header.visualIndex(Global.noteTableTitlePosition); + Global.setColumnPosition("noteTableTitlePosition", position); + position = noteTableView.header.visualIndex(Global.noteTableSynchronizedPosition); + Global.setColumnPosition("noteTableSynchronizedPosition", position); + position = noteTableView.header.visualIndex(Global.noteTableGuidPosition); + Global.setColumnPosition("noteTableGuidPosition", position); + position = noteTableView.header.visualIndex(Global.noteTableThumbnailPosition); + Global.setColumnPosition("noteTableThumbnailPosition", position); + + } // Save column widths for the next time private void saveNoteIndexWidth() { int width; @@ -1037,6 +1201,10 @@ public class NeverNote extends QMainWindow{ Global.setColumnWidth("noteTableSubjectDatePosition", width); width = noteTableView.getColumnWidth(Global.noteTableSynchronizedPosition); Global.setColumnWidth("noteTableSynchronizedPosition", width); + width = noteTableView.getColumnWidth(Global.noteTableThumbnailPosition); + Global.setColumnWidth("noteTableThumbnailPosition", width); + width = noteTableView.getColumnWidth(Global.noteTableGuidPosition); + Global.setColumnWidth("noteTableGuidPosition", width); } @@ -1048,9 +1216,9 @@ public class NeverNote extends QMainWindow{ // Setup the tree containing the user's notebooks. private void initializeNotebookTree() { logger.log(logger.HIGH, "Entering NeverNote.initializeNotebookTree"); - notebookTree.itemSelectionChanged.connect(this, "notebookTreeSelection()"); +// notebookTree.itemClicked.connect(this, "notebookTreeSelection()"); + notebookTree.selectionSignal.connect(this, "notebookTreeSelection()"); listManager.notebookSignal.refreshNotebookTreeCounts.connect(notebookTree, "updateCounts(List, List)"); - // notebookTree.resize(Global.getSize("notebookTree")); logger.log(logger.HIGH, "Leaving NeverNote.initializeNotebookTree"); } // Listener when a notebook is selected @@ -1067,31 +1235,41 @@ public class NeverNote extends QMainWindow{ menuBar.noteRestoreAction.setVisible(false); menuBar.notebookEditAction.setEnabled(true); menuBar.notebookDeleteAction.setEnabled(true); + menuBar.notebookPublishAction.setEnabled(true); + menuBar.notebookShareAction.setEnabled(true); + menuBar.notebookIconAction.setEnabled(true); + menuBar.notebookStackAction.setEnabled(true); List selections = notebookTree.selectedItems(); - QTreeWidgetItem currentSelection; selectedNotebookGUIDs.clear(); - if (!Global.mimicEvernoteInterface) { - for (int i=0; i 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 = ""; - if (selections.size() > 0) - guid = (selections.get(0).text(2)); - if (!guid.equals("")) - selectedNotebookGUIDs.add(guid); + menuBar.notebookIconAction.setEnabled(true); + for (int j=0; j icons = conn.getNotebookTable().getAllIcons(); + notebookTree.setIcons(icons); + + if (selectedNotebookGUIDs == null) selectedNotebookGUIDs = new ArrayList(); List books = conn.getNotebookTable().getAll(); for (int i=books.size()-1; i>=0; i--) { @@ -1183,29 +1366,107 @@ public class NeverNote extends QMainWindow{ } // Edit an existing notebook @SuppressWarnings("unused") + private void stackNotebook() { + logger.log(logger.HIGH, "Entering NeverNote.stackNotebook"); + StackNotebook edit = new StackNotebook(); + + List selections = notebookTree.selectedItems(); + QTreeWidgetItem currentSelection; + for (int i=0; i selections = notebookTree.selectedItems(); QTreeWidgetItem currentSelection; currentSelection = selections.get(0); edit.setNotebook(currentSelection.text(0)); - edit.setNotebooks(listManager.getNotebookIndex()); + + String guid = currentSelection.text(2); + if (!guid.equalsIgnoreCase("STACK")) { + edit.setTitle(tr("Edit Notebook")); + edit.setNotebooks(listManager.getNotebookIndex()); + edit.setLocalCheckboxEnabled(false); + for (int i=0; i filteredBooks = notebookFilter.getValidNotebooks(currentNote, listManager.getNotebookIndex()); + browserWindow.setNotebookList(filteredBooks); + Iterator set = externalWindows.keySet().iterator(); + while(set.hasNext()) + externalWindows.get(set.next()).getBrowserWindow().setNotebookList(filteredBooks); logger.log(logger.HIGH, "Leaving NeverNote.editNotebook"); } + // Publish a notebook + @SuppressWarnings("unused") + private void publishNotebook() { + List selections = notebookTree.selectedItems(); + QTreeWidgetItem currentSelection; + currentSelection = selections.get(0); + String guid = currentSelection.text(2); + + if (guid.equalsIgnoreCase("STACK") || guid.equalsIgnoreCase("")) + return; + + Notebook n = null; + int position = 0; + for (int i=0; i selections = notebookTree.selectedItems(); + QTreeWidgetItem currentSelection; + currentSelection = selections.get(0); + String guid = currentSelection.text(2); + + if (guid.equalsIgnoreCase("STACK") || guid.equalsIgnoreCase("")) + return; + + Notebook n = null;; + for (int i=0; i selections = notebookTree.selectedItems(); @@ -1236,13 +1569,18 @@ public class NeverNote extends QMainWindow{ QTreeWidgetItem currentSelection; currentSelection = selections.get(i); String guid = currentSelection.text(2); - for (int j=0; j=0; i--) { - // if (dbRunner.getLocalNotebooks().get(i).equals(arg0)) - // } - notebookTreeSelection(); - notebookTree.load(listManager.getNotebookIndex(), listManager.getLocalNotebooks()); - listManager.countNotebookResults(listManager.getNoteIndex()); -// notebookTree.updateCounts(listManager.getNotebookIndex(), listManager.getNotebookCounter()); + + 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 @@ -1352,6 +1704,7 @@ public class NeverNote extends QMainWindow{ listManager.loadNotesIndex(); notebookIndexUpdated(); noteIndexUpdated(false); + reloadTagTree(true); // noteIndexUpdated(false); // Build a list of non-closed notebooks @@ -1365,12 +1718,100 @@ public class NeverNote extends QMainWindow{ if (!found) nbooks.add(listManager.getNotebookIndex().get(i)); } + + FilterEditorNotebooks notebookFilter = new FilterEditorNotebooks(conn, logger); + List filteredBooks = notebookFilter.getValidNotebooks(currentNote, listManager.getNotebookIndex()); + browserWindow.setNotebookList(filteredBooks); + + // Update any external windows + Iterator set = externalWindows.keySet().iterator(); + while(set.hasNext()) + externalWindows.get(set.next()).getBrowserWindow().setNotebookList(filteredBooks); + waitCursor(false); - browserWindow.setNotebookList(nbooks); } + // Change the notebook's icon + @SuppressWarnings("unused") + private void setNotebookIcon() { + boolean stackSelected = false; + boolean allNotebookSelected = false; + + QTreeWidgetItem currentSelection; + List selections = notebookTree.selectedItems(); + if (selections.size() == 0) + return; + + currentSelection = selections.get(0); + String guid = currentSelection.text(2); + if (guid.equalsIgnoreCase("")) + allNotebookSelected = true; + if (guid.equalsIgnoreCase("STACK")) + stackSelected = true; + QIcon currentIcon = currentSelection.icon(0); + QIcon icon; + SetIcon dialog; + + if (!stackSelected && !allNotebookSelected) { + icon = conn.getNotebookTable().getIcon(guid); + if (icon == null) { + dialog = new SetIcon(currentIcon, saveLastPath); + dialog.setUseDefaultIcon(true); + } else { + dialog = new SetIcon(icon, saveLastPath); + dialog.setUseDefaultIcon(false); + } + } else { + if (stackSelected) { + icon = conn.getSystemIconTable().getIcon(currentSelection.text(0), "STACK"); + } else { + icon = conn.getSystemIconTable().getIcon(currentSelection.text(0), "ALLNOTEBOOK"); + } + if (icon == null) { + dialog = new SetIcon(currentIcon, saveLastPath); + dialog.setUseDefaultIcon(true); + } else { + 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()); + if (newIcon == null) { + newIcon = new QIcon(iconPath+"books2.png"); + } + currentSelection.setIcon(0,newIcon); + return; + } + if (allNotebookSelected) { + conn.getSystemIconTable().setIcon(currentSelection.text(0), "ALLNOTEBOOK", newIcon, dialog.getFileType()); + if (newIcon == null) { + newIcon = new QIcon(iconPath+"notebook-green.png"); + } + currentSelection.setIcon(0,newIcon); + return; + } + conn.getNotebookTable().setIcon(guid, newIcon, dialog.getFileType()); + if (newIcon == null) { + boolean isPublished = false;; + boolean found = false; + for (int i=0; i 0 @@ -1494,7 +1939,9 @@ public class NeverNote extends QMainWindow{ // Setup the tree containing the user's tags private void initializeTagTree() { logger.log(logger.HIGH, "Entering NeverNote.initializeTagTree"); - tagTree.itemSelectionChanged.connect(this, "tagTreeSelection()"); +// tagTree.itemSelectionChanged.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"); } @@ -1518,10 +1965,12 @@ public class NeverNote extends QMainWindow{ if (selections.size() > 0) { menuBar.tagEditAction.setEnabled(true); menuBar.tagDeleteAction.setEnabled(true); + menuBar.tagIconAction.setEnabled(true); } else { menuBar.tagEditAction.setEnabled(false); menuBar.tagDeleteAction.setEnabled(false); + menuBar.tagIconAction.setEnabled(true); } listManager.setSelectedTags(selectedTagGUIDs); listManager.loadNotesIndex(); @@ -1537,11 +1986,14 @@ public class NeverNote extends QMainWindow{ logger.log(logger.HIGH, "Entering NeverNote.tagIndexUpdated"); if (selectedTagGUIDs == null) selectedTagGUIDs = new ArrayList(); -// selectedTagGUIDs.clear(); // clear out old entries + if (reload) + listManager.reloadTagIndex(); tagTree.blockSignals(true); - if (reload) + 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) @@ -1662,11 +2114,44 @@ public class NeverNote extends QMainWindow{ menuBar.noteRestoreAction.setVisible(false); menuBar.tagEditAction.setEnabled(false); menuBar.tagDeleteAction.setEnabled(false); + menuBar.tagIconAction.setEnabled(false); selectedTagGUIDs.clear(); listManager.setSelectedTags(selectedTagGUIDs); tagTree.blockSignals(false); } + // Change the icon for a tag + @SuppressWarnings("unused") + private void setTagIcon() { + QTreeWidgetItem currentSelection; + List selections = tagTree.selectedItems(); + if (selections.size() == 0) + return; + + currentSelection = selections.get(0); + String guid = currentSelection.text(2); + + QIcon currentIcon = currentSelection.icon(0); + QIcon icon = conn.getTagTable().getIcon(guid); + SetIcon dialog; + if (icon == null) { + dialog = new SetIcon(currentIcon, saveLastPath); + dialog.setUseDefaultIcon(true); + } else { + 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) + newIcon = new QIcon(iconPath+"tag.png"); + currentSelection.setIcon(0, newIcon); + } + } + //*************************************************************** //*************************************************************** @@ -1782,6 +2267,7 @@ public class NeverNote extends QMainWindow{ String currentGuid = selectedSavedSearchGUID; menuBar.savedSearchEditAction.setEnabled(true); menuBar.savedSearchDeleteAction.setEnabled(true); + menuBar.savedSearchIconAction.setEnabled(true); List selections = savedSearchTree.selectedItems(); QTreeWidgetItem currentSelection; selectedSavedSearchGUID = ""; @@ -1808,6 +2294,7 @@ public class NeverNote extends QMainWindow{ private void clearSavedSearchFilter() { menuBar.savedSearchEditAction.setEnabled(false); menuBar.savedSearchDeleteAction.setEnabled(false); + menuBar.savedSearchIconAction.setEnabled(false); savedSearchTree.blockSignals(true); savedSearchTree.clearSelection(); savedSearchTree.blockSignals(false); @@ -1821,6 +2308,7 @@ public class NeverNote extends QMainWindow{ if (selectedSavedSearchGUID == null) selectedSavedSearchGUID = new String(); savedSearchTree.blockSignals(true); + savedSearchTree.setIcons(conn.getSavedSearchTable().getAllIcons()); savedSearchTree.load(listManager.getSavedSearchIndex()); savedSearchTree.selectGuid(selectedSavedSearchGUID); savedSearchTree.blockSignals(false); @@ -1832,17 +2320,20 @@ public class NeverNote extends QMainWindow{ menuBar.savedSearchEditAction.setEnabled(true); menuBar.savedSearchDeleteAction.setEnabled(true); + menuBar.savedSearchIconAction.setEnabled(true); List selections = savedSearchTree.selectedItems(); if (selections.size() > 0) { menuBar.savedSearchEditAction.setEnabled(true); menuBar.savedSearchDeleteAction.setEnabled(true); + menuBar.savedSearchIconAction.setEnabled(true); selectedSavedSearchGUID = selections.get(0).text(1); SavedSearch s = conn.getSavedSearchTable().getSavedSearch(selectedSavedSearchGUID); searchField.setEditText(s.getQuery()); } else { menuBar.savedSearchEditAction.setEnabled(false); menuBar.savedSearchDeleteAction.setEnabled(false); + menuBar.savedSearchIconAction.setEnabled(false); selectedSavedSearchGUID = ""; searchField.setEditText(""); } @@ -1864,6 +2355,38 @@ public class NeverNote extends QMainWindow{ Global.saveWindowVisible("savedSearchTree", savedSearchTree.isVisible()); logger.log(logger.HIGH, "Leaving NeverNote.toggleSavedSearchWindow"); } + // Change the icon for a saved search + @SuppressWarnings("unused") + private void setSavedSearchIcon() { + QTreeWidgetItem currentSelection; + List selections = savedSearchTree.selectedItems(); + if (selections.size() == 0) + return; + + currentSelection = selections.get(0); + String guid = currentSelection.text(1); + + QIcon currentIcon = currentSelection.icon(0); + QIcon icon = conn.getSavedSearchTable().getIcon(guid); + SetIcon dialog; + if (icon == null) { + dialog = new SetIcon(currentIcon, saveLastPath); + dialog.setUseDefaultIcon(true); + } else { + 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) + newIcon = new QIcon(iconPath+"search.png"); + currentSelection.setIcon(0, newIcon); + } + + } @@ -1884,6 +2407,7 @@ public class NeverNote extends QMainWindow{ 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()); @@ -1992,8 +2516,75 @@ public class NeverNote extends QMainWindow{ 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; - + // 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; + } + + + if (Global.version.equals(version)) + return; + + UpgradeAvailableDialog dialog = new UpgradeAvailableDialog(); + dialog.exec(); + if (dialog.remindMe()) + Global.setCheckVersionUpgrade(true); + else + Global.setCheckVersionUpgrade(false); + } + + //*************************************************************** //*************************************************************** //** These functions deal with the Toolbar @@ -2001,20 +2592,45 @@ public class NeverNote extends QMainWindow{ //*************************************************************** // 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(); + noteIndexUpdated(true); + if (currentNote == null && listManager.getNoteIndex().size() > 0) { + currentNote = listManager.getNoteIndex().get(0); + currentNoteGuid = currentNote.getGuid(); + } + if (currentNote != null) + loadNoteBrowserInformation(browserWindow); } // 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) { + + // This is done because we want to force a reload of + // images. Some images we may want to highlight the text. noteCache.clear(); + readOnlyCache.clear(); + inkNoteCache.clear(); + listManager.setEnSearch(""); -///// listManager.clearNoteIndexSearch(); - //noteIndexUpdated(true); listManager.loadNotesIndex(); refreshEvernoteNote(true); noteIndexUpdated(false); @@ -2026,6 +2642,9 @@ public class NeverNote extends QMainWindow{ private void searchFieldChanged() { logger.log(logger.HIGH, "Entering NeverNote.searchFieldChanged"); noteCache.clear(); + readOnlyCache.clear(); + inkNoteCache.clear(); + saveNoteColumnPositions(); saveNoteIndexWidth(); String text = searchField.currentText(); listManager.setEnSearch(text.trim()); @@ -2051,66 +2670,81 @@ public class NeverNote extends QMainWindow{ QIcon prevIcon = new QIcon(iconPath+"back.png"); prevButton.setIcon(prevIcon); prevButton.triggered.connect(this, "previousViewedAction()"); + togglePrevArrowButton(Global.isToolbarButtonVisible("prevArrow")); nextButton = toolBar.addAction("Next"); QIcon nextIcon = new QIcon(iconPath+"forward.png"); nextButton.setIcon(nextIcon); nextButton.triggered.connect(this, "nextViewedAction()"); + toggleNextArrowButton(Global.isToolbarButtonVisible("nextArrow")); upButton = toolBar.addAction("Up"); QIcon upIcon = new QIcon(iconPath+"up.png"); upButton.setIcon(upIcon); upButton.triggered.connect(this, "upAction()"); + toggleUpArrowButton(Global.isToolbarButtonVisible("upArrow")); + downButton = toolBar.addAction("Down"); QIcon downIcon = new QIcon(iconPath+"down.png"); downButton.setIcon(downIcon); downButton.triggered.connect(this, "downAction()"); + toggleDownArrowButton(Global.isToolbarButtonVisible("downArrow")); synchronizeButton = toolBar.addAction("Synchronize"); - synchronizeAnimation = new ArrayList(); - synchronizeAnimation.add(new QIcon(iconPath+"synchronize-0.png")); - synchronizeAnimation.add(new QIcon(iconPath+"synchronize-1.png")); - synchronizeAnimation.add(new QIcon(iconPath+"synchronize-2.png")); - synchronizeAnimation.add(new QIcon(iconPath+"synchronize-3.png")); - synchronizeButton.setIcon(synchronizeAnimation.get(0)); - synchronizeFrame = 0; + synchronizeButton.setIcon(new QIcon(iconPath+"synchronize.png")); + synchronizeIconAngle = 0; synchronizeButton.triggered.connect(this, "evernoteSync()"); + toggleSynchronizeButton(Global.isToolbarButtonVisible("synchronize")); printButton = toolBar.addAction("Print"); QIcon printIcon = new QIcon(iconPath+"print.png"); printButton.setIcon(printIcon); printButton.triggered.connect(this, "printNote()"); - + togglePrintButton(Global.isToolbarButtonVisible("print")); + tagButton = toolBar.addAction("Tag"); QIcon tagIcon = new QIcon(iconPath+"tag.png"); tagButton.setIcon(tagIcon); tagButton.triggered.connect(browserWindow, "modifyTags()"); - + toggleTagButton(Global.isToolbarButtonVisible("tag")); + attributeButton = toolBar.addAction("Attributes"); QIcon attributeIcon = new QIcon(iconPath+"attribute.png"); attributeButton.setIcon(attributeIcon); attributeButton.triggered.connect(this, "toggleNoteInformation()"); + toggleAttributeButton(Global.isToolbarButtonVisible("attribute")); emailButton = toolBar.addAction("Email"); QIcon emailIcon = new QIcon(iconPath+"email.png"); emailButton.setIcon(emailIcon); emailButton.triggered.connect(this, "emailNote()"); - + toggleEmailButton(Global.isToolbarButtonVisible("email")); + deleteButton = toolBar.addAction("Delete"); QIcon deleteIcon = new QIcon(iconPath+"delete.png"); deleteButton.setIcon(deleteIcon); deleteButton.triggered.connect(this, "deleteNote()"); - + toggleDeleteButton(Global.isToolbarButtonVisible("delete")); + newButton = toolBar.addAction("New"); QIcon newIcon = new QIcon(iconPath+"new.png"); newButton.triggered.connect(this, "addNote()"); newButton.setIcon(newIcon); + toggleNewButton(Global.isToolbarButtonVisible("new")); + + allNotesButton = toolBar.addAction("All Notes"); + QIcon allIcon = new QIcon(iconPath+"books.png"); + allNotesButton.triggered.connect(this, "allNotes()"); + allNotesButton.setIcon(allIcon); + toggleAllNotesButton(Global.isToolbarButtonVisible("allNotes")); + toolBar.addSeparator(); toolBar.addWidget(new QLabel(tr("Quota:"))); toolBar.addWidget(quotaBar); //quotaBar.setSizePolicy(Policy.Minimum, Policy.Minimum); updateQuotaBar(); + toolBar.addSeparator(); // Setup the zoom zoomSpinner = new QSpinBox(); @@ -2136,16 +2770,165 @@ public class NeverNote extends QMainWindow{ 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"); } // Update the sychronize button picture + @Override + public QMenu createPopupMenu() { + QMenu contextMenu = super.createPopupMenu(); + + contextMenu.addSeparator(); + QAction prevAction = addContextAction("prevArrow", tr("Previous Arrow")); + contextMenu.addAction(prevAction); + prevAction.triggered.connect(this, "togglePrevArrowButton(Boolean)"); + + QAction nextAction = addContextAction("nextArrow", tr("Next Arrow")); + contextMenu.addAction(nextAction); + nextAction.triggered.connect(this, "toggleNextArrowButton(Boolean)"); + + QAction upAction = addContextAction("upArrow", tr("Up Arrow")); + contextMenu.addAction(upAction); + upAction.triggered.connect(this, "toggleUpArrowButton(Boolean)"); + + QAction downAction = addContextAction("downArrow", tr("Down Arrow")); + contextMenu.addAction(downAction); + downAction.triggered.connect(this, "toggleDownArrowButton(Boolean)"); + + QAction synchronizeAction = addContextAction("synchronize", tr("Synchronize")); + contextMenu.addAction(synchronizeAction); + synchronizeAction.triggered.connect(this, "toggleSynchronizeButton(Boolean)"); + + QAction printAction = addContextAction("print", tr("Print")); + contextMenu.addAction(printAction); + printAction.triggered.connect(this, "togglePrintButton(Boolean)"); + + QAction tagAction = addContextAction("tag", tr("Tag")); + contextMenu.addAction(tagAction); + tagAction.triggered.connect(this, "toggleTagButton(Boolean)"); + + QAction attributeAction = addContextAction("attribute", tr("Attribute")); + contextMenu.addAction(attributeAction); + attributeAction.triggered.connect(this, "toggleAttributeButton(Boolean)"); + + QAction emailAction = addContextAction("email", tr("Email")); + contextMenu.addAction(emailAction); + emailAction.triggered.connect(this, "toggleEmailButton(Boolean)"); + + QAction deleteAction = addContextAction("delete", tr("Delete")); + contextMenu.addAction(deleteAction); + deleteAction.triggered.connect(this, "toggleDeleteButton(Boolean)"); + + QAction newAction = addContextAction("new", tr("Add")); + contextMenu.addAction(newAction); + newAction.triggered.connect(this, "toggleNewButton(Boolean)"); + + QAction allNotesAction = addContextAction("allNotes", tr("All Notes")); + 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)"); + + return contextMenu; + + } + private QAction addContextAction(String config, String name) { + QAction newAction = new QAction(this); + newAction.setText(name); + newAction.setCheckable(true); + newAction.setChecked(Global.isToolbarButtonVisible(config)); + return newAction; + } + private void togglePrevArrowButton(Boolean toggle) { + prevButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("prevArrow", toggle); + } + private void toggleNextArrowButton(Boolean toggle) { + nextButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("nextArrow", toggle); + } + private void toggleUpArrowButton(Boolean toggle) { + upButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("upArrow", toggle); + } + private void toggleDownArrowButton(Boolean toggle) { + downButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("downArrow", toggle); + } + private void toggleSynchronizeButton(Boolean toggle) { + synchronizeButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("synchronize", toggle); + } + private void togglePrintButton(Boolean toggle) { + printButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("print", toggle); + } + private void toggleTagButton(Boolean toggle) { + tagButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("tag", toggle); + } + private void toggleAttributeButton(Boolean toggle) { + attributeButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("attribute", toggle); + } + private void toggleEmailButton(Boolean toggle) { + emailButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("email", toggle); + } + private void toggleDeleteButton(Boolean toggle) { + deleteButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("delete", toggle); + } + private void toggleNewButton(Boolean toggle) { + newButton.setVisible(toggle); + Global.saveToolbarButtonsVisible("new", toggle); + } + private void toggleAllNotesButton(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 updateSyncButton() { - synchronizeFrame++; - if (synchronizeFrame == 4) - synchronizeFrame = 0; - synchronizeButton.setIcon(synchronizeAnimation.get(synchronizeFrame)); + + if (syncIcons == null) { + syncIcons = new ArrayList(); + 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") @@ -2154,7 +2937,8 @@ public class NeverNote extends QMainWindow{ if (!Global.isConnected) remoteConnect(); if (Global.isConnected) - synchronizeAnimationTimer.start(200); + synchronizeAnimationTimer.start(5); +// synchronizeAnimationTimer.start(200); syncTimer(); logger.log(logger.HIGH, "Leaving NeverNote.evernoteSync"); } @@ -2313,6 +3097,7 @@ public class NeverNote extends QMainWindow{ menuBar.connectAction.setText(tr("Connect")); menuBar.connectAction.setToolTip(tr("Connect to Evernote")); menuBar.synchronizeAction.setEnabled(false); + Global.isConnected = false; synchronizeAnimationTimer.stop(); return; } @@ -2358,6 +3143,30 @@ public class NeverNote extends QMainWindow{ 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(); Global.isConnected = syncRunner.isConnected; setupOnlineMenu(); @@ -2388,10 +3197,10 @@ public class NeverNote extends QMainWindow{ @SuppressWarnings("unused") private void attributeTreeClicked(QTreeWidgetItem item, Integer integer) { - clearTagFilter(); - clearNotebookFilter(); +// clearTagFilter(); +// clearNotebookFilter(); clearTrashFilter(); - clearSavedSearchFilter(); +// clearSavedSearchFilter(); if (attributeTreeSelected == null || item.nativeId() != attributeTreeSelected.nativeId()) { if (item.childCount() > 0) { @@ -2507,7 +3316,8 @@ public class NeverNote extends QMainWindow{ noteTableView.showColumn(Global.noteTableGuidPosition); List selections = noteTableView.selectionModel().selectedRows(); - noteTableView.hideColumn(Global.noteTableGuidPosition); + if (!Global.isColumnVisible("guid")) + noteTableView.hideColumn(Global.noteTableGuidPosition); if (selections.size() > 0) { QModelIndex index; @@ -2568,6 +3378,23 @@ public class NeverNote extends QMainWindow{ refreshEvernoteNoteList(); logger.log(logger.HIGH, "Calling note table reload in NeverNote.noteIndexUpdated() - "+reload); noteTableView.load(reload); + 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(); + noteTableView.selectRow(pos-1); + } + } + } + showColumns(); scrollToGuid(currentNoteGuid); logger.log(logger.HIGH, "Leaving NeverNote.noteIndexUpdated"); } @@ -2590,10 +3417,11 @@ public class NeverNote extends QMainWindow{ if (currentNoteGuid == null) currentNoteGuid = new String(); + //determine current note guid for (Note note : listManager.getNoteIndex()) { tempNoteGuid = note.getGuid(); if (currentNoteGuid.equals(tempNoteGuid)) { - saveCurrentNoteGuid = new String(tempNoteGuid); + saveCurrentNoteGuid = tempNoteGuid; } } @@ -2604,14 +3432,12 @@ public class NeverNote extends QMainWindow{ browserWindow.setDisabled(true); } - if (saveCurrentNoteGuid.equals("") && listManager.getNoteIndex().size() >0) { - currentNoteGuid = listManager.getNoteIndex().get(listManager.getNoteIndex().size()-1).getGuid(); - currentNote = listManager.getNoteIndex().get(listManager.getNoteIndex().size()-1); - refreshEvernoteNote(true); - } else { + if (!saveCurrentNoteGuid.equals("")) { refreshEvernoteNote(false); + } else { + currentNoteGuid = ""; } - reloadTagTree(); + reloadTagTree(false); logger.log(logger.HIGH, "Leaving NeverNote.refreshEvernoteNoteList"); } @@ -2696,6 +3522,7 @@ public class NeverNote extends QMainWindow{ if (tableGuid.equals(guid)) { listManager.getNoteTableModel().setData(i, Global.noteTableTagPosition,tagBuffer.toString()); listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false"); + noteTableView.proxyModel.invalidate(); return; } } @@ -2711,16 +3538,17 @@ public class NeverNote extends QMainWindow{ //QModelIndex modelIndex = noteTableView.proxyModel.index(i, Global.noteTableGuidPosition); QModelIndex modelIndex = listManager.getNoteTableModel().index(i, Global.noteTableGuidPosition); if (modelIndex != null) { -// SortedMap ix = noteTableView.proxyModel.itemData(modelIndex); SortedMap ix = listManager.getNoteTableModel().itemData(modelIndex); String tableGuid = (String)ix.values().toArray()[0]; if (tableGuid.equals(guid)) { listManager.getNoteTableModel().setData(i, Global.noteTableAuthorPosition,author); listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false"); + noteTableView.proxyModel.invalidate(); return; } } } + logger.log(logger.HIGH, "Leaving NeverNote.updateListAuthor"); } private void updateListNoteNotebook(String guid, String notebook) { @@ -2743,12 +3571,14 @@ public class NeverNote extends QMainWindow{ if (tableGuid.equals(guid)) { listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false"); listManager.getNoteTableModel().setData(i, Global.noteTableSourceUrlPosition,url); + noteTableView.proxyModel.invalidate(); return; } } } logger.log(logger.HIGH, "Leaving NeverNote.updateListAuthor"); } + @SuppressWarnings("unused") private void updateListGuid(String oldGuid, String newGuid) { logger.log(logger.HIGH, "Entering NeverNote.updateListTitle"); @@ -2780,7 +3610,6 @@ public class NeverNote extends QMainWindow{ String noteGuid = (String)ix.values().toArray()[0]; if (noteGuid.equalsIgnoreCase(listManager.getNoteIndex().get(j).getGuid())) { listManager.getNoteTableModel().setData(i, Global.noteTableTagPosition, newName); - //listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false"); i=listManager.getNoteTableModel().rowCount(); } } @@ -2807,7 +3636,6 @@ public class NeverNote extends QMainWindow{ String noteGuid = (String)ix.values().toArray()[0]; if (noteGuid.equalsIgnoreCase(listManager.getNoteIndex().get(j).getGuid())) { listManager.getNoteTableModel().setData(i, Global.noteTableTagPosition, newName); -// listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false"); i=listManager.getNoteTableModel().rowCount(); } } @@ -2825,7 +3653,6 @@ public class NeverNote extends QMainWindow{ SortedMap ix = listManager.getNoteTableModel().itemData(modelIndex); String tableName = (String)ix.values().toArray()[0]; if (tableName.equalsIgnoreCase(oldName)) { -// listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false"); listManager.getNoteTableModel().setData(i, Global.noteTableNotebookPosition, newName); } } @@ -2843,6 +3670,7 @@ public class NeverNote extends QMainWindow{ String tableGuid = (String)ix.values().toArray()[0]; if (tableGuid.equals(guid)) { listManager.getNoteTableModel().setData(i, Global.noteTableCreationPosition, date.toString(Global.getDateFormat()+" " +Global.getTimeFormat())); + noteTableView.proxyModel.invalidate(); return; } } @@ -2861,13 +3689,13 @@ public class NeverNote extends QMainWindow{ if (tableGuid.equals(guid)) { listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false"); listManager.getNoteTableModel().setData(i, Global.noteTableSubjectDatePosition, date.toString(Global.getDateFormat()+" " +Global.getTimeFormat())); + noteTableView.proxyModel.invalidate(); return; } } } logger.log(logger.HIGH, "Leaving NeverNote.updateListDateCreated"); } - @SuppressWarnings("unused") private void updateListDateChanged(String guid, QDateTime date) { logger.log(logger.HIGH, "Entering NeverNote.updateListDateChanged"); @@ -2887,23 +3715,11 @@ public class NeverNote extends QMainWindow{ } private void updateListDateChanged() { logger.log(logger.HIGH, "Entering NeverNote.updateListDateChanged"); - QDateTime date = new QDateTime(QDateTime.currentDateTime()); - for (int i=0; i ix = listManager.getNoteTableModel().itemData(modelIndex); - String tableGuid = (String)ix.values().toArray()[0]; - if (tableGuid.equals(currentNoteGuid)) { - listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false"); - listManager.getNoteTableModel().setData(i, Global.noteTableChangedPosition, date.toString(Global.getDateFormat()+" " +Global.getTimeFormat())); - return; - } - } - } + QDateTime date = new QDateTime(QDateTime.currentDateTime()); + updateListDateChanged(currentNoteGuid, date); logger.log(logger.HIGH, "Leaving NeverNote.updateListDateChanged"); } // Redo scroll - @SuppressWarnings("unused") private void scrollToCurrentGuid() { //scrollToGuid(currentNoteGuid); List selections = noteTableView.selectionModel().selectedRows(); @@ -2948,6 +3764,7 @@ public class NeverNote extends QMainWindow{ i=listManager.getNoteTableModel().rowCount(); } } + noteTableView.repaint(); } // Show/Hide columns private void showColumns() { @@ -2959,11 +3776,9 @@ public class NeverNote extends QMainWindow{ noteTableView.setColumnHidden(Global.noteTableTagPosition, !Global.isColumnVisible("tags")); noteTableView.setColumnHidden(Global.noteTableNotebookPosition, !Global.isColumnVisible("notebook")); noteTableView.setColumnHidden(Global.noteTableSynchronizedPosition, !Global.isColumnVisible("synchronized")); - } - // Open a separate window - @SuppressWarnings("unused") - private void listDoubleClick() { - + noteTableView.setColumnHidden(Global.noteTableGuidPosition, !Global.isColumnVisible("guid")); + noteTableView.setColumnHidden(Global.noteTableThumbnailPosition, !Global.isColumnVisible("thumbnail")); + noteTableView.setColumnHidden(Global.noteTableTitlePosition, !Global.isColumnVisible("title")); } // Title color has changed @SuppressWarnings("unused") @@ -2999,6 +3814,132 @@ public class NeverNote extends QMainWindow{ } logger.log(logger.HIGH, "Leaving NeverNote.updateListAuthor"); } + // Wide list was chosen + public void narrowListView() { + saveNoteColumnPositions(); + saveNoteIndexWidth(); + saveWindowState(); + 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.wideListView.setChecked(false); + menuBar.narrowListView.setChecked(true); + + menuBar.wideListView.blockSignals(false); + menuBar.narrowListView.blockSignals(false); + + mainLeftRightSplitter.addWidget(noteTableView); + mainLeftRightSplitter.addWidget(browserWindow); + restoreWindowState(false); + noteTableView.repositionColumns(); + noteTableView.resizeColumnWidths(); + noteTableView.resizeRowHeights(); + + sortCol = Global.getSortColumn(); + sortOrder = Global.getSortOrder(); + noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder)); + + showColumns(); + noteTableView.load(false); + scrollToCurrentGuid(); + } + public void wideListView() { + 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.wideListView.blockSignals(true); + menuBar.narrowListView.blockSignals(true); + + menuBar.wideListView.setChecked(true); + menuBar.narrowListView.setChecked(false); + + menuBar.wideListView.blockSignals(false); + menuBar.narrowListView.blockSignals(false); + browserIndexSplitter.setVisible(true); + browserIndexSplitter.addWidget(noteTableView); + browserIndexSplitter.addWidget(browserWindow); + restoreWindowState(false); + noteTableView.repositionColumns(); + noteTableView.resizeColumnWidths(); + noteTableView.resizeRowHeights(); + + sortCol = Global.getSortColumn(); + sortOrder = Global.getSortOrder(); + noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder)); + + showColumns(); + noteTableView.load(false); + scrollToCurrentGuid(); + } + + + //*************************************************************** + //*************************************************************** + //** External editor window functions + //*************************************************************** + //*************************************************************** + private void listDoubleClick() { + saveNote(); + if (externalWindows.containsKey(currentNoteGuid)) { + externalWindows.get(currentNoteGuid).raise(); + return; + } + // We have a new external editor to create + QIcon appIcon = new QIcon(iconPath+"nevernote.png"); + ExternalBrowse newBrowser = new ExternalBrowse(conn); + newBrowser.setWindowIcon(appIcon); + externalWindows.put(currentNoteGuid, newBrowser); + showEditorButtons(newBrowser.getBrowserWindow()); + loadNoteBrowserInformation(newBrowser.getBrowserWindow()); + setupBrowserWindowListeners(newBrowser.getBrowserWindow(), false); + newBrowser.windowClosing.connect(this, "externalWindowClosing(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)"); + + browserWindow.noteSignal.tagsChanged.connect(newBrowser, "updateTags(String, List)"); + browserWindow.noteSignal.titleChanged.connect(newBrowser, "updateTitle(String, String)"); + browserWindow.noteSignal.notebookChanged.connect(newBrowser, "updateNotebook(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); + for (int i=0; i0) + line.append(Global.tagDelimeter+" "); + line.append(values.get(i)); + } + if (guid.equals(currentNoteGuid)) { + browserWindow.setTag(line.toString()); + } + } + @SuppressWarnings("unused") + private void externalWindowClosing(String guid) { + externalWindows.remove(guid); + } + //*************************************************************** @@ -3009,6 +3950,13 @@ public class NeverNote extends QMainWindow{ @SuppressWarnings("unused") private void setNoteDirty() { logger.log(logger.EXTREME, "Entering NeverNote.setNoteDirty()"); + // Find if the note is being edited externally. If it is, update it. + if (externalWindows.containsKey(currentNoteGuid)) { + QTextCodec codec = QTextCodec.codecForName("UTF-8"); + QByteArray unicode = codec.fromUnicode(browserWindow.getContent()); + ExternalBrowse window = externalWindows.get(currentNoteGuid); + window.getBrowserWindow().getBrowser().setContent(unicode); + } // If the note is dirty, then it is unsynchronized by default. if (noteDirty) @@ -3038,56 +3986,74 @@ public class NeverNote extends QMainWindow{ */ logger.log(logger.EXTREME, "Leaving NeverNote.setNoteDirty()"); } + @SuppressWarnings("unused") + private void saveNoteExternalBrowser(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 (guid.equals(currentNoteGuid)) { + noteDirty = true; + browserWindow.getBrowser().setContent(unicode); + } + if (save) { + thumbnailRunner.addWork("GENERATE "+ guid); + saveNote(guid, browser); + } + + } private void saveNote() { - logger.log(logger.EXTREME, "Inside NeverNote.saveNote()"); if (noteDirty) { - logger.log(logger.EXTREME, "Note is dirty."); - waitCursor(true); - - preview = new Thumbnailer(currentNoteGuid, new QSize(1024,768)); - preview.finished.connect(this, "saveThumbnail(String)"); - preview.setContent(browserWindow.getContent()); + saveNote(currentNoteGuid, browserWindow); + thumbnailRunner.addWork("GENERATE "+ currentNoteGuid); + noteDirty = 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"); - QTextCodec codec = QTextCodec.codecForLocale(); + logger.log(logger.EXTREME, "Saving to cache"); + QTextCodec codec = QTextCodec.codecForLocale(); // QTextDecoder decoder = codec.makeDecoder(); - codec = QTextCodec.codecForName("UTF-8"); - QByteArray unicode = codec.fromUnicode(browserWindow.getContent()); - noteCache.put(currentNoteGuid, unicode.toString()); + codec = QTextCodec.codecForName("UTF-8"); + QByteArray unicode = codec.fromUnicode(window.getContent()); + noteCache.put(guid, unicode.toString()); - logger.log(logger.EXTREME, "updating list manager"); - listManager.updateNoteContent(currentNoteGuid, browserWindow.getContent()); -// noteCache.put(currentNoteGuid, browserWindow.getContent()); - logger.log(logger.EXTREME, "Updating title"); - listManager.updateNoteTitle(currentNoteGuid, browserWindow.getTitle()); - updateListDateChanged(); - - logger.log(logger.EXTREME, "Looking through note index for refreshed note"); - for (int i=0; i or encoded characters are ugly js.append(""); - js.append(""); + js.append(""); js.append(""); + js.append(""); js.append(""); js.append(""); - js.append(rebuildNoteHTML(currentNoteGuid, currentNote.getContent())); + formatter.setNote(currentNote, Global.pdfPreview()); + js.append(formatter.rebuildNoteHTML()); js.append(""); js.replace("", ""); js.replace("", ""); js.replace("", ""); - browserWindow.getBrowser().setContent(js); + browser.getBrowser().setContent(js); noteCache.put(currentNoteGuid, js.toString()); - if (conn.getNoteTable().isThumbnailNeeded(currentNoteGuid)) { - preview = new Thumbnailer(currentNoteGuid, new QSize(1024,768)); - preview.finished.connect(this, "saveThumbnail(String)"); - preview.setContent(js.toString()); - } + + if (formatter.resourceError) + resourceErrorMessage(); + readOnly = formatter.readOnly; + inkNote = formatter.inkNote; + if (readOnly) + readOnlyCache.put(currentNoteGuid, true); + if (inkNote) + inkNoteCache.put(currentNoteGuid, true); } else { logger.log(logger.HIGH, "Note content is being pulled from the cache"); - String cachedContent = modifyCachedTodoTags(noteCache.get(currentNoteGuid)); - browserWindow.getBrowser().setContent(new QByteArray(cachedContent)); + String cachedContent = formatter.modifyCachedTodoTags(noteCache.get(currentNoteGuid)); + js = new QByteArray(cachedContent); + browser.getBrowser().setContent(js); + if (readOnlyCache.containsKey(currentNoteGuid)) + readOnly = true; + if (inkNoteCache.containsKey(currentNoteGuid)) + inkNote = true; + } + if (conn.getNoteTable().isThumbnailNeeded(currentNoteGuid)) { + thumbnailHTMLReady(currentNoteGuid, js, Global.calculateThumbnailZoom(js.toString())); + } + + if (readOnly || inkNote) + browser.getBrowser().page().setContentEditable(false); // We don't allow editing of ink notes + else + browser.getBrowser().page().setContentEditable(true); + browser.setReadOnly(readOnly); + deleteButton.setEnabled(!readOnly); + tagButton.setEnabled(!readOnly); + menuBar.noteDelete.setEnabled(!readOnly); + menuBar.noteTags.setEnabled(!readOnly); + browser.setNote(currentNote); + + if (conn.getNotebookTable().isLinked(currentNote.getNotebookGuid())) { + deleteButton.setEnabled(false); + menuBar.notebookDeleteAction.setEnabled(false); + } else { + deleteButton.setEnabled(true); + menuBar.notebookDeleteAction.setEnabled(true); } - - browserWindow.getBrowser().page().setContentEditable(!inkNote); // We don't allow editing of ink notes - browserWindow.setNote(currentNote); // Build a list of non-closed notebooks List nbooks = new ArrayList(); @@ -3139,56 +4143,42 @@ public class NeverNote extends QMainWindow{ nbooks.add(listManager.getNotebookIndex().get(i)); } - browserWindow.setNotebookList(nbooks); - browserWindow.setTitle(currentNote.getTitle()); - browserWindow.setTag(getTagNamesForNote(currentNote)); - browserWindow.setAuthor(currentNote.getAttributes().getAuthor()); + browser.setTitle(currentNote.getTitle()); + browser.setTag(getTagNamesForNote(currentNote)); + browser.setAuthor(currentNote.getAttributes().getAuthor()); - browserWindow.setAltered(currentNote.getUpdated()); - browserWindow.setCreation(currentNote.getCreated()); + browser.setAltered(currentNote.getUpdated()); + browser.setCreation(currentNote.getCreated()); if (currentNote.getAttributes().getSubjectDate() > 0) - browserWindow.setSubjectDate(currentNote.getAttributes().getSubjectDate()); + browser.setSubjectDate(currentNote.getAttributes().getSubjectDate()); else - browserWindow.setSubjectDate(currentNote.getCreated()); - browserWindow.setUrl(currentNote.getAttributes().getSourceURL()); - browserWindow.setAllTags(listManager.getTagIndex()); - browserWindow.setCurrentTags(currentNote.getTagNames()); + browser.setSubjectDate(currentNote.getCreated()); + browser.setUrl(currentNote.getAttributes().getSourceURL()); + + FilterEditorTags tagFilter = new FilterEditorTags(conn, logger); + List tagList = tagFilter.getValidTags(currentNote); + browser.setAllTags(tagList); + + browser.setCurrentTags(currentNote.getTagNames()); noteDirty = false; scrollToGuid(currentNoteGuid); - browserWindow.loadingData(false); + browser.loadingData(false); if (thumbnailViewer.isActiveWindow()) thumbnailView(); + + FilterEditorNotebooks notebookFilter = new FilterEditorNotebooks(conn, logger); + browser.setNotebookList(notebookFilter.getValidNotebooks(currentNote, listManager.getNotebookIndex())); + waitCursor(false); logger.log(logger.HIGH, "Leaving NeverNote.refreshEvernoteNote"); } // Save a generated thumbnail - @SuppressWarnings("unused") - private void saveThumbnail(String guid) { - QFile tFile = new QFile(Global.getFileManager().getResDirPath("thumbnail-" + guid + ".png")); - tFile.open(OpenModeFlag.ReadOnly); - QByteArray imgBytes = tFile.readAll(); - tFile.close(); - conn.getNoteTable().setThumbnail(guid, imgBytes); - conn.getNoteTable().setThumbnailNeeded(guid, false); - thumbnailViewer.setThumbnail(QImage.fromData(imgBytes)); - if (thumbnailViewer.isVisible()) - thumbnailViewer.showFullScreen(); - - /* - QByteArray img2 = new QByteArray(conn.getNoteTable().getThumbnail(guid)); - QFile file = new QFile(Global.currentDir+"res/aaaa.png"); - file.open(OpenModeFlag.WriteOnly); - file.write(img2); - file.close(); - */ - } - // Show/Hide note information - @SuppressWarnings("unused") private void toggleNoteInformation() { logger.log(logger.HIGH, "Entering NeverNote.toggleNoteInformation"); browserWindow.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 @@ -3248,30 +4238,16 @@ public class NeverNote extends QMainWindow{ @SuppressWarnings("unused") private void fullReindex() { logger.log(logger.HIGH, "Entering NeverNote.fullReindex"); - // If we are deleting non-trash notes - 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 1) setMessage(tr("Notes will be reindexed.")); @@ -3343,9 +4319,19 @@ public class NeverNote extends QMainWindow{ browserWindow.setReadOnly(false); saveNote(); Calendar currentTime = new GregorianCalendar(); - String noteString = new String("\n" + + StringBuffer noteString = new StringBuffer(100); + noteString.append("\n" + "\n" + - "\n
"); + "\n"); + + if (Global.overrideDefaultFont()) { + noteString.append(""); + noteString.append(""); + noteString.append("
\n"); + noteString.append("\n\n"); + } else + noteString.append("
\n"); + noteString.append(""); Long l = new Long(currentTime.getTimeInMillis()); String randint = new String(Long.toString(l)); @@ -3396,7 +4382,7 @@ public class NeverNote extends QMainWindow{ newNote.setGuid(randint); newNote.setNotebookGuid(notebook); newNote.setTitle(""); - newNote.setContent(noteString); + newNote.setContent(noteString.toString()); newNote.setDeleted(0); newNote.setCreated(System.currentTimeMillis()); newNote.setUpdated(System.currentTimeMillis()); @@ -3431,7 +4417,11 @@ public class NeverNote extends QMainWindow{ listManager.countNotebookResults(listManager.getNoteIndex()); browserWindow.titleLabel.setFocus(); browserWindow.titleLabel.selectAll(); -// notebookTree.updateCounts(listManager.getNotebookIndex(), listManager.getNotebookCounter()); +// notebookTree.updateCounts(listManager.getNotebookIndex(), listManager.getNotebookCounter()); + + // If the window is hidden, then we want to popup this in an external window & + if (!isVisible()) + listDoubleClick(); logger.log(logger.HIGH, "Leaving NeverNote.addNote"); } // Restore a note from the trash; @@ -3459,35 +4449,53 @@ public class NeverNote extends QMainWindow{ browserWindow.getBrowser().page().findText(find.getText(), find.getFlags()); find.setFocus(); } + @SuppressWarnings("unused") + private void updateNoteTitle(String guid, String title) { + listManager.setNoteSynchronized(guid, 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); - } +// if (guid.equals(currentNoteGuid) && !noteDirty) + 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)) { + ExternalBrowse b = externalWindows.get(oldGuid); + externalWindows.remove(oldGuid); + b.getBrowserWindow().getNote().setGuid(newGuid); + externalWindows.put(newGuid, b); + } + for (int i=0; i= 1) { + logger.log(logger.EXTREME, "No available thumbnail generators. Aborting " +guid); + return; + } + + logger.log(logger.EXTREME, "Creating new thumbnail generator " +guid); + Thumbnailer preview = new Thumbnailer(logger, conn, listManager, thumbnailRunner); + thumbGenerators.add(preview); + + if (preview.mutex.tryLock()) { + logger.log(logger.EXTREME, "Loading thumbnail for " +guid); + preview.loadContent(guid, html, zoom); + } + logger.log(logger.HIGH, "Exiting thumnailHTMLReady()"); + } + + //********************************************************** //********************************************************** @@ -3710,9 +4764,11 @@ public class NeverNote extends QMainWindow{ 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") @@ -3752,7 +4808,7 @@ public class NeverNote extends QMainWindow{ // If we've gotten this far, we have a good note. if (historyWindow == null) { - historyWindow = new OnlineNoteHistory(conn); + historyWindow = new OnlineNoteHistory(logger, conn); historyWindow.historyCombo.activated.connect(this, "reloadHistoryWindow(String)"); historyWindow.restoreAsNew.clicked.connect(this, "restoreHistoryNoteAsNew()"); historyWindow.restore.clicked.connect(this, "restoreHistoryNote()"); @@ -3779,7 +4835,7 @@ public class NeverNote extends QMainWindow{ int usn = 0; for (int i=0; i -1) { - appl = fn.substring(pos+1); - } - } - } - - String fileDetails = null; - if (r.getAttributes() != null && r.getAttributes().getFileName() != null && !r.getAttributes().getFileName().equals("")) - fileDetails = r.getAttributes().getFileName(); - String contextFileName; - FileManager fileManager = Global.getFileManager(); - if (fileDetails != null && !fileDetails.equals("")) { - enmedia.setAttribute("href", "nnres://" +r.getGuid() +Global.attachmentNameDelimeter +fileDetails); - contextFileName = fileManager.getResDirPath(r.getGuid() + Global.attachmentNameDelimeter + fileDetails); - } else { - enmedia.setAttribute("href", "nnres://" +r.getGuid() +Global.attachmentNameDelimeter +appl); - contextFileName = fileManager.getResDirPath(r.getGuid() + Global.attachmentNameDelimeter + appl); - } - contextFileName = contextFileName.replace("\\", "/"); - enmedia.setAttribute("onContextMenu", "window.jambi.resourceContextMenu('" +contextFileName +"');"); - if (fileDetails == null || fileDetails.equals("")) - fileDetails = ""; - enmedia.setAttribute("en-tag", "en-media"); - enmedia.setAttribute("guid", r.getGuid()); - enmedia.setTagName("a"); - QDomElement newText = doc.createElement("img"); - boolean goodPreview = false; - String filePath = ""; - if (appl.equalsIgnoreCase("pdf") && Global.pdfPreview()) { - String fileName; - Resource res = conn.getNoteTable().noteResourceTable.getNoteResource(r.getGuid(), true); - if (res.getAttributes() != null && - res.getAttributes().getFileName() != null && - !res.getAttributes().getFileName().trim().equals("")) - fileName = res.getGuid()+Global.attachmentNameDelimeter+res.getAttributes().getFileName(); - else - fileName = res.getGuid()+".pdf"; - QFile file = new QFile(fileManager.getResDirPath(fileName)); - QFile.OpenMode mode = new QFile.OpenMode(); - mode.set(QFile.OpenModeFlag.WriteOnly); - file.open(mode); - QDataStream out = new QDataStream(file); - Resource resBinary = conn.getNoteTable().noteResourceTable.getNoteResource(res.getGuid(), true); - QByteArray binData = new QByteArray(resBinary.getData().getBody()); - resBinary = null; - out.writeBytes(binData.toByteArray()); - file.close(); - PDFPreview pdfPreview = new PDFPreview(); - goodPreview = pdfPreview.setupPreview(file.fileName(), appl,0); - if (goodPreview) { - QDomElement span = doc.createElement("span"); - QDomElement table = doc.createElement("table"); - span.setAttribute("pdfNavigationTable", "true"); - QDomElement tr = doc.createElement("tr"); - QDomElement td = doc.createElement("td"); - QDomElement left = doc.createElement("img"); - left.setAttribute("onMouseDown", "window.jambi.nextPage('" +file.fileName() +"')"); - left.setAttribute("onMouseDown", "window.jambi.nextPage('" +file.fileName() +"')"); - left.setAttribute("onMouseOver", "style.cursor='hand'"); - QDomElement right = doc.createElement("img"); - right.setAttribute("onMouseDown", "window.jambi.nextPage('" +file.fileName() +"')"); - left.setAttribute("onMouseDown", "window.jambi.previousPage('" +file.fileName() +"')"); - // NFC TODO: should these be file:// URLs? - left.setAttribute("src", Global.getFileManager().getImageDirPath("small_left.png")); - right.setAttribute("src", Global.getFileManager().getImageDirPath("small_right.png")); - right.setAttribute("onMouseOver", "style.cursor='hand'"); - - table.appendChild(tr); - tr.appendChild(td); - td.appendChild(left); - td.appendChild(right); - span.appendChild(table); - enmedia.parentNode().insertBefore(span, enmedia); - } - filePath = fileName+".png"; - } - String icon = findIcon(appl); - if (icon.equals("attachment.png")) - icon = findIcon(fileDetails.substring(fileDetails.indexOf(".")+1)); - // NFC TODO: should this be a 'file://' URL? - newText.setAttribute("src", Global.getFileManager().getImageDirPath(icon)); - if (goodPreview) { - // NFC TODO: should this be a 'file://' URL? - newText.setAttribute("src", fileManager.getResDirPath(filePath)); - newText.setAttribute("style", "border-style:solid; border-color:green; padding:0.5mm 0.5mm 0.5mm 0.5mm;"); - } - newText.setAttribute("title", fileDetails); - enmedia.removeChild(enmedia.firstChild()); - - enmedia.appendChild(newText); - } - } - logger.log(logger.HIGH, "Leaving NeverNote.modifyApplicationTags"); - } - // Modify the en-to tag into an input field - private void modifyTodoTags(QDomElement todo) { - logger.log(logger.HIGH, "Entering NeverNote.modifyTodoTags"); - todo.setAttribute("type", "checkbox"); - String checked = todo.attribute("checked"); - todo.removeAttribute("checked"); - if (checked.equalsIgnoreCase("true")) - todo.setAttribute("checked", ""); - else - todo.setAttribute("unchecked",""); - todo.setAttribute("value", checked); - todo.setAttribute("onClick", "value=checked;window.jambi.contentChanged(); "); - todo.setTagName("input"); - logger.log(logger.HIGH, "Leaving NeverNote.modifyTodoTags"); - } - // Modify any cached todo tags that may have changed - private String modifyCachedTodoTags(String note) { - logger.log(logger.HIGH, "Entering NeverNote.modifyCachedTodoTags"); - StringBuffer html = new StringBuffer(note); - for (int i=html.indexOf("-1; i=html.indexOf("",i+1); - String input = html.substring(i,endPos); - if (input.indexOf("value=\"true\"") > 0) - input = input.replace(" unchecked=\"\"", " checked=\"\""); - else - input = input.replace(" checked=\"\"", " unchecked=\"\""); - html.replace(i, endPos, input); - i++; + @SuppressWarnings("unused") + private void setupSelectiveSync() { + + // Get a list of valid notebooks + List notebooks = null; + List tags = null; + List linkedNotebooks = null; + try { + notebooks = syncRunner.noteStore.listNotebooks(syncRunner.authToken); + tags = syncRunner.noteStore.listTags(syncRunner.authToken); + linkedNotebooks = syncRunner.noteStore.listLinkedNotebooks(syncRunner.authToken); + } catch (EDAMUserException e) { + setMessage("EDAMUserException: " +e.getMessage()); + return; + } catch (EDAMSystemException e) { + setMessage("EDAMSystemException: " +e.getMessage()); + return; + } catch (TException e) { + setMessage("EDAMTransactionException: " +e.getMessage()); + return; + } catch (EDAMNotFoundException e) { + setMessage("EDAMNotFoundException: " +e.getMessage()); + return; } - logger.log(logger.HIGH, "Leaving NeverNote.modifyCachedTodoTags"); - return html.toString(); - } - // Modify the en-media tag into an image tag so it can be displayed. - private void modifyImageTags(QDomElement docElem, QDomElement enmedia, QDomAttr hash) { - logger.log(logger.HIGH, "Entering NeverNote.modifyImageTags"); - String type = enmedia.attribute("type"); - if (type.startsWith("image/")) - type = "."+type.substring(6); - else - type=""; - String resGuid = conn.getNoteTable().noteResourceTable.getNoteResourceGuidByHashHex(currentNoteGuid, hash.value()); - QFile tfile = new QFile(Global.getFileManager().getResDirPath(resGuid + type)); - if (!tfile.exists()) { - Resource r = null; - if (resGuid != null) - r = conn.getNoteTable().noteResourceTable.getNoteResource(resGuid,true); - if (r==null || r.getData() == null || r.getData().getBody().length == 0) - resourceErrorMessage(); - if (r!= null && r.getData() != null && r.getData().getBody().length > 0) { - tfile.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.WriteOnly)); - QByteArray binData = new QByteArray(r.getData().getBody()); - tfile.write(binData); - tfile.close(); - enmedia.setAttribute("src", QUrl.fromLocalFile(tfile.fileName()).toString()); - enmedia.setAttribute("en-tag", "en-media"); - enmedia.setNodeValue(""); - enmedia.setAttribute("guid", r.getGuid()); - enmedia.setTagName("img"); + // Split up notebooks into synchronized & non-synchronized + List ignoredBooks = new ArrayList(); + List dbIgnoredNotebooks = conn.getSyncTable().getIgnoreRecords("NOTEBOOK"); + + for (int i=notebooks.size()-1; i>=0; i--) { + for (int j=0; j(); - tempFiles.clear(); - QDomElement docElem = doc.documentElement(); - - // Modify en-media tags - QDomNodeList anchors = docElem.elementsByTagName("en-media"); - int enMediaCount = anchors.length(); - for (int i=enMediaCount-1; i>=0; i--) { - QDomElement enmedia = anchors.at(i).toElement(); - if (enmedia.hasAttribute("type")) { - QDomAttr attr = enmedia.attributeNode("type"); - QDomAttr hash = enmedia.attributeNode("hash"); - String[] type = attr.nodeValue().split("/"); - String appl = type[1]; - - if (type[0] != null) { - if (type[0].equals("image")) { - modifyImageTags(docElem, enmedia, hash); - } - if (!type[0].equals("image")) { - modifyApplicationTags(doc, docElem, enmedia, hash, appl); - } + + // split up tags into synchronized & non-synchronized + List ignoredTags = new ArrayList(); + List dbIgnoredTags = conn.getSyncTable().getIgnoreRecords("TAG"); + + for (int i=tags.size()-1; i>=0; i--) { + for (int j=0; j ignoredLinkedNotebooks = new ArrayList(); + List 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 oldIgnoreNotebooks = conn.getSyncTable().getIgnoreRecords("NOTEBOOK"); + for (int i=0; i newNotebooks = new ArrayList(); + for (int i=ignore.getIgnoredBookList().count()-1; i>=0; i--) { + String text = ignore.getIgnoredBookList().takeItem(i).text(); + for (int j=0; j=0; i--) { - QDomElement enmedia = anchors.at(i).toElement(); - modifyTodoTags(enmedia); + // Clear out old tags & add new ones + List oldIgnoreTags = conn.getSyncTable().getIgnoreRecords("TAG"); + for (int i=0; i=0; i--) { - QDomElement enmedia = anchors.at(i).toElement(); - enmedia.setAttribute("contentEditable","false"); - enmedia.setAttribute("src", Global.getFileManager().getImageDirPath("encrypt.png")); - enmedia.setAttribute("en-tag","en-crypt"); - enmedia.setAttribute("alt", enmedia.text()); - Global.cryptCounter++; - enmedia.setAttribute("id", "crypt"+Global.cryptCounter.toString()); - String encryptedText = enmedia.text(); - - // If the encryption string contains crlf at the end, remove them because they mess up the javascript. - if (encryptedText.endsWith("\n")) - encryptedText = encryptedText.substring(0,encryptedText.length()-1); - if (encryptedText.endsWith("\r")) - encryptedText = encryptedText.substring(0,encryptedText.length()-1); - - // Add the commands - String hint = enmedia.attribute("hint"); - hint = hint.replace("'","'"); - enmedia.setAttribute("onClick", "window.jambi.decryptText('crypt"+Global.cryptCounter.toString()+"', '"+encryptedText+"', '"+hint+"');"); - enmedia.setAttribute("onMouseOver", "style.cursor='hand'"); - enmedia.setTagName("img"); - enmedia.removeChild(enmedia.firstChild()); // Remove the actual encrypted text + List newTags = new ArrayList(); + for (int i=ignore.getIgnoredTagList().count()-1; i>=0; i--) { + String text = ignore.getIgnoredTagList().takeItem(i).text(); + for (int j=0; j oldIgnoreLinkedNotebooks = conn.getSyncTable().getIgnoreRecords("LINKEDNOTEBOOK"); + for (int i=0; i newLinked = new ArrayList(); + for (int i=ignore.getIgnoredLinkedNotebookList().count()-1; i>=0; i--) { + String text = ignore.getIgnoredLinkedNotebookList().takeItem(i).text(); + for (int j=0; j(); - tempFiles.clear(); - - doc = modifyTags(doc); - doc = addHilight(doc); - QDomElement docElem = doc.documentElement(); - docElem.setTagName("Body"); -// docElem.setAttribute("bgcolor", "green"); - logger.log(logger.EXTREME, "Rebuilt HTML:"); - logger.log(logger.EXTREME, doc.toString()); - logger.log(logger.HIGH, "Leaving NeverNote.rebuildNoteHTML"); - // Fix the stupid problem where inserting an tag after an tag (which is done - // to get the application tag to work properly) causes spaces to be inserted - // between the & . This messes things up later. This is an ugly hack. - StringBuffer html = new StringBuffer(doc.toString()); - for (int i=html.indexOf("-1; i=html.indexOf("\n",i+1); - int z = html.indexOf("i; j--) - html.deleteCharAt(j); - i=html.indexOf("/>", z+1); - z = html.indexOf("",i); - for (int j=z-1; j>i+1; j--) - html.deleteCharAt(j); - } - return html.toString(); - } - // Scan and do hilighting of words - private QDomDocument addHilight(QDomDocument doc) { - EnSearch e = listManager.getEnSearch(); - if (e.hilightWords == null || e.hilightWords.size() == 0) - return doc; - XMLInsertHilight hilight = new XMLInsertHilight(doc, listManager.getEnSearch().hilightWords); - return hilight.getDoc(); - } - + + 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() { if (inkNote) @@ -4193,7 +5054,6 @@ public class NeverNote extends QMainWindow{ "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; -//// browserWindow.setEnabled(false); browserWindow.setReadOnly(true); } @@ -4222,7 +5082,9 @@ public class NeverNote extends QMainWindow{ syncRunner.syncDeletedContent = Global.synchronizeDeletedContent(); if (syncThreadsReady > 0) { + indexRunner.interrupt = true; saveNoteIndexWidth(); + saveNoteColumnPositions(); if (syncRunner.addWork("SYNC")) { syncRunning = true; syncRunner.syncNeeded = true; @@ -4239,7 +5101,7 @@ public class NeverNote extends QMainWindow{ syncRunning = false; syncRunner.syncNeeded = false; synchronizeAnimationTimer.stop(); - synchronizeButton.setIcon(synchronizeAnimation.get(0)); + synchronizeButton.setIcon(new QIcon(iconPath+"synchronize.png")); saveNote(); if (currentNote == null) { currentNote = conn.getNoteTable().getNote(currentNoteGuid, false, false, false, false, true); @@ -4324,66 +5186,19 @@ public class NeverNote extends QMainWindow{ 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 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 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) { + 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()"); - } - 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() { @@ -4453,7 +5268,14 @@ public class NeverNote extends QMainWindow{ } - + private void thumbnailTimer() { + if (Global.enableThumbnails() && conn.getNoteTable().getThumbnailNeededCount() > 1) { + thumbnailTimer.setInterval(10*1000); + thumbnailRunner.addWork("SCAN"); + } else { + thumbnailTimer.setInterval(60*1000); + } + } //************************************************** //* Backup & Restore @@ -4466,13 +5288,18 @@ public class NeverNote extends QMainWindow{ fd.setWindowTitle(tr("Backup Database")); fd.setFilter(tr("NeverNote 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()); @@ -4507,13 +5334,19 @@ public class NeverNote extends QMainWindow{ fd.setWindowTitle(tr("Restore Database")); fd.setFilter(tr("NeverNote 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)); @@ -4572,7 +5405,10 @@ public class NeverNote extends QMainWindow{ fd.setWindowTitle(tr("Import Notes")); fd.setFilter(tr("NeverNote 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; } @@ -4587,6 +5423,7 @@ public class NeverNote extends QMainWindow{ ImportData noteReader = new ImportData(conn, false); String fileName = fd.selectedFiles().get(0); +// saveLastPath.substring(0,fileName.lastIndexOf("/")); if (!fileName.endsWith(".nnex")) fileName = fileName +".nnex"; @@ -4840,7 +5677,11 @@ public class NeverNote extends QMainWindow{ byte[] hash = md.digest(); String newHash = Global.byteArrayToHexString(hash); if (r.getNoteGuid().equalsIgnoreCase(currentNoteGuid)) { - updateResourceContentHash(r.getGuid(), oldHash, newHash); + updateResourceContentHash(browserWindow, r.getGuid(), oldHash, newHash); + } + if (externalWindows.containsKey(r.getNoteGuid())) { + updateResourceContentHash(externalWindows.get(r.getNoteGuid()).getBrowserWindow(), + r.getGuid(), oldHash, newHash); } conn.getNoteTable().updateResourceContentHash(r.getNoteGuid(), oldHash, newHash); Data data = r.getData(); @@ -4857,6 +5698,13 @@ public class NeverNote extends QMainWindow{ browserWindow.getBrowser().triggerPageAction(WebAction.Reload); } + if (externalWindows.containsKey(r.getNoteGuid())) { + QWebSettings.setMaximumPagesInCache(0); + QWebSettings.setObjectCacheCapacities(0, 0, 0); + externalWindows.get(r.getNoteGuid()).getBrowserWindow().getBrowser().triggerPageAction(WebAction.Reload); + + } + logger.log(logger.HIGH, "Exiting externalFielEdited"); } // This is a timer event that tries to save any external files that were edited. This @@ -4888,24 +5736,24 @@ public class NeverNote extends QMainWindow{ // If an attachment on the current note was edited, we need to update the current notes's hash // Update a note content's hash. This happens if a resource is edited outside of NN - public void updateResourceContentHash(String guid, String oldHash, String newHash) { + public void updateResourceContentHash(BrowserWindow browser, String guid, String oldHash, String newHash) { int position = browserWindow.getContent().indexOf("en-tag=\"en-media\" guid=\""+guid+"\" type="); int endPos; for (;position>-1;) { - endPos = browserWindow.getContent().indexOf(">", position+1); - String oldSegment = browserWindow.getContent().substring(position,endPos); + endPos = browser.getContent().indexOf(">", position+1); + String oldSegment = browser.getContent().substring(position,endPos); int hashPos = oldSegment.indexOf("hash=\""); int hashEnd = oldSegment.indexOf("\"", hashPos+7); String hash = oldSegment.substring(hashPos+6, hashEnd); if (hash.equalsIgnoreCase(oldHash)) { String newSegment = oldSegment.replace(oldHash, newHash); - String content = browserWindow.getContent().substring(0,position) + + String content = browser.getContent().substring(0,position) + newSegment + - browserWindow.getContent().substring(endPos); - browserWindow.getBrowser().setContent(new QByteArray(content));; + browser.getContent().substring(endPos); + browser.getBrowser().setContent(new QByteArray(content));; } - position = browserWindow.getContent().indexOf("en-tag=\"en-media\" guid=\""+guid+"\" type=", position+1); + position = browser.getContent().indexOf("en-tag=\"en-media\" guid=\""+guid+"\" type=", position+1); } } @@ -4918,7 +5766,7 @@ public class NeverNote extends QMainWindow{ if (e.type() == QEvent.Type.WindowStateChange) { if (isMinimized() && Global.showTrayIcon()) { e.accept(); - QTimer.singleShot(200, this, "hide()"); + QTimer.singleShot(10, this, "hide()"); return; } if (isMaximized())