1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00

Menumerge as to TWK-213

This commit is contained in:
Hugo Lindström
2011-10-25 15:13:17 +02:00
parent 4e7672fd63
commit 16f49b58a8

View File

@@ -67,7 +67,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1000</width> <width>1000</width>
<height>22</height> <height>20</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuSettings"> <widget class="QMenu" name="menuSettings">
@@ -78,12 +78,16 @@
</widget> </widget>
<widget class="QMenu" name="menuApp"> <widget class="QMenu" name="menuApp">
<property name="title"> <property name="title">
<string>&amp;Music Player</string> <string>&amp;Tomahawk</string>
</property> </property>
<addaction name="actionPlay"/> <addaction name="actionPlay"/>
<addaction name="actionPrevious"/> <addaction name="actionPrevious"/>
<addaction name="actionNext"/> <addaction name="actionNext"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionCreatePlaylist"/>
<addaction name="actionCreate_New_Station"/>
<addaction name="actionLoadXSPF"/>
<addaction name="separator"/>
<addaction name="actionUpdateCollection"/> <addaction name="actionUpdateCollection"/>
<addaction name="actionRescanCollection"/> <addaction name="actionRescanCollection"/>
<addaction name="separator"/> <addaction name="separator"/>
@@ -112,17 +116,7 @@
<addaction name="actionDiagnostics"/> <addaction name="actionDiagnostics"/>
<addaction name="actionAboutTomahawk"/> <addaction name="actionAboutTomahawk"/>
</widget> </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="menuApp"/>
<addaction name="menuPlaylist"/>
<addaction name="menuNetwork"/> <addaction name="menuNetwork"/>
<addaction name="menuSettings"/> <addaction name="menuSettings"/>
<addaction name="menuWindow"/> <addaction name="menuWindow"/>