Merge pull request #278 from vkbo/tweaks

GUI Tweaks
vkbo · Jun 2, 2020 · 3a22863 · 3a22863
2 parents afdd07b + e8db673
commit 3a22863
Show file tree

Hide file tree

Showing 25 changed files with 869 additions and 516 deletions.
diff --git a/nw/__init__.py b/nw/__init__.py
@@ -172,15 +172,15 @@ def main(sysArgs=None):
             debugLevel = logging.INFO
         elif inOpt == "--debug":
             debugLevel = logging.DEBUG
-            logFormat  = "[{asctime:}] {name:>30}:{lineno:<4d}  {levelname:8}  {message:}"
+            logFormat  = "[{asctime:}] {name:>20}:{lineno:<4d}  {levelname:8}  {message:}"
         elif inOpt == "--logfile":
             logFile = inArg
             toFile  = True
         elif inOpt in ("-q","--quiet"):
             toStd = False
         elif inOpt == "--verbose":
             debugLevel = VERBOSE
-            logFormat  = "[{asctime:}] {name:>30}:{lineno:<4d}  {levelname:8}  {message:}"
+            logFormat  = "[{asctime:}] {name:>20}:{lineno:<4d}  {levelname:8}  {message:}"
         elif inOpt == "--style":
             qtStyle = inArg
         elif inOpt == "--config":
@@ -196,7 +196,7 @@ def main(sysArgs=None):
     CONFIG.cmdOpen   = cmdOpen
 
     # Set Logging
-    logFmt = logging.Formatter(fmt=logFormat,datefmt="%Y-%m-%d %H:%M:%S",style="{")
+    logFmt = logging.Formatter(fmt=logFormat, datefmt="%Y-%m-%d %H:%M:%S", style="{")
 
     if not logFile == "" and toFile:
         if path.isfile(logFile+".bak"):

diff --git a/nw/assets/icons/fallback/hash-dark.svg b/nw/assets/icons/fallback/hash-dark.svg
diff --git a/nw/assets/icons/fallback/hash.svg b/nw/assets/icons/fallback/hash.svg
diff --git a/nw/assets/icons/typicons_colour_dark/hash.svg b/nw/assets/icons/typicons_colour_dark/hash.svg
diff --git a/nw/assets/icons/typicons_colour_dark/icons.conf b/nw/assets/icons/typicons_colour_dark/icons.conf
@@ -1,8 +1,9 @@
 ##
-# Icons:    Typicons Colour Dark
-# Source:   https://github.com/stephenhutchings/typicons.font
-# Credit:   Stephen Hutchings
-# Modified: Veronica Berglyd Olsen
+# Icons:     Typicons Colour Dark
+# Source:    https://github.com/stephenhutchings/typicons.font
+# Credit:    Stephen Hutchings
+# Modified:  Veronica Berglyd Olsen
+# Additions: hash.svg
 ##
 
 [Main]
@@ -39,3 +40,4 @@ save           = download.svg
 edit           = pencil.svg
 check          = tick.svg
 cross          = times.svg
+hash           = hash.svg
diff --git a/nw/assets/icons/typicons_colour_light/hash.svg b/nw/assets/icons/typicons_colour_light/hash.svg
diff --git a/nw/assets/icons/typicons_colour_light/icons.conf b/nw/assets/icons/typicons_colour_light/icons.conf
@@ -1,8 +1,9 @@
 ##
-# Icons:    Typicons Colour Light
-# Source:   https://github.com/stephenhutchings/typicons.font
-# Credit:   Stephen Hutchings
-# Modified: Veronica Berglyd Olsen
+# Icons:     Typicons Colour Light
+# Source:    https://github.com/stephenhutchings/typicons.font
+# Credit:    Stephen Hutchings
+# Modified:  Veronica Berglyd Olsen
+# Additions: hash.svg
 ##
 
 [Main]
@@ -39,3 +40,4 @@ save           = download.svg
 edit           = pencil.svg
 check          = tick.svg
 cross          = times.svg
+hash           = hash.svg
diff --git a/nw/assets/icons/typicons_grey_dark/hash.svg b/nw/assets/icons/typicons_grey_dark/hash.svg
diff --git a/nw/assets/icons/typicons_grey_dark/icons.conf b/nw/assets/icons/typicons_grey_dark/icons.conf
@@ -1,7 +1,9 @@
 ##
-# Icons:  Typicons Grey Dark
-# Source: https://github.com/stephenhutchings/typicons.font
-# Credit: Stephen Hutchings
+# Icons:     Typicons Grey Dark
+# Source:    https://github.com/stephenhutchings/typicons.font
+# Credit:    Stephen Hutchings
+# Modified:  Veronica Berglyd Olsen
+# Additions: hash.svg
 ##
 
 [Main]
@@ -38,3 +40,4 @@ save           = download.svg
 edit           = pencil.svg
 check          = tick.svg
 cross          = times.svg
+hash           = hash.svg