From 90ec4a788664307f420a93d051eaad9c112d0040 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Wed, 15 May 2013 10:21:23 -0400
Subject: [PATCH] bug 199605: have line wrap option on the build console

---
 .../icons/elcl16/wrap_lines.png               | Bin 0 -> 876 bytes
 .../internal/ui/CPluginResources.properties   |   1 +
 .../ui/buildconsole/BuildConsolePage.java     |   7 ++-
 .../ui/buildconsole/BuildConsoleViewer.java   |   1 -
 .../ui/buildconsole/ConsoleMessages.java      |   1 +
 .../buildconsole/ConsoleMessages.properties   |   1 +
 .../ui/buildconsole/WrapLinesAction.java      |  57 ++++++++++++++++++
 .../BuildConsolePreferencePage.java           |  18 ++++--
 .../org/eclipse/cdt/ui/CDTSharedImages.java   |   4 +-
 9 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100644 core/org.eclipse.cdt.ui/icons/elcl16/wrap_lines.png
 create mode 100644 core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/WrapLinesAction.java

diff --git a/core/org.eclipse.cdt.ui/icons/elcl16/wrap_lines.png b/core/org.eclipse.cdt.ui/icons/elcl16/wrap_lines.png
new file mode 100644
index 0000000000000000000000000000000000000000..1576a42f59a6352aec743680f056aa37933aac74
GIT binary patch
literal 876
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR?vxSX$<tS+niToMmT#
zQlnrr1V&T{gg$=!3g}_Rk|4ie28U-i(tsQ(PZ!6KiaE&%3fu;ajK%^6Mn;bU9jlF3
Z@G)pbFxWqF5{m<ck*BMl%Q~loCID_d9%%po

literal 0
HcmV?d00001

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
index 22f82c51b4f..c6ecfc88cd9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
@@ -20,6 +20,7 @@ CView.make_edit_action =Project properties
 ConsolePreferencePage.clearConsole.label=Always clear console before building
 ConsolePreferencePage.autoOpenConsole.label=Open console when building
 ConsolePreferencePage.consoleOnTop.label=Bring console to top when building (if present)
+ConsolePreferencePage.consoleWrapLines.label=Wrap lines on the console
 ConsolePreferencePage.consoleLines.label=Limit console output (number of lines):
 ConsolePreferencePage.consoleLines.errorMessage=Value must be an integer between 10 and 2147483647
 ConsolePreferencePage.tabWidth.label=Display tab width:
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
index 490fa57fd43..78cfac64230 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2011 QNX Software Systems and others.
+ * Copyright (c) 2002, 2013 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -133,6 +133,7 @@ public class BuildConsolePage extends Page
 	private NextErrorAction fNextErrorAction;
 	private PreviousErrorAction fPreviousErrorAction;
 	private ShowErrorAction fShowErrorAction;
+	private WrapLinesAction fWrapAction;
 
 	/**
 	 * @param view
@@ -296,6 +297,8 @@ public class BuildConsolePage extends Page
 			setTabs(CUIPlugin.getDefault().getPreferenceStore().getInt(BuildConsolePreferencePage.PREF_BUILDCONSOLE_TAB_WIDTH));
 		} else if (IConsoleConstants.P_BACKGROUND_COLOR.equals(property)) {
 			fViewer.getTextWidget().setBackground(fConsole.getBackground());
+		} else if (property.equals(BuildConsolePreferencePage.PREF_BUILDCONSOLE_WRAP_LINES)) {
+			fWrapAction.setChecked(BuildConsolePreferencePage.isConsoleWrapLines());
 		}
 	}
 
@@ -303,6 +306,7 @@ public class BuildConsolePage extends Page
 		fClearOutputAction = new ClearOutputAction(getViewer());
 		fScrollLockAction = new ScrollLockAction(getViewer());
 		fScrollLockAction.setChecked(fIsLocked);
+		fWrapAction = new WrapLinesAction(getViewer());
 		fNextErrorAction = new NextErrorAction(this);
 		fPreviousErrorAction = new PreviousErrorAction(this);
 		fShowErrorAction = new ShowErrorAction(this);
@@ -363,6 +367,7 @@ public class BuildConsolePage extends Page
 		mgr.appendToGroup(BuildConsole.ERROR_GROUP, fShowErrorAction);
 		mgr.appendToGroup(IConsoleConstants.OUTPUT_GROUP, fSaveLogAction);
 		mgr.appendToGroup(IConsoleConstants.OUTPUT_GROUP, fScrollLockAction);
+		mgr.appendToGroup(IConsoleConstants.OUTPUT_GROUP, fWrapAction);
 		mgr.appendToGroup(IConsoleConstants.OUTPUT_GROUP, fClearOutputAction);
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java
index 12bfade1c25..cd65f2e77e2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java
@@ -92,7 +92,6 @@ public class BuildConsoleViewer extends TextViewer
 			styledText.setFont(parent.getFont());
 			styledText.setDoubleClickEnabled(true);
 			styledText.setEditable(false);
-			styledText.setWordWrap(true);
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java
index a30e5a559c7..0c56ecdc196 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java
@@ -45,6 +45,7 @@ public final class ConsoleMessages extends NLS {
 	public static String CopyLog_LogFileIsNotAvailable;
 	public static String CopyLog_UnableToAccess;
 	public static String CopyLog_UnavailableLog;
+	public static String WrapLinesAction_WrapLines;
 
 	static {
 		NLS.initializeMessages(BUNDLE_NAME, ConsoleMessages.class);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties
index cc5b5321978..9c8ae730065 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties
@@ -38,3 +38,4 @@ ScrollLockAction_Scroll_Lock_1=Scroll Lock
 NextErrorAction_Tooltip=Next Error
 PreviousErrorAction_Tooltip=Previous Error 
 ShowErrorAction_Tooltip=Show Error In Editor
+WrapLinesAction_WrapLines=Wrap Lines
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/WrapLinesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/WrapLinesAction.java
new file mode 100644
index 00000000000..f51928f0c18
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/WrapLinesAction.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2013, 2013 Andrew Gvozdev and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Andrew Gvozdev - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.ui.buildconsole;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.custom.StyledText;
+
+import org.eclipse.cdt.ui.CDTSharedImages;
+
+import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage;
+
+/**
+ * Toggles word wrapping of the console
+ */
+public class WrapLinesAction extends Action {
+	private BuildConsoleViewer fConsoleViewer;
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param viewer - console viewer.
+	 */
+	public WrapLinesAction(BuildConsoleViewer viewer) {
+		super(ConsoleMessages.WrapLinesAction_WrapLines); 
+		fConsoleViewer = viewer;
+		setChecked(BuildConsolePreferencePage.isConsoleWrapLines());
+
+		setToolTipText(ConsoleMessages.WrapLinesAction_WrapLines);
+		setImageDescriptor(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_WRAP_LINE)); 
+	}
+
+	private void setWordWrap(boolean wrap) {
+		StyledText styledText = fConsoleViewer.getTextWidget();
+		if (styledText != null) {
+			styledText.setWordWrap(wrap);
+		}
+	}
+
+	@Override
+	public void run() {
+		setWordWrap(isChecked());
+	}
+
+	@Override
+	public void setChecked(boolean checked) {
+		super.setChecked(checked);
+		setWordWrap(checked);
+	}
+}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java
index 55874adc974..1e3cce9e978 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.preferences;
 
-import org.eclipse.cdt.ui.CUIPlugin;
-
-import org.eclipse.cdt.internal.ui.ICHelpContextIds;
-
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.ColorFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
@@ -30,11 +26,16 @@ import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.PlatformUI;
 
+import org.eclipse.cdt.ui.CUIPlugin;
+
+import org.eclipse.cdt.internal.ui.ICHelpContextIds;
+
 public class BuildConsolePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
 	private static final String PREF_CLEAR_CONSOLE = "clearConsole"; //$NON-NLS-1$
 	private static final String PREF_CONSOLE_ON_TOP = "consoleOnTop"; //$NON-NLS-1$
 	private static final String PREF_AUTO_OPEN_CONSOLE = "autoOpenConsole"; //$NON-NLS-1$
+	public static final String PREF_BUILDCONSOLE_WRAP_LINES = "buildConsoleWrapLines"; //$NON-NLS-1$
 
 	// In font registry
 	public static final String PREF_BUILDCONSOLE_FONT = "org.eclipse.cdt.ui.buildconsole.ConsoleFont"; //$NON-NLS-1$
@@ -74,6 +75,9 @@ public class BuildConsolePreferencePage extends FieldEditorPreferencePage implem
 		BooleanFieldEditor consoleOnTop = new BooleanFieldEditor(PREF_CONSOLE_ON_TOP,
 				CUIPlugin.getResourceString("ConsolePreferencePage.consoleOnTop.label"), parent); //$NON-NLS-1$
 		addField(consoleOnTop);
+		BooleanFieldEditor consoleWrapLines = new BooleanFieldEditor(PREF_BUILDCONSOLE_WRAP_LINES,
+				CUIPlugin.getResourceString("ConsolePreferencePage.consoleWrapLines.label"), parent); //$NON-NLS-1$
+		addField(consoleWrapLines);
 
 		IntegerFieldEditor buildCount = new IntegerFieldEditor(PREF_BUILDCONSOLE_LINES,
 				CUIPlugin.getResourceString("ConsolePreferencePage.consoleLines.label"), parent); //$NON-NLS-1$
@@ -133,6 +137,7 @@ public class BuildConsolePreferencePage extends FieldEditorPreferencePage implem
 	public static boolean isClearBuildConsole() {
 		return CUIPlugin.getDefault().getPreferenceStore().getBoolean(PREF_CLEAR_CONSOLE);
 	}
+
 	public static boolean isAutoOpenConsole() {
 		return CUIPlugin.getDefault().getPreferenceStore().getBoolean(PREF_AUTO_OPEN_CONSOLE);
 	}
@@ -141,6 +146,10 @@ public class BuildConsolePreferencePage extends FieldEditorPreferencePage implem
 		return CUIPlugin.getDefault().getPreferenceStore().getBoolean(PREF_CONSOLE_ON_TOP);
 	}
 
+	public static boolean isConsoleWrapLines() {
+		return CUIPlugin.getDefault().getPreferenceStore().getBoolean(PREF_BUILDCONSOLE_WRAP_LINES);
+	}
+
 	public static int buildConsoleLines() {
 		return CUIPlugin.getDefault().getPreferenceStore().getInt(PREF_BUILDCONSOLE_LINES);
 	}
@@ -153,6 +162,7 @@ public class BuildConsolePreferencePage extends FieldEditorPreferencePage implem
 		prefs.setDefault(PREF_CLEAR_CONSOLE, true);
 		prefs.setDefault(PREF_AUTO_OPEN_CONSOLE, true);
 		prefs.setDefault(PREF_CONSOLE_ON_TOP, false);
+		prefs.setDefault(PREF_BUILDCONSOLE_WRAP_LINES, true);
 		prefs.setDefault(PREF_BUILDCONSOLE_LINES, 500);
 		prefs.setDefault(PREF_BUILDCONSOLE_TAB_WIDTH, 4);
 		PreferenceConverter.setDefault(prefs, PREF_BUILDCONSOLE_OUTPUT_COLOR, new RGB(0, 0, 0));
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java
index e812341ba42..9f3e0f90ed2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Andrew Gvozdev and others.
+ * Copyright (c) 2010, 2013 Andrew Gvozdev and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -128,6 +128,8 @@ public class CDTSharedImages {
 	public static final String IMG_OBJS_INCCONT = "icons/obj16/incc_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_EXTENSION = "icons/obj16/extension_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_USER = "icons/obj16/person-me.gif"; //$NON-NLS-1$
+	/** @since 5.6 */
+	public static final String IMG_OBJS_WRAP_LINE = "icons/elcl16/wrap_lines.png"; //$NON-NLS-1$
 	public static final String IMG_OBJS_CDT_TESTING = "icons/obj16/flask.png"; //$NON-NLS-1$
 
 	public static final String IMG_OBJS_NLS_NEVER_TRANSLATE = "icons/obj16/never_translate.gif"; //$NON-NLS-1$