Add Wombat theme, put it and Base16 theme in OS X menu

diff --git a/Factor.app/Contents/Resources/English.lproj/Factor.nib/designable.nib b/Factor.app/Contents/Resources/English.lproj/Factor.nib/designable.nib
index 74aa0193e2b98b91b4bfe46319f21f410a8c634e..e5b14f8bbaabbd0658b2c5dc0b09d85bf1b2ba6b 100644 (file)
--- a/Factor.app/Contents/Resources/English.lproj/Factor.nib/designable.nib
+++ b/Factor.app/Contents/Resources/English.lproj/Factor.nib/designable.nib
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">

     <dependencies>
         <deployment version="1050" identifier="macosx"/>
     <dependencies>
         <deployment version="1050" identifier="macosx"/>

-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>

     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>


@@ -235,6 +235,18 @@
                                                 <action selector="switchDarkTheme:" target="-1" id="2ug-u3-tEU"/>
                                             </connections>
                                         </menuItem>
                                                 <action selector="switchDarkTheme:" target="-1" id="2ug-u3-tEU"/>
                                             </connections>
                                         </menuItem>

+                                        <menuItem title="Base16" id="c5Z-R4-x0d">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="switchBase16Theme:" target="-1" id="ilJ-8c-q12"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Wombat" id="5Ri-3D-AWg">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="switchWombatTheme:" target="-1" id="BQz-Hk-EpG"/>
+                                            </connections>
+                                        </menuItem>

                                     </items>
                                 </menu>
                             </menuItem>
                                     </items>
                                 </menu>
                             </menuItem>


@@ -277,6 +289,7 @@
                     </menu>
                 </menuItem>
             </items>
                     </menu>
                 </menuItem>
             </items>

+            <point key="canvasLocation" x="-52" y="128"/>

         </menu>
     </objects>
 </document>
         </menu>
     </objects>
 </document>

diff --git a/Factor.app/Contents/Resources/English.lproj/Factor.nib/keyedobjects.nib b/Factor.app/Contents/Resources/English.lproj/Factor.nib/keyedobjects.nib
index 67eedf8402b80dd76aead6b5f9a565daebf9cdd4..d5fe8592c7dd15a1b25d6f94fd8e02ed4af3a3b3 100644 (file)
Binary files a/Factor.app/Contents/Resources/English.lproj/Factor.nib/keyedobjects.nib and b/Factor.app/Contents/Resources/English.lproj/Factor.nib/keyedobjects.nib differ

diff --git a/basis/ui/backend/cocoa/tools/tools.factor b/basis/ui/backend/cocoa/tools/tools.factor
index feed1a53dc3b30772ed285e14755ff5050f7fe17..482330f849ca78bac832eca8a5a3371cfdeaed33 100644 (file)
--- a/basis/ui/backend/cocoa/tools/tools.factor
+++ b/basis/ui/backend/cocoa/tools/tools.factor
@@ -45,6 +45,10 @@ IN: ui.backend.cocoa.tools
 
     METHOD: id switchDarkTheme: id app [ dark-mode f ] ;
 
 
     METHOD: id switchDarkTheme: id app [ dark-mode f ] ;
 

+    METHOD: id switchWombatTheme: id app [ wombat-mode f ] ;
+
+    METHOD: id switchBase16Theme: id app [ base16-mode f ] ;
+

     METHOD: id refreshAll: id app [ [ refresh-all ] \ refresh-all call-listener f ] ;
 ;CLASS>
 
     METHOD: id refreshAll: id app [ [ refresh-all ] \ refresh-all call-listener f ] ;
 ;CLASS>
 

diff --git a/basis/ui/theme/switching/switching.factor b/basis/ui/theme/switching/switching.factor
index 9b22efc3637c16c2320d0318ce402f5b6599c13e..2e68a99911a5fe01491d1f682aedb790fac3c737 100644 (file)
--- a/basis/ui/theme/switching/switching.factor
+++ b/basis/ui/theme/switching/switching.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2016 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2016 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: hashtables kernel namespaces sequences ui.theme
-vocabs.loader ;
+USING: hashtables kernel namespaces sequences ui.theme ui.theme.base16
+ui.theme.wombat vocabs.loader ;

 IN: ui.theme.switching
 
 SYMBOL: default-theme?
 IN: ui.theme.switching
 
 SYMBOL: default-theme?


@@ -26,4 +26,8 @@ t default-theme? set-global
 
 : dark-mode ( -- ) dark-theme switch-theme ;
 
 
 : dark-mode ( -- ) dark-theme switch-theme ;
 

+: wombat-mode ( -- ) wombat-theme switch-theme ;
+
+: base16-mode ( -- ) base16-theme switch-theme ;
+

 { "ui.theme.switching" "ui.tools" } "ui.theme.switching.tools" require-when
 { "ui.theme.switching" "ui.tools" } "ui.theme.switching.tools" require-when

diff --git a/basis/ui/theme/wombat/authors.txt b/basis/ui/theme/wombat/authors.txt
new file mode 100644 (file)
index 0000000..d514ff4
--- /dev/null
+++ b/basis/ui/theme/wombat/authors.txt
@@ -0,0 +1 @@
+Alex Maestas

diff --git a/basis/ui/theme/wombat/summary.txt b/basis/ui/theme/wombat/summary.txt
new file mode 100644 (file)
index 0000000..40faf8f
--- /dev/null
+++ b/basis/ui/theme/wombat/summary.txt
@@ -0,0 +1 @@
+Port of the Wombat theme from Emacs and Vim

diff --git a/basis/ui/theme/wombat/wombat.factor b/basis/ui/theme/wombat/wombat.factor
new file mode 100644 (file)
index 0000000..4a156d5
--- /dev/null
+++ b/basis/ui/theme/wombat/wombat.factor
@@ -0,0 +1,95 @@
+USING: colors ui.theme ;
+IN: ui.theme.wombat
+SINGLETON: wombat-theme
+
+! This is a port of the `wombat` theme from emacs, adapted with permission from
+! Kristoffer Grönlund, who, in turn, adapted it from the Vim color scheme by
+! Lars H. Nielsen.
+
+M: wombat-theme toolbar-background COLOR: #454545 ;
+M: wombat-theme toolbar-button-pressed-background COLOR: #242424 ;
+
+M: wombat-theme menu-background COLOR: #384048 ;
+M: wombat-theme menu-border-color COLOR: #a0a8b0 ;
+
+M: wombat-theme status-bar-background COLOR: #384048 ;
+M: wombat-theme status-bar-foreground COLOR: white ;
+
+M: wombat-theme button-text-color COLOR: #303030 ;
+M: wombat-theme button-clicked-text-color COLOR: white ;
+
+M: wombat-theme line-color COLOR: #656565 ;
+
+M: wombat-theme column-title-background COLOR: #384048 ;
+
+M: wombat-theme roll-button-rollover-border COLOR: #a0a8b0 ;
+M: wombat-theme roll-button-selected-background COLOR: #a0a8b0 ;
+
+M: wombat-theme source-files-color COLOR: #95e454 ;
+M: wombat-theme errors-color COLOR: #e5786d ;
+M: wombat-theme details-color COLOR: #8ac6f2 ;
+
+M: wombat-theme debugger-color COLOR: #e5786d ;
+M: wombat-theme completion-color COLOR: #3f9f9e ;
+
+M: wombat-theme data-stack-color COLOR: #8ac6f2 ;
+M: wombat-theme retain-stack-color COLOR: #95e454 ;
+M: wombat-theme call-stack-color COLOR: #3f9f9e ;
+
+M: wombat-theme title-bar-gradient { COLOR: #242424 COLOR: #454545 } ;
+
+M: wombat-theme popup-color COLOR: #ddaa6f ;
+
+M: wombat-theme object-color COLOR: #8ac6f2 ;
+M: wombat-theme contents-color COLOR: #95e454 ;
+
+M: wombat-theme help-header-background COLOR: #384048 ;
+
+M: wombat-theme thread-status-stopped-background COLOR: #333333 ;
+M: wombat-theme thread-status-suspended-background COLOR: #242424 ;
+M: wombat-theme thread-status-running-background COLOR: #444444 ;
+
+M: wombat-theme thread-status-stopped-foreground COLOR: #8ac6f2 ;
+M: wombat-theme thread-status-suspended-foreground COLOR: #ddaa6f ;
+M: wombat-theme thread-status-running-foreground COLOR: #95e454 ;
+
+M: wombat-theme error-summary-background COLOR: #b85149 ;
+
+M: wombat-theme content-background COLOR: #242424 ;
+M: wombat-theme text-color COLOR: #f6f3e9 ;
+
+M: wombat-theme link-color COLOR: #8ac6f2 ;
+M: wombat-theme title-color COLOR: #a0a8b0 ;
+M: wombat-theme heading-color COLOR: #a0a8b0 ;
+M: wombat-theme snippet-color COLOR: #e5786d ;
+M: wombat-theme output-color COLOR: #e5786d ;
+M: wombat-theme deprecated-background-color COLOR: #454545 ;
+M: wombat-theme deprecated-border-color COLOR: #92a65e ;
+M: wombat-theme warning-background-color COLOR: #454545 ;
+M: wombat-theme warning-border-color COLOR: #8ac6f2 ;
+M: wombat-theme code-background-color COLOR: #303030 ;
+M: wombat-theme code-border-color COLOR: white ;
+M: wombat-theme help-path-border-color COLOR: #384048 ;
+
+M: wombat-theme tip-background-color COLOR: #303030 ;
+
+M: wombat-theme prompt-background-color COLOR: #92a65e ;
+
+M: wombat-theme dim-color COLOR: #8ac6f2 ;
+M: wombat-theme highlighted-word-color COLOR: #95e454 ;
+M: wombat-theme string-color COLOR: #95e454 ;
+M: wombat-theme stack-effect-color COLOR: #e5786d ;
+
+M: wombat-theme vocab-background-color COLOR: #303030 ;
+M: wombat-theme vocab-border-color COLOR: #a0a8b0 ;
+
+M: wombat-theme field-border-color COLOR: #a0a8b0 ;
+
+M: wombat-theme editor-caret-color COLOR: #92a65e ;
+M: wombat-theme selection-color COLOR: #444444 ;
+M: wombat-theme panel-background-color COLOR: #444444 ;
+M: wombat-theme focus-border-color COLOR: #a0a8b0 ;
+
+M: wombat-theme labeled-border-color COLOR: #303030 ;
+
+M: wombat-theme table-border-color COLOR: #a0a8b0 ;