Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] 'Auto-Refresh by default' and 'Show ASCII by default' preferences.

Added the 'Auto-Refresh by default' and 'Show ASCII by default' preferences to the 'Memory Views' preference page.

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/ChangeLog,v
retrieving revision 1.29
diff -u -r1.29 ChangeLog
--- ChangeLog 11 Nov 2002 20:16:03 -0000 1.29
+++ ChangeLog 13 Nov 2002 18:48:38 -0000
@@ -1,3 +1,11 @@
+2002-11-13 Mikhail Khodjaiants
+ Added the 'Auto-Refresh by default' and 'Show ASCII by default' preferences
+ to the 'Memory Views' preference page.
+ * ICDebugPreferenceConstants.java
+ * MemoryViewPreferencePage.java
+ * MemoryControlArea.java
+ * MemoryView.java
+
 2002-11-11 Mikhail Khodjaiants
  Fix for PR 25988: The 'Padding Character' preference of the Memory view doesn't work.
  * MemoryControlArea.java
Index: src/org/eclipse/cdt/debug/internal/ui/preferences/ICDebugPreferenceConstants.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/ICDebugPreferenceConstants.java,v
retrieving revision 1.4
diff -u -r1.4 ICDebugPreferenceConstants.java
--- src/org/eclipse/cdt/debug/internal/ui/preferences/ICDebugPreferenceConstants.java 4 Oct 2002 18:09:02 -0000 1.4
+++ src/org/eclipse/cdt/debug/internal/ui/preferences/ICDebugPreferenceConstants.java 13 Nov 2002 18:48:38 -0000
@@ -27,6 +27,13 @@
 public interface ICDebugPreferenceConstants
 {
  /**
+  * Boolean preference controlling whether the debugger shows
+  * full paths. When <code>true</code> the debugger
+  * will show full paths in newly opened views.
+  */
+ public static final String PREF_SHOW_FULL_PATHS = ICDebugUIConstants.PLUGIN_ID + "cDebug.show_full_paths";
+
+ /**
   * The RGB for the color to be used to indicate changed registers
   */
  public static final String CHANGED_REGISTER_RGB = "Changed.Register.RGB"; file://$NON-NLS-1$
@@ -47,7 +54,6 @@
  public static final String PREF_MEMORY_SIZE = "Memory.Size";
  public static final String PREF_MEMORY_FORMAT = "Memory.Format";
  public static final String PREF_MEMORY_BYTES_PER_ROW = "Memory.BytesPerRow";
- public static final String PREF_MEMORY_DISPLAY_ASCII = "Memory.DisplayASCII";
  public static final String PREF_MEMORY_PADDING_CHAR = "Memory.PaddingChar";
 
  /**
@@ -93,9 +99,15 @@
  public static final String PREF_SHOW_CHAR_VALUES = ICDebugUIConstants.PLUGIN_ID + "cDebug.showCharValues"; file://$NON-NLS-1$
 
  /**
-  * Boolean preference controlling whether the debugger shows
-  * full paths. When <code>true</code> the debugger
-  * will show full paths in newly opened views.
+  * Boolean preference controlling whether the memory view shows ASCII characters.
+  * When <code>true</code> the memory view will show ASCII characters by default.
+  */
+ public static final String PREF_MEMORY_SHOW_ASCII = ICDebugUIConstants.PLUGIN_ID + "Memory.show_ascii"; file://$NON-NLS-1$
+
+ /**
+  * Boolean preference controlling whether the memory view will be refreshed
+  * every time when the execution of program stops.
+  * When <code>true</code> the 'Auto-Refresh' option will be checked.
   */
- public static final String PREF_SHOW_FULL_PATHS = ICDebugUIConstants.PLUGIN_ID + "cDebug.show_full_paths"; file://$NON-NLS-1$
+ public static final String PREF_MEMORY_AUTO_REFRESH = ICDebugUIConstants.PLUGIN_ID + "Memory.auto_refresh"; file://$NON-NLS-1$
 }
Index: src/org/eclipse/cdt/debug/internal/ui/preferences/MemoryViewPreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/MemoryViewPreferencePage.java,v
retrieving revision 1.5
diff -u -r1.5 MemoryViewPreferencePage.java
--- src/org/eclipse/cdt/debug/internal/ui/preferences/MemoryViewPreferencePage.java 11 Nov 2002 20:16:03 -0000 1.5
+++ src/org/eclipse/cdt/debug/internal/ui/preferences/MemoryViewPreferencePage.java 13 Nov 2002 18:48:38 -0000
@@ -7,6 +7,7 @@
 
 import org.eclipse.cdt.debug.internal.ui.ICDebugHelpContextIds;
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
+import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.ColorFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.FontFieldEditor;
@@ -96,10 +97,11 @@
 //  addField( dirty );
   addField( font );
 
-//  StringFieldEditor paddingChar = new StringFieldEditor( ICDebugPreferenceConstants.PREF_MEMORY_PADDING_CHAR, "Padding Character:", 1, getFieldEditorParent() );
   StringFieldEditor paddingChar = createPaddingCharacterField();
   paddingChar.setTextLimit( 1 );
   addField( paddingChar );
+  createSpacer( getFieldEditorParent(), 1 );
+  createDefaultSettingsFields();
  }
 
  /* (non-Javadoc)
@@ -120,6 +122,8 @@
  public static void initDefaults( IPreferenceStore store )
  {
   store.setDefault( ICDebugPreferenceConstants.PREF_MEMORY_PADDING_CHAR, ICDebugPreferenceConstants.DEFAULT_MEMORY_PADDING_CHAR ); 
+  store.setDefault( ICDebugPreferenceConstants.PREF_MEMORY_AUTO_REFRESH, true ); 
+  store.setDefault( ICDebugPreferenceConstants.PREF_MEMORY_SHOW_ASCII, true );
   PreferenceConverter.setDefault( store, ICDebugPreferenceConstants.MEMORY_FONT, ICDebugPreferenceConstants.DEFAULT_MEMORY_FONT );
   PreferenceConverter.setDefault( store, ICDebugPreferenceConstants.MEMORY_FOREGROUND_RGB, ICDebugPreferenceConstants.DEFAULT_MEMORY_FOREGROUND_RGB );
   PreferenceConverter.setDefault( store, ICDebugPreferenceConstants.MEMORY_BACKGROUND_RGB, ICDebugPreferenceConstants.DEFAULT_MEMORY_BACKGROUND_RGB );
@@ -147,5 +151,11 @@
        return ( getTextControl().getText().length() == 1 );
       }
      };
+ }
+
+ private void createDefaultSettingsFields()
+ {
+  addField( new BooleanFieldEditor( ICDebugPreferenceConstants.PREF_MEMORY_AUTO_REFRESH, "Auto-Refresh by default", SWT.NONE, getFieldEditorParent() ) );
+  addField( new BooleanFieldEditor( ICDebugPreferenceConstants.PREF_MEMORY_SHOW_ASCII, "Show ASCII by default", SWT.NONE, getFieldEditorParent() ) );
  }
 }
Index: src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java,v
retrieving revision 1.14
diff -u -r1.14 MemoryControlArea.java
--- src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java 11 Nov 2002 20:16:03 -0000 1.14
+++ src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryControlArea.java 13 Nov 2002 18:48:38 -0000
@@ -13,7 +13,6 @@
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -69,14 +68,18 @@
   fPresentation = createPresentation();
   fAddressText = createAddressText( this );
   fMemoryText = createMemoryText( this, style, fPresentation );
+  setDefaultPreferences();
  }
 
- private MemoryPresentation createPresentation()
+ private void setDefaultPreferences()
  {
-  IPreferenceStore pstore = CDebugUIPlugin.getDefault().getPreferenceStore();
-  char[] paddingCharStr = pstore.getString( ICDebugPreferenceConstants.PREF_MEMORY_PADDING_CHAR ).toCharArray();
+  char[] paddingCharStr = CDebugUIPlugin.getDefault().getPreferenceStore().getString( ICDebugPreferenceConstants.PREF_MEMORY_PADDING_CHAR ).toCharArray();
   setPaddingChar( ( paddingCharStr.length > 0 ) ? paddingCharStr[0] : '.' );
+  fPresentation.setDisplayAscii( CDebugUIPlugin.getDefault().getPreferenceStore().getBoolean( ICDebugPreferenceConstants.PREF_MEMORY_SHOW_ASCII ) );
+ }
 
+ private MemoryPresentation createPresentation()
+ {
   return new MemoryPresentation();
  }
 
@@ -250,6 +253,7 @@
                        getNumberOfRows(),
                        getNumberOfColumns(),
                        getPaddingChar() ) );
+    getMemoryBlock().setFrozen( !CDebugUIPlugin.getDefault().getPreferenceStore().getBoolean( ICDebugPreferenceConstants.PREF_MEMORY_AUTO_REFRESH ) );
    getPresentation().setMemoryBlock( getMemoryBlock() );
   }
   setMemoryTextState();
Index: src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java,v
retrieving revision 1.12
diff -u -r1.12 MemoryView.java
--- src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java 4 Nov 2002 01:47:47 -0000 1.12
+++ src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryView.java 13 Nov 2002 18:48:38 -0000
@@ -17,6 +17,7 @@
 import org.eclipse.cdt.debug.internal.ui.actions.RefreshMemoryAction;
 import org.eclipse.cdt.debug.internal.ui.actions.SaveMemoryChangesAction;
 import org.eclipse.cdt.debug.internal.ui.actions.ShowAsciiAction;
+import org.eclipse.cdt.debug.internal.ui.preferences.ICDebugPreferenceConstants;
 import org.eclipse.cdt.debug.internal.ui.views.AbstractDebugEventHandler;
 import org.eclipse.cdt.debug.internal.ui.views.AbstractDebugEventHandlerView;
 import org.eclipse.cdt.debug.internal.ui.views.IDebugExceptionHandler;
@@ -90,7 +91,7 @@
 
   action = "" AutoRefreshMemoryAction( (MemoryViewer)getViewer() );
   action.setEnabled( false );
-  action.setChecked( false );
+  action.setChecked( CDebugUIPlugin.getDefault().getPreferenceStore().getBoolean( ICDebugPreferenceConstants.PREF_MEMORY_AUTO_REFRESH ) );
   setAction( "AutoRefreshMemory", action ); file://$NON-NLS-1$
   add( (AutoRefreshMemoryAction)action );
 
@@ -106,7 +107,7 @@
 
   action = "" ShowAsciiAction( (MemoryViewer)getViewer() );
   action.setEnabled( false );
-  action.setChecked( false );
+  action.setChecked( CDebugUIPlugin.getDefault().getPreferenceStore().getBoolean( ICDebugPreferenceConstants.PREF_MEMORY_SHOW_ASCII ) );
   setAction( "ShowAscii", action ); file://$NON-NLS-1$
   add( (ShowAsciiAction)action );
 


Back to the top