Fix logic that caused a note's title to be pulled from the text when it is not manual...

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / BrowserWindow.java

diff --git a/src/cx/fbn/nevernote/gui/BrowserWindow.java b/src/cx/fbn/nevernote/gui/BrowserWindow.java
index b3d8495..ac9bd98 100644 (file)
--- a/src/cx/fbn/nevernote/gui/BrowserWindow.java
+++ b/src/cx/fbn/nevernote/gui/BrowserWindow.java
@@ -200,20 +200,11 @@ public class BrowserWindow extends QWidget {
        public EditorButtonBar buttonLayout;\r
        public final QComboBox fontList;\r
        public final QAction    fontListAction;\r
-<<<<<<< HEAD
        public final QToolButton fontColor;\r
        public final QAction    fontColorAction;\r
        private final ColorMenu fontColorMenu;\r
        public final QToolButton fontHilight;\r
        public final QAction    fontHilightAction;\r
-=======
-       public final QPushButton fontColor;\r
-       public final QAction    fontColorAction;\r
-       private final ColorMenu fontColorMenu;\r
-       public final QPushButton fontHilight;\r
-       public final QAction    fontHilightAction;\r
-//     public final ColorComboBox fontHilight;\r
->>>>>>> 14a0afe3faba057afbddf62aa8ed25139750d68b
        private final ColorMenu fontHilightColorMenu;\r
        public final QFileSystemWatcher fileWatcher;\r
        public int cursorPosition;\r
@@ -493,11 +484,7 @@ public class BrowserWindow extends QWidget {
                }\r
 \r
 //             buttonLayout.addWidget(newSeparator(), 0);\r
-<<<<<<< HEAD
                fontColor = newToolButton("fontColor", tr("Font Color"));\r
-=======
-               fontColor = newEditorButton("fontColor", tr("Font Color"));\r
->>>>>>> 14a0afe3faba057afbddf62aa8ed25139750d68b
                fontColorMenu = new ColorMenu(this);\r
                fontColor.setMenu(fontColorMenu.getMenu());\r
                fontColor.setPopupMode(ToolButtonPopupMode.MenuButtonPopup);\r
@@ -505,22 +492,15 @@ public class BrowserWindow extends QWidget {
                fontColorMenu.getMenu().triggered.connect(this, "fontColorClicked()");\r
                fontColorAction = buttonLayout.addWidget(fontColor);\r
                buttonLayout.toggleFontColorVisible.triggered.connect(this, "toggleFontColorVisible(Boolean)");\r
-<<<<<<< HEAD
                fontHilight = newToolButton("fontHilight", tr("Font Hilight Color"));\r
                fontHilight.setPopupMode(ToolButtonPopupMode.MenuButtonPopup);\r
                fontHilight.setAutoRaise(false);\r
-=======
-               fontHilight = newEditorButton("fontHilight", tr("Font Hilight Color"));\r
->>>>>>> 14a0afe3faba057afbddf62aa8ed25139750d68b
                fontHilightColorMenu = new ColorMenu(this);\r
                fontHilightColorMenu.setDefault(QColor.yellow);\r
                fontHilight.setMenu(fontHilightColorMenu.getMenu());\r
                fontHilightColorMenu.getMenu().triggered.connect(this, "fontHilightClicked()");\r
                fontHilightAction = buttonLayout.addWidget(fontHilight);\r
-<<<<<<< HEAD
                fontHilightColorMenu.setDefault(QColor.yellow);\r
-=======
->>>>>>> 14a0afe3faba057afbddf62aa8ed25139750d68b
                buttonLayout.toggleFontHilight.triggered.connect(this, "toggleFontHilightVisible(Boolean)");\r
 \r
 //             buttonLayout.addWidget(new QLabel(), 1);\r
@@ -553,9 +533,10 @@ public class BrowserWindow extends QWidget {
                browser.page().mainFrame().setTextSizeMultiplier(Global.getTextSizeMultiplier());\r
                browser.page().mainFrame().setZoomFactor(Global.getZoomFactor());\r
                \r
-                previewPageList = new HashMap<String,Integer>();\r
+               previewPageList = new HashMap<String,Integer>();\r
                \r
                browser.page().microFocusChanged.connect(this, "microFocusChanged()");\r
+               \r
                logger.log(logger.HIGH, "Browser setup complete");\r
        }\r
 \r
@@ -1602,7 +1583,7 @@ public class BrowserWindow extends QWidget {
        // Check the note title\r
        private void checkNoteTitle() {\r
                String text = browser.page().currentFrame().toPlainText();\r
-               if (saveNoteTitle.trim().equals("")) {\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
@@ -1610,13 +1591,15 @@ public class BrowserWindow extends QWidget {
                                        text = tr("Untitled Note");\r
                                titleLabel.setText(text);\r
                        } else {\r
-                               if (text.length() > 20)\r
-                                       titleLabel.setText(text.substring(0, 20));\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
                        }\r
                        noteSignal.titleChanged.emit(currentNote.getGuid(), titleLabel\r
@@ -2646,7 +2629,6 @@ public class BrowserWindow extends QWidget {
        }\r
 \r
 \r
-<<<<<<< HEAD
        // Invoke spell checker dialog\r
        private void doSpellCheck() {\r
 \r
@@ -2709,8 +2691,5 @@ public class BrowserWindow extends QWidget {
                }\r
 \r
     }\r
-=======
-\r
->>>>>>> 14a0afe3faba057afbddf62aa8ed25139750d68b
 \r
 }\r