Commit 3f69d38f authored by Julia Radzhabova's avatar Julia Radzhabova

Merge branch 'feature/sse-print-settings' into develop

parents 98ff253a 225120e0
...@@ -187,7 +187,7 @@ define([ ...@@ -187,7 +187,7 @@ define([
case 'back': break; case 'back': break;
case 'save': this.api.asc_Save(); break; case 'save': this.api.asc_Save(); break;
case 'save-desktop': this.api.asc_DownloadAs(); break; case 'save-desktop': this.api.asc_DownloadAs(); break;
case 'print': this.api.asc_Print(undefined, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); break; case 'print': Common.NotificationCenter.trigger('print', this.leftMenu); break;
case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'exit': Common.NotificationCenter.trigger('goback'); break;
case 'edit': case 'edit':
// this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); // this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText);
......
...@@ -793,6 +793,10 @@ define([ ...@@ -793,6 +793,10 @@ define([
if (!this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram) { if (!this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram) {
this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
var printController = app.getController('Print');
printController && this.api && printController.setApi(this.api);
} }
var celleditorController = this.getApplication().getController('CellEditor'); var celleditorController = this.getApplication().getController('CellEditor');
...@@ -806,7 +810,6 @@ define([ ...@@ -806,7 +810,6 @@ define([
toolbarController = application.getController('Toolbar'), toolbarController = application.getController('Toolbar'),
statusbarController = application.getController('Statusbar'), statusbarController = application.getController('Statusbar'),
rightmenuController = application.getController('RightMenu'), rightmenuController = application.getController('RightMenu'),
printController = application.getController('Print'),
/** coauthoring begin **/ /** coauthoring begin **/
commentsController = application.getController('Common.Controllers.Comments'), commentsController = application.getController('Common.Controllers.Comments'),
/** coauthoring end **/ /** coauthoring end **/
...@@ -826,7 +829,6 @@ define([ ...@@ -826,7 +829,6 @@ define([
} }
rightmenuController && rightmenuController.setApi(me.api); rightmenuController && rightmenuController.setApi(me.api);
printController && printController.setApi(me.api);
if (statusbarController) { if (statusbarController) {
statusbarController.getView('Statusbar').changeViewMode(true); statusbarController.getView('Statusbar').changeViewMode(true);
...@@ -1636,10 +1638,7 @@ define([ ...@@ -1636,10 +1638,7 @@ define([
onPrint: function() { onPrint: function() {
if (!this.appOptions.canPrint) return; if (!this.appOptions.canPrint) return;
Common.NotificationCenter.trigger('print', this);
if (this.api)
this.api.asc_Print(undefined, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
Common.component.Analytics.trackEvent('Print');
}, },
onPrintUrl: function(url) { onPrintUrl: function(url) {
......
...@@ -43,13 +43,13 @@ define([ ...@@ -43,13 +43,13 @@ define([
], ],
initialize: function() { initialize: function() {
this.adjPrintParams = new Asc.asc_CAdjustPrint();
this.adjPrintParams.asc_setLayoutPageType(c_oAscLayoutPageType.ActualSize);
var value = Common.localStorage.getItem("sse-print-settings-range"); var value = Common.localStorage.getItem("sse-print-settings-range");
value = (value!==null) ? parseInt(value) : c_oAscPrintType.ActiveSheets; value = (value!==null) ? parseInt(value) : c_oAscPrintType.ActiveSheets;
this.adjPrintParams = new Asc.asc_CAdjustPrint();
this.adjPrintParams.asc_setPrintType(value); this.adjPrintParams.asc_setPrintType(value);
this.diffParams = {};
this._changedProps = null;
this.addListeners({ this.addListeners({
'MainSettingsPrint': { 'MainSettingsPrint': {
...@@ -67,11 +67,10 @@ define([ ...@@ -67,11 +67,10 @@ define([
}, },
onAfterRender: function(view) { onAfterRender: function(view) {
this.printSettings.cmbSheet.on('selected', _.bind(this.comboSheetsChange, this)); this.printSettings.cmbSheet.on('selected', _.bind(this.comboSheetsChange, this, this.printSettings));
this.printSettings.btnOk.on('click', _.bind(this.querySavePrintSettings, this)); this.printSettings.btnOk.on('click', _.bind(this.querySavePrintSettings, this));
var toolbar = SSE.getController('Toolbar').getView('Toolbar'); Common.NotificationCenter.on('print', _.bind(this.openPrintSettings, this));
if (toolbar) this.registerControlEvents(this.printSettings);
toolbar.mnuPrint.on('item:click', _.bind(this.openPrintSettings, this));
}, },
setApi: function(o) { setApi: function(o) {
...@@ -81,16 +80,15 @@ define([ ...@@ -81,16 +80,15 @@ define([
updateSheetsInfo: function() { updateSheetsInfo: function() {
if (this.printSettings.isVisible()) { if (this.printSettings.isVisible()) {
this.updateSettings(); this.updateSettings(this.printSettings);
} else { } else {
this.isFillSheets = false; this.isFillSheets = false;
this.diffParams = {};
} }
}, },
updateSettings: function() { updateSettings: function(panel) {
var wc = this.api.asc_getWorksheetsCount(), i = -1; var wc = this.api.asc_getWorksheetsCount(), i = -1;
var items = [{displayValue: this.strAllSheets, value:-255}]; var items = [];
while (++i < wc) { while (++i < wc) {
if (!this.api.asc_isWorksheetHidden(i)) { if (!this.api.asc_isWorksheetHidden(i)) {
...@@ -101,87 +99,16 @@ define([ ...@@ -101,87 +99,16 @@ define([
} }
} }
this.printSettings.cmbSheet.store.reset(items); panel.cmbSheet.store.reset(items);
var item = this.printSettings.cmbSheet.store.findWhere({value: this.printSettings.cmbSheet.getValue()}) || var item = panel.cmbSheet.store.findWhere({value: panel.cmbSheet.getValue()}) ||
this.printSettings.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); panel.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()});
if (item) { if (item) {
this.printSettings.cmbSheet.setValue(item.get('value')); panel.cmbSheet.setValue(item.get('value'));
}
},
comboSheetsChange: function(combo, record) {
var newvalue = record.value;
if (newvalue == -255) {
this.indeterminatePageOptions(this.printSettings);
} else {
this.fillPageOptions(this.printSettings, this.api.asc_getPageOptions(newvalue));
}
},
isDiffRefill: function() {
for (var item in this.diffParams) {
if (this.diffParams[item] == undefined) return true;
} }
return item == undefined;
}, },
indeterminatePageOptions: function(panel) { comboSheetsChange: function(panel, combo, record) {
if (this.isDiffRefill()) { this.fillPageOptions(panel, this._changedProps[record.value] ? this._changedProps[record.value] : this.api.asc_getPageOptions(record.value));
var wc = this.api.asc_getWorksheetsCount();
if (wc == 1) {
this.diffParams.orientation = false;
this.diffParams.size = false;
this.diffParams.headings = false;
this.diffParams.grid = false;
this.diffParams.margintop = false;
this.diffParams.marginright = false;
this.diffParams.marginbottom = false;
this.diffParams.marginleft = false;
} else {
var index = 0;
var opts = this.api.asc_getPageOptions(index), opts_next;
while (++index < wc) {
opts_next = this.api.asc_getPageOptions(index);
if (this.diffParams.orientation == undefined)
this.diffParams.orientation = opts.asc_getPageSetup().asc_getOrientation() != opts_next.asc_getPageSetup().asc_getOrientation();
if (this.diffParams.size == undefined)
this.diffParams.size = (opts.asc_getPageSetup().asc_getWidth() != opts_next.asc_getPageSetup().asc_getWidth() || opts.asc_getPageSetup().asc_getHeight() != opts_next.asc_getPageSetup().asc_getHeight());
if (this.diffParams.headings == undefined)
this.diffParams.headings = opts.asc_getHeadings() != opts_next.asc_getHeadings();
if (this.diffParams.grid == undefined)
this.diffParams.grid = opts.asc_getGridLines() != opts_next.asc_getGridLines();
if (this.diffParams.margintop == undefined)
this.diffParams.margintop = Math.abs(opts.asc_getPageMargins().asc_getTop()-opts_next.asc_getPageMargins().asc_getTop()) > 0.001;
if (this.diffParams.marginright == undefined)
this.diffParams.marginright = Math.abs(opts.asc_getPageMargins().asc_getRight() - opts_next.asc_getPageMargins().asc_getRight()) > 0.001;
if (this.diffParams.marginbottom == undefined)
this.diffParams.marginbottom = Math.abs(opts.asc_getPageMargins().asc_getBottom() - opts_next.asc_getPageMargins().asc_getBottom()) > 0.001;
if (this.diffParams.marginleft == undefined)
this.diffParams.marginleft = Math.abs(opts.asc_getPageMargins().asc_getLeft() - opts_next.asc_getPageMargins().asc_getLeft()) > 0.001;
}
}
}
if (this.diffParams.orientation) panel.cmbPaperOrientation.setValue('-');
if (this.diffParams.size) panel.cmbPaperSize.setValue('-');
if (this.diffParams.margintop) panel.spnMarginTop.setValue('-');
if (this.diffParams.marginright) panel.spnMarginRight.setValue('-');
if (this.diffParams.marginbottom) panel.spnMarginBottom.setValue('-');
if (this.diffParams.marginleft) panel.spnMarginLeft.setValue('-');
if (this.diffParams.grid) panel.chPrintGrid.setValue('indeterminate');
if (this.diffParams.headings) panel.chPrintRows.setValue('indeterminate');
}, },
fillPageOptions: function(panel, props) { fillPageOptions: function(panel, props) {
...@@ -199,19 +126,40 @@ define([ ...@@ -199,19 +126,40 @@ define([
else else
panel.cmbPaperSize.setValue('Custom (' + w +' x ' + h); panel.cmbPaperSize.setValue('Custom (' + w +' x ' + h);
var fitwidth = opt.asc_getFitToWidth(),
fitheight = opt.asc_getFitToHeight();
if (!fitwidth && !fitheight) panel.cmbLayout.setValue(0);
else if (fitwidth && fitheight) panel.cmbLayout.setValue(1);
else if (fitwidth && !fitheight) panel.cmbLayout.setValue(2);
else panel.cmbLayout.setValue(3);
item = panel.cmbPaperOrientation.store.findWhere({value: opt.asc_getOrientation()});
if (item) panel.cmbPaperOrientation.setValue(item.get('value'));
opt = props.asc_getPageMargins(); opt = props.asc_getPageMargins();
panel.spnMarginLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getLeft())); panel.spnMarginLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getLeft()), true);
panel.spnMarginTop.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getTop())); panel.spnMarginTop.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getTop()), true);
panel.spnMarginRight.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getRight())); panel.spnMarginRight.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getRight()), true);
panel.spnMarginBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getBottom())); panel.spnMarginBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getBottom()), true);
panel.chPrintGrid.setValue(props.asc_getGridLines(), true);
panel.chPrintRows.setValue(props.asc_getHeadings(), true);
},
panel.chPrintGrid.setValue(props.asc_getGridLines()); fillPrintOptions: function(props) {
panel.chPrintRows.setValue(props.asc_getHeadings()); this.printSettingsDlg.setRange(props.asc_getPrintType());
this.onChangeRange();
}, },
fillPrintOptions: function(panel, props) { onChangeRange: function() {
panel.setRange(props.asc_getPrintType()); var printtype = this.printSettingsDlg.getRange(),
// panel.setLayout(props.asc_getLayoutPageType()); store = this.printSettingsDlg.cmbSheet.store,
item = (printtype !== c_oAscPrintType.EntireWorkbook) ? store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}) : store.at(0);
if (item) {
this.printSettingsDlg.cmbSheet.setValue(item.get('value'));
this.comboSheetsChange(this.printSettingsDlg, this.printSettingsDlg.cmbSheet, item.toJSON());
}
this.printSettingsDlg.cmbSheet.setDisabled(printtype !== c_oAscPrintType.EntireWorkbook);
}, },
getPageOptions: function(panel) { getPageOptions: function(panel) {
...@@ -225,10 +173,13 @@ define([ ...@@ -225,10 +173,13 @@ define([
var pagew = /^\d{3}\.?\d*/.exec(panel.cmbPaperSize.getValue()); var pagew = /^\d{3}\.?\d*/.exec(panel.cmbPaperSize.getValue());
var pageh = /\d{3}\.?\d*$/.exec(panel.cmbPaperSize.getValue()); var pageh = /\d{3}\.?\d*$/.exec(panel.cmbPaperSize.getValue());
// if (pagew && pageh) {
opt.asc_setWidth(!pagew ? undefined : parseFloat(pagew[0])); opt.asc_setWidth(!pagew ? undefined : parseFloat(pagew[0]));
opt.asc_setHeight(!pageh? undefined : parseFloat(pageh[0])); opt.asc_setHeight(!pageh? undefined : parseFloat(pageh[0]));
// }
var value = panel.cmbLayout.getValue();
opt.asc_setFitToWidth(value==1 || value==2);
opt.asc_setFitToHeight(value==1 || value==3);
props.asc_setPageSetup(opt); props.asc_setPageSetup(opt);
...@@ -243,55 +194,41 @@ define([ ...@@ -243,55 +194,41 @@ define([
return props; return props;
}, },
savePageOptions: function(panel, index) { savePageOptions: function(panel) {
var opts = this.getPageOptions(panel); var wc = this.api.asc_getWorksheetsCount(),
if (index == -255) {
var wc = this.api.asc_getWorksheetsCount();
index = -1; index = -1;
while (++index < wc) { while (++index < wc) {
this.api.asc_setPageOptions(opts, index); if (this._changedProps[index])
} this.api.asc_setPageOptions(this._changedProps[index], index);
if (this.diffParams.orientation) this.diffParams.orientation = opts.asc_getPageSetup().asc_getOrientation() == undefined;
if (this.diffParams.size) this.diffParams.size = (opts.asc_getPageSetup().asc_getWidth() == undefined || opts.asc_getPageSetup().asc_getHeight() == undefined);
if (this.diffParams.headings) this.diffParams.headings = opts.asc_getHeadings() == undefined;
if (this.diffParams.grid) this.diffParams.grid = opts.asc_getGridLines() == undefined;
if (this.diffParams.margintop) this.diffParams.margintop = opts.asc_getPageMargins().asc_getTop() == undefined;
if (this.diffParams.marginright) this.diffParams.marginright = opts.asc_getPageMargins().asc_getRight() == undefined;
if (this.diffParams.marginbottom) this.diffParams.marginbottom = opts.asc_getPageMargins().asc_getBottom() == undefined;
if (this.diffParams.marginleft) this.diffParams.marginleft = opts.asc_getPageMargins().asc_getLeft() == undefined;
} else {
this.api.asc_setPageOptions(opts, index);
this.diffParams = {};
} }
}, },
onShowMainSettingsPrint: function() { onShowMainSettingsPrint: function() {
this._changedProps = [];
if (!this.isFillSheets) { if (!this.isFillSheets) {
this.isFillSheets = true; this.isFillSheets = true;
this.updateSettings(); this.updateSettings(this.printSettings);
} }
if (!this.isUpdatedSettings) {
this.isUpdatedSettings = true;
var item = this.printSettings.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); var item = this.printSettings.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()});
if (item) { if (item) {
this.printSettings.cmbSheet.setValue(item.get('value')); this.printSettings.cmbSheet.setValue(item.get('value'));
this.comboSheetsChange(this.printSettings.cmbSheet, item.toJSON()); this.comboSheetsChange(this.printSettings, this.printSettings.cmbSheet, item.toJSON());
}
} }
}, },
openPrintSettings: function(menu, item) { openPrintSettings: function(btn) {
if (item.value === 'options' && this.api ) { if (this.api) {
this.printSettingsDlg = (new SSE.Views.PrintSettings({ this.printSettingsDlg = (new SSE.Views.PrintSettings({
handler: _.bind(this.resultPrintSettings,this), handler: _.bind(this.resultPrintSettings,this),
afterrender: _.bind(function() { afterrender: _.bind(function() {
this.fillPageOptions(this.printSettingsDlg, this.api.asc_getPageOptions()); this._changedProps = [];
this.fillPrintOptions(this.printSettingsDlg, this.adjPrintParams); this.updateSettings(this.printSettingsDlg);
this.printSettingsDlg.cmbSheet.on('selected', _.bind(this.comboSheetsChange, this, this.printSettingsDlg));
this.fillPrintOptions(this.adjPrintParams);
this.registerControlEvents(this.printSettingsDlg);
},this) },this)
})); }));
this.printSettingsDlg.show(); this.printSettingsDlg.show();
...@@ -302,36 +239,26 @@ define([ ...@@ -302,36 +239,26 @@ define([
var view = SSE.getController('Toolbar').getView('Toolbar'); var view = SSE.getController('Toolbar').getView('Toolbar');
if (result == 'ok') { if (result == 'ok') {
if ( this.checkMargins(this.printSettingsDlg) ) { if ( this.checkMargins(this.printSettingsDlg) ) {
this.savePageOptions(this.printSettingsDlg, this.printSettingsDlg.getRange() == c_oAscPrintType.EntireWorkbook ? -255:undefined); this.savePageOptions(this.printSettingsDlg);
var printtype = this.printSettingsDlg.getRange(); var printtype = this.printSettingsDlg.getRange();
this.adjPrintParams.asc_setPrintType(printtype); this.adjPrintParams.asc_setPrintType(printtype);
Common.localStorage.setItem("sse-print-settings-range", printtype); Common.localStorage.setItem("sse-print-settings-range", printtype);
// this.adjPrintParams.asc_setLayoutPageType(this.printSettingsDlg.getLayout());
this.api.asc_Print(this.adjPrintParams, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); this.api.asc_Print(this.adjPrintParams, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera);
this.isUpdatedSettings = false; Common.component.Analytics.trackEvent('Print');
Common.component.Analytics.trackEvent('ToolBar', 'Print');
Common.NotificationCenter.trigger('edit:complete', view);
} else } else
return true; return true;
} } else
Common.NotificationCenter.trigger('edit:complete', view); Common.NotificationCenter.trigger('edit:complete', view);
}, },
onChangeRange: function() {
var newvalue = this.printSettingsDlg.getRange();
if (newvalue == c_oAscPrintType.EntireWorkbook) {
this.indeterminatePageOptions(this.printSettingsDlg);
} else if (this.lastCheckedRange == c_oAscPrintType.EntireWorkbook) {
this.fillPageOptions(this.printSettingsDlg, this.api.asc_getPageOptions());
}
this.lastCheckedRange = newvalue;
},
querySavePrintSettings: function() { querySavePrintSettings: function() {
if ( this.checkMargins(this.printSettings) ) { if ( this.checkMargins(this.printSettings) ) {
this.savePageOptions(this.printSettings, this.printSettings.cmbSheet.getValue()); this.savePageOptions(this.printSettings);
this.printSettings.applySettings(); this.printSettings.applySettings();
} }
}, },
...@@ -378,6 +305,24 @@ define([ ...@@ -378,6 +305,24 @@ define([
return true; return true;
}, },
registerControlEvents: function(panel) {
panel.cmbPaperSize.on('selected', _.bind(this.propertyChange, this, panel));
panel.cmbPaperOrientation.on('selected', _.bind(this.propertyChange, this, panel));
panel.cmbLayout.on('selected', _.bind(this.propertyChange, this, panel));
panel.spnMarginTop.on('change', _.bind(this.propertyChange, this, panel));
panel.spnMarginBottom.on('change', _.bind(this.propertyChange, this, panel));
panel.spnMarginLeft.on('change', _.bind(this.propertyChange, this, panel));
panel.spnMarginRight.on('change', _.bind(this.propertyChange, this, panel));
panel.chPrintGrid.on('change', _.bind(this.propertyChange, this, panel));
panel.chPrintRows.on('change', _.bind(this.propertyChange, this, panel));
},
propertyChange: function(panel) {
if (this._changedProps) {
this._changedProps[panel.cmbSheet.getValue()] = this.getPageOptions(panel);
}
},
warnCheckMargings: 'Margins are incorrect', warnCheckMargings: 'Margins are incorrect',
strAllSheets: 'All Sheets', strAllSheets: 'All Sheets',
textWarning: 'Warning' textWarning: 'Warning'
......
...@@ -168,7 +168,6 @@ define([ ...@@ -168,7 +168,6 @@ define([
toolbar.btnNewDocument.on('click', _.bind(this.onNewDocument, this)); toolbar.btnNewDocument.on('click', _.bind(this.onNewDocument, this));
toolbar.btnOpenDocument.on('click', _.bind(this.onOpenDocument, this)); toolbar.btnOpenDocument.on('click', _.bind(this.onOpenDocument, this));
toolbar.btnPrint.on('click', _.bind(this.onPrint, this)); toolbar.btnPrint.on('click', _.bind(this.onPrint, this));
toolbar.btnPrint.menu.on('item:click', _.bind(this.onPrintMenu, this));
toolbar.btnSave.on('click', _.bind(this.onSave, this)); toolbar.btnSave.on('click', _.bind(this.onSave, this));
toolbar.btnUndo.on('click', _.bind(this.onUndo, this)); toolbar.btnUndo.on('click', _.bind(this.onUndo, this));
toolbar.btnRedo.on('click', _.bind(this.onRedo, this)); toolbar.btnRedo.on('click', _.bind(this.onRedo, this));
...@@ -290,25 +289,7 @@ define([ ...@@ -290,25 +289,7 @@ define([
}, },
onPrint: function(e) { onPrint: function(e) {
if (this.api) { Common.NotificationCenter.trigger('print', this.toolbar);
this.api.asc_Print(undefined, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari == true use asc_onPrintUrl event
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('Print');
Common.component.Analytics.trackEvent('ToolBar', 'Print');
}
},
onPrintMenu: function(menu, item) {
if (item.value === 'print' && this.api) {
this.api.asc_Print(undefined, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('Print');
Common.component.Analytics.trackEvent('ToolBar', 'Print');
}
}, },
onSave: function(e) { onSave: function(e) {
......
<div class="settings-panel active"> <div class="settings-panel active">
<div class="padding-large inner-content" > <div class="padding-large inner-content" >
<div id="printadv-dlg-radio-current" class="padding-small" style="display: block;"></div> <div id="printadv-dlg-combo-range" class="input-group-nr" /> </div>
<div id="printadv-dlg-radio-all" class="padding-small" style="display: block;"></div> <div class="padding-large"/>
<div id="printadv-dlg-radio-selection" style="display: block;"></div> <div class="padding-large inner-content" >
<div id="printadv-dlg-combo-sheets" class="input-group-nr" />
</div> </div>
<div class="separator horizontal padding-large"/>
<div class="padding-large inner-content" > <div class="padding-large inner-content" >
<div id="printadv-dlg-combo-pages" class="input-group-nr" /> <div id="printadv-dlg-combo-pages" class="input-group-nr" />
</div> </div>
<div class="separator horizontal padding-large"/>
<div class="padding-large inner-content" > <div class="padding-large inner-content" >
<span id="printadv-dlg-combo-orient" /> <span id="printadv-dlg-combo-orient" />
</div> </div>
<div class="padding-large inner-content" >
<span id="printadv-dlg-combo-layout" />
</div>
<div id="printadv-dlg-content-to-hide"> <div id="printadv-dlg-content-to-hide">
<div class="separator horizontal padding-large"/>
<div class="padding-large inner-content" > <div class="padding-large inner-content" >
<table cols="2" class="no-padding"> <table cols="2" class="no-padding">
<tr> <tr>
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
<td><label><%= scope.strBottom %></label></td> <td><label><%= scope.strBottom %></label></td>
</tr> </tr>
<tr> <tr>
<td class="padding-small"><div id="printadv-dlg-spin-margin-top" style="margin-right: 15px;"></div></td> <td class="padding-small"><div id="printadv-dlg-spin-margin-top" style="margin-right: 19px;"></div></td>
<td class="padding-small"><div id="printadv-dlg-spin-margin-bottom"></div></td> <td class="padding-small"><div id="printadv-dlg-spin-margin-bottom"></div></td>
</tr> </tr>
<tr> <tr>
...@@ -34,12 +35,7 @@ ...@@ -34,12 +35,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="separator horizontal padding-large"/> <div class="padding-small"/>
<!--<div class="padding-large inner-content" >-->
<!--<div id="printadv-dlg-radio-actual" class="padding-small" style="display: block;"></div>-->
<!--<div id="printadv-dlg-radio-fit" class="" style="display: block;"></div>-->
<!--</div>-->
<!--<div class="separator horizontal padding-large"/>-->
<div class="inner-content"> <div class="inner-content">
<div id="printadv-dlg-chb-grid" style="margin-bottom: 10px;"/> <div id="printadv-dlg-chb-grid" style="margin-bottom: 10px;"/>
<div id="printadv-dlg-chb-rows"/> <div id="printadv-dlg-chb-rows"/>
......
...@@ -134,7 +134,7 @@ define([ ...@@ -134,7 +134,7 @@ define([
el: $('#id-settings-menu'), el: $('#id-settings-menu'),
store: new Common.UI.DataViewStore([ store: new Common.UI.DataViewStore([
{name: this.txtGeneral, panel: this.generalSettings, iconCls:'mnu-settings-general', selected: true}, {name: this.txtGeneral, panel: this.generalSettings, iconCls:'mnu-settings-general', selected: true},
{name: this.txtPrint, panel: this.printSettings, iconCls:'mnu-print'} {name: this.txtPageSettings, panel: this.printSettings, iconCls:'mnu-print'}
]), ]),
itemTemplate: _.template([ itemTemplate: _.template([
'<div id="<%= id %>" class="settings-item-wrap">', '<div id="<%= id %>" class="settings-item-wrap">',
...@@ -173,7 +173,7 @@ define([ ...@@ -173,7 +173,7 @@ define([
}, },
txtGeneral: 'General', txtGeneral: 'General',
txtPrint: 'Print' txtPageSettings: 'Page Settings'
}, SSE.Views.FileMenuPanels.Settings || {})); }, SSE.Views.FileMenuPanels.Settings || {}));
SSE.Views.MainSettingsPrint = Common.UI.BaseView.extend(_.extend({ SSE.Views.MainSettingsPrint = Common.UI.BaseView.extend(_.extend({
...@@ -193,6 +193,10 @@ define([ ...@@ -193,6 +193,10 @@ define([
'<td class="left"><label><%= scope.textPageOrientation %></label></td>', '<td class="left"><label><%= scope.textPageOrientation %></label></td>',
'<td class="right"><span id="advsettings-print-combo-orient" /></td>', '<td class="right"><span id="advsettings-print-combo-orient" /></td>',
'</tr>','<tr class="divider"></tr>', '</tr>','<tr class="divider"></tr>',
'<tr>',
'<td class="left"><label><%= scope.textPageScaling %></label></td>',
'<td class="right"><span id="advsettings-print-combo-layout" /></td>',
'</tr>','<tr class="divider"></tr>',
'<tr>', '<tr>',
'<td class="left" style="vertical-align: top;"><label><%= scope.strMargins %></label></td>', '<td class="left" style="vertical-align: top;"><label><%= scope.strMargins %></label></td>',
'<td class="right" style="vertical-align: top;"><div id="advsettings-margins">', '<td class="right" style="vertical-align: top;"><div id="advsettings-margins">',
...@@ -245,19 +249,17 @@ define([ ...@@ -245,19 +249,17 @@ define([
this.cmbSheet = new Common.UI.ComboBox({ this.cmbSheet = new Common.UI.ComboBox({
el : $('#advsettings-print-combo-sheets'), el : $('#advsettings-print-combo-sheets'),
style : 'width: 260px;', style : 'width: 242px;',
menuStyle : 'min-width: 260px;max-height: 280px;', menuStyle : 'min-width: 242px;max-height: 280px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : [ data : []
{ value: -255, displayValue: this.strAllSheets }
]
}); });
this.cmbPaperSize = new Common.UI.ComboBox({ this.cmbPaperSize = new Common.UI.ComboBox({
el : $('#advsettings-print-combo-pages'), el : $('#advsettings-print-combo-pages'),
style : 'width: 260px;', style : 'width: 242px;',
menuStyle : 'max-height: 280px; min-width: 260px;', menuStyle : 'max-height: 280px; min-width: 242px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : [ data : [
...@@ -279,8 +281,8 @@ define([ ...@@ -279,8 +281,8 @@ define([
this.cmbPaperOrientation = new Common.UI.ComboBox({ this.cmbPaperOrientation = new Common.UI.ComboBox({
el : $('#advsettings-print-combo-orient'), el : $('#advsettings-print-combo-orient'),
style : 'width: 200px;', style : 'width: 132px;',
menuStyle : 'min-width: 200px;', menuStyle : 'min-width: 132px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : [ data : [
...@@ -289,6 +291,20 @@ define([ ...@@ -289,6 +291,20 @@ define([
] ]
}); });
this.cmbLayout = new Common.UI.ComboBox({
el : $('#advsettings-print-combo-layout'),
style : 'width: 242px;',
menuStyle : 'min-width: 242px;',
editable : false,
cls : 'input-group-nr',
data : [
{ value: 0, displayValue: this.textActualSize },
{ value: 1, displayValue: this.textFitPage },
{ value: 2, displayValue: this.textFitCols },
{ value: 3, displayValue: this.textFitRows }
]
});
this.chPrintGrid = new Common.UI.CheckBox({ this.chPrintGrid = new Common.UI.CheckBox({
el: $('#advsettings-print-chb-grid'), el: $('#advsettings-print-chb-grid'),
labelText: this.textPrintGrid labelText: this.textPrintGrid
...@@ -302,7 +318,7 @@ define([ ...@@ -302,7 +318,7 @@ define([
this.spnMarginTop = new Common.UI.MetricSpinner({ this.spnMarginTop = new Common.UI.MetricSpinner({
el: $('#advsettings-spin-margin-top'), el: $('#advsettings-spin-margin-top'),
step: .1, step: .1,
width: 90, width: 110,
defaultUnit : "cm", defaultUnit : "cm",
value: '0 cm', value: '0 cm',
maxValue: 48.25, maxValue: 48.25,
...@@ -313,7 +329,7 @@ define([ ...@@ -313,7 +329,7 @@ define([
this.spnMarginBottom = new Common.UI.MetricSpinner({ this.spnMarginBottom = new Common.UI.MetricSpinner({
el: $('#advsettings-spin-margin-bottom'), el: $('#advsettings-spin-margin-bottom'),
step: .1, step: .1,
width: 90, width: 110,
defaultUnit : "cm", defaultUnit : "cm",
value: '0 cm', value: '0 cm',
maxValue: 48.25, maxValue: 48.25,
...@@ -324,7 +340,7 @@ define([ ...@@ -324,7 +340,7 @@ define([
this.spnMarginLeft = new Common.UI.MetricSpinner({ this.spnMarginLeft = new Common.UI.MetricSpinner({
el: $('#advsettings-spin-margin-left'), el: $('#advsettings-spin-margin-left'),
step: .1, step: .1,
width: 90, width: 110,
defaultUnit : "cm", defaultUnit : "cm",
value: '0.19 cm', value: '0.19 cm',
maxValue: 48.25, maxValue: 48.25,
...@@ -335,7 +351,7 @@ define([ ...@@ -335,7 +351,7 @@ define([
this.spnMarginRight = new Common.UI.MetricSpinner({ this.spnMarginRight = new Common.UI.MetricSpinner({
el: $('#advsettings-spin-margin-right'), el: $('#advsettings-spin-margin-right'),
step: .1, step: .1,
width: 90, width: 110,
defaultUnit : "cm", defaultUnit : "cm",
value: '0.19 cm', value: '0.19 cm',
maxValue: 48.25, maxValue: 48.25,
...@@ -397,7 +413,12 @@ define([ ...@@ -397,7 +413,12 @@ define([
textPageSize: 'Page Size', textPageSize: 'Page Size',
textPageOrientation: 'Page Orientation', textPageOrientation: 'Page Orientation',
strPrint: 'Print', strPrint: 'Print',
textSettings: 'Settings for' textSettings: 'Settings for',
textPageScaling: 'Scaling',
textActualSize: 'Actual Size',
textFitPage: 'Fit Sheet on One Page',
textFitCols: 'Fit All Columns on One Page',
textFitRows: 'Fit All Rows on One Page'
}, SSE.Views.MainSettingsPrint || {})); }, SSE.Views.MainSettingsPrint || {}));
SSE.Views.FileMenuPanels.MainSettingsGeneral = Common.UI.BaseView.extend(_.extend({ SSE.Views.FileMenuPanels.MainSettingsGeneral = Common.UI.BaseView.extend(_.extend({
......
...@@ -51,7 +51,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -51,7 +51,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
options: { options: {
alias: 'PrintSettings', alias: 'PrintSettings',
contentWidth: 280, contentWidth: 280,
height: 482 height: 471
}, },
initialize : function(options) { initialize : function(options) {
...@@ -60,14 +60,14 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -60,14 +60,14 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
template: [ template: [
'<div class="box" style="height:' + (this.options.height-85) + 'px;">', '<div class="box" style="height:' + (this.options.height-85) + 'px;">',
'<div class="menu-panel" style="overflow: hidden;">', '<div class="menu-panel" style="overflow: hidden;">',
'<div style="height: 90px; line-height: 90px;" class="div-category">' + this.textPrintRange + '</div>', '<div style="height: 42px; line-height: 42px;" class="div-category">' + this.textPrintRange + '</div>',
'<div style="height: 55px; line-height: 55px;" class="div-category">' + this.textPageSize + '</div>', '<div style="height: 52px; line-height: 66px;" class="div-category">' + this.textSettings + '</div>',
'<div style="height: 55px; line-height: 55px;" class="div-category">' + this.textPageOrientation + '</div>', '<div style="height: 38px; line-height: 38px;" class="div-category">' + this.textPageSize + '</div>',
'<div style="height: 122px; line-height: 122px;" class="div-category">' + this.strMargins + '</div>', '<div style="height: 38px; line-height: 38px;" class="div-category">' + this.textPageOrientation + '</div>',
// '<div style="height: 73px; line-height: 73px;" class="div-category">' + this.textLayout + '</div>', '<div style="height: 38px; line-height: 38px;" class="div-category">' + this.textScaling + '</div>',
'<div style="height: 73px; line-height: 73px;" class="div-category">' + this.strPrint + '</div>', '<div style="height: 108px; line-height: 33px;" class="div-category">' + this.strMargins + '</div>',
'<div style="height: 58px; line-height: 40px;" class="div-category">' + this.strPrint + '</div>',
'</div>', '</div>',
'<div class="separator"/>',
'<div class="content-panel">' + _.template(contentTemplate)({scope: this}) + '</div>', '<div class="content-panel">' + _.template(contentTemplate)({scope: this}) + '</div>',
'</div>', '</div>',
'<div class="separator horizontal"/>', '<div class="separator horizontal"/>',
...@@ -85,32 +85,33 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -85,32 +85,33 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
render: function() { render: function() {
Common.Views.AdvancedSettingsWindow.prototype.render.call(this); Common.Views.AdvancedSettingsWindow.prototype.render.call(this);
this.radioCurrent = new Common.UI.RadioBox({ this.cmbRange = new Common.UI.ComboBox({
el: $('#printadv-dlg-radio-current'), el : $('#printadv-dlg-combo-range'),
labelText: this.textCurrentSheet, style : 'width: 132px;',
name: 'asc-radio-printrange', menuStyle : 'min-width: 132px;max-height: 280px;',
checked: true editable : false,
}); cls : 'input-group-nr',
this.radioCurrent.on('change', _.bind(this.onRadioRangeChange,this)); data : [
{ value: c_oAscPrintType.ActiveSheets, displayValue: this.textCurrentSheet },
this.radioAll = new Common.UI.RadioBox({ { value: c_oAscPrintType.EntireWorkbook, displayValue: this.textAllSheets },
el: $('#printadv-dlg-radio-all'), { value: c_oAscPrintType.Selection, displayValue: this.textSelection }
labelText: this.textAllSheets, ]
name: 'asc-radio-printrange'
}); });
this.radioAll.on('change', _.bind(this.onRadioRangeChange,this)); this.cmbRange.on('selected', _.bind(this.comboRangeChange, this));
this.radioSelection = new Common.UI.RadioBox({ this.cmbSheet = new Common.UI.ComboBox({
el: $('#printadv-dlg-radio-selection'), el : $('#printadv-dlg-combo-sheets'),
labelText: this.textSelection, style : 'width: 242px;',
name: 'asc-radio-printrange' menuStyle : 'min-width: 242px;max-height: 280px;',
editable : false,
cls : 'input-group-nr',
data : []
}); });
this.radioSelection.on('change', _.bind(this.onRadioRangeChange,this));
this.cmbPaperSize = new Common.UI.ComboBox({ this.cmbPaperSize = new Common.UI.ComboBox({
el : $('#printadv-dlg-combo-pages'), el : $('#printadv-dlg-combo-pages'),
style : 'width: 260px;', style : 'width: 242px;',
menuStyle : 'max-height: 280px; min-width: 260px;', menuStyle : 'max-height: 280px; min-width: 242px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : [ data : [
...@@ -132,8 +133,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -132,8 +133,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
this.cmbPaperOrientation = new Common.UI.ComboBox({ this.cmbPaperOrientation = new Common.UI.ComboBox({
el : $('#printadv-dlg-combo-orient'), el : $('#printadv-dlg-combo-orient'),
style : 'width: 115px;', style : 'width: 132px;',
menuStyle : 'min-width: 115px;', menuStyle : 'min-width: 132px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : [ data : [
...@@ -155,7 +156,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -155,7 +156,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
this.spnMarginTop = new Common.UI.MetricSpinner({ this.spnMarginTop = new Common.UI.MetricSpinner({
el: $('#printadv-dlg-spin-margin-top'), el: $('#printadv-dlg-spin-margin-top'),
step: .1, step: .1,
width: 115, width: 110,
defaultUnit : "cm", defaultUnit : "cm",
value: '0 cm', value: '0 cm',
maxValue: 48.25, maxValue: 48.25,
...@@ -166,7 +167,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -166,7 +167,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
this.spnMarginBottom = new Common.UI.MetricSpinner({ this.spnMarginBottom = new Common.UI.MetricSpinner({
el: $('#printadv-dlg-spin-margin-bottom'), el: $('#printadv-dlg-spin-margin-bottom'),
step: .1, step: .1,
width: 115, width: 110,
defaultUnit : "cm", defaultUnit : "cm",
value: '0 cm', value: '0 cm',
maxValue: 48.25, maxValue: 48.25,
...@@ -177,7 +178,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -177,7 +178,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
this.spnMarginLeft = new Common.UI.MetricSpinner({ this.spnMarginLeft = new Common.UI.MetricSpinner({
el: $('#printadv-dlg-spin-margin-left'), el: $('#printadv-dlg-spin-margin-left'),
step: .1, step: .1,
width: 115, width: 110,
defaultUnit : "cm", defaultUnit : "cm",
value: '0.19 cm', value: '0.19 cm',
maxValue: 48.25, maxValue: 48.25,
...@@ -188,7 +189,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -188,7 +189,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
this.spnMarginRight = new Common.UI.MetricSpinner({ this.spnMarginRight = new Common.UI.MetricSpinner({
el: $('#printadv-dlg-spin-margin-right'), el: $('#printadv-dlg-spin-margin-right'),
step: .1, step: .1,
width: 115, width: 110,
defaultUnit : "cm", defaultUnit : "cm",
value: '0.19 cm', value: '0.19 cm',
maxValue: 48.25, maxValue: 48.25,
...@@ -196,18 +197,19 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -196,18 +197,19 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
}); });
this.spinners.push(this.spnMarginRight); this.spinners.push(this.spnMarginRight);
// this.radioActual = new Common.UI.RadioBox({ this.cmbLayout = new Common.UI.ComboBox({
// el: $('#printadv-dlg-radio-actual'), el : $('#printadv-dlg-combo-layout'),
// labelText: this.textActualSize, style : 'width: 242px;',
// name: 'asc-radio-printlayout' menuStyle : 'min-width: 242px;',
// }); editable : false,
// cls : 'input-group-nr',
// this.radioFit = new Common.UI.RadioBox({ data : [
// el: $('#printadv-dlg-radio-fit'), { value: 0, displayValue: this.textActualSize },
// labelText: this.textFit, { value: 1, displayValue: this.textFitPage },
// name: 'asc-radio-printlayout', { value: 2, displayValue: this.textFitCols },
// checked: true { value: 3, displayValue: this.textFitRows }
// }); ]
});
this.btnHide = new Common.UI.Button({ this.btnHide = new Common.UI.Button({
el: $('#printadv-dlg-btn-hide') el: $('#printadv-dlg-btn-hide')
...@@ -224,23 +226,14 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -224,23 +226,14 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
}, },
setRange: function(value) { setRange: function(value) {
(value==c_oAscPrintType.ActiveSheets) ? this.radioCurrent.setValue(true) : ((value==c_oAscPrintType.EntireWorkbook) ? this.radioAll.setValue(true) : this.radioSelection.setValue(true)); this.cmbRange.setValue(value);
},
setLayout: function(value) {
// (value==c_oAscLayoutPageType.ActualSize) ? this.radioActual.setValue(true) : this.radioFit.setValue(true);
}, },
getRange: function() { getRange: function() {
return (this.radioCurrent.getValue() ? c_oAscPrintType.ActiveSheets : (this.radioAll.getValue() ? c_oAscPrintType.EntireWorkbook : c_oAscPrintType.Selection)); return this.cmbRange.getValue();
},
getLayout: function() {
// return (this.radioActual.getValue() ? c_oAscLayoutPageType.ActualSize : c_oAscLayoutPageType.FitToWidth);
}, },
onRadioRangeChange: function(radio, newvalue) { comboRangeChange: function(combo, record) {
if (newvalue)
this.fireEvent('changerange', this); this.fireEvent('changerange', this);
}, },
...@@ -258,13 +251,13 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -258,13 +251,13 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
if (!this.extended) { if (!this.extended) {
this.extended = true; this.extended = true;
this.panelDetails.css({'display': 'none'}); this.panelDetails.css({'display': 'none'});
this.setHeight(286); this.setHeight(303);
btn.setCaption(this.textShowDetails); btn.setCaption(this.textShowDetails);
Common.localStorage.setItem("sse-hide-print-settings", 1); Common.localStorage.setItem("sse-hide-print-settings", 1);
} else { } else {
this.extended = false; this.extended = false;
this.panelDetails.css({'display': 'block'}); this.panelDetails.css({'display': 'block'});
this.setHeight(482); this.setHeight(471);
btn.setCaption(this.textHideDetails); btn.setCaption(this.textHideDetails);
Common.localStorage.setItem("sse-hide-print-settings", 0); Common.localStorage.setItem("sse-hide-print-settings", 0);
} }
...@@ -290,9 +283,13 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', ...@@ -290,9 +283,13 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template',
textAllSheets: 'All Sheets', textAllSheets: 'All Sheets',
textSelection: 'Selection', textSelection: 'Selection',
textActualSize: 'Actual Size', textActualSize: 'Actual Size',
textFit: 'Fit to width', textFitPage: 'Fit Sheet on One Page',
textFitCols: 'Fit All Columns on One Page',
textFitRows: 'Fit All Rows on One Page',
textShowDetails: 'Show Details', textShowDetails: 'Show Details',
cancelButtonText: 'Cancel', cancelButtonText: 'Cancel',
textHideDetails: 'Hide Details' textHideDetails: 'Hide Details',
textScaling: 'Scaling',
textSettings: 'Sheet Settings'
}, SSE.Views.PrintSettings || {})); }, SSE.Views.PrintSettings || {}));
}); });
\ No newline at end of file
...@@ -197,21 +197,8 @@ define([ ...@@ -197,21 +197,8 @@ define([
id : 'id-toolbar-btn-print', id : 'id-toolbar-btn-print',
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'btn-print', iconCls : 'btn-print',
split : true,
hint : me.tipPrint + Common.Utils.String.platformKey('Ctrl+P'), hint : me.tipPrint + Common.Utils.String.platformKey('Ctrl+P'),
lock : [_set.editCell, _set.cantPrint], lock : [_set.editCell, _set.cantPrint]
menu : new Common.UI.Menu({
items: [
{
caption: me.textPrint,
value: 'print'
},
{
caption: me.textPrintOptions,
value: 'options'
}
]
})
}); });
me.btnSave = new Common.UI.Button({ me.btnSave = new Common.UI.Button({
...@@ -1502,8 +1489,6 @@ define([ ...@@ -1502,8 +1489,6 @@ define([
}) })
}); });
me.mnuPrint = me.btnPrint.menu;
me.lockControls = [ me.lockControls = [
me.cmbFontName, me.cmbFontSize, me.btnIncFontSize, me.btnDecFontSize, me.btnBold, me.cmbFontName, me.cmbFontSize, me.btnIncFontSize, me.btnDecFontSize, me.btnBold,
me.btnItalic, me.btnUnderline, me.btnTextColor, me.btnHorizontalAlign, me.btnAlignLeft, me.btnItalic, me.btnUnderline, me.btnTextColor, me.btnHorizontalAlign, me.btnAlignLeft,
......
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruština", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruština",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "jako Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "jako Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "Obecný", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Obecný",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Tisk", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Tisk",
"SSE.Views.FormulaDialog.cancelButtonText": "Zrušit", "SSE.Views.FormulaDialog.cancelButtonText": "Zrušit",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "Vše", "SSE.Views.FormulaDialog.sCategoryAll": "Vše",
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
"SSE.Views.PrintSettings.textActualSize": "Skutečná velikost", "SSE.Views.PrintSettings.textActualSize": "Skutečná velikost",
"SSE.Views.PrintSettings.textAllSheets": "Všechny listy", "SSE.Views.PrintSettings.textAllSheets": "Všechny listy",
"SSE.Views.PrintSettings.textCurrentSheet": "Aktuální list", "SSE.Views.PrintSettings.textCurrentSheet": "Aktuální list",
"SSE.Views.PrintSettings.textFit": "Přizpůsobit šířce", "del_SSE.Views.PrintSettings.textFit": "Přizpůsobit šířce",
"SSE.Views.PrintSettings.textHideDetails": "Skrýt podrobnosti", "SSE.Views.PrintSettings.textHideDetails": "Skrýt podrobnosti",
"SSE.Views.PrintSettings.textLayout": "Rozložení", "SSE.Views.PrintSettings.textLayout": "Rozložení",
"SSE.Views.PrintSettings.textPageOrientation": "Otočení stránky", "SSE.Views.PrintSettings.textPageOrientation": "Otočení stránky",
......
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "wie Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "wie Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "Allgemein", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Allgemein",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Drucken", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Drucken",
"SSE.Views.FormulaDialog.cancelButtonText": "Abbrechen", "SSE.Views.FormulaDialog.cancelButtonText": "Abbrechen",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
"SSE.Views.PrintSettings.textActualSize": "Volle Größe", "SSE.Views.PrintSettings.textActualSize": "Volle Größe",
"SSE.Views.PrintSettings.textAllSheets": "Alle Blätter", "SSE.Views.PrintSettings.textAllSheets": "Alle Blätter",
"SSE.Views.PrintSettings.textCurrentSheet": "Aktuelles Blatt", "SSE.Views.PrintSettings.textCurrentSheet": "Aktuelles Blatt",
"SSE.Views.PrintSettings.textFit": "An Breite anpassen", "del_SSE.Views.PrintSettings.textFit": "An Breite anpassen",
"SSE.Views.PrintSettings.textHideDetails": "Details ausblenden", "SSE.Views.PrintSettings.textHideDetails": "Details ausblenden",
"SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textLayout": "Layout",
"SSE.Views.PrintSettings.textPageOrientation": "Seitenorientierung", "SSE.Views.PrintSettings.textPageOrientation": "Seitenorientierung",
......
...@@ -500,7 +500,8 @@ ...@@ -500,7 +500,8 @@
"SSE.Views.FileMenuPanels.Settings.strAutoRecover": "Turn on autorecover", "SSE.Views.FileMenuPanels.Settings.strAutoRecover": "Turn on autorecover",
"SSE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover", "SSE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Print", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Print",
"SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Page Settings",
"SSE.Views.FormulaDialog.cancelButtonText": "Cancel", "SSE.Views.FormulaDialog.cancelButtonText": "Cancel",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -588,6 +589,11 @@ ...@@ -588,6 +589,11 @@
"SSE.Views.MainSettingsPrint.textPrintGrid": "Print Gridlines", "SSE.Views.MainSettingsPrint.textPrintGrid": "Print Gridlines",
"SSE.Views.MainSettingsPrint.textPrintHeadings": "Print Row and Column Headings", "SSE.Views.MainSettingsPrint.textPrintHeadings": "Print Row and Column Headings",
"SSE.Views.MainSettingsPrint.textSettings": "Settings for", "SSE.Views.MainSettingsPrint.textSettings": "Settings for",
"SSE.Views.MainSettingsPrint.textPageScaling": "Scaling",
"SSE.Views.MainSettingsPrint.textActualSize": "Actual Size",
"SSE.Views.MainSettingsPrint.textFitPage": "Fit Sheet on One Page",
"SSE.Views.MainSettingsPrint.textFitCols": "Fit All Columns on One Page",
"SSE.Views.MainSettingsPrint.textFitRows": "Fit All Rows on One Page",
"SSE.Views.NamedRangeEditDlg.cancelButtonText": "Cancel", "SSE.Views.NamedRangeEditDlg.cancelButtonText": "Cancel",
"SSE.Views.NamedRangeEditDlg.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created<br>at the moment as some of them are being edited.", "SSE.Views.NamedRangeEditDlg.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created<br>at the moment as some of them are being edited.",
"SSE.Views.NamedRangeEditDlg.namePlaceholder": "Defined name", "SSE.Views.NamedRangeEditDlg.namePlaceholder": "Defined name",
...@@ -680,7 +686,7 @@ ...@@ -680,7 +686,7 @@
"SSE.Views.PrintSettings.textActualSize": "Actual Size", "SSE.Views.PrintSettings.textActualSize": "Actual Size",
"SSE.Views.PrintSettings.textAllSheets": "All Sheets", "SSE.Views.PrintSettings.textAllSheets": "All Sheets",
"SSE.Views.PrintSettings.textCurrentSheet": "Current Sheet", "SSE.Views.PrintSettings.textCurrentSheet": "Current Sheet",
"SSE.Views.PrintSettings.textFit": "Fit to width", "del_SSE.Views.PrintSettings.textFit": "Fit to width",
"SSE.Views.PrintSettings.textHideDetails": "Hide Details", "SSE.Views.PrintSettings.textHideDetails": "Hide Details",
"SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textLayout": "Layout",
"SSE.Views.PrintSettings.textPageOrientation": "Page Orientation", "SSE.Views.PrintSettings.textPageOrientation": "Page Orientation",
...@@ -691,6 +697,11 @@ ...@@ -691,6 +697,11 @@
"SSE.Views.PrintSettings.textSelection": "Selection", "SSE.Views.PrintSettings.textSelection": "Selection",
"SSE.Views.PrintSettings.textShowDetails": "Show Details", "SSE.Views.PrintSettings.textShowDetails": "Show Details",
"SSE.Views.PrintSettings.textTitle": "Print Settings", "SSE.Views.PrintSettings.textTitle": "Print Settings",
"SSE.Views.PrintSettings.textPageScaling": "Scaling",
"SSE.Views.PrintSettings.textFitPage": "Fit Sheet on One Page",
"SSE.Views.PrintSettings.textFitCols": "Fit All Columns on One Page",
"SSE.Views.PrintSettings.textFitRows": "Fit All Rows on One Page",
"SSE.Views.PrintSettings.textSettings": "Sheet Settings",
"SSE.Views.RightMenu.txtChartSettings": "Chart Settings", "SSE.Views.RightMenu.txtChartSettings": "Chart Settings",
"SSE.Views.RightMenu.txtImageSettings": "Image Settings", "SSE.Views.RightMenu.txtImageSettings": "Image Settings",
"SSE.Views.RightMenu.txtParagraphSettings": "Text Settings", "SSE.Views.RightMenu.txtParagraphSettings": "Text Settings",
......
...@@ -496,7 +496,7 @@ ...@@ -496,7 +496,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruso", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruso",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimir", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimir",
"SSE.Views.FormulaDialog.cancelButtonText": "Cancelar", "SSE.Views.FormulaDialog.cancelButtonText": "Cancelar",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
"SSE.Views.PrintSettings.textActualSize": "Tamaño actual", "SSE.Views.PrintSettings.textActualSize": "Tamaño actual",
"SSE.Views.PrintSettings.textAllSheets": "Todas las hojas", "SSE.Views.PrintSettings.textAllSheets": "Todas las hojas",
"SSE.Views.PrintSettings.textCurrentSheet": "Hoja actual", "SSE.Views.PrintSettings.textCurrentSheet": "Hoja actual",
"SSE.Views.PrintSettings.textFit": "Ajustar al ancho", "del_SSE.Views.PrintSettings.textFit": "Ajustar al ancho",
"SSE.Views.PrintSettings.textHideDetails": "Ocultar detalles", "SSE.Views.PrintSettings.textHideDetails": "Ocultar detalles",
"SSE.Views.PrintSettings.textLayout": "Diseño", "SSE.Views.PrintSettings.textLayout": "Diseño",
"SSE.Views.PrintSettings.textPageOrientation": "Orientación de página", "SSE.Views.PrintSettings.textPageOrientation": "Orientación de página",
......
...@@ -496,7 +496,7 @@ ...@@ -496,7 +496,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "comme Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "comme Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "Général", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Général",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimer", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimer",
"SSE.Views.FormulaDialog.cancelButtonText": "Annuler", "SSE.Views.FormulaDialog.cancelButtonText": "Annuler",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
"SSE.Views.PrintSettings.textActualSize": "Taille réelle", "SSE.Views.PrintSettings.textActualSize": "Taille réelle",
"SSE.Views.PrintSettings.textAllSheets": "Toutes les feuilles", "SSE.Views.PrintSettings.textAllSheets": "Toutes les feuilles",
"SSE.Views.PrintSettings.textCurrentSheet": "Feuille active", "SSE.Views.PrintSettings.textCurrentSheet": "Feuille active",
"SSE.Views.PrintSettings.textFit": "Ajuster à la largeur", "del_SSE.Views.PrintSettings.textFit": "Ajuster à la largeur",
"SSE.Views.PrintSettings.textHideDetails": "Masquer détails", "SSE.Views.PrintSettings.textHideDetails": "Masquer détails",
"SSE.Views.PrintSettings.textLayout": "Disposition", "SSE.Views.PrintSettings.textLayout": "Disposition",
"SSE.Views.PrintSettings.textPageOrientation": "Orientation de la page", "SSE.Views.PrintSettings.textPageOrientation": "Orientation de la page",
......
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "come Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "come Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "Generale", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Generale",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Stampa", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Stampa",
"SSE.Views.FormulaDialog.cancelButtonText": "Annulla", "SSE.Views.FormulaDialog.cancelButtonText": "Annulla",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
"SSE.Views.PrintSettings.textActualSize": "Dimensione reale", "SSE.Views.PrintSettings.textActualSize": "Dimensione reale",
"SSE.Views.PrintSettings.textAllSheets": "Tutti i fogli", "SSE.Views.PrintSettings.textAllSheets": "Tutti i fogli",
"SSE.Views.PrintSettings.textCurrentSheet": "Foglio attuale", "SSE.Views.PrintSettings.textCurrentSheet": "Foglio attuale",
"SSE.Views.PrintSettings.textFit": "Adatta alla larghezza", "del_SSE.Views.PrintSettings.textFit": "Adatta alla larghezza",
"SSE.Views.PrintSettings.textHideDetails": "Nascondi dettagli", "SSE.Views.PrintSettings.textHideDetails": "Nascondi dettagli",
"SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textLayout": "Layout",
"SSE.Views.PrintSettings.textPageOrientation": "Orientamento pagina", "SSE.Views.PrintSettings.textPageOrientation": "Orientamento pagina",
......
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Print", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Print",
"SSE.Views.FormulaDialog.cancelButtonText": "Atcelt", "SSE.Views.FormulaDialog.cancelButtonText": "Atcelt",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
"SSE.Views.PrintSettings.textActualSize": "Actual Size", "SSE.Views.PrintSettings.textActualSize": "Actual Size",
"SSE.Views.PrintSettings.textAllSheets": "All Sheets", "SSE.Views.PrintSettings.textAllSheets": "All Sheets",
"SSE.Views.PrintSettings.textCurrentSheet": "Current Sheet", "SSE.Views.PrintSettings.textCurrentSheet": "Current Sheet",
"SSE.Views.PrintSettings.textFit": "Fit to width", "del_SSE.Views.PrintSettings.textFit": "Fit to width",
"SSE.Views.PrintSettings.textHideDetails": "Hide Details", "SSE.Views.PrintSettings.textHideDetails": "Hide Details",
"SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textLayout": "Layout",
"SSE.Views.PrintSettings.textPageOrientation": "Lapas orientācija", "SSE.Views.PrintSettings.textPageOrientation": "Lapas orientācija",
......
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "Geral", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Geral",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimir", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Imprimir",
"SSE.Views.FormulaDialog.cancelButtonText": "Cancelar", "SSE.Views.FormulaDialog.cancelButtonText": "Cancelar",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
"SSE.Views.PrintSettings.textActualSize": "Tamanho real", "SSE.Views.PrintSettings.textActualSize": "Tamanho real",
"SSE.Views.PrintSettings.textAllSheets": "Todas as folhas", "SSE.Views.PrintSettings.textAllSheets": "Todas as folhas",
"SSE.Views.PrintSettings.textCurrentSheet": "Folha atual", "SSE.Views.PrintSettings.textCurrentSheet": "Folha atual",
"SSE.Views.PrintSettings.textFit": "Ajustar à Largura", "del_SSE.Views.PrintSettings.textFit": "Ajustar à Largura",
"SSE.Views.PrintSettings.textHideDetails": "Ocultar detalhes", "SSE.Views.PrintSettings.textHideDetails": "Ocultar detalhes",
"SSE.Views.PrintSettings.textLayout": "Layout", "SSE.Views.PrintSettings.textLayout": "Layout",
"SSE.Views.PrintSettings.textPageOrientation": "Orientação da página", "SSE.Views.PrintSettings.textPageOrientation": "Orientação da página",
......
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
"SSE.Views.FileMenuPanels.Settings.strAutoRecover": "Включить автовосстановление", "SSE.Views.FileMenuPanels.Settings.strAutoRecover": "Включить автовосстановление",
"SSE.Views.FileMenuPanels.Settings.textAutoRecover": "Автовосстановление", "SSE.Views.FileMenuPanels.Settings.textAutoRecover": "Автовосстановление",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "Общие", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Общие",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Печать", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Печать",
"SSE.Views.FormulaDialog.cancelButtonText": "Отмена", "SSE.Views.FormulaDialog.cancelButtonText": "Отмена",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -680,7 +680,7 @@ ...@@ -680,7 +680,7 @@
"SSE.Views.PrintSettings.textActualSize": "Реальный размер", "SSE.Views.PrintSettings.textActualSize": "Реальный размер",
"SSE.Views.PrintSettings.textAllSheets": "Все листы", "SSE.Views.PrintSettings.textAllSheets": "Все листы",
"SSE.Views.PrintSettings.textCurrentSheet": "Текущий лист", "SSE.Views.PrintSettings.textCurrentSheet": "Текущий лист",
"SSE.Views.PrintSettings.textFit": "По ширине", "del_SSE.Views.PrintSettings.textFit": "По ширине",
"SSE.Views.PrintSettings.textHideDetails": "Скрыть детали", "SSE.Views.PrintSettings.textHideDetails": "Скрыть детали",
"SSE.Views.PrintSettings.textLayout": "Макет", "SSE.Views.PrintSettings.textLayout": "Макет",
"SSE.Views.PrintSettings.textPageOrientation": "Ориентация страницы", "SSE.Views.PrintSettings.textPageOrientation": "Ориентация страницы",
......
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "kot Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "kot Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "Splošen", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Splošen",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Natisni", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Natisni",
"SSE.Views.FormulaDialog.cancelButtonText": "Prekliči", "SSE.Views.FormulaDialog.cancelButtonText": "Prekliči",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
"SSE.Views.PrintSettings.textActualSize": "Dejanska velikost", "SSE.Views.PrintSettings.textActualSize": "Dejanska velikost",
"SSE.Views.PrintSettings.textAllSheets": "Vsi listi", "SSE.Views.PrintSettings.textAllSheets": "Vsi listi",
"SSE.Views.PrintSettings.textCurrentSheet": "Trenuten list", "SSE.Views.PrintSettings.textCurrentSheet": "Trenuten list",
"SSE.Views.PrintSettings.textFit": "Prilagodi k širini", "del_SSE.Views.PrintSettings.textFit": "Prilagodi k širini",
"SSE.Views.PrintSettings.textHideDetails": "Skrij podrobnosti", "SSE.Views.PrintSettings.textHideDetails": "Skrij podrobnosti",
"SSE.Views.PrintSettings.textLayout": "Postavitev", "SSE.Views.PrintSettings.textLayout": "Postavitev",
"SSE.Views.PrintSettings.textPageOrientation": "Orientacija strani", "SSE.Views.PrintSettings.textPageOrientation": "Orientacija strani",
......
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windows olarak", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windows olarak",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "Genel", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Genel",
"SSE.Views.FileMenuPanels.Settings.txtPrint": "Yazdır", "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Yazdır",
"SSE.Views.FormulaDialog.cancelButtonText": "İptal Et", "SSE.Views.FormulaDialog.cancelButtonText": "İptal Et",
"SSE.Views.FormulaDialog.okButtonText": "TAMAM", "SSE.Views.FormulaDialog.okButtonText": "TAMAM",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
"SSE.Views.PrintSettings.textActualSize": "Gerçek Boyut", "SSE.Views.PrintSettings.textActualSize": "Gerçek Boyut",
"SSE.Views.PrintSettings.textAllSheets": "Tüm Tablolar", "SSE.Views.PrintSettings.textAllSheets": "Tüm Tablolar",
"SSE.Views.PrintSettings.textCurrentSheet": "Mevcut Tablo", "SSE.Views.PrintSettings.textCurrentSheet": "Mevcut Tablo",
"SSE.Views.PrintSettings.textFit": "Genişliğe Sığdır", "del_SSE.Views.PrintSettings.textFit": "Genişliğe Sığdır",
"SSE.Views.PrintSettings.textHideDetails": "Detayları Gizle", "SSE.Views.PrintSettings.textHideDetails": "Detayları Gizle",
"SSE.Views.PrintSettings.textLayout": "Tasarım", "SSE.Views.PrintSettings.textLayout": "Tasarım",
"SSE.Views.PrintSettings.textPageOrientation": "Sayfa Orientasyonu", "SSE.Views.PrintSettings.textPageOrientation": "Sayfa Orientasyonu",
......
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