Update document build with correct import (#89)

- Import app id, locale dir and description from cli_args file. - pyproject.toml: use meson build - Fix README - Inject app id and locale dir to cli_args using meson. - Update copyright year
mamolinux · Oct 23, 2024 · f914e90 · f914e90
1 parent 52893cf
commit f914e90
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -47,11 +47,11 @@ Very simple Python3-based GUI application to set different theme colour and mode
 	- [Runtime Dependencies](#runtime-dependencies)
 	- [Debian/Ubuntu based systems](#debianubuntu-based-distro)
 	- [Other Linux-based systems](#other-linux-based-distro)
-	- [Installation](#installation)
-		- [1. Download and install binary files](#1-download-and-install-binary-files)
-		- [2. Build and Install from source](#2-build-and-install-from-source)
-			- [Debian/Ubuntu based systems](#debianubuntu-based-systems)
-			- [Other Linux-based systems](#other-linux-based-systems)
+- [Installation](#installation)
+	- [1. Download and install binary files](#1-download-and-install-binary-files)
+	- [2. Build and Install from source](#2-build-and-install-from-source)
+		- [Debian/Ubuntu based systems](#debianubuntu-based-systems)
+		- [Other Linux-based systems](#other-linux-based-systems)
 - [User Manual](#user-manual)
 - [Issue Tracking and Contributing](#issue-tracking-and-contributing)
 	- [For Developers](#for-developers)
@@ -167,7 +167,7 @@ cd theme-manager-master
 		meson compile -C builddir --verbose
 		sudo meson install -C builddir
 		```
-		This step requires **Administrative Privilege**. So, be careful before using this. To **remove** the installed files, run:
+		The last step requires **Administrative Privilege**. So, be careful before using this. To **remove** the installed files, run:
 		```
 		sudo ninja uninstall -C builddir
 		```

diff --git a/src/ThemeManager/DesktopTheme.py b/src/ThemeManager/DesktopTheme.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #
@@ -21,14 +21,24 @@
 #
 
 # import the necessary modules!
+import gettext
+import locale
 import logging
 import os
 import subprocess
 
 # imports from current package
+from ThemeManager.cli_args import APP, LOCALE_DIR
 from ThemeManager.common import TMBackend
 
 
+# i18n
+locale.bindtextdomain(APP, LOCALE_DIR)
+gettext.bindtextdomain(APP, LOCALE_DIR)
+gettext.textdomain(APP)
+_ = gettext.gettext
+
+
 # logger
 module_logger = logging.getLogger('ThemeManager.DesktopTheme')
 

diff --git a/src/ThemeManager/LoginTheme.py b/src/ThemeManager/LoginTheme.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #
@@ -26,3 +26,4 @@
 import locale
 
 # imports from current package
+from ThemeManager.cli_args import APP, LOCALE_DIR
diff --git a/src/ThemeManager/about_window.py b/src/ThemeManager/about_window.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #
@@ -29,7 +29,8 @@
 from gi.repository import Gtk
 
 # imports from current package
-from ThemeManager.common import APP, LOCALE_DIR, __version__
+from ThemeManager.cli_args import APP, LOCALE_DIR, description
+from ThemeManager.common import __version__
 
 
 # i18n
@@ -64,7 +65,7 @@ def __init__(self, widget):
 
 		self.about_dlg.set_website_label(_("Official Website"))
 		self.about_dlg.set_website("https://hsbasu.github.io/theme-manager")
-		self.about_dlg.set_comments(_("A Python3-based GUI application to change different colour variants of GTK, Icon, Cursor and other themes."))
+		self.about_dlg.set_comments(description)
 		self.about_dlg.set_copyright(copyrights)
 
 		self.about_dlg.set_authors(authors)

diff --git a/src/ThemeManager/cli_args.py b/src/ThemeManager/cli_args.py
@@ -25,11 +25,10 @@
 import gettext
 import locale
 
-# imports from current package
-from ThemeManager.common import APP, LOCALE_DIR
-
 
 # i18n
+APP = '@appname@'
+LOCALE_DIR = "@localedir@"
 locale.bindtextdomain(APP, LOCALE_DIR)
 gettext.bindtextdomain(APP, LOCALE_DIR)
 gettext.textdomain(APP)

diff --git a/src/ThemeManager/common.py b/src/ThemeManager/common.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #
@@ -37,9 +37,11 @@
 from random import choice
 from threading import Thread
 
+# imports from current package
+from ThemeManager.cli_args import APP, LOCALE_DIR
+
+
 # i18n
-APP = 'theme-manager'
-LOCALE_DIR = "/usr/share/locale"
 locale.bindtextdomain(APP, LOCALE_DIR)
 gettext.bindtextdomain(APP, LOCALE_DIR)
 gettext.textdomain(APP)

diff --git a/src/ThemeManager/gui.py b/src/ThemeManager/gui.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #
@@ -37,7 +37,8 @@
 # imports from current package
 from ThemeManager.about_window import AboutWindow
 from ThemeManager.logger import LoggerWindow
-from ThemeManager.common import APP, CONFIG_FILE, LOCALE_DIR, UI_PATH, __version__, theme_styles, _async, TMBackend
+from ThemeManager.cli_args import APP, LOCALE_DIR
+from ThemeManager.common import CONFIG_FILE, UI_PATH, __version__, theme_styles, _async, TMBackend
 from ThemeManager.indicator import TMIndicator
 from ThemeManager.DesktopTheme import desktop_theme
 from ThemeManager.time_chooser import TimeChooserButton

diff --git a/src/ThemeManager/indicator.py b/src/ThemeManager/indicator.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #
@@ -35,7 +35,8 @@
 # imports from current package
 from ThemeManager.about_window import AboutWindow
 from ThemeManager.logger import LoggerWindow
-from ThemeManager.common import APP, LOCALE_DIR, theme_styles
+from ThemeManager.cli_args import APP, LOCALE_DIR
+from ThemeManager.common import theme_styles
 from ThemeManager.tm_daemon import TMState_monitor
 from ThemeManager.DesktopTheme import desktop_theme
 

diff --git a/src/ThemeManager/logger.py b/src/ThemeManager/logger.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #
@@ -29,7 +29,8 @@
 from gi.repository import Gtk
 
 # imports from current package
-from ThemeManager.common import APP, LOCALE_DIR, LOGFILE, UI_PATH
+from ThemeManager.cli_args import APP, LOCALE_DIR
+from ThemeManager.common import LOGFILE, UI_PATH
 
 
 # i18n

diff --git a/src/ThemeManager/main.py b/src/ThemeManager/main.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #

diff --git a/src/ThemeManager/meson.build b/src/ThemeManager/meson.build
@@ -21,8 +21,17 @@ version_file = configure_file(
   }
 )
 
+args_file = configure_file(
+  input: 'cli_args.py',
+  output: 'cli_args.py',
+  configuration: {
+    'appname': application_id,
+    'localedir': join_paths(prefix, get_option('localedir')),
+  }
+)
+
 python.install_sources(
-  python_sources, version_file,
+  python_sources, version_file, args_file,
   subdir: 'ThemeManager',
   preserve_path: true,
 )

diff --git a/src/ThemeManager/time_chooser.py b/src/ThemeManager/time_chooser.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2023-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager and parts of this file is
 # copied from cinnamon's ChooserButtonWidgets.py
@@ -33,7 +33,7 @@
 from gi.repository import Gtk, GLib
 
 # imports from current package
-from ThemeManager.common import APP, LOCALE_DIR
+from ThemeManager.cli_args import APP, LOCALE_DIR
 
 # i18n
 locale.bindtextdomain(APP, LOCALE_DIR)

diff --git a/src/ThemeManager/tm_daemon.py b/src/ThemeManager/tm_daemon.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
+# Copyright (C) 2021-2024 Himadri Sekhar Basu <hsb10@iitbbs.ac.in>
 #
 # This file is part of theme-manager.
 #
@@ -28,7 +28,8 @@
 from time import sleep
 
 # imports from current package
-from ThemeManager.common import APP, LOCALE_DIR, theme_styles, _async, TMBackend
+from ThemeManager.cli_args import APP, LOCALE_DIR
+from ThemeManager.common import theme_styles, _async, TMBackend
 from ThemeManager.DesktopTheme import desktop_theme