From 02314e24f09c1b405919cd80d3747f2850223244 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@digia.com>
Date: Thu, 9 Jan 2014 14:44:25 +0100
Subject: Editor: add margin displaying to project settings.

This patch also moves the showMargin and marginColumn settings into a
new settings class.

Change-Id: I676447be751c13ee438edc1e31e5998b999c6771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/texteditor/displaysettingspage.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/plugins/texteditor/displaysettingspage.h')

diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h
index 6bbf516587..fbe742ce3a 100644
--- a/src/plugins/texteditor/displaysettingspage.h
+++ b/src/plugins/texteditor/displaysettingspage.h
@@ -37,6 +37,7 @@
 namespace TextEditor {
 
 class DisplaySettings;
+class MarginSettings;
 
 class DisplaySettingsPageParameters
 {
@@ -60,14 +61,16 @@ public:
     void finish();
 
     const DisplaySettings &displaySettings() const;
+    const MarginSettings &marginSettings() const;
 
 signals:
     void displaySettingsChanged(const TextEditor::DisplaySettings &);
+    void marginSettingsChanged(const TextEditor::MarginSettings &);
 
 private:
-    void settingsFromUI(DisplaySettings &displaySettings) const;
+    void settingsFromUI(DisplaySettings &displaySettings, MarginSettings &marginSettings) const;
     void settingsToUI();
-    void setDisplaySettings(const DisplaySettings &);
+    void setDisplaySettings(const DisplaySettings &, const MarginSettings &newMarginSettings);
 
     struct DisplaySettingsPagePrivate;
     DisplaySettingsPagePrivate *d;
-- 
cgit v1.2.3