switched to modern domain based app naming

ozmartian · Nov 30, 2017 · d5be946 · d5be946
1 parent a9dd1fb
commit d5be946
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 27 deletions.
diff --git a/_packaging/debian/changelog b/_packaging/debian/changelog
@@ -1,3 +1,9 @@
+vidcutter (5.0.5-2) stable; urgency=medium
+
+  * fixed timeline slider tooltip displaying time position to only appear
+    when mouse is over the slider widget. this stops it from constantly
+    appearing whenever media position changes like during simple playback
+
 vidcutter (5.0.5-1) stable; urgency=medium
 
   * Removal of Python 3 OpenGL module to allow app to work on

diff --git a/_packaging/debian/control b/_packaging/debian/control
@@ -4,7 +4,7 @@ Section: video
 Priority: optional
 Build-Depends: dh-python, python3-setuptools, python3-all, python3-dev, libmpv-dev, debhelper (>= 9)
 Standards-Version: 3.9.8
-Homepage: http://vidcutter.ozmartians.com
+Homepage: https://vidcutter.ozmartians.com
 
 Package: vidcutter
 Architecture: i386 amd64

diff --git a/_packaging/fedora/vidcutter.spec b/_packaging/fedora/vidcutter.spec
@@ -1,13 +1,14 @@
 # Maintained by app author Pete Alexandrou <pete AT ozmartians DOT com>
 %global pkg_name vidcutter
+%global id com.ozmartians.VidCutter
 
 Name:           %{pkg_name}
 Version:        5.0.5
 Release:        1%{?dist}
 Summary:        the simplest + fastest video cutter & joiner
 Group:          Applications/Multimedia
 License:        GPLv3+
-URL:            http://vidcutter.ozmartians.com
+URL:            https://vidcutter.ozmartians.com
 
 Source0:        https://github.com/ozmartian/%{pkg_name}/archive/%{version}.tar.gz
 BuildArch:      i686 x86_64
@@ -39,7 +40,7 @@ rm -rf %{pkg_name}.egg-info
 %{python3_sitearch}/%{pkg_name}
 %{python3_sitearch}/%{pkg_name}-%{version}-py?.?.egg-info
 %{_bindir}/%{pkg_name}
-%{_datadir}/applications/%{pkg_name}.desktop
+%{_datadir}/applications/%{id}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{pkg_name}.png
 %{_datadir}/icons/hicolor/128x128/apps/%{pkg_name}.png
 %{_datadir}/icons/hicolor/22x22/apps/%{pkg_name}.png
@@ -50,7 +51,7 @@ rm -rf %{pkg_name}.egg-info
 %{_datadir}/icons/hicolor/512x512/apps/%{pkg_name}.png
 %{_datadir}/icons/hicolor/64x64/apps/%{pkg_name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{pkg_name}.svg
-%{_datadir}/appdata/%{pkg_name}.appdata.xml
+%{_datadir}/appdata/%{id}.appdata.xml
 %{_datadir}/mime/packages/x-%{pkg_name}.xml
 %{_datadir}/pixmaps/%{pkg_name}.svg
 

diff --git a/_packaging/openSUSE/vidcutter.changes b/_packaging/openSUSE/vidcutter.changes
@@ -11,6 +11,10 @@ implementation in the core PyOpenGL package. Vivid is no longer
 a supported distro version so it should be okay to omit on a
 permanent basis.
 
+- fixed timeline slider tooltip displaying time position to only appear
+when mouse is over the slider widget. this stops it from constantly
+appearing whenever media position changes like during simple playback
+
 -------------------------------------------------------------------
 Thu Nov 16 00:22:00 UTC 2017 - [email protected]
 

diff --git a/_packaging/openSUSE/vidcutter.spec b/_packaging/openSUSE/vidcutter.spec
@@ -1,10 +1,12 @@
+%global id com.ozmartians.VidCutter
+
 Name:           vidcutter
 Version:        5.0.5
 Release:        0
 Summary:        the simplest + fastest video cutter & joiner
 License:        GPL-3.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Url:            http://vidcutter.ozmartians.com/
+Url:            https://vidcutter.ozmartians.com/
 Source0:        https://github.com/ozmartian/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  desktop-file-utils
 BuildRequires:  hicolor-icon-theme
@@ -46,7 +48,7 @@ python3 setup.py install --root %{buildroot}
 %{_bindir}/%{name}
 %{python3_sitearch}/%{name}-%{version}-py*.egg-info/
 %{python3_sitearch}/%{name}/
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{id}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/22x22/apps/%{name}.png
 %{_datadir}/icons/hicolor/24x24/apps/%{name}.png
@@ -57,7 +59,7 @@ python3 setup.py install --root %{buildroot}
 %{_datadir}/icons/hicolor/256x256/apps/%{name}.png
 %{_datadir}/icons/hicolor/512x512/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/appdata/%{id}.appdata.xml
 %{_datadir}/mime/packages/x-%{name}.xml
 %{_datadir}/pixmaps/%{name}.svg
 

diff --git a/_packaging/snap/snapcraft.yaml b/_packaging/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: vidcutter
-version: 5.0.0
-summary: the simplest + fastest video cutter & joiner
+version: 5.0.5
+summary: the simplest + fastest video cutter and joiner
 description: |
     A modern, simple to use, constantly evolving and 
     hella fast MEDIA CUTTER + JOINER w/ frame-accurate

diff --git a/data/appdata/vidcutter.appdata.xml → ...data/com.ozmartians.VidCutter.appdata.xml b/data/appdata/vidcutter.appdata.xml → ...data/com.ozmartians.VidCutter.appdata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017 Pete Alexandrou <[email protected]> -->
 <component type="desktop">
-  <id>vidcutter.desktop</id>
+  <id>com.ozmartians.VidCutter.desktop</id>
+  <name>VidCutter</name>
+  <summary>Media Cutter + Joiner</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <name>VidCutter</name>
-  <summary>the simplest + fastest video cutter and joiner</summary>
   <description>
-    A modern, simple to use, constantly evolving and hella fast MEDIA CUTTER + JOINER
-    w/ frame-accurate SmartCut technology + Qt5, libmpv, FFmpeg and MediaInfo powering
-    the backend.
+    <p>
+      A modern, simple to use, constantly evolving and hella fast MEDIA CUTTER + JOINER
+      w/ frame-accurate SmartCut technology + Qt5, libmpv, FFmpeg and MediaInfo powering
+      the backend.
+    </p>
   </description>
   <screenshots>
     <screenshot type="default">

diff --git a/data/desktop/vidcutter.desktop → .../desktop/com.ozmartians.VidCutter.desktop b/data/desktop/vidcutter.desktop → .../desktop/com.ozmartians.VidCutter.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=VidCutter
-GenericName=Video Cutter + Joiner
+GenericName=Media Cutter + Joiner
 X-GNOME-FullName=VidCutter
-Comment=Simple & fast FFmpeg based video cutter & joiner
+Comment=the simplest + fastest video cutter & joiner
 Exec=vidcutter %f
 Terminal=false
 Type=Application

diff --git a/helpers.py b/helpers.py
@@ -71,8 +71,8 @@ def get_data_files():
                 ('/usr/share/icons/hicolor/512x512/apps', ['data/icons/hicolor/512x512/apps/vidcutter.png']),
                 ('/usr/share/icons/hicolor/scalable/apps', ['data/icons/hicolor/scalable/apps/vidcutter.svg']),
                 ('/usr/share/pixmaps', ['data/icons/vidcutter.svg']),
-                ('/usr/share/applications', ['data/desktop/vidcutter.desktop']),
-                ('/usr/share/appdata', ['data/appdata/vidcutter.appdata.xml']),
+                ('/usr/share/applications', ['data/desktop/com.ozmartians.VidCutter.desktop']),
+                ('/usr/share/appdata', ['data/appdata/com.ozmartians.VidCutter.appdata.xml']),
                 ('/usr/share/mime/packages', ['data/mime/x-vidcutter.xml'])
             ]
         return files
@@ -106,23 +106,21 @@ def pip_notes():
         ---[Ubuntu/Debian/Mint/etc]--------------------------
             
             python3-dev libmpv1 libmpv-dev python3-pyqt5
-            python3-pyqt5.qtopengl python3-opengl ffmpeg
-            mediainfo
+            python3-pyqt5.qtopengl ffmpeg mediainfo
     
         ---[Arch Linux]--------------------------------------
     
-            python mpv python-pyqt5 python-opengl
-            ffmpeg mediainfo
+            python mpv python-pyqt5 ffmpeg mediainfo
     
         ---[Fedora]------------------------------------------
         
             python3-devel mpv-libs mpv-libs-devel python3-qt5
-            python3-pyopengl ffmpeg mediainfo
+            ffmpeg mediainfo
         
         ---[openSUSE]----------------------------------------
             
             python3-devel libmpv1 mpv-devel python3-qt5
-            python3-opengl ffmpeg mediainfo 
+            ffmpeg mediainfo 
 
     You need to build a Python extension module before you can run the
     app directly from source code. This is done for you automatically by

diff --git a/vidcutter/__init__.py b/vidcutter/__init__.py
@@ -26,6 +26,7 @@
 
 __appname__ = 'VidCutter'
 __domain__ = 'ozmartians.com'
+__desktopid__ = 'com.ozmartians.VidCutter'
 __appid__ = 'vidcutter-CCDC440A-CC57-4BED-8CDE-1DA285976A64'
 
 __author__ = 'Pete Alexandrou'

diff --git a/vidcutter/libs/taskbarprogress.py b/vidcutter/libs/taskbarprogress.py
@@ -24,13 +24,15 @@
 
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtDBus import QDBusConnection, QDBusMessage
-from PyQt5.QtWidgets import qApp, QWidget
+from PyQt5.QtWidgets import QWidget
+
+import vidcutter
 
 
 class TaskbarProgress(QWidget):
     def __init__(self, parent=None):
         super(TaskbarProgress, self).__init__(parent)
-        self._desktopfile = 'application://{}.desktop'.format(qApp.applicationName().lower())
+        self._desktopfile = 'application://{}.desktop'.format(vidcutter.__desktopid__)
         self._sessionbus = QDBusConnection.sessionBus()
         self.clear()