/*
- * This file is part of NeverNote
+ * This file is part of NixNote
* Copyright 2009 Randy Baumgarte
*
* This file may be licensed under the terms of of the
import cx.fbn.nevernote.dialog.ThumbnailViewer;
import cx.fbn.nevernote.dialog.UpgradeAvailableDialog;
import cx.fbn.nevernote.dialog.WatchFolder;
+import cx.fbn.nevernote.evernote.NoteMetadata;
import cx.fbn.nevernote.filters.FilterEditorNotebooks;
import cx.fbn.nevernote.filters.FilterEditorTags;
import cx.fbn.nevernote.gui.AttributeTreeWidget;
import cx.fbn.nevernote.utilities.SyncTimes;
import cx.fbn.nevernote.xml.ExportData;
import cx.fbn.nevernote.xml.ImportData;
+import cx.fbn.nevernote.xml.ImportEnex;
import cx.fbn.nevernote.xml.NoteFormatter;
boolean encryptOnShutdown; // should I encrypt when I close?
boolean decryptOnShutdown; // should I decrypt on shutdown;
String encryptCipher; // What cipher should I use?
- Signal0 minimizeToTray;
+ //Signal0 minimizeToTray;
boolean windowMaximized = false; // Keep track of the window state for restores
List<String> pdfReadyQueue; // Queue of PDFs that are ready to be rendered.
List<QPixmap> syncIcons; // Array of icons used in sync animation
conn = dbConn;
if (conn.getConnection() == null) {
String msg = new String(tr("Unable to connect to the database.\n\nThe most probable reason is that some other process\n" +
- "is accessing the database or NeverNote is already running.\n\n" +
- "Please end any other process or shutdown the other NeverNote before starting.\n\nExiting program."));
+ "is accessing the database or NixNote is already running.\n\n" +
+ "Please end any other process or shutdown the other NixNote before starting.\n\nExiting program."));
QMessageBox.critical(null, tr("Database Connection Error") ,msg);
System.exit(16);
QApplication.setStyle(Global.getStyle());
if (Global.useStandardPalette())
QApplication.setPalette(QApplication.style().standardPalette());
- setWindowTitle(tr("NeverNote"));
+ setWindowTitle(tr("NixNote"));
mainLeftRightSplitter = new QSplitter();
setCentralWidget(mainLeftRightSplitter);
tagTree = new TagTreeWidget(conn);
savedSearchTree = new SavedSearchTreeWidget();
trashTree = new TrashTreeWidget();
- noteTableView = new TableView(logger, listManager);
-
+ noteTableView = new TableView(logger, listManager);
searchField = new QComboBox();
searchField.setObjectName("searchField");
noteTableView.setNoteDuplicateAction(menuBar.noteDuplicateAction);
noteTableView.setNoteHistoryAction(menuBar.noteOnlineHistoryAction);
noteTableView.noteSignal.titleColorChanged.connect(this, "titleColorChanged(Integer)");
+ noteTableView.noteSignal.notePinned.connect(this, "notePinned()");
noteTableView.setMergeNotesAction(menuBar.noteMergeAction);
noteTableView.setCopyAsUrlAction(menuBar.noteCopyAsUrlAction);
noteTableView.doubleClicked.connect(this, "listDoubleClick()");
trayIcon = new QSystemTrayIcon(this);
- trayIcon.setToolTip(tr("NeverNote"));
+ trayIcon.setToolTip(tr("NixNote"));
trayIcon.setContextMenu(trayMenu);
trayIcon.activated.connect(this, "trayActivated(com.trolltech.qt.gui.QSystemTrayIcon$ActivationReason)");
tagTree.showAllTags(true);
QIcon appIcon = new QIcon(iconPath+"nevernote.png");
- setWindowIcon(appIcon);
- trayIcon.setIcon(appIcon);
- if (Global.showTrayIcon())
- trayIcon.show();
- else
- trayIcon.hide();
+ if (QSystemTrayIcon.isSystemTrayAvailable()) {
+ setWindowIcon(appIcon);
+ trayIcon.setIcon(appIcon);
+ if (Global.showTrayIcon() || Global.minimizeOnClose())
+ trayIcon.show();
+ else
+ trayIcon.hide();
+ }
scrollToGuid(currentNoteGuid);
if (Global.automaticLogin()) {
int sortCol = Global.getSortColumn();
int sortOrder = Global.getSortOrder();
+ noteTableView.proxyModel.blocked = true;
noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
+ noteTableView.proxyModel.blocked = false;
+ noteTableView.proxyModel.sortChanged.connect(this, "tableSortOrderChanged(Integer,Integer)");
+
+ // Set the startup notebook
+ String defaultNotebook = Global.getStartupNotebook();
+ if (!defaultNotebook.equals("AllNotebooks") && !defaultNotebook.equals("")) {
+ for (int k=0; k<listManager.getNotebookIndex().size(); k++) {
+ if (listManager.getNotebookIndex().get(k).isDefaultNotebook()) {
+ notebookTree.clearSelection();
+ notebookTree.selectGuid(listManager.getNotebookIndex().get(k).getGuid());
+ notebookTree.selectionSignal.emit();
+ }
+ }
+ }
+
if (Global.checkVersionUpgrade())
checkForUpdates();
}
}
NeverNote application = new NeverNote(dbConn);
+ if (Global.syncOnly) {
+ System.out.println("Performing synchronization only.");
+ application.remoteConnect();
+ if (Global.isConnected) {
+ application.syncRunner.syncNeeded = true;
+ application.syncRunner.addWork("SYNC");
+ application.syncRunner.addWork("STOP");
+ while(!application.syncRunner.isIdle());
+ application.closeNeverNote();
+ }
+ return;
+ }
application.setAttribute(WidgetAttribute.WA_DeleteOnClose, true);
if (Global.startMinimized())
ApplicationLogger logger = new ApplicationLogger("nevernote-database.log");
File f = Global.getFileManager().getDbDirFile(Global.databaseName + ".h2.db");
- boolean dbExists = f.exists();
- if (!dbExists)
+ File fr = Global.getFileManager().getDbDirFile(Global.resourceDatabaseName + ".h2.db");
+ File fi = Global.getFileManager().getDbDirFile(Global.resourceDatabaseName + ".h2.db");
+ if (!f.exists())
Global.setDatabaseUrl("");
+ if (!fr.exists())
+ Global.setResourceDatabaseUrl("");
+ if (!fi.exists())
+ Global.setIndexDatabaseUrl("");
if (Global.getDatabaseUrl().toUpperCase().indexOf("CIPHER=") > -1) {
boolean goodCheck = false;
// Encrypt the database upon shutdown
private void encryptOnShutdown() {
String dbPath= Global.getFileManager().getDbDirPath("");
- String dbName = "NeverNote";
try {
+
Statement st = conn.getConnection().createStatement();
st.execute("shutdown");
+ st = conn.getResourceConnection().createStatement();
+ st.execute("shutdown");
+ st = conn.getIndexConnection().createStatement();
+ st.execute("shutdown");
if (QMessageBox.question(this, tr("Are you sure"),
tr("Are you sure you wish to encrypt the database?"),
QMessageBox.StandardButton.Yes,
QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
- ChangeFileEncryption.execute(dbPath, dbName, encryptCipher, null, Global.cipherPassword.toCharArray(), true);
+ ChangeFileEncryption.execute(dbPath, "NeverNote", encryptCipher, null, Global.cipherPassword.toCharArray(), true);
+ ChangeFileEncryption.execute(dbPath, "Resources", encryptCipher, null, Global.cipherPassword.toCharArray(), true);
+ ChangeFileEncryption.execute(dbPath, "Index", encryptCipher, null, Global.cipherPassword.toCharArray(), true);
Global.setDatabaseUrl(Global.getDatabaseUrl() + ";CIPHER="+encryptCipher);
+ Global.setResourceDatabaseUrl(Global.getResourceDatabaseUrl() + ";CIPHER="+encryptCipher);
+ Global.setIndexDatabaseUrl(Global.getIndexDatabaseUrl() + ";CIPHER="+encryptCipher);
+
QMessageBox.information(this, tr("Encryption Complete"), tr("Encryption is complete"));
}
} catch (SQLException e) {
ChangeFileEncryption.execute(dbPath, dbName, encryptCipher, Global.cipherPassword.toCharArray(), null, true);
Global.setDatabaseUrl("");
+ Global.setResourceDatabaseUrl("");
+ Global.setIndexDatabaseUrl("");
QMessageBox.information(this, tr("Decryption Complete"), tr("Decryption is complete"));
}
} catch (SQLException e) {
startupConfig.setHomeDirPath(arg.substring(arg.indexOf('=') + 1));
if (lower.startsWith("--disable-viewing"))
startupConfig.setDisableViewing(true);
+ if (lower.startsWith("--sync-only=true"))
+ startupConfig.setSyncOnly(true);
}
- Global.setup(startupConfig);
+ Global.setup(startupConfig);
+
}
// Exit point
@Override
public void closeEvent(QCloseEvent event) {
- if (Global.minimizeOnClose() && !closeAction && Global.showTrayIcon()) {
+ if (Global.minimizeOnClose() && !closeAction) {
event.ignore();
hide();
return;
waitCursor(true);
if (currentNote!= null & browserWindow!=null) {
- if (!currentNote.getTitle().equals(browserWindow.getTitle()))
+ if (currentNote.getTitle() != null && browserWindow != null
+ && !currentNote.getTitle().equals(browserWindow.getTitle()))
conn.getNoteTable().updateNoteTitle(currentNote.getGuid(), browserWindow.getTitle());
}
saveNote();
indexRunner.indexNoteTitle = Global.indexNoteTitle();
indexRunner.specialIndexCharacters = Global.getSpecialIndexCharacters();
indexRunner.indexImageRecognition = Global.indexImageRecognition();
- if (Global.showTrayIcon())
+ if (Global.showTrayIcon() || Global.minimizeOnClose())
trayIcon.show();
else
trayIcon.hide();
Global.setColumnPosition("noteTableGuidPosition", position);
position = noteTableView.header.visualIndex(Global.noteTableThumbnailPosition);
Global.setColumnPosition("noteTableThumbnailPosition", position);
+ position = noteTableView.header.visualIndex(Global.noteTablePinnedPosition);
+ Global.setColumnPosition("noteTablePinnedPosition", position);
}
// Save column widths for the next time
Global.setColumnWidth("noteTableThumbnailPosition", width);
width = noteTableView.getColumnWidth(Global.noteTableGuidPosition);
Global.setColumnWidth("noteTableGuidPosition", width);
+ width = noteTableView.getColumnWidth(Global.noteTablePinnedPosition);
+ Global.setColumnWidth("noteTablePinnedPosition", width);
}
@SuppressWarnings("unused")
// Listener when a notebook is selected
private void notebookTreeSelection() {
logger.log(logger.HIGH, "Entering NeverNote.notebookTreeSelection");
-
+ noteTableView.proxyModel.blocked = true;
+
clearTrashFilter();
clearAttributeFilter();
clearSavedSearchFilter();
refreshEvernoteNote(true);
listManager.refreshCounters = true;
listManager.refreshCounters();
+ if (selectedNotebookGUIDs.size() == 1) {
+ int col = conn.getNotebookTable().getSortColumn(selectedNotebookGUIDs.get(0));
+ int order = conn.getNotebookTable().getSortOrder(selectedNotebookGUIDs.get(0));
+ if (col != -1) {
+ noteTableView.proxyModel.blocked = true;
+ if (order == 1)
+ noteTableView.sortByColumn(col, Qt.SortOrder.DescendingOrder);
+ else
+ noteTableView.sortByColumn(col, Qt.SortOrder.AscendingOrder);
+ }
+ }
+ noteTableView.proxyModel.blocked = false;
logger.log(logger.HIGH, "Leaving NeverNote.notebookTreeSelection");
}
if (tagTree.selectedItems().size() > 0)
filter = true;
tagTree.showAllTags(!filter);
+ tagIndexUpdated(false);
logger.log(logger.HIGH, "Leaving NeverNote.reloadTagTree");
}
// Edit an existing tag
logger.log(logger.HIGH, "Entering NeverNote.compactDatabase");
if (QMessageBox.question(this, tr("Confirmation"), tr("This will free unused space in the database, "+
"but please be aware that depending upon the size of your database this can be time consuming " +
- "and NeverNote will be unresponsive until it is complete. Do you wish to continue?"),
+ "and NixNote will be unresponsive until it is complete. Do you wish to continue?"),
QMessageBox.StandardButton.Yes,
QMessageBox.StandardButton.No)==StandardButton.No.value() && Global.verifyDelete() == true) {
return;
QTextEdit textBox = new QTextEdit();
layout.addWidget(textBox);
textBox.setReadOnly(true);
- QFile file = new QFile(Global.getFileManager().getHomeDirPath("release.txt"));
+ QFile file = new QFile(Global.getFileManager().getProgramDirPath("release.txt"));
if (!file.open(new QIODevice.OpenMode(QIODevice.OpenModeFlag.ReadOnly,
QIODevice.OpenModeFlag.Text)))
return;
private void about() {
logger.log(logger.HIGH, "Entering NeverNote.about");
QMessageBox.about(this,
- tr("About NeverNote"),
- tr("<h4><center><b>NeverNote</b></center></h4><hr><center>Version ")
- +Global.version
- +tr("<hr></center>Evernote"
- +"An Open Source Evernote Client.<br><br>"
+ tr("About NixNote"),
+ tr("<h4><center><b>NixNote</b></center></h4><hr><center>Version ")
+ //+Global.version
+ +"1.2.120404"
+ +tr("<hr>"
+ +"Open Source Evernote Client.<br><br>"
+"Licensed under GPL v2. <br><hr><br>"
- +"Evernote is copyright 2001-2010 by Evernote Corporation<br>"
+ +"</center>Evernote is copyright 2001-2012 by Evernote Corporation<br>"
+"Jambi and QT are the licensed trademark of Nokia Corporation<br>"
+"PDFRenderer is licened under the LGPL<br>"
+"JTidy is copyrighted under the World Wide Web Consortium<br>"
listManager.setEnSearch(text.trim());
listManager.loadNotesIndex();
noteIndexUpdated(false);
+
refreshEvernoteNote(true);
searchPerformed = true;
+ waitCursor(false);
logger.log(logger.HIGH, "Leaving NeverNote.searchFieldChanged");
}
menuBar.noteRestoreAction.setVisible(false);
}
else {
+ trashNoteGuid = tempGuid;
currentNoteGuid = trashNoteGuid;
- trashNoteGuid = tempGuid;
menuBar.noteRestoreAction.setEnabled(true);
menuBar.noteRestoreAction.setVisible(true);
Global.showDeleted = true;
saveNote();
+ // If we have more than one selection, then set the merge note action to true.
+ List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
+ if (selections.size() > 1)
+ menuBar.noteMergeAction.setEnabled(true);
+ else
+ menuBar.noteMergeAction.setEnabled(false);
+
// If the ctrl key is pressed, then they are selecting multiple
// entries and we don't want to change the currently viewed note.
if (QApplication.keyboardModifiers().isSet(KeyboardModifier.ControlModifier) &&
}
noteTableView.showColumn(Global.noteTableGuidPosition);
- List<QModelIndex> selections = noteTableView.selectionModel().selectedRows();
if (!Global.isColumnVisible("guid"))
noteTableView.hideColumn(Global.noteTableGuidPosition);
browserWindow.setDisabled(true);
}
+ if (Global.showDeleted && listManager.getNotebookIndex().size() > 0 && saveCurrentNoteGuid.equals("")) {
+ currentNoteGuid = listManager.getNoteIndex().get(0).getGuid();
+ saveCurrentNoteGuid = currentNoteGuid;
+ refreshEvernoteNote(true);
+ }
+
if (!saveCurrentNoteGuid.equals("")) {
refreshEvernoteNote(false);
} else {
- currentNoteGuid = "";
+ currentNoteGuid = "";
}
reloadTagTree(false);
noteTableView.setColumnHidden(Global.noteTableSynchronizedPosition, !Global.isColumnVisible("synchronized"));
noteTableView.setColumnHidden(Global.noteTableGuidPosition, !Global.isColumnVisible("guid"));
noteTableView.setColumnHidden(Global.noteTableThumbnailPosition, !Global.isColumnVisible("thumbnail"));
- noteTableView.setColumnHidden(Global.noteTableTitlePosition, !Global.isColumnVisible("title"));
+ noteTableView.setColumnHidden(Global.noteTableTitlePosition, !Global.isColumnVisible("title"));
+ noteTableView.setColumnHidden(Global.noteTablePinnedPosition, !Global.isColumnVisible("pinned"));
}
// Title color has changed
@SuppressWarnings("unused")
private void titleColorChanged(Integer color) {
- logger.log(logger.HIGH, "Entering NeverNote.updateListAuthor");
+ logger.log(logger.HIGH, "Entering NeverNote.titleColorChanged");
+ setNoteDirty();
QColor backgroundColor = new QColor();
QColor foregroundColor = new QColor(QColor.black);
backgroundColor.setRgb(color);
}
}
}
- logger.log(logger.HIGH, "Leaving NeverNote.updateListAuthor");
+ logger.log(logger.HIGH, "Leaving NeverNote.titleColorChanged");
+ }
+ // A note has been pinned or unpinned
+ @SuppressWarnings("unused")
+ private void notePinned() {
+ logger.log(logger.EXTREME, "Entering NeverNote.notePinned()");
+ setNoteDirty();
+
+ for (int j=0; j<selectedNoteGUIDs.size(); j++) {
+ NoteMetadata meta = listManager.getNoteMetadata().get(selectedNoteGUIDs.get(j));
+ boolean pinned = !meta.isPinned();
+ meta.setPinned(pinned); // Toggle the pinned/unpinned
+
+ // Update the list & table
+ listManager.updateNoteMetadata(meta);
+ noteTableView.proxyModel.addGuid(selectedNoteGUIDs.get(j), meta);
+ }
+
+ logger.log(logger.EXTREME, "Leaving NeverNote.setNoteDirty()");
}
// Wide list was chosen
public void narrowListView() {
sortCol = Global.getSortColumn();
sortOrder = Global.getSortOrder();
+ noteTableView.proxyModel.blocked = true;
noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
+ noteTableView.proxyModel.blocked = false;
+
showColumns();
noteTableView.load(false);
sortCol = Global.getSortColumn();
sortOrder = Global.getSortOrder();
+ noteTableView.proxyModel.blocked = true;
noteTableView.sortByColumn(sortCol, SortOrder.resolve(sortOrder));
-
+ noteTableView.proxyModel.blocked = false;
+
showColumns();
noteTableView.load(false);
scrollToCurrentGuid();
}
-
+ // Sort order for the notebook has changed
+ public void tableSortOrderChanged(Integer column, Integer order) {
+
+ // Find what notebook (if any) is selected. We ignore stacks & the "All Notebooks".
+ List<QTreeWidgetItem> selectedNotebook = notebookTree.selectedItems();
+ if (selectedNotebook.size() > 0 && !selectedNotebook.get(0).text(0).equalsIgnoreCase("All Notebooks") && !selectedNotebook.get(0).text(2).equalsIgnoreCase("STACK")) {
+ QTreeWidgetItem currentSelectedNotebook = selectedNotebook.get(0);
+ String notebook;
+ notebook = currentSelectedNotebook.text(2);
+ conn.getNotebookTable().setSortOrder(notebook, column, order);
+ }
+ }
//***************************************************************
@SuppressWarnings("unused")
loadNoteBrowserInformation(newBrowser.getBrowserWindow(), guid, note);
setupBrowserWindowListeners(newBrowser.getBrowserWindow(), false);
newBrowser.windowClosing.connect(this, "externalWindowClosing(String)");
- newBrowser.getBrowserWindow().noteSignal.titleChanged.connect(this, "externalWindowTitleEdited(String, String)");
+ //newBrowser.getBrowserWindow().noteSignal.titleChanged.connect(this, "externalWindowTitleEdited(String, String)");
newBrowser.getBrowserWindow().noteSignal.tagsChanged.connect(this, "externalWindowTagsEdited(String, List)");
newBrowser.contentsChanged.connect(this, "saveNoteExternalBrowser(String, String, Boolean, BrowserWindow)");
newBrowser.getBrowserWindow().blockApplication.connect(this, "blockApplication(BrowserWindow)");
newBrowser.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);
//** These functions deal with Note specific things
//***************************************************************
//***************************************************************
- @SuppressWarnings("unused")
private void setNoteDirty() {
logger.log(logger.EXTREME, "Entering NeverNote.setNoteDirty()");
// Set the note as dirty and check if its status is synchronized in the display table
noteDirty = true;
- for (int i=0; i<listManager.getUnsynchronizedNotes().size(); i++) {
- if (listManager.getUnsynchronizedNotes().get(i).equals(currentNoteGuid))
+ if (listManager.getNoteMetadata().containsKey(currentNoteGuid) &&
+ listManager.getNoteMetadata().get(currentNoteGuid).isDirty()) {
return;
}
// If this wasn't already marked as unsynchronized, then we need to update the table
listManager.getNoteTableModel().updateNoteSyncStatus(currentNoteGuid, false);
-/* listManager.getUnsynchronizedNotes().add(currentNoteGuid);
+// listManager.getUnsynchronizedNotes().add(currentNoteGuid);
for (int i=0; i<listManager.getNoteTableModel().rowCount(); i++) {
QModelIndex modelIndex = listManager.getNoteTableModel().index(i, Global.noteTableGuidPosition);
if (modelIndex != null) {
SortedMap<Integer, Object> ix = listManager.getNoteTableModel().itemData(modelIndex);
String tableGuid = (String)ix.values().toArray()[0];
if (tableGuid.equals(currentNoteGuid)) {
- listManager.getNoteTableModel().setData(i, Global.noteTableSynchronizedPosition, "false");
+ listManager.getNoteTableModel().proxyModel.setData(i, Global.noteTableSynchronizedPosition, "false");
return;
}
}
}
- */
+
logger.log(logger.EXTREME, "Leaving NeverNote.setNoteDirty()");
}
@SuppressWarnings("unused")
Global.cryptCounter =0;
if (readOnly) {
browserWindow.setReadOnly(true);
- return;
}
if (!reload)
js.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">");
js.append("<style type=\"text/css\">.en-crypt-temp { border-collapse:collapse; border-style:solid; border-color:blue; padding:0.0mm 0.0mm 0.0mm 0.0mm; }</style>");
js.append("<style type=\"text/css\">en-hilight { background-color: rgb(255,255,0) }</style>");
- js.append("<style> img { max-width:100%; }</style>");
+ js.append("<style> img { height:auto; width:auto; max-height:auto; max-width:100%; }</style>");
+ if (Global.displayRightToLeft())
+ js.append("<style> body { direction:rtl; }</style>");
js.append("<style type=\"text/css\">en-spell { text-decoration: none; border-bottom: dotted 1px #cc0000; }</style>");
js.append("</head>");
formatter.setNote(note, Global.pdfPreview());
if (formatter.formatError) {
waitCursor(false);
QMessageBox.information(this, tr("Error"),
- tr("NeverNote had issues formatting this note." +
+ tr("NixNote had issues formatting this note." +
" To protect your data this note is being marked as read-only."));
waitCursor(true);
}
if (conn.getNoteTable().isThumbnailNeeded(guid)) {
thumbnailHTMLReady(guid, js, Global.calculateThumbnailZoom(js.toString()));
}
- if (readOnly || inkNote)
+ if (readOnly || inkNote ||
+ (note.getAttributes() != null && note.getAttributes().getContentClass() != null && note.getAttributes().getContentClass() != ""))
browser.getBrowser().page().setContentEditable(false); // We don't allow editing of ink notes
else
browser.getBrowser().page().setContentEditable(true);
String notebook = null;
listManager.getNotebookIndex().get(0).getGuid();
List<QTreeWidgetItem> selectedNotebook = notebookTree.selectedItems();
- if (selectedNotebook.size() > 0 && !selectedNotebook.get(0).text(0).equalsIgnoreCase("All Notebooks")) {
+ if (selectedNotebook.size() > 0 && !selectedNotebook.get(0).text(0).equalsIgnoreCase("All Notebooks") && !selectedNotebook.get(0).text(2).equalsIgnoreCase("STACK")) {
QTreeWidgetItem currentSelectedNotebook = selectedNotebook.get(0);
notebook = currentSelectedNotebook.text(2);
} else {
}
conn.getNoteTable().addNote(newNote, true);
- listManager.getUnsynchronizedNotes().add(newNote.getGuid());
- listManager.addNote(newNote);
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setGuid(newNote.getGuid());
+ metadata.setDirty(true);
+ listManager.addNote(newNote, metadata);
// noteTableView.insertRow(newNote, true, -1);
currentNote = newNote;
@SuppressWarnings("unused")
private void updateNoteTitle(String guid, String title) {
listManager.setNoteSynchronized(guid, false);
+
+ // We do this manually because if we've edited the note in an
+ // external window we run into the possibility of signal recursion
+ // looping.
+ if (guid.equals(currentNoteGuid)) {
+ browserWindow.titleLabel.blockSignals(true);
+ browserWindow.titleLabel.setText(title);
+ browserWindow.titleLabel.blockSignals(false);
+ }
}
// Signal received that note content has changed. Normally we just need the guid to remove
// it from the cache.
for (int i=0; i<listManager.getNoteIndex().size(); i++) {
if (listManager.getNoteIndex().get(i).getGuid().equals(newGuid)) {
- noteTableView.proxyModel.addGuid(newGuid);
+ noteTableView.proxyModel.addGuid(newGuid, listManager.getNoteMetadata().get(newGuid));
i=listManager.getNoteIndex().size();
}
}
- if (listManager.getNoteTableModel().titleColors.containsKey(oldGuid)) {
- int color = listManager.getNoteTableModel().titleColors.get(oldGuid);
- listManager.getNoteTableModel().titleColors.put(newGuid, color);
- listManager.getNoteTableModel().titleColors.remove(oldGuid);
+ if (listManager.getNoteTableModel().metaData.containsKey(oldGuid)) {
+ NoteMetadata meta = listManager.getNoteTableModel().metaData.get(oldGuid);
+ listManager.getNoteTableModel().metaData.put(newGuid, meta);
+ listManager.getNoteTableModel().metaData.remove(oldGuid);
}
}
Note oldNote = conn.getNoteTable().getNote(guid, true, false,false,false,true);
List<Resource> resList = conn.getNoteTable().noteResourceTable.getNoteResources(guid, true);
- oldNote.setContent(conn.getNoteTable().getNoteContentBinary(guid));
+ oldNote.setContent(conn.getNoteTable().getNoteContentNoUTFConversion(guid));
oldNote.setResources(resList);
duplicateNote(oldNote);
}
newNote.setResources(resList);
// Add note to the database
- listManager.addNote(newNote);
conn.getNoteTable().addNote(newNote, true);
- listManager.getUnsynchronizedNotes().add(newNote.getGuid());
- noteTableView.insertRow(newNote, true, -1);
+ NoteMetadata metaData = new NoteMetadata();
+ NoteMetadata oldMeta = listManager.getNoteMetadata().get(oldNote.getGuid());
+ metaData.copy(oldMeta);
+ metaData.setGuid(newNote.getGuid());
+ listManager.addNote(newNote, metaData);
+ noteTableView.insertRow(newNote, metaData, true, -1);
currentNoteGuid = newNote.getGuid();
currentNote = newNote;
refreshEvernoteNote(true);
}
}
msg = tr("An error has happened while saving the note \"") +title+
- tr("\".\n\nThis is probably due to a document that is too complex for Nevernote to process. "+
+ tr("\".\n\nThis is probably due to a document that is too complex for NixNote to process. "+
"As a result, changes to the note may not be saved properly in the database."+
"\n\nA cached copy is being preserved so you can recover any data, but data may" +
"\nbe lost. Please review the note to recover any critical data before restarting.");
n.getResources().get(i).setActive(true);
conn.getNoteTable().noteResourceTable.saveNoteResource(n.getResources().get(i), true);
}
- listManager.addNote(n);
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setGuid(n.getGuid());
+ listManager.addNote(n, metadata);
conn.getNoteTable().addNote(n, true);
refreshEvernoteNote(true);
setMessage(tr("Note has been restored."));
if (currentNote == null) {
currentNote = conn.getNoteTable().getNote(currentNoteGuid, false, false, false, false, true);
}
- listManager.setUnsynchronizedNotes(conn.getNoteTable().getUnsynchronizedGUIDs());
- noteIndexUpdated(false);
+ listManager.refreshNoteMetadata();
+ noteIndexUpdated(true);
noteTableView.selectionModel().blockSignals(true);
scrollToGuid(currentNoteGuid);
noteTableView.selectionModel().blockSignals(false);
conn.getLinkedNotebookTable().expungeNotebook(guid, false);
evernoteSync();
}
-/* if (syncDialog.convertToLocal.isChecked()) {
- conn.getNotebookTable().convertFromSharedNotebook(notebookGuid, true);
- conn.getLinkedNotebookTable().expungeNotebook(guid, false);
- evernoteSync();
- }
- if (syncDialog.convertToShared.isChecked()) {
- conn.getLinkedNotebookTable().expungeNotebook(guid, false);
- conn.getNotebookTable().convertFromSharedNotebook(notebookGuid, false);
- evernoteSync();
- } */
refreshLists();
return;
}
thumbnailRunner.interrupt = true;
indexRunner.addWork("SCAN");
}
- logger.log(logger.EXTREME, "Leaving neverNote index timer");
+ logger.log(logger.EXTREME, "Leaving NixNote index timer");
}
@SuppressWarnings("unused")
tagDeadCount++;
if (tagDeadCount > MAX && !disableTagThreadCheck) {
QMessageBox.information(this, tr("A thread has died."), tr("It appears as the tag counter thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ "checking stopping NixNote, saving the logs for later viewing, and restarting. Sorry."));
disableTagThreadCheck = true;
}
} else
notebookThreadDeadCount++;
if (notebookThreadDeadCount > MAX && !disableNotebookThreadCheck) {
QMessageBox.information(this, tr("A thread has died."), tr("It appears as the notebook counter thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ "checking stopping NixNote, saving the logs for later viewing, and restarting. Sorry."));
disableNotebookThreadCheck=true;
}
} else
trashDeadCount++;
if (trashDeadCount > MAX && !disableTrashThreadCheck) {
QMessageBox.information(this, tr("A thread has died."), ("It appears as the trash counter thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ "checking stopping NixNote, saving the logs for later viewing, and restarting. Sorry."));
disableTrashThreadCheck = true;
}
} else
saveThreadDeadCount++;
if (saveThreadDeadCount > MAX && !disableSaveThreadCheck) {
QMessageBox.information(this, tr("A thread has died."), tr("It appears as the note saver thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ "checking stopping NixNote, saving the logs for later viewing, and restarting. Sorry."));
disableSaveThreadCheck = true;
}
} else
syncThreadDeadCount++;
if (syncThreadDeadCount > MAX && !disableSyncThreadCheck) {
QMessageBox.information(this, tr("A thread has died."), tr("It appears as the synchronization thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ "checking stopping NixNote, saving the logs for later viewing, and restarting. Sorry."));
disableSyncThreadCheck = true;
}
} else
indexThreadDeadCount++;
if (indexThreadDeadCount > MAX && !disableIndexThreadCheck) {
QMessageBox.information(this, tr("A thread has died."), tr("It appears as the index thread has died. I recommend "+
- "checking stopping NeverNote, saving the logs for later viewing, and restarting. Sorry."));
+ "checking stopping NixNote, saving the logs for later viewing, and restarting. Sorry."));
disableIndexThreadCheck = true;
}
} else
fd.setFileMode(FileMode.AnyFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Backup Database"));
- fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptSave);
if (saveLastPath == null || saveLastPath.equals(""))
fd.setDirectory(System.getProperty("user.home"));
fd.setFileMode(FileMode.ExistingFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Restore Database"));
- fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptOpen);
if (saveLastPath == null || saveLastPath.equals(""))
fd.setDirectory(System.getProperty("user.home"));
fd.setFileMode(FileMode.AnyFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Backup Database"));
- fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptSave);
fd.setDirectory(System.getProperty("user.home"));
if (fd.exec() == 0 || fd.selectedFiles().size() == 0) {
fd.setFileMode(FileMode.ExistingFile);
fd.setConfirmOverwrite(true);
fd.setWindowTitle(tr("Import Notes"));
- fd.setFilter(tr("NeverNote Export (*.nnex);;All Files (*.*)"));
+ fd.setFilter(tr("NixNote Export (*.nnex);;Evernote Export (*.enex);;All Files (*.*)"));
fd.setAcceptMode(AcceptMode.AcceptOpen);
if (saveLastPath == null || saveLastPath.equals(""))
fd.setDirectory(System.getProperty("user.home"));
if (selectedNoteGUIDs.size() == 0 && !currentNoteGuid.equals(""))
selectedNoteGUIDs.add(currentNoteGuid);
- ImportData noteReader = new ImportData(conn, false);
String fileName = fd.selectedFiles().get(0);
// saveLastPath.substring(0,fileName.lastIndexOf("/"));
- if (!fileName.endsWith(".nnex"))
- fileName = fileName +".nnex";
- if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
- noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
- else
- noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
+ if (fileName.endsWith(".nnex")) {
+ ImportData noteReader = new ImportData(conn, false);
+ if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
+ noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
+ else
+ noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
- noteReader.importData(fileName);
+ noteReader.importData(fileName);
- if (noteReader.lastError != 0) {
- setMessage(noteReader.getErrorMessage());
- logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
- waitCursor(false);
- return;
+ if (noteReader.lastError != 0) {
+ setMessage(noteReader.getErrorMessage());
+ logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
+ waitCursor(false);
+ return;
+ }
+ } else {
+ if (fileName.endsWith(".enex")) {
+ ImportEnex noteReader = new ImportEnex(conn, false);
+ if (selectedNotebookGUIDs != null && selectedNotebookGUIDs.size() > 0)
+ noteReader.setNotebookGuid(selectedNotebookGUIDs.get(0));
+ else
+ noteReader.setNotebookGuid(listManager.getNotebookIndex().get(0).getGuid());
+
+ waitCursor(false);
+ if (QMessageBox.question(this, tr("Confirmation"),
+ tr("Create new tags from import?"),
+ QMessageBox.StandardButton.Yes,
+ QMessageBox.StandardButton.No) == StandardButton.Yes.value()) {
+ noteReader.createNewTags = true;
+ } else
+ noteReader.createNewTags = false;
+ waitCursor(true);
+ noteReader.importData(fileName);
+
+ if (noteReader.lastError != 0) {
+ setMessage(noteReader.getErrorMessage());
+ logger.log(logger.LOW, "Import problem: " +noteReader.lastError);
+ waitCursor(false);
+ return;
+ }
+ }
}
listManager.loadNoteTitleColors();
Note newNote = importer.getNote();
newNote.setNotebookGuid(notebook);
newNote.setTitle(dir.at(i));
- listManager.addNote(newNote);
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setDirty(true);
+ metadata.setGuid(newNote.getGuid());
+ listManager.addNote(newNote, metadata);
conn.getNoteTable().addNote(newNote, true);
- listManager.getUnsynchronizedNotes().add(newNote.getGuid());
- noteTableView.insertRow(newNote, true, -1);
+ noteTableView.insertRow(newNote, metadata, true, -1);
listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
listManager.countNotebookResults(listManager.getNoteIndex());
importedFiles.add(list.get(i).absoluteFilePath());
Note newNote = importer.getNote();
newNote.setNotebookGuid(notebook);
newNote.setTitle(dir.at(i));
- listManager.addNote(newNote);
+ NoteMetadata metadata = new NoteMetadata();
+ metadata.setDirty(true);
+ metadata.setGuid(newNote.getGuid());
+ listManager.addNote(newNote, metadata);
conn.getNoteTable().addNote(newNote, true);
- listManager.getUnsynchronizedNotes().add(newNote.getGuid());
- noteTableView.insertRow(newNote, true, -1);
+ noteTableView.insertRow(newNote, metadata, true, -1);
listManager.updateNoteContent(newNote.getGuid(), importer.getNoteContent());
listManager.countNotebookResults(listManager.getNoteIndex());
dir.remove(dir.at(i));
@Override
public void changeEvent(QEvent e) {
if (e.type() == QEvent.Type.WindowStateChange) {
- if (isMinimized() && Global.showTrayIcon()) {
- e.accept();
- QTimer.singleShot(10, this, "hide()");
- return;
+ if (QSystemTrayIcon.isSystemTrayAvailable()) {
+ if (isMinimized() && (Global.showTrayIcon() || Global.showTrayIcon())) {
+ e.accept();
+ QTimer.singleShot(10, this, "hide()");
+ return;
+ }
+ if (isMaximized())
+ windowMaximized = true;
+ else
+ windowMaximized = false;
}
- if (isMaximized())
- windowMaximized = true;
- else
- windowMaximized = false;
}
}
OSDN Git Service
