Replace case sensitive checkbox with a button using an icon.

eclipse · Jun 21, 2021 · f2d35f2 · f2d35f2
1 parent e41e13d
commit f2d35f2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/...lipse/plugins/org.eclipse.chemclipse.rcp.ui.icons/icons/16x16/caseSensitive.png b/...lipse/plugins/org.eclipse.chemclipse.rcp.ui.icons/icons/16x16/caseSensitive.png
diff --git a/...emclipse.rcp.ui.icons/src/org/eclipse/chemclipse/rcp/ui/icons/core/IApplicationImage.java b/...emclipse.rcp.ui.icons/src/org/eclipse/chemclipse/rcp/ui/icons/core/IApplicationImage.java
@@ -321,6 +321,7 @@ public static String getLocation(String fileName, String size) {
 	String IMAGE_EXPAND_ALL = PATH_PREFIX + "expand_all.gif";
 	String IMAGE_COLLAPSE_ALL = PATH_PREFIX + "collapse_all.gif";
 	String IMAGE_SEARCH = PATH_PREFIX + "search.gif";
+	String IMAGE_CASE_SENSITIVE = PATH_PREFIX + "caseSensitive.png";
 	String IMAGE_EVALUATE = PATH_PREFIX + "evaluate.gif";
 	String IMAGE_EVALUATED = PATH_PREFIX + "evaluated.gif";
 	String IMAGE_VALIDATE = PATH_PREFIX + "validate.gif";

diff --git a/...lipse.chemclipse.swt.ui/src/org/eclipse/chemclipse/swt/ui/components/SearchSupportUI.java b/...lipse.chemclipse.swt.ui/src/org/eclipse/chemclipse/swt/ui/components/SearchSupportUI.java
@@ -29,7 +29,7 @@
 public class SearchSupportUI extends Composite {
 
 	private Text text;
-	private Button checkbox;
+	private Button caseSensitiveButton;
 	private ISearchListener searchListener;
 
 	public SearchSupportUI(Composite parent, int style) {
@@ -72,7 +72,7 @@ public String getSearchText() {
 
 	public boolean isSearchCaseSensitive() {
 
-		return checkbox.getSelection();
+		return PreferenceSupplier.isSearchCaseSensitive();
 	}
 
 	private void createControl() {
@@ -87,7 +87,7 @@ private void createControl() {
 		//
 		createButtonSearch(composite);
 		text = createTextSearch(composite);
-		checkbox = createCheckBoxCaseSensitive(composite);
+		caseSensitiveButton = createButtonCaseSensitive(composite);
 	}
 
 	private Button createButtonSearch(Composite parent) {
@@ -152,18 +152,21 @@ public void widgetDefaultSelected(SelectionEvent e) {
 		return text;
 	}
 
-	private Button createCheckBoxCaseSensitive(Composite parent) {
+	private Button createButtonCaseSensitive(Composite parent) {
 
-		Button button = new Button(parent, SWT.CHECK);
+		Button button = new Button(parent, SWT.PUSH);
 		button.setText("");
 		button.setToolTipText("Search Case Sensitive");
-		button.setSelection(PreferenceSupplier.isSearchCaseSensitive());
+		boolean active = PreferenceSupplier.isSearchCaseSensitive();
+		button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_CASE_SENSITIVE, IApplicationImage.SIZE_16x16, active));
 		button.addSelectionListener(new SelectionAdapter() {
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 
-				PreferenceSupplier.setSearchCaseSensitive(button.getSelection());
+				boolean active = !PreferenceSupplier.isSearchCaseSensitive();
+				PreferenceSupplier.setSearchCaseSensitive(active);
+				button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_CASE_SENSITIVE, IApplicationImage.SIZE_16x16, active));
 				runSearch();
 			}
 		});
@@ -175,7 +178,7 @@ private void runSearch() {
 
 		if(searchListener != null) {
 			String searchText = text.getText().trim();
-			boolean caseSensitive = checkbox.getSelection();
+			boolean caseSensitive = PreferenceSupplier.isSearchCaseSensitive();
 			searchListener.performSearch(searchText, caseSensitive);
 		}
 	}