Fix HTML escaping for custom OSD notifications

Fixes #618

src/settings/contextsettingspage.cpp

@@ -75,21 +75,23 @@ ContextSettingsPage::ContextSettingsPage(SettingsDialog* dialog) : SettingsPage(
 
   // Create and populate the helper menus
   QMenu *menu = new QMenu(this);
-  menu->addAction(ui_->action_albumartist);
-  menu->addAction(ui_->action_artist);
-  menu->addAction(ui_->action_album);
   menu->addAction(ui_->action_title);
+  menu->addAction(ui_->action_album);
+  menu->addAction(ui_->action_artist);
+  menu->addAction(ui_->action_albumartist);
+  menu->addAction(ui_->action_track);
+  menu->addAction(ui_->action_disc);
   menu->addAction(ui_->action_year);
+  menu->addAction(ui_->action_originalyear);
   menu->addAction(ui_->action_composer);
   menu->addAction(ui_->action_performer);
   menu->addAction(ui_->action_grouping);
+  menu->addAction(ui_->action_filename);
+  menu->addAction(ui_->action_url);
   menu->addAction(ui_->action_length);
-  menu->addAction(ui_->action_disc);
-  menu->addAction(ui_->action_track);
   menu->addAction(ui_->action_genre);
   menu->addAction(ui_->action_playcount);
   menu->addAction(ui_->action_skipcount);
-  menu->addAction(ui_->action_filename);
   menu->addSeparator();
   menu->addAction(ui_->action_newline);
   ui_->context_exp_chooser1->setMenu(menu);

src/settings/contextsettingspage.ui

@@ -473,6 +473,30 @@
     <string>Add song filename</string>
    </property>
   </action>
+  <action name="action_url">
+   <property name="text">
+    <string>%url%</string>
+   </property>
+   <property name="toolTip">
+    <string>Add song URL</string>
+   </property>
+  </action>
+  <action name="action_rating">
+   <property name="text">
+    <string>%rating%</string>
+   </property>
+   <property name="toolTip">
+    <string>Add song rating</string>
+   </property>
+  </action>
+  <action name="action_originalyear">
+   <property name="text">
+    <string>%originalyear%</string>
+   </property>
+   <property name="toolTip">
+    <string>Add song original year tag</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

src/settings/notificationssettingspage.cpp

@@ -56,7 +56,7 @@
 class QHideEvent;
 class QShowEvent;
 
-NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
+NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog *dialog)
     : SettingsPage(dialog), ui_(new Ui_NotificationsSettingsPage), pretty_popup_(new OSDPretty(OSDPretty::Mode_Draggable)) {
 
   ui_->setupUi(this);
@@ -69,23 +69,24 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
 
   // Create and populate the helper menus
   QMenu *menu = new QMenu(this);
-  menu->addAction(ui_->action_artist);
-  menu->addAction(ui_->action_album);
   menu->addAction(ui_->action_title);
+  menu->addAction(ui_->action_album);
+  menu->addAction(ui_->action_artist);
   menu->addAction(ui_->action_albumartist);
+  menu->addAction(ui_->action_disc);
+  menu->addAction(ui_->action_track);
   menu->addAction(ui_->action_year);
+  menu->addAction(ui_->action_originalyear);
+  menu->addAction(ui_->action_genre);
   menu->addAction(ui_->action_composer);
   menu->addAction(ui_->action_performer);
   menu->addAction(ui_->action_grouping);
   menu->addAction(ui_->action_length);
-  menu->addAction(ui_->action_disc);
-  menu->addAction(ui_->action_track);
-  menu->addAction(ui_->action_genre);
+  menu->addAction(ui_->action_filename);
+  menu->addAction(ui_->action_url);
   menu->addAction(ui_->action_playcount);
   menu->addAction(ui_->action_skipcount);
-  menu->addAction(ui_->action_filename);
   menu->addAction(ui_->action_rating);
-  menu->addAction(ui_->action_score);
   menu->addSeparator();
   menu->addAction(ui_->action_newline);
   ui_->notifications_exp_chooser1->setMenu(menu);

src/settings/notificationssettingspage.ui

@@ -482,14 +482,6 @@
     <string>Add song rating</string>
    </property>
   </action>
-  <action name="action_score">
-   <property name="text">
-    <string notr="true">%score%</string>
-   </property>
-   <property name="toolTip">
-    <string>Add song auto score</string>
-   </property>
-  </action>
   <action name="action_newline">
    <property name="text">
     <string notr="true">%newline%</string>
@@ -506,6 +498,22 @@
     <string>Add song filename</string>
    </property>
   </action>
+  <action name="action_url">
+   <property name="text">
+    <string>%url%</string>
+   </property>
+   <property name="toolTip">
+    <string>Add song URL</string>
+   </property>
+  </action>
+  <action name="action_originalyear">
+   <property name="text">
+    <string>%originalyear%</string>
+   </property>
+   <property name="toolTip">
+    <string>Add song original year tag</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>notifications_none</tabstop>