Fix colors

anno-gui/src/main/java/org/genesys2/anno/gui/AppWindow.java

@@ -482,7 +482,7 @@ public class AppWindow {
 		});
 
 		tabFolder = new CTabFolder(sashForm, SWT.NONE);
-		tabFolder.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_NORMAL_SHADOW));
+		tabFolder.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
 		tabFolder.setSelectionBackground(Display.getCurrent().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT));
 
 		tableViewer = new TableViewer(sashForm, SWT.BORDER | SWT.FULL_SELECTION);

anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java

@@ -395,6 +395,8 @@ public class PushDialog extends Dialog {
 		});
 		tltmRadioItemDebug.setText("DEBUG");
 
+		// Set info log level
+		LogManager.getRootLogger().setLevel(Level.INFO);
 		ToolItem tltmRadioItemInfo = new ToolItem(toolBar, SWT.RADIO);
 		tltmRadioItemInfo.setSelection(true);
 		tltmRadioItemInfo.addSelectionListener(new SelectionAdapter() {
@@ -499,7 +501,7 @@ public class PushDialog extends Dialog {
 	protected void doPush(final GenesysOp operation) {
 
 		OAuthSettings oauthSettings = settings.getOauthSettings();
-		_log.info("Starting push to " + oauthSettings.getServerUrl());
+		_log.warn("Starting push to " + oauthSettings.getServerUrl());
 		final GenesysClient genesysClient = SpringConfig.createGenesysClient(oauthSettings);
 		this.pushProgress.sourceRowCount = 0;
 

anno-gui/src/main/java/org/genesys2/anno/gui/SheetDisplay.java

@@ -107,9 +107,11 @@ public class SheetDisplay extends Composite {
 	private ObjectMapper mapper;
 
 	final Color listBackgroundColor = SWTResourceManager.getColor(SWT.COLOR_LIST_BACKGROUND);
-	final Color unmappedColumnSelectedColor = SWTResourceManager.getColor(239, 239, 210);
-	final Color mappedColumnUnselectedColor = SWTResourceManager.getColor(199, 213, 235);
-	final Color mappedColumnSelectedColor = SWTResourceManager.getColor(117, 152, 206);
+	final Color listForegroundColor = SWTResourceManager.getColor(SWT.COLOR_LIST_FOREGROUND);
+	final Color unmappedColumnSelectedColor = SWTResourceManager.getColor(100, 50, 50);
+	final Color mappedColumnUnselectedColor = SWTResourceManager.getColor(50, 50, 100);
+	final Color mappedColumnSelectedColor = SWTResourceManager.getColor(50, 100, 50);
+	final Color mappedSelectedForegroundColor = SWTResourceManager.getColor(SWT.COLOR_WHITE);
 
 	private static class ContentProvider implements IStructuredContentProvider {
 		@Override
@@ -149,14 +151,18 @@ public class SheetDisplay extends Composite {
 			if (currentColumn.getRdfTerm() != null && !currentColumn.getRdfTerm().isEmpty()) {
 				if (currentColumn == selectedColumn) {
 					cell.setBackground(mappedColumnSelectedColor); // pink
+					cell.setForeground(mappedSelectedForegroundColor);
 				} else {
 					cell.setBackground(mappedColumnUnselectedColor); // light blue
+					cell.setForeground(mappedSelectedForegroundColor);
 				}
 			} else {
 				if (currentColumn == selectedColumn) {
 					cell.setBackground(unmappedColumnSelectedColor); // yellow
+					cell.setForeground(mappedSelectedForegroundColor);
 				} else {
 					cell.setBackground(listBackgroundColor); // default
+					cell.setForeground(listForegroundColor);
 				}
 			}
 		}
@@ -250,6 +256,7 @@ public class SheetDisplay extends Composite {
 		tbtmQuery.setText("SQL Query");
 
 		Composite compositeQuery = new Composite(tabFolder, SWT.NONE);
+		compositeQuery.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
 		compositeQuery.setLayout(new GridLayout(4, false));
 		tbtmQuery.setControl(compositeQuery);
 
@@ -293,7 +300,7 @@ public class SheetDisplay extends Composite {
 		tbtmColumnProperties.setText("Column");
 
 		ScrolledComposite scrolledComposite = new ScrolledComposite(tabFolder, SWT.V_SCROLL);
-		scrolledComposite.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
+		scrolledComposite.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
 		scrolledComposite.setExpandVertical(true);
 		scrolledComposite.setExpandHorizontal(true);
 		tbtmColumnProperties.setControl(scrolledComposite);
@@ -421,7 +428,7 @@ public class SheetDisplay extends Composite {
 		tbtmSheet.setText("Headers");
 
 		Composite compoHeaders = new Composite(tabFolder, SWT.NONE);
-		compoHeaders.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
+		compoHeaders.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
 		tbtmSheet.setControl(compoHeaders);
 		compoHeaders.setLayout(new GridLayout(2, false));
 		new Label(compoHeaders, SWT.NONE);
@@ -472,7 +479,7 @@ public class SheetDisplay extends Composite {
 		tbtmCSV.setText("CSV");
 
 		ScrolledComposite scrolledComposite2 = new ScrolledComposite(tabFolder, SWT.V_SCROLL);
-		scrolledComposite2.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
+		scrolledComposite2.setBackground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND));
 		scrolledComposite2.setExpandVertical(true);
 		scrolledComposite2.setExpandHorizontal(true);
 		tbtmCSV.setControl(scrolledComposite2);

anno-gui/src/main/java/org/genesys2/anno/gui/WorkspaceDialog.java

@@ -39,6 +39,7 @@ import org.eclipse.wb.swt.SWTResourceManager;
 
 import swing2swt.layout.BorderLayout;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.graphics.Point;
 
 public class WorkspaceDialog extends Dialog {
 
@@ -102,7 +103,8 @@ public class WorkspaceDialog extends Dialog {
 	 */
 	private void createContents() {
 		shlWorkspaceLauncher = new Shell(getParent(), SWT.CLOSE | SWT.RESIZE | SWT.TITLE);
-		shlWorkspaceLauncher.setSize(650, 194);
+		shlWorkspaceLauncher.setMinimumSize(new Point(600, 200));
+		shlWorkspaceLauncher.setSize(600, 200);
 		shlWorkspaceLauncher.setText("Workspace Launcher");
 		shlWorkspaceLauncher.setLayout(new BorderLayout(0, 0));