Skip to content

Commit 7b13b7b

Browse files
imhemishimhemish
committed
rename to 'Kaar'
1 parent 92f3915 commit 7b13b7b

21 files changed

+75
-62
lines changed

‎README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Kamm
1+
# Kaar
22

33
A [todo.txt](http://todotxt.org) based to-do app
44

@@ -31,9 +31,14 @@ The dependencies required for building by meson are:
3131
# Supported extensions on todo.txt
3232

3333
- Hidden Tasks (`h:1` hides the task)
34+
- Due Dates (example: `due:2023-04-08`)
3435

3536
# Inspiration
3637

3738
Features and UI of this app are derived from [Mindstream](https://github.com/xuhcc/mindstream) and [qtodotxt2](https://github.com/QTodoTxt/QTodoTxt2)
3839

40+
# Name
41+
42+
The name 'Kaar' (kār) is a word present in both Sanskrit (कार) and Classical Persian (کار) as a cognate from Indo-Iranian language family which can mean things like action, work, doer in their descendants such as Urdu, Hindi, Punjabi, etc.
43+
3944
> Made with Python, GTK4, cosy Libadwaita 🥰 in India 🇮🇳

‎data/icons/hicolor/scalable/apps/net.hemish.kamm.svg ‎data/icons/hicolor/scalable/apps/net.hemish.kaar.svg

File renamed without changes.

‎data/icons/hicolor/symbolic/apps/net.hemish.kamm-symbolic.svg ‎data/icons/hicolor/symbolic/apps/net.hemish.kaar-symbolic.svg

File renamed without changes.

‎data/icons/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
application_id = 'net.hemish.kamm'
1+
application_id = 'net.hemish.kaar'
22

33
scalable_dir = 'hicolor' / 'scalable' / 'apps'
44
install_data(

‎data/meson.build

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
desktop_file = i18n.merge_file(
2-
input: 'net.hemish.kamm.desktop.in',
3-
output: 'net.hemish.kamm.desktop',
2+
input: 'net.hemish.kaar.desktop.in',
3+
output: 'net.hemish.kaar.desktop',
44
type: 'desktop',
55
po_dir: '../po',
66
install: true,
@@ -13,8 +13,8 @@ if desktop_utils.found()
1313
endif
1414

1515
appstream_file = i18n.merge_file(
16-
input: 'net.hemish.kamm.metainfo.xml.in',
17-
output: 'net.hemish.kamm.metainfo.xml',
16+
input: 'net.hemish.kaar.metainfo.xml.in',
17+
output: 'net.hemish.kaar.metainfo.xml',
1818
po_dir: '../po',
1919
install: true,
2020
install_dir: get_option('datadir') / 'metainfo'
@@ -24,7 +24,7 @@ appstreamcli = find_program('appstreamcli', required: false, disabler: true)
2424
test('Validate appstream file', appstreamcli,
2525
args: ['validate', '--no-net', '--explain', appstream_file])
2626

27-
install_data('net.hemish.kamm.gschema.xml',
27+
install_data('net.hemish.kaar.gschema.xml',
2828
install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
2929
)
3030

‎data/net.hemish.kamm.desktop.in ‎data/net.hemish.kaar.desktop.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Desktop Entry]
2-
Name=kamm
3-
Exec=kamm
4-
Icon=net.hemish.kamm
2+
Name=Kaar
3+
Exec=kaar
4+
Icon=net.hemish.kaar
55
Terminal=false
66
Type=Application
77
Categories=GTK;

‎data/net.hemish.kamm.gschema.xml ‎data/net.hemish.kaar.gschema.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33

4-
<schemalist gettext-domain="kamm">
5-
<schema id="net.hemish.kamm" path="/net/hemish/kamm/">
4+
<schemalist gettext-domain="kaar">
5+
<schema id="net.hemish.kaar" path="/net/hemish/kaar/">
66
<key name="autosave" type="b">
77
<default>true</default>
88
<summary>Autosave</summary>

‎data/net.hemish.kamm.metainfo.xml.in ‎data/net.hemish.kaar.metainfo.xml.in

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version='1.0' encoding='utf-8'?>
22
<component type="desktop">
33
<!--Created with jdAppStreamEdit 8.0-->
4-
<id>net.hemish.kamm</id>
4+
<id>net.hemish.kaar</id>
55
<name></name>
66
<summary></summary>
77
<developer_name>Hemish</developer_name>
8-
<launchable type="desktop-id">net.hemish.kamm.desktop</launchable>
8+
<launchable type="desktop-id">net.hemish.kaar.desktop</launchable>
99
<metadata_license>CC0-1.0</metadata_license>
1010
<project_license>GPL-3.0-or-later</project_license>
1111
<update_contact>hemish04082005@gmail.com</update_contact>
1212
<description>
1313
<p>No description</p>
1414
</description>
15-
<url type="homepage">https://github.com/imhemish/kamm</url>
16-
<url type="bugtracker">https://github.com/imhemish/kamm/issues</url>
17-
<url type="vcs-browser">https://github.com/imhemish/kamm</url>
15+
<url type="homepage">https://github.com/imhemish/kaar</url>
16+
<url type="bugtracker">https://github.com/imhemish/kaar/issues</url>
17+
<url type="vcs-browser">https://github.com/imhemish/kaar</url>
1818
<categories>
1919
<category>Office</category>
2020
<category>Utility</category>

‎meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project('kamm',
1+
project('kaar',
22
version: '0.1.0',
33
meson_version: '>= 0.62.0',
44
default_options: [ 'warning_level=2', 'werror=false', ],

‎net.hemish.kamm.json ‎net.hemish.kaar.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"app-id" : "net.hemish.kamm",
2+
"app-id" : "net.hemish.kaar",
33
"runtime" : "org.gnome.Platform",
44
"runtime-version" : "45",
55
"sdk" : "org.gnome.Sdk",
6-
"command" : "kamm",
6+
"command" : "kaar",
77
"finish-args" : [
88
"--share=ipc",
99
"--socket=fallback-x11",
@@ -25,7 +25,7 @@
2525
"modules" : [
2626
"python3-pytodotxt.json",
2727
{
28-
"name" : "kamm",
28+
"name" : "kaar",
2929
"builddir" : true,
3030
"buildsystem" : "meson",
3131
"sources" : [

‎po/POTFILES

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
data/net.hemish.kamm.desktop.in
2-
data/net.hemish.kamm.metainfo.xml.in
3-
data/net.hemish.kamm.gschema.xml
1+
data/net.hemish.kaar.desktop.in
2+
data/net.hemish.kaar.metainfo.xml.in
3+
data/net.hemish.kaar.gschema.xml
44
src/main.py
55
src/window.py
6-
src/window.ui
6+
src/blp/preferences.blp
7+
src/blp/task.blp
8+
src/blp/ui.blp
9+
src/sorting.py
10+
src/model.py
11+
src/preferences_window.py

‎po/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
i18n.gettext('kamm', preset: 'glib')
1+
i18n.gettext('kaar', preset: 'glib')

‎src/blp/preferences.blp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Gtk 4.0;
22
using Adw 1;
33

4-
template $KammPreferencesWindow: Adw.PreferencesWindow {
4+
template $KaarPreferencesWindow: Adw.PreferencesWindow {
55
Adw.PreferencesPage {
66
title: "General";
77
icon-name: "applications-system-symbolic";

‎src/blp/ui.blp

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ using Gio 2.0;
55
menu menu {
66
item ("Preferences", "app.preferences")
77
item ("Keyboard Shortcuts", "win.show-help-overlay")
8-
item ("About Kamm", "app.about")
8+
item ("About Kaar", "app.about")
99
}
1010

11-
template $KammWindow: Adw.ApplicationWindow {
11+
template $KaarWindow: Adw.ApplicationWindow {
1212
height-request: 400;
1313
width-request: 280;
1414

@@ -92,6 +92,9 @@ template $KammWindow: Adw.ApplicationWindow {
9292

9393
[top]
9494
Adw.HeaderBar {
95+
title-widget: Adw.WindowTitle {
96+
title: "Kaar";
97+
};
9598
styles [
9699
"flat"
97100
]

‎src/kamm.gresource.xml ‎src/kaar.gresource.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<gresources>
3-
<gresource prefix="/net/hemish/kamm">
3+
<gresource prefix="/net/hemish/kaar">
44
<file preprocess="xml-stripblanks">blp/ui.ui</file>
55
<file preprocess="xml-stripblanks">blp/preferences.ui</file>
66
<file preprocess="xml-stripblanks">blp/task.ui</file>

‎src/kamm.in ‎src/kaar.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!@PYTHON@
22

3-
# kamm.in
3+
# kaar.in
44
#
5-
# Copyright 2023 Hemish
5+
# Copyright 2024 Hemish
66
#
77
# This program is free software: you can redistribute it and/or modify
88
# it under the terms of the GNU General Public License as published by
@@ -31,16 +31,16 @@ localedir = '@localedir@'
3131

3232
sys.path.insert(1, pkgdatadir)
3333
signal.signal(signal.SIGINT, signal.SIG_DFL)
34-
locale.bindtextdomain('kamm', localedir)
35-
locale.textdomain('kamm')
36-
gettext.install('kamm', localedir)
34+
locale.bindtextdomain('kaar', localedir)
35+
locale.textdomain('kaar')
36+
gettext.install('kaar', localedir)
3737

3838
if __name__ == '__main__':
3939
import gi
4040

4141
from gi.repository import Gio
42-
resource = Gio.Resource.load(os.path.join(pkgdatadir, 'kamm.gresource'))
42+
resource = Gio.Resource.load(os.path.join(pkgdatadir, 'kaar.gresource'))
4343
resource._register()
4444

45-
from kamm import main
45+
from kaar import main
4646
sys.exit(main.main(VERSION))

‎src/main.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
gi.require_version('Adw', '1')
2626

2727
from gi.repository import Gtk, Gio, Adw
28-
from .window import KammWindow
29-
from .preferences_window import KammPreferencesWindow, converter
28+
from .window import KaarWindow
29+
from .preferences_window import KaarPreferencesWindow, converter
3030
from .model import TodoTask
3131
from pytodotxt import TodoTxt, TodoTxtParser
3232
from .filtering import Filtering
@@ -43,12 +43,12 @@ def wrapper(*args, **kwargs):
4343
return thread
4444
return wrapper
4545

46-
class KammApplication(Adw.Application):
46+
class KaarApplication(Adw.Application):
4747
"""The main application singleton class."""
4848

4949
def __init__(self):
5050
print("application initiated")
51-
super().__init__(application_id='net.hemish.kamm',
51+
super().__init__(application_id='net.hemish.kaar',
5252
flags=Gio.ApplicationFlags.DEFAULT_FLAGS)
5353
self.create_action('quit', lambda *_: self.quit(), ['<primary>q'])
5454
self.create_action('about', self.on_about_action)
@@ -63,7 +63,7 @@ def __init__(self):
6363

6464
print("actions created")
6565

66-
self.settings: Gio.Settings = Gio.Settings('net.hemish.kamm')
66+
self.settings: Gio.Settings = Gio.Settings('net.hemish.kaar')
6767

6868
self.should_autosave = self.settings.get_boolean("autosave")
6969

@@ -169,15 +169,15 @@ def do_activate(self):
169169

170170
win = self.props.active_window
171171
if not win:
172-
win = KammWindow(application=self)
172+
win = KaarWindow(application=self)
173173
self.search_filter.set_filter_func(lambda object: self.props.active_window.search_entry.get_text().lower() in str(object).lower())
174174
win.present()
175175

176176
def on_about_action(self, widget, _):
177177
"""Callback for the app.about action."""
178178
about = Adw.AboutWindow(transient_for=self.props.active_window,
179-
application_name='kamm',
180-
application_icon='net.hemish.kamm',
179+
application_name='Kaar',
180+
application_icon='net.hemish.kaar',
181181
developer_name='Hemish',
182182
version='0.1.0',
183183
developers=['Hemish'],
@@ -186,7 +186,7 @@ def on_about_action(self, widget, _):
186186

187187
def on_preferences_action(self, widget, _):
188188
"""Callback for the app.preferences action."""
189-
preferences = KammPreferencesWindow(transient_for=self.props.active_window)
189+
preferences = KaarPreferencesWindow(transient_for=self.props.active_window)
190190
preferences.present()
191191

192192
def new_task(self, *args):
@@ -241,5 +241,5 @@ def create_action(self, name, callback, shortcuts=None):
241241

242242
def main(version):
243243
"""The application's entry point."""
244-
app = KammApplication()
244+
app = KaarApplication()
245245
return app.run(sys.argv)

‎src/meson.build

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name()
2-
moduledir = pkgdatadir / 'kamm'
2+
moduledir = pkgdatadir / 'kaar'
33
gnome = import('gnome')
44

55
blueprints = custom_target('blueprints',
@@ -12,8 +12,8 @@ blueprints = custom_target('blueprints',
1212
command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
1313
)
1414

15-
gnome.compile_resources('kamm',
16-
'kamm.gresource.xml',
15+
gnome.compile_resources('kaar',
16+
'kaar.gresource.xml',
1717
gresource_bundle: true,
1818
install: true,
1919
install_dir: pkgdatadir,
@@ -29,15 +29,15 @@ conf.set('localedir', get_option('prefix') / get_option('localedir'))
2929
conf.set('pkgdatadir', pkgdatadir)
3030

3131
configure_file(
32-
input: 'kamm.in',
33-
output: 'kamm',
32+
input: 'kaar.in',
33+
output: 'kaar',
3434
configuration: conf,
3535
install: true,
3636
install_dir: get_option('bindir'),
3737
install_mode: 'r-xr--r--'
3838
)
3939

40-
kamm_sources = [
40+
kaar_sources = [
4141
'__init__.py',
4242
'main.py',
4343
'window.py',
@@ -47,4 +47,4 @@ kamm_sources = [
4747
'sorting.py'
4848
]
4949

50-
install_data(kamm_sources, install_dir: moduledir)
50+
install_data(kaar_sources, install_dir: moduledir)

‎src/model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# This represents a single task row, which is actually made up of stack
77
# containing two views: edit and view as defined in task.blp
8-
@Gtk.Template(resource_path='/net/hemish/kamm/blp/task.ui')
8+
@Gtk.Template(resource_path='/net/hemish/kaar/blp/task.ui')
99
class TaskStack(Gtk.Stack):
1010
__gtype_name__ = "TaskStack"
1111
entry_row: Adw.EntryRow = Gtk.Template.Child()

‎src/preferences_window.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def converter(index):
2424
"COMPLETION_DATE": _("Competion Date")
2525
}
2626

27-
@Gtk.Template(resource_path='/net/hemish/kamm/blp/preferences.ui')
28-
class KammPreferencesWindow(Adw.PreferencesWindow):
29-
__gtype_name__ = 'KammPreferencesWindow'
27+
@Gtk.Template(resource_path='/net/hemish/kaar/blp/preferences.ui')
28+
class KaarPreferencesWindow(Adw.PreferencesWindow):
29+
__gtype_name__ = 'KaarPreferencesWindow'
3030
location: Adw.ActionRow = Gtk.Template.Child()
3131
autosave: Adw.SwitchRow = Gtk.Template.Child()
3232
open_button: Gtk.Button = Gtk.Template.Child()

‎src/window.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
from gi.repository import Adw, Gtk, Gio, Gdk
2121
from .model import TaskFactory
2222

23-
@Gtk.Template(resource_path='/net/hemish/kamm/blp/ui.ui')
24-
class KammWindow(Adw.ApplicationWindow):
25-
__gtype_name__ = 'KammWindow'
23+
@Gtk.Template(resource_path='/net/hemish/kaar/blp/ui.ui')
24+
class KaarWindow(Adw.ApplicationWindow):
25+
__gtype_name__ = 'KaarWindow'
2626
list_view: Gtk.ListView = Gtk.Template.Child()
2727
search_entry: Gtk.SearchEntry = Gtk.Template.Child()
2828
search_bar: Gtk.SearchBar = Gtk.Template.Child()
@@ -60,6 +60,6 @@ def __init__(self, **kwargs):
6060

6161

6262
css_provider = Gtk.CssProvider()
63-
css_provider.load_from_resource("/net/hemish/kamm/style.css")
63+
css_provider.load_from_resource("/net/hemish/kaar/style.css")
6464
Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
6565

0 commit comments

Comments
 (0)