Commit 54a561db authored by Daniel Garcia Moreno's avatar Daniel Garcia Moreno

Use personal appid instead of org.gnome.timetrack

parent 4ee735ea
Pipeline #53129 failed with stage
in 17 seconds
......@@ -18,7 +18,7 @@
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="org.gnome.timetrack.svg"
sodipodi:docname="net.danigm.timetrack.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
style="display:inline;enable-background:new"
......@@ -421,7 +421,7 @@
x="-0.24669456"
id="tspan3023"
sodipodi:role="line"
style="font-size:5.33333349px;stroke-width:0.33264872">org.gnome.timetrack</tspan></text>
style="font-size:5.33333349px;stroke-width:0.33264872">net.danigm.timetrack</tspan></text>
<g
style="display:inline;fill:#000000;enable-background:new"
transform="matrix(7.9911709,0,0,8.0036407,-167.7909,-4846.0776)"
......
......@@ -9,7 +9,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="org.gnome.timetrack-symbolic.svg"
sodipodi:docname="net.danigm.timetrack-symbolic.svg"
height="16"
id="svg7384"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
......
......@@ -2,13 +2,13 @@ datadir = join_paths('share', 'icons')
icondir = join_paths('hicolor', 'scalable', 'apps')
if get_option('profile') == 'development'
install_data (
join_paths(icondir, 'org.gnome.timetrack.svg'),
join_paths(icondir, 'net.danigm.timetrack.svg'),
install_dir: join_paths(datadir, icondir),
rename: 'org.gnome.timetrackDevel.svg'
rename: 'net.danigm.timetrackDevel.svg'
)
else
install_data (
join_paths(icondir, 'org.gnome.timetrack.svg'),
join_paths(icondir, 'net.danigm.timetrack.svg'),
install_dir: join_paths(datadir, icondir)
)
endif
......@@ -16,13 +16,13 @@ endif
icondir = join_paths('hicolor', 'symbolic', 'apps')
if get_option('profile') == 'development'
install_data (
join_paths(icondir, 'org.gnome.timetrack-symbolic.svg'),
join_paths(icondir, 'net.danigm.timetrack-symbolic.svg'),
install_dir: join_paths(datadir, icondir),
rename: 'org.gnome.timetrackDevel-symbolic.svg'
rename: 'net.danigm.timetrackDevel-symbolic.svg'
)
else
install_data (
join_paths(icondir, 'org.gnome.timetrack-symbolic.svg'),
join_paths(icondir, 'net.danigm.timetrack-symbolic.svg'),
install_dir: join_paths(datadir, icondir)
)
endif
......
......@@ -17,16 +17,16 @@ gnome.compile_resources(
)
desktop_conf = configuration_data()
application_id = 'org.gnome.timetrack'
application_id = 'net.danigm.timetrack'
if get_option('profile') == 'development'
application_id = 'org.gnome.timetrackDevel'
application_id = 'net.danigm.timetrackDevel'
endif
desktop_conf.set('ICON', application_id)
desktop = i18n.merge_file(
'desktop',
input: configure_file(
input: files('org.gnome.timetrack.desktop.in.in'),
output: 'org.gnome.timetrack.desktop.in',
input: files('net.danigm.timetrack.desktop.in.in'),
output: 'net.danigm.timetrack.desktop.in',
configuration: desktop_conf
),
output: '@0@.desktop'.format(application_id),
......@@ -47,16 +47,16 @@ if desktop_file_validate.found()
endif
appdata_conf = configuration_data()
application_id = 'org.gnome.timetrack'
application_id = 'net.danigm.timetrack'
if get_option('profile') == 'development'
application_id = 'org.gnome.timetrackDevel'
application_id = 'net.danigm.timetrackDevel'
endif
appdata_conf.set('APPID', application_id)
appdata = i18n.merge_file(
'appdata',
input: configure_file(
input: files('org.gnome.timetrack.appdata.xml.in.in'),
output: 'org.gnome.timetrack.appdata.xml.in',
input: files('net.danigm.timetrack.appdata.xml.in.in'),
output: 'net.danigm.timetrack.appdata.xml.in',
configuration: appdata_conf
),
output: application_id + '.appdata.xml',
......
......@@ -3,7 +3,7 @@ Name=Timetrack
Comment=A timetrack for GNOME
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=@ICON@
Exec=gnome-timetrack %U
Exec=timetrack %U
Terminal=false
Type=Application
Categories=Utility;GTK;GNOME;
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/timetrack">
<gresource prefix="/net/danigm/timetrack">
<file compressed="true">timetrack.css</file>
<file compressed="true" preprocess="xml-stripblanks">about_dialog.ui</file>
<file compressed="true" preprocess="xml-stripblanks">main_window.ui</file>
......
#!/bin/bash
flatpak-builder --repo=repo --force-clean timetrack net.danigm.timetrack-release.json
flatpak build-bundle repo net.danigm.timetrack.flatpak net.danigm.timetrack
flatpak uninstall -y --user net.danigm.timetrack
flatpak install -y --user net.danigm.timetrack.flatpak
{
"app-id": "org.gnome.timetrack",
"app-id": "net.danigm.timetrack",
"runtime" : "org.gnome.Platform",
"runtime-version" : "master",
"sdk" : "org.gnome.Sdk",
"command" : "gnome-timetrack",
"command" : "timetrack",
"finish-args" : [
"--share=ipc",
"--socket=x11",
......
{
"app-id": "org.gnome.timetrackDevel",
"app-id": "net.danigm.timetrackDevel",
"runtime" : "org.gnome.Platform",
"runtime-version" : "master",
"sdk" : "org.gnome.Sdk",
......@@ -9,7 +9,7 @@
"nightly"
],
"desktop-file-name-prefix": "(Development) ",
"command" : "gnome-timetrack",
"command" : "timetrack",
"finish-args" : [
"--share=ipc",
"--socket=x11",
......
......@@ -4,7 +4,7 @@ project('timetrack', 'c',
)
i18n = import('i18n')
python = import('python3')
project_id = 'org.gnome.timetrack'
project_id = 'net.danigm.timetrack'
contributors = 'Daniel García Moreno &lt;danigm@gnome.org&gt;'
message('Looking for dependencies')
......@@ -53,9 +53,9 @@ endif
conf.set('CONTRIBUTORS', contributors)
conf.set_quoted('PROFILE', profile)
application_id = 'org.gnome.timetrack'
application_id = 'net.danigm.timetrack'
if get_option('profile') == 'development'
application_id = 'org.gnome.timetrackDevel'
application_id = 'net.danigm.timetrackDevel'
endif
conf.set('APPID', application_id)
......@@ -70,7 +70,7 @@ install_subdir(
message('Preparing init file')
configure_file(
input: 'timetrack.in',
output: 'gnome-timetrack',
output: 'timetrack',
configuration: conf,
install_dir: bindir
)
......
data/about_dialog.ui.in
data/main_window.ui
data/org.gnome.timetrack.appdata.xml.in.in
data/org.gnome.timetrack.desktop.in.in
data/org.gnome.timetrack.gschema.xml
data/net.danigm.timetrack.appdata.xml.in.in
data/net.danigm.timetrack.desktop.in.in
data/net.danigm.timetrack.gschema.xml
......@@ -41,7 +41,7 @@ if __name__ == "__main__":
if @PROFILE@ == 'Devel':
Application.development_mode = True
Application.application_id = 'org.gnome.timetrackDevel'
Application.application_id = 'net.danigm.timetrackDevel'
else:
Application.development_mode = False
......
......@@ -28,7 +28,7 @@ class Activity:
m = m % 60
return (h, m, s)
class ActivityWidget(Gtk.Box):
label = NotImplemented
......
......@@ -12,7 +12,7 @@ class Application(Gtk.Application):
window = NotImplemented
file_list = []
development_mode = False
application_id = "org.gnome.timetrack"
application_id = "net.danigm.timetrack"
db = NotImplemented
def __init__(self, *args, **kwargs):
......@@ -66,7 +66,7 @@ class Application(Gtk.Application):
def on_about_menu_clicked(self, action, param):
builder = Gtk.Builder()
builder.add_from_resource("/org/gnome/timetrack/about_dialog.ui")
builder.add_from_resource("/net/danigm/timetrack/about_dialog.ui")
about_dialog = builder.get_object("about_dialog")
about_dialog.set_modal(True)
if self.window is not NotImplemented:
......@@ -79,7 +79,7 @@ class Application(Gtk.Application):
def on_shortcuts_menu_clicked(self, action, param):
builder = Gtk.Builder()
builder.add_from_resource("/org/gnome/timetrack/shortcuts_overview.ui")
builder.add_from_resource("/net/danigm/timetrack/shortcuts_overview.ui")
shortcuts_overview = builder.get_object("shortcuts_overview")
if self.window is not NotImplemented:
shortcuts_overview.set_transient_for(self.window)
......
......@@ -24,7 +24,7 @@ class EditDialog(Gtk.Dialog):
super().__init__(*args, use_header_bar=True, **kwargs)
builder = Gtk.Builder()
builder.add_from_resource("/org/gnome/timetrack/edit_dialog.ui")
builder.add_from_resource("/net/danigm/timetrack/edit_dialog.ui")
self.activity_name = builder.get_object("edit-activity")
self.start_date = builder.get_object("edit-calendar")
......
......@@ -72,7 +72,7 @@ class MainWindow(Gtk.ApplicationWindow):
def create_headerbar(self):
builder = Gtk.Builder()
builder.add_from_resource("/org/gnome/timetrack/main_window.ui")
builder.add_from_resource("/net/danigm/timetrack/main_window.ui")
self.headerbar = builder.get_object("headerbar")
self.set_titlebar(self.headerbar)
......@@ -92,7 +92,7 @@ class MainWindow(Gtk.ApplicationWindow):
# TODO: Add comments
def create_container(self):
builder = Gtk.Builder()
builder.add_from_resource("/org/gnome/timetrack/main_window.ui")
builder.add_from_resource("/net/danigm/timetrack/main_window.ui")
self.main_stack = builder.get_object('main-stack')
self.report_stack = builder.get_object('report-stack')
......@@ -135,7 +135,7 @@ class MainWindow(Gtk.ApplicationWindow):
css_provider = Gtk.CssProvider()
css_provider_resource = Gio.File.new_for_uri(
"resource:///org/gnome/timetrack/timetrack.css")
"resource:///net/danigm/timetrack/timetrack.css")
css_provider.load_from_file(css_provider_resource)
context = Gtk.StyleContext()
......
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