X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
index 8eb108a..5d5ef64 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
@@ -12,23 +12,31 @@ Contributors:
 package net.sourceforge.phpeclipse;
 
 /**
- * The main plugin class to be used in the desktop.
+ * Predefined prference constants
  */
 public interface IPreferenceConstants {
   public static final String LOCALHOST_PREF = "_localhost";
   public static final String DOCUMENTROOT_PREF = "_documentroot";
   public static final String USE_EXTERNAL_BROWSER_PREF = "_use_external_browser";
+  public static final String SHOW_EXTERNAL_PREVIEW_PREF = "_show_external_preview";
   public static final String EXTERNAL_BROWSER_PREF = "_external_browser";
-  public static final String MYSQL_PREF = "_my_sql";
-  public static final String APACHE_START_PREF = "_apache_start";
-  public static final String APACHE_STOP_PREF = "_apache_stop";
-  public static final String APACHE_RESTART_PREF = "_apache_restart";
-  public static final String SHOW_OUTPUT_IN_CONSOLE = "_sho_output_in_console";
+  public static final String MYSQL_RUN_PREF = "_mysql_run_pref";
+  public static final String MYSQL_START_BACKGROUND = "_mysql_start_background";
+  public static final String MYSQL_PREF = "__mysql_start";
+  public static final String APACHE_RUN_PREF = "_apache_run_pref";
+  public static final String APACHE_START_BACKGROUND = "_apache_start_background";
+  public static final String APACHE_START_PREF = "__apache_start";
+  public static final String APACHE_STOP_BACKGROUND = "_apache_stop_background";
+  public static final String APACHE_STOP_PREF = "__apache_stop";
+  public static final String APACHE_RESTART_BACKGROUND = "_apache_restart_background";
+  public static final String APACHE_RESTART_PREF = "__apache_restart";
+  public static final String SHOW_OUTPUT_IN_CONSOLE = "_show_output_in_console";
+  public static final String PHP_RUN_PREF = "_php_run_pref";
   public static final String EXTERNAL_PARSER_PREF = "_external_parser";
   public static final String PHP_PARSER_DEFAULT = "_php_parser_default";
   public static final String PHP_INTERNAL_PARSER = "_php_internal_parser";
   public static final String PHP_EXTERNAL_PARSER = "_php_external_parser";
-  public static final String PHP_PARSE_ON_SAVE = "_php_parse_on_save";
+  // public static final String PHP_PARSE_ON_SAVE = "_php_parse_on_save";
   public static final String PHP_MULTILINE_COMMENT = "_php_multilineComment";
   public static final String PHP_MULTILINE_COMMENT_BOLD = "_php_multilineComment_bold";
   public static final String PHP_MULTILINE_COMMENT_ITALIC = "_php_multilineComment_italic";
@@ -37,6 +45,10 @@ public interface IPreferenceConstants {
   public static final String PHP_SINGLELINE_COMMENT_BOLD = "_php_singlelineComment_bold";
   public static final String PHP_SINGLELINE_COMMENT_ITALIC = "_php_singlelineComment_italic";
   public static final String PHP_SINGLELINE_COMMENT_UNDERLINE = "_php_singlelineComment_underline";
+	public static final String PHP_TAG = "_php_tag";
+	public static final String PHP_TAG_BOLD = "_php_tag_bold";
+	public static final String PHP_TAG_ITALIC = "_php_tag_italic";
+	public static final String PHP_TAG_UNDERLINE = "_php_tag_underline";
   public static final String PHP_KEYWORD = "_php_keyword";
   public static final String PHP_KEYWORD_BOLD = "_php_keyword_bold";
   public static final String PHP_KEYWORD_ITALIC = "_php_keyword_italic";
@@ -65,28 +77,61 @@ public interface IPreferenceConstants {
   public static final String PHP_DEFAULT_BOLD = "_php_default_bold";
   public static final String PHP_DEFAULT_ITALIC = "_php_default_italic";
   public static final String PHP_DEFAULT_UNDERLINE = "_php_default_underline";
-  public static final String LINKED_POSITION_COLOR = "_linkedPositionColor";
-  public static final String PHP_EDITOR_BACKGROUND = "_php_editor_background";
+
+  /** The color key for PHPDoc keywords (<code>@foo</code>) in PHPDoc comments. */
+  public static final String PHPDOC_KEYWORD = "_php_doc_keyword"; //$NON-NLS-1$
+  public static final String PHPDOC_KEYWORD_BOLD = "_php_doc_keyword_bold";
+  public static final String PHPDOC_KEYWORD_ITALIC = "_php_doc_keyword_italic";
+  public static final String PHPDOC_KEYWORD_UNDERLINE = "_php_doc_keyword_underline";
+  /** The color key for HTML tags (<code>&lt;foo&gt;</code>) in PHPDoc comments. */
+  public static final String PHPDOC_TAG = "_php_doc_tag"; //$NON-NLS-1$
+  public static final String PHPDOC_TAG_BOLD = "_php_doc_tag_bold";
+  public static final String PHPDOC_TAG_ITALIC = "_php_doc_tag_italic";
+  public static final String PHPDOC_TAG_UNDERLINE = "_php_doc_tag_underline";
+  /** The color key for PHPDoc links (<code>{foo}</code>) in PHPDoc comments. */
+  public static final String PHPDOC_LINK = "_php_doc_link"; //$NON-NLS-1$
+  public static final String PHPDOC_LINK_BOLD = "_php_doc_link_bold";
+  public static final String PHPDOC_LINK_ITALIC = "_php_doc_link_italic";
+  public static final String PHPDOC_LINK_UNDERLINE = "_php_doc_link_underline";
+  /** The color key for everthing in PHPDoc comments for which no other color is specified. */
+  public static final String PHPDOC_DEFAULT = "_php_doc_default"; //$NON-NLS-1$
+  public static final String PHPDOC_DEFAULT_BOLD = "_php_doc_default_bold";
+  public static final String PHPDOC_DEFAULT_ITALIC = "_php_doc_default_italic";
+  public static final String PHPDOC_DEFAULT_UNDERLINE = "_php_doc_default_underline";
+
+  //  public static final String LINKED_POSITION_COLOR = "_linkedPositionColor";
+  //  public static final String PHP_EDITOR_BACKGROUND = "_php_editor_background";
   public static final String PHP_USERDEF_XMLFILE = "_userdef_xmlfile";
 
+  //  /** The color key for PHPDoc keywords (<code>@foo</code>) in PHPDoc comments. */
+  //  public static final String PHPDOC_KEYWORD= "_php_doc_keyword"; //$NON-NLS-1$
+  //  /** The color key for HTML tags (<code>&lt;foo&gt;</code>) in PHPDoc comments. */
+  //  public static final String PHPDOC_TAG= "_php_doc_tag"; //$NON-NLS-1$
+  //  /** The color key for PHPDoc links (<code>{foo}</code>) in PHPDoc comments. */
+  //  public static final String PHPDOC_LINK= "_php_doc_link"; //$NON-NLS-1$
+  //  /** The color key for everthing in PHPDoc comments for which no other color is specified. */
+  //  public static final String PHPDOC_DEFAULT= "_php_doc_default"; //$NON-NLS-1$
+
   /*Language stuff  - under dev*/
-  public static final String RESOURCE_BUNDLE = "_php_editor_res_bundle"; //$NON-NLS-1$	
+  public static final String RESOURCE_BUNDLE = "_php_editor_res_bundle"; //$NON-NLS-1$
   public static final String LANGUAGE_DEFAULT = "net.sourceforge.phpeclipse.newPHPPreferencesMessages_en_GB";
   public static final String RESOURCE_BUNDLE_DE = "net.sourceforge.phpeclipse.newPHPPreferencesMessages_DE";
   public static final String RESOURCE_BUNDLE_FR = "net.sourceforge.phpeclipse.newPHPPreferencesMessages_FR";
+  public static final String RESOURCE_BUNDLE_ES = "net.sourceforge.phpeclipse.newPHPPreferencesMessages_es_ES";
   public static final String RESOURCE_BUNDLE_EN_GB = "net.sourceforge.phpeclipse.newPHPPreferencesMessages_en_GB";
+	public static final String RESOURCE_BUNDLE_JA = "net.sourceforge.phpeclipse.newPHPPreferencesMessages_JA";
 
-  public static final String FORMATTER_TAB_SIZE = "_formatter_tab_size";
-  public static final String SPACES_FOR_TABS = "_formatter_tab_size";
+  //public static final String FORMATTER_TAB_SIZE = "_formatter_tab_size";
+  //public static final String SPACES_FOR_TABS = "_formatter_tab_size";
 
   public static final String EDITOR_BOLD_SUFFIX = "_editor_bold_suffix";
   /** Preference key for showing the line number ruler */
-  public final static String LINE_NUMBER_RULER = "_lineNumberRuler"; //$NON-NLS-1$
+  // public final static String LINE_NUMBER_RULER = "_lineNumberRuler"; //$NON-NLS-1$
   /** Preference key for the foreground color of the line numbers */
-  public final static String LINE_NUMBER_COLOR = "_lineNumberColor"; //$NON-NLS-1$
+  // public final static String LINE_NUMBER_COLOR = "_lineNumberColor"; //$NON-NLS-1$
 
-  public final static String PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT = "_defaultBackgroundColor"; //$NON-NLS-1$
-  public final static String PREFERENCE_COLOR_BACKGROUND = "backgroundColor"; //$NON-NLS-1$
+  //  public final static String PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT = "_defaultBackgroundColor"; //$NON-NLS-1$
+  //  public final static String PREFERENCE_COLOR_BACKGROUND = "backgroundColor"; //$NON-NLS-1$
 
   /** Preference key for content assist proposal color */
   public final static String PROPOSALS_FOREGROUND = "content_assist_proposals_foreground"; //$NON-NLS-1$