Skip to content

Commit

Permalink
Merge pull request #14 from LibreRambox/changed-service-namespace
Browse files Browse the repository at this point in the history
Draft: Changed service namespace
  • Loading branch information
wolfposd committed Dec 5, 2023
2 parents ba7a5a7 + 59d56aa commit d99351f
Show file tree
Hide file tree
Showing 102 changed files with 239 additions and 239 deletions.
80 changes: 40 additions & 40 deletions .sencha/app/codegen.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@
"parameters": {
"appControllers": "",
"appModels": "",
"appName": "Rambox",
"appName": "LibreRambox",
"appStores": "",
"appViews": "",
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "Rambox.controller",
"controllerNamespace": "LibreRambox.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "Rambox.model",
"name": "Rambox",
"modelNamespace": "LibreRambox.model",
"name": "LibreRambox",
"packagesRelPath": "ext/packages",
"senchadir": ".sencha",
"themeName": "default",
"uniqueId": "0f59c907-ae2e-485e-8a8d-cc2f7f60c1ed",
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "Rambox.view"
"viewNamespace": "LibreRambox.view"
}
},
".sencha/app/development.properties": {
Expand All @@ -58,24 +58,24 @@
"parameters": {
"appControllers": "",
"appModels": "",
"appName": "Rambox",
"appName": "LibreRambox",
"appStores": "",
"appViews": "",
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "Rambox.controller",
"controllerNamespace": "LibreRambox.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "Rambox.model",
"name": "Rambox",
"modelNamespace": "LibreRambox.model",
"name": "LibreRambox",
"packagesRelPath": "ext/packages",
"senchadir": ".sencha",
"themeName": "default",
"uniqueId": "0f59c907-ae2e-485e-8a8d-cc2f7f60c1ed",
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "Rambox.view"
"viewNamespace": "LibreRambox.view"
}
},
".sencha/app/native.properties": {
Expand All @@ -84,24 +84,24 @@
"parameters": {
"appControllers": "",
"appModels": "",
"appName": "Rambox",
"appName": "LibreRambox",
"appStores": "",
"appViews": "",
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "Rambox.controller",
"controllerNamespace": "LibreRambox.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "Rambox.model",
"name": "Rambox",
"modelNamespace": "LibreRambox.model",
"name": "LibreRambox",
"packagesRelPath": "ext/packages",
"senchadir": ".sencha",
"themeName": "default",
"uniqueId": "0f59c907-ae2e-485e-8a8d-cc2f7f60c1ed",
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "Rambox.view"
"viewNamespace": "LibreRambox.view"
}
},
".sencha/app/package.properties": {
Expand All @@ -110,24 +110,24 @@
"parameters": {
"appControllers": "",
"appModels": "",
"appName": "Rambox",
"appName": "LibreRambox",
"appStores": "",
"appViews": "",
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "Rambox.controller",
"controllerNamespace": "LibreRambox.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "Rambox.model",
"name": "Rambox",
"modelNamespace": "LibreRambox.model",
"name": "LibreRambox",
"packagesRelPath": "ext/packages",
"senchadir": ".sencha",
"themeName": "default",
"uniqueId": "0f59c907-ae2e-485e-8a8d-cc2f7f60c1ed",
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "Rambox.view"
"viewNamespace": "LibreRambox.view"
}
},
".sencha/app/production.properties": {
Expand All @@ -136,24 +136,24 @@
"parameters": {
"appControllers": "",
"appModels": "",
"appName": "Rambox",
"appName": "LibreRambox",
"appStores": "",
"appViews": "",
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "Rambox.controller",
"controllerNamespace": "LibreRambox.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "Rambox.model",
"name": "Rambox",
"modelNamespace": "LibreRambox.model",
"name": "LibreRambox",
"packagesRelPath": "ext/packages",
"senchadir": ".sencha",
"themeName": "default",
"uniqueId": "0f59c907-ae2e-485e-8a8d-cc2f7f60c1ed",
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "Rambox.view"
"viewNamespace": "LibreRambox.view"
}
},
".sencha/app/sencha.cfg": {
Expand All @@ -162,24 +162,24 @@
"parameters": {
"appControllers": "",
"appModels": "",
"appName": "Rambox",
"appName": "LibreRambox",
"appStores": "",
"appViews": "",
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "Rambox.controller",
"controllerNamespace": "LibreRambox.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "Rambox.model",
"name": "Rambox",
"modelNamespace": "LibreRambox.model",
"name": "LibreRambox",
"packagesRelPath": "ext/packages",
"senchadir": ".sencha",
"themeName": "default",
"uniqueId": "0f59c907-ae2e-485e-8a8d-cc2f7f60c1ed",
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "Rambox.view"
"viewNamespace": "LibreRambox.view"
}
},
".sencha/app/testing.properties": {
Expand All @@ -188,24 +188,24 @@
"parameters": {
"appControllers": "",
"appModels": "",
"appName": "Rambox",
"appName": "LibreRambox",
"appStores": "",
"appViews": "",
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "Rambox.controller",
"controllerNamespace": "LibreRambox.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "Rambox.model",
"name": "Rambox",
"modelNamespace": "LibreRambox.model",
"name": "LibreRambox",
"packagesRelPath": "ext/packages",
"senchadir": ".sencha",
"themeName": "default",
"uniqueId": "0f59c907-ae2e-485e-8a8d-cc2f7f60c1ed",
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "Rambox.view"
"viewNamespace": "LibreRambox.view"
}
},
"sass/config.rb": {
Expand All @@ -214,24 +214,24 @@
"parameters": {
"appControllers": "",
"appModels": "",
"appName": "Rambox",
"appName": "LibreRambox",
"appStores": "",
"appViews": "",
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "Rambox.controller",
"controllerNamespace": "LibreRambox.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "Rambox.model",
"name": "Rambox",
"modelNamespace": "LibreRambox.model",
"name": "LibreRambox",
"packagesRelPath": "ext/packages",
"senchadir": ".sencha",
"themeName": "default",
"uniqueId": "0f59c907-ae2e-485e-8a8d-cc2f7f60c1ed",
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "Rambox.view"
"viewNamespace": "LibreRambox.view"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions .sencha/app/sencha.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The name of the application
app.name=Rambox
app.name=LibreRambox

# The path(s) to application javascript sources (comma separated)
app.classpath=${app.dir}/app,${app.dir}/app.js
Expand All @@ -9,7 +9,7 @@ app.overrides=${app.dir}/overrides

# The root namespace to use when mapping scss resources to js classes
# in the sass/src and sass/var directories
app.sass.namespace=Rambox
app.sass.namespace=LibreRambox

# Path to sass rule definition files corresponding to JavaScript classes.
app.sass.srcpath=${app.dir}/sass/src
Expand Down
16 changes: 8 additions & 8 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@ ElectronCookies.enable({ origin: 'localhost' });
// Sencha App
Ext.setGlyphFontFamily('FontAwesome');
Ext.application({
name: 'Rambox'
name: 'LibreRambox'

,extend: 'Rambox.Application'
,extend: 'LibreRambox.Application'

,autoCreateViewport: 'Rambox.view.main.Main'
,autoCreateViewport: 'LibreRambox.view.main.Main'
});

// auto update logic
const ipc = require('electron').ipcRenderer;

ipc.on('showAbout', function(event, message) {
!Ext.cq1('about') ? Ext.create('Rambox.view.main.About') : '';
!Ext.cq1('about') ? Ext.create('LibreRambox.view.main.About') : '';
});
ipc.on('showPreferences', function(event, message) {
!Ext.cq1('preferences') ? Ext.create('Rambox.view.preferences.Preferences').show() : '';
!Ext.cq1('preferences') ? Ext.create('LibreRambox.view.preferences.Preferences').show() : '';
});
ipc.on('grantPermissions', async function() {
await require('@electron/remote').systemPreferences.askForMediaAccess('microphone');
await require('@electron/remote').systemPreferences.askForMediaAccess('camera');
});
ipc.on('autoUpdater:check-update', function() {
Rambox.app.checkUpdate();
LibreRambox.app.checkUpdate();
});
ipc.on('autoUpdater:update-not-available', function() {
Ext.Msg.show({
Expand Down Expand Up @@ -130,13 +130,13 @@ ipc.on('setBadge', function(event, messageCount) {
// Reload Current Service
ipc.on('reloadCurrentService', function(e) {
var tab = Ext.cq1('app-main').getActiveTab();
if ( tab.id !== 'ramboxTab' ) tab.reloadService();
if ( tab.id !== 'libreRamboxTab' ) tab.reloadService();
});
// Toggle Status Bar
ipc.on('toggleStatusBar', function() {
var tab = Ext.cq1('app-main').getActiveTab();

if ( tab.id !== 'ramboxTab' ) {
if ( tab.id !== 'libreRamboxTab' ) {
tab.down('statusbar').closed ? tab.setStatusBar(tab.record.get('statusbar')) : tab.closeStatusBar();
}
});
Expand Down
14 changes: 7 additions & 7 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* The application's namespace.
*/
"name": "Rambox",
"name": "LibreRambox",

/**
* The relative path to the appliaction's markup file (html, jsp, asp, etc.)
Expand All @@ -28,7 +28,7 @@
* The name of the theme for this application.
*/

"theme": "rambox-default-theme",
"theme": "librerambox-default-theme",

/**
* The list of required packages (with optional versions; default is "latest").
Expand All @@ -49,13 +49,13 @@
"sass": {
/**
* The root namespace to use when mapping *.scss files to classes in the
* sass/src and sass/var directories. For example, "Rambox.view.Foo" would
* map to "sass/src/view/Foo.scss". If we changed this to "Rambox.view" then
* sass/src and sass/var directories. For example, "LibreRambox.view.Foo" would
* map to "sass/src/view/Foo.scss". If we changed this to "LibreRambox.view" then
* it would map to "sass/src/Foo.scss". To style classes outside the app's
* root namespace, change this to "". Doing so would change the mapping of
* "Rambox.view.Foo" to "sass/src/Rambox/view/Foo.scss".
* "LibreRambox.view.Foo" to "sass/src/LibreRambox/view/Foo.scss".
*/
"namespace": "Rambox"
"namespace": "LibreRambox"
},

/**
Expand Down Expand Up @@ -267,7 +267,7 @@
"cache": [
"index.html",
"app.js",
"resources/Rambox-all.css",
"resources/LibreRambox-all.css",
"resources/Icon.png"
],
/**
Expand Down
12 changes: 6 additions & 6 deletions app/Application.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Ext.define('Rambox.Application', {
Ext.define('LibreRambox.Application', {
extend: 'Ext.app.Application'

,name: 'Rambox'
,name: 'LibreRambox'

,requires: [
'Rambox.util.MD5'
'LibreRambox.util.MD5'
,'Ext.window.Toast'
,'Ext.util.Cookies'
]
Expand Down Expand Up @@ -138,7 +138,7 @@ Ext.define('Rambox.Application', {
Ext.Loader.loadScript({url: Ext.util.Format.format("ext/packages/ext-locale/build/ext-locale-{0}.js", localStorage.getItem('locale-extjs') || 'en')});

// Set Google URLs
Rambox.app.config.googleURLs = [
LibreRambox.app.config.googleURLs = [
"accounts.google.com/ServiceLogin",
"accounts.google.com/signin",
"accounts.google.com/_/lookup/accountlookup",
Expand Down Expand Up @@ -233,9 +233,9 @@ Ext.define('Rambox.Application', {
newValue = parseInt(newValue);
if ( newValue > 0 ) {
if ( Ext.cq1('app-main').getActiveTab().record ) {
document.title = 'LibreRambox (' + Rambox.util.Format.formatNumber(newValue) + ') - '+Ext.cq1('app-main').getActiveTab().record.get('name');
document.title = 'LibreRambox (' + LibreRambox.util.Format.formatNumber(newValue) + ') - '+Ext.cq1('app-main').getActiveTab().record.get('name');
} else {
document.title = 'LibreRambox (' + Rambox.util.Format.formatNumber(newValue) + ')';
document.title = 'LibreRambox (' + LibreRambox.util.Format.formatNumber(newValue) + ')';
}
} else {
if ( Ext.cq1('app-main') && Ext.cq1('app-main').getActiveTab().record ) {
Expand Down
2 changes: 1 addition & 1 deletion app/model/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ While by default the unread count is determined by looking for ` (COUNT)` to the

Code provided by `js_unread` will be injected into the service website.
You can retrieve the unread count in this JavaScript code e.g. by parsing elements.
Set the unread count by calling `rambox.setUnreadCount(COUNT)` or clear it by calling `rambox.clearUnreadCount()`.
Set the unread count by calling `librerambox.setUnreadCount(COUNT)` or clear it by calling `librerambox.clearUnreadCount()`.
2 changes: 1 addition & 1 deletion app/model/Service.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Ext.define('Rambox.model.Service', {
Ext.define('LibreRambox.model.Service', {
extend: 'Ext.data.Model'

,identifier: 'sequential'
Expand Down
Loading

0 comments on commit d99351f

Please sign in to comment.