correct more app

This commit is contained in:
Xuan Sang LE
2020-05-21 21:56:16 +02:00
parent 04225e74fb
commit d62bafae48
32 changed files with 710 additions and 383 deletions

View File

@ -8,20 +8,26 @@ afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] div[data-i
background-repeat: repeat;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] div[data-id = "status"]
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] afx-hbox[data-id = "statcontainer"]
{
background-color: transparent;
border-top: 1px solid #cbcbcb;
padding-left: 10px;
padding-top: 3px;
border-bottom: 1px solid #cbcbcb;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] afx-hbox[data-id = "statcontainer"] button,
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] afx-hbox[data-id = "statcontainer"] input
{
height: 24px;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] canvas{
margin-left: auto;
margin-right: auto;
display: block;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] div.pdf-page {
margin-bottom: 5px;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] div[data-id = "view"].image
{
display: flex;

View File

@ -25,18 +25,62 @@
}
main() {
this.currfile = void 0;
if (this.args && this.args.length > 0) {
this.currfile = this.args[0].path.asFileHandle();
}
this.view = this.find("view");
this.status = this.find("status");
this.zoom = this.find("zoom");
this.btnext = this.find("btnext");
this.btprev = this.find("btprev");
this.btreset = this.find("btreset");
this.txtpage = this.find("txtpage");
this.zoom.set("onchange", (e) => {
return this.setViewScale(e.data);
});
this.btreset.set("onbtclick", (e) => {
this.zoom.set("value", 100);
return this.setViewScale(100);
});
this.btnext.set("onbtclick", (e) => {
var val;
val = parseInt($(this.txtpage).val());
if (isNaN(val)) {
return;
}
$(this.txtpage).val(val + 1);
return this.gotoPage();
});
this.btprev.set("onbtclick", (e) => {
var val;
val = parseInt($(this.txtpage).val());
if (isNaN(val)) {
return;
}
$(this.txtpage).val(val - 1);
return this.gotoPage();
});
$(this.txtpage).keyup((e) => {
if (e.which !== 13) {
return;
}
if (!this.pdf) {
return;
}
return this.gotoPage();
});
PDFJS.workerSrc = `${this.path()}/pdf.worker.js`.asFileHandle().getlink();
this.pdf = void 0;
this.img = void 0;
this.bindKey("ALT-O", () => {
return this.actionFile(`${this.name}-Open`);
});
this.bindKey("CTRL-X", () => {
return this.actionFile(`${this.name}-Close`);
});
this.zoom.set("max", 200);
this.zoom.set("value", 100);
return this.open(this.currfile);
}
@ -49,25 +93,46 @@
}
return file.onready().then(() => {
file.info.size = (file.info.size / 1024).toFixed(2);
return this.renderFile(file);
return this.renderFile();
}).catch((err) => {
return this.error(__("File not found {0}", file.path), err);
});
}
renderFile(file) {
var mime;
mime = file.info.mime;
if (!mime) {
gotoPage() {
var val;
if (!this.pdf) {
return;
}
val = parseInt($(this.txtpage).val());
if (isNaN(val)) {
return;
}
if (val <= 0 || val > this.pdf.numPages) {
return;
}
($(this.view)).empty();
return this.renderPDFPages(val, this.zoom.get("value") / 100, false).catch((e) => {
return this.error(__("Unable to render page {0}", val), e);
});
}
renderFile() {
var mime;
mime = this.currfile.info.mime;
if (!mime) {
return;
}
this.pdf = void 0;
this.img = void 0;
($(this.view)).empty();
this.zoom.set("value", 100);
if (mime.match(/^[^\/]+\/.*pdf.*/g)) {
return this.renderPDF(file);
return this.renderPDF();
} else if (mime.match(/image\/.*svg.*/g)) {
return this.renderSVG(file);
return this.renderSVG();
} else if (mime.match(/image\/.*/g)) {
return this.renderImage(file);
return this.renderImage();
} else {
return this.notify(__("Mime type {0} is not supported", file.info.mime));
}
@ -77,44 +142,92 @@
return ($(this.status)).html(t);
}
renderPDF(file) {
return this.load(new Promise((resolve, reject) => {
setViewScale(value) {
var canvas, context, h, mime, scale, w;
if (!this.currfile) {
return;
}
mime = this.currfile.info.mime;
scale = value / 100;
if (mime.match(/^[^\/]+\/.*pdf.*/g)) {
if (!this.pdf) {
return;
}
($(this.view)).empty();
return this.load(this.renderPDFPages(1, scale)).catch((e) => {
return this.error(__("Unable to set view scale"), e);
});
} else if (mime.match(/image\/.*svg.*/g)) {
return $($(this.view).children()[0]).css("width", `${Math.round(value)}%`).css("height", `${Math.round(value)}%`);
} else if (mime.match(/image\/.*/g)) {
if (!this.img) {
return;
}
canvas = $(this.view).children()[0];
context = canvas.getContext('2d');
w = this.img.width * scale;
h = this.img.height * scale;
canvas.height = h;
canvas.width = w;
context.clearRect(0, 0, canvas.width, canvas.height);
context.scale(scale, scale);
return context.drawImage(this.img, 0, 0);
}
}
renderPDFPages(n, scale, recursive) {
return new Promise((resolve, reject) => {
var status;
status = `${file.info.name} (${file.info.size} Kb)`;
return file.read("binary").then((d) => {
status = `${this.currfile.info.name} (${this.currfile.info.size} Kb)`;
if (n > this.pdf.numPages) {
return resolve();
}
return this.pdf.getPage(n).then((page) => {
var canvas, context, div, renderContext, viewport;
viewport = page.getViewport(scale);
div = ($("<div/>")).attr("id", "page-" + (page.pageIndex + 1)).attr("scale", scale).addClass("pdf-page");
($(this.view)).append(div);
canvas = ($("<canvas>"))[0];
div.append(canvas);
context = canvas.getContext('2d');
canvas.height = viewport.height;
canvas.width = viewport.width;
renderContext = {
canvasContext: context,
viewport: viewport
};
page.render(renderContext);
page._canvas = canvas;
this.setStatus(`${status} - page ${n}/${this.pdf.numPages} loaded`);
if (recursive) {
return this.renderPDFPages(n + 1, scale, recursive).then(function() {
return resolve();
}).catch(function(e) {
return reject(e);
});
} else {
return resolve();
}
}).catch(function(e) {
return reject(e);
});
});
}
renderPDF() {
return this.load(new Promise((resolve, reject) => {
return this.currfile.read("binary").then((d) => {
($(this.view)).removeClass();
return PDFJS.getDocument({
data: d
}).then((pdf) => {
var fn;
fn = (p) => {
if (p > pdf.numPages) {
this.setStatus(`${status} - loaded`);
return resolve();
}
return pdf.getPage(p).then((page) => {
var canvas, context, div, renderContext, scale, viewport;
scale = 1.5;
viewport = page.getViewport(scale);
div = ($("<div/>")).attr("id", "page-" + (page.pageIndex + 1));
($(this.view)).append(div);
canvas = ($("<canvas>"))[0];
div.append(canvas);
context = canvas.getContext('2d');
canvas.height = viewport.height;
canvas.width = viewport.width;
renderContext = {
canvasContext: context,
viewport: viewport
};
page.render(renderContext);
this.setStatus(`${status} - ${p}/${pdf.numPages} loaded`);
return fn(p + 1);
}).catch(function(e) {
return reject(e);
});
};
return fn(1);
this.pdf = pdf;
return this.renderPDFPages(1, 1, false).then(() => {
$(this.txtpage).val("1");
return resolve();
}).catch(function(e) {
return reject(e);
});
}).catch(function(e) {
return reject(e);
});
@ -122,23 +235,23 @@
return reject(e);
});
})).catch((e) => {
return this.error(__("Unable to view file: {}", file.path), e);
return this.error(__("Unable to view file: {0}", this.currfile.path), e);
});
}
renderSVG(file) {
renderSVG() {
($(this.view)).attr("class", "image");
return file.read().then((d) => {
return this.currfile.read().then((d) => {
this.view.innerHTML = d;
return $($(this.view).children()[0]).css("width", "100%").css("height", "100%");
}).catch((e) => {
return this.error(__("Unable to read file: {}", file.path), e);
return this.error(__("Unable to read file: {0}", this.currfile.path), e);
});
}
renderImage(file) {
renderImage() {
($(this.view)).attr("class", "image");
return file.read("binary").then((d) => {
return this.currfile.read("binary").then((d) => {
var blob, canvas, img;
img = new Image();
canvas = ($("<canvas/>"))[0];
@ -149,16 +262,17 @@
context = canvas.getContext('2d');
canvas.height = img.height;
canvas.width = img.width;
this.img = img;
//console.log canvas.width, canvas.height
context.drawImage(img, 0, 0);
return this.setStatus(`${file.info.name} (${file.info.size} Kb) - ${img.width}x${img.height}`);
return this.setStatus(`${this.currfile.info.name} (${this.currfile.info.size} Kb) - ${img.width}x${img.height}`);
};
blob = new Blob([d], {
type: file.info.mime
type: this.currfile.info.mime
});
return img.src = URL.createObjectURL(blob);
}).catch((e) => {
return this.error(__("Unable to read file: {}", file.path), e);
return this.error(__("Unable to read file: {0}", this.currfile.path), e);
});
}

View File

@ -6,7 +6,7 @@
"author": "Xuan Sang LE",
"email": "xsang.le@gmail.com"
},
"version":"0.0.2-a",
"version":"0.0.3-a",
"category":"Utils",
"iconclass":"fa fa-eye",
"mimes":["[^\/]*/.*pdf", "image/.*"]

View File

@ -1,6 +1,17 @@
<afx-app-window data-id = "preview-win" apptitle="Preview" width="600" height="400">
<afx-vbox data-id = "container">
<afx-hbox data-height = "25" data-id = "statcontainer" >
<div data-width = "5" ></div>
<afx-button data-width="20" iconclass="fa fa-chevron-left" data-id="btprev"></afx-button>
<input type="text" data-width="30" data-id="txtpage" />
<afx-button data-width="20" iconclass="fa fa-chevron-right" data-id="btnext"></afx-button>
<div data-width = "5" ></div>
<afx-button data-width="20" iconclass="fa fa-arrows-alt" data-id="btreset"></afx-button>
<div data-width = "5" ></div>
<afx-slider data-width="150" data-id="zoom" ></afx-slider>
<div data-id = "status" style="text-align: right;"></div>
<div data-width = "10" ></div>
</afx-hbox>
<div data-id="view" ></div>
<div data-id = "status" data-height = "20"></div>
</afx-vbox>
</afx-app-window>

Binary file not shown.

View File

@ -21,14 +21,46 @@ class Preview extends this.OS.GUI.BaseApplication
super "Preview", args
main: () ->
@currfile = undefined
@currfile = @args[0].path.asFileHandle() if @args and @args.length > 0
@view = @find "view"
@status = @find "status"
@zoom = @find "zoom"
@btnext = @find "btnext"
@btprev = @find "btprev"
@btreset = @find "btreset"
@txtpage = @find "txtpage"
@zoom.set "onchange", (e) => @setViewScale e.data
@btreset.set "onbtclick", (e) =>
@zoom.set "value", 100
@setViewScale 100
@btnext.set "onbtclick", (e) =>
val = parseInt $(@txtpage).val()
return if isNaN val
$(@txtpage).val val + 1
@gotoPage()
@btprev.set "onbtclick", (e) =>
val = parseInt $(@txtpage).val()
return if isNaN val
$(@txtpage).val val - 1
@gotoPage()
$(@txtpage).keyup (e) =>
return unless e.which is 13
return unless @pdf
@gotoPage()
PDFJS.workerSrc = "#{@path()}/pdf.worker.js".asFileHandle().getlink()
@pdf = undefined
@img = undefined
@bindKey "ALT-O", () => @actionFile "#{@name}-Open"
@bindKey "CTRL-X", () => @actionFile "#{@name}-Close"
@zoom.set "max", 200
@zoom.set "value", 100
@open @currfile
@ -37,72 +69,125 @@ class Preview extends this.OS.GUI.BaseApplication
@currfile = file unless @currfile is file
file.onready().then () =>
file.info.size = (file.info.size / 1024).toFixed(2)
@renderFile file
@renderFile()
.catch (err) =>
@error __("File not found {0}", file.path), err
renderFile: (file) ->
mime = file.info.mime
return unless mime
gotoPage: () ->
return unless @pdf
val = parseInt $(@txtpage).val()
return if isNaN(val)
return if val <= 0 or val > @pdf.numPages
($ @view).empty()
@renderPDFPages val, (@zoom.get("value") / 100), false
.catch (e) => @error __("Unable to render page {0}", val), e
renderFile: () ->
mime = @currfile.info.mime
return unless mime
@pdf = undefined
@img = undefined
($ @view).empty()
@zoom.set "value", 100
if mime.match /^[^\/]+\/.*pdf.*/g
@renderPDF file
@renderPDF()
else if mime.match /image\/.*svg.*/g
@renderSVG file
@renderSVG()
else if mime.match /image\/.*/g
@renderImage file
@renderImage()
else
@notify __("Mime type {0} is not supported", file.info.mime)
setStatus: (t) ->
($ @status).html t
renderPDF: (file) ->
setViewScale: (value) ->
return unless @currfile
mime = @currfile.info.mime
scale = (value / 100)
if mime.match /^[^\/]+\/.*pdf.*/g
return unless @pdf
($ @view).empty()
@load @renderPDFPages 1, scale
.catch (e) => @error __("Unable to set view scale"), e
else if mime.match /image\/.*svg.*/g
$($(@view).children()[0])
.css "width", "#{Math.round(value)}%"
.css "height", "#{Math.round(value)}%"
else if mime.match /image\/.*/g
return unless @img
canvas = $(@view).children()[0]
context = canvas.getContext '2d'
w = @img.width * scale
h = @img.height * scale
canvas.height = h
canvas.width = w
context.clearRect(0, 0, canvas.width, canvas.height)
context.scale scale, scale
context.drawImage @img, 0, 0
renderPDFPages: (n, scale, recursive) ->
new Promise (resolve, reject) =>
status = "#{@currfile.info.name} (#{@currfile.info.size} Kb)"
return resolve() if n > @pdf.numPages
@pdf.getPage(n).then (page) =>
viewport = page.getViewport scale
div = ($ "<div/>")
.attr("id", "page-" + (page.pageIndex + 1))
.attr("scale", scale)
.addClass "pdf-page"
($ @view).append div
canvas = ($ "<canvas>")[0]
div.append canvas
context = canvas.getContext '2d'
canvas.height = viewport.height
canvas.width = viewport.width
renderContext =
canvasContext: context
viewport: viewport
page.render renderContext
page._canvas = canvas
@setStatus "#{status} - page #{n}/#{@pdf.numPages} loaded"
if recursive
@renderPDFPages n + 1, scale, recursive
.then () -> resolve()
.catch (e) -> reject e
else
resolve()
.catch (e) -> reject e
renderPDF: () ->
@load new Promise (resolve, reject) =>
status = "#{file.info.name} (#{file.info.size} Kb)"
file.read("binary").then (d) =>
@currfile.read("binary").then (d) =>
($ @view).removeClass()
PDFJS.getDocument { data: d }
.then (pdf) =>
fn = (p) =>
if p > pdf.numPages
@setStatus "#{status} - loaded"
return resolve()
pdf.getPage(p).then (page) =>
scale = 1.5
viewport = page.getViewport scale
div = ($ "<div/>").attr("id", "page-" + (page.pageIndex + 1))
($ @view).append div
canvas = ($ "<canvas>")[0]
div.append canvas
context = canvas.getContext '2d'
canvas.height = viewport.height
canvas.width = viewport.width
renderContext =
canvasContext: context
viewport: viewport
page.render renderContext
@setStatus "#{status} - #{p}/#{pdf.numPages} loaded"
fn(p+1)
@pdf = pdf
@renderPDFPages 1, 1, false
.then () =>
$(@txtpage).val("1")
resolve()
.catch (e) -> reject e
fn(1)
.catch (e) -> reject e
.catch (e) -> reject e
.catch (e) => @error __("Unable to view file: {}", file.path), e
.catch (e) => @error __("Unable to view file: {0}", @currfile.path), e
renderSVG: (file) ->
renderSVG: () ->
($ @view).attr("class", "image")
file.read().then (d) =>
@currfile.read().then (d) =>
@view.innerHTML = d
$($(@view).children()[0])
.css "width", "100%"
.css "height", "100%"
.catch (e) => @error __("Unable to read file: {}", file.path), e
.catch (e) => @error __("Unable to read file: {0}", @currfile.path), e
renderImage: (file) ->
renderImage: () ->
($ @view).attr("class", "image")
file.read("binary").then (d) =>
@currfile.read("binary").then (d) =>
img = new Image()
canvas = ($ "<canvas/>")[0]
($ @view).append canvas
@ -112,13 +197,14 @@ class Preview extends this.OS.GUI.BaseApplication
context = canvas.getContext '2d'
canvas.height = img.height
canvas.width = img.width
@img = img
#console.log canvas.width, canvas.height
context.drawImage img, 0, 0
@setStatus "#{file.info.name} (#{file.info.size} Kb) - #{img.width}x#{img.height}"
@setStatus "#{@currfile.info.name} (#{@currfile.info.size} Kb) - #{img.width}x#{img.height}"
blob = new Blob [d], { type: file.info.mime }
blob = new Blob [d], { type: @currfile.info.mime }
img.src = URL.createObjectURL blob
.catch (e) => @error __("Unable to read file: {}", file.path), e
.catch (e) => @error __("Unable to read file: {0}", @currfile.path), e
menu: () ->
menu = [{

View File

@ -7,20 +7,26 @@ afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] div[data-i
background-repeat: repeat;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] div[data-id = "status"]
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] afx-hbox[data-id = "statcontainer"]
{
background-color: transparent;
border-top: 1px solid #cbcbcb;
padding-left: 10px;
padding-top: 3px;
border-bottom: 1px solid #cbcbcb;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] afx-hbox[data-id = "statcontainer"] button,
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] afx-hbox[data-id = "statcontainer"] input
{
height: 24px;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] canvas{
margin-left: auto;
margin-right: auto;
display: block;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] div.pdf-page {
margin-bottom: 5px;
}
afx-app-window[data-id = "preview-win"] afx-vbox[data-id="container"] div[data-id = "view"].image
{
display: flex;

View File

@ -6,7 +6,7 @@
"author": "Xuan Sang LE",
"email": "xsang.le@gmail.com"
},
"version":"0.0.2-a",
"version":"0.0.3-a",
"category":"Utils",
"iconclass":"fa fa-eye",
"mimes":["[^\/]*/.*pdf", "image/.*"]

View File

@ -1,6 +1,17 @@
<afx-app-window data-id = "preview-win" apptitle="Preview" width="600" height="400">
<afx-vbox data-id = "container">
<afx-hbox data-height = "25" data-id = "statcontainer" >
<div data-width = "5" ></div>
<afx-button data-width="20" iconclass="fa fa-chevron-left" data-id="btprev"></afx-button>
<input type="text" data-width="30" data-id="txtpage" />
<afx-button data-width="20" iconclass="fa fa-chevron-right" data-id="btnext"></afx-button>
<div data-width = "5" ></div>
<afx-button data-width="20" iconclass="fa fa-arrows-alt" data-id="btreset"></afx-button>
<div data-width = "5" ></div>
<afx-slider data-width="150" data-id="zoom" ></afx-slider>
<div data-id = "status" style="text-align: right;"></div>
<div data-width = "10" ></div>
</afx-hbox>
<div data-id="view" ></div>
<div data-id = "status" data-height = "20"></div>
</afx-vbox>
</afx-app-window>