brl/citadel-realms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to get everything working in citadel build

Browse Source
This commit is contained in:
Bruce Leidl 2024-11-13 11:38:16 -05:00
parent 581e404edf
commit 048002a617
7 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/com.subgraph.citadel.Realms.desktop
View File

@ -3,4 +3,4 @@ Name=Realms
Type=Application Type=Application
Exec=com.subgraph.citadel.Realms Exec=com.subgraph.citadel.Realms
Terminal=false Terminal=false
Icon=com.subgraph.citadel.Realms Icon=/usr/share/icons/com.subgraph.Realms.png

11
data/meson.build
View File

@ -16,6 +16,15 @@ blueprints = custom_target('blueprints',
command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'], command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
) )
desktop_file = i18n.merge_file(
input: 'com.subgraph.citadel.Realms.desktop',
output: 'com.subgraph.citadel.Realms.desktop',
type: 'desktop',
po_dir: '../po',
install: true,
install_dir: join_paths(get_option('datadir'), 'applications')
)
gnome.compile_resources( gnome.compile_resources(
APP_ID + '.data', APP_ID + '.data',
APP_ID + '.data.gresource.xml', APP_ID + '.data.gresource.xml',
@ -25,6 +34,6 @@ gnome.compile_resources(
dependencies: blueprints, dependencies: blueprints,
) )
install_data('icons/com.subgraph.Realms.png', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/512x512/apps')) install_data('icons/com.subgraph.Realms.png', install_dir: join_paths(get_option('datadir'), 'icons'))

4
js/model/RealmManager.js
View File

@ -7,7 +7,7 @@ import { LabelColorManager } from './LabelColors.js';
const Signals = imports.signals; const Signals = imports.signals;
const RealmIface = loadInterfaceXML("com.subgraph.realms.Realm"); const RealmIface = loadInterfaceXML("com.subgraph.realms.Realm");
const RealmFSIface = loadInterfaceXML("com.subgraph.realms.RealmFS"); const RealmFSIface = loadInterfaceXML("com.subgraph.realms.RealmFS");
const BUS_NAME = 'com.subgraph.Realms2'; const BUS_NAME = 'com.subgraph.realms';
const OBJECT_PATH = '/com/subgraph/Realms2'; const OBJECT_PATH = '/com/subgraph/Realms2';
const ManagerInterface = loadInterfaceXML("com.subgraph.realms.Manager2"); const ManagerInterface = loadInterfaceXML("com.subgraph.realms.Manager2");
const ManagerProxy = Gio.DBusProxy.makeProxyWrapper(ManagerInterface); const ManagerProxy = Gio.DBusProxy.makeProxyWrapper(ManagerInterface);
@ -23,7 +23,7 @@ export class RealmManager {
this._realmfs = {}; this._realmfs = {};
this._objectManager = new ObjectManager({ this._objectManager = new ObjectManager({
connection: Gio.DBus.system, connection: Gio.DBus.system,
name: 'com.subgraph.Realms2', name: BUS_NAME,
objectPath: '/com/subgraph/Realms2', objectPath: '/com/subgraph/Realms2',
knownInterfaces: [RealmIface, RealmFSIface], knownInterfaces: [RealmIface, RealmFSIface],
onLoaded: this._onLoaded.bind(this), onLoaded: this._onLoaded.bind(this),

1
meson.build
View File

@ -8,6 +8,7 @@ project(
APP_ID = 'com.subgraph.citadel.Realms' APP_ID = 'com.subgraph.citadel.Realms'
gnome = import('gnome') gnome = import('gnome')
i18n = import('i18n')
#tsc = find_program('tsc', required: true) #tsc = find_program('tsc', required: true)

2
src/com.subgraph.citadel.Realms.js
View File

@ -1,4 +1,4 @@
#!@GJS@ -m #!/usr/bin/env -S gjs -m
import GLib from 'gi://GLib' import GLib from 'gi://GLib'

1
src/meson.build
View File

@ -2,7 +2,6 @@ configure_file(
input: APP_ID + '.js', input: APP_ID + '.js',
output: APP_ID, output: APP_ID,
configuration: { configuration: {
'GJS': find_program('gjs').full_path(),
'PACKAGE_NAME': APP_ID, 'PACKAGE_NAME': APP_ID,
'PACKAGE_VERSION': meson.project_version(), 'PACKAGE_VERSION': meson.project_version(),
'PREFIX': get_option('prefix'), 'PREFIX': get_option('prefix'),

5
src/model/RealmManager.ts
View File

@ -13,7 +13,7 @@ const Signals = imports.signals;
const RealmIface = loadInterfaceXML("com.subgraph.realms.Realm"); const RealmIface = loadInterfaceXML("com.subgraph.realms.Realm");
const RealmFSIface = loadInterfaceXML("com.subgraph.realms.RealmFS"); const RealmFSIface = loadInterfaceXML("com.subgraph.realms.RealmFS");
const BUS_NAME = 'com.subgraph.Realms2'; const BUS_NAME = 'com.subgraph.realms';
const OBJECT_PATH = '/com/subgraph/Realms2'; const OBJECT_PATH = '/com/subgraph/Realms2';
const ManagerInterface = loadInterfaceXML("com.subgraph.realms.Manager2"); const ManagerInterface = loadInterfaceXML("com.subgraph.realms.Manager2");
const ManagerProxy = Gio.DBusProxy.makeProxyWrapper(ManagerInterface); const ManagerProxy = Gio.DBusProxy.makeProxyWrapper(ManagerInterface);
@ -33,7 +33,6 @@ export class RealmManager {
private _labelColors: LabelColorManager; private _labelColors: LabelColorManager;
private _proxy: Gio.DBusProxy; private _proxy: Gio.DBusProxy;
static instance(): RealmManager { static instance(): RealmManager {
return RealmManager.INSTANCE; return RealmManager.INSTANCE;
} }
@ -43,7 +42,7 @@ export class RealmManager {
this._objectManager = new ObjectManager({ this._objectManager = new ObjectManager({
connection: Gio.DBus.system, connection: Gio.DBus.system,
name: 'com.subgraph.Realms2', name: BUS_NAME,
objectPath: '/com/subgraph/Realms2', objectPath: '/com/subgraph/Realms2',
knownInterfaces: [RealmIface, RealmFSIface], knownInterfaces: [RealmIface, RealmFSIface],
onLoaded: this._onLoaded.bind(this), onLoaded: this._onLoaded.bind(this),