# HG changeset patch
# User Chris Cannam
# Date 1329240454 0
# Node ID a220f99f11346686122e5ca1d3644b51004347b2
# Parent  7829da6abe975f9c959dc901863c872e158d13fd
Remove Refresh button from toolbar, adjust spacing

diff -r 7829da6abe97 -r a220f99f1134 src/mainwindow.cpp
--- a/src/mainwindow.cpp	Tue Feb 14 16:48:01 2012 +0000
+++ b/src/mainwindow.cpp	Tue Feb 14 17:27:34 2012 +0000
@@ -3006,22 +3006,19 @@
 {
     int sz = 32;
 
-    m_fileToolBar = addToolBar(tr("File"));
-    m_fileToolBar->setIconSize(QSize(sz, sz));
-    m_fileToolBar->addAction(m_openAct);
-    m_fileToolBar->addAction(m_hgRefreshAct);
-    m_fileToolBar->setMovable(false);
-
-    m_repoToolBar = addToolBar(tr("Remote"));
-    m_repoToolBar->setIconSize(QSize(sz, sz));
-    m_repoToolBar->addAction(m_hgIncomingAct);
-    m_repoToolBar->addAction(m_hgPullAct);
-    m_repoToolBar->addAction(m_hgPushAct);
-    m_repoToolBar->setMovable(false);
+    bool spacingReqd = false;
+#ifndef Q_OS_MAC
+    spacingReqd = true;
+#endif
 
     m_workFolderToolBar = addToolBar(tr("Work"));
     addToolBar(Qt::LeftToolBarArea, m_workFolderToolBar);
     m_workFolderToolBar->setIconSize(QSize(sz, sz));
+    if (spacingReqd) {
+        QWidget *w = new QWidget;
+        w->setFixedHeight(6);
+        m_workFolderToolBar->addWidget(w);
+    }
     m_workFolderToolBar->addAction(m_hgFolderDiffAct);
     m_workFolderToolBar->addSeparator();
     m_workFolderToolBar->addAction(m_hgRevertAct);
@@ -3033,6 +3030,17 @@
     m_workFolderToolBar->addAction(m_hgRemoveAct);
     m_workFolderToolBar->setMovable(false);
 
+    m_repoToolBar = addToolBar(tr("Remote"));
+    m_repoToolBar->setIconSize(QSize(sz, sz));
+    if (spacingReqd) m_repoToolBar->addWidget(new QLabel(" "));
+    m_repoToolBar->addAction(m_openAct);
+    if (spacingReqd) m_repoToolBar->addWidget(new QLabel(" "));
+    m_repoToolBar->addSeparator();
+    m_repoToolBar->addAction(m_hgIncomingAct);
+    m_repoToolBar->addAction(m_hgPullAct);
+    m_repoToolBar->addAction(m_hgPushAct);
+    m_repoToolBar->setMovable(false);
+
     updateToolBarStyle();
 }
 
diff -r 7829da6abe97 -r a220f99f1134 src/mainwindow.h
--- a/src/mainwindow.h	Tue Feb 14 16:48:01 2012 +0000
+++ b/src/mainwindow.h	Tue Feb 14 17:27:34 2012 +0000
@@ -237,7 +237,6 @@
     QAction *m_aboutAct;
     QAction *m_helpAct;
 
-    QToolBar *m_fileToolBar;
     QToolBar *m_repoToolBar;
     QToolBar *m_workFolderToolBar;