Correct search field changing not selecting a default note properly after it is cleared.

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

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 8ac26d2..1eba567 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -1227,13 +1227,15 @@ public class NeverNote extends QMainWindow{
        }    
        // Load the style sheet
        private void loadStyleSheet() {
+               String styleSheetName = "default.qss";
+               if (Global.getStyle().equalsIgnoreCase("cleanlooks"))
+                               styleSheetName = "default-cleanlooks.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");
+                       fileName = Global.getFileManager().getQssDirPath(styleSheetName);
                        file = new QFile(fileName);
                }
                file.open(OpenModeFlag.ReadOnly);
@@ -2624,7 +2626,9 @@ public class NeverNote extends QMainWindow{
                                                                +"JTidy is copyrighted under the World Wide Web Consortium<br>"
                                                                +"Apache Common Utilities licensed under the Apache License Version 2.0<br>"
                                                                +"Jazzy is licened under the LGPL<br>"
-                                                               +"Java is a registered trademark of Oracle Corporation.<br><hr>"));     
+                                                               +"Java is a registered trademark of Oracle Corporation.<br><hr>"
+                                                               +"Special thanks to:<br>BitRock InstallBuilder for the Windows installer"
+                                                               +"<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering."));
                logger.log(logger.HIGH, "Leaving NeverNote.about");
        }
        // Hide the entire left hand side
@@ -2744,6 +2748,7 @@ public class NeverNote extends QMainWindow{
                        currentNote = listManager.getNoteIndex().get(0);
                        currentNoteGuid = currentNote.getGuid();
                }
+               refreshEvernoteNote(true);
                if (currentNote != null)
                        loadNoteBrowserInformation(browserWindow);
        }
@@ -2768,6 +2773,7 @@ public class NeverNote extends QMainWindow{
                                listManager.loadNotesIndex();
                                refreshEvernoteNote(true);
                                noteIndexUpdated(false);
+                               refreshEvernoteNote(true);
                        }
                        searchPerformed = false;
                }
@@ -3992,6 +3998,7 @@ public class NeverNote extends QMainWindow{
                
        showColumns();
        noteTableView.load(false);
+       refreshEvernoteNote(true);
        scrollToCurrentGuid();
     }
     public void wideListView() {
@@ -4807,6 +4814,7 @@ public class NeverNote extends QMainWindow{
                        notebookTree.selectGuid("");
                }
                notebookTreeSelection();
+               refreshEvernoteNote(true);
        }
        // Merge notes
        @SuppressWarnings("unused")