From 89e4aae0867c5a16ef967cded2932e063c2ddd98 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 1 Apr 2016 16:01:12 +0300 Subject: [PATCH] =?UTF-8?q?[SSE]=20Bug=2021666,=2025965=20:=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=B5=D1=87=D0=B0?= =?UTF-8?q?=D1=82=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/controller/Print.js | 224 +++++++----------- .../main/app/template/PrintSettings.template | 22 +- .../main/app/view/FileMenuPanels.js | 53 +++-- .../main/app/view/PrintSettings.js | 123 +++++----- apps/spreadsheeteditor/main/locale/cs.json | 4 +- apps/spreadsheeteditor/main/locale/de.json | 4 +- apps/spreadsheeteditor/main/locale/en.json | 15 +- apps/spreadsheeteditor/main/locale/es.json | 4 +- apps/spreadsheeteditor/main/locale/fr.json | 4 +- apps/spreadsheeteditor/main/locale/it.json | 4 +- apps/spreadsheeteditor/main/locale/lv.json | 4 +- apps/spreadsheeteditor/main/locale/pt.json | 4 +- apps/spreadsheeteditor/main/locale/ru.json | 4 +- apps/spreadsheeteditor/main/locale/sl.json | 4 +- apps/spreadsheeteditor/main/locale/tr.json | 4 +- 15 files changed, 223 insertions(+), 254 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index 17abfa8ac..099ac4e0e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -11,13 +11,13 @@ define([ ], initialize: function() { - this.adjPrintParams = new Asc.asc_CAdjustPrint(); - this.adjPrintParams.asc_setLayoutPageType(c_oAscLayoutPageType.ActualSize); - var value = Common.localStorage.getItem("sse-print-settings-range"); value = (value!==null) ? parseInt(value) : c_oAscPrintType.ActiveSheets; + + this.adjPrintParams = new Asc.asc_CAdjustPrint(); this.adjPrintParams.asc_setPrintType(value); - this.diffParams = {}; + + this._changedProps = null; this.addListeners({ 'MainSettingsPrint': { @@ -35,11 +35,12 @@ define([ }, 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)); var toolbar = SSE.getController('Toolbar').getView('Toolbar'); if (toolbar) toolbar.mnuPrint.on('item:click', _.bind(this.openPrintSettings, this)); + this.registerControlEvents(this.printSettings); }, setApi: function(o) { @@ -49,16 +50,15 @@ define([ updateSheetsInfo: function() { if (this.printSettings.isVisible()) { - this.updateSettings(); + this.updateSettings(this.printSettings); } else { this.isFillSheets = false; - this.diffParams = {}; } }, - updateSettings: function() { + updateSettings: function(panel) { var wc = this.api.asc_getWorksheetsCount(), i = -1; - var items = [{displayValue: this.strAllSheets, value:-255}]; + var items = []; while (++i < wc) { if (!this.api.asc_isWorksheetHidden(i)) { @@ -69,87 +69,16 @@ define([ } } - this.printSettings.cmbSheet.store.reset(items); - var item = this.printSettings.cmbSheet.store.findWhere({value: this.printSettings.cmbSheet.getValue()}) || - this.printSettings.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); + panel.cmbSheet.store.reset(items); + var item = panel.cmbSheet.store.findWhere({value: panel.cmbSheet.getValue()}) || + panel.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); 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) { - if (this.isDiffRefill()) { - 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'); + comboSheetsChange: function(panel, combo, record) { + this.fillPageOptions(panel, this._changedProps[record.value] ? this._changedProps[record.value] : this.api.asc_getPageOptions(record.value)); }, fillPageOptions: function(panel, props) { @@ -167,6 +96,16 @@ define([ else 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(); panel.spnMarginLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getLeft())); panel.spnMarginTop.setValue(Common.Utils.Metric.fnRecalcFromMM(opt.asc_getTop())); @@ -177,9 +116,20 @@ define([ panel.chPrintRows.setValue(props.asc_getHeadings()); }, - fillPrintOptions: function(panel, props) { - panel.setRange(props.asc_getPrintType()); -// panel.setLayout(props.asc_getLayoutPageType()); + fillPrintOptions: function(props) { + this.printSettingsDlg.setRange(props.asc_getPrintType()); + this.onChangeRange(); + }, + + onChangeRange: function() { + var printtype = this.printSettingsDlg.getRange(), + 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) { @@ -193,10 +143,13 @@ define([ var pagew = /^\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_setHeight(!pageh? undefined : parseFloat(pageh[0])); -// } + + + var value = panel.cmbLayout.getValue(); + opt.asc_setFitToWidth(value==1 || value==2); + opt.asc_getFitToHeight(value==1 || value==3); props.asc_setPageSetup(opt); @@ -211,45 +164,28 @@ define([ return props; }, - savePageOptions: function(panel, index) { - var opts = this.getPageOptions(panel); - - if (index == -255) { - var wc = this.api.asc_getWorksheetsCount(); + savePageOptions: function(panel) { + var wc = this.api.asc_getWorksheetsCount(), index = -1; - while (++index < wc) { - this.api.asc_setPageOptions(opts, 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 = {}; + while (++index < wc) { + if (this._changedProps[index]) + this.api.asc_setPageOptions(this._changedProps[index], index); } }, onShowMainSettingsPrint: function() { + this._changedProps = []; + if (!this.isFillSheets) { 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()}); - if (item) { - this.printSettings.cmbSheet.setValue(item.get('value')); - this.comboSheetsChange(this.printSettings.cmbSheet, item.toJSON()); - } + var item = this.printSettings.cmbSheet.store.findWhere({value: this.api.asc_getActiveWorksheetIndex()}); + if (item) { + this.printSettings.cmbSheet.setValue(item.get('value')); + this.comboSheetsChange(this.printSettings, this.printSettings.cmbSheet, item.toJSON()); } }, @@ -258,8 +194,11 @@ define([ this.printSettingsDlg = (new SSE.Views.PrintSettings({ handler: _.bind(this.resultPrintSettings,this), afterrender: _.bind(function() { - this.fillPageOptions(this.printSettingsDlg, this.api.asc_getPageOptions()); - this.fillPrintOptions(this.printSettingsDlg, this.adjPrintParams); + this._changedProps = []; + 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.printSettingsDlg.show(); @@ -270,36 +209,23 @@ define([ var view = SSE.getController('Toolbar').getView('Toolbar'); if (result == 'ok') { 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(); this.adjPrintParams.asc_setPrintType(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.isUpdatedSettings = false; + Common.NotificationCenter.trigger('edit:complete', view); } else return true; - } - - 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; + } else + Common.NotificationCenter.trigger('edit:complete', view); }, querySavePrintSettings: function() { if ( this.checkMargins(this.printSettings) ) { - this.savePageOptions(this.printSettings, this.printSettings.cmbSheet.getValue()); + this.savePageOptions(this.printSettings); this.printSettings.applySettings(); } }, @@ -346,6 +272,24 @@ define([ 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', strAllSheets: 'All Sheets', textWarning: 'Warning' diff --git a/apps/spreadsheeteditor/main/app/template/PrintSettings.template b/apps/spreadsheeteditor/main/app/template/PrintSettings.template index 921fe9a71..003224ded 100644 --- a/apps/spreadsheeteditor/main/app/template/PrintSettings.template +++ b/apps/spreadsheeteditor/main/app/template/PrintSettings.template @@ -1,19 +1,20 @@
-
-
-
+
+
+
+
-
-
+
+ +
-
@@ -21,7 +22,7 @@ - + @@ -34,12 +35,7 @@
-
- - - - - +
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 6202bc505..e5fb8f753 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -102,7 +102,7 @@ define([ el: $('#id-settings-menu'), store: new Common.UI.DataViewStore([ {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([ '
', @@ -141,7 +141,7 @@ define([ }, txtGeneral: 'General', - txtPrint: 'Print' + txtPageSettings: 'Page Settings' }, SSE.Views.FileMenuPanels.Settings || {})); SSE.Views.MainSettingsPrint = Common.UI.BaseView.extend(_.extend({ @@ -161,6 +161,10 @@ define([ '', '', '','', + '', + '', + '', + '','', '', '', '
', @@ -213,19 +217,17 @@ define([ this.cmbSheet = new Common.UI.ComboBox({ el : $('#advsettings-print-combo-sheets'), - style : 'width: 260px;', - menuStyle : 'min-width: 260px;max-height: 280px;', + style : 'width: 242px;', + menuStyle : 'min-width: 242px;max-height: 280px;', editable : false, cls : 'input-group-nr', - data : [ - { value: -255, displayValue: this.strAllSheets } - ] + data : [] }); this.cmbPaperSize = new Common.UI.ComboBox({ el : $('#advsettings-print-combo-pages'), - style : 'width: 260px;', - menuStyle : 'max-height: 280px; min-width: 260px;', + style : 'width: 242px;', + menuStyle : 'max-height: 280px; min-width: 242px;', editable : false, cls : 'input-group-nr', data : [ @@ -247,8 +249,8 @@ define([ this.cmbPaperOrientation = new Common.UI.ComboBox({ el : $('#advsettings-print-combo-orient'), - style : 'width: 200px;', - menuStyle : 'min-width: 200px;', + style : 'width: 132px;', + menuStyle : 'min-width: 132px;', editable : false, cls : 'input-group-nr', data : [ @@ -257,6 +259,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({ el: $('#advsettings-print-chb-grid'), labelText: this.textPrintGrid @@ -270,7 +286,7 @@ define([ this.spnMarginTop = new Common.UI.MetricSpinner({ el: $('#advsettings-spin-margin-top'), step: .1, - width: 90, + width: 110, defaultUnit : "cm", value: '0 cm', maxValue: 48.25, @@ -281,7 +297,7 @@ define([ this.spnMarginBottom = new Common.UI.MetricSpinner({ el: $('#advsettings-spin-margin-bottom'), step: .1, - width: 90, + width: 110, defaultUnit : "cm", value: '0 cm', maxValue: 48.25, @@ -292,7 +308,7 @@ define([ this.spnMarginLeft = new Common.UI.MetricSpinner({ el: $('#advsettings-spin-margin-left'), step: .1, - width: 90, + width: 110, defaultUnit : "cm", value: '0.19 cm', maxValue: 48.25, @@ -303,7 +319,7 @@ define([ this.spnMarginRight = new Common.UI.MetricSpinner({ el: $('#advsettings-spin-margin-right'), step: .1, - width: 90, + width: 110, defaultUnit : "cm", value: '0.19 cm', maxValue: 48.25, @@ -365,7 +381,12 @@ define([ textPageSize: 'Page Size', textPageOrientation: 'Page Orientation', 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.FileMenuPanels.MainSettingsGeneral = Common.UI.BaseView.extend(_.extend({ diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js index 44bae06a4..a7a8400ec 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js @@ -19,7 +19,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', options: { alias: 'PrintSettings', contentWidth: 280, - height: 482 + height: 471 }, initialize : function(options) { @@ -28,14 +28,14 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', template: [ '
', '
', - '
' + this.textPrintRange + '
', - '
' + this.textPageSize + '
', - '
' + this.textPageOrientation + '
', - '
' + this.strMargins + '
', -// '
' + this.textLayout + '
', - '
' + this.strPrint + '
', + '
' + this.textPrintRange + '
', + '
' + this.textSettings + '
', + '
' + this.textPageSize + '
', + '
' + this.textPageOrientation + '
', + '
' + this.textScaling + '
', + '
' + this.strMargins + '
', + '
' + this.strPrint + '
', '
', - '
', '
' + _.template(contentTemplate)({scope: this}) + '
', '
', '
', @@ -53,32 +53,33 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', render: function() { Common.Views.AdvancedSettingsWindow.prototype.render.call(this); - this.radioCurrent = new Common.UI.RadioBox({ - el: $('#printadv-dlg-radio-current'), - labelText: this.textCurrentSheet, - name: 'asc-radio-printrange', - checked: true + this.cmbRange = new Common.UI.ComboBox({ + el : $('#printadv-dlg-combo-range'), + style : 'width: 132px;', + menuStyle : 'min-width: 132px;max-height: 280px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: c_oAscPrintType.ActiveSheets, displayValue: this.textCurrentSheet }, + { value: c_oAscPrintType.EntireWorkbook, displayValue: this.textAllSheets }, + { value: c_oAscPrintType.Selection, displayValue: this.textSelection } + ] }); - this.radioCurrent.on('change', _.bind(this.onRadioRangeChange,this)); + this.cmbRange.on('selected', _.bind(this.comboRangeChange, this)); - this.radioAll = new Common.UI.RadioBox({ - el: $('#printadv-dlg-radio-all'), - labelText: this.textAllSheets, - name: 'asc-radio-printrange' + this.cmbSheet = new Common.UI.ComboBox({ + el : $('#printadv-dlg-combo-sheets'), + style : 'width: 242px;', + menuStyle : 'min-width: 242px;max-height: 280px;', + editable : false, + cls : 'input-group-nr', + data : [] }); - this.radioAll.on('change', _.bind(this.onRadioRangeChange,this)); - - this.radioSelection = new Common.UI.RadioBox({ - el: $('#printadv-dlg-radio-selection'), - labelText: this.textSelection, - name: 'asc-radio-printrange' - }); - this.radioSelection.on('change', _.bind(this.onRadioRangeChange,this)); this.cmbPaperSize = new Common.UI.ComboBox({ el : $('#printadv-dlg-combo-pages'), - style : 'width: 260px;', - menuStyle : 'max-height: 280px; min-width: 260px;', + style : 'width: 242px;', + menuStyle : 'max-height: 280px; min-width: 242px;', editable : false, cls : 'input-group-nr', data : [ @@ -100,8 +101,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.cmbPaperOrientation = new Common.UI.ComboBox({ el : $('#printadv-dlg-combo-orient'), - style : 'width: 115px;', - menuStyle : 'min-width: 115px;', + style : 'width: 132px;', + menuStyle : 'min-width: 132px;', editable : false, cls : 'input-group-nr', data : [ @@ -123,7 +124,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.spnMarginTop = new Common.UI.MetricSpinner({ el: $('#printadv-dlg-spin-margin-top'), step: .1, - width: 115, + width: 110, defaultUnit : "cm", value: '0 cm', maxValue: 48.25, @@ -134,7 +135,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.spnMarginBottom = new Common.UI.MetricSpinner({ el: $('#printadv-dlg-spin-margin-bottom'), step: .1, - width: 115, + width: 110, defaultUnit : "cm", value: '0 cm', maxValue: 48.25, @@ -145,7 +146,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.spnMarginLeft = new Common.UI.MetricSpinner({ el: $('#printadv-dlg-spin-margin-left'), step: .1, - width: 115, + width: 110, defaultUnit : "cm", value: '0.19 cm', maxValue: 48.25, @@ -156,7 +157,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', this.spnMarginRight = new Common.UI.MetricSpinner({ el: $('#printadv-dlg-spin-margin-right'), step: .1, - width: 115, + width: 110, defaultUnit : "cm", value: '0.19 cm', maxValue: 48.25, @@ -164,18 +165,19 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', }); this.spinners.push(this.spnMarginRight); -// this.radioActual = new Common.UI.RadioBox({ -// el: $('#printadv-dlg-radio-actual'), -// labelText: this.textActualSize, -// name: 'asc-radio-printlayout' -// }); -// -// this.radioFit = new Common.UI.RadioBox({ -// el: $('#printadv-dlg-radio-fit'), -// labelText: this.textFit, -// name: 'asc-radio-printlayout', -// checked: true -// }); + this.cmbLayout = new Common.UI.ComboBox({ + el : $('#printadv-dlg-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.btnHide = new Common.UI.Button({ el: $('#printadv-dlg-btn-hide') @@ -192,24 +194,15 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', }, setRange: function(value) { - (value==c_oAscPrintType.ActiveSheets) ? this.radioCurrent.setValue(true) : ((value==c_oAscPrintType.EntireWorkbook) ? this.radioAll.setValue(true) : this.radioSelection.setValue(true)); - }, - - setLayout: function(value) { -// (value==c_oAscLayoutPageType.ActualSize) ? this.radioActual.setValue(true) : this.radioFit.setValue(true); + this.cmbRange.setValue(value); }, 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) { - if (newvalue) - this.fireEvent('changerange', this); + comboRangeChange: function(combo, record) { + this.fireEvent('changerange', this); }, updateMetricUnit: function() { @@ -226,13 +219,13 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', if (!this.extended) { this.extended = true; this.panelDetails.css({'display': 'none'}); - this.setHeight(286); + this.setHeight(303); btn.setCaption(this.textShowDetails); Common.localStorage.setItem("sse-hide-print-settings", 1); } else { this.extended = false; this.panelDetails.css({'display': 'block'}); - this.setHeight(482); + this.setHeight(471); btn.setCaption(this.textHideDetails); Common.localStorage.setItem("sse-hide-print-settings", 0); } @@ -258,9 +251,13 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', textAllSheets: 'All Sheets', textSelection: 'Selection', 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', cancelButtonText: 'Cancel', - textHideDetails: 'Hide Details' + textHideDetails: 'Hide Details', + textScaling: 'Scaling', + textSettings: 'Sheet Settings' }, SSE.Views.PrintSettings || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index e20a2ef35..a7d59f0f0 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruština", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "jako Windows", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "Vše", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Skutečná velikost", "SSE.Views.PrintSettings.textAllSheets": "Všechny listy", "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.textLayout": "Rozložení", "SSE.Views.PrintSettings.textPageOrientation": "Otočení stránky", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 4814cad60..82f184436 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "wie Windows", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Volle Größe", "SSE.Views.PrintSettings.textAllSheets": "Alle Blätter", "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.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Seitenorientierung", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index d88326cf3..655e4cf36 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -500,7 +500,8 @@ "SSE.Views.FileMenuPanels.Settings.strAutoRecover": "Turn on autorecover", "SSE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -588,6 +589,11 @@ "SSE.Views.MainSettingsPrint.textPrintGrid": "Print Gridlines", "SSE.Views.MainSettingsPrint.textPrintHeadings": "Print Row and Column Headings", "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.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created
at the moment as some of them are being edited.", "SSE.Views.NamedRangeEditDlg.namePlaceholder": "Defined name", @@ -680,7 +686,7 @@ "SSE.Views.PrintSettings.textActualSize": "Actual Size", "SSE.Views.PrintSettings.textAllSheets": "All Sheets", "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.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Page Orientation", @@ -691,6 +697,11 @@ "SSE.Views.PrintSettings.textSelection": "Selection", "SSE.Views.PrintSettings.textShowDetails": "Show Details", "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.txtImageSettings": "Image Settings", "SSE.Views.RightMenu.txtParagraphSettings": "Text Settings", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 6507d28d5..377847c92 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -496,7 +496,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruso", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -676,7 +676,7 @@ "SSE.Views.PrintSettings.textActualSize": "Tamaño actual", "SSE.Views.PrintSettings.textAllSheets": "Todas las hojas", "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.textLayout": "Diseño", "SSE.Views.PrintSettings.textPageOrientation": "Orientación de página", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index d2c996b0d..6352f570b 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -496,7 +496,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "comme Windows", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -676,7 +676,7 @@ "SSE.Views.PrintSettings.textActualSize": "Taille réelle", "SSE.Views.PrintSettings.textAllSheets": "Toutes les feuilles", "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.textLayout": "Disposition", "SSE.Views.PrintSettings.textPageOrientation": "Orientation de la page", diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index b1777cf8b..95f4f2413 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "come Windows", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Dimensione reale", "SSE.Views.PrintSettings.textAllSheets": "Tutti i fogli", "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.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Orientamento pagina", diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index 8f822c585..32743f025 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Actual Size", "SSE.Views.PrintSettings.textAllSheets": "All Sheets", "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.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Lapas orientācija", diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index 77a9e0a8b..cf84de471 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Tamanho real", "SSE.Views.PrintSettings.textAllSheets": "Todas as folhas", "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.textLayout": "Layout", "SSE.Views.PrintSettings.textPageOrientation": "Orientação da página", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 5d3caa437..83de321c2 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -499,7 +499,7 @@ "SSE.Views.FileMenuPanels.Settings.strAutoRecover": "Включить автовосстановление", "SSE.Views.FileMenuPanels.Settings.textAutoRecover": "Автовосстановление", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Общие", - "SSE.Views.FileMenuPanels.Settings.txtPrint": "Печать", + "del_SSE.Views.FileMenuPanels.Settings.txtPrint": "Печать", "SSE.Views.FormulaDialog.cancelButtonText": "Отмена", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -679,7 +679,7 @@ "SSE.Views.PrintSettings.textActualSize": "Реальный размер", "SSE.Views.PrintSettings.textAllSheets": "Все листы", "SSE.Views.PrintSettings.textCurrentSheet": "Текущий лист", - "SSE.Views.PrintSettings.textFit": "По ширине", + "del_SSE.Views.PrintSettings.textFit": "По ширине", "SSE.Views.PrintSettings.textHideDetails": "Скрыть детали", "SSE.Views.PrintSettings.textLayout": "Макет", "SSE.Views.PrintSettings.textPageOrientation": "Ориентация страницы", diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index fdccaf4a9..ec04002fb 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "kot Windows", "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.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Dejanska velikost", "SSE.Views.PrintSettings.textAllSheets": "Vsi listi", "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.textLayout": "Postavitev", "SSE.Views.PrintSettings.textPageOrientation": "Orientacija strani", diff --git a/apps/spreadsheeteditor/main/locale/tr.json b/apps/spreadsheeteditor/main/locale/tr.json index 8fff641e0..e02f619eb 100644 --- a/apps/spreadsheeteditor/main/locale/tr.json +++ b/apps/spreadsheeteditor/main/locale/tr.json @@ -493,7 +493,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windows olarak", "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.okButtonText": "TAMAM", "SSE.Views.FormulaDialog.sCategoryAll": "All", @@ -673,7 +673,7 @@ "SSE.Views.PrintSettings.textActualSize": "Gerçek Boyut", "SSE.Views.PrintSettings.textAllSheets": "Tüm Tablolar", "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.textLayout": "Tasarım", "SSE.Views.PrintSettings.textPageOrientation": "Sayfa Orientasyonu",