directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r812034 - in /directory/studio/trunk: ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/ ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ schemaeditor/src/m...
Date Mon, 07 Sep 2009 08:24:48 GMT
Author: pamarcelot
Date: Mon Sep  7 08:24:47 2009
New Revision: 812034

URL: http://svn.apache.org/viewvc?rev=812034&view=rev
Log:
Fix for DIRSTUDIO-535 (Use SWT.SEARCH and SWT.CANCEL style bits on search text field for a
native search field on Mac OS X).

Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java?rev=812034&r1=812033&r2=812034&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java
Mon Sep  7 08:24:47 2009
@@ -163,8 +163,8 @@
     public NewEntryObjectclassWizardPage( String pageName, NewEntryWizard wizard )
     {
         super( pageName );
-        setTitle( Messages.getString("NewEntryObjectclassWizardPage.ObjectClasses") ); //$NON-NLS-1$
-        setDescription( Messages.getString("NewEntryObjectclassWizardPage.ObjectClassesDescription")
); //$NON-NLS-1$
+        setTitle( Messages.getString( "NewEntryObjectclassWizardPage.ObjectClasses" ) );
//$NON-NLS-1$
+        setDescription( Messages.getString( "NewEntryObjectclassWizardPage.ObjectClassesDescription"
) ); //$NON-NLS-1$
         setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor(
             BrowserCommonConstants.IMG_ENTRY_WIZARD ) );
         setPageComplete( false );
@@ -193,7 +193,8 @@
             }
             if ( !hasOneStructuralOC )
             {
-                setMessage( Messages.getString("NewEntryObjectclassWizardPage.SelectStructuralObjectClass"),
WizardPage.WARNING ); //$NON-NLS-1$
+                setMessage(
+                    Messages.getString( "NewEntryObjectclassWizardPage.SelectStructuralObjectClass"
), WizardPage.WARNING ); //$NON-NLS-1$
             }
             else
             {
@@ -312,15 +313,17 @@
         composite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
 
         Label availableLabel = new Label( composite, SWT.NONE );
-        availableLabel.setText( Messages.getString("NewEntryObjectclassWizardPage.AvailableObjectClasses")
); //$NON-NLS-1$
+        availableLabel.setText( Messages.getString( "NewEntryObjectclassWizardPage.AvailableObjectClasses"
) ); //$NON-NLS-1$
         Label buttonLabel = new Label( composite, SWT.NONE );
         buttonLabel.setText( "" ); //$NON-NLS-1$
         Label selectedLabel = new Label( composite, SWT.NONE );
-        selectedLabel.setText( Messages.getString("NewEntryObjectclassWizardPage.SelectedObjectClasses")
); //$NON-NLS-1$
+        selectedLabel.setText( Messages.getString( "NewEntryObjectclassWizardPage.SelectedObjectClasses"
) ); //$NON-NLS-1$
 
         Composite availableObjectClassesComposite = BaseWidgetUtils.createColumnContainer(
composite, 1, 1 );
 
-        availableObjectClassesInstantSearch = BaseWidgetUtils.createText( availableObjectClassesComposite,
"", 1 ); //$NON-NLS-1$
+        availableObjectClassesInstantSearch = new Text( availableObjectClassesComposite,
SWT.NONE | SWT.BORDER
+            | SWT.SEARCH | SWT.CANCEL );
+        availableObjectClassesInstantSearch.setLayoutData( new GridData( GridData.FILL_HORIZONTAL
) );
         availableObjectClassesInstantSearch.addModifyListener( new ModifyListener()
         {
             public void modifyText( ModifyEvent e )
@@ -349,8 +352,8 @@
         } );
         ControlDecoration availableObjectClassesInstantSearchDecoration = new ControlDecoration(
             availableObjectClassesInstantSearch, SWT.TOP | SWT.LEFT, composite );
-        availableObjectClassesInstantSearchDecoration
-            .setDescriptionText( Messages.getString("NewEntryObjectclassWizardPage.FilterDescription")
); //$NON-NLS-1$
+        availableObjectClassesInstantSearchDecoration.setDescriptionText( Messages
+            .getString( "NewEntryObjectclassWizardPage.FilterDescription" ) ); //$NON-NLS-1$
         availableObjectClassesInstantSearchDecoration.setImage( FieldDecorationRegistry.getDefault()
             .getFieldDecoration( FieldDecorationRegistry.DEC_CONTENT_PROPOSAL ).getImage()
);
 
@@ -398,8 +401,10 @@
         data.grabExcessHorizontalSpace = true;
         data.grabExcessVerticalSpace = true;
         label0.setLayoutData( data );
-        addButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("NewEntryObjectclassWizardPage.AddButton"),
1 ); //$NON-NLS-1$
-        removeButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("NewEntryObjectclassWizardPage.RemoveButton"),
1 ); //$NON-NLS-1$
+        addButton = BaseWidgetUtils.createButton( buttonComposite, Messages
+            .getString( "NewEntryObjectclassWizardPage.AddButton" ), 1 ); //$NON-NLS-1$
+        removeButton = BaseWidgetUtils.createButton( buttonComposite, Messages
+            .getString( "NewEntryObjectclassWizardPage.RemoveButton" ), 1 ); //$NON-NLS-1$
         Label label3 = new Label( buttonComposite, SWT.NONE );
         data = new GridData();
         data.grabExcessHorizontalSpace = true;

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java?rev=812034&r1=812033&r2=812034&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java
Mon Sep  7 08:24:47 2009
@@ -225,7 +225,7 @@
 
         // create filter field
         toolkit.createLabel( client, Messages.getString( "SchemaPage.Filter" ) ); //$NON-NLS-1$
-        this.filterText = toolkit.createText( client, "", SWT.NONE ); //$NON-NLS-1$
+        this.filterText = toolkit.createText( client, "", SWT.NONE | SWT.SEARCH | SWT.CANCEL
); //$NON-NLS-1$
         this.filterText.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
         this.filterText.setData( FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER );
         this.filterText.addModifyListener( new ModifyListener()

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=812034&r1=812033&r2=812034&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
(original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
Mon Sep  7 08:24:47 2009
@@ -182,7 +182,7 @@
         searchFieldLabel.setLayoutData( new GridData( SWT.NONE, SWT.CENTER, false, false
) );
 
         // Search Text Field
-        searchField = new Text( searchFieldInnerComposite, SWT.BORDER );
+        searchField = new Text( searchFieldInnerComposite, SWT.BORDER | SWT.SEARCH | SWT.CANCEL
);
         if ( searchString != null )
         {
             searchField.setText( searchString );



Mime
View raw message