UI texts and layout tweaks

cas-bioinf · Jan 5, 2017 · 0c048cc · 0c048cc
1 parent 472ff1d
commit 0c048cc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cy-genexpi/src/main/java/cz/cas/mbu/cygenexpi/internal/tasks/ConfigurationTask.java b/cy-genexpi/src/main/java/cz/cas/mbu/cygenexpi/internal/tasks/ConfigurationTask.java
@@ -129,15 +129,15 @@ protected ValidationState getValidationState(StringBuilder messageBuilder) {
 		if(selectedDeviceWrapper != null && selectedDeviceWrapper.getDevice().getType().contains(CLDevice.Type.GPU))
 		{
 			messageBuilder.append("You have selected a GPU platform.\n"
-					+ "It is strongly discouraged to use the GPU that runs your main display for computations as it may freeze your computer.\n");
+					+ "It is strongly discouraged to use a GPU for both computation and running a display.\n");
 
 			if(! preventFullOccupation)
 			{
 				messageBuilder.append(
 						"Selecting 'Prevent full occupation' may prevent some of the issues, bot does not work with all GPUs.");
 			}						
 			messageBuilder.append(
-					"\nAre you sure '" + selectedDeviceWrapper.getDevice().getName() + "' is not your main display?\n"
+					"\nAre you sure '" + selectedDeviceWrapper.getDevice().getName() + "' is not connected to a display?\n"
 						);
 
 			return ValidationState.REQUEST_CONFIRMATION;

diff --git a/cy-genexpi/src/main/java/cz/cas/mbu/cygenexpi/internal/ui/BatchTaggingPanel.java b/cy-genexpi/src/main/java/cz/cas/mbu/cygenexpi/internal/ui/BatchTaggingPanel.java
@@ -109,10 +109,10 @@ public BatchTaggingPanel(CyServiceRegistrar registrar, TaggingInfo info, Tagging
 		JSeparator separator = new JSeparator();
 		controlPanel.add(separator, "1, 1, 8, 1");
 
-		JButton btnApproveDisplayedTags = new JButton("Approve Tags");
+		JButton btnApproveDisplayedTags = new JButton("Approve Tags & Continue");
 		btnApproveDisplayedTags.setFont(new Font("Tahoma", Font.BOLD, 13));
 		btnApproveDisplayedTags.addActionListener(evt -> approveAllSelectedTags());
-		controlPanel.add(btnApproveDisplayedTags, "8, 2");
+		controlPanel.add(btnApproveDisplayedTags, "6, 2, 3, 1");
 
 		JButton btnRefresh = new JButton("Refresh");
 		controlPanel.add(btnRefresh, "6, 4");

diff --git a/cy-genexpi/src/main/java/cz/cas/mbu/cygenexpi/internal/ui/HumanTaggingPanel.java b/cy-genexpi/src/main/java/cz/cas/mbu/cygenexpi/internal/ui/HumanTaggingPanel.java
@@ -117,9 +117,9 @@ public HumanTaggingPanel(CyServiceRegistrar serviceRegistrar) {
 		currentTagTextField.setEditable(false);
 		currentTagTextField.setColumns(3);
 		FormLayout fl_panel = new FormLayout(new ColumnSpec[] {
-				ColumnSpec.decode("74px"),
+				FormSpecs.DEFAULT_COLSPEC,
 				FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
-				ColumnSpec.decode("108px:grow"),
+				ColumnSpec.decode("default:grow"),
 				FormSpecs.RELATED_GAP_COLSPEC,
 				FormSpecs.DEFAULT_COLSPEC,
 				FormSpecs.RELATED_GAP_COLSPEC,

diff --git a/cy-genexpi/src/main/java/cz/cas/mbu/cygenexpi/internal/ui/wizard/EnterErrorCheckingStep.java b/cy-genexpi/src/main/java/cz/cas/mbu/cygenexpi/internal/ui/wizard/EnterErrorCheckingStep.java
@@ -109,7 +109,7 @@ public EnterErrorCheckingStep() {
 		chckbxUseConstantSynthesis = new JCheckBox("Exclude genes fitted with constant synthesis");
 		add(chckbxUseConstantSynthesis, "2, 16, 3, 1");
 
-		JLabel lblifCheckedWe = new JLabel("<html>If checked, we will first try to fit the profiles by a simple model with consant synthesis and constant decay. If the genes can be fit well by this model, they can be fit also by any combination of regulators and thus genes found to be fit well by constant synthesis will be excluded from fitting by potential regulators.</html>");
+		JLabel lblifCheckedWe = new JLabel("<html>If checked, we will first try to fit the profiles by a simple model with constant synthesis and constant decay. If the genes can be fit well by this model, they can be fit also by any combination of regulators and thus genes found to be fit well by constant synthesis will be excluded from fitting by potential regulators.</html>");
 		lblifCheckedWe.setFont(new Font("Tahoma", Font.ITALIC, 11));
 		add(lblifCheckedWe, "4, 18");