Commit da38af10 authored by Roman Alifanov's avatar Roman Alifanov

created config.py, which is available everywhere under the name tuneit_config…

created config.py, which is available everywhere under the name tuneit_config and contains important settings (or will contain :))
parent d232911a
option('systemd_unitdir', type: 'string', value: '/usr/lib/systemd/system', description: 'Path to systemd unit directory') option('systemd_unitdir',
\ No newline at end of file type: 'string',
value: '/usr/lib/systemd/system',
description: 'Path to systemd unit directory'
)
option('is_devel',
type: 'boolean',
value: false,
description: 'devel?'
)
class Config:
VERSION = '@VERSION@'
pkgdatadir = '@pkgdatadir@'
localedir = '@localedir@'
IS_DEVEL = @IS_DEVEL@
\ No newline at end of file
...@@ -25,7 +25,6 @@ import signal ...@@ -25,7 +25,6 @@ import signal
import locale import locale
import gettext import gettext
VERSION = '@VERSION@'
pkgdatadir = '@pkgdatadir@' pkgdatadir = '@pkgdatadir@'
localedir = '@localedir@' localedir = '@localedir@'
......
...@@ -61,7 +61,7 @@ class TuneitApplication(Adw.Application): ...@@ -61,7 +61,7 @@ class TuneitApplication(Adw.Application):
about = Adw.AboutDialog(application_name='tuneit', about = Adw.AboutDialog(application_name='tuneit',
application_icon='ru.ximperlinux.TuneIt', application_icon='ru.ximperlinux.TuneIt',
developer_name='Etersoft', developer_name='Etersoft',
version='0.1.0', version=tuneit_config.VERSION,
developers=['Ximper'], developers=['Ximper'],
copyright='© 2024 Etersoft') copyright='© 2024 Etersoft')
# Translators: Replace "translator-credits" with your name/username, and optionally an email or URL. # Translators: Replace "translator-credits" with your name/username, and optionally an email or URL.
...@@ -88,7 +88,7 @@ class TuneitApplication(Adw.Application): ...@@ -88,7 +88,7 @@ class TuneitApplication(Adw.Application):
self.set_accels_for_action(f"app.{name}", shortcuts) self.set_accels_for_action(f"app.{name}", shortcuts)
def main(version): def main():
"""The application's entry point.""" """The application's entry point."""
app = TuneitApplication() app = TuneitApplication()
return app.run(sys.argv) return app.run(sys.argv)
...@@ -31,6 +31,8 @@ conf.set('VERSION', meson.project_version()) ...@@ -31,6 +31,8 @@ conf.set('VERSION', meson.project_version())
conf.set('localedir', get_option('prefix') / get_option('localedir')) conf.set('localedir', get_option('prefix') / get_option('localedir'))
conf.set('pkgdatadir', pkgdatadir) conf.set('pkgdatadir', pkgdatadir)
conf.set('IS_DEVEL', get_option('is_devel'))
configure_file( configure_file(
input: 'tuneit.in', input: 'tuneit.in',
output: 'tuneit', output: 'tuneit',
...@@ -49,6 +51,15 @@ configure_file( ...@@ -49,6 +51,15 @@ configure_file(
install_mode: 'r-xr-xr-x' install_mode: 'r-xr-xr-x'
) )
configure_file(
input: 'config.py',
output: 'config.py',
configuration: conf,
install: true,
install_dir: moduledir
)
tuneit_sources = [ tuneit_sources = [
'__init__.py', '__init__.py',
'main.py', 'main.py',
......
...@@ -7,7 +7,7 @@ def get_local_module_directory(): ...@@ -7,7 +7,7 @@ def get_local_module_directory():
return os.path.join(home_directory, ".local", "share", "tuneit", "modules") return os.path.join(home_directory, ".local", "share", "tuneit", "modules")
def get_module_directory(): def get_module_directory():
return "/usr/share/tuneit/modules" return os.path.join(tuneit_config.pkgdatadir, "modules")
def load_modules(): def load_modules():
modules = [] modules = []
......
...@@ -33,7 +33,6 @@ logging.basicConfig( ...@@ -33,7 +33,6 @@ logging.basicConfig(
datefmt="%Y-%m-%d %H:%M:%S", datefmt="%Y-%m-%d %H:%M:%S",
) )
VERSION = '@VERSION@'
pkgdatadir = '@pkgdatadir@' pkgdatadir = '@pkgdatadir@'
localedir = '@localedir@' localedir = '@localedir@'
...@@ -43,6 +42,12 @@ locale.bindtextdomain('tuneit', localedir) ...@@ -43,6 +42,12 @@ locale.bindtextdomain('tuneit', localedir)
locale.textdomain('tuneit') locale.textdomain('tuneit')
gettext.install('tuneit', localedir) gettext.install('tuneit', localedir)
import builtins
from tuneit.config import Config
builtins.tuneit_config = Config
if __name__ == '__main__': if __name__ == '__main__':
import gi import gi
...@@ -51,4 +56,4 @@ if __name__ == '__main__': ...@@ -51,4 +56,4 @@ if __name__ == '__main__':
resource._register() resource._register()
from tuneit import main from tuneit import main
sys.exit(main.main(VERSION)) sys.exit(main.main())
...@@ -41,6 +41,11 @@ class TuneitWindow(Adw.ApplicationWindow): ...@@ -41,6 +41,11 @@ class TuneitWindow(Adw.ApplicationWindow):
self.error_dialog = TuneItErrorDialog() self.error_dialog = TuneItErrorDialog()
self.connect('settings_page_update', self.update_settings_page) self.connect('settings_page_update', self.update_settings_page)
if tuneit_config.IS_DEVEL:
print("!!! DEVEL BUILD")
self.add_css_class("devel")
self.update_settings_page() self.update_settings_page()
def update_settings_page(self): def update_settings_page(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment