From 1eb9447097ed0b57e68dd43b709370ba28042003 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sun, 11 Apr 2010 15:05:30 +0000
Subject: [PATCH] Use F2 as a shortcut for editing the current track.  Fixes
 issue #194

---
 src/mainwindow.ui                 | 51 +++++++++++++++++--------------
 src/translations/cs.po            |  3 ++
 src/translations/el.po            |  3 ++
 src/translations/es.po            |  3 ++
 src/translations/fr.po            |  3 ++
 src/translations/pl.po            |  3 ++
 src/translations/ru.po            |  3 ++
 src/translations/sk.po            |  3 ++
 src/translations/translations.pot |  3 ++
 9 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 0ea20952a..0bed87ea0 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -14,7 +14,7 @@
    <string>Clementine</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../data/data.qrc">
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -298,7 +298,7 @@
        <item>
         <widget class="QToolButton" name="library_filter_clear">
          <property name="icon">
-          <iconset>
+          <iconset resource="../data/data.qrc">
            <normaloff>:/clear.png</normaloff>:/clear.png</iconset>
          </property>
          <property name="iconSize">
@@ -322,7 +322,7 @@
        <item>
         <widget class="QToolButton" name="library_options">
          <property name="icon">
-          <iconset>
+          <iconset resource="../data/data.qrc">
            <normaloff>:/configure.png</normaloff>:/configure.png</iconset>
          </property>
          <property name="iconSize">
@@ -502,7 +502,7 @@
   </widget>
   <action name="action_previous_track">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/media-skip-backward.png</normaloff>:/media-skip-backward.png</iconset>
    </property>
    <property name="text">
@@ -511,7 +511,7 @@
   </action>
   <action name="action_play_pause">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/media-playback-start.png</normaloff>:/media-playback-start.png</iconset>
    </property>
    <property name="text">
@@ -523,7 +523,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
    </property>
    <property name="text">
@@ -532,7 +532,7 @@
   </action>
   <action name="action_next_track">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/media-skip-forward.png</normaloff>:/media-skip-forward.png</iconset>
    </property>
    <property name="text">
@@ -541,7 +541,7 @@
   </action>
   <action name="action_quit">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/exit.png</normaloff>:/exit.png</iconset>
    </property>
    <property name="text">
@@ -553,7 +553,7 @@
   </action>
   <action name="action_stop_after_this_track">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
    </property>
    <property name="text">
@@ -619,7 +619,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/last.fm/love.png</normaloff>:/last.fm/love.png</iconset>
    </property>
    <property name="text">
@@ -631,7 +631,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/last.fm/ban.png</normaloff>:/last.fm/ban.png</iconset>
    </property>
    <property name="text">
@@ -640,7 +640,7 @@
   </action>
   <action name="action_clear_playlist">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/clear-list.png</normaloff>:/clear-list.png</iconset>
    </property>
    <property name="text">
@@ -652,7 +652,7 @@
   </action>
   <action name="action_edit_track">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/edit-track.png</normaloff>:/edit-track.png</iconset>
    </property>
    <property name="text">
@@ -673,10 +673,13 @@
    <property name="text">
     <string>Edit tag...</string>
    </property>
+   <property name="shortcut">
+    <string>F2</string>
+   </property>
   </action>
   <action name="action_configure">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/configure.png</normaloff>:/configure.png</iconset>
    </property>
    <property name="text">
@@ -690,7 +693,7 @@
   </action>
   <action name="action_shuffle">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/shuffle.png</normaloff>:/shuffle.png</iconset>
    </property>
    <property name="text">
@@ -699,7 +702,7 @@
   </action>
   <action name="action_add_media">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/open_media.png</normaloff>:/open_media.png</iconset>
    </property>
    <property name="text">
@@ -708,7 +711,7 @@
   </action>
   <action name="action_add_stream">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/open_stream.png</normaloff>:/open_stream.png</iconset>
    </property>
    <property name="text">
@@ -717,7 +720,7 @@
   </action>
   <action name="action_open_media">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/open_media.png</normaloff>:/open_media.png</iconset>
    </property>
    <property name="text">
@@ -726,7 +729,7 @@
   </action>
   <action name="action_cover_manager">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/download.png</normaloff>:/download.png</iconset>
    </property>
    <property name="text">
@@ -735,7 +738,7 @@
   </action>
   <action name="action_shuffle_mode">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/media-playlist-shuffle.png</normaloff>:/media-playlist-shuffle.png</iconset>
    </property>
    <property name="text">
@@ -744,7 +747,7 @@
   </action>
   <action name="action_repeat_mode">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/media-playlist-repeat.png</normaloff>:/media-playlist-repeat.png</iconset>
    </property>
    <property name="text">
@@ -753,7 +756,7 @@
   </action>
   <action name="action_remove_from_playlist">
    <property name="icon">
-    <iconset>
+    <iconset resource="../data/data.qrc">
      <normaloff>:/list-remove.png</normaloff>:/list-remove.png</iconset>
    </property>
    <property name="text">
@@ -862,6 +865,8 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../data/data.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/src/translations/cs.po b/src/translations/cs.po
index e9697357b..5cea4e7b7 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -540,6 +540,9 @@ msgstr "Nastaví hodnoty pro zvolené skladby..."
 msgid "Edit tag..."
 msgstr ""
 
+msgid "F2"
+msgstr ""
+
 msgid "Configure Clementine..."
 msgstr "Nastavit Clementine..."
 
diff --git a/src/translations/el.po b/src/translations/el.po
index 8eaa959e0..a270915e5 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -543,6 +543,9 @@ msgstr "Δώσε τιμή σε όλα τα επιλεγμένα κομμάτια
 msgid "Edit tag..."
 msgstr "Τροποποίησησ ετικέτας..."
 
+msgid "F2"
+msgstr ""
+
 msgid "Configure Clementine..."
 msgstr "Παραμετροποίηση του Clementine..."
 
diff --git a/src/translations/es.po b/src/translations/es.po
index 482e858a4..9c7579b1a 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -542,6 +542,9 @@ msgstr "Cambiar valor para todas las pistas seleccionadas..."
 msgid "Edit tag..."
 msgstr "Editar etiqueta..."
 
+msgid "F2"
+msgstr ""
+
 msgid "Configure Clementine..."
 msgstr "Configurar Clementine..."
 
diff --git a/src/translations/fr.po b/src/translations/fr.po
index bb6943433..bfd8f9d72 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -542,6 +542,9 @@ msgstr "Définir une valeur pour toutes les pistes sélectionnées..."
 msgid "Edit tag..."
 msgstr "Modifier la tag..."
 
+msgid "F2"
+msgstr ""
+
 msgid "Configure Clementine..."
 msgstr "Configurer Clementine..."
 
diff --git a/src/translations/pl.po b/src/translations/pl.po
index 6e91138e9..c189c6319 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -538,6 +538,9 @@ msgstr "Ustaw wartość dla wszystkich zaznaczonych utworów..."
 msgid "Edit tag..."
 msgstr "Edytuj znacznik..."
 
+msgid "F2"
+msgstr ""
+
 msgid "Configure Clementine..."
 msgstr "Konfiguruj Clementine..."
 
diff --git a/src/translations/ru.po b/src/translations/ru.po
index f5d85930b..3863d5190 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -538,6 +538,9 @@ msgstr ""
 msgid "Edit tag..."
 msgstr ""
 
+msgid "F2"
+msgstr ""
+
 msgid "Configure Clementine..."
 msgstr "Настроить Clementine..."
 
diff --git a/src/translations/sk.po b/src/translations/sk.po
index 23661f294..d30422e49 100644
--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@@ -541,6 +541,9 @@ msgstr "Nastaviť hodnotu pre vybraté skladby..."
 msgid "Edit tag..."
 msgstr "Upraviť tag..."
 
+msgid "F2"
+msgstr ""
+
 msgid "Configure Clementine..."
 msgstr "Nastaviť Clementine..."
 
diff --git a/src/translations/translations.pot b/src/translations/translations.pot
index 09f4ef7a8..8ebce4af5 100644
--- a/src/translations/translations.pot
+++ b/src/translations/translations.pot
@@ -534,6 +534,9 @@ msgstr ""
 msgid "Edit tag..."
 msgstr ""
 
+msgid "F2"
+msgstr ""
+
 msgid "Configure Clementine..."
 msgstr ""