Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] [PE] Change tooltip for Insert Chart button in the toolbar when chart is selected.

Browse source
This commit is contained in:
Julia Radzhabova 2016-12-27 12:34:08 +03:00
parent 96dba54f6d
commit b2c3707a6e
6 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -93,7 +93,8 @@ define([
can_copycut: undefined,
pgmargins: undefined,
fontsize: undefined,
in_equation: false
in_equation: false,
in_chart: false
};
this.flg = {};
this.diagramEditor = null;
@ -685,6 +686,11 @@ define([
if ((need_disable || in_image) != toolbar.mnuInsertTextArt.isDisabled())
toolbar.mnuInsertTextArt.setDisabled(need_disable || in_image);
if (in_chart !== this._state.in_chart) {
toolbar.btnInsertChart.updateHint(in_chart ? toolbar.tipChangeChart : toolbar.tipInsertChart);
this._state.in_chart = in_chart;
}
need_disable = in_chart && image_locked || !in_chart && need_disable;
if (need_disable != toolbar.btnInsertChart.isDisabled())
toolbar.btnInsertChart.setDisabled(need_disable);

3
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1958,7 +1958,8 @@ define([
mniInsFootnote: 'Insert Footnote',
mniDelFootnote: 'Delete All Footnotes',
mniNoteSettings: 'Notes Settings',
textGotoFootnote: 'Go to Footnotes'
textGotoFootnote: 'Go to Footnotes',
tipChangeChart: 'Change Chart Type'
}, DE.Views.Toolbar || {}));
});

1
apps/documenteditor/main/locale/en.json
View file

@ -1520,6 +1520,7 @@
"DE.Views.Toolbar.tipAlignLeft": "Align Left",
"DE.Views.Toolbar.tipAlignRight": "Align Right",
"DE.Views.Toolbar.tipBack": "Back",
"DE.Views.Toolbar.tipChangeChart": "Change Chart Type",
"DE.Views.Toolbar.tipClearStyle": "Clear Style",
"DE.Views.Toolbar.tipColorSchemas": "Change Color Scheme",
"DE.Views.Toolbar.tipColumns": "Insert columns",

12
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -95,7 +95,8 @@ define([
zoom_type: undefined,
zoom_percent: undefined,
fontsize: undefined,
in_equation: undefined
in_equation: undefined,
in_chart: false
};
this._isAddingShape = false;
this.slideSizeArr = [
@ -570,7 +571,8 @@ define([
no_paragraph = true,
no_text = true,
no_object = true,
in_equation = false;
in_equation = false,
in_chart = false;
while (++i < selectedObjects.length) {
type = selectedObjects[i].get_ObjectType();
@ -589,11 +591,17 @@ define([
if (type !== Asc.c_oAscTypeSelectElement.Image) {
no_text = false;
}
in_chart = type == Asc.c_oAscTypeSelectElement.Chart;
} else if (type === Asc.c_oAscTypeSelectElement.Math) {
in_equation = true;
}
}
if (in_chart !== this._state.in_chart) {
this.toolbar.btnInsertChart.updateHint(in_chart ? this.toolbar.tipChangeChart : this.toolbar.tipInsertChart);
this._state.in_chart = in_chart;
}
if (paragraph_locked!==undefined && this._state.prcontrolsdisable !== paragraph_locked) {
if (this._state.activated) this._state.prcontrolsdisable = paragraph_locked;
this.toolbar.lockToolbar(PE.enumLock.paragraphLock, paragraph_locked, {array: me.toolbar.paragraphControls});

3
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1713,6 +1713,7 @@ define([
textShowCurrent: 'Show from Current slide',
textShowSettings: 'Show Settings',
tipInsertEquation: 'Insert Equation',
textCharts: 'Charts'
textCharts: 'Charts',
tipChangeChart: 'Change Chart Type'
}, PE.Views.Toolbar || {}));
});

1
apps/presentationeditor/main/locale/en.json
View file

@ -1233,6 +1233,7 @@
"PE.Views.Toolbar.tipAddSlide": "Add Slide",
"PE.Views.Toolbar.tipAdvSettings": "Advanced Settings",
"PE.Views.Toolbar.tipBack": "Back",
"PE.Views.Toolbar.tipChangeChart": "Change Chart Type",
"PE.Views.Toolbar.tipChangeSlide": "Change Slide Layout",
"PE.Views.Toolbar.tipClearStyle": "Clear Style",
"PE.Views.Toolbar.tipColorSchemas": "Change Color Scheme",