From 168695bd15ffcf6773b1091d3e8cd308c08b6a92 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 5 Jan 2019 10:01:32 +0800 Subject: [PATCH 1/2] Use reverse DNS convention for metadata files naming Also update appdata install path. Closes #10111. --- .tx/config | 2 +- dist/unix/CMakeLists.txt | 6 +++--- ....appdata.xml => org.qbittorrent.qBittorrent.appdata.xml} | 0 ...ttorrent.desktop => org.qbittorrent.qBittorrent.desktop} | 0 unixconf.pri | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename dist/unix/{qbittorrent.appdata.xml => org.qbittorrent.qBittorrent.appdata.xml} (100%) rename dist/unix/{qbittorrent.desktop => org.qbittorrent.qBittorrent.desktop} (100%) diff --git a/.tx/config b/.tx/config index 14d71d5e9..2b8d3296e 100644 --- a/.tx/config +++ b/.tx/config @@ -11,7 +11,7 @@ minimum_perc = 23 mode = developer [qbittorrent.qbittorrentdesktop_master] -source_file = dist/unix/qbittorrent.desktop +source_file = dist/unix/org.qbittorrent.qBittorrent.desktop source_lang = en type = DESKTOP minimum_perc = 23 diff --git a/dist/unix/CMakeLists.txt b/dist/unix/CMakeLists.txt index edf0d9216..26b4bea7d 100644 --- a/dist/unix/CMakeLists.txt +++ b/dist/unix/CMakeLists.txt @@ -31,12 +31,12 @@ if (Qt5Widgets_FOUND) DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor FILES_MATCHING PATTERN "*.png") - install(FILES qbittorrent.desktop + install(FILES org.qbittorrent.qBittorrent.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ COMPONENT data) - install(FILES qbittorrent.appdata.xml - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/ + install(FILES org.qbittorrent.qBittorrent.appdata.xml + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/ COMPONENT data) install(FILES diff --git a/dist/unix/qbittorrent.appdata.xml b/dist/unix/org.qbittorrent.qBittorrent.appdata.xml similarity index 100% rename from dist/unix/qbittorrent.appdata.xml rename to dist/unix/org.qbittorrent.qBittorrent.appdata.xml diff --git a/dist/unix/qbittorrent.desktop b/dist/unix/org.qbittorrent.qBittorrent.desktop similarity index 100% rename from dist/unix/qbittorrent.desktop rename to dist/unix/org.qbittorrent.qBittorrent.desktop diff --git a/unixconf.pri b/unixconf.pri index 89d5d1426..fa059c0df 100644 --- a/unixconf.pri +++ b/unixconf.pri @@ -35,12 +35,12 @@ nogui:systemd { # Menu Icon !nogui { - menuicon.files = $$DIST_PATH/qbittorrent.desktop + menuicon.files = $$DIST_PATH/org.qbittorrent.qBittorrent.desktop menuicon.path = $$DATADIR/applications/ INSTALLS += menuicon - appdata.files = $$DIST_PATH/qbittorrent.appdata.xml - appdata.path = $$DATADIR/appdata/ + appdata.files = $$DIST_PATH/org.qbittorrent.qBittorrent.appdata.xml + appdata.path = $$DATADIR/metainfo/ INSTALLS += appdata # Apps icons From 8dfcb028a6c83a6a2c89acf6e09fd25927ccca4d Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 5 Jan 2019 10:09:10 +0800 Subject: [PATCH 2/2] Update .appdata descriptions --- .../org.qbittorrent.qBittorrent.appdata.xml | 79 +++++++++++-------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/dist/unix/org.qbittorrent.qBittorrent.appdata.xml b/dist/unix/org.qbittorrent.qBittorrent.appdata.xml index 344da31d5..1b3c43a59 100644 --- a/dist/unix/org.qbittorrent.qBittorrent.appdata.xml +++ b/dist/unix/org.qbittorrent.qBittorrent.appdata.xml @@ -1,64 +1,73 @@ - qbittorrent.desktop + org.qbittorrent.qBittorrent CC0-1.0 GPL-2.0 and OpenSSL qBittorrent - A Bittorrent Client + An open-source Bittorrent client

- Aiming to be a good alternative to all other bittorrent clients out - there, qBittorrent is fast, stable and provides unicode support as well - as many other features. Additionally, qBittorrent runs and provides those - same features on all major platforms (Linux, Mac OS X, Windows, FreeBSD). -

-

- It is programmed in C++ / Qt and uses libtorrent (sometimes called - libtorrent-rasterbar) by Arvid Norberg. GeoLite data, created by MaxMind, - are included in qBittorrent. Its features include: -

+ The qBittorrent project aims to provide an open-source software alternative to µTorrent. + Additionally, qBittorrent runs and provides the same features on all major platforms (FreeBSD, Linux, macOS, OS/2, Windows). + qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library. +

  • Polished µTorrent-like User Interface
    • -
  • Well-integrated and extensible Search Engine
    • -
  • All Bittorrent extensions (DHT, Peer Exchange, Full encryption, Magnet/BitComet URIs, ...)
    • -
  • Remote control through a Web user interface
    • -
  • Advanced control over trackers, peers and torrents
    • -
  • UPnP / NAT-PMP port forwarding support
    • -
  • Available in ~25 languages (Unicode support)
    • -
  • Torrent creation tool
    • -
  • Advanced RSS support with download filters (inc. regex)
    • +
  • + Well-integrated and extensible Search Engine +
      +
    • Simultaneous search in many Torrent search sites
      • +
    • Category-specific search requests (e.g. Books, Music, Software)
      • +
    +
    • +
  • RSS feed support with advanced download filters (incl. regex)
    • +
  • + Many Bittorrent extensions supported: +
      +
    • Magnet links
      • +
    • Distributed hash table (DHT), peer exchange protocol (PEX), local peer discovery (LSD)
      • +
    • Private torrents
      • +
    • Encrypted connections
      • +
    • and many more...
      • +
    +
    • +
  • Remote control through Web user interface, written with AJAX
    • +
  • Sequential downloading (Download in order)
    • +
  • + Advanced control over torrents, trackers and peers +
      +
    • Torrents queueing and prioritizing
      • +
    • Torrent content selection and prioritizing
      • +
    +
  • Bandwidth scheduler
    • -
  • IP Filtering (eMule and PeerGuardian compatible)
    • +
  • Torrent creation tool
    • +
  • IP Filtering (eMule & PeerGuardian format compatible)
  • IPv6 compliant
    • -
  • Sequential downloading (aka "Download in order")
    • +
  • UPnP / NAT-PMP port forwarding support
    • +
  • Available on all platforms: Windows, Linux, macOS, FreeBSD, OS/2
    • +
  • Available in ~70 languages
 + org.qbittorrent.qBittorrent.desktop - - https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_01.png - + https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_01.png - - https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_02.png - + https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_02.png - - https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_03.png - + https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_03.png - - https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_04.png - + https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_04.png - https://www.qbittorrent.org/ sledgehammer999@qbittorrent.org The qBittorrent Project + https://www.qbittorrent.org/ http://bugs.qbittorrent.org/ https://www.qbittorrent.org/donate http://forum.qbittorrent.org/