Skip to content
Snippets Groups Projects
Verified Commit f619b8c0 authored by Nico's avatar Nico
Browse files

Change name to briar-gtk or BriarGtk where possible

Modules can't contain slashes and class names seem to follow CamelCase
style.
parent 4b2bd6f7
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.openjdk10"
],
"command": "briar_gtk",
"command": "briar-gtk",
"finish-args": [
"--share=network",
"--share=ipc",
......@@ -63,14 +63,14 @@
]
},
{
"name": "briar_gtk",
"name": "briar-gtk",
"buildsystem": "meson",
"config-opts": [ "--libdir=lib" ],
"builddir": true,
"sources": [
{
"type": "git",
"url": "file:///home/nico/Work/Current/Briar/briar_gtk"
"url": "file:///home/nico/Work/Current/Briar/briar-gtk"
}
]
}
......
[Desktop Entry]
Name=Briar GTK
Exec=briar_gtk
Exec=briar-gtk
Terminal=false
Type=Application
Categories=GTK;
......
project('briar_gtk', version: '0.1.0',
project('briar-gtk', version: '0.1.0',
meson_version: '>= 0.40.0',
)
......
i18n.gettext('briar_gtk', preset: 'glib')
i18n.gettext('briar-gtk', preset: 'glib')
\ No newline at end of file
File moved
#!@PYTHON@
# briar_gtk.in
# briar-gtk.in
#
# Copyright 2019 Nico Alt
#
......@@ -28,13 +28,13 @@ localedir = '@localedir@'
sys.path.insert(1, pkgdatadir)
signal.signal(signal.SIGINT, signal.SIG_DFL)
gettext.install('briar_gtk', localedir)
gettext.install('briar-gtk', localedir)
if __name__ == '__main__':
import gi
from gi.repository import Gio
resource = Gio.Resource.load(os.path.join(pkgdatadir, 'briar_gtk.gresource'))
resource = Gio.Resource.load(os.path.join(pkgdatadir, 'briar-gtk.gresource'))
resource._register()
from briar_gtk import main
......
......@@ -22,7 +22,7 @@ gi.require_version('Gtk', '3.0')
from gi.repository import Gtk, Gio
from .window import Briar_gtkWindow
from .window import BriarGtkWindow
class Application(Gtk.Application):
......@@ -33,7 +33,7 @@ class Application(Gtk.Application):
def do_activate(self):
win = self.props.active_window
if not win:
win = Briar_gtkWindow(application=self)
win = BriarGtkWindow(application=self)
win.present()
......
......@@ -2,8 +2,8 @@ pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.proje
moduledir = join_paths(pkgdatadir, 'briar_gtk')
gnome = import('gnome')
gnome.compile_resources('briar_gtk',
'briar_gtk.gresource.xml',
gnome.compile_resources('briar-gtk',
'briar-gtk.gresource.xml',
gresource_bundle: true,
install: true,
install_dir: pkgdatadir,
......@@ -18,8 +18,8 @@ conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
conf.set('pkgdatadir', pkgdatadir)
configure_file(
input: 'briar_gtk.in',
output: 'briar_gtk',
input: 'briar-gtk.in',
output: 'briar-gtk',
configuration: conf,
install: true,
install_dir: get_option('bindir')
......
......@@ -20,8 +20,8 @@ from .gi_composites import GtkTemplate
@GtkTemplate(ui='/app/briar/gtk/window.ui')
class Briar_gtkWindow(Gtk.ApplicationWindow):
__gtype_name__ = 'Briar_gtkWindow'
class BriarGtkWindow(Gtk.ApplicationWindow):
__gtype_name__ = 'BriarGtkWindow'
label = GtkTemplate.Child()
......
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="Briar_gtkWindow" parent="GtkApplicationWindow">
<template class="BriarGtkWindow" parent="GtkApplicationWindow">
<property name="default-width">600</property>
<property name="default-height">300</property>
<child type="titlebar">
......@@ -24,3 +24,4 @@
</template>
</interface>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment