From a6fe38af2f0aa03580488c4fe3d2069a63283067 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Thu, 25 Oct 2018 00:43:52 +0200
Subject: [PATCH] Qt interface: Changed the icon names to lookup according to
 the Icon Naming Specification (bug #7)

---
 CMakeLists.txt                |  2 +-
 src/whyblocked.ui             | 22 ++++++++--------
 src/whyblocked_add.ui         |  4 +--
 translations/whyblocked_de.ts | 48 +++++++++++++++++++++++++----------
 translations/whyblocked_en.ts | 48 +++++++++++++++++++++++++----------
 5 files changed, 81 insertions(+), 43 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bf0de0..8f3b615 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.6)
 project (whyblocked
-         VERSION 0.10.9
+         VERSION 0.10.10
          LANGUAGES CXX
 )
 
diff --git a/src/whyblocked.ui b/src/whyblocked.ui
index caf0e00..95ffae7 100644
--- a/src/whyblocked.ui
+++ b/src/whyblocked.ui
@@ -104,6 +104,7 @@
    <addaction name="action_edit"/>
    <addaction name="action_remove"/>
    <addaction name="action_reload"/>
+   <addaction name="separator"/>
    <addaction name="action_about"/>
    <addaction name="action_quit"/>
   </widget>
@@ -137,7 +138,7 @@
   </widget>
   <action name="action_add">
    <property name="icon">
-    <iconset theme="add">
+    <iconset theme="list-add">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
@@ -147,12 +148,12 @@
     <string>Add user or instance</string>
    </property>
    <property name="shortcut">
-    <string notr="true">Ctrl+N</string>
+    <string>Ctrl+N</string>
    </property>
   </action>
   <action name="action_remove">
    <property name="icon">
-    <iconset theme="remove">
+    <iconset theme="list-remove">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
@@ -162,12 +163,12 @@
     <string>Remove user or instance</string>
    </property>
    <property name="shortcut">
-    <string notr="true">Del</string>
+    <string>Del</string>
    </property>
   </action>
   <action name="action_about">
    <property name="icon">
-    <iconset theme="info">
+    <iconset theme="help-about">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
@@ -176,13 +177,10 @@
    <property name="toolTip">
     <string>About this application</string>
    </property>
-   <property name="shortcut">
-    <string notr="true"/>
-   </property>
   </action>
   <action name="action_reload">
    <property name="icon">
-    <iconset theme="reload">
+    <iconset theme="view-refresh">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
@@ -192,12 +190,12 @@
     <string>Reload database</string>
    </property>
    <property name="shortcut">
-    <string notr="true">Ctrl+R</string>
+    <string>Ctrl+R</string>
    </property>
   </action>
   <action name="action_quit">
    <property name="icon">
-    <iconset theme="exit">
+    <iconset theme="application-exit">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
@@ -207,7 +205,7 @@
     <string>Quit application</string>
    </property>
    <property name="shortcut">
-    <string notr="true">Ctrl+Q</string>
+    <string>Ctrl+Q</string>
    </property>
   </action>
   <action name="action_edit">
diff --git a/src/whyblocked_add.ui b/src/whyblocked_add.ui
index 98bfb77..fdb9017 100644
--- a/src/whyblocked_add.ui
+++ b/src/whyblocked_add.ui
@@ -56,7 +56,7 @@
         <string>&amp;Add</string>
        </property>
        <property name="icon">
-        <iconset theme="add">
+        <iconset theme="list-add">
          <normaloff>.</normaloff>.</iconset>
        </property>
       </widget>
@@ -154,7 +154,7 @@
         <string>Re&amp;move</string>
        </property>
        <property name="icon">
-        <iconset theme="remove">
+        <iconset theme="list-remove">
          <normaloff>.</normaloff>.</iconset>
        </property>
       </widget>
diff --git a/translations/whyblocked_de.ts b/translations/whyblocked_de.ts
index 9138df7..a828b79 100644
--- a/translations/whyblocked_de.ts
+++ b/translations/whyblocked_de.ts
@@ -97,72 +97,92 @@
         <translation>Werkzeugleiste</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="121"/>
+        <location filename="../src/whyblocked.ui" line="122"/>
         <source>&amp;Database</source>
         <translation>&amp;Datenbank</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="131"/>
+        <location filename="../src/whyblocked.ui" line="132"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="144"/>
+        <location filename="../src/whyblocked.ui" line="145"/>
         <source>&amp;Add</source>
         <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="147"/>
+        <location filename="../src/whyblocked.ui" line="148"/>
         <source>Add user or instance</source>
         <translation>Benutzer oder Instanz hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="159"/>
+        <location filename="../src/whyblocked.ui" line="151"/>
+        <source>Ctrl+N</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/whyblocked.ui" line="160"/>
         <source>Re&amp;move</source>
         <translation>Ent&amp;fernen</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="162"/>
+        <location filename="../src/whyblocked.ui" line="163"/>
         <source>Remove user or instance</source>
         <translation>Benutzer oder Instanz entfernen</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="174"/>
+        <location filename="../src/whyblocked.ui" line="166"/>
+        <source>Del</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/whyblocked.ui" line="175"/>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="177"/>
+        <location filename="../src/whyblocked.ui" line="178"/>
         <source>About this application</source>
         <translation>Über dieses Programm</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="189"/>
+        <location filename="../src/whyblocked.ui" line="187"/>
         <source>&amp;Reload</source>
         <translation>Neu &amp;laden</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="192"/>
+        <location filename="../src/whyblocked.ui" line="190"/>
         <source>Reload database</source>
         <translation>Datenbank neu laden</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="204"/>
+        <location filename="../src/whyblocked.ui" line="193"/>
+        <source>Ctrl+R</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/whyblocked.ui" line="202"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="207"/>
+        <location filename="../src/whyblocked.ui" line="205"/>
         <source>Quit application</source>
         <translation>Programm beenden</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="219"/>
+        <location filename="../src/whyblocked.ui" line="208"/>
+        <source>Ctrl+Q</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../src/whyblocked.ui" line="217"/>
         <source>&amp;Edit</source>
         <translation>B&amp;earbeiten</translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="222"/>
+        <location filename="../src/whyblocked.ui" line="220"/>
         <location filename="../src/interface_qt.cpp" line="93"/>
         <source>Edit entry</source>
         <translation>Eintrag bearbeiten</translation>
diff --git a/translations/whyblocked_en.ts b/translations/whyblocked_en.ts
index ac1f76e..ebea874 100644
--- a/translations/whyblocked_en.ts
+++ b/translations/whyblocked_en.ts
@@ -97,72 +97,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="121"/>
+        <location filename="../src/whyblocked.ui" line="122"/>
         <source>&amp;Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="131"/>
+        <location filename="../src/whyblocked.ui" line="132"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="144"/>
+        <location filename="../src/whyblocked.ui" line="145"/>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="147"/>
+        <location filename="../src/whyblocked.ui" line="148"/>
         <source>Add user or instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="159"/>
+        <location filename="../src/whyblocked.ui" line="151"/>
+        <source>Ctrl+N</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/whyblocked.ui" line="160"/>
         <source>Re&amp;move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="162"/>
+        <location filename="../src/whyblocked.ui" line="163"/>
         <source>Remove user or instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="174"/>
+        <location filename="../src/whyblocked.ui" line="166"/>
+        <source>Del</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/whyblocked.ui" line="175"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="177"/>
+        <location filename="../src/whyblocked.ui" line="178"/>
         <source>About this application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="189"/>
+        <location filename="../src/whyblocked.ui" line="187"/>
         <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="192"/>
+        <location filename="../src/whyblocked.ui" line="190"/>
         <source>Reload database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="204"/>
+        <location filename="../src/whyblocked.ui" line="193"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/whyblocked.ui" line="202"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="207"/>
+        <location filename="../src/whyblocked.ui" line="205"/>
         <source>Quit application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="219"/>
+        <location filename="../src/whyblocked.ui" line="208"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/whyblocked.ui" line="217"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/whyblocked.ui" line="222"/>
+        <location filename="../src/whyblocked.ui" line="220"/>
         <location filename="../src/interface_qt.cpp" line="93"/>
         <source>Edit entry</source>
         <translation type="unfinished"></translation>