Misterzym
/
Rambox-CE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Uppercase font glyph literals to make them less ambiguous.

pull/3202/head
TheGoddessInari 6 years ago
parent
522c0d1ba4
commit
c7c7ce7dab
No known key found for this signature in database
GPG Key ID: 1209B1B7632D69A
5 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.js
  2. 2
      app/Application.js
  3. 16
      app/ux/WebView.js
  4. 30
      app/view/main/Main.js
  5. 2
      app/view/main/MainController.js

2
app.js
Unescape View File

@ -64,7 +64,7 @@ ipc.on('autoUpdater:update-downloaded', function(e, releaseNotes, releaseName, r
} }
,'->' ,'->'
,{ ,{
glyph: 'xf00d@FontAwesome' glyph: 'XF00D@FontAwesome'
,baseCls: '' ,baseCls: ''
,style: 'cursor:pointer;' ,style: 'cursor:pointer;'
,handler: function(btn) { Ext.cq1('app-main').removeDocked(btn.up('toolbar'), true); } ,handler: function(btn) { Ext.cq1('app-main').removeDocked(btn.up('toolbar'), true); }

2
app/Application.js
Unescape View File

@ -111,7 +111,7 @@ Ext.define('Rambox.Application', {
} }
,'->' ,'->'
,{ ,{
glyph: 'xf00d@FontAwesome' glyph: 'XF00D@FontAwesome'
,baseCls: '' ,baseCls: ''
,style: 'cursor:pointer;' ,style: 'cursor:pointer;'
,handler: function(btn) { Ext.cq1('app-main').removeDocked(btn.up('toolbar'), true); } ,handler: function(btn) { Ext.cq1('app-main').removeDocked(btn.up('toolbar'), true); }

16
app/ux/WebView.js
Unescape View File

@ -71,14 +71,14 @@ Ext.define('Rambox.ux.WebView',{
,items: [ ,items: [
{ {
text: 'Back' text: 'Back'
,glyph: 'xf053@FontAwesome' ,glyph: 'XF053@FontAwesome'
,flex: 1 ,flex: 1
,scope: me ,scope: me
,handler: me.goBack ,handler: me.goBack
} }
,{ ,{
text: 'Forward' text: 'Forward'
,glyph: 'xf054@FontAwesome' ,glyph: 'XF054@FontAwesome'
,iconAlign: 'right' ,iconAlign: 'right'
,flex: 1 ,flex: 1
,scope: me ,scope: me
@ -91,33 +91,33 @@ Ext.define('Rambox.ux.WebView',{
,'-' ,'-'
,{ ,{
text: 'Zoom In' text: 'Zoom In'
,glyph: 'xf00e@FontAwesome' ,glyph: 'XF00E@FontAwesome'
,scope: me ,scope: me
,handler: me.zoomIn ,handler: me.zoomIn
} }
,{ ,{
text: 'Zoom Out' text: 'Zoom Out'
,glyph: 'xf010@FontAwesome' ,glyph: 'XF010@FontAwesome'
,scope: me ,scope: me
,handler: me.zoomOut ,handler: me.zoomOut
} }
,{ ,{
text: 'Reset Zoom' text: 'Reset Zoom'
,glyph: 'xf002@FontAwesome' ,glyph: 'XF002@FontAwesome'
,scope: me ,scope: me
,handler: me.resetZoom ,handler: me.resetZoom
} }
,'-' ,'-'
,{ ,{
text: locale['app.webview[0]'] text: locale['app.webview[0]']
,glyph: 'xf021@FontAwesome' ,glyph: 'XF021@FontAwesome'
,scope: me ,scope: me
,handler: me.reloadService ,handler: me.reloadService
} }
,'-' ,'-'
,{ ,{
text: locale['app.webview[3]'] text: locale['app.webview[3]']
,glyph: 'xf121@FontAwesome' ,glyph: 'XF121@FontAwesome'
,scope: me ,scope: me
,handler: me.toggleDevTools ,handler: me.toggleDevTools
} }
@ -200,7 +200,7 @@ Ext.define('Rambox.ux.WebView',{
} }
,{ ,{
xtype: 'button' xtype: 'button'
,glyph: 'xf00d@FontAwesome' ,glyph: 'XF00D@FontAwesome'
,scale: 'small' ,scale: 'small'
,ui: 'decline' ,ui: 'decline'
,padding: 0 ,padding: 0

30
app/view/main/Main.js
Unescape View File

@ -142,7 +142,7 @@ Ext.define('Rambox.view.main.Main', {
,tools: [ ,tools: [
{ {
xtype: 'button' xtype: 'button'
,glyph: 'xf1f8@FontAwesome' ,glyph: 'XF1F8@FontAwesome'
,baseCls: '' ,baseCls: ''
,tooltip: locale['app.main[10]'] ,tooltip: locale['app.main[10]']
,handler: 'removeAllServices' ,handler: 'removeAllServices'
@ -170,14 +170,14 @@ Ext.define('Rambox.view.main.Main', {
,align: 'right' ,align: 'right'
,items: [ ,items: [
{ {
glyph: 0xf1f7 glyph: 0xF1F7
,tooltip: locale['app.main[11]'] ,tooltip: locale['app.main[11]']
,getClass: function( value, metaData, record, rowIndex, colIndex, store, view ){ ,getClass: function( value, metaData, record, rowIndex, colIndex, store, view ){
if ( record.get('notifications') ) return 'x-hidden'; if ( record.get('notifications') ) return 'x-hidden';
} }
} }
,{ ,{
glyph: 0xf026 glyph: 0xF026
,tooltip: locale['app.main[12]'] ,tooltip: locale['app.main[12]']
,getClass: function( value, metaData, record, rowIndex, colIndex, store, view ){ ,getClass: function( value, metaData, record, rowIndex, colIndex, store, view ){
if ( !record.get('muted') ) return 'x-hidden'; if ( !record.get('muted') ) return 'x-hidden';
@ -191,13 +191,13 @@ Ext.define('Rambox.view.main.Main', {
,align: 'center' ,align: 'center'
,items: [ ,items: [
{ {
glyph: 0xf013 glyph: 0xF013
,tooltip: locale['app.main[13]'] ,tooltip: locale['app.main[13]']
,handler: 'configureService' ,handler: 'configureService'
,getClass: function(){ return 'x-hidden-display'; } ,getClass: function(){ return 'x-hidden-display'; }
} }
,{ ,{
glyph: 0xf1f8 glyph: 0xF1F8
,tooltip: locale['app.main[14]'] ,tooltip: locale['app.main[14]']
,handler: 'removeService' ,handler: 'removeService'
,getClass: function(){ return 'x-hidden-display'; } ,getClass: function(){ return 'x-hidden-display'; }
@ -236,7 +236,7 @@ Ext.define('Rambox.view.main.Main', {
,overflowHandler: 'menu' ,overflowHandler: 'menu'
,items: [ ,items: [
{ {
glyph: 'xf1f7@FontAwesome' glyph: 'XF1F7@FontAwesome'
,text: locale['app.main[16]']+': '+(JSON.parse(localStorage.getItem('dontDisturb')) ? locale['app.window[20]'] : locale['app.window[21]']) ,text: locale['app.main[16]']+': '+(JSON.parse(localStorage.getItem('dontDisturb')) ? locale['app.window[20]'] : locale['app.window[21]'])
,tooltip: locale['app.main[17]']+'<br/><b>'+locale['app.main[18]']+': Alt+F1</b>' ,tooltip: locale['app.main[17]']+'<br/><b>'+locale['app.main[18]']+': Alt+F1</b>'
,enableToggle: true ,enableToggle: true
@ -246,7 +246,7 @@ Ext.define('Rambox.view.main.Main', {
,pressed: JSON.parse(localStorage.getItem('dontDisturb')) ,pressed: JSON.parse(localStorage.getItem('dontDisturb'))
} }
,{ ,{
glyph: 'xf023@FontAwesome' glyph: 'XF023@FontAwesome'
,text: locale['app.main[19]'] ,text: locale['app.main[19]']
,tooltip: locale['app.main[20]']+'<br/><b>'+locale['app.main[18]']+': Alt+F2</b>' ,tooltip: locale['app.main[20]']+'<br/><b>'+locale['app.main[18]']+': Alt+F2</b>'
,handler: 'lockRambox' ,handler: 'lockRambox'
@ -255,7 +255,7 @@ Ext.define('Rambox.view.main.Main', {
,'->' ,'->'
,{ ,{
text: 'Backup' text: 'Backup'
,glyph: 'xf0c7@FontAwesome' ,glyph: 'XF0C7@FontAwesome'
,id: 'backupBtn' ,id: 'backupBtn'
,tooltip: 'Backup services to disk' ,tooltip: 'Backup services to disk'
,scope: Rambox.ux.FileBackup ,scope: Rambox.ux.FileBackup
@ -263,7 +263,7 @@ Ext.define('Rambox.view.main.Main', {
} }
,{ ,{
text: 'Restore' text: 'Restore'
,glyph: 'xf115@FontAwesome' ,glyph: 'XF115@FontAwesome'
,id: 'restoreBtn' ,id: 'restoreBtn'
,tooltip: 'Restore services from disk' ,tooltip: 'Restore services from disk'
,scope: Rambox.ux.FileBackup ,scope: Rambox.ux.FileBackup
@ -271,7 +271,7 @@ Ext.define('Rambox.view.main.Main', {
} }
,{ ,{
tooltip: locale['preferences[0]'] tooltip: locale['preferences[0]']
,glyph: 'xf013@FontAwesome' ,glyph: 'XF013@FontAwesome'
,handler: 'openPreferences' ,handler: 'openPreferences'
} }
] ]
@ -287,14 +287,14 @@ Ext.define('Rambox.view.main.Main', {
} }
,{ ,{
text: locale['app.main[25]'] text: locale['app.main[25]']
,glyph: 'xf21e@FontAwesome' ,glyph: 'XF21E@FontAwesome'
,href: 'https://www.gofundme.com/rambox-os' ,href: 'https://www.gofundme.com/rambox-os'
} }
] ]
/* TODO: Translation /* TODO: Translation
,{ ,{
text: 'Translation' text: 'Translation'
,glyph: 'xf0ac@FontAwesome' ,glyph: 'XF0AC@FontAwesome'
,href: 'https://crowdin.com/project/rambox/invite' ,href: 'https://crowdin.com/project/rambox/invite'
} }
]*/ ]*/
@ -314,15 +314,15 @@ Ext.define('Rambox.view.main.Main', {
,pressed: true ,pressed: true
} }
,{ ,{
glyph: 'xf082@FontAwesome' glyph: 'XF082@FontAwesome'
,href: 'https://www.facebook.com/TheGoddessInari' ,href: 'https://www.facebook.com/TheGoddessInari'
} }
,{ ,{
glyph: 'xf099@FontAwesome' glyph: 'XF099@FontAwesome'
,href: 'https://www.twitter.com/TheGoddessInari' ,href: 'https://www.twitter.com/TheGoddessInari'
} }
,{ ,{
glyph: 'xf09b@FontAwesome' glyph: 'XF09B@FontAwesome'
,href: 'https://www.github.com/TheGoddessInari/rambox' ,href: 'https://www.github.com/TheGoddessInari/rambox'
} }
] ]

2
app/view/main/MainController.js
Unescape View File

@ -443,7 +443,7 @@ Ext.define('Rambox.view.main.MainController', {
,{ ,{
xtype: 'button' xtype: 'button'
,text: locale['app.window[27]'] ,text: locale['app.window[27]']
,glyph: 'xf13e@FontAwesome' ,glyph: 'XF13E@FontAwesome'
,width: 256 ,width: 256
,scale: 'large' ,scale: 'large'
,handler: validateFn ,handler: validateFn

Write Preview
Loading…
Cancel
Save