Changed default style to Cleanlooks, added default-cleanlooks.qss, and corrected...

diff --git a/qss/default-cleanlooks.qss b/qss/default-cleanlooks.qss
new file mode 100644 (file)
index 0000000..71ea808
--- /dev/null
+++ b/qss/default-cleanlooks.qss
@@ -0,0 +1,103 @@
+/* Default stylesheet */
+
+
+
+QTreeView::branch:has-siblings:!adjoins-item  {
+     border-image: url(qss/dummy.png) 0;
+ }
+
+ QTreeView::branch:has-siblings:adjoins-item {
+     border-image: url(qss/dummy.png) 0;
+ }
+ QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
+     border-image: url(qss/dummy.png) 0;
+ }
+
+ QTreeView::branch:has-children:!has-siblings:closed,
+ QTreeView::branch:closed:has-children:has-siblings  {
+         border-image: none;
+         image: url(qss/branch-closed.png);
+ }
+
+ QTreeView::branch:open:has-children:!has-siblings,
+ QTreeView::branch:open:has-children:has-siblings  {
+         border-image: none;
+         image: url(qss/branch-open.png);
+ }
+ QTreeView::item {
+      padding: 1px 1px 1px 1px;    
+ } 
+ 
+ QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
+       border-image: none;
+       image: none;
+ }
+ QTreeView {
+       border: 0.1em solid #666;
+       padding: 0 0 0 0.3em;
+       height: 1.4em;
+       background: #B0C4DE; 
+       background: #EFEBE7;    
+ }
+
+ 
+
+
+QProgressBar { 
+       text-align: center; 
+}
+
+QTableView {
+
+       selection-color: black;
+       selection-background-color: #B0C4DE;
+}
+
+
+QSpinBox {
+     padding-right: 15px; /* make room for the arrows */
+     border-width: 3;
+     text-align: center;
+ }
+ 
+ 
+ QSplitter::handle {
+   border-radius: 3px;
+ }
+ 
+
+QHeaderView {
+       background: transparent;
+}
+QHeaderView::section {
+       border: 0.1em solid #666;
+       padding: 0 0 0 0.3em;
+       height: 1.4em; 
+       min-width: 20px;
+}
+QHeaderView
+       QHeaderView::section:first, QHeaderView::section:only-one {
+       border: 2px;
+       min-width: 50px;
+}
+
+
+
+
+
+
+/*
+QLineEdit:focus {
+     border: 1px solid black;
+     border-radius: 10px;
+     padding: 0 8px;
+     background: #FFFFD4;
+     selection-background-color: darkgray;
+ }
+ QLineEdit:!focus {
+      border: none;
+      background-color: transparent;
+ }
+*/
+
+

diff --git a/src/cx/fbn/nevernote/Global.java b/src/cx/fbn/nevernote/Global.java
index 6cceef6..5df9f2a 100644 (file)
--- a/src/cx/fbn/nevernote/Global.java
+++ b/src/cx/fbn/nevernote/Global.java
@@ -1065,7 +1065,7 @@ public class Global {
     }\r
     public static String getStyle() {\r
                settings.beginGroup("General");\r
-               String val  = (String)settings.value("style", "");\r
+               String val  = (String)settings.value("style", "Cleanlooks");\r
                settings.endGroup();\r
                return val;\r
     }\r

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index df7890e..a6e9803 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);

diff --git a/src/cx/fbn/nevernote/threads/CounterRunner.java b/src/cx/fbn/nevernote/threads/CounterRunner.java
index 3531964..8c7e562 100644 (file)
--- a/src/cx/fbn/nevernote/threads/CounterRunner.java
+++ b/src/cx/fbn/nevernote/threads/CounterRunner.java
@@ -313,7 +313,6 @@ public class CounterRunner extends QObject implements Runnable {
                if (abortCount)\r
                        return;\r
 \r
-               System.out.println("***"+tCounter);\r
                trashSignal.countChanged.emit(tCounter);\r
                logger.log(logger.EXTREME, "Leaving CounterRunner.countTrashResults()");\r
        }\r