pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PE] Slide master mode: fix statusbar

Browse Source
This commit is contained in:
Julia.Svinareva
2024-06-05 13:27:02 +03:00
parent fcde1893e4
commit 16f1cb5bec
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/presentationeditor/main/app/controller/Statusbar.js
View File

@ -61,12 +61,14 @@ define([
'langchanged': this.onLangMenu
},
'ViewTab': {
'statusbar:hide': _.bind(me.onChangeCompactView, me)
'statusbar:hide': _.bind(me.onChangeCompactView, me),
'viewmode:change': _.bind(me.onChangeViewMode, me)
}
});
this._state = {
zoom_type: undefined,
zoom_percent: undefined
zoom_percent: undefined,
slideMasterMode: false
};
this._isZoomRecord = (Common.localStorage.getItem("pe-settings-zoom") != -3);
},
@ -150,7 +152,8 @@ define([
},
onPreview: function(slidenum, presenter) {
Common.NotificationCenter.trigger('preview:start', _.isNumber(slidenum) ? slidenum : 0, presenter);
var slideNum = this._state.slideMasterMode ? 0 : (_.isNumber(slidenum) ? slidenum : 0);
Common.NotificationCenter.trigger('preview:start', slideNum, presenter);
},
onPreviewBtnClick: function(btn, e) {
@ -265,6 +268,12 @@ define([
this.disconnectTip = null;
},
onChangeViewMode: function (mode) {
var isSlideMaster = mode === 'master';
this._state.slideMasterMode = isSlideMaster;
this.statusbar.showSlideMasterStatus(isSlideMaster);
},
zoomText : 'Zoom {0}%',
textDisconnect: '<b>Connection is lost</b><br>Trying to connect. Please check connection settings.'

1
apps/presentationeditor/main/app/template/StatusBar.template
View File

@ -5,6 +5,7 @@
</div>
<div class="status-group dropup">
<label id="status-label-pages" class="status-label dropdown-toggle margin-top-large margin-left-7" style="display: none;" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="-3, 0"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
<label id="status-label-slide-master" class="status-label margin-top-large margin-left-7" style="display: none;" data-hint="0" data-hint-direction="top" data-hint-offset="-3, 0"><%= scope.textSlideMaster %></label>
<div id="status-goto-box" class="dropdown-menu">
<label class="float-left"><%= scope.goToPageText %></label>
<div id="status-goto-page" style="display:inline-block;"></div>

13
apps/presentationeditor/main/app/view/Statusbar.js
View File

@ -334,6 +334,16 @@ define([
this.getStatusLabel().text('');
},
showSlideMasterStatus: function (show) {
if (show) {
$('#status-label-pages').css('display', 'none');
$('#status-label-slide-master').css('display', 'inline-block');
} else {
$('#status-label-pages').css('display', 'inline-block');
$('#status-label-slide-master').css('display', 'none');
}
},
reloadLanguages: function(array) {
var arr = [],
saved = this.langMenu.saved;
@ -405,7 +415,8 @@ define([
tipSetLang : 'Set Text Language',
textShowBegin: 'Show from Beginning',
textShowCurrent: 'Show from Current slide',
textShowPresenterView: 'Show presenter view'
textShowPresenterView: 'Show presenter view',
textSlideMaster: 'Slide master'
}, PE.Views.Statusbar || {}));
}
);

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

@ -2417,6 +2417,7 @@
"PE.Views.Statusbar.tipZoomIn": "Zoom in",
"PE.Views.Statusbar.tipZoomOut": "Zoom out",
"PE.Views.Statusbar.txtPageNumInvalid": "Invalid slide number",
"PE.Views.Statusbar.textSlideMaster": "Slide master",
"PE.Views.TableSettings.deleteColumnText": "Delete column",
"PE.Views.TableSettings.deleteRowText": "Delete row",
"PE.Views.TableSettings.deleteTableText": "Delete table",