diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index 24eddcae7..773009471 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -2020,7 +2020,7 @@ define([
onPositionChange: function(btn) {
var pos = btn.getNumberValue();
- if (Common.UI.isRTL()) {
+ if (Common.UI.isRTL()) {
pos = this.sldrGradient.maxValue - pos;
}
var minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
diff --git a/apps/spreadsheeteditor/main/app/template/CellSettings.template b/apps/spreadsheeteditor/main/app/template/CellSettings.template
index ab127387f..644612f68 100644
--- a/apps/spreadsheeteditor/main/app/template/CellSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/CellSettings.template
@@ -19,22 +19,22 @@
-
+
-
-
-
+
+
+
@@ -47,7 +47,7 @@
-
+
@@ -72,10 +72,10 @@
-
-
-
-
+
+
+
+
|
@@ -127,7 +127,7 @@
-
+
|
diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettings.template b/apps/spreadsheeteditor/main/app/template/ImageSettings.template
index 9d7e446a7..27e002faf 100644
--- a/apps/spreadsheeteditor/main/app/template/ImageSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/ImageSettings.template
@@ -43,15 +43,15 @@
|
|
diff --git a/apps/spreadsheeteditor/main/app/template/ShapeSettings.template b/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
index 4d8534512..4e01cc82c 100644
--- a/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/ShapeSettings.template
@@ -26,7 +26,7 @@
- |
@@ -44,11 +44,11 @@
-
+
-
+
@@ -61,7 +61,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
|
@@ -86,7 +86,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
|
@@ -159,15 +159,15 @@
|
|
@@ -182,7 +182,7 @@
-
+
|
diff --git a/apps/spreadsheeteditor/main/app/template/SlicerSettings.template b/apps/spreadsheeteditor/main/app/template/SlicerSettings.template
index 27b937ffe..840bf7fd2 100644
--- a/apps/spreadsheeteditor/main/app/template/SlicerSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/SlicerSettings.template
@@ -47,7 +47,7 @@
-
+
|
diff --git a/apps/spreadsheeteditor/main/app/template/TextArtSettings.template b/apps/spreadsheeteditor/main/app/template/TextArtSettings.template
index 38d4e8846..ac22734b7 100644
--- a/apps/spreadsheeteditor/main/app/template/TextArtSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/TextArtSettings.template
@@ -36,7 +36,7 @@
-
+
|
@@ -44,7 +44,7 @@
- |
@@ -62,11 +62,11 @@
-
+
-
+
@@ -79,7 +79,7 @@
-
+
@@ -87,7 +87,7 @@
|
-
+
|
@@ -104,7 +104,7 @@
-
+
@@ -126,7 +126,7 @@
-
+
|
diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js
index 690341383..d9183286e 100644
--- a/apps/spreadsheeteditor/main/app/view/CellSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js
@@ -288,7 +288,8 @@ define([
var color = me.GradColor.colors[me.GradColor.currentIdx];
me.btnGradColor.setColor(color);
me.colorsGrad.select(color,false);
- me.spnGradPosition.setValue(me.GradColor.values[me.GradColor.currentIdx]);
+ var curValue = me.GradColor.values[me.GradColor.currentIdx];
+ me.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - curValue : curValue);
});
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
@@ -958,7 +959,8 @@ define([
me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
// Step position
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx]);
+ var curValue = this.GradColor.values[this.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? this.sldrGradient.maxValue - curValue : curValue);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {
@@ -1410,7 +1412,8 @@ define([
onGradientChange: function(slider, newValue, oldValue) {
this.GradColor.values = slider.getValues();
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx], true);
+ var curValue = this.GradColor.values[this.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? this.sldrGradient.maxValue - curValue : curValue, true);
this._sliderChanged = true;
if (this.api && !this._noApply) {
if (this._sendUndoPoint) {
@@ -1512,8 +1515,11 @@ define([
onPositionChange: function(btn) {
var me = this,
- pos = btn.getNumberValue(),
- minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
+ pos = btn.getNumberValue();
+ if (Common.UI.isRTL()) {
+ pos = this.sldrGradient.maxValue - pos;
+ }
+ var minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
maxValue = (this.GradColor.currentIdx+1 maxValue;
if (this.api) {
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js
index 2bd693270..8bbed9823 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js
@@ -797,7 +797,6 @@ define([
cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-menu-chart',
caption : this.textChangeType,
- style : 'width: 100%;text-align: left;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
@@ -810,7 +809,6 @@ define([
cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-select-range',
caption : this.textSelectData,
- style : 'width: 100%;text-align: left;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
@@ -823,7 +821,6 @@ define([
cls : 'btn-toolbar',
iconCls : 'toolbar__icon switch_row_column',
caption : this.textSwitch,
- style : 'width: 100%;text-align: left;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
index fe17489b1..c42a22068 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
@@ -525,7 +525,8 @@ define([
onGradientChange: function(slider, newValue, oldValue){
this.GradColor.values = slider.getValues();
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx], true);
+ var curValue = this.GradColor.values[this.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? this.sldrGradient.maxValue - curValue : curValue, true);
this._sliderChanged = true;
if (this.api && !this._noApply) {
if (this._sendUndoPoint) {
@@ -938,7 +939,8 @@ define([
}
me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx]);
+ var curValue = me.GradColor.values[me.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - curValue : curValue);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {Value: 1, Color: this.GradColor.colors[0]};
@@ -1375,7 +1377,7 @@ define([
me.btnGradColor.setColor(color);
me.colorsGrad.select(color,false);
var pos = me.GradColor.values[me.GradColor.currentIdx];
- me.spnGradPosition.setValue(pos, true);
+ me.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - pos : pos, true);
});
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
@@ -1894,8 +1896,11 @@ define([
},
onPositionChange: function(btn) {
- var pos = btn.getNumberValue(),
- minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
+ var pos = btn.getNumberValue();
+ if (Common.UI.isRTL()) {
+ pos = this.sldrGradient.maxValue - pos;
+ }
+ var minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
maxValue = (this.GradColor.currentIdx+1 maxValue;
if (this.api) {
diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js
index ef15aebd6..f867a7fd2 100644
--- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js
@@ -517,7 +517,8 @@ define([
onGradientChange: function(slider, newValue, oldValue){
this.GradColor.values = slider.getValues();
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx], true);
+ var curValue = this.GradColor.values[this.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? this.sldrGradient.maxValue - curValue : curValue, true);
this._sliderChanged = true;
if (this.api && !this._noApply) {
if (this._sendUndoPoint) {
@@ -874,7 +875,8 @@ define([
me.GradColor.currentIdx = 0;
}
me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
- this.spnGradPosition.setValue(this.GradColor.values[this.GradColor.currentIdx]);
+ var curValue = me.GradColor.values[me.GradColor.currentIdx];
+ this.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - curValue : curValue);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {Value: 1, Color: this.GradColor.colors[0]};
this.BGColor = {Value: 1, Color: 'ffffff'};
@@ -1313,7 +1315,7 @@ define([
me.btnGradColor.setColor(color);
me.colorsGrad.select(color,false);
var pos = me.GradColor.values[me.GradColor.currentIdx];
- me.spnGradPosition.setValue(pos, true);
+ me.spnGradPosition.setValue(Common.UI.isRTL() ? me.sldrGradient.maxValue - pos : pos, true);
});
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
@@ -1757,8 +1759,11 @@ define([
},
onPositionChange: function(btn) {
- var pos = btn.getNumberValue(),
- minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
+ var pos = btn.getNumberValue();
+ if (Common.UI.isRTL()) {
+ pos = this.sldrGradient.maxValue - pos;
+ }
+ var minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],
maxValue = (this.GradColor.currentIdx+1 maxValue;
if (this.api) {
diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
index d8783ac31..f9373be9e 100644
--- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less
+++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less
@@ -6,6 +6,314 @@
label.input-label{
vertical-align: baseline;
}
+
+ id-cell-settings {
+ #cell-combo-border-type {
+ display: inline-block;
+ vertical-align: middle;
+ width: 93px;
+ }
+
+ .border-color {
+ display: inline-block;
+ float: right;
+ vertical-align: middle;
+
+ .rtl & {
+ float: left;
+ }
+
+ .input-label {
+ margin-right: 5px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 5px;
+ }
+ }
+
+ #cell-border-color-btn {
+ display: inline-block;
+ }
+ }
+
+ #cell-spin-angle {
+ display: inline-block;
+ margin-left: 5px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 5px;
+ }
+ }
+
+ #cell-panel-gradient-fill {
+ .cell-direction {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+
+ #cell-button-direction {
+ .dataview .item {
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+ }
+
+ .gradient-position {
+ margin-left: 10px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 10px;
+ }
+ }
+ }
+
+ #cell-foreground-color-btn, #cell-background-color-btn {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+
+ id-table-settings {
+ #id-table-menu-template {
+ .group-description {
+ padding: 3px 0 3px 10px;
+ .font-weight-bold();
+
+ .rtl & {
+ text-align: right;
+ padding: 3px 10px 3px 0;
+ }
+ }
+
+ .group-items-container {
+ .item {
+ &:hover {
+ .box-shadow(0 0 0 2px @border-preview-hover-ie) !important;
+ .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover) !important;
+ }
+
+ &.selected {
+ .box-shadow(0 0 0 2px @border-preview-select-ie) !important;
+ .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select) !important;
+ }
+ }
+ }
+ }
+ }
+
+ id-shape-settings {
+ #shape-spin-transparency {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ #shape-button-270, #shape-button-fliph {
+ display: inline-block;
+ margin-right: 4px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 4px;
+ }
+ }
+
+ #shape-button-90, #shape-button-flipv {
+ display: inline-block;
+ }
+
+ #shape-btn-change {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .shape-direction {
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .angle-label {
+ margin-right: 5px;
+ margin-bottom: 3px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 5px;
+ }
+ }
+
+ .gradient-position {
+ margin-left: 10px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 10px;
+ }
+ }
+
+ .texture-img {
+ width: 90px;
+ height: 80px;
+ padding: 14px 20px;
+ border: 1px solid #AFAFAF;
+ border-radius: 2px;
+ background: #ffffff;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ #shape-foreground-color-btn,
+ #shape-background-color-btn {
+ display: inline-block;
+ float:right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+
+ id-image-settings {
+ #image-button-270, #image-button-fliph {
+ display: inline-block;
+ margin-right: 4px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 4px;
+ }
+ }
+
+ #image-button-90, #image-button-flipv {
+ display: inline-block;
+ }
+ }
+
+ id-chart-settings {
+ #chart-btn-change-type .btn,
+ #chart-btn-select-data .btn,
+ #chart-btn-switch .btn {
+ width: 100%;
+ text-align: left;
+
+ .rtl & {
+ text-align: right;
+ }
+ }
+ }
+
+ id-textart-settings {
+ #textart-spin-transparency {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .textar-direction {
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ .angle-label {
+ margin-right: 5px;
+ margin-bottom: 3px;
+
+ .rtl & {
+ margin-right: 0;
+ margin-left: 5px;
+ }
+ }
+
+ .gradient-position {
+ margin-left: 10px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 10px;
+ }
+ }
+
+ .texture-img {
+ padding: 14px 20px;
+ border: 1px solid #AFAFAF;
+ border-radius: 2px;
+ background: #ffffff;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ #textart-button-from-url {
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+
+ #id-textart-menu-direction {
+ .dataview .item {
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+
+ #textart-foreground-color-btn,
+ #textart-background-color-btn {
+ display: inline-block;
+ float: right;
+
+ .rtl & {
+ float: left;
+ }
+ }
+ }
+
+ id-slicer-settings {
+ #slicer-spin-cols {
+ display: inline-block;
+ margin-left: 5px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 5px;
+ }
+ }
+ }
}
.combo-pattern-item {
@@ -57,12 +365,17 @@
.list-item {
width: 146px;
- margin-left:20px;
+ margin-left: 20px;
display: inline-block;
white-space: pre;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: middle;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 20px;
+ }
}
.listitem-icon {
@@ -220,26 +533,4 @@
.dataview > .item:not(:hover):not(.selected) {
.box-shadow(none);
}
-}
-
-#id-table-menu-template {
- .group-description {
- padding: 3px 0 3px 10px;
- .font-weight-bold();
-
- }
-
- .group-items-container {
- .item {
- &:hover {
- .box-shadow(0 0 0 2px @border-preview-hover-ie) !important;
- .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover) !important;
- }
-
- &.selected {
- .box-shadow(0 0 0 2px @border-preview-select-ie) !important;
- .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select) !important;
- }
- }
- }
}
\ No newline at end of file
|