diff --git a/app/src/actions/settingsActions.js b/app/src/actions/settingsActions.js index c73ce67..79b5ef2 100644 --- a/app/src/actions/settingsActions.js +++ b/app/src/actions/settingsActions.js @@ -27,9 +27,9 @@ export const toggleAdvancedMode = () => type : 'TOGGLE_ADVANCED_MODE' }); -export const toggleStickyAppBar = () => +export const togglePermanentTopBar = () => ({ - type : 'TOGGLE_STICKY_APPBAR' + type : 'TOGGLE_PERMANENT_TOPBAR' }); export const setLastN = (lastN) => diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js index 938e1c2..6ef8dae 100644 --- a/app/src/components/Controls/TopBar.js +++ b/app/src/components/Controls/TopBar.js @@ -123,7 +123,7 @@ const TopBar = (props) => room, peersLength, lobbyPeers, - stickyAppBar, + permanentTopBar, myPicture, loggedIn, loginEnabled, @@ -174,7 +174,7 @@ const TopBar = (props) => return ( room : state.room, peersLength : peersLengthSelector(state), lobbyPeers : lobbyPeersKeySelector(state), - stickyAppBar : state.settings.stickyAppBar, + permanentTopBar : state.settings.permanentTopBar, loggedIn : state.me.loggedIn, loginEnabled : state.me.loginEnabled, myPicture : state.me.picture, @@ -430,7 +430,7 @@ export default withRoomContext(connect( prev.room === next.room && prev.peers === next.peers && prev.lobbyPeers === next.lobbyPeers && - prev.settings.stickyAppBar === next.settings.stickyAppBar && + prev.settings.permanentTopBar === next.settings.permanentTopBar && prev.me.loggedIn === next.me.loggedIn && prev.me.loginEnabled === next.me.loginEnabled && prev.me.picture === next.me.picture && diff --git a/app/src/components/MeetingViews/Democratic.js b/app/src/components/MeetingViews/Democratic.js index d987e4e..550dda0 100644 --- a/app/src/components/MeetingViews/Democratic.js +++ b/app/src/components/MeetingViews/Democratic.js @@ -68,7 +68,7 @@ class Democratic extends React.PureComponent const width = this.peersRef.current.clientWidth - PADDING_H; const height = this.peersRef.current.clientHeight - - (this.props.toolbarsVisible || this.props.stickyAppBar ? PADDING_V : PADDING_H); + (this.props.toolbarsVisible || this.props.permanentTopBar ? PADDING_V : PADDING_H); let x, y, space; @@ -129,7 +129,7 @@ class Democratic extends React.PureComponent advancedMode, spotlightsPeers, toolbarsVisible, - stickyAppBar, + permanentTopBar, classes } = this.props; @@ -143,7 +143,7 @@ class Democratic extends React.PureComponent
@@ -175,7 +175,7 @@ Democratic.propTypes = boxes : PropTypes.number, spotlightsPeers : PropTypes.array.isRequired, toolbarsVisible : PropTypes.bool.isRequired, - stickyAppBar : PropTypes.bool, + permanentTopBar : PropTypes.bool, classes : PropTypes.object.isRequired }; @@ -185,7 +185,7 @@ const mapStateToProps = (state) => boxes : videoBoxesSelector(state), spotlightsPeers : spotlightPeersSelector(state), toolbarsVisible : state.room.toolbarsVisible, - stickyAppBar : state.settings.stickyAppBar + permanentTopBar : state.settings.permanentTopBar }; }; @@ -202,7 +202,7 @@ export default connect( prev.consumers === next.consumers && prev.room.spotlights === next.room.spotlights && prev.room.toolbarsVisible === next.room.toolbarsVisible && - prev.settings.stickyAppBar === next.settings.stickyAppBar + prev.settings.permanentTopBar === next.settings.permanentTopBar ); } } diff --git a/app/src/components/Settings/Settings.js b/app/src/components/Settings/Settings.js index aeff7dd..4817efe 100644 --- a/app/src/components/Settings/Settings.js +++ b/app/src/components/Settings/Settings.js @@ -59,7 +59,7 @@ const Settings = ({ me, settings, onToggleAdvancedMode, - onToggleStickyAppBar, + onTogglePermanentTopBar, handleCloseSettings, handleChangeMode, classes @@ -324,17 +324,17 @@ const Settings = ({ } + control={} label={intl.formatMessage({ - id : 'settings.stickyAppBar', - defaultMessage : 'Sticky App Bar' + id : 'settings.permanentTopBar', + defaultMessage : 'Permanent top bar' })} /> @@ -358,7 +358,7 @@ Settings.propTypes = room : appPropTypes.Room.isRequired, settings : PropTypes.object.isRequired, onToggleAdvancedMode : PropTypes.func.isRequired, - onToggleStickyAppBar : PropTypes.func.isRequired, + onTogglePermanentTopBar : PropTypes.func.isRequired, handleChangeMode : PropTypes.func.isRequired, handleCloseSettings : PropTypes.func.isRequired, classes : PropTypes.object.isRequired @@ -375,7 +375,7 @@ const mapStateToProps = (state) => const mapDispatchToProps = { onToggleAdvancedMode : settingsActions.toggleAdvancedMode, - onToggleStickyAppBar : settingsActions.toggleStickyAppBar, + onTogglePermanentTopBar : settingsActions.togglePermanentTopBar, handleChangeMode : roomActions.setDisplayMode, handleCloseSettings : roomActions.setSettingsOpen }; diff --git a/app/src/components/VideoContainers/FullScreenView.js b/app/src/components/VideoContainers/FullScreenView.js index 7516f1b..5549712 100644 --- a/app/src/components/VideoContainers/FullScreenView.js +++ b/app/src/components/VideoContainers/FullScreenView.js @@ -83,7 +83,7 @@ const FullScreenView = (props) => consumer, toggleConsumerFullscreen, toolbarsVisible, - stickyAppBar, + permanentTopBar, classes } = props; @@ -106,7 +106,7 @@ const FullScreenView = (props) =>
{ @@ -135,7 +135,7 @@ FullScreenView.propTypes = consumer : appPropTypes.Consumer, toggleConsumerFullscreen : PropTypes.func.isRequired, toolbarsVisible : PropTypes.bool, - stickyAppBar : PropTypes.bool, + permanentTopBar : PropTypes.bool, classes : PropTypes.object.isRequired }; @@ -143,7 +143,7 @@ const mapStateToProps = (state) => ({ consumer : state.consumers[state.room.fullScreenConsumer], toolbarsVisible : state.room.toolbarsVisible, - stickyAppBar : state.settings.stickyAppBar + permanentTopBar : state.settings.permanentTopBar }); const mapDispatchToProps = (dispatch) => @@ -166,7 +166,7 @@ export default connect( prev.consumers[prev.room.fullScreenConsumer] === next.consumers[next.room.fullScreenConsumer] && prev.room.toolbarsVisible === next.room.toolbarsVisible && - prev.settings.stickyAppBar === next.settings.stickyAppBar + prev.settings.permanentTopBar === next.settings.permanentTopBar ); } } diff --git a/app/src/reducers/settings.js b/app/src/reducers/settings.js index 5a3c893..210243b 100644 --- a/app/src/reducers/settings.js +++ b/app/src/reducers/settings.js @@ -43,11 +43,11 @@ const settings = (state = initialState, action) => return { ...state, lastN }; } - case 'TOGGLE_STICKY_APPBAR': + case 'TOGGLE_PERMANENT_TOPBAR': { - const stickyAppBar = !state.stickyAppBar; + const permanentTopBar = !state.permanentTopBar; - return { ...state, stickyAppBar }; + return { ...state, permanentTopBar }; } case 'SET_VIDEO_RESOLUTION': diff --git a/app/src/translations/cn.json b/app/src/translations/cn.json index 2c99211..7814260 100644 --- a/app/src/translations/cn.json +++ b/app/src/translations/cn.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "退出全屏", "tooltip.lobby": "显示大厅", "tooltip.settings": "显示设置", + "tooltip.participants": "显示参加者", "label.roomName": "房间名称", "label.chooseRoomButton": "继续", @@ -93,6 +94,8 @@ "settings.layout": "房间布局", "settings.selectRoomLayout": "选择房间布局", "settings.advancedMode": "高级模式", + "settings.permanentTopBar": "永久顶吧", + "settings.lastn": "可见视频数量", "filesharing.saveFileError": "无法保存文件", "filesharing.startingFileShare": "正在尝试共享文件", diff --git a/app/src/translations/de.json b/app/src/translations/de.json index 3dc24ef..dbec99a 100644 --- a/app/src/translations/de.json +++ b/app/src/translations/de.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Vollbild verlassen", "tooltip.lobby": "Warteraum", "tooltip.settings": "Einstellungen", + "tooltip.participants": "Teilnehmer", "label.roomName": "Room name", "label.chooseRoomButton": "Continue", @@ -93,6 +94,8 @@ "settings.layout": "Raumlayout", "settings.selectRoomLayout": "Wähle Raumlayout", "settings.advancedMode": "Erweiterter Modus", + "settings.permanentTopBar": "Permanente obere Leiste", + "settings.lastn": "Anzahl der sichtbaren Videos", "filesharing.saveFileError": "Fehler beim Speichern der Datei", "filesharing.startingFileShare": "Starte Teilen der Datei", diff --git a/app/src/translations/dk.json b/app/src/translations/dk.json index b46ca92..a00bbec 100644 --- a/app/src/translations/dk.json +++ b/app/src/translations/dk.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Efterlad fuldskærm", "tooltip.lobby": "Vis lobby", "tooltip.settings": "Vis indstillinger", + "tooltip.participants": "Vis deltagere", "label.roomName": "Værelsesnavn", "label.chooseRoomButton": "Fortsæt", @@ -93,6 +94,8 @@ "settings.layout": "Møde visning", "settings.selectRoomLayout": "Vælg møde visning", "settings.advancedMode": "Avanceret tilstand", + "settings.permanentTopBar": "Permanent øverste linje", + "settings.lastn": "Antal synlige videoer", "filesharing.saveFileError": "Kan ikke gemme fil", "filesharing.startingFileShare": "Forsøger at dele filen", diff --git a/app/src/translations/el.json b/app/src/translations/el.json index 7a1d04e..e0fd46c 100644 --- a/app/src/translations/el.json +++ b/app/src/translations/el.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Έξοδος από την πλήρη οθόνη", "tooltip.lobby": "Εμφάνιση λόμπι", "tooltip.settings": "Εμφάνιση ρυθμίσεων", + "tooltip.participants": "Εμφάνιση συμμετεχόντων", "label.roomName": "Όνομα δωματίου", "label.chooseRoomButton": "Συνέχεια", @@ -93,6 +94,8 @@ "settings.layout": "Περιβάλλον δωματίου", "settings.selectRoomLayout": "Επιλογή περιβάλλοντος δωματίου", "settings.advancedMode": "Προηγμένη λειτουργία", + "settings.permanentTopBar": "Μόνιμη μπάρα κορυφής", + "settings.lastn": "Αριθμός ορατών βίντεο", "filesharing.saveFileError": "Αδυναμία αποθήκευσης του αρχείου", "filesharing.startingFileShare": "Προσπάθεια διαμοιρασμού αρχείου", diff --git a/app/src/translations/en.json b/app/src/translations/en.json index 2df5c04..b3f3e45 100644 --- a/app/src/translations/en.json +++ b/app/src/translations/en.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Leave fullscreen", "tooltip.lobby": "Show lobby", "tooltip.settings": "Show settings", + "tooltip.participants": "Show participants", "label.roomName": "Room name", "label.chooseRoomButton": "Continue", @@ -93,6 +94,8 @@ "settings.layout": "Room layout", "settings.selectRoomLayout": "Select room layout", "settings.advancedMode": "Advanced mode", + "settings.permanentTopBar": "Permanent top bar", + "settings.lastn": "Number of visible videos", "filesharing.saveFileError": "Unable to save file", "filesharing.startingFileShare": "Attempting to share file", diff --git a/app/src/translations/es.json b/app/src/translations/es.json index b4afe4a..6cb0059 100644 --- a/app/src/translations/es.json +++ b/app/src/translations/es.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Salir de la pantalla completa", "tooltip.lobby": "Mostrar sala de espera", "tooltip.settings": "Mostrar ajustes", + "tooltip.participants": "Mostrar participantes", "label.roomName": "Nombre de la sala", "label.chooseRoomButton": "Continuar", @@ -93,6 +94,8 @@ "settings.layout": "Disposición de la sala", "settings.selectRoomLayout": "Seleccione la disposición de la sala", "settings.advancedMode": "Modo avanzado", + "settings.permanentTopBar": "Barra superior permanente", + "settings.lastn": "Cantidad de videos visibles", "filesharing.saveFileError": "No ha sido posible guardar el fichero", "filesharing.startingFileShare": "Intentando compartir el fichero", diff --git a/app/src/translations/fr.json b/app/src/translations/fr.json index 34f5ce5..9b6098e 100644 --- a/app/src/translations/fr.json +++ b/app/src/translations/fr.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen" : " Quitter le plein écran", "tooltip.lobby" : " Afficher la salle d'attente", "tooltip.settings" : " Afficher les paramètres", + "tooltip.participants": "Afficher les participants", "label.roomName" : " Nom de la salle", "label.chooseRoomButton" : " Continuer", @@ -93,6 +94,8 @@ "settings.layout" : " Mode d'affichage de la salle", "settings.selectRoomLayout" : " Sélectionner l'affiche de la salle", "settings.advancedMode" : " Mode avancé", + "settings.permanentTopBar": "Barre supérieure permanente", + "settings.lastn": "Nombre de vidéos visibles", "filesharing.saveFileError" : " Impossible d'enregistrer le fichier", "filesharing.startingFileShare" : " Début du transfert de fichier", diff --git a/app/src/translations/hr.json b/app/src/translations/hr.json index b56333b..4f0aa0d 100644 --- a/app/src/translations/hr.json +++ b/app/src/translations/hr.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Izađi iz punog ekrana", "tooltip.lobby": "Prikaži predvorje", "tooltip.settings": "Prikaži postavke", + "tooltip.participants": "Pokažite sudionike", "label.roomName": "Naziv sobe", "label.chooseRoomButton": "Nastavi", @@ -93,6 +94,8 @@ "settings.layout": "Način prikaza", "settings.selectRoomLayout": "Odaberi način prikaza", "settings.advancedMode": "Napredne mogućnosti", + "settings.permanentTopBar": "Stalna gornja šipka", + "settings.lastn": "Broj vidljivih videozapisa", "filesharing.saveFileError": "Nije moguće spremiti datoteku", "filesharing.startingFileShare": "Pokušaj dijeljenja datoteke", diff --git a/app/src/translations/hu.json b/app/src/translations/hu.json index 32d9f9c..2c4d23d 100644 --- a/app/src/translations/hu.json +++ b/app/src/translations/hu.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Kilépés teljes képernyős módból", "tooltip.lobby": "Az előszobában várakozók listája", "tooltip.settings": "Beállítások", + "tooltip.participants": "Résztvevők", "label.roomName": "Konferencia", "label.chooseRoomButton": "Tovább", @@ -93,6 +94,8 @@ "settings.layout": "A konferencia képkiosztása", "settings.selectRoomLayout": "Válaszd ki a konferencia képkiosztását", "settings.advancedMode": "Részletes információk", + "settings.permanentTopBar": "Állandó felső sáv", + "settings.lastn": "A látható videók száma", "filesharing.saveFileError": "A file-t nem sikerült elmenteni", "filesharing.startingFileShare": "Fájl megosztása", diff --git a/app/src/translations/nb.json b/app/src/translations/nb.json index 3f017e0..0c103e8 100644 --- a/app/src/translations/nb.json +++ b/app/src/translations/nb.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Forlat fullskjerm", "tooltip.lobby": "Vis lobby", "tooltip.settings": "Vis innstillinger", + "tooltip.participants": "Vis deltakere", "label.roomName": "Møtenavn", "label.chooseRoomButton": "Fortsett", @@ -93,6 +94,8 @@ "settings.layout": "Møtelayout", "settings.selectRoomLayout": "Velg møtelayout", "settings.advancedMode": "Avansert modus", + "settings.permanentTopBar": "Permanent topplinje", + "settings.lastn": "Antall videoer synlig", "filesharing.saveFileError": "Klarte ikke å lagre fil", "filesharing.startingFileShare": "Starter fildeling", diff --git a/app/src/translations/pl.json b/app/src/translations/pl.json index 60367f2..6f30b4f 100644 --- a/app/src/translations/pl.json +++ b/app/src/translations/pl.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Wyłącz tryb pełnoekranowy", "tooltip.lobby": "Pokaż poczekalnię", "tooltip.settings": "Pokaż ustawienia", + "tooltip.participants": "Pokaż uczestników", "label.roomName": "Nazwa konferencji", "label.chooseRoomButton": "Kontynuuj", @@ -93,6 +94,8 @@ "settings.layout": "Układ konferencji", "settings.selectRoomLayout": "Ustawienia układu konferencji", "settings.advancedMode": "Tryb zaawansowany", + "settings.permanentTopBar": "Stały górny pasek", + "settings.lastn": "Liczba widocznych filmów", "filesharing.saveFileError": "Nie można zapisać pliku", "filesharing.startingFileShare": "Próba udostępnienia pliku", diff --git a/app/src/translations/pt.json b/app/src/translations/pt.json index b371966..a0220f9 100644 --- a/app/src/translations/pt.json +++ b/app/src/translations/pt.json @@ -58,6 +58,7 @@ "tooltip.leaveFullscreen": "Sair de ecrã completo", "tooltip.lobby": "Apresentar sala de espera", "tooltip.settings": "Apresentar definições", + "tooltip.participants": "Apresentar participantes", "label.roomName": "Nome da sala", "label.chooseRoomButton": "Continuar", @@ -93,6 +94,8 @@ "settings.layout": "Disposição da sala", "settings.selectRoomLayout": "Seleccione a disposição da sala", "settings.advancedMode": "Modo avançado", + "settings.permanentTopBar": "Barra superior permanente", + "settings.lastn": "Número de vídeos visíveis", "filesharing.saveFileError": "Impossível de gravar o ficheiro", "filesharing.startingFileShare": "Tentando partilha de ficheiro", diff --git a/app/src/translations/ro.json b/app/src/translations/ro.json index 56c6b24..ec54b94 100644 --- a/app/src/translations/ro.json +++ b/app/src/translations/ro.json @@ -57,7 +57,7 @@ "tooltip.enterFullscreen": "Modul ecran complet", "tooltip.leaveFullscreen": "Ieșire din modul ecran complet", "tooltip.lobby": "Arată holul", - "tooltip.settings": "Arată setăile", + "tooltip.settings": "Arată participanții", "label.roomName": "Numele camerei", "label.chooseRoomButton": "Continuare", @@ -93,6 +93,8 @@ "settings.layout": "Aspectul camerei video", "settings.selectRoomLayout": "Selectează spectul camerei video", "settings.advancedMode": "Mod avansat", + "settings.permanentTopBar": "Bara de sus permanentă", + "settings.lastn": "Numărul de videoclipuri vizibile", "filesharing.saveFileError": "Încercarea de a salva fișierul a eșuat", "filesharing.startingFileShare": "Partajarea fișierului",