From 0c5536bf78a6eed4b7453ec600546cd05d285818 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sat, 7 May 2011 10:13:19 -0400
Subject: [PATCH] Only show separator on non-osx since it makes the otherwise
 empty Help menu show up

---
 src/tomahawkwindow.cpp | 4 ++++
 src/tomahawkwindow.ui  | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index 47e5b8394..d3bd49c28 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -150,6 +150,10 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
     toolbar->setToolButtonStyle( Qt::ToolButtonFollowStyle );
     toolbar->installEventFilter( new WidgetDragFilter( toolbar ) );
 
+#ifndef Q_WS_MAC
+    ui->menuHelp->insertSeparator( 1 );
+#endif
+
 #if defined( Q_OS_DARWIN ) && defined( HAVE_SPARKLE )
     QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates...") );
     checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole );
diff --git a/src/tomahawkwindow.ui b/src/tomahawkwindow.ui
index ece2c6407..092aea983 100644
--- a/src/tomahawkwindow.ui
+++ b/src/tomahawkwindow.ui
@@ -35,7 +35,7 @@
      <x>0</x>
      <y>0</y>
      <width>1000</width>
-     <height>20</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSettings">
@@ -84,7 +84,6 @@
      <string>&amp;Help</string>
     </property>
     <addaction name="actionDiagnostics"/>
-    <addaction name="separator"/>
     <addaction name="actionAboutTomahawk"/>
    </widget>
    <addaction name="menuApp"/>
@@ -187,6 +186,9 @@
    <property name="text">
     <string>Diagnostics...</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>