Corrected problem where not having a title in an external window would cause a recurs...

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index b17fc22..7511f2f 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -4241,7 +4241,7 @@ public class NeverNote extends QMainWindow{
        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)");
@@ -4253,12 +4253,6 @@ public class NeverNote extends QMainWindow{
        
        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);

diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index 4ef8373..7510af5 100644 (file)
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -2144,28 +2144,28 @@ public class BrowserWindow extends QWidget {
                String text = browser.page().currentFrame().toPlainText();\r
                if (saveNoteTitle == null)\r
                        saveNoteTitle = new String();\r
+               text = text.trim();\r
+               int newLine = text.indexOf("\n");\r
+               if (newLine > 0)\r
+                       text = text.substring(0,newLine);\r
                if (saveNoteTitle.trim().equals("") || saveNoteTitle.trim().equals("Untitled Note")) {\r
-                       int newLine = text.indexOf("\n");\r
-                       if (newLine > 0) {\r
-                               text = text.substring(0, newLine);\r
-                               if (text.trim().equals(""))\r
-                                       text = tr("Untitled Note");\r
+                       if (text.trim().equals(""))\r
+                               text = tr("Untitled Note");\r
                                titleLabel.setText(text);\r
-                       } else {\r
-                               if (text.length() > Constants.EDAM_NOTE_TITLE_LEN_MAX)\r
-                                       titleLabel.setText(text.substring(0, Constants.EDAM_NOTE_TITLE_LEN_MAX));\r
-                               else {\r
-                                       titleLabel.blockSignals(true);\r
-                                       if (text.trim().equals(""))\r
-                                               titleLabel.setText(tr("Untitled Note"));\r
-                                       else\r
-                                               titleLabel.setText(text);\r
-                                       titleLabel.blockSignals(false);\r
-                               }\r
+               } else {\r
+                       if (text.length() > Constants.EDAM_NOTE_TITLE_LEN_MAX)\r
+                               titleLabel.setText(text.substring(0, Constants.EDAM_NOTE_TITLE_LEN_MAX));\r
+                       else {\r
+                               titleLabel.blockSignals(true);\r
+                               if (text.trim().equals(""))\r
+                                       titleLabel.setText(tr("Untitled Note"));\r
+                               else\r
+                                       titleLabel.setText(text);\r
+                               titleLabel.blockSignals(false);\r
                        }\r
-                       if (currentNote != null && titleLabel != null)\r
-                               noteSignal.titleChanged.emit(currentNote.getGuid(), titleLabel.text());\r
                }\r
+               if (currentNote != null && titleLabel != null)\r
+                       noteSignal.titleChanged.emit(currentNote.getGuid(), text);\r
        }\r
 \r
        // Return the note contents so we can email them\r

diff --git a/src/cx/fbn/nevernote/gui/ExternalBrowse.java b/src/cx/fbn/nevernote/gui/ExternalBrowse.java
index a16e7c6..b9320a0 100644 (file)
--- a/src/cx/fbn/nevernote/gui/ExternalBrowse.java
+++ b/src/cx/fbn/nevernote/gui/ExternalBrowse.java
@@ -41,6 +41,7 @@ public class ExternalBrowse extends QMdiSubWindow {
        public Signal4<String, String, Boolean, BrowserWindow> contentsChanged;\r
        public Signal1<String>  windowClosing;\r
        boolean noteDirty;\r
+       String saveTitle;\r
        private final FindDialog        find;                                           // Text search in note dialog\r
 //     ExternalBrowserMenuBar          menu;\r
        ExternalBrowserMenuBar  menu;\r
@@ -91,7 +92,9 @@ public class ExternalBrowse extends QMdiSubWindow {
     \r
        @SuppressWarnings("unused")\r
        private void updateTitle(String guid, String title) {\r
-               if (guid.equals(getBrowserWindow().getNote().getGuid())) {\r
+               if (guid.equals(getBrowserWindow().getNote().getGuid()) &&\r
+                               (saveTitle != null && !title.equals(saveTitle) || saveTitle == null) ) {\r
+                       saveTitle = title;\r
                        getBrowserWindow().loadingData(true);\r
                        getBrowserWindow().setTitle(title);\r
                        getBrowserWindow().getNote().setTitle(title);\r