Skip to content

W
web-apps
Commit 32a7830e authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

[SSE] Пересчет пресетов для размеров листа с учетом единиц измерения.

parent 201f381c
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 26 deletions
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file @ 32a7830e
......@@ -263,19 +263,19 @@ define([
editable : false,
cls : 'input-group-nr',
data : [
{value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)'},
{value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)'},
{value:'210|297', displayValue:'A4 (21cm x 29,7cm)'},
{value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)'},
{value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)'},
{value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)'},
{value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)'},
{value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)'},
{value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)'},
{value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)'},
{value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)'},
{value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)'},
{value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)'}
{value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)', caption: 'US Letter'},
{value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal'},
{value:'210|297', displayValue:'A4 (21cm x 29,7cm)', caption: 'A4'},
{value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)', caption: 'A5'},
{value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)', caption: 'B5'},
{value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10'},
{value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)', caption: 'Envelope DL'},
{value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)', caption: 'Tabloid'},
{value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)', caption: 'A3'},
{value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize'},
{value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K'},
{value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3'},
{value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3'}
]
});
......@@ -383,6 +383,17 @@ define([
spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
}
}
var store = this.cmbPaperSize.store;
for (var i=0; i<store.length; i++) {
var item = store.at(i),
value = item.get('value'),
pagewidth = /^\d{3}\.?\d*/.exec(value),
pageheight = /\d{3}\.?\d*$/.exec(value);
item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()] + ' x ' +
parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()] + ')');
}
this.cmbPaperSize.onResetItems();
},
applySettings: function() {
......
apps/spreadsheeteditor/main/app/view/PrintSettings.js
View file @ 32a7830e
......@@ -115,19 +115,19 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
editable : false,
cls : 'input-group-nr',
data : [
{value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)'},
{value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)'},
{value:'210|297', displayValue:'A4 (21cm x 29,7cm)'},
{value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)'},
{value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)'},
{value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)'},
{value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)'},
{value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)'},
{value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)'},
{value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)'},
{value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)'},
{value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)'},
{value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)'}
{value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)', caption: 'US Letter'},
{value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal'},
{value:'210|297', displayValue:'A4 (21cm x 29,7cm)', caption: 'A4'},
{value:'148.1|209.9', displayValue:'A5 (14,81cm x 20,99cm)', caption: 'A5'},
{value:'176|250.1', displayValue:'B5 (17,6cm x 25,01cm)', caption: 'B5'},
{value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10'},
{value:'110.1|220.1', displayValue:'Envelope DL (11,01cm x 22,01cm)', caption: 'Envelope DL'},
{value:'279.4|431.7', displayValue:'Tabloid (27,94cm x 43,17cm)', caption: 'Tabloid'},
{value:'297|420.1', displayValue:'A3 (29,7cm x 42,01cm)', caption: 'A3'},
{value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize'},
{value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K'},
{value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3'},
{value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3'}
]
});
......@@ -245,6 +245,17 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
}
}
var store = this.cmbPaperSize.store;
for (var i=0; i<store.length; i++) {
var item = store.at(i),
value = item.get('value'),
pagewidth = /^\d{3}\.?\d*/.exec(value),
pageheight = /\d{3}\.?\d*$/.exec(value);
item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()] + ' x ' +
parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + Common.Utils.Metric.metricName[Common.Utils.Metric.getCurrentMetric()] + ')');
}
this.cmbPaperSize.onResetItems();
},
handlerShowDetails: function(btn) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7