You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2009/09/08 10:16:54 UTC
svn commit: r812379 - in /directory/studio/trunk: ldapbrowser-common/
ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/
ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/
...
Author: pamarcelot
Date: Tue Sep 8 08:16:53 2009
New Revision: 812379
URL: http://svn.apache.org/viewvc?rev=812379&view=rev
Log:
Fix for DIRSTUDIO-534 (Re-order the preference pages for better understanding). Removed Colors And Fonts pref page. Moved some of its content in the Attributes page. The rest of the content was no longuer relevant (quick filter and errors/warnings).
Removed:
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ColorsAndFontsPreferencePage.java
Modified:
directory/studio/trunk/ldapbrowser-common/plugin.properties
directory/studio/trunk/ldapbrowser-common/plugin.xml
directory/studio/trunk/ldapbrowser-common/plugin_de.properties
directory/studio/trunk/ldapbrowser-common/plugin_fr.properties
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributesPreferencePage.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetQuickFilterWidget.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java
Modified: directory/studio/trunk/ldapbrowser-common/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin.properties?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin.properties Tue Sep 8 08:16:53 2009
@@ -38,9 +38,6 @@
PrefPage_AttributesPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.AttributesPreferencePage
PrefPage_AttributesPreferencePage_name=Attributes
-PrefPage_ColorsAndFontsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.ColorsAndFontsPreferencePage
-PrefPage_ColorsAndFontsPreferencePage_name=Colors and Fonts
-
PrefPage_BinaryAttributesAndSyntaxesPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.BinaryAttributesAndSyntaxesPreferencePage
PrefPage_BinaryAttributesAndSyntaxesPreferencePage_name=Binary Attributes
Modified: directory/studio/trunk/ldapbrowser-common/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin.xml?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin.xml (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin.xml Tue Sep 8 08:16:53 2009
@@ -66,15 +66,6 @@
<keywordReference id="%Keyword_LDAP_id"/>
</page>
<page
- category="%PrefPage_MainPreferencePage_id"
- class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.ColorsAndFontsPreferencePage"
- id="%PrefPage_ColorsAndFontsPreferencePage_id"
- name="%PrefPage_ColorsAndFontsPreferencePage_name">
- <keywordReference id="%Keyword_Colors_id"/>
- <keywordReference id="%Keyword_Fonts_id"/>
- <keywordReference id="%Keyword_LDAP_id"/>
- </page>
- <page
category="%PrefPage_AttributesPreferencePage_id"
class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.BinaryAttributesAndSyntaxesPreferencePage"
id="%PrefPage_BinaryAttributesAndSyntaxesPreferencePage_id"
Modified: directory/studio/trunk/ldapbrowser-common/plugin_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin_de.properties?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin_de.properties Tue Sep 8 08:16:53 2009
@@ -19,8 +19,6 @@
PrefPage_AttributesPreferencePage_name=Attribute
-PrefPage_ColorsAndFontsPreferencePage_name=Farben und Schriften
-
PrefPage_BinaryAttributesAndSyntaxesPreferencePage_name=Binary Attributes
PrefPage_ValueEditorsPreferencePage_name=Werte Editoren
Modified: directory/studio/trunk/ldapbrowser-common/plugin_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin_fr.properties?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin_fr.properties Tue Sep 8 08:16:53 2009
@@ -29,8 +29,6 @@
PrefPage_AttributesPreferencePage_name=Attributs
-PrefPage_ColorsAndFontsPreferencePage_name=Couleurs et polices
-
PrefPage_BinaryAttributesAndSyntaxesPreferencePage_name=Attributs binaires
PrefPage_ValueEditorsPreferencePage_name=Editeurs de valeur
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java Tue Sep 8 08:16:53 2009
@@ -103,13 +103,7 @@
public static final String PREFERENCE_MAYATTRIBUTE_FONT = "mayAttributeFont"; //$NON-NLS-1$
public static final String PREFERENCE_OPERATIONALATTRIBUTE_COLOR = "operationalAttributeColor"; //$NON-NLS-1$
public static final String PREFERENCE_OPERATIONALATTRIBUTE_FONT = "operationalAttributeFont"; //$NON-NLS-1$
- public static final String PREFERENCE_QUICKFILTER_BACKGROUND_COLOR = "quickfilterBackgroundColor"; //$NON-NLS-1$
- public static final String PREFERENCE_QUICKFILTER_FOREGROUND_COLOR = "quickfilterForegroundColor"; //$NON-NLS-1$
- public static final String PREFERENCE_QUICKFILTER_FONT = "quickfilterFont"; //$NON-NLS-1$
- public static final String PREFERENCE_ERROR_FONT = "errorFont"; //$NON-NLS-1$
- public static final String PREFERENCE_ERROR_COLOR = "errorColor"; //$NON-NLS-1$
- public static final String PREFERENCE_WARNING_FONT = "warningFont"; //$NON-NLS-1$
- public static final String PREFERENCE_WARNING_COLOR = "warningColor"; //$NON-NLS-1$
+
public static final int SHOW_DN = 0;
public static final int SHOW_RDN = 1;
public static final int SHOW_RDN_VALUE = 2;
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java Tue Sep 8 08:16:53 2009
@@ -63,8 +63,6 @@
// Colors and Fonts
RGB rgbBlack = Display.getDefault().getSystemColor( SWT.COLOR_BLACK ).getRGB();
- RGB rgbRed = Display.getDefault().getSystemColor( SWT.COLOR_RED ).getRGB();
- RGB rgbYellow = Display.getDefault().getSystemColor( SWT.COLOR_YELLOW ).getRGB();
FontData[] fontData = Display.getDefault().getSystemFont().getFontData();
FontData fontDataNormal = new FontData( fontData[0].getName(), fontData[0].getHeight(), SWT.NORMAL );
FontData fontDataItalic = new FontData( fontData[0].getName(), fontData[0].getHeight(), SWT.ITALIC );
@@ -80,15 +78,6 @@
PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_MAYATTRIBUTE_FONT, fontDataNormal );
PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_OPERATIONALATTRIBUTE_COLOR, rgbBlack );
PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_OPERATIONALATTRIBUTE_FONT, fontDataItalic );
- // Error/Warning colors and fonts
- PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_WARNING_FONT, fontDataBoldItalic );
- PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_WARNING_COLOR, rgbYellow );
- PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_ERROR_FONT, fontDataBoldItalic );
- PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_ERROR_COLOR, rgbRed );
- // Quick filter background colors and fonts
- PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_QUICKFILTER_FONT, fontDataBold );
- PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_QUICKFILTER_BACKGROUND_COLOR, rgbYellow );
- PreferenceConverter.setDefault( store, BrowserCommonConstants.PREFERENCE_QUICKFILTER_FOREGROUND_COLOR, rgbBlack );
// Attributes
store.setDefault( BrowserCommonConstants.PREFERENCE_SHOW_RAW_VALUES, false );
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributesPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributesPreferencePage.java?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributesPreferencePage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributesPreferencePage.java Tue Sep 8 08:16:53 2009
@@ -24,13 +24,19 @@
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.connection.ui.widgets.BaseWidgetUtils;
+import org.eclipse.jface.preference.ColorSelector;
+import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
@@ -43,18 +49,39 @@
*/
public class AttributesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
-
private Button showDecoratedValuesButton;
+ private final String[] ATTRIBUTE_TYPES = new String[]
+ {
+ Messages.getString( "AttributesPreferencePage.ObjectClassAttribute" ), Messages.getString( "AttributesPreferencePage.MustAttributes" ), Messages.getString( "AttributesPreferencePage.MayAttributes" ), Messages.getString( "AttributesPreferencePage.OperationalAttributes" ) }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+ private final String[] ATTRIBUTE_FONT_CONSTANTS = new String[]
+ { BrowserCommonConstants.PREFERENCE_OBJECTCLASS_FONT, BrowserCommonConstants.PREFERENCE_MUSTATTRIBUTE_FONT,
+ BrowserCommonConstants.PREFERENCE_MAYATTRIBUTE_FONT,
+ BrowserCommonConstants.PREFERENCE_OPERATIONALATTRIBUTE_FONT };
+
+ private final String[] ATTRIBUTE_COLOR_CONSTANTS = new String[]
+ { BrowserCommonConstants.PREFERENCE_OBJECTCLASS_COLOR, BrowserCommonConstants.PREFERENCE_MUSTATTRIBUTE_COLOR,
+ BrowserCommonConstants.PREFERENCE_MAYATTRIBUTE_COLOR,
+ BrowserCommonConstants.PREFERENCE_OPERATIONALATTRIBUTE_COLOR };
+
+ private Label[] attributeTypeLabels = new Label[ATTRIBUTE_TYPES.length];
+
+ private ColorSelector[] attributeColorSelectors = new ColorSelector[ATTRIBUTE_TYPES.length];
+
+ private Button[] attributeBoldButtons = new Button[ATTRIBUTE_TYPES.length];
+
+ private Button[] attributeItalicButtons = new Button[ATTRIBUTE_TYPES.length];
+
/**
* Creates a new instance of AttributesPreferencePage.
*/
public AttributesPreferencePage()
{
- super( Messages.getString("AttributesPreferencePage.Attributes") ); //$NON-NLS-1$
+ super( Messages.getString( "AttributesPreferencePage.Attributes" ) ); //$NON-NLS-1$
super.setPreferenceStore( BrowserCommonActivator.getDefault().getPreferenceStore() );
- super.setDescription( Messages.getString("AttributesPreferencePage.GeneralSettings") ); //$NON-NLS-1$
+ super.setDescription( Messages.getString( "AttributesPreferencePage.GeneralSettings" ) ); //$NON-NLS-1$
}
@@ -85,22 +112,119 @@
BaseWidgetUtils.createSpacer( composite, 1 );
BaseWidgetUtils.createSpacer( composite, 1 );
- showDecoratedValuesButton = BaseWidgetUtils.createCheckbox( composite, Messages.getString("AttributesPreferencePage.ShowDecoratedValues"), 1 ); //$NON-NLS-1$
+ // Show Decorated Values
+ showDecoratedValuesButton = BaseWidgetUtils.createCheckbox( composite, Messages
+ .getString( "AttributesPreferencePage.ShowDecoratedValues" ), 1 ); //$NON-NLS-1$
showDecoratedValuesButton.setSelection( !getPreferenceStore().getBoolean(
BrowserCommonConstants.PREFERENCE_SHOW_RAW_VALUES ) );
+ // Attributes Colors And Fonts
+ BaseWidgetUtils.createSpacer( composite, 1 );
+ BaseWidgetUtils.createSpacer( composite, 1 );
+ Group colorsAndFontsGroup = BaseWidgetUtils.createGroup( composite, Messages
+ .getString( "AttributesPreferencePage.AttributeColorsAndFonts" ), 1 ); //$NON-NLS-1$
+ colorsAndFontsGroup.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ Composite colorsAndFontsComposite = BaseWidgetUtils.createColumnContainer( colorsAndFontsGroup, 4, 1 );
+ for ( int i = 0; i < ATTRIBUTE_TYPES.length; i++ )
+ {
+ attributeTypeLabels[i] = BaseWidgetUtils.createLabel( colorsAndFontsComposite, ATTRIBUTE_TYPES[i], 1 );
+ attributeTypeLabels[i].setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ attributeColorSelectors[i] = new ColorSelector( colorsAndFontsComposite );
+ attributeBoldButtons[i] = BaseWidgetUtils.createCheckbox( colorsAndFontsComposite, Messages
+ .getString( "AttributesPreferencePage.Bold" ), 1 ); //$NON-NLS-1$
+ attributeItalicButtons[i] = BaseWidgetUtils.createCheckbox( colorsAndFontsComposite, Messages
+ .getString( "AttributesPreferencePage.Italic" ), 1 ); //$NON-NLS-1$
+
+ FontData[] fontDatas = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault()
+ .getPreferenceStore(), ATTRIBUTE_FONT_CONSTANTS[i] );
+ RGB rgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
+ ATTRIBUTE_COLOR_CONSTANTS[i] );
+ setColorsAndFonts( i, fontDatas, rgb );
+ }
+
applyDialogFont( composite );
return composite;
}
+ private void setColorsAndFonts( int index, FontData[] fontDatas, RGB rgb )
+ {
+ boolean bold = isBold( fontDatas );
+ boolean italic = isItalic( fontDatas );
+ attributeColorSelectors[index].setColorValue( rgb );
+ attributeBoldButtons[index].setSelection( bold );
+ attributeItalicButtons[index].setSelection( italic );
+ }
+
+
+ private void setFontData( FontData[] fontDatas, Button boldButton, Button italicButton )
+ {
+ for ( FontData fontData : fontDatas )
+ {
+ int style = SWT.NORMAL;
+ if ( boldButton.getSelection() )
+ {
+ style |= SWT.BOLD;
+ }
+ if ( italicButton.getSelection() )
+ {
+ style |= SWT.ITALIC;
+ }
+ fontData.setStyle( style );
+ }
+ }
+
+
+ private boolean isBold( FontData[] fontDatas )
+ {
+ boolean bold = false;
+ for ( FontData fontData : fontDatas )
+ {
+ if ( ( fontData.getStyle() & SWT.BOLD ) != SWT.NORMAL )
+ {
+ bold = true;
+ }
+ }
+ return bold;
+ }
+
+
+ private boolean isItalic( FontData[] fontDatas )
+ {
+ boolean italic = false;
+ for ( FontData fontData : fontDatas )
+ {
+ if ( ( fontData.getStyle() & SWT.ITALIC ) != SWT.NORMAL )
+ {
+ italic = true;
+ }
+ }
+ return italic;
+ }
+
+
/**
* {@inheritDoc}
*/
public boolean performOk()
{
+ // Show Decorated Values
getPreferenceStore().setValue( BrowserCommonConstants.PREFERENCE_SHOW_RAW_VALUES,
!showDecoratedValuesButton.getSelection() );
+
+ // Attributes Colors And Fonts
+ for ( int i = 0; i < ATTRIBUTE_TYPES.length; i++ )
+ {
+ FontData[] fontDatas = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault()
+ .getPreferenceStore(), ATTRIBUTE_FONT_CONSTANTS[i] );
+ setFontData( fontDatas, attributeBoldButtons[i], attributeItalicButtons[i] );
+ RGB rgb = attributeColorSelectors[i].getColorValue();
+ PreferenceConverter.setValue( BrowserCommonActivator.getDefault().getPreferenceStore(),
+ ATTRIBUTE_FONT_CONSTANTS[i], fontDatas );
+ PreferenceConverter.setValue( BrowserCommonActivator.getDefault().getPreferenceStore(),
+ ATTRIBUTE_COLOR_CONSTANTS[i], rgb );
+ }
+
return true;
}
@@ -110,8 +234,20 @@
*/
protected void performDefaults()
{
+ // Show Decorated Values
showDecoratedValuesButton.setSelection( !getPreferenceStore().getDefaultBoolean(
BrowserCommonConstants.PREFERENCE_SHOW_RAW_VALUES ) );
+
+ // Attributes Colors And Fonts
+ for ( int i = 0; i < ATTRIBUTE_TYPES.length; i++ )
+ {
+ FontData[] fontDatas = PreferenceConverter.getDefaultFontDataArray( BrowserCommonActivator.getDefault()
+ .getPreferenceStore(), ATTRIBUTE_FONT_CONSTANTS[i] );
+ RGB rgb = PreferenceConverter.getDefaultColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
+ ATTRIBUTE_COLOR_CONSTANTS[i] );
+ setColorsAndFonts( i, fontDatas, rgb );
+ }
+
super.performDefaults();
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties Tue Sep 8 08:16:53 2009
@@ -19,6 +19,13 @@
AttributesPreferencePage.Attributes=Attributes
AttributesPreferencePage.GeneralSettings=General settings for attributes:
AttributesPreferencePage.ShowDecoratedValues=Show decorated values
+AttributesPreferencePage.AttributeColorsAndFonts=Attribute Colors and Fonts
+AttributesPreferencePage.Bold=Bold
+AttributesPreferencePage.Italic=Italic
+AttributesPreferencePage.MayAttributes=May attributes:
+AttributesPreferencePage.MustAttributes=Must attributes:
+AttributesPreferencePage.ObjectClassAttribute=Objectclass attribute:
+AttributesPreferencePage.OperationalAttributes=Operational attributes:
AttributeValueEditorDialog.AttributeTypeOrOID=Attribute Type or OID:
AttributeValueEditorDialog.AttributeValueEditor=Attribute Value Editor
AttributeValueEditorDialog.ValueEditor=Value Editor:
@@ -50,21 +57,6 @@
BrowserPreferencePage.UseAsEntryLabel2=\ as entry label
BrowserPreferencePage.UseAsSearchResultLabel1=Use
BrowserPreferencePage.UseAsSearchResultLabel2=\ as search result label
-ColorsAndFontsPreferencePage.AttributeColorsAndFonts=Attribute Colors and Fonts
-ColorsAndFontsPreferencePage.Bold=Bold
-ColorsAndFontsPreferencePage.colorsAndFonts=Colors and Fonts
-ColorsAndFontsPreferencePage.colorsAndFontsDescription=Color and Font settings for the LDAP browser:
-ColorsAndFontsPreferencePage.Errors=Errors:
-ColorsAndFontsPreferencePage.Italic=Italic
-ColorsAndFontsPreferencePage.MayAttributes=May attributes:
-ColorsAndFontsPreferencePage.MustAttributes=Must attributes:
-ColorsAndFontsPreferencePage.ObjectClassAttribute=Objectclass attribute:
-ColorsAndFontsPreferencePage.OperationalAttributes=Operational attributes:
-ColorsAndFontsPreferencePage.QuickFilter=Quick Filter
-ColorsAndFontsPreferencePage.QuickFilterBackground=Quick Filter Background
-ColorsAndFontsPreferencePage.QuickFilterColorsAndFonts=Quick Filter Colors and Fonts
-ColorsAndFontsPreferencePage.WaringAndErrorColorsAndFonts=Warning and Error Colors and Fonts
-ColorsAndFontsPreferencePage.Warnings=Warnings:
EntryEditorPreferencePage.AutoExpandFoldedAttributes=Auto-expand folded attributes
EntryEditorPreferencePage.EnableFolding=Enable folding
EntryEditorPreferencePage.EntryEditor=Entry Editor
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties Tue Sep 8 08:16:53 2009
@@ -19,6 +19,13 @@
AttributesPreferencePage.Attributes=Attribute
AttributesPreferencePage.GeneralSettings=Allgemeine Einstellungen f\u00FCr Attribute:
AttributesPreferencePage.ShowDecoratedValues=Dekorierte Werte anzeigen
+AttributesPreferencePage.AttributeColorsAndFonts=Attribut Farben und Schriften
+AttributesPreferencePage.Bold=Fett
+AttributesPreferencePage.Italic=Kursiv
+AttributesPreferencePage.MayAttributes=Optionale Attribute:
+AttributesPreferencePage.MustAttributes=Pflichtattribute:
+AttributesPreferencePage.ObjectClassAttribute=Objektklassen Attribut:
+AttributesPreferencePage.OperationalAttributes=Operationale Attribute:
AttributeValueEditorDialog.AttributeTypeOrOID=Attribut Typ oder OID:
AttributeValueEditorDialog.AttributeValueEditor=Attribut Wert Editor
AttributeValueEditorDialog.ValueEditor=Wert Editor:
@@ -50,21 +57,6 @@
BrowserPreferencePage.UseAsEntryLabel2=\ als Eintragsbeschriftung
BrowserPreferencePage.UseAsSearchResultLabel1=Benutze
BrowserPreferencePage.UseAsSearchResultLabel2=\ als Suchergebnisbeschriftung
-ColorsAndFontsPreferencePage.AttributeColorsAndFonts=Attribut Farben und Schriften
-ColorsAndFontsPreferencePage.Bold=Fett
-ColorsAndFontsPreferencePage.colorsAndFonts=Farben und Schriften
-ColorsAndFontsPreferencePage.colorsAndFontsDescription=Farb- und Schrifteinstellungen f\u00FCr den LDAP Browser:
-ColorsAndFontsPreferencePage.Errors=Fehler:
-ColorsAndFontsPreferencePage.Italic=Kursiv
-ColorsAndFontsPreferencePage.MayAttributes=Optionale Attribute:
-ColorsAndFontsPreferencePage.MustAttributes=Pflichtattribute:
-ColorsAndFontsPreferencePage.ObjectClassAttribute=Objektklassen Attribut:
-ColorsAndFontsPreferencePage.OperationalAttributes=Operationale Attribute:
-ColorsAndFontsPreferencePage.QuickFilter=Schnell-Filter
-ColorsAndFontsPreferencePage.QuickFilterBackground=Schnell-Filter Hintergrund
-ColorsAndFontsPreferencePage.QuickFilterColorsAndFonts=Schnell-Filter Farben und Schriften
-ColorsAndFontsPreferencePage.WaringAndErrorColorsAndFonts=Warnung und Fehler Farben und Schriften
-ColorsAndFontsPreferencePage.Warnings=Warnungen:
EntryEditorPreferencePage.AutoExpandFoldedAttributes=Gefaltete Attribute automatisch aufklappen
EntryEditorPreferencePage.EnableFolding=Falten aktivieren
EntryEditorPreferencePage.EntryEditor=Eintrags-Editor
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties Tue Sep 8 08:16:53 2009
@@ -19,6 +19,13 @@
AttributesPreferencePage.Attributes=Attributs
AttributesPreferencePage.GeneralSettings=R\u00E9glages g\u00E9n\u00E9raux pour les attributs:
AttributesPreferencePage.ShowDecoratedValues=Afficher les valeurs d\u00E9cor\u00E9es
+AttributesPreferencePage.AttributeColorsAndFonts=Couleurs et polices des attributs
+AttributesPreferencePage.Bold=Gras
+AttributesPreferencePage.Italic=Italique
+AttributesPreferencePage.MayAttributes=Attributs facultatifs (MAY):
+AttributesPreferencePage.MustAttributes=Attributs obligatoires (MUST):
+AttributesPreferencePage.ObjectClassAttribute=Attribut objectClass:
+AttributesPreferencePage.OperationalAttributes=Attributs op\u00E9rationnels:
AttributeValueEditorDialog.AttributeTypeOrOID=Type d'attribut ou OID:
AttributeValueEditorDialog.AttributeValueEditor=Attribut d'\u00E9diteur de valeur
AttributeValueEditorDialog.ValueEditor=Editeur de valeur:
@@ -50,21 +57,6 @@
BrowserPreferencePage.UseAsEntryLabel2=\ comme \u00E9tiquette d'entr\u00E9e
BrowserPreferencePage.UseAsSearchResultLabel1=Utiliser le/la
BrowserPreferencePage.UseAsSearchResultLabel2=\ comme \u00E9tiquette de r\u00E9sultat de recherche
-ColorsAndFontsPreferencePage.AttributeColorsAndFonts=Couleurs et polices des attributs
-ColorsAndFontsPreferencePage.Bold=Gras
-ColorsAndFontsPreferencePage.colorsAndFonts=Couleurs et polices
-ColorsAndFontsPreferencePage.colorsAndFontsDescription=R\u00E9glages de couleurs et polices pour le navigateur LDAP:
-ColorsAndFontsPreferencePage.Errors=Erreurs:
-ColorsAndFontsPreferencePage.Italic=Italique
-ColorsAndFontsPreferencePage.MayAttributes=Attributs facultatifs (MAY):
-ColorsAndFontsPreferencePage.MustAttributes=Attributs obligatoires (MUST):
-ColorsAndFontsPreferencePage.ObjectClassAttribute=Attribut objectClass:
-ColorsAndFontsPreferencePage.OperationalAttributes=Attributs op\u00E9rationnels:
-ColorsAndFontsPreferencePage.QuickFilter=Filtre rapide
-ColorsAndFontsPreferencePage.QuickFilterBackground=Fond du filtre rapide
-ColorsAndFontsPreferencePage.QuickFilterColorsAndFonts=Couleurs et polices du filtre rapide
-ColorsAndFontsPreferencePage.WaringAndErrorColorsAndFonts=Couleurs et polices des avertissements et erreurs
-ColorsAndFontsPreferencePage.Warnings=Avertissements:
EntryEditorPreferencePage.AutoExpandFoldedAttributes=D\u00E9plier automatiquement les attributs r\u00E9unis
EntryEditorPreferencePage.EnableFolding=Activer la r\u00E9union
EntryEditorPreferencePage.EntryEditor=Editeur d'entr\u00E9e
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java Tue Sep 8 08:16:53 2009
@@ -33,11 +33,13 @@
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
/**
@@ -106,7 +108,9 @@
IAttribute attribute = ( IAttribute ) obj;
if ( index == EntryEditorWidgetTableMetadata.KEY_COLUMN_INDEX )
{
- return NLS.bind( Messages.getString("EntryEditorWidgetLabelProvider.AttributeLabel"), attribute.getDescription(), attribute.getValueSize() ); //$NON-NLS-1$
+ return NLS
+ .bind(
+ Messages.getString( "EntryEditorWidgetLabelProvider.AttributeLabel" ), attribute.getDescription(), attribute.getValueSize() ); //$NON-NLS-1$
}
else
{
@@ -151,18 +155,22 @@
{
if ( value.isEmpty() )
{
- FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault()
- .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_ERROR_FONT );
- return BrowserCommonActivator.getDefault().getFont( fontData );
+ FontData[] fontData = Display.getDefault().getSystemFont().getFontData();
+ FontData fontDataBoldItalic = new FontData( fontData[0].getName(), fontData[0].getHeight(), SWT.BOLD
+ | SWT.ITALIC );
+ return BrowserCommonActivator.getDefault().getFont( new FontData[]
+ { fontDataBoldItalic } );
}
}
if ( attribute != null && value == null )
{
if ( !attribute.isConsistent() )
{
- FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault()
- .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_ERROR_FONT );
- return BrowserCommonActivator.getDefault().getFont( fontData );
+ FontData[] fontData = Display.getDefault().getSystemFont().getFontData();
+ FontData fontDataBoldItalic = new FontData( fontData[0].getName(), fontData[0].getHeight(), SWT.BOLD
+ | SWT.ITALIC );
+ return BrowserCommonActivator.getDefault().getFont( new FontData[]
+ { fontDataBoldItalic } );
}
}
@@ -223,18 +231,16 @@
{
if ( value.isEmpty() )
{
- RGB rgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
- BrowserCommonConstants.PREFERENCE_ERROR_COLOR );
- return BrowserCommonActivator.getDefault().getColor( rgb );
+ return BrowserCommonActivator.getDefault().getColor(
+ Display.getDefault().getSystemColor( SWT.COLOR_RED ).getRGB() );
}
}
if ( attribute != null && value == null )
{
if ( !attribute.isConsistent() )
{
- RGB rgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
- BrowserCommonConstants.PREFERENCE_ERROR_COLOR );
- return BrowserCommonActivator.getDefault().getColor( rgb );
+ return BrowserCommonActivator.getDefault().getColor(
+ Display.getDefault().getSystemColor( SWT.COLOR_RED ).getRGB() );
}
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetQuickFilterWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetQuickFilterWidget.java?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetQuickFilterWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetQuickFilterWidget.java Tue Sep 8 08:16:53 2009
@@ -24,16 +24,11 @@
import org.apache.directory.studio.connection.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
-import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -122,7 +117,7 @@
// Reseting the layout of the composite to be displayed correctly
GridData compositeGridData = new GridData( SWT.FILL, SWT.NONE, true, false );
composite.setLayoutData( compositeGridData );
-
+
innerComposite = BaseWidgetUtils.createColumnContainer( composite, 3, 1 );
quickFilterAttributeText = new Text( innerComposite, SWT.BORDER );
@@ -134,25 +129,6 @@
filter.setQuickFilterAttribute( quickFilterAttributeText.getText() );
clearQuickFilterButton.setEnabled( !"".equals( quickFilterAttributeText.getText() ) //$NON-NLS-1$
|| !"".equals( quickFilterValueText.getText() ) ); //$NON-NLS-1$
- if ( !"".equals( quickFilterAttributeText.getText() ) ) //$NON-NLS-1$
- {
- RGB fgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
- BrowserCommonConstants.PREFERENCE_QUICKFILTER_FOREGROUND_COLOR );
- RGB bgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
- BrowserCommonConstants.PREFERENCE_QUICKFILTER_BACKGROUND_COLOR );
- Color fgColor = BrowserCommonActivator.getDefault().getColor( fgRgb );
- Color bgColor = BrowserCommonActivator.getDefault().getColor( bgRgb );
- quickFilterAttributeText.setForeground( fgColor );
- quickFilterAttributeText.setBackground( bgColor );
- FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault()
- .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_QUICKFILTER_FONT );
- Font font = BrowserCommonActivator.getDefault().getFont( fontData );
- quickFilterAttributeText.setFont( font );
- }
- else
- {
- quickFilterAttributeText.setBackground( null );
- }
}
} );
@@ -165,30 +141,12 @@
filter.setQuickFilterValue( quickFilterValueText.getText() );
clearQuickFilterButton.setEnabled( !"".equals( quickFilterAttributeText.getText() ) //$NON-NLS-1$
|| !"".equals( quickFilterValueText.getText() ) ); //$NON-NLS-1$
- if ( !"".equals( quickFilterValueText.getText() ) ) //$NON-NLS-1$
- {
- RGB fgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
- BrowserCommonConstants.PREFERENCE_QUICKFILTER_FOREGROUND_COLOR );
- RGB bgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
- BrowserCommonConstants.PREFERENCE_QUICKFILTER_BACKGROUND_COLOR );
- Color fgColor = BrowserCommonActivator.getDefault().getColor( fgRgb );
- Color bgColor = BrowserCommonActivator.getDefault().getColor( bgRgb );
- quickFilterValueText.setForeground( fgColor );
- quickFilterValueText.setBackground( bgColor );
- FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault()
- .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_QUICKFILTER_FONT );
- Font font = BrowserCommonActivator.getDefault().getFont( fontData );
- quickFilterValueText.setFont( font );
- }
- else
- {
- quickFilterValueText.setBackground( null );
- }
}
} );
clearQuickFilterButton = new Button( innerComposite, SWT.PUSH );
- clearQuickFilterButton.setToolTipText( Messages.getString("EntryEditorWidgetQuickFilterWidget.ClearQuickFilter") ); //$NON-NLS-1$
+ clearQuickFilterButton.setToolTipText( Messages
+ .getString( "EntryEditorWidgetQuickFilterWidget.ClearQuickFilter" ) ); //$NON-NLS-1$
clearQuickFilterButton.setImage( BrowserCommonActivator.getDefault()
.getImage( BrowserCommonConstants.IMG_CLEAR ) );
clearQuickFilterButton.setEnabled( false );
@@ -224,7 +182,7 @@
compositeGridData.heightHint = 0;
compositeGridData.widthHint = 0;
composite.setLayoutData( compositeGridData );
-
+
if ( !"".equals( quickFilterAttributeText.getText() ) ) //$NON-NLS-1$
{
quickFilterAttributeText.setText( "" ); //$NON-NLS-1$
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java?rev=812379&r1=812378&r2=812379&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java Tue Sep 8 08:16:53 2009
@@ -24,16 +24,11 @@
import org.apache.directory.studio.connection.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
-import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -124,25 +119,6 @@
{
filter.setQuickFilterValue( quickFilterValueText.getText() );
clearQuickFilterButton.setEnabled( !"".equals( quickFilterValueText.getText() ) ); //$NON-NLS-1$
- if ( !"".equals( quickFilterValueText.getText() ) ) //$NON-NLS-1$
- {
- RGB fgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
- BrowserCommonConstants.PREFERENCE_QUICKFILTER_FOREGROUND_COLOR );
- RGB bgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(),
- BrowserCommonConstants.PREFERENCE_QUICKFILTER_BACKGROUND_COLOR );
- Color fgColor = BrowserCommonActivator.getDefault().getColor( fgRgb );
- Color bgColor = BrowserCommonActivator.getDefault().getColor( bgRgb );
- quickFilterValueText.setForeground( fgColor );
- quickFilterValueText.setBackground( bgColor );
- FontData[] fontData = PreferenceConverter.getFontDataArray( BrowserCommonActivator.getDefault()
- .getPreferenceStore(), BrowserCommonConstants.PREFERENCE_QUICKFILTER_FONT );
- Font font = BrowserCommonActivator.getDefault().getFont( fontData );
- quickFilterValueText.setFont( font );
- }
- else
- {
- quickFilterValueText.setBackground( null );
- }
}
} );