From 1842cd77938ea2086aba61887a6416097834c911 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Tue, 10 Mar 2015 12:50:43 +0100
Subject: DiffEditor: Fix sync toggle

Use more QActions in the ToolBar. Those seem to work better
than the bare widgets.

Move "ignore WS" after the Context Lines spinbox so that we
can make the editor smaller while keeping the pop-up menu working.

Change-Id: I00d707c6ee1fb8d90fef5aa5ec5abb7149d4e6a0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
---
 src/plugins/diffeditor/diffeditor.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/plugins/diffeditor/diffeditor.h')

diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 78134cc24c..3be67972e4 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -38,6 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
+class QLabel;
 class QSpinBox;
 class QToolBar;
 class QToolButton;
@@ -76,7 +77,7 @@ private slots:
     void toggleDescription();
     void updateDescription();
     void contextLineCountHasChanged(int lines);
-    void ignoreWhitespaceHasChanged(bool ignore);
+    void ignoreWhitespaceHasChanged();
     void prepareForReload();
     void reloadHasFinished(bool success);
     void setCurrentDiffFileIndex(int index);
@@ -102,21 +103,19 @@ private:
     QVector<IDiffView *> m_views;
     QToolBar *m_toolBar;
     QComboBox *m_entriesComboBox;
-    QToolButton *m_whitespaceButton;
     QSpinBox *m_contextSpinBox;
     QAction *m_toggleSyncAction;
     QAction *m_whitespaceButtonAction;
-    QAction *m_contextLabelAction;
-    QAction *m_contextSpinBoxAction;
     QAction *m_toggleDescriptionAction;
     QAction *m_reloadAction;
-    QToolButton *m_diffEditorSwitcher;
+    QLabel *m_contextLabel;
+    QAction *m_viewSwitcherAction;
     QPair<QString, QString> m_currentFileChunk;
     int m_currentViewIndex;
     int m_currentDiffFileIndex;
+    int m_ignoreChanges;
     bool m_sync;
     bool m_showDescription;
-    bool m_ignoreChanges;
 };
 
 } // namespace Internal
-- 
cgit v1.2.1