# HG changeset patch
# User wpaul
# Date 1244134219 18000
# Node ID c14cf2c1fe78399ce2a926ffeb166e75214a6b83
# Parent  e2002a613358e45786077e0f44513abd65b904d8# Parent  bd0210e4c71e833dc57d4cb24101982eaec43318
merged

diff -r e2002a613358 -r c14cf2c1fe78 core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Jun 03 16:48:10 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Thu Jun 04 11:50:19 2009 -0500
@@ -189,7 +189,7 @@
 			<topic label="New Launch Configuration Wizard"	href="html/projects/launch/wiz_new_launch_config.htm" />
 			<topic label="Debug dialog"						href="html/projects/launch/wnd_debug_configuration.htm" />
 
-		    <topic label="Launch configurations"			href="html/concepts/launch_configuration.htm" >
+		    <topic label="Launch types"			href="html/concepts/launch_configuration.htm" >
 				<topic label="Applications"					href="html/projects/launch/applications.htm" />
 				<topic label="Application TRK"				href="html/projects/launch/run_mode.htm" />
 				<topic label="Attach to Process"			href="html/projects/launch/attach_process.htm" />
diff -r e2002a613358 -r c14cf2c1fe78 core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/LoggingPreferencesPage.java
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/LoggingPreferencesPage.java	Wed Jun 03 16:48:10 2009 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/logging/LoggingPreferencesPage.java	Thu Jun 04 11:50:19 2009 -0500
@@ -18,11 +18,14 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -58,6 +61,8 @@
 
 public class LoggingPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage {
 
+	public static final String REFRESH_LOG_ITEM = "Refresh Log";
+
 	class TreeContentProvider implements IStructuredContentProvider, ITreeContentProvider {
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
@@ -66,7 +71,10 @@
 		}
 
 		public Object[] getElements(Object inputElement) {
-			return DiagnosticLogManager.getDiagnosticLogManager().getLogGroups();
+			Collection<Object> elements = new ArrayList<Object>();
+			elements.addAll(Arrays.asList(DiagnosticLogManager.getDiagnosticLogManager().getLogGroups()));
+			elements.add(REFRESH_LOG_ITEM);
+			return elements.toArray();
 		}
 
 		public Object[] getChildren(Object parentElement) {
@@ -198,6 +206,10 @@
 				DiagnosticLog log = (DiagnosticLog) element;
 				enableLog(log, event.getChecked());
 			}
+			else if (element.equals(REFRESH_LOG_ITEM)) {
+				String prefId = ResourcesPlugin.PI_RESOURCES + ".refresh.log";
+				ResourcesPlugin.getPlugin().getPluginPreferences().setValue(prefId, event.getChecked());
+			}
 		updateGroupsCheckedState();
 	}
 
@@ -228,6 +240,12 @@
 					logPath.setText(log.getFile().getCanonicalPath());
 				} catch (IOException e) { e.printStackTrace(); }
 			}					
+			else if (firstElement.equals(REFRESH_LOG_ITEM)) {
+				IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation().append("refresh.log");
+				try {
+					logPath.setText(path.toFile().getCanonicalPath());
+				} catch (IOException e) {e.printStackTrace(); }
+			}
 		}
 		
 	}
@@ -251,7 +269,15 @@
 								IDE.openEditorOnFileStore(activePage, fileStore);
 							} catch (PartInitException e) { e.printStackTrace(); }							
 							}
-					}										
+					}
+					else if (object.equals(REFRESH_LOG_ITEM)) {
+						IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation().append("refresh.log");
+						File f = path.toFile();
+						IFileStore fileStore= EFS.getLocalFileSystem().getStore(Path.fromOSString(f.getAbsolutePath()));
+						try {
+							IDE.openEditorOnFileStore(activePage, fileStore);
+						} catch (PartInitException e) { e.printStackTrace(); }							
+					}
 				}
 				
 			}					
@@ -272,7 +298,9 @@
 			checkboxTreeViewer.setChecked(logGroup, allChecked);
 			checkboxTreeViewer.setGrayed(logGroup, anyChecked && !allChecked);
 		}
-		
+		String prefId = ResourcesPlugin.PI_RESOURCES + ".refresh.log";
+		boolean prefState = ResourcesPlugin.getPlugin().getPluginPreferences().getBoolean(prefId);
+		checkboxTreeViewer.setChecked(REFRESH_LOG_ITEM, prefState);
 	}
 
 	protected void mailLogs() {