From 16f49b58a8f59e882bcf22717b6b3e4fcd5ee818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Lindstr=C3=B6m?= <hugolm84@gmail.com>
Date: Tue, 25 Oct 2011 15:13:17 +0200
Subject: [PATCH] Menumerge as to TWK-213

---
 src/tomahawkwindow.ui | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/tomahawkwindow.ui b/src/tomahawkwindow.ui
index 57f53bbbc..97fdca390 100644
--- a/src/tomahawkwindow.ui
+++ b/src/tomahawkwindow.ui
@@ -67,7 +67,7 @@
      <x>0</x>
      <y>0</y>
      <width>1000</width>
-     <height>22</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSettings">
@@ -78,12 +78,16 @@
    </widget>
    <widget class="QMenu" name="menuApp">
     <property name="title">
-     <string>&amp;Music Player</string>
+     <string>&amp;Tomahawk</string>
     </property>
     <addaction name="actionPlay"/>
     <addaction name="actionPrevious"/>
     <addaction name="actionNext"/>
     <addaction name="separator"/>
+    <addaction name="actionCreatePlaylist"/>
+    <addaction name="actionCreate_New_Station"/>
+    <addaction name="actionLoadXSPF"/>
+    <addaction name="separator"/>
     <addaction name="actionUpdateCollection"/>
     <addaction name="actionRescanCollection"/>
     <addaction name="separator"/>
@@ -112,17 +116,7 @@
     <addaction name="actionDiagnostics"/>
     <addaction name="actionAboutTomahawk"/>
    </widget>
-   <widget class="QMenu" name="menuPlaylist">
-    <property name="title">
-     <string>&amp;Playlist</string>
-    </property>
-    <addaction name="actionCreatePlaylist"/>
-    <addaction name="actionCreate_New_Station"/>
-    <addaction name="separator"/>
-    <addaction name="actionLoadXSPF"/>
-   </widget>
    <addaction name="menuApp"/>
-   <addaction name="menuPlaylist"/>
    <addaction name="menuNetwork"/>
    <addaction name="menuSettings"/>
    <addaction name="menuWindow"/>