diff --git a/Makefile b/Makefile index b2802f1..2a6a0c3 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ NC=\033[0m coffees= src/core/core.coffee\ src/core/api.coffee\ - src/core/handlers/InBrowserHandler.coffee\ + src/core/handlers/TestHandler.coffee\ src/core/gui.coffee\ src/core/BaseModel.coffee\ src/core/BaseApplication.coffee\ @@ -30,7 +30,7 @@ lite: build_coffee build_tag build_theme schemes build_services build_packages # coffee --compile $< build_coffees: - @echo "$(BLUE)=======Building coffee files=======$(NC)" + @echo "$(BLUE)Building coffee files$(NC)" - mkdir $(BUILDDIR)/scripts - rm $(BUILDDIR)/scripts/antos.js for f in $(coffees); do (cat "$${f}"; echo) >> $(BUILDDIR)/scripts/antos.coffee; done @@ -39,16 +39,20 @@ build_coffees: libs: - @echo "$(BLUE)=======Copy lib files=======$(NC)" + @echo "$(BLUE)Copy lib files$(NC)" cp -rf src/libs/* $(BUILDDIR)/scripts/ schemes: - @echo "$(BLUE)=======Copy schemes files======= $(NC)" + @echo "$(BLUE)Copy schemes files$(NC)" - mkdir -p $(BUILDDIR)/resources/schemes cp src/core/schemes/* $(BUILDDIR)/resources/schemes/ - + +testdata: + @echo "$(BLUE)Copy JSON test files$(NC)" + - mkdir -p $(BUILDDIR)/resources/jsons + cp src/core/handlers/jsons/* $(BUILDDIR)/resources/jsons build_tags: - @echo "=======$(BLUE)Building tag files=======$(NC)" + @echo "$(BLUE)Building tag files$(NC)" -mkdir $(BUILDDIR)/resources -rm $(BUILDDIR)/resources/antos_tags.js for f in src/core/tags/*; do (cat "$${f}"; echo) >> $(BUILDDIR)/resources/antos_tags.js; done @@ -57,7 +61,7 @@ build_themes: antos_themes_build antos_themes_build: - @echo "=======$(BLUE)Building themes name: antos=======$(NC)" + @echo "$(BLUE)Building themes name: antos$(NC)" -rm -rf $(BUILDDIR)/resources/themes/antos/* -mkdir -p $(BUILDDIR)/resources/themes/antos for f in src/themes/antos/*.css; do (cat "$${f}"; echo) >> $(BUILDDIR)/resources/themes/antos/antos.css;done @@ -67,7 +71,7 @@ antos_themes_build: build_services: - @echo "=======$(BLUE)Building services=======$(NC)" + @echo "$(BLUE)Building services$(NC)" -mkdir -p $(BUILDDIR)/services -rm -rf $(BUILDDIR)/services/* for f in $(services); do (coffee -cs < "src/services/$$f.coffee" >$(BUILDDIR)/services/"$$f.js");done diff --git a/src/core/BaseApplication.coffee b/src/core/BaseApplication.coffee index 77495fc..906cfaf 100644 --- a/src/core/BaseApplication.coffee +++ b/src/core/BaseApplication.coffee @@ -20,7 +20,7 @@ class BaseApplication extends this.OS.GUI.BaseModel me.dialog.hide() if me.dialog @on "menuselect", (d) -> switch d.e.item.data.dataid - when "#{me.name}-about" then alert "About " + me.pid + me.name + when "#{me.name}-about" then me.openDialog "AboutDialog", ()-> when "#{me.name}-exit" then me.trigger "exit" #now load the scheme path = "packages/#{@name}/scheme.html" diff --git a/src/core/BaseDialog.coffee b/src/core/BaseDialog.coffee index 5ed47c5..30a87dc 100644 --- a/src/core/BaseDialog.coffee +++ b/src/core/BaseDialog.coffee @@ -12,6 +12,8 @@ class BaseDialog extends this.OS.GUI.BaseModel @parent.dialog = undefined if @parent ($ @scheme).remove() if @scheme @dialog.quit() if @dialog + init: () -> + main: () -> meta: () -> @parent.meta() show: () -> @@ -40,7 +42,9 @@ this.OS.GUI.BaseDialog = BaseDialog class BasicDialog extends BaseDialog constructor: ( name, @conf ) -> super name - html = " + + init: () -> + html = " " html += "<#{@conf.tag} data-id = 'content'>" html += "
" @@ -109,4 +113,24 @@ class ColorPickerDialog extends BasicDialog } ] } -this.OS.register "ColorPickerDialog", ColorPickerDialog \ No newline at end of file +this.OS.register "ColorPickerDialog", ColorPickerDialog + +class AboutDialog extends BaseDialog + constructor: () -> + super "AboutDialog" + + init: () -> + @render "resources/schemes/about.html" + + main: () -> + mt = @meta() + @scheme.set "apptitle", "About: #{mt.name}" + (@find "mylabel").set "*", {icon:mt.icon, iconclass:mt.iconclass, text:"#{mt.name}(v#{mt.version})"} + ($ @find "mydesc").html mt.description + # grid data for author info + return unless mt.info + rows = [] + rows.push [ { value: k }, { value: v } ] for k, v of mt.info + (@find "mygrid").set "rows", rows + +this.OS.register "AboutDialog", AboutDialog \ No newline at end of file diff --git a/src/core/BaseModel.coffee b/src/core/BaseModel.coffee index 89a7b8b..9025d4a 100644 --- a/src/core/BaseModel.coffee +++ b/src/core/BaseModel.coffee @@ -22,6 +22,7 @@ class BaseModel #implement by sub class onexit: (e) -> #implement by subclass + one: (e, f) -> @observable.one e, f on: (e, f) -> @observable.on e, f trigger: (e, d) -> @observable.trigger e, d @@ -39,6 +40,7 @@ class BaseModel @dialog.parent = @ @dialog.handler = f @dialog.pid = @pid + @dialog.init() publish: (t, m) -> mt = @meta() diff --git a/src/core/api.coffee b/src/core/api.coffee index 339ddf4..d3d0226 100644 --- a/src/core/api.coffee +++ b/src/core/api.coffee @@ -1,22 +1,56 @@ -self.OS.API = +self.OS.API = # the handler object could be a any remote or local handle to # fetch user data, used by the API to make requests # handlers are defined in /src/handlers - handler: new Object() - + handler: {} + VFS: + scandir: (p, c, f) -> + _API.handler.request "scandir", { path: p }, c, f #request a user data - request: (query, callback) -> - # definition here - handle.request query, callback + post: (p, d, c, f) -> + q = _courrier.getMID() + _API.loading q, p + $.ajax { + type: "POST", + url: p, + data: d, + success: null, + dataType: 'json' + } + .done (data) -> + _API.loaded q, p, "OK" + c(data) + .fail (e, s) -> + _API.loaded q, p, "FAIL" + f(e, s) systemConfig: -> _API.request 'config', (result) -> console.log result - + loading: (q, p) -> + _courrier.trigger "loading", { id: q, data: { m: "#{p}", s: true }, name: "OS" } + loaded: (q, p, m ) -> + _courrier.trigger "loaded", { id: q, data: { m: "#{m}: #{p}", s: false }, name: "OS" } get: (p, c, f) -> + q = _courrier.getMID() + _API.loading q, p $.get p - .done (data) -> c(data) - .fail -> f() + .done (data) -> + _API.loaded q, p, "OK" + c(data) + .fail (e, s) -> + _API.loaded q, p, "FAIL" + f(e, s) + script: (p, c, f) -> + q = _courrier.getMID() + _API.loading q, p + $.getScript p + .done (data) -> + _API.loaded q, p, "OK" + c(data) + .fail (e, s) -> + _API.loaded q, p, "FAIL" + f(e, s) resource: (resource, callback) -> path = "resources/#{resource}" _API.get path, callback diff --git a/src/core/core.coffee b/src/core/core.coffee index a664256..955c373 100644 --- a/src/core/core.coffee +++ b/src/core/core.coffee @@ -8,6 +8,7 @@ self.OS or= courrier: observable: riot.observable() + quota: 0 listeners: new Object on: (e, f, a) -> _courrier.listeners[a.pid] = [] unless _courrier.listeners[a.pid] @@ -19,6 +20,9 @@ self.OS or= _courrier.observable.off i.e, i.f for i in _courrier.listeners[app.pid] delete _courrier.listeners[app.pid] _courrier.listeners[app.pid] = [] + getMID: () -> + _courrier.quota += 1 + _courrier.quota register: (name, x) -> if x.type is 3 then self.OS.GUI.dialog[name] = x else _APP[name] = x diff --git a/src/core/gui.coffee b/src/core/gui.coffee index f86b3e3..6350fed 100644 --- a/src/core/gui.coffee +++ b/src/core/gui.coffee @@ -17,13 +17,12 @@ self.OS.GUI = (x) -> return null unless x _GUI.htmlToScheme x, app, parent - , (f) -> + , (e, s) -> _courrier.trigger "fail", {id: 0, data: { m: "Cannot load scheme file: #{path} for #{app.name} (#{app.pid})",e: e, s: s }, name:"OS" } - alert "cannot load scheme" loadTheme: (name) -> path = "resources/themes/#{name}/#{name}.css" @@ -40,10 +39,10 @@ self.OS.GUI = pushService: (srv) -> return _PM.createProcess srv, _APP[srv] if _APP[srv] path = "services/#{srv}.js" - $.getScript path - .done (e, s) -> + _API.script path, + (d) -> _PM.createProcess srv, _APP[srv] - .fail (e, s) -> + , (e, s) -> _courrier.trigger "srvroutineready", srv _courrier.trigger "fail", { id:0,data:{m: "Cannot read service script: #{srv} ", e: e, s: s }, @@ -53,12 +52,14 @@ self.OS.GUI = if not _APP[app] # first load it path = "packages/#{app}/" - $.getScript path + "main.js" - .done (e, s) -> + _API.script path + "main.js", + (d) -> #load css file - $.get "#{path}main.css", () -> - $ '', { rel: 'stylesheet', type: 'text/css', 'href': "#{path}main.css" } - .appendTo 'head' + _API.get "#{path}main.css", + () -> + $ '', { rel: 'stylesheet', type: 'text/css', 'href': "#{path}main.css" } + .appendTo 'head' + , () -> #launch if _APP[app] # load app meta data @@ -66,12 +67,11 @@ self.OS.GUI = (data) -> _APP[app].meta = data _PM.createProcess app, _APP[app] - console.log "Fist time loading " + app , (e, s) -> _courrier.trigger "fail", {id:0, data:{ m: "Cannot read application metadata: #{app} ",e: e, s: s }, name:"OS"} alert "cannot read application, meta-data" - .fail (e,s) -> + , (e, s) -> #BUG report here _courrier.trigger "fail", {id :0, data:{m: "Cannot load application script: #{app}", @@ -81,23 +81,24 @@ self.OS.GUI = # now launch it if _APP[app] _PM.createProcess app, _APP[app] - dock: (app,meta) -> + dock: (app, meta) -> # dock an application to a dock # create a data object data = icon: null iconclass: meta.iconclass || "" - app:app - onbtclick: () -> - app.toggle() + app: app + onbtclick: () -> app.toggle() data.icon = "packages/#{meta.app}/#{meta.icon}" if meta.icon + # TODO: add default app icon class in system setting + # so that it can be themed data.iconclass = "fa fa-cogs" if (not meta.icon) and (not meta.iconclass) dock = $ "#sysdock" - dock.get(0).newapp data - app.sysdock = dock.get(0) - app.appmenu = ($ "[data-id = 'appmenu']", "#syspanel")[0] + app.one "rendered", () -> + dock.get(0).newapp data + app.sysdock = dock.get(0) + app.appmenu = ($ "[data-id = 'appmenu']", "#syspanel")[0] app.init() - #app.show() -- notwork, sice the scheme is not loaded yet undock: (app) -> ($ "#sysdock").get(0).removeapp app @@ -112,7 +113,6 @@ self.OS.GUI = if e.contextmenuHandler e.contextmenuHandler event, ($ "#contextmenu")[0] else - #console.log ($ "#workspace").get(0), ($ e).parent().get(0) p = $(e).parent().get(0) handler p if p isnt ($ "#workspace").get(0) handler event.target diff --git a/src/core/handlers/InBrowserHandler.coffee b/src/core/handlers/InBrowserHandler.coffee deleted file mode 100644 index a37b57d..0000000 --- a/src/core/handlers/InBrowserHandler.coffee +++ /dev/null @@ -1,3 +0,0 @@ -self.OS.API.handler = - request: ( query ) -> - $.ajax {} \ No newline at end of file diff --git a/src/core/handlers/TestHandler.coffee b/src/core/handlers/TestHandler.coffee new file mode 100644 index 0000000..b8bd5c7 --- /dev/null +++ b/src/core/handlers/TestHandler.coffee @@ -0,0 +1,8 @@ +self.OS.API.handler = + request: ( p, d, c, f) -> + path = switch p + when 'scandir' then 'resources/jsons/scandir.json' + else undefined + return unless path + _API.get path, c, f + \ No newline at end of file diff --git a/src/core/handlers/jsons/scandir.json b/src/core/handlers/jsons/scandir.json new file mode 100644 index 0000000..249adfc --- /dev/null +++ b/src/core/handlers/jsons/scandir.json @@ -0,0 +1,324 @@ +{ + "result": [ + { + "permissions": " (755)", + "type": "dir", + "mtime": "2017-07-23T22:53:10", + "size": 102, + "path": "home:////.desktop", + "ctime": "2017-07-23T22:53:10", + "filename": ".desktop", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": true + }, + "group": { + "write": false, + "read": true, + "exec": true + }, + "other": { + "write": false, + "read": true, + "exec": true + } + }, + "mime": "", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (644)", + "type": "file", + "mtime": "2017-07-23T22:51:57", + "size": 6148, + "path": "home:////.DS_Store", + "ctime": "2017-07-23T22:51:57", + "filename": ".DS_Store", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": false + }, + "group": { + "write": false, + "read": true, + "exec": false + }, + "other": { + "write": false, + "read": true, + "exec": false + } + }, + "mime": "application/octet-stream", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (755)", + "type": "dir", + "mtime": "2017-07-23T21:45:59", + "size": 68, + "path": "home:////.packages", + "ctime": "2017-07-23T21:45:59", + "filename": ".packages", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": true + }, + "group": { + "write": false, + "read": true, + "exec": true + }, + "other": { + "write": false, + "read": true, + "exec": true + } + }, + "mime": "", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (644)", + "type": "file", + "mtime": "2017-07-30T00:55:34", + "size": 2821, + "path": "home:////.settings.json", + "ctime": "2017-07-30T00:55:34", + "filename": ".settings.json", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": false + }, + "group": { + "write": false, + "read": true, + "exec": false + }, + "other": { + "write": false, + "read": true, + "exec": false + } + }, + "mime": "application/json", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (644)", + "type": "file", + "mtime": "2017-07-11T20:30:51", + "size": 575, + "path": "home:////helloworld.xml", + "ctime": "2017-07-11T20:30:51", + "filename": "helloworld.xml", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": false + }, + "group": { + "write": false, + "read": true, + "exec": false + }, + "other": { + "write": false, + "read": true, + "exec": false + } + }, + "mime": "application/xml", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (644)", + "type": "file", + "mtime": "2017-05-15T14:47:59", + "size": 4420074, + "path": "home:////Last Reunion - Peter Roe.mp3", + "ctime": "2017-07-11T21:27:28", + "filename": "Last Reunion - Peter Roe.mp3", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": false + }, + "group": { + "write": false, + "read": true, + "exec": false + }, + "other": { + "write": false, + "read": true, + "exec": false + } + }, + "mime": "audio/mpeg", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (644)", + "type": "file", + "mtime": "2016-05-07T15:45:47", + "size": 3409596, + "path": "home:////Nobody Home.mp3", + "ctime": "2017-07-11T21:33:26", + "filename": "Nobody Home.mp3", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": false + }, + "group": { + "write": false, + "read": true, + "exec": false + }, + "other": { + "write": false, + "read": true, + "exec": false + } + }, + "mime": "audio/mpeg", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (644)", + "type": "file", + "mtime": "2014-03-28T18:15:53", + "size": 1953, + "path": "home:////opencvcurl.cpp", + "ctime": "2017-07-23T13:39:31", + "filename": "opencvcurl.cpp", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": false + }, + "group": { + "write": false, + "read": true, + "exec": false + }, + "other": { + "write": false, + "read": true, + "exec": false + } + }, + "mime": "text/cpp", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (755)", + "type": "dir", + "mtime": "2017-07-11T20:27:40", + "size": 68, + "path": "home:////Public", + "ctime": "2017-07-11T20:27:40", + "filename": "Public", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": true + }, + "group": { + "write": false, + "read": true, + "exec": true + }, + "other": { + "write": false, + "read": true, + "exec": true + } + }, + "mime": "", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (644)", + "type": "file", + "mtime": "2017-07-11T20:31:04", + "size": 69, + "path": "home:////test.lua", + "ctime": "2017-07-11T20:31:04", + "filename": "test.lua", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": false + }, + "group": { + "write": false, + "read": true, + "exec": false + }, + "other": { + "write": false, + "read": true, + "exec": false + } + }, + "mime": "text/lua", + "uid": 501, + "gid": 20 + }, + { + "permissions": " (644)", + "type": "file", + "mtime": "2016-08-01T14:54:34", + "size": 3974373, + "path": "home:////The sound of silence.mp3", + "ctime": "2017-07-11T20:29:04", + "filename": "The sound of silence.mp3", + "perm": { + "owner": { + "write": true, + "read": true, + "exec": false + }, + "group": { + "write": false, + "read": true, + "exec": false + }, + "other": { + "write": false, + "read": true, + "exec": false + } + }, + "mime": "audio/mpeg", + "uid": 501, + "gid": 20 + } + ], + "error": false +} diff --git a/src/core/schemes/about.html b/src/core/schemes/about.html new file mode 100644 index 0000000..ad8bc6f --- /dev/null +++ b/src/core/schemes/about.html @@ -0,0 +1,11 @@ + + +
+

+ +

+

+
+ + + \ No newline at end of file diff --git a/src/core/schemes/notifications.html b/src/core/schemes/notifications.html index b1e3ede..e27ed3c 100644 --- a/src/core/schemes/notifications.html +++ b/src/core/schemes/notifications.html @@ -29,16 +29,30 @@ } - - + + + - + \ No newline at end of file diff --git a/src/core/tags/afx-button.js b/src/core/tags/afx-button.js index dbc9849..ce41c71 100644 --- a/src/core/tags/afx-button.js +++ b/src/core/tags/afx-button.js @@ -1,13 +1,12 @@ - \ No newline at end of file diff --git a/src/core/tags/afx-file-view.js b/src/core/tags/afx-file-view.js index f3be14a..46b1edb 100644 --- a/src/core/tags/afx-file-view.js +++ b/src/core/tags/afx-file-view.js @@ -1,13 +1,18 @@ - - - - + + + +
\ No newline at end of file diff --git a/src/core/tags/afx-grid-view.js b/src/core/tags/afx-grid-view.js index 12b9c9e..32f56ee 100644 --- a/src/core/tags/afx-grid-view.js +++ b/src/core/tags/afx-grid-view.js @@ -1,5 +1,5 @@ - +
@@ -12,6 +12,8 @@ this.rid = $(self.root).attr("data-id") || Math.floor(Math.random() * 100000) + 1 self.selidx = -1 self.nrow = 0 + self.ongridselect = opts.ongridselect + self.root.observable = opts.observable self.root.set = function(k,v) { if(k == "selected") @@ -43,16 +45,16 @@ return self[k] } - this.root.observable = opts.observable || riot.observable() - this.on("mount", function(){ + if(self.refs.gridhead) + self.refs.gridhead.observable = self.root.observable $(self.refs.container) .css("display","table") //.css("flex-direction","column") .css("width","100%") self.calibrate_size() - this.root.observable.on("resize",function(){ + self.root.observable.on("resize",function(){ self.calibrate_size() }) }) @@ -68,13 +70,13 @@ var data = { id:self.rid, data:event.item} - if(opts.onlistselect) - opts.onlistselect(data) + if(self.ongridselect) + self.ongridselect(data) if(self.selidx != -1) self.rows[self.selidx].selected =false self.selidx = event.item.i self.rows[self.selidx].selected = true - this.root.observable.trigger('gridselect',data) + self.root.observable.trigger('gridselect',data) event.preventUpdate = true self.update() //event.preventDefault() @@ -85,18 +87,16 @@
- - - {child.value} +
+ \ No newline at end of file diff --git a/src/core/tags/afx-list-view.js b/src/core/tags/afx-list-view.js index eefa95e..bb2a0c7 100644 --- a/src/core/tags/afx-list-view.js +++ b/src/core/tags/afx-list-view.js @@ -4,19 +4,18 @@
  • - - - { item.text } +
+ \ No newline at end of file diff --git a/src/core/tags/afx-sys-panel.js b/src/core/tags/afx-sys-panel.js index e669ca7..5730915 100644 --- a/src/core/tags/afx-sys-panel.js +++ b/src/core/tags/afx-sys-panel.js @@ -14,7 +14,8 @@ {text:"wTerm",type:"app"}, {text:"NotePad",type:"app", iconclass:"fa fa-commenting"}, {text:"ActivityMonitor",type:"app"}, - {text:"DummyApp",type:"app"} + {text:"DummyApp",type:"app"}, + {text:"Files",type:"app"} ], onmenuselect: function(d) { diff --git a/src/packages/ActivityMonitor/package.json b/src/packages/ActivityMonitor/package.json index 4e7e188..fa72f40 100644 --- a/src/packages/ActivityMonitor/package.json +++ b/src/packages/ActivityMonitor/package.json @@ -2,10 +2,11 @@ "app":"ActivityMonitor", "name":"Activity monitor", "description":"Processes monitor and manager", - "author":{ - "name": "Xuan Sang LE", + "info":{ + "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, + "version":"0.1a", "category":"System", "iconclass":"fa fa-heartbeat", "mimes":["*"] diff --git a/src/packages/DummyApp/package.json b/src/packages/DummyApp/package.json index dfcb433..fddc6e2 100644 --- a/src/packages/DummyApp/package.json +++ b/src/packages/DummyApp/package.json @@ -2,10 +2,13 @@ "app":"DummyApp", "name":"DummyApp", "description":"App for test", - "author":{ - "name": "Xuan Sang LE", - "email": "xsang.le@gmail.com" + "info":{ + "author": "Xuan Sang LE", + "email": "xsang.le@gmail.com", + "credit": "dedicated to some one here", + "licences": "MIT" }, + "version":"0.1a", "category":"System", "iconclass":"fa fa-user-circle-o", "mimes":["*"] diff --git a/src/packages/DummyApp/scheme.html b/src/packages/DummyApp/scheme.html index 8ffc815..7e097ed 100644 --- a/src/packages/DummyApp/scheme.html +++ b/src/packages/DummyApp/scheme.html @@ -2,8 +2,8 @@ - - + + diff --git a/src/packages/Files/main.coffee b/src/packages/Files/main.coffee index 3069360..f819d55 100644 --- a/src/packages/Files/main.coffee +++ b/src/packages/Files/main.coffee @@ -1,4 +1,3 @@ -_GUI = this.OS.GUI class Files extends this.OS.GUI.BaseApplication constructor: () -> super "Files" @@ -10,8 +9,52 @@ class Files extends this.OS.GUI.BaseApplication mdata = [ { text: " Child 1" }, { text: "child2", child: [{text: "sub child", child:[{text:"sub sub child"}] }]}] m.set "items", mdata m.show(e) + @on "fileselect", (d) -> console.log d + #load home directory + @_api.VFS.scandir 'home:///', + (d) -> + me.view.set "data", d.result + , (e, s) -> + alert "cannot open dir" - samples: () -> - + menu: () -> + me = @ + menu = [ + { + text: "File", + child: [ + { text: "New file", dataid: "#{@name}-mkf" }, + { text: "New folder", dataid: "#{@name}-mkdir" }, + { text: "Upload", dataid: "#{@name}-upload" } + ] + }, + { + text: "Edit", + child: [ + { text: "Rename", dataid: "#{@name}-mv" }, + { text: "Delete", dataid: "#{@name}-rm" }, + { text: "Information", dataid: "#{@name}-info" }, + { text: "Open with", dataid: "#{@name}-open" }, + { text: "Download", dataid: "#{@name}-download" }, + ] + }, + { + text: "View", + child: [ + { text: "Refresh", dataid: "#{@name}-refresh" }, + { text: "Sidebar", dataid: "#{@name}-side" }, + { text: "Navigation bar", dataid: "#{@name}-nav" }, + { text: "Hidden files", dataid: "#{@name}-hidden" }, + { text: "Type", child: [ + { text: "Icon view", dataid: "#{@name}-icon", type: 'icon' }, + { text: "List view", dataid: "#{@name}-list", type: 'list' }, + { text: "Tree view", dataid: "#{@name}-tree", type: 'tree' } + ], onmenuselect: (e) -> + me.view.set 'view', e.item.data.type + }, + ] + }, + ] + menu this.OS.register "Files",Files \ No newline at end of file diff --git a/src/packages/Files/package.json b/src/packages/Files/package.json index a3b1239..03a28d5 100644 --- a/src/packages/Files/package.json +++ b/src/packages/Files/package.json @@ -2,11 +2,12 @@ "app":"Files", "name":"Files manager", "description":"System files manager", - "author":{ - "name": "Xuan Sang LE", + "info":{ + "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, + "version":"0.1a", "category":"System", - "iconclass":"fa fa-archive", + "iconclass":"fa fa-hdd-o", "mimes":["*"] } \ No newline at end of file diff --git a/src/packages/Files/scheme.html b/src/packages/Files/scheme.html index 64dc595..acc4773 100644 --- a/src/packages/Files/scheme.html +++ b/src/packages/Files/scheme.html @@ -1,4 +1,4 @@ - + diff --git a/src/packages/NotePad/package.json b/src/packages/NotePad/package.json index 7223d3b..8119eaa 100644 --- a/src/packages/NotePad/package.json +++ b/src/packages/NotePad/package.json @@ -2,10 +2,11 @@ "app":"NotePad", "name":"NotePad editor", "description":"Basic application for text editing", - "author":{ - "name": "Xuan Sang LE", + "info":{ + "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, + "version":"0.1a", "category":"System", "iconclass":"fa fa-pencil-square-o", "mimes":["*"] diff --git a/src/packages/wTerm/package.json b/src/packages/wTerm/package.json index 579b446..9862bd5 100644 --- a/src/packages/wTerm/package.json +++ b/src/packages/wTerm/package.json @@ -2,10 +2,11 @@ "app":"wTerm", "name":"Unix terminal like", "description":"Access Unix terminal from web", - "author":{ - "name": "Xuan Sang LE", + "info":{ + "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, + "version":"0.1a", "category":"System", "iconclass":"fa fa-terminal", "mimes":["*"] diff --git a/src/services/Calendar.coffee b/src/services/Calendar.coffee index 270ff2e..1abf788 100644 --- a/src/services/Calendar.coffee +++ b/src/services/Calendar.coffee @@ -12,9 +12,9 @@ class Calendar extends this.OS.GUI.BaseService me.text = "#{now.getDate()}/#{(now.getMonth()+1)}/#{now.getFullYear()} " + "#{now.getHours()}:#{now.getMinutes()}:#{now.getSeconds()}" me.update() - + awake: (e) -> - @.openDialog "CalendarDialog", (d) -> + @.openDialog "CalendarDialog", (d) -> console.log d # do nothing cleanup: (evt) -> console.log "cleanup for quit" diff --git a/src/services/PushNotification.coffee b/src/services/PushNotification.coffee index be43ebb..73cc6d9 100644 --- a/src/services/PushNotification.coffee +++ b/src/services/PushNotification.coffee @@ -1,33 +1,55 @@ class PushNotification extends this.OS.GUI.BaseService constructor: () -> super "PushNotification" - @iconclass = "fa fa-commenting" + @iconclass = "fa fa-bars" @onmenuselect = (e) -> console.log e @cb = undefined - + @pending = [] init: -> @view = false path = "resources/schemes/notifications.html" @render path + spin: (b) -> + if b and @iconclass is "fa fa-bars" + @iconclass = "fa fa-spinner fa-spin" + @update() + else if not b and @iconclass is "fa fa-spinner fa-spin" + @iconclass = "fa fa-bars" + @update() + main: -> me = @ @mlist = @find "notifylist" @mfeed = @find "notifeed" @nzone = @find "notifyzone" + @fzone = @find "feedzone" (@find "btclear").set "onbtclick", (e) -> me.mlist.set "items", [] #mlist.set "onlistselect", (e) -> console.log e @subscribe "notification", (o) -> me.pushout 'INFO', o @subscribe "fail", (o) -> me.pushout 'FAIL', o @subscribe "error", (o) -> me.pushout 'ERROR', o + + @subscribe "loading", (o) -> + me.pending.push o.id + me.spin true + @subscribe "loaded", (o) -> + i = me.pending.indexOf o.id + me.pending.splice i, 1 if i >= 0 + me.spin false if me.pending.length is 0 + ($ @nzone).css "right", 0 .css "top", "-3px" .css "height", "" .css "bottom", "0" + .css "z-index", 1000000 + .hide() + ($ @fzone) + #.css("z-index", 99999) + .css("bottom", "0") + .css("height", "") .hide() - ($ @mfeed).css "right", "5px" - .css "top", "0" pushout: (s, o, mfeed) -> d = { @@ -35,19 +57,13 @@ class PushNotification extends this.OS.GUI.BaseService icon: o.data.icon, iconclass: o.data.iconclass, closable: true } - d1 = { - header: "#{o.name} (#{o.id})" - text: "#{s}: #{o.data.m}", - icon: o.data.icon, - iconclass: o.data.iconclass, - closable: true } - @mlist.push d, true - @notifeed d1 + @mlist.unshift d, true + @notifeed d notifeed: (d) -> me = @ - @mfeed.push d, true - ($ @mfeed).show() + @mfeed.unshift d, true + ($ @fzone).show() timer = setTimeout () -> me.mfeed.remove d, true clearTimeout timer @@ -59,7 +75,7 @@ class PushNotification extends this.OS.GUI.BaseService me = @ if not @cb @cb = (e) -> - return if e.originalEvent.item and e.originalEvent.item.closable + return if e.originalEvent.item and e.originalEvent.item.i isnt undefined if not ($ e.target).closest($ me.nzone).length and not ($ e.target).closest($ me.holder.root).length ($ me.nzone).hide() $(document).unbind "click", me.cb diff --git a/src/themes/antos/afx-feed.css b/src/themes/antos/afx-feed.css deleted file mode 100644 index 7a28d0e..0000000 --- a/src/themes/antos/afx-feed.css +++ /dev/null @@ -1,44 +0,0 @@ -afx-feed { - width: 100%; -} - -afx-feed > div{ - border:1px solid #a6a6a6; - border-radius: 6px; - background-color: #e9e9e9; -} - -afx-feed > div > p{ - padding:2px; - padding-top: 0; - padding-left: 5px; - margin: 0; - font-weight: bold; - border-bottom: 1px solid #a6a6a6; - position: relative; -} -afx-feed i.closable{ - width: 16px; - height: 16px; - display: inline-block; - cursor: pointer; -} -afx-feed i.closable:before{ - content: "\f00d"; - font-family: "FontAwesome"; - font-size: 10px; - right:5px; - color: #414339; - position:absolute; - font-style: normal; - top:5px; -} -afx-feed > div > div{ - background-color: white; - padding:5px; - border-radius: 6px; -} -afx-feed > div > div > p{ - padding:0; - margin: 0; -} \ No newline at end of file diff --git a/src/themes/antos/afx-file-view.css b/src/themes/antos/afx-file-view.css new file mode 100644 index 0000000..3c8471c --- /dev/null +++ b/src/themes/antos/afx-file-view.css @@ -0,0 +1,87 @@ +afx-file-view { + position: relative; +} +afx-file-view div.status{ + position: absolute; + bottom: 0px; + left:0px; + padding:3px; + right: 0px; + height: 15px; + background-color: #dfdfdf; + border-top: 1px solid #a6A6a6; +} +afx-file-view afx-list-view li{ + float:left; + display: block; + width:70px; + height: 60px; + background-color: transparent; + text-align: center; + padding:3px; + margin-right: 5px; + margin-bottom: 5px; +} +afx-file-view afx-list-view li:nth-child(odd){ + background-color: transparent; +} +afx-file-view afx-list-view i.afx-dir:before{ + content: "\f07b"; + font-family: "FontAwesome"; + font-size: 32px; + color: #414339; + font-weight: normal; + font-style: normal; +} +afx-file-view afx-list-view i{ + width: 32px; + height: 32px; + display: block; + margin-left: 19px; +} + + +afx-file-view afx-list-view i.afx-file:before{ + content: "\f016"; + font-family: "FontAwesome"; + font-size: 28px; + color: #414339; + font-style: normal; + font-weight: normal; +} + +afx-file-view afx-list-view li.selected, afx-file-view afx-list-view li.selected i:before { + background-color: #116cd6; + color:white; + border-radius: 6px; +} + +afx-file-view afx-grid-view i.afx-file:before{ + content: "\f016"; + font-family: "FontAwesome"; + font-size: 16px; + color: #414339; + font-style: normal; + font-weight: normal; +} +afx-file-view afx-grid-view i.afx-dir:before{ + content: "\f07b"; + font-family: "FontAwesome"; + font-size: 16px; + color: #414339; + font-style: normal; + font-weight: normal; +} +afx-file-view afx-grid-view i{ + display: inline-block; + margin-right: 5px; +} +afx-file-view afx-grid-view afx-grid-row.selected i:before{ + color:white; +} +afx-file-view afx-grid-view afx-grid-row.grid_row_header{ + background-color: #dfdfdf; +} +afx-file-view afx-grid-view afx-grid-row.grid_row_header div{ + border: 1px solid #a6a6a6; +} \ No newline at end of file diff --git a/src/themes/antos/afx-grid-view.css b/src/themes/antos/afx-grid-view.css index e2bb3a7..5a3c206 100644 --- a/src/themes/antos/afx-grid-view.css +++ b/src/themes/antos/afx-grid-view.css @@ -7,6 +7,9 @@ afx-grid-view afx-grid-row div{ padding:3px; padding-left: 5px; padding-right: 5px; + user-select:none; + -webkit-user-select:none; + cursor:default; } afx-grid-view afx-grid-row:nth-child(even){ @@ -15,13 +18,9 @@ afx-grid-view afx-grid-row:nth-child(even){ afx-grid-view afx-grid-row.grid_row_header div{ border-right: 2px solid #e5e5e5; -} - -afx-grid-view afx-grid-row i.icon-style { - width: 16px; - height: 16px; - display: inline-block; - float:left; + user-select:none; + -webkit-user-select:none; + cursor:default; } afx-grid-view afx-grid-row.selected { background-color: #116cd6; diff --git a/src/themes/antos/afx-label.css b/src/themes/antos/afx-label.css new file mode 100644 index 0000000..749f66d --- /dev/null +++ b/src/themes/antos/afx-label.css @@ -0,0 +1,6 @@ +afx-label i.icon-style { + width: 16px; + height: 16px; + display: inline-block; + float:left; +} \ No newline at end of file diff --git a/src/themes/antos/afx-list-view.css b/src/themes/antos/afx-list-view.css index a00d093..c8ed698 100644 --- a/src/themes/antos/afx-list-view.css +++ b/src/themes/antos/afx-list-view.css @@ -1,6 +1,7 @@ afx-list-view{ overflow:auto; padding: 5px; + display: block; } /* afx-list-view div.list-container{ @@ -29,12 +30,6 @@ afx-list-view li{ afx-list-view li:nth-child(odd){ background-color: #f5F5F5; } -afx-list-view i.icon-style { - width: 16px; - height: 16px; - display: inline-block; - float:left; -} afx-list-view i.closable{ width: 16px; height: 16px; diff --git a/src/themes/antos/afx-menu.css b/src/themes/antos/afx-menu.css index 55d5830..5fb124b 100644 --- a/src/themes/antos/afx-menu.css +++ b/src/themes/antos/afx-menu.css @@ -15,12 +15,6 @@ afx-menu ul{ padding:0; margin: 0; } -afx-menu i.icon-style { - width: 16px; - height: 16px; - display: inline-block; - float:left; -} afx-menu afx-menu ul { diff --git a/src/themes/antos/afx-switch.css b/src/themes/antos/afx-switch.css new file mode 100644 index 0000000..54a5bb5 --- /dev/null +++ b/src/themes/antos/afx-switch.css @@ -0,0 +1,20 @@ +afx-switch span{ + display: inline-block; + width: 30px; + height:24px; + cursor: pointer; + font-size: 24px; + font-family: "FontAwesome"; +} +afx-switch span:before{ + content: "\f204"; + color: #414339; + font-style: normal; + font-weight: normal; +} +afx-switch span.swon:before{ + content: "\f205"; + color: #116cd6; + font-style: normal; + font-weight: normal; +} \ No newline at end of file