Fixed naming issue

marbetschar · Feb 6, 2020 · 434bde9 · 434bde9
1 parent d089dc8
commit 434bde9
Show file tree

Hide file tree

Showing 22 changed files with 432 additions and 141 deletions.
diff --git a/....github.marbetschar.timing.appdata.xml.in → ...hub.marbetschar.time-limit.appdata.xml.in b/....github.marbetschar.timing.appdata.xml.in → ...hub.marbetschar.time-limit.appdata.xml.in
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2020 Marco Betschart <[email protected]> -->
 <component type="desktop">
-  <id>com.github.marbetschar.timing</id>
+  <id>com.github.marbetschar.time-limit</id>
   <metadata_license>CC0</metadata_license>
-  <name>Timer</name>
+  <name>Time Limit</name>
   <summary>A simple and beautiful timer</summary>
   <description>
     <p>
@@ -22,7 +22,7 @@
      <value key="x-appcenter-suggested-price">2</value>
   </custom>
     <provides>
-    <binary>com.github.marbetschar.timing</binary>
+    <binary>com.github.marbetschar.time-limit</binary>
   </provides>
   <content_rating type="oars-1.1">
     <content_attribute id="violence-cartoon">none</content_attribute>
@@ -54,16 +54,16 @@
     <content_attribute id="money-gambling">none</content_attribute>
   </content_rating>
   <developer_name>Marco Betschart</developer_name>
-  <url type="homepage">https://github.com/marbetschar/timer</url>
-  <url type="bugtracker">https://github.com/marbetschar/timer/issues</url>
-  <url type="help">https://github.com/marbetschar/timer/issues</url>
-  <update_contact>elementary-timer@marco.betschart.name</update_contact>
+  <url type="homepage">https://github.com/marbetschar/time-limit</url>
+  <url type="bugtracker">https://github.com/marbetschar/time-limit/issues</url>
+  <url type="help">https://github.com/marbetschar/time-limit/issues</url>
+  <update_contact>elementary-time-limit@marco.betschart.name</update_contact>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/marbetschar/timer/master/screenshots/Desktop-App.png</image>
+      <image>https://raw.githubusercontent.com/marbetschar/time-limit/master/screenshots/Desktop-App.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/marbetschar/timer/master/screenshots/Desktop-Notification.png</image>
+      <image>https://raw.githubusercontent.com/marbetschar/time-limit/master/screenshots/Desktop-Notification.png</image>
     </screenshot>
   </screenshots>
 </component>
diff --git a/.../com.github.marbetschar.timing.desktop.in → ....github.marbetschar.time-limit.desktop.in b/.../com.github.marbetschar.timing.desktop.in → ....github.marbetschar.time-limit.desktop.in
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=Timer
-GenericName=Timer App
+Name=Time Limit
+GenericName=Time Limit
 Comment=A simply beautiful timer
 Categories=Utility
-Exec=com.github.marbetschar.timing
-Icon=com.github.marbetschar.timing
+Exec=com.github.marbetschar.time-limit
+Icon=com.github.marbetschar.time-limit
 Terminal=false
 Type=Application
 Keyword=Timer;Countdown

diff --git a/data/gresource.xml b/data/gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/com/github/marbetschar/timing">
+  <gresource prefix="/com/github/marbetschar/time-limit">
     <file alias="pause.svg" compressed="true" preprocess="xml-stripblanks">pause.svg</file>
     <file alias="progress.png" compressed="true">progress.png</file>
     <file compressed="true">Main.css</file>

diff --git a/data/gschema.xml b/data/gschema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema path="/com/github/marbetschar/timing/" id="com.github.marbetschar.timing">
+  <schema path="/com/github/marbetschar/time-limit/" id="com.github.marbetschar.time-limit">
     <key name="window-maximized" type="b">
       <default>false</default>
       <summary>Whether the window was maximized on last run</summary>

diff --git a/data/icons/64.svg b/data/icons/64.svg
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-com.github.marbetschar.timing (0.1ubuntu1) UNRELEASED; urgency=low
+com.github.marbetschar.time-limit (0.1ubuntu1) UNRELEASED; urgency=low
 
-  * Initial Release.  * 
+  * Initial Release.  *
 
  -- Marco Betschart <[email protected]>  Thu, 06 Feb 2020 01:49:19 +0100
diff --git a/debian/control b/debian/control
@@ -1,15 +1,15 @@
-Source: com.github.marbetschar.timer
+Source: com.github.marbetschar.time-limit
 Section: x11
 Priority: optional
-Maintainer: Marco Betschart <elementary-timer@marco.betschart.name>
+Maintainer: Marco Betschart <time-limit@marco.betschart.name>
 Build-Depends: cmake (>= 2.8),
                debhelper (>= 9),
                libgtk-3-dev,
                valac (>= 0.40.0)
 Standards-Version: 3.9.3
 
-Package: com.github.marbetschar.timing
+Package: com.github.marbetschar.time-limit
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Timer
+Description: Time Limit
  A simple and beautiful timer app for elementary OS
diff --git a/debian/copyright b/debian/copyright
@@ -1,9 +1,9 @@
 Format: https://dep.debian.net/deps/dep5
 Upstream-Name: cmake-hello-world
-Source: https://github.com/marbetschar/timer
+Source: https://github.com/marbetschar/time-limit
 
 Files: src/* data/* debian/*
-Copyright: 2020 Marco Betschart <elementary-timer@marco.betschart.name>
+Copyright: 2020 Marco Betschart <time-limit@marco.betschart.name>
 License: GPL-3.0+
 
 License: GPL-3.0+

diff --git a/install.sh b/install.sh
@@ -9,4 +9,4 @@ sudo ninja install
 sudo chown -R $USER:$USER .
 
 export G_MESSAGES_DEBUG=all
-com.github.marbetschar.timing
+com.github.marbetschar.time-limit
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 # project name and programming language
-project('com.github.marbetschar.timing', 'vala', 'c')
+project('com.github.marbetschar.time-limit', 'vala', 'c')
 
 gnome = import('gnome')
 i18n = import('i18n')

diff --git a/po/POTFILES b/po/POTFILES
@@ -1,3 +1,3 @@
 src/Application.vala
-data/com.github.marbetschar.timing.desktop.in
-data/com.github.marbetschar.timing.appdata.xml.in
+data/com.github.marbetschar.time-limit.desktop.in
+data/com.github.marbetschar.time-limit.appdata.xml.in
diff --git a/po/com.github.marbetschar.timing.pot → po/com.github.marbetschar.time-limit.pot b/po/com.github.marbetschar.timing.pot → po/com.github.marbetschar.time-limit.pot
diff --git a/po/de.po b/po/de.po
@@ -1,11 +1,11 @@
-# German translations for com.github.marbetschar.timing package.
-# Copyright (C) 2020 THE com.github.marbetschar.timing'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the com.github.marbetschar.timing package.
+# German translations for com.github.marbetschar.time-limit package.
+# Copyright (C) 2020 THE com.github.marbetschar.time-limit'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the com.github.marbetschar.time-limit package.
 # Automatically generated, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: com.github.marbetschar.timing\n"
+"Project-Id-Version: com.github.marbetschar.time-limit\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-02-06 09:35+0900\n"
 "PO-Revision-Date: 2020-01-30 20:48+0100\n"
@@ -17,28 +17,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/com.github.marbetschar.timing.desktop.in:3
-#: data/com.github.marbetschar.timing.appdata.xml.in:6
+#: data/com.github.marbetschar.time-limit.desktop.in:3
+#: data/com.github.marbetschar.time-limit.appdata.xml.in:6
 msgid "Timer"
 msgstr ""
 
-#: data/com.github.marbetschar.timing.desktop.in:4
+#: data/com.github.marbetschar.time-limit.desktop.in:4
 msgid "Timer App"
 msgstr ""
 
-#: data/com.github.marbetschar.timing.desktop.in:5
+#: data/com.github.marbetschar.time-limit.desktop.in:5
 msgid "A simply beautiful timer"
 msgstr ""
 
-#: data/com.github.marbetschar.timing.desktop.in:8
-msgid "com.github.marbetschar.timing"
+#: data/com.github.marbetschar.time-limit.desktop.in:8
+msgid "com.github.marbetschar.time-limit"
 msgstr ""
 
-#: data/com.github.marbetschar.timing.appdata.xml.in:7
+#: data/com.github.marbetschar.time-limit.appdata.xml.in:7
 msgid "A simple and beautiful timer"
 msgstr ""
 
-#: data/com.github.marbetschar.timing.appdata.xml.in:9
+#: data/com.github.marbetschar.time-limit.appdata.xml.in:9
 msgid ""
 "A quick summary of your app's main selling points and features. Just a "
 "couple sentences per paragraph is best."

diff --git a/src/Application.vala b/src/Application.vala
@@ -16,21 +16,21 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 public class Timer.Application : Gtk.Application {
     public static GLib.Settings settings;
 
     public Application () {
         Object (
-            application_id: "com.github.marbetschar.timing",
+            application_id: "com.github.marbetschar.time-limit",
             flags: ApplicationFlags.FLAGS_NONE
         );
     }
 
     static construct {
-        settings = new Settings("com.github.marbetschar.timing");
+        settings = new Settings("com.github.marbetschar.time-limit");
     }
 
     protected override void activate () {
@@ -71,7 +71,7 @@ public class Timer.Application : Gtk.Application {
         });
 
         main_window.send_notification.connect ((notification) => {
-            send_notification("com.github.marbetschar.timing", notification);
+            send_notification("com.github.marbetschar.time-limit", notification);
         });
     }
 

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -16,7 +16,7 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 public class Timer.MainWindow : Gtk.ApplicationWindow {
@@ -26,7 +26,7 @@ public class Timer.MainWindow : Gtk.ApplicationWindow {
     public MainWindow (Gtk.Application application) {
         Object (
             application: application,
-            icon_name: "com.github.marbetschar.timing",
+            icon_name: "com.github.marbetschar.time-limit",
             resizable: false,
             default_height: 200,
             default_width: 200
@@ -35,10 +35,10 @@ public class Timer.MainWindow : Gtk.ApplicationWindow {
 
     construct {
         var main_window_provider = new Gtk.CssProvider ();
-        main_window_provider.load_from_resource ("com/github/marbetschar/timing/Main.css");
+        main_window_provider.load_from_resource ("com/github/marbetschar/time-limit/Main.css");
 
         weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
-        default_theme.add_resource_path ("/com/github/marbetschar/timing/");
+        default_theme.add_resource_path ("/com/github/marbetschar/time-limit/");
 
         var header = new Gtk.HeaderBar ();
         header.decoration_layout = "close:";

diff --git a/src/Util.vala b/src/Util.vala
@@ -16,7 +16,7 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 namespace Timer.Util {

diff --git a/src/Widgets/Clock.vala b/src/Widgets/Clock.vala
@@ -16,7 +16,7 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 public class Timer.Widgets.Clock : Gtk.Overlay {
@@ -37,7 +37,7 @@ public class Timer.Widgets.Clock : Gtk.Overlay {
 
     static construct {
         css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("com/github/marbetschar/timing/Main.css");
+        css_provider.load_from_resource ("com/github/marbetschar/time-limit/Main.css");
     }
 
     construct {

diff --git a/src/Widgets/Face.vala b/src/Widgets/Face.vala
@@ -16,7 +16,7 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 public class Timer.Widgets.Face : Gtk.Frame {
@@ -25,7 +25,7 @@ public class Timer.Widgets.Face : Gtk.Frame {
 
     static construct {
         css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("com/github/marbetschar/timing/Face.css");
+        css_provider.load_from_resource ("com/github/marbetschar/time-limit/Face.css");
     }
 
     construct {

diff --git a/src/Widgets/Labels.vala b/src/Widgets/Labels.vala
@@ -16,7 +16,7 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 public class Timer.Widgets.Labels : Gtk.Box {
@@ -35,7 +35,7 @@ public class Timer.Widgets.Labels : Gtk.Box {
 
     static construct {
         css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("com/github/marbetschar/timing/Labels.css");
+        css_provider.load_from_resource ("com/github/marbetschar/time-limit/Labels.css");
     }
 
     construct {

diff --git a/src/Widgets/ProgressArrow.vala b/src/Widgets/ProgressArrow.vala
@@ -16,7 +16,7 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 public class Timer.Widgets.ProgressArrow : Gtk.DrawingArea {

diff --git a/src/Widgets/ProgressBar.vala b/src/Widgets/ProgressBar.vala
@@ -16,7 +16,7 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 public class Timer.Widgets.ProgressBar : Gtk.DrawingArea {
@@ -35,7 +35,7 @@ public class Timer.Widgets.ProgressBar : Gtk.DrawingArea {
         set_size_request (192, 192); // TODO: Make size allocation dynamic to support resizing
 
         try {
-            background = new Gdk.Pixbuf.from_resource ("/com/github/marbetschar/timing/progress.png");
+            background = new Gdk.Pixbuf.from_resource ("/com/github/marbetschar/time-limit/progress.png");
         } catch (Error e) {
             warning (e.message);
         }

diff --git a/src/Widgets/ProgressIndicator.vala b/src/Widgets/ProgressIndicator.vala
@@ -16,7 +16,7 @@
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
 *
-* Authored by: Marco Betschart <elementary-timer@marco.betschart.name
+* Authored by: Marco Betschart <time-limit@marco.betschart.name
 */
 
 public class Timer.Widgets.ProgressIndicator : Gtk.Fixed {