Browse Source

Merge pull request #2144 from bertyhell/pr/2101-hide-service-labels

feat: #2101 Add option to hide tabbar labels
pull/2195/head
Ramiro Saenz 6 years ago committed by GitHub
parent
commit
3318e39cb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      app/ux/WebView.js
  2. 6
      app/view/preferences/Preferences.js
  3. 7
      electron/main.js
  4. 2
      resources/languages/af.js
  5. 2
      resources/languages/bg.js
  6. 2
      resources/languages/bn.js
  7. 2
      resources/languages/bs2.js
  8. 2
      resources/languages/ca.js
  9. 2
      resources/languages/ceb.js
  10. 2
      resources/languages/cs.js
  11. 2
      resources/languages/da.js
  12. 2
      resources/languages/de-CH.js
  13. 2
      resources/languages/de.js
  14. 2
      resources/languages/en.js
  15. 2
      resources/languages/fi.js
  16. 2
      resources/languages/fil.js
  17. 2
      resources/languages/fr.js
  18. 2
      resources/languages/he.js
  19. 2
      resources/languages/hi.js
  20. 2
      resources/languages/hr.js
  21. 2
      resources/languages/hu.js
  22. 2
      resources/languages/it.js
  23. 2
      resources/languages/ja.js
  24. 2
      resources/languages/nl.js
  25. 2
      resources/languages/no.js
  26. 2
      resources/languages/pl.js
  27. 2
      resources/languages/pt-BR.js
  28. 2
      resources/languages/pt-PT.js
  29. 2
      resources/languages/ro.js
  30. 2
      resources/languages/sk.js
  31. 2
      resources/languages/sr.js
  32. 2
      resources/languages/sv-SE.js
  33. 2
      resources/languages/uk.js
  34. 2
      resources/languages/vi.js
  35. 2
      resources/languages/zh-CN.js
  36. 2
      resources/languages/zh-TW.js

3
app/ux/WebView.js

@ -38,9 +38,10 @@ Ext.define('Rambox.ux.WebView',{
// Allow Custom sites with self certificates
//if ( me.record.get('trust') ) ipc.send('allowCertificate', me.src);
const prefConfig = ipc.sendSync('getConfig');
Ext.apply(me, {
items: me.webViewConstructor()
,title: me.record.get('tabname') ? me.record.get('name') : ''
,title: prefConfig.hide_tabbar_labels ? '' : (me.record.get('tabname') ? me.record.get('name') : '')
,icon: me.record.get('type') === 'custom' ? (me.record.get('logo') === '' ? 'resources/icons/custom.png' : me.record.get('logo')) : 'resources/icons/'+me.record.get('logo')
,src: me.record.get('url')
,type: me.record.get('type')

6
app/view/preferences/Preferences.js

@ -167,6 +167,12 @@ Ext.define('Rambox.view.preferences.Preferences',{
]
})
}
,{
xtype: 'checkbox'
,name: 'hide_tabbar_labels'
,boxLabel: locale['preferences[28]']
,value: config.hide_tabbar_labels
}
,{
xtype: 'combo'
,name: 'default_service'

7
electron/main.js

@ -23,6 +23,7 @@ const config = new Config({
always_on_top: false
,hide_menu_bar: false
,tabbar_location: 'top'
,hide_tabbar_labels: false
,window_display_behavior: 'taskbar_tray'
,auto_launch: !isDev
,flash_frame: true
@ -299,7 +300,7 @@ ipcMain.on('setServiceNotifications', function(event, partition, op) {
ipcMain.on('setDontDisturb', function(event, arg) {
config.set('dont_disturb', arg);
})
});
// Reload app
ipcMain.on('reloadApp', function(event) {
@ -312,7 +313,7 @@ ipcMain.on('relaunchApp', function(event) {
app.exit(0);
});
const shouldQuit = app.requestSingleInstanceLock()
const shouldQuit = app.requestSingleInstanceLock();
if (!shouldQuit) {
app.quit();
return;
@ -421,7 +422,7 @@ if ( config.get('proxy') ) {
if(!authInfo.isProxy)
return;
event.preventDefault()
event.preventDefault();
callback(config.get('proxyLogin'), config.get('proxyPassword'))
})
}

2
resources/languages/af.js

File diff suppressed because one or more lines are too long

2
resources/languages/bg.js

File diff suppressed because one or more lines are too long

2
resources/languages/bn.js

File diff suppressed because one or more lines are too long

2
resources/languages/bs2.js

File diff suppressed because one or more lines are too long

2
resources/languages/ca.js

File diff suppressed because one or more lines are too long

2
resources/languages/ceb.js

File diff suppressed because one or more lines are too long

2
resources/languages/cs.js

File diff suppressed because one or more lines are too long

2
resources/languages/da.js

File diff suppressed because one or more lines are too long

2
resources/languages/de-CH.js

File diff suppressed because one or more lines are too long

2
resources/languages/de.js

File diff suppressed because one or more lines are too long

2
resources/languages/en.js

File diff suppressed because one or more lines are too long

2
resources/languages/fi.js

File diff suppressed because one or more lines are too long

2
resources/languages/fil.js

File diff suppressed because one or more lines are too long

2
resources/languages/fr.js

File diff suppressed because one or more lines are too long

2
resources/languages/he.js

File diff suppressed because one or more lines are too long

2
resources/languages/hi.js

File diff suppressed because one or more lines are too long

2
resources/languages/hr.js

File diff suppressed because one or more lines are too long

2
resources/languages/hu.js

File diff suppressed because one or more lines are too long

2
resources/languages/it.js

File diff suppressed because one or more lines are too long

2
resources/languages/ja.js

File diff suppressed because one or more lines are too long

2
resources/languages/nl.js

File diff suppressed because one or more lines are too long

2
resources/languages/no.js

File diff suppressed because one or more lines are too long

2
resources/languages/pl.js

File diff suppressed because one or more lines are too long

2
resources/languages/pt-BR.js

File diff suppressed because one or more lines are too long

2
resources/languages/pt-PT.js

File diff suppressed because one or more lines are too long

2
resources/languages/ro.js

File diff suppressed because one or more lines are too long

2
resources/languages/sk.js

File diff suppressed because one or more lines are too long

2
resources/languages/sr.js

File diff suppressed because one or more lines are too long

2
resources/languages/sv-SE.js

File diff suppressed because one or more lines are too long

2
resources/languages/uk.js

File diff suppressed because one or more lines are too long

2
resources/languages/vi.js

File diff suppressed because one or more lines are too long

2
resources/languages/zh-CN.js

File diff suppressed because one or more lines are too long

2
resources/languages/zh-TW.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save