Merge pull request #7 from xvw/develop

Move to version 1.2.0

Makefile

@@ -14,7 +14,7 @@ install:
 	npm install
 
 app: install build
-	./node_modules/.bin/electron-packager .
+	./node_modules/.bin/electron-packager . qian --overwrite --icon=icon.icns
 
 clean:
 	rm -rf node_modules

README.md

@@ -38,6 +38,25 @@ In addition, if a feature seems interesting to implement, let's talk about it in
 -  `make` (a combo of `make build` and `make run`)
 -  `make app` to create a runnable app on OSX
 
+## Shortcuts
+
+-  `Tab` : toggle the focus on the searchbar
+-  `Cmd + Alt + Enter` : Open the current folder in finder
+-  `Cmd + Enter` : Open the current folder in a terminal
+
+> those shortcuts works only if the search bar does not have the focus
+
+-  `Cmd + Left` : Go on the pred view (if it exists)
+-  `Cmd + Right` : Go on the next view (if it exists)
+-  `Cmd + Up` : Go to the parent (if it exists)
+
+## About the search bar
+
+Using `Tab` you can toggle the search-bar activation. When you write
+text into this bar, the content of the folder will be filtered using
+a fuzzy-filtering. If you write `/`, Qian will open the first element
+of the result of the filtering.
+
 
 ## Credits
 
@@ -47,8 +66,10 @@ In addition, if a feature seems interesting to implement, let's talk about it in
 -  [@xvw](https://github.com/xvw): everything else... (I think :P)
 
 ### Tools
+
+-  [Dotgrid](http://wiki.xxiivv.com/#dotgrid) (for the logo)
 -  [Elm](http://elm-lang.org/) (to have a nice language)
 -  [Electron](https://electron.atom.io/) (to have a window !)
 -  [Font Awesome](http://fontawesome.io/) (for the icon in the UI)
--  [NoRedInk](http://package.elm-lang.org/packages/NoRedInk/elm-simple-fuzzy/latest)
+-  [NoRedInk Simple Fuzzy](http://package.elm-lang.org/packages/NoRedInk/elm-simple-fuzzy/latest)
    (for the Fuzzy Searching)

main.js

@@ -14,7 +14,8 @@ function createWindow() {
     backgroundColor: "#000",
     frame: true,
     resizable: true,
-    autoHideMenuBar: true
+    autoHideMenuBar: true,
+    icon: __dirname + '/icon.ico'
   })
   mainWindow.loadURL(`file://${ __dirname }/static/index.html`)
   //mainWindow.webContents.openDevTools()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qian",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "A small experience",
   "main": "main.js",
   "scripts": {

src/Action.elm

@@ -13,6 +13,8 @@ module Action
         , goToSettings
         , goToTree
         , changeDefaultTerminal
+        , navigateHistoryFromMenu
+        , toParentFromMenu
         )
 
 {-| Provide all "action" of the application
@@ -175,6 +177,18 @@ changeDir model newPath =
     changeHistory model (\history -> History.push history newPath)
 
 
+{-| Go to the parent from Electron
+-}
+toParentFromMenu : Model -> ( Model, Cmd Message )
+toParentFromMenu model =
+    case File.parent model.history.present of
+        Nothing ->
+            ( model, Cmd.none )
+
+        Just parent ->
+            changeDir model parent
+
+
 {-| Navigate in the history (pred/next)
 -}
 navigateHistory : Model -> History File.Path -> ( Model, Cmd Message )
@@ -187,6 +201,25 @@ navigateHistory model newHistory =
         ( newModel, Port.getTree (Model.now newModel) )
 
 
+{-| Navigate in the history from Electron
+-}
+navigateHistoryFromMenu : Model -> Bool -> ( Model, Cmd Message )
+navigateHistoryFromMenu model isPast =
+    let
+        f =
+            if isPast then
+                History.backward
+            else
+                History.forward
+    in
+        case f model.history of
+            Just x ->
+                navigateHistory model x
+
+            Nothing ->
+                ( model, Cmd.none )
+
+
 {-| Change the current tree
 -}
 changeTree : Model -> File.Tree -> ( Model, Cmd Message )

src/Main.elm

@@ -18,6 +18,8 @@ subscriptions model =
     Sub.batch
         [ Port.retreiveTree ChangeTree
         , Port.treeMutation TreeMutation
+        , Port.historyNavigation NavigateHistoryFromMenu
+        , Port.jumpToParent ToParentFromMenu
         ]
 
 
@@ -62,6 +64,12 @@ update message model =
         GoToTree ->
             Action.goToTree model
 
+        NavigateHistoryFromMenu isPast ->
+            Action.navigateHistoryFromMenu model isPast
+
+        ToParentFromMenu _ ->
+            Action.toParentFromMenu model
+
         ChangeDefaultTerminal ->
             Action.changeDefaultTerminal model
 

src/Message.elm

@@ -20,4 +20,6 @@ type Message
     | RecordConfigTerminal String -- Track the configuration changement
     | GoToSettings -- Go to the user settings
     | GoToTree -- Return to the treeView
+    | NavigateHistoryFromMenu Bool -- Navigation from Electron
+    | ToParentFromMenu Bool -- Go to parent from Electron
     | ChangeDefaultTerminal -- Change the default terminal

src/Port.elm

@@ -9,6 +9,8 @@ port module Port
         , openInFinder
         , openInTerminal
         , changeTerminal
+        , historyNavigation
+        , jumpToParent
         )
 
 {-| JavaScript interopt
@@ -41,6 +43,16 @@ port getTree : File.Path -> Cmd msg
 port retreiveTree : (File.Tree -> msg) -> Sub msg
 
 
+{-| Perform a modification on the history from Electron
+-}
+port historyNavigation : (Bool -> msg) -> Sub msg
+
+
+{-| Jump to the parent from Electron
+-}
+port jumpToParent : (Bool -> msg) -> Sub msg
+
+
 {-| Watch the TreeMutation
 -}
 port treeMutation : (Bool -> msg) -> Sub msg

static/index.html

@@ -4,7 +4,7 @@
     <link rel="stylesheet" href="css/fa.css">
     <link rel="stylesheet" href="css/fonts.css">
     <link rel="stylesheet" href="css/default.css">
-   <title>Qian 1</title>
+   <title>qian</title>
   </head>
 
   <body>

static/js/index.js

@@ -9,6 +9,9 @@ import * as childProcess from 'child_process'
 const { shell, remote } = electron
 const { app } = remote
 
+const Menu = remote.Menu;
+const MenuItem = remote.MenuItem;
+
 
 // A default configuration (actually, it is supported
 // only a Terminal :) )
@@ -43,26 +46,98 @@ function rewriteConfiguration(config) {
   fs.writeFileSync(qianFile, JSON.stringify(config))
 }
 
+const configObj = getConfigObject(defaultConfig)
+const homePath = path.resolve(app.getPath('home'));
 
 // Define the flag to be passed to the Elm Program
 const flags = {
-  current: path.resolve("."),
-  config: getConfigObject(defaultConfig),
-  home: path.resolve(app.getPath('home')),
+  current: homePath,
+  config: configObj,
+  home: homePath,
   root: '/'
 }
 
 // Initialize the Elm behaviour
 const container = document.getElementById('app');
 const elmApp = elm.Main.embed(container, flags);
 
+// Application
+
+
+function openInTerminal(app, dir) {
+  childProcess.spawn('open', ['-a', app, dir])
+}
+
 // Ports to Elm Application
 
 let watcher // the file Watcher
+let currentTree = homePath;
+
+const template =
+  [
+    {
+      label: 'qian',
+      submenu: [{role: 'about'}, {role: 'quit'}]
+    },
+    {
+      label: 'Shortcuts',
+      submenu: [
+        {
+          label: 'Pred',
+          accelerator: 'CmdOrCtrl+Left',
+          click: function(item, focusedWindow) {
+            if (focusedWindow) {
+              elmApp.ports.historyNavigation.send(true)
+            }
+          }
+        },
+        {
+          label: 'Next',
+          accelerator: 'CmdOrCtrl+Right',
+          click: function(item, focusedWindow) {
+            if (focusedWindow) {
+              elmApp.ports.historyNavigation.send(false)
+            }
+          }
+        },
+        {
+          label: 'Parent',
+          accelerator: 'CmdOrCtrl+Up',
+          click: function(item, focusedWindow) {
+            if (focusedWindow) {
+              elmApp.ports.jumpToParent.send(true)
+            }
+          }
+        },
+        {
+          label: 'Open in finder',
+          accelerator: 'CmdOrCtrl+Alt+enter',
+          click: function(item, focusedWindow) {
+            if (focusedWindow) {
+              shell.showItemInFolder(currentTree)
+            }
+          }
+        },
+        {
+          label: 'Open in Terminal',
+          accelerator: 'CmdOrCtrl+enter',
+          click: function(item, focusedWindow) {
+            if (focusedWindow) {
+              openInTerminal(configObj.terminal, currentTree)
+            }
+          }
+        }
+      ]
+    }
+  ];
+
+const menu = Menu.buildFromTemplate(template)
+Menu.setApplicationMenu(menu)
 
 // Watch and get treeFile
 elmApp.ports.getTree.subscribe((pwd) => {
   const dir = path.resolve(pwd)
+  currentTree = dir;
   const tree = fs.readdirSync(dir).map((entry) => {
     const completePath = path.join(dir, entry)
     return {
@@ -97,7 +172,7 @@ elmApp.ports.openInFinder.subscribe((pwd) => {
 
 elmApp.ports.openInTerminal.subscribe((input) => {
   const dir = path.resolve(input.path)
-  childProcess.spawn('open', ['-a', input.app, dir])
+  openInTerminal(input.app, dir)
 });
 
 elmApp.ports.changeTerminal.subscribe((config) => {