19 changed files with 628 additions and 1033 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,223 +1,185 @@
-kind: pipeline
-name: build x86_64
+pipeline:
+  gcc6:
+    image: ubuntu:xenial
+    pull: true
+    environment:
+      - LANG=C.utf8
+      - CXX=g++-6
+      - CXXFLAGS=-pipe -O2
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
+      - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
+      - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
+      - apt-get update -q
+      - apt-get install -qy g++-6 cmake pkg-config
+      - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev
+      - apt-get install -qy dpkg-dev rpm file wget
+      - gpg --import /var/autosign_gpg.key
+      - rm -rf build && mkdir -p build && cd build
+      - cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+      - make package
+      - cmake -DWITH_DEB=ON ..
+      - make package
+      - cmake -DWITH_DEB=OFF -DWITH_RPM=ON ..
+      - make package
+      - gpg --verbose --detach-sign *.tar.gz
+      - gpg --verbose --detach-sign *.deb
+      - gpg --verbose --detach-sign *.rpm
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives
+      - /home/tastytea/misc/autosign_gpg.key:/var/autosign_gpg.key

-volumes:
- name: debian-package-cache
-  host:
-    path: /var/cache/debian-package-cache
+  gcc7:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=g++-7
+      - CXXFLAGS=-pipe -O2
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - apt-get update -q
+      - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
+      - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list
+      - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
+      - apt-get install -qy gnupg
+      - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
+      - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
+      - apt-get update -q
+      - apt-get install -qy -t xenial g++-7
+      - apt-get install -qy cmake pkg-config
+      - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives

-trigger:
-  event:
-    exclude:
-    - tag
+  gcc8:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=g++-8
+      - CXXFLAGS=-pipe -O2
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - apt-get update -q
+      - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
+      - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list
+      - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
+      - apt-get install -qy gnupg
+      - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
+      - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
+      - apt-get update -q
+      - apt-get install -qy -t xenial g++-8
+      - apt-get install -qy cmake pkg-config
+      - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives

-steps:
- name: submodules
-  image: docker:git
-  commands:
-    - git submodule init
-    - git submodule update --recursive
+  clang3:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=clang++
+      - CXXFLAGS=-pipe -O2
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
+      - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list
+      - apt-get update -q
+      - apt-get install -qy clang cmake pkg-config
+      - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives

- name: gcc6
-  image: ubuntu:xenial
-  pull: always
-  environment:
-    CXX: g++-6
-    CXXFLAGS: -pipe -O2
-  commands:
-  - rm /etc/apt/apt.conf.d/docker-clean
-  - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
-  - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
-  - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy g++-6 cmake pkg-config
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev asciidoc
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  volumes:
-  - name: debian-package-cache
-    path: /var/cache/apt/archives
+  clang5:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=clang++-5.0
+      - CXXFLAGS=-pipe -O2
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
+      - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/stretch.list
+      - apt-get update -q
+      - apt-get install -qy -t stretch-backports clang-5.0
+      - apt-get install -qy cmake pkg-config
+      - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives

- name: gcc9
-  image: debian:stretch-slim
-  pull: always
-  environment:
-    CXX: g++-9
-    CXXFLAGS: -pipe -O2
-  commands:
-  - rm /etc/apt/apt.conf.d/docker-clean
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
-  - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list
-  - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy gnupg
-  - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
-  - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy -t xenial g++-9
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy cmake pkg-config
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev asciidoc
-  - rm -rf build && mkdir -p build && cd build
-  - cmake ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  volumes:
-  - name: debian-package-cache
-    path: /var/cache/apt/archives
+  clang6:
+    image: debian:stretch-slim
+    pull: true
+    when:
+      event: [push, pull_request]
+    environment:
+      - LANG=C.utf8
+      - CXX=clang++-6.0
+      - CXXFLAGS=-pipe -O2
+    commands:
+      - rm /etc/apt/apt.conf.d/docker-clean
+      - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
+      - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/stretch.list
+      - apt-get update -q
+      - apt-get install -qy -t stretch-backports clang-6.0
+      - apt-get install -qy cmake pkg-config
+      - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev
+      - rm -rf build && mkdir -p build && cd build
+      - cmake ..
+      - make VERBOSE=1
+      - make install DESTDIR=install
+    volumes:
+      - /var/cache/debian-package-cache:/var/cache/apt/archives

- name: clang3
-  image: debian:stretch-slim
-  pull: always
-  environment:
-    CXX: clang++
-    CXXFLAGS: -pipe -O2
-  commands:
-  - rm /etc/apt/apt.conf.d/docker-clean
-  - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
-  - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy clang cmake pkg-config
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev asciidoc
-  - rm -rf build && mkdir -p build && cd build
-  - cmake ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  volumes:
-  - name: debian-package-cache
-    path: /var/cache/apt/archives
-
- name: clang6
-  image: debian:stretch-slim
-  pull: always
-  environment:
-    CXX: clang++-6.0
-    CXXFLAGS: -pipe -O2
-  commands:
-  - rm /etc/apt/apt.conf.d/docker-clean
-  - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
-  - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/stretch.list
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy -t stretch-backports clang-6.0
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy cmake pkg-config
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev asciidoc
-  - rm -rf build && mkdir -p build && cd build
-  - cmake ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  volumes:
-  - name: debian-package-cache
-    path: /var/cache/apt/archives
-
- name: notify
-  image: drillster/drone-email
-  pull: always
-  settings:
-    host: cryptoparty-celle.de
-    username:
-      from_secret: email_username
-    password:
-      from_secret: email_password
-    from: drone@tzend.de
-  when:
-    status: [ changed, failure ]
-
---
-kind: pipeline
-name: packages x86_64
-
-volumes:
- name: debian-package-cache
-  host:
-    path: /var/cache/debian-package-cache
- name: gpg-key
-  host:
-    path: /var/autosign_gpg.key
-
-trigger:
-  event:
-    - tag
-
-steps:
- name: submodules
-  image: docker:git
-  commands:
-    - git submodule init
-    - git submodule update --recursive
-
- name: gcc6
-  image: ubuntu:xenial
-  pull: always
-  environment:
-    CXX: g++-6
-    CXXFLAGS: -pipe -O2
-  commands:
-  - rm /etc/apt/apt.conf.d/docker-clean
-  - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
-  - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
-  - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get update -q
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy g++-6 cmake pkg-config
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev asciidoc
-  - rm -f /var/cache/apt/archives/lock
-  - apt-get install -qy dpkg-dev rpm file wget
-  - gpg --import /var/autosign_gpg.key
-  - rm -rf build && mkdir -p build && cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  - make VERBOSE=1
-  - make install DESTDIR=install
-  - make package
-  - cmake -DWITH_DEB=ON ..
-  - make package
-  - cmake -DWITH_DEB=OFF -DWITH_RPM=ON ..
-  - make package
-  - gpg --verbose --detach-sign *.tar.gz
-  - gpg --verbose --detach-sign *.deb
-  - gpg --verbose --detach-sign *.rpm
-  volumes:
-  - name: debian-package-cache
-    path: /var/cache/apt/archives
-  - name: gpg-key
-    path: /var/autosign_gpg.key
-
- name: prepare_release
-  image: ubuntu:xenial
-  pull: always
-  commands:
-  - cp -v build/whyblocked-${DRONE_TAG}_x86_64.tar.gz .
-  - cp -v build/whyblocked-${DRONE_TAG}_x86_64.tar.gz.sig .
-  - cp -v build/whyblocked_${DRONE_TAG}-0_amd64.deb .
-  - cp -v build/whyblocked_${DRONE_TAG}-0_amd64.deb.sig .
-  - cp -v build/whyblocked-${DRONE_TAG}-0.x86_64.rpm .
-  - cp -v build/whyblocked-${DRONE_TAG}-0.x86_64.rpm.sig .
-
- name: release
-  image: plugins/gitea-release
-  pull: always
-  settings:
+  prepare_release:
+    image: ubuntu:xenial
+    pull: true
+    when:
+      event: tag
+    commands:
+      - cp -v build/whyblocked-${DRONE_TAG}_x86_64.tar.gz .
+      - cp -v build/whyblocked-${DRONE_TAG}_x86_64.tar.gz.sig .
+      - cp -v build/whyblocked_${DRONE_TAG}-0_amd64.deb .
+      - cp -v build/whyblocked_${DRONE_TAG}-0_amd64.deb.sig .
+      - cp -v build/whyblocked-${DRONE_TAG}-0.x86_64.rpm .
+      - cp -v build/whyblocked-${DRONE_TAG}-0.x86_64.rpm.sig .
+  gitea_release:
+    image: plugins/gitea-release
+    pull: true
+    when:
+      event: tag
    base_url: https://schlomp.space
-    api_key:
-      from_secret: gitea_token
+    secrets: [ gitea_token ]
    title: ${DRONE_TAG}
    prerelease: true
    files:
@ -231,15 +193,11 @@ steps:
      - sha256
      - sha512

- name: notify
-  image: drillster/drone-email
-  pull: always
-  settings:
+  notify:
+    image: drillster/drone-email
+    pull: true
    host: cryptoparty-celle.de
-    username:
-      from_secret: email_username
-    password:
-      from_secret: email_password
+    secrets: [ email_username, email_password ]
    from: drone@tzend.de
-  when:
-    status: [ changed, failure ]
+    when:
+      status: [ changed, failure ]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.2)
 project (whyblocked
-         VERSION 0.15.0
+         VERSION 0.14.0
         LANGUAGES CXX
 )

@ -41,46 +41,24 @@ configure_file (
    "${PROJECT_BINARY_DIR}/version.hpp"
 )

-add_executable(${CMAKE_PROJECT_NAME}
-               src/qt/main.cpp src/qt/mainwindow.cpp src/qt/dialog_add.cpp
-               src/whyblocked.cpp src/xdgcfg.cpp)
-target_link_libraries(${CMAKE_PROJECT_NAME}
+set(COMMON_LIBRARIES
+    )
+
+add_executable(whyblocked-gui
+               src/interface_qt.cpp src/whyblocked.cpp src/xdgcfg.cpp)
+target_link_libraries(whyblocked-gui
                      ${LIBXDG_BASEDIR_LIBRARIES} vsqlitepp Qt5::Widgets
                      ${LIBCONFIG_LIBRARIES} stdc++fs)
-set(WITH_MAN "YES" CACHE STRING "WITH_MAN defaults to \"YES\"")
-add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
-                   WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
-                   COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_PROJECT_NAME} whyblocked-gui)

-if(WITH_MAN)
-  add_custom_command(
-                     OUTPUT "${PROJECT_BINARY_DIR}/whyblocked.1"
-                     WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
-                     DEPENDS "${CMAKE_SOURCE_DIR}/whyblocked.1.adoc"
-                     COMMAND ${CMAKE_SOURCE_DIR}/build_manpage.sh
-                     ARGS ${PROJECT_VERSION})
-  add_custom_target(run ALL
-                    DEPENDS "${PROJECT_BINARY_DIR}/whyblocked.1"
-)
-endif()
+install(TARGETS whyblocked-gui DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES de.tastytea.Whyblocked.desktop DESTINATION
+        ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+install(FILES de.tastytea.Whyblocked.appdata.xml DESTINATION
+        ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
+install(FILES de.tastytea.Whyblocked.svg DESTINATION
+        ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)

-install(TARGETS ${CMAKE_PROJECT_NAME}
-        DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES "${PROJECT_BINARY_DIR}/whyblocked-gui"
-        DESTINATION "${CMAKE_INSTALL_BINDIR}")
-install(FILES de.tastytea.Whyblocked.desktop
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-install(FILES de.tastytea.Whyblocked.appdata.xml
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
-install(FILES de.tastytea.Whyblocked.svg
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
-if(WITH_MAN)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/whyblocked.1
-          DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-endif()
-
-set(WITH_TRANSLATIONS "YES" CACHE STRING "WITH_TRANSLATIONS defaults to \"YES\"")
-if(WITH_TRANSLATIONS)
+if(NOT WITHOUT_TRANSLATIONS)
  add_subdirectory(translations)
 endif()

--- a/README.md
+++ b/README.md
@ -1,13 +1,14 @@
-**Whyblocked** allows you to store the reason why you blocked someone, along
-with “receipts”, URLs to the posts that led you to block them.
+**Whyblocked** allows you to store the reason why you blocked someone, along with
+"receipts", URLs to the posts that led you to block them.

-It has a Qt-interface and uses an SQLite-database.
+It has a text- and a Qt-interface and uses an SQLite-database.

-![Screenshot](https://doc.schlomp.space/whyblocked/whyblocked_screenshot.png)
+![Screenshot Qt interface](https://doc.schlomp.space/whyblocked/whyblocked_screenshot.png)

 ## Usage

-Run `whyblocked`. You can also start it from the menu of your desktop
+For the text interface start `whyblocked`, for the Qt interface
+`whyblocked-gui`. You can also start it from the menu of your desktop
 environment.

 ## Install
@ -16,12 +17,9 @@ environment.

 Every [release](https://schlomp.space/tastytea/whyblocked/releases) includes
 a .deb-package, an .rpm-package and a .tar.gz-package with precompiled binaries
-for x86_64(amd64)
-([more info](https://schlomp.space/tastytea/whyblocked/wiki/Binary-Packages)).
-These are automatically built and not tested. You can install them with
-`apt install ./whyblocked*.deb` or `yum install ./whyblocked*.rpm`,
-respectively. The packages are signed with the PGP key
-[242E5AC4DA587BF9](https://tastytea.de/tastytea_autosign.asc)
+for x86_64(amd64) ([more info](https://schlomp.space/tastytea/whyblocked/wiki/Binary-Packages)). These are automatically built and not tested. You can install
+them with `dpkg -i` or `rpm -i`, respectively. The packages are signed with the
+PGP key [242E5AC4DA587BF9](https://tastytea.de/tastytea_autosign.asc)
 (Fingerprint: `F730 1ADF C9ED 2624 48C4  2B64 242E 5AC4 DA58 7BF9`).

 Gentoo ebuilds are available via my
@ -31,26 +29,31 @@ Gentoo ebuilds are available via my

 #### Dependencies

-* C++ compiler (tested: [gcc](https://gcc.gnu.org/) 6/8/9,
-  [clang](https://llvm.org/) 3/6)
+* C++ compiler (tested: [gcc](https://gcc.gnu.org/) 6/7/8,
+  [clang](https://llvm.org/) 3/5/6)
 * [cmake](https://cmake.org/) (at least 3.2)
 * [vsqlite++](http://vsqlite.virtuosic-bytes.com/) (tested: 0.3)
 * [libxdg-basedir](http://repo.or.cz/w/libxdg-basedir.git) (tested: 1.2)
-* [qtcore](https://www.qt.io/) (tested: 5.12/5.5)
-* [qtwidgets](https://www.qt.io/) (tested: 5.12/5.5)
+* [qtcore](https://www.qt.io/) (tested: 5.11/5.5)
+* [qtwidgets](https://www.qt.io/) (tested: 5.11/5.5)
 * [libconfig++](https://github.com/hyperrealm/libconfig) (tested: 1.5)
 * Optional
-    * Translations: [lupdate & lrelease](http://doc.qt.io/qt-5/linguist-manager.html) (tested: 5.12/5.5)
-    * Manpage: [asciidoc](http://asciidoc.org/) (tested: 8.6)
+    * Translations: [lupdate & lrelease](http://doc.qt.io/qt-5/linguist-manager.html) (tested: 5.11/5.5)

 #### Get sourcecode

 Download the current
-[release](https://schlomp.space/tastytea/whyblocked/releases).
+[release](https://schlomp.space/tastytea/whyblocked/releases) and copy
+[xdgcfg](https://schlomp.space/tastytea/xdgcfg) into `xdgcfg/`.
+
+If you clone from git, be sure to `git submodule init` and
+`git submodule update` afterwards. See the [submodules article in the git book]
+(https://git-scm.com/book/en/v2/Git-Tools-Submodules#_cloning_submodules) for
+further info.

 #### Compile

-``` zsh
+```SH
 mkdir build
 cd build
 cmake ..
@ -60,8 +63,7 @@ make install

 cmake options:
 * `-DCMAKE_BUILD_TYPE=Debug` for a debug build
-* `-DWITH_TRANSLATIONS=NO` to not compile translations
-* `-DWITH_MAN=NO` to not compile the manpage
+* `-DWITHOUT_TRANSLATIONS=YES` to not compile translations
 * One of:
    * `-DWITH_DEB=YES` if you want to be able to generate a deb-package
    * `-DWITH_RPM=YES` if you want to be able to generate an rpm-package
@ -89,14 +91,14 @@ Please report them on the

 ## Licence & Copyright

-``` plain
+```PLAIN
 Copyright © 2018 tastytea <tastytea@tastytea.de>.
 License GPLv3: GNU GPL version 3 <https://www.gnu.org/licenses/gpl-3.0.html>.
 This program comes with ABSOLUTELY NO WARRANTY. This is free software,
 and you are welcome to redistribute it under certain conditions.
 ```

-The icon is derived from the icons *“messagebox critical”* and *“help”* of the
+The icon is derived from the icons `messagebox critical` and `help` of the
 [Gartoon icon theme](https://commons.wikimedia.org/wiki/Gartoon_icons). The
 original authors were Zeus, Patrick Yavitz and La Mula Francis, who released
 them under the terms of the
--- a/build_manpage.sh
+++ b/build_manpage.sh
@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -n "${1}" ]; then
-    dir="$(dirname ${0})"
-    cp -vf ${dir}/whyblocked.1.adoc .
-    sed -Ei "s/(Revision: +)[0-9]+\.[0-9]\.[0-9]/\1${1}/" whyblocked.1.adoc
-    a2x --doctype manpage --format manpage --no-xmllint whyblocked.1.adoc
-else
-    echo "usage: ${0} VERSION" >&2
-fi
--- a/de.tastytea.Whyblocked.desktop
+++ b/de.tastytea.Whyblocked.desktop
@ -5,7 +5,7 @@ Name=Whyblocked
 Comment=Reminds you why you blocked someone
 Comment[de]=Erinnert dich, warum du jemanden blockiertest
 Icon=de.tastytea.Whyblocked
-Exec=whyblocked
+Exec=whyblocked-gui
 Terminal=false
 Categories=Utility;
 Keywords=blocklist;social-network;
--- a/src/qt/mainwindow.cpp
+++ b/src/qt/mainwindow.cpp
@ -20,11 +20,12 @@
 #include <codecvt>
 #include <algorithm>
 #include <QMessageBox>
+#include <QTranslator>
+#include <QLibraryInfo>
 #include <QtCore/qmimedata.h>
 #include <libconfig.h++>
 #include "version.hpp"
-#include "mainwindow.hpp"
-#include "dialog_add.hpp"
+#include "interface_qt.hpp"

 using std::wstring;

@ -103,6 +104,7 @@ MainWindow::MainWindow(QMainWindow *parent)
    }

    widget_find->hide();
+    text_find->installEventFilter(this);

    reload();

@ -162,7 +164,8 @@ MainWindow::~MainWindow()
        tableview->horizontalHeader()->sectionSize(0);
    headers.add(libconfig::Setting::TypeInt) =
        tableview->horizontalHeader()->sectionSize(1);
-    headers.add(libconfig::Setting::TypeInt) = 125;
+    headers.add(libconfig::Setting::TypeInt) =
+        tableview->horizontalHeader()->sectionSize(2);

    libconfig::Setting &find_in = root.add("find_in",
                                           libconfig::Setting::TypeGroup);
@ -174,6 +177,33 @@ MainWindow::~MainWindow()
    _config.write();
 }

+void MainWindow::populate_tableview(const vector<Database::data> &entries)
+{
+    _model->clear();
+    _model->setHorizontalHeaderLabels(
+    {
+        tr("User/Instance"),
+        tr("Blocked/Silenced"),
+        tr("Reason")
+    });
+    tableview->horizontalHeader()->resizeSection(0, _headersize[0]);
+    tableview->horizontalHeader()->resizeSection(1, _headersize[1]);
+    tableview->horizontalHeader()->resizeSection(2, _headersize[2]);
+
+    for (const Database::data &entry : entries)
+    {
+        add_row(QString::fromStdString(entry.user),
+                entry.blocked,
+                QString::fromStdString(entry.reason));
+    }
+}
+
+void MainWindow::reload()
+{
+    _database.reload();
+    populate_tableview(_dbdata);
+}
+
 void MainWindow::add_row(const QString &user, const int &blocked,
                         const QString &reason)
 {
@ -191,16 +221,40 @@ void MainWindow::add_row(const QString &user, const int &blocked,
    _model->appendRow(items);
 }

+void MainWindow::add()
+{
+    DialogAdd *dialog = new DialogAdd(_database, this);
+    dialog->show();
+}
+
+void MainWindow::edit()
+{
+    if (tableview->selectionModel()->selectedRows().count() != 1)
+    {
+        QMessageBox::warning(this, tr("Invalid selection"),
+                             tr("Please select only 1 entry to edit."));
+        return;
+    }
+
+    DialogAdd *dialog = new DialogAdd(_database, this);
+    dialog->setWindowTitle(tr("Edit entry"));
+
+    QModelIndex index = tableview->selectionModel()->selectedRows().first();
+    const string user = index.sibling(index.row(), 0).data()
+                                                     .toString().toStdString();
+
+    dialog->set_data(_database.get_user(user));
+    dialog->setProperty("edit", true);
+    dialog->show();
+}
+
 void MainWindow::remove()
 {
    QItemSelectionModel *selection = tableview->selectionModel();
    if (selection->hasSelection())
    {
-        // I use this construct here because the number of selected rows
-        // decrease by 1 each iteration.
-        for (; selection->selectedRows().count() > 0;)
+        for (auto &row : selection->selectedRows())
        {
-            const QModelIndex row = selection->selectedRows().front();
            const string user = row.data().toString().toStdString();
            _database.remove(user);
            _model->removeRow(row.row());
@ -214,6 +268,109 @@ void MainWindow::remove()
    }
 }

+void MainWindow::find()
+{
+    if (widget_find->isVisible())
+    {
+        widget_find->hide();
+    }
+    else
+    {
+        widget_find->show();
+        text_find->setFocus();
+    }
+}
+
+bool MainWindow::eventFilter(QObject *obj, QEvent *event)
+{
+    wstring searchfor;
+
+    if (obj == text_find)
+    {
+        if (event->type() == QEvent::KeyRelease)
+        {
+            searchfor = text_find->text().toLower().toStdWString();
+        }
+        else if (event->type() == QEvent::Drop)
+        {
+            QDropEvent *drop = static_cast<QDropEvent*>(event);
+            searchfor = drop->mimeData()->text().toLower().toStdWString();
+        }
+        else
+        {
+            return QObject::eventFilter(obj, event);
+        }
+    }
+    else
+    {
+        return QObject::eventFilter(obj, event);
+    }
+
+    vector<Database::data> filtered_entries;
+    if (!_dbdata.empty())
+    {
+        for (const Database::data &entry : _dbdata)
+        {
+            wstring searchstring;
+
+            std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> convert;
+
+            if (check_user->isChecked())
+            {
+                searchstring += convert.from_bytes(entry.user);
+            }
+            if (check_reason->isChecked())
+            {
+                searchstring += convert.from_bytes(entry.reason);
+            }
+            std::transform(searchstring.begin(), searchstring.end(),
+                           searchstring.begin(), ::towlower);
+            if (searchstring.find(searchfor) != std::string::npos)
+            {
+                filtered_entries.push_back(entry);
+            }
+        }
+    }
+
+    populate_tableview(filtered_entries);
+
+    return QObject::eventFilter(obj, event);
+}
+
+void MainWindow::about()
+{
+    QMessageBox::about(this, tr("About Whyblocked"),
+        tr("<p><b>Whyblocked</b> %1</p>"
+           "<p>Reminds you why you blocked someone.</p>"
+           "<p>Sourcecode: <a href=\"https://schlomp.space/tastytea/whyblocked\">"
+           "https://schlomp.space/tastytea/whyblocked</a></p>"
+           "<p><small>Copyright © 2018 <a href=\"mailto:tastytea@tastytea.de\">tastytea</a>.<br>"
+           "Licence GPLv3: <a href=\"https://www.gnu.org/licenses/gpl-3.0.html\">"
+           "GNU GPL version 3</a>.<br>"
+           "This program comes with ABSOLUTELY NO WARRANTY. This is free software, "
+           "and you are welcome to redistribute it under certain conditions.</small></p>")
+        .arg(global::version));
+}
+
+void MainWindow::show_details(QModelIndex index)
+{
+    const string user = index.sibling(index.row(), 0).data()
+                                                     .toString().toStdString();
+    Database::data data = _database.get_user(user);
+    string text = "";
+
+    if (!data.receipts.empty())
+    {
+        text += string("<b>") + tr("Receipts:").toStdString() + "</b>";
+        for (const string &url : data.receipts)
+        {
+            text += "<br>" + url;
+        }
+        text = urls_to_hyperlinks(text);
+    }
+    label_receipts->setText(QString::fromStdString((text)));
+}
+
 const string MainWindow::urls_to_hyperlinks(const string &text)
 {
    std::regex re_url("((https?|gopher|ftps?)\\://[^ <]*)");
@ -255,145 +412,119 @@ void MainWindow::dropEvent(QDropEvent *event)
    DialogAdd *dialog = new DialogAdd(_database, this);
    Database::data data;
    data.user = text;
-    data.blocked = true;
    dialog->set_data(data);
    dialog->show();
 }

-void MainWindow::add()
+DialogAdd::DialogAdd(Database &database, QMainWindow *parent)
+: QDialog(parent)
+, _parent(static_cast<MainWindow*>(parent))
+, _database(database)
 {
-    DialogAdd *dialog = new DialogAdd(_database, this);
-    dialog->show();
+    setupUi(this);
 }

-void MainWindow::edit()
+const Database::data DialogAdd::get_data() const
 {
-    if (tableview->selectionModel()->selectedRows().count() != 1)
+    std::vector<string> receipts;
+    for (int row = 0; row <= list_receipts->count() - 1; ++row)
+    {
+        receipts.push_back(list_receipts->item(row)->text().toStdString());
+    }
+
+    Database::data data;
+    data.user = text_user->text().toStdString();
+    data.blocked = radio_blocked->isChecked();
+    data.reason = text_reason->text().toStdString();
+    data.receipts = receipts;
+
+    return data;
+}
+
+void DialogAdd::set_data(const Database::data &data)
+{
+    text_user->setText(QString::fromStdString(data.user));
+    radio_blocked->setChecked(data.blocked);
+    radio_silcenced->setChecked(!data.blocked);
+    text_reason->setText(QString::fromStdString(data.reason));
+    for (const string &receipt : data.receipts)
+    {
+        QListWidgetItem *item =
+            new QListWidgetItem(QString::fromStdString(receipt));
+        item->setFlags(item->flags() | Qt::ItemIsEditable);
+        list_receipts->insertItem(list_receipts->count(), item);
+    }
+}
+
+void DialogAdd::add_receipt()
+{
+    QListWidgetItem *item = new QListWidgetItem(tr("Insert receipt here."));
+    item->setFlags(item->flags() | Qt::ItemIsEditable);
+    list_receipts->insertItem(list_receipts->count(), item);
+    list_receipts->editItem(item);
+}
+
+void DialogAdd::remove_receipt()
+{
+    for (auto item :list_receipts->selectedItems())
+    {
+        delete item;
+    }
+}
+
+void DialogAdd::accept()
+{
+    if (property("edit").toBool())
+    {
+        _parent->remove();
+    }
+    Database::data data = get_data();
+
+    if (!data)
    {
-        QMessageBox::warning(this, tr("Invalid selection"),
-                             tr("Please select only 1 entry to edit."));
        return;
    }

-    DialogAdd *dialog = new DialogAdd(_database, this);
-    dialog->setWindowTitle(tr("Edit entry"));
+    _database.add_user(data);
+    _parent->add_row(QString::fromStdString(data.user),
+                     data.blocked,
+                     QString::fromStdString(data.reason));

-    QModelIndex index = tableview->selectionModel()->selectedRows().first();
-    const string user = index.sibling(index.row(), 0).data()
-                                                     .toString().toStdString();
-
-    dialog->set_data(_database.get_user(user));
-    dialog->setProperty("edit", true);
-    dialog->show();
+    delete this;
 }

-void MainWindow::about()
+void DialogAdd::dragEnterEvent(QDragEnterEvent *event)
 {
-    QMessageBox::about(this, tr("About Whyblocked"),
-        tr("<p><b>Whyblocked</b> %1</p>"
-           "<p>Reminds you why you blocked someone.</p>"
-           "<p>Sourcecode: <a href=\"https://schlomp.space/tastytea/whyblocked\">"
-           "https://schlomp.space/tastytea/whyblocked</a></p>"
-           "<p><small>Copyright © 2018 <a href=\"mailto:tastytea@tastytea.de\">tastytea</a>.<br>"
-           "Licence GPLv3: <a href=\"https://www.gnu.org/licenses/gpl-3.0.html\">"
-           "GNU GPL version 3</a>.<br>"
-           "This program comes with ABSOLUTELY NO WARRANTY. This is free software, "
-           "and you are welcome to redistribute it under certain conditions.</small></p>")
-        .arg(global::version));
-}
-
-void MainWindow::show_details(QModelIndex index)
-{
-    const string user = index.sibling(index.row(), 0).data()
-                                                     .toString().toStdString();
-    Database::data data = _database.get_user(user);
-    string text = "";
-
-    if (!data.receipts.empty())
+    if (event->mimeData()->hasFormat("text/plain"))
    {
-        text += string("<b>") + tr("Receipts:").toStdString() + "</b>";
-        for (const string &url : data.receipts)
-        {
-            text += "<br>" + url;
-        }
-        text = urls_to_hyperlinks(text);
-    }
-    label_receipts->setText(QString::fromStdString((text)));
-}
-
-void MainWindow::populate_tableview(const vector<Database::data> &entries)
-{
-    _model->clear();
-    _model->setHorizontalHeaderLabels(
-    {
-        tr("User/Instance"),
-        tr("Blocked/Silenced"),
-        tr("Reason")
-    });
-    tableview->horizontalHeader()->resizeSection(0, _headersize[0]);
-    tableview->horizontalHeader()->resizeSection(1, _headersize[1]);
-    tableview->horizontalHeader()->resizeSection(2, _headersize[2]);
-
-    for (const Database::data &entry : entries)
-    {
-        add_row(QString::fromStdString(entry.user),
-                entry.blocked,
-                QString::fromStdString(entry.reason));
+        event->acceptProposedAction();
    }
 }

-void MainWindow::reload()
+void DialogAdd::dropEvent(QDropEvent *event)
 {
-    _database.reload();
-    populate_tableview(_dbdata);
+    const QString text = event->mimeData()->text();
+    QListWidgetItem *item = new QListWidgetItem(text);
+    item->setFlags(item->flags() | Qt::ItemIsEditable);
+    list_receipts->insertItem(list_receipts->count(), item);
 }

-void MainWindow::find()
+int main(int argc, char *argv[])
 {
-    if (widget_find->isVisible())
-    {
-        widget_find->hide();
-    }
-    else
-    {
-        widget_find->show();
-        text_find->setFocus();
-    }
-}
-
-void MainWindow::update_search(const QString &text)
-{
-    const wstring searchfor = text.toLower().toStdWString();
-
-    vector<Database::data> filtered_entries;
-    if (!_dbdata.empty())
-    {
-        for (const Database::data &entry : _dbdata)
-        {
-            wstring searchstring;
-            std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> convert;
-
-            if (check_user->isChecked())
-            {
-                searchstring += convert.from_bytes(entry.user);
-            }
-            if (check_reason->isChecked())
-            {
-                searchstring += convert.from_bytes(entry.reason);
-            }
-            std::transform(searchstring.begin(), searchstring.end(),
-                           searchstring.begin(), ::towlower);
-            if (searchstring.find(searchfor) != std::string::npos)
-            {
-                filtered_entries.push_back(entry);
-            }
-        }
-    }
-
-    populate_tableview(filtered_entries);
-}
-
-void MainWindow::update_search()
-{
-    update_search(text_find->text());
+    QApplication app(argc, argv);
+    QCoreApplication::setApplicationName("Whyblocked");
+    
+    QTranslator qtTranslator;
+    qtTranslator.load("qt_" + QLocale::system().name(),
+                      QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    app.installTranslator(&qtTranslator);
+    QTranslator appTranslator;
+    appTranslator.load("whyblocked_" + QLocale::system().name(),
+                       QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    app.installTranslator(&appTranslator);
+
+    MainWindow win;
+    win.show();
+
+    return app.exec();
 }
--- a/src/qt/mainwindow.hpp
+++ b/src/qt/mainwindow.hpp
@ -14,8 +14,8 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef MAINWINDOW_HPP
-#define MAINWINDOW_HPP
+#ifndef INTERFACE_QT_HPP
+#define INTERFACE_QT_HPP

 #include <string>
 #include <memory>
@ -25,9 +25,10 @@
 #include <QStandardItemModel>
 #include <QDialog>
 #include <QtGui/qevent.h>
-#include "../xdgcfg.hpp"
-#include "../whyblocked.hpp"
+#include "xdgcfg.hpp"
+#include "whyblocked.hpp"
 #include "ui_whyblocked.h"
+#include "ui_whyblocked_add.h"

 using std::string;
 using std::vector;
@ -49,6 +50,7 @@ private:
    const string urls_to_hyperlinks(const string &text);
    void dragEnterEvent(QDragEnterEvent *event);
    void dropEvent(QDropEvent *event);
+    bool eventFilter(QObject *obj, QEvent *event);

    QStandardItemModel *_model;
    xdgcfg _config;
@ -64,9 +66,30 @@ private slots:
    void populate_tableview(const vector<Database::data> &entries);
    void reload();
    void find();
-    void update_search(const QString &text);
-    void update_search();

 };

-#endif  // MAINWINDOW_HPP
+class DialogAdd : public QDialog, private Ui::DialogAdd
+{
+    Q_OBJECT
+
+public:
+    explicit DialogAdd(Database &database, QMainWindow *parent = nullptr);
+    void set_data(const Database::data &data);
+
+private:
+    const Database::data get_data() const;
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dropEvent(QDropEvent *event);
+
+    MainWindow *_parent;
+    Database &_database;
+
+private slots:
+    void add_receipt();
+    void remove_receipt();
+    void accept();
+
+};
+
+#endif  // INTERFACE_QT_HPP
--- a/src/qt/dialog_add.cpp
+++ b/src/qt/dialog_add.cpp
@ -1,112 +0,0 @@
-/*  This file is part of whyblocked.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QtCore/qmimedata.h>
-#include "dialog_add.hpp"
-
-DialogAdd::DialogAdd(Database &database, QMainWindow *parent)
-: QDialog(parent)
-, _parent(static_cast<MainWindow*>(parent))
-, _database(database)
-{
-    setupUi(this);
-}
-
-
-void DialogAdd::set_data(const Database::data &data)
-{
-    text_user->setText(QString::fromStdString(data.user));
-    radio_blocked->setChecked(data.blocked);
-    radio_silcenced->setChecked(!data.blocked);
-    text_reason->setText(QString::fromStdString(data.reason));
-    for (const string &receipt : data.receipts)
-    {
-        QListWidgetItem *item =
-            new QListWidgetItem(QString::fromStdString(receipt));
-        item->setFlags(item->flags() | Qt::ItemIsEditable);
-        list_receipts->insertItem(list_receipts->count(), item);
-    }
-}
-
-const Database::data DialogAdd::get_data() const
-{
-    std::vector<string> receipts;
-    for (int row = 0; row <= list_receipts->count() - 1; ++row)
-    {
-        receipts.push_back(list_receipts->item(row)->text().toStdString());
-    }
-
-    Database::data data;
-    data.user = text_user->text().toStdString();
-    data.blocked = radio_blocked->isChecked();
-    data.reason = text_reason->text().toStdString();
-    data.receipts = receipts;
-
-    return data;
-}
-
-void DialogAdd::dragEnterEvent(QDragEnterEvent *event)
-{
-    if (event->mimeData()->hasFormat("text/plain"))
-    {
-        event->acceptProposedAction();
-    }
-}
-
-void DialogAdd::dropEvent(QDropEvent *event)
-{
-    const QString text = event->mimeData()->text();
-    QListWidgetItem *item = new QListWidgetItem(text);
-    item->setFlags(item->flags() | Qt::ItemIsEditable);
-    list_receipts->insertItem(list_receipts->count(), item);
-}
-
-void DialogAdd::add_receipt()
-{
-    QListWidgetItem *item = new QListWidgetItem(tr("Insert receipt here."));
-    item->setFlags(item->flags() | Qt::ItemIsEditable);
-    list_receipts->insertItem(list_receipts->count(), item);
-    list_receipts->editItem(item);
-}
-
-void DialogAdd::remove_receipt()
-{
-    for (auto item :list_receipts->selectedItems())
-    {
-        delete item;
-    }
-}
-
-void DialogAdd::accept()
-{
-    if (property("edit").toBool())
-    {
-        _parent->remove();
-    }
-    Database::data data = get_data();
-
-    if (!data)
-    {
-        return;
-    }
-
-    _database.add_user(data);
-    _parent->add_row(QString::fromStdString(data.user),
-                     data.blocked,
-                     QString::fromStdString(data.reason));
-
-    delete this;
-}
--- a/src/qt/dialog_add.hpp
+++ b/src/qt/dialog_add.hpp
@ -1,46 +0,0 @@
-/*  This file is part of whyblocked.
- *  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DIALOG_ADD_HPP
-#define DIALOG_ADD_HPP
-
-#include "mainwindow.hpp"
-#include "ui_whyblocked_add.h"
-
-class DialogAdd : public QDialog, private Ui::DialogAdd
-{
-    Q_OBJECT
-
-public:
-    explicit DialogAdd(Database &database, QMainWindow *parent = nullptr);
-    void set_data(const Database::data &data);
-
-private:
-    const Database::data get_data() const;
-    void dragEnterEvent(QDragEnterEvent *event);
-    void dropEvent(QDropEvent *event);
-
-    MainWindow *_parent;
-    Database &_database;
-
-private slots:
-    void add_receipt();
-    void remove_receipt();
-    void accept();
-
-};
-
-#endif  // DIALOG_ADD_HPP
--- a/src/qt/main.cpp
+++ b/src/qt/main.cpp
@ -1,42 +0,0 @@
-/*  This file is part of whyblocked.
- *  Copyright © 2019, 2020 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mainwindow.hpp"
-
-#include <QLibraryInfo>
-#include <QLocale>
-#include <QTranslator>
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    QCoreApplication::setApplicationName("Whyblocked");
-
-    QTranslator qtTranslator;
-    qtTranslator.load(QLocale(), "qt", "_",
-                      QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-
-    app.installTranslator(&qtTranslator);
-    QTranslator appTranslator;
-    appTranslator.load(QLocale(), "whyblocked", "_",
-                       QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-    app.installTranslator(&appTranslator);
-
-    MainWindow win;
-    win.show();
-
-    return app.exec();
-}
--- a/src/qt/whyblocked.ui
+++ b/src/qt/whyblocked.ui
@ -46,7 +46,7 @@
          <bool>true</bool>
         </property>
         <property name="clearButtonEnabled">
-          <bool>true</bool>
+          <bool>false</bool>
         </property>
        </widget>
       </item>
@ -453,54 +453,6 @@
    </hint>
   </hints>
  </connection>
-  <connection>
-   <sender>text_find</sender>
-   <signal>textChanged(QString)</signal>
-   <receiver>MainWindow</receiver>
-   <slot>update_search(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>201</x>
-     <y>83</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>299</x>
-     <y>299</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>check_user</sender>
-   <signal>clicked()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>update_search()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>455</x>
-     <y>82</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>299</x>
-     <y>299</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>check_reason</sender>
-   <signal>clicked()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>update_search()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>553</x>
-     <y>82</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>299</x>
-     <y>299</y>
-    </hint>
-   </hints>
-  </connection>
 </connections>
 <slots>
  <slot>add()</slot>
@ -511,9 +463,5 @@
  <slot>edit()</slot>
  <slot>find()</slot>
  <slot>reload()</slot>
-  <slot>check_user_changed(int)</slot>
-  <slot>check_reason_changed(int)</slot>
-  <slot>update_search(QString)</slot>
-  <slot>update_search()</slot>
 </slots>
 </ui>
--- a/src/qt/whyblocked_add.ui
+++ b/src/qt/whyblocked_add.ui
--- a/src/xdgcfg.cpp
+++ b/src/xdgcfg.cpp
@ -1,95 +0,0 @@
-/*  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify it
- *  under the terms of the BSD-3-Clause license.
- */
-
-#include <basedir.h>
-#include "xdgcfg.hpp"
-
-xdgcfg::xdgcfg(const string &filename, const string &subdir)
-: _cfg()
-, _verbose(false)
-{
-    xdgHandle xdg;
-    xdgInitHandle(&xdg);
-    _filepath = xdgConfigHome(&xdg);
-    xdgWipeHandle(&xdg);
-
-    if (!subdir.empty())
-    {
-        _filepath /= subdir;
-    }
-    if (!fs::exists(_filepath))
-    {
-        fs::create_directories(_filepath);
-    }
-    _filepath /= filename;
-}
-
-uint8_t xdgcfg::read()
-{
-    try
-    {
-        _cfg.readFile(_filepath.c_str());
-    }
-    catch (const libconfig::FileIOException &e)
-    {
-        if (_verbose)
-        {
-            cerr << "I/O error while reading " << _filepath
-                 << " - " << e.what() << endl;
-        }
-        return 1;
-    }
-    catch (const libconfig::ParseException &e)
-    {
-        if (_verbose)
-        {
-            cerr << "Parse error at " << e.getFile() << ":" << e.getLine()
-                 << " - " << e.getError() << endl;
-        }
-        return 2;
-    }
-
-    return 0;
-}
-
-bool xdgcfg::write()
-{
-    try
-    {
-        _cfg.writeFile(_filepath.c_str());
-    }
-    catch (const libconfig::FileIOException &e)
-    {
-        if (_verbose)
-        {
-            cerr << "I/O error while writing " << _filepath
-                 << " - " << e.what() << endl;
-        }
-        return false;
-    }
-
-    return true;
-}
-
-libconfig::Config &xdgcfg::get_cfg()
-{
-    return _cfg;
-}
-
-const fs::path xdgcfg::get_filepath() const
-{
-    return _filepath;
-}
-
-void xdgcfg::set_verbose(bool verbose)
-{
-    _verbose = verbose;
-}
-
-bool xdgcfg::get_verbose() const
-{
-    return _verbose;
-}
--- a/src/xdgcfg.cpp
+++ b/src/xdgcfg.cpp
@ -0,0 +1 @@
+../xdgcfg/src/xdgcfg.cpp
--- a/src/xdgcfg.hpp
+++ b/src/xdgcfg.hpp
@ -1,106 +0,0 @@
-/*  Copyright © 2019 tastytea <tastytea@tastytea.de>
- *
- *  This program is free software: you can redistribute it and/or modify it
- *  under the terms of the BSD-3-Clause license.
- */
-
-#ifndef XDGCFG_HPP
-#define XDGCFG_HPP
-
-#if __cplusplus >= 201703L
-    #include <filesystem>
-#else
-    #include <experimental/filesystem>
-#endif
-#include <string>
-#include <iostream>
-#include <cstdint>
-#include <libconfig.h++>
-
-#if __cplusplus >= 201703L
-    namespace fs = std::filesystem;
-#else
-    namespace fs = std::experimental::filesystem;
-#endif
-using std::string;
-using std::uint8_t;
-using std::cerr;
-using std::endl;
-
-class xdgcfg
-{
-public:
-    /*!
-     *  @brief  Checks if subdir is present, creates it if necessary
-     *
-     *          Example:
-     *  @code
-     *          xdgcfg config("test.cfg", "subdirectory");
-     *  @endcode
-     *
-     *  @param  filename  The name of the file, including extension
-     *  @param  subdir    The subdir (optional)
-     */
-    explicit xdgcfg(const string &filename, const string &subdir = "");
-
-    /*!
-     *  @brief  Read the file
-     *
-     *  @return 0 on success, 1 on I/O error, 2 on parse error.
-     */
-    uint8_t read();
-
-    /*!
-     *  @brief  Write the file
-     *
-     *  @return `true` on success
-     */
-    bool write();
-
-    /*!
-     *  @brief  Returns a reference to the config as libconfig::Config
-     *
-     *          Example:
-     *  @code
-     *          libconfig::Config &cfg = config.get_cfg();
-     *  @endcode
-     */
-    libconfig::Config &get_cfg();
-
-    /*!
-     *  @brief  Returns the complete filepath
-     */
-    const fs::path get_filepath() const;
-
-    /*!
-     *  @brief  Sets verbosity
-     */
-    void set_verbose(bool verbose);
-
-    /*!
-     *  @brief  Returns verbosity
-     */
-    bool get_verbose() const;
-
-private:
-    /*!
-     *  Holds the contents of the CFG file
-     */
-    libconfig::Config _cfg;
-
-    /*!
-     *  Complete filepath
-     */
-    fs::path _filepath;
-
-    /*!
-     *  Print out error messages if true
-     */
-    bool _verbose;
-};
-
-/*!
- *  @example example.cpp
- */
-
-#endif  // XDGCFG_HPP
--- a/src/xdgcfg.hpp
+++ b/src/xdgcfg.hpp
@ -0,0 +1 @@
+../xdgcfg/src/xdgcfg.hpp
--- a/translations/CMakeLists.txt
+++ b/translations/CMakeLists.txt
@ -7,6 +7,6 @@ qt5_create_translation(QM_FILES ${TS_SRC_FILES} ${TS_FILES}
                       OPTIONS -no-obsolete)
 # qt5_add_translation(QM_FILES ${TS_FILES})
 add_custom_target(translations ALL DEPENDS ${QM_FILES})
-add_dependencies(${CMAKE_PROJECT_NAME} translations)
+add_dependencies(${CMAKE_PROJECT_NAME}-gui translations)
 install(FILES ${QM_FILES} DESTINATION
        ${CMAKE_INSTALL_DATAROOTDIR}/qt5/translations)
--- a/translations/whyblocked_de.ts
+++ b/translations/whyblocked_de.ts
@ -4,77 +4,77 @@
 <context>
    <name>DialogAdd</name>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="17"/>
+        <location filename="../src/whyblocked_add.ui" line="17"/>
        <source>Add entry</source>
        <translation>Eintrag hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="40"/>
+        <location filename="../src/whyblocked_add.ui" line="40"/>
        <source>Memory aids, proof</source>
        <translation>Gedächtnisstützen, Beweise</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="43"/>
+        <location filename="../src/whyblocked_add.ui" line="43"/>
        <source>Rece&amp;ipts</source>
        <translation>Be&amp;lege</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="56"/>
+        <location filename="../src/whyblocked_add.ui" line="56"/>
        <source>Add receipt</source>
        <translation>Beleg hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="59"/>
+        <location filename="../src/whyblocked_add.ui" line="59"/>
        <source>&amp;Add</source>
        <translation>&amp;Hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="79"/>
+        <location filename="../src/whyblocked_add.ui" line="79"/>
        <source>&amp;Blocked</source>
        <translation>&amp;Blockiert</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="98"/>
+        <location filename="../src/whyblocked_add.ui" line="98"/>
        <source>&amp;Silenced</source>
        <translation>&amp;Gedämpft</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="105"/>
+        <location filename="../src/whyblocked_add.ui" line="105"/>
        <source>R&amp;eason</source>
        <translation>B&amp;egründung</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="134"/>
+        <location filename="../src/whyblocked_add.ui" line="134"/>
        <source>Blocked/Silenced</source>
        <translation>Blockiert/Gedämpft</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="144"/>
+        <location filename="../src/whyblocked_add.ui" line="144"/>
        <source>&amp;User/Instance</source>
        <translation>Ben&amp;utzer/Instanz</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="154"/>
+        <location filename="../src/whyblocked_add.ui" line="154"/>
        <source>Remove receipt</source>
        <translation>Beleg entfernen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="157"/>
+        <location filename="../src/whyblocked_add.ui" line="157"/>
        <source>Re&amp;move</source>
        <translation>Ent&amp;fernen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="164"/>
+        <location filename="../src/whyblocked_add.ui" line="164"/>
        <source>Del</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="171"/>
+        <location filename="../src/whyblocked_add.ui" line="171"/>
        <source>You can drag URLs in here</source>
        <translation>Du kannst URLs hier hineinziehen</translation>
    </message>
    <message>
-        <location filename="../src/qt/dialog_add.cpp" line="79"/>
+        <location filename="../src/interface_qt.cpp" line="461"/>
        <source>Insert receipt here.</source>
        <translation>Beleg hier einfügen.</translation>
    </message>
@ -82,205 +82,205 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="17"/>
+        <location filename="../src/whyblocked.ui" line="17"/>
        <source>Whyblocked</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="56"/>
+        <location filename="../src/whyblocked.ui" line="56"/>
        <source>Search for Users/Instances</source>
        <translation>Suche nach Benutzern/Instanzen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="69"/>
+        <location filename="../src/whyblocked.ui" line="69"/>
        <source>Search for Reasons</source>
        <translation>Suche nach Begründungen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="88"/>
+        <location filename="../src/whyblocked.ui" line="88"/>
        <source>Click or press enter to view receipts</source>
        <translation>Klicken oder Eingabe drücken, um Belege zu anzuzeigen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="131"/>
+        <location filename="../src/whyblocked.ui" line="131"/>
        <source>Memory aids, proof</source>
        <translation>Gedächtnisstützen, Beweise</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="155"/>
+        <location filename="../src/whyblocked.ui" line="155"/>
        <source>Toolbar</source>
        <translation>Werkzeugleiste</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="186"/>
+        <location filename="../src/whyblocked.ui" line="186"/>
        <source>&amp;Database</source>
        <translation>&amp;Datenbank</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="197"/>
+        <location filename="../src/whyblocked.ui" line="197"/>
        <source>&amp;Help</source>
        <translation>&amp;Hilfe</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="210"/>
+        <location filename="../src/whyblocked.ui" line="210"/>
        <source>&amp;Add</source>
        <translation>&amp;Hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="213"/>
+        <location filename="../src/whyblocked.ui" line="213"/>
        <source>Add user or instance</source>
        <translation>Benutzer oder Instanz hinzufügen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="216"/>
+        <location filename="../src/whyblocked.ui" line="216"/>
        <source>Ctrl+N</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="225"/>
+        <location filename="../src/whyblocked.ui" line="225"/>
        <source>Re&amp;move</source>
        <translation>Ent&amp;fernen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="228"/>
+        <location filename="../src/whyblocked.ui" line="228"/>
        <source>Remove user or instance</source>
        <translation>Benutzer oder Instanz entfernen</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="231"/>
+        <location filename="../src/whyblocked.ui" line="231"/>
        <source>Del</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="240"/>
+        <location filename="../src/whyblocked.ui" line="240"/>
        <source>&amp;About</source>
        <translation>&amp;Über</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="243"/>
+        <location filename="../src/whyblocked.ui" line="243"/>
        <source>About this application</source>
        <translation>Über dieses Programm</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="252"/>
+        <location filename="../src/whyblocked.ui" line="252"/>
        <source>&amp;Reload</source>
        <translation>Neu &amp;laden</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="255"/>
+        <location filename="../src/whyblocked.ui" line="255"/>
        <source>Reload database</source>
        <translation>Datenbank neu laden</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="258"/>
+        <location filename="../src/whyblocked.ui" line="258"/>
        <source>Ctrl+R</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="267"/>
+        <location filename="../src/whyblocked.ui" line="267"/>
        <source>&amp;Quit</source>
        <translation>&amp;Beenden</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="270"/>
+        <location filename="../src/whyblocked.ui" line="270"/>
        <source>Quit application</source>
        <translation>Programm beenden</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="273"/>
+        <location filename="../src/whyblocked.ui" line="273"/>
        <source>Ctrl+Q</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="282"/>
+        <location filename="../src/whyblocked.ui" line="282"/>
        <source>&amp;Edit</source>
        <translation>B&amp;earbeiten</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="285"/>
-        <location filename="../src/qt/mainwindow.cpp" line="279"/>
+        <location filename="../src/whyblocked.ui" line="285"/>
+        <location filename="../src/interface_qt.cpp" line="240"/>
        <source>Edit entry</source>
        <translation>Eintrag bearbeiten</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="300"/>
+        <location filename="../src/whyblocked.ui" line="300"/>
        <source>&amp;Find</source>
        <translation>&amp;Finden</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="303"/>
+        <location filename="../src/whyblocked.ui" line="303"/>
        <source>Find entries</source>
        <translation>Finde Einträge</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="306"/>
+        <location filename="../src/whyblocked.ui" line="306"/>
        <source>Ctrl+F</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="59"/>
-        <location filename="../src/qt/mainwindow.cpp" line="329"/>
+        <location filename="../src/whyblocked.ui" line="59"/>
+        <location filename="../src/interface_qt.cpp" line="185"/>
        <source>User/Instance</source>
        <translation>Benutzer/Instanz</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="330"/>
+        <location filename="../src/interface_qt.cpp" line="186"/>
        <source>Blocked/Silenced</source>
        <translation>Blockiert/Gedämpft</translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="72"/>
-        <location filename="../src/qt/mainwindow.cpp" line="331"/>
+        <location filename="../src/whyblocked.ui" line="72"/>
+        <location filename="../src/interface_qt.cpp" line="187"/>
        <source>Reason</source>
        <translation>Begründung</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="109"/>
+        <location filename="../src/interface_qt.cpp" line="111"/>
        <source>Try dragging an account from your webbrowser into this window.</source>
        <translation>Versuche, einen Account von deinem Webbrowser in dieses Fenster zu ziehen.</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="184"/>
+        <location filename="../src/interface_qt.cpp" line="214"/>
        <source>blocked</source>
        <translation>blockiert</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="188"/>
+        <location filename="../src/interface_qt.cpp" line="218"/>
        <source>silenced</source>
        <translation>gedämpft</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="273"/>
+        <location filename="../src/interface_qt.cpp" line="234"/>
        <source>Invalid selection</source>
        <translation>Ungültige Auswahl</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="274"/>
+        <location filename="../src/interface_qt.cpp" line="235"/>
        <source>Please select only 1 entry to edit.</source>
        <translation>Bitte nur 1 Eintrag zum bearbeiten auswählen.</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="212"/>
+        <location filename="../src/interface_qt.cpp" line="266"/>
        <source>Nothing selected</source>
        <translation>Nichts ausgewählt</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="213"/>
+        <location filename="../src/interface_qt.cpp" line="267"/>
        <source>Please select entries to remove.</source>
        <translation>Bitte wähle Einträge aus, die gelöscht werden sollen.</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="292"/>
+        <location filename="../src/interface_qt.cpp" line="342"/>
        <source>About Whyblocked</source>
        <translation>Über Whyblocked</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="293"/>
+        <location filename="../src/interface_qt.cpp" line="343"/>
        <source>&lt;p&gt;&lt;b&gt;Whyblocked&lt;/b&gt; %1&lt;/p&gt;&lt;p&gt;Reminds you why you blocked someone.&lt;/p&gt;&lt;p&gt;Sourcecode: &lt;a href=&quot;https://schlomp.space/tastytea/whyblocked&quot;&gt;https://schlomp.space/tastytea/whyblocked&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Copyright © 2018 &lt;a href=&quot;mailto:tastytea@tastytea.de&quot;&gt;tastytea&lt;/a&gt;.&lt;br&gt;Licence GPLv3: &lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;GNU GPL version 3&lt;/a&gt;.&lt;br&gt;This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;b&gt;Whyblocked&lt;/b&gt; %1&lt;/p&gt;&lt;p&gt;Erinnert dich, warum du jemanden blockiertest.&lt;/p&gt;&lt;p&gt;Quelltext: &lt;a href=&quot;https://schlomp.space/tastytea/whyblocked&quot;&gt;https://schlomp.space/tastytea/whyblocked&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Copyright © 2018 &lt;a href=&quot;mailto:tastytea@tastytea.de&quot;&gt;tastytea&lt;/a&gt;.&lt;br&gt;Lizenz GPLv3: &lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;GNU GPL version 3&lt;/a&gt;.&lt;br&gt;Für dieses Programm besteht KEINERLEI GARANTIE. Dies ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen.&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="314"/>
+        <location filename="../src/interface_qt.cpp" line="364"/>
        <source>Receipts:</source>
        <translation>Belege:</translation>
    </message>
--- a/translations/whyblocked_en.ts
+++ b/translations/whyblocked_en.ts
@ -4,77 +4,77 @@
 <context>
    <name>DialogAdd</name>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="17"/>
+        <location filename="../src/whyblocked_add.ui" line="17"/>
        <source>Add entry</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="40"/>
+        <location filename="../src/whyblocked_add.ui" line="40"/>
        <source>Memory aids, proof</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="43"/>
+        <location filename="../src/whyblocked_add.ui" line="43"/>
        <source>Rece&amp;ipts</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="56"/>
+        <location filename="../src/whyblocked_add.ui" line="56"/>
        <source>Add receipt</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="59"/>
+        <location filename="../src/whyblocked_add.ui" line="59"/>
        <source>&amp;Add</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="79"/>
+        <location filename="../src/whyblocked_add.ui" line="79"/>
        <source>&amp;Blocked</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="98"/>
+        <location filename="../src/whyblocked_add.ui" line="98"/>
        <source>&amp;Silenced</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="105"/>
+        <location filename="../src/whyblocked_add.ui" line="105"/>
        <source>R&amp;eason</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="134"/>
+        <location filename="../src/whyblocked_add.ui" line="134"/>
        <source>Blocked/Silenced</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="144"/>
+        <location filename="../src/whyblocked_add.ui" line="144"/>
        <source>&amp;User/Instance</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="154"/>
+        <location filename="../src/whyblocked_add.ui" line="154"/>
        <source>Remove receipt</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="157"/>
+        <location filename="../src/whyblocked_add.ui" line="157"/>
        <source>Re&amp;move</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="164"/>
+        <location filename="../src/whyblocked_add.ui" line="164"/>
        <source>Del</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked_add.ui" line="171"/>
+        <location filename="../src/whyblocked_add.ui" line="171"/>
        <source>You can drag URLs in here</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/dialog_add.cpp" line="79"/>
+        <location filename="../src/interface_qt.cpp" line="461"/>
        <source>Insert receipt here.</source>
        <translation type="unfinished"></translation>
    </message>
@ -82,205 +82,205 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="17"/>
+        <location filename="../src/whyblocked.ui" line="17"/>
        <source>Whyblocked</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="56"/>
+        <location filename="../src/whyblocked.ui" line="56"/>
        <source>Search for Users/Instances</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="69"/>
+        <location filename="../src/whyblocked.ui" line="69"/>
        <source>Search for Reasons</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="88"/>
+        <location filename="../src/whyblocked.ui" line="88"/>
        <source>Click or press enter to view receipts</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="131"/>
+        <location filename="../src/whyblocked.ui" line="131"/>
        <source>Memory aids, proof</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="155"/>
+        <location filename="../src/whyblocked.ui" line="155"/>
        <source>Toolbar</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="186"/>
+        <location filename="../src/whyblocked.ui" line="186"/>
        <source>&amp;Database</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="197"/>
+        <location filename="../src/whyblocked.ui" line="197"/>
        <source>&amp;Help</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="210"/>
+        <location filename="../src/whyblocked.ui" line="210"/>
        <source>&amp;Add</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="213"/>
+        <location filename="../src/whyblocked.ui" line="213"/>
        <source>Add user or instance</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="216"/>
+        <location filename="../src/whyblocked.ui" line="216"/>
        <source>Ctrl+N</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="225"/>
+        <location filename="../src/whyblocked.ui" line="225"/>
        <source>Re&amp;move</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="228"/>
+        <location filename="../src/whyblocked.ui" line="228"/>
        <source>Remove user or instance</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="231"/>
+        <location filename="../src/whyblocked.ui" line="231"/>
        <source>Del</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="240"/>
+        <location filename="../src/whyblocked.ui" line="240"/>
        <source>&amp;About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="243"/>
+        <location filename="../src/whyblocked.ui" line="243"/>
        <source>About this application</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="252"/>
+        <location filename="../src/whyblocked.ui" line="252"/>
        <source>&amp;Reload</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="255"/>
+        <location filename="../src/whyblocked.ui" line="255"/>
        <source>Reload database</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="258"/>
+        <location filename="../src/whyblocked.ui" line="258"/>
        <source>Ctrl+R</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="267"/>
+        <location filename="../src/whyblocked.ui" line="267"/>
        <source>&amp;Quit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="270"/>
+        <location filename="../src/whyblocked.ui" line="270"/>
        <source>Quit application</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="273"/>
+        <location filename="../src/whyblocked.ui" line="273"/>
        <source>Ctrl+Q</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="282"/>
+        <location filename="../src/whyblocked.ui" line="282"/>
        <source>&amp;Edit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="285"/>
-        <location filename="../src/qt/mainwindow.cpp" line="279"/>
+        <location filename="../src/whyblocked.ui" line="285"/>
+        <location filename="../src/interface_qt.cpp" line="240"/>
        <source>Edit entry</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="300"/>
+        <location filename="../src/whyblocked.ui" line="300"/>
        <source>&amp;Find</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="303"/>
+        <location filename="../src/whyblocked.ui" line="303"/>
        <source>Find entries</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="306"/>
+        <location filename="../src/whyblocked.ui" line="306"/>
        <source>Ctrl+F</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="59"/>
-        <location filename="../src/qt/mainwindow.cpp" line="329"/>
+        <location filename="../src/whyblocked.ui" line="59"/>
+        <location filename="../src/interface_qt.cpp" line="185"/>
        <source>User/Instance</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="330"/>
+        <location filename="../src/interface_qt.cpp" line="186"/>
        <source>Blocked/Silenced</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/whyblocked.ui" line="72"/>
-        <location filename="../src/qt/mainwindow.cpp" line="331"/>
+        <location filename="../src/whyblocked.ui" line="72"/>
+        <location filename="../src/interface_qt.cpp" line="187"/>
        <source>Reason</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="109"/>
+        <location filename="../src/interface_qt.cpp" line="111"/>
        <source>Try dragging an account from your webbrowser into this window.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="184"/>
+        <location filename="../src/interface_qt.cpp" line="214"/>
        <source>blocked</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="188"/>
+        <location filename="../src/interface_qt.cpp" line="218"/>
        <source>silenced</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="273"/>
+        <location filename="../src/interface_qt.cpp" line="234"/>
        <source>Invalid selection</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="274"/>
+        <location filename="../src/interface_qt.cpp" line="235"/>
        <source>Please select only 1 entry to edit.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="212"/>
+        <location filename="../src/interface_qt.cpp" line="266"/>
        <source>Nothing selected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="213"/>
+        <location filename="../src/interface_qt.cpp" line="267"/>
        <source>Please select entries to remove.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="292"/>
+        <location filename="../src/interface_qt.cpp" line="342"/>
        <source>About Whyblocked</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="293"/>
+        <location filename="../src/interface_qt.cpp" line="343"/>
        <source>&lt;p&gt;&lt;b&gt;Whyblocked&lt;/b&gt; %1&lt;/p&gt;&lt;p&gt;Reminds you why you blocked someone.&lt;/p&gt;&lt;p&gt;Sourcecode: &lt;a href=&quot;https://schlomp.space/tastytea/whyblocked&quot;&gt;https://schlomp.space/tastytea/whyblocked&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Copyright © 2018 &lt;a href=&quot;mailto:tastytea@tastytea.de&quot;&gt;tastytea&lt;/a&gt;.&lt;br&gt;Licence GPLv3: &lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;GNU GPL version 3&lt;/a&gt;.&lt;br&gt;This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/qt/mainwindow.cpp" line="314"/>
+        <location filename="../src/interface_qt.cpp" line="364"/>
        <source>Receipts:</source>
        <translation type="unfinished"></translation>
    </message>
--- a/whyblocked.1.adoc
+++ b/whyblocked.1.adoc
@ -1,37 +0,0 @@
-= whyblocked(1)
-:Author:        tastytea
-:Email:         tastytea@tastytea.de
-:Date:          2019-04-12
-:Revision:      0.0.0
-:man source:    Whyblocked
-:man version:   {revision}
-:man manual:    General Commands Manual
-
-== NAME
-
-whyblocked - reminds you why you blocked someone.
-
-== SYNOPSIS
-
-*whyblocked*
-
-== DESCRIPTION
-
-Whyblocked allows you to store the reason why you blocked someone, along with
-"receipts", URLs to the posts that led you to block them.
-
-Apart from the obvious method, you can add entries by dropping the link to a
-profile into the main window. In the "Add entry" dialog, you can add receipts by
-dropping links or text into the receipts list.
-
-== FILES
-
- *Configuration file*: `${XDG_CONFIG_HOME}/whyblocked.cfg`
- *Database*: `${XDG_DATA_HOME}/whyblocked/database.sqlite`
-
-`${XDG_CONFIG_HOME}` is usually `~/.config` and `${XDG_DATA_HOME}` is usually
-`~/.local/share`
-
-== REPORTING BUGS
-
-Bugtracker: https://schlomp.space/tastytea/whyblocked/issues
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit e22f82fc6f1c40cda3d3ce5e671299f26f622528
				`@ -0,0 +1 @@`
				`Subproject commit e22f82fc6f1c40cda3d3ce5e671299f26f622528`