Merge lp:~danilovesky/workcraft/trunk-bug-1350787 into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'WorkcraftCore/src/org/workcraft/Info.java'
--- WorkcraftCore/src/org/workcraft/Info.java	2015-02-28 23:14:51 +0000
+++ WorkcraftCore/src/org/workcraft/Info.java	2015-03-17 14:02:13 +0000
@@ -13,7 +13,7 @@
 	private static final int majorVersion = 3;
 	private static final int minorVersion = 0;
 	private static final int revisionVersion = 4;
-	private static final String statusVersion = "alpha"; // alpha, beta, rc1, rc2
+	private static final String statusVersion = null; // "alpha", "beta", "rc1", null (for release)
 
 	private static final int startYear = 2006;
 	private static final int currentYear = Calendar.getInstance().get(Calendar.YEAR);

=== modified file 'WorkcraftCore/src/org/workcraft/gui/MainWindow.java'
--- WorkcraftCore/src/org/workcraft/gui/MainWindow.java	2015-02-10 15:21:12 +0000
+++ WorkcraftCore/src/org/workcraft/gui/MainWindow.java	2015-03-17 14:02:13 +0000
@@ -23,8 +23,12 @@
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.DisplayMode;
 import java.awt.Font;
+import java.awt.Insets;
 import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.font.FontRenderContext;
@@ -346,6 +350,21 @@
 		utilityWindows.add(dockableWindow);
 	}
 
+	public void setWindowSize(boolean maximised, int width, int height){
+	    if(maximised){
+	        DisplayMode mode = this.getGraphicsConfiguration().getDevice().getDisplayMode();
+	        Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(this.getGraphicsConfiguration());
+	        this.setMaximizedBounds(new Rectangle(
+	                mode.getWidth() - insets.right - insets.left, 
+	                mode.getHeight() - insets.top - insets.bottom
+	        ));
+	        this.setExtendedState(this.getExtendedState() | JFrame.MAXIMIZED_BOTH);
+	        this.setSize(mode.getWidth() - insets.right - insets.left, mode.getHeight() - insets.top - insets.bottom); 
+	    }else{
+	        this.setExtendedState(JFrame.NORMAL);
+	    }
+	}
+	
 	public void startup() {
 		MainWindowIconManager.apply(this);
 
@@ -375,13 +394,6 @@
 		rootDockingPort = new DefaultDockingPort("defaultDockingPort");
 		content.add(rootDockingPort, BorderLayout.CENTER);
 
-		boolean maximised = Boolean.parseBoolean(framework
-				.getConfigVar("gui.main.maximised"));
-		String w = framework.getConfigVar("gui.main.width");
-		String h = framework.getConfigVar("gui.main.height");
-		int width = (w == null) ? 800 : Integer.parseInt(w);
-		int height = (h == null) ? 600 : Integer.parseInt(h);
-
 		lastSavePath = framework.getConfigVar("gui.main.lastSavePath");
 		lastOpenPath = framework.getConfigVar("gui.main.lastOpenPath");
 		for (int i = 0; i < CommonEditorSettings.getRecentCount(); i++) {
@@ -390,12 +402,23 @@
 		}
 		mainMenu.setRecentMenu(new ArrayList<String>(recentFiles));
 
+		String maximisedStr = framework.getConfigVar("gui.main.maximised");
+		String widthStr = framework.getConfigVar("gui.main.width");
+		String heightStr = framework.getConfigVar("gui.main.height");
+
+		boolean maximised = (maximisedStr == null) ? true : Boolean.parseBoolean(maximisedStr);
+        this.setExtendedState(maximised ? JFrame.MAXIMIZED_BOTH : JFrame.NORMAL);
+        
+       	DisplayMode mode = this.getGraphicsConfiguration().getDevice().getDisplayMode();
+       	Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(this.getGraphicsConfiguration());
+        int width = mode.getWidth() - insets.right - insets.left;
+        int height = mode.getHeight() - insets.top - insets.bottom;
+        if ((widthStr != null) && (heightStr != null)) {
+        	width = Integer.parseInt(widthStr);
+        	height = Integer.parseInt(heightStr);
+        }
 		this.setSize(width, height);
 
-		if (maximised) {
-			setExtendedState(MAXIMIZED_BOTH);
-		}
-
 		createWindows();
 
 		outputWindow.captureStream();
@@ -404,44 +427,50 @@
 		rootDockingPort.setBorderManager(new StandardBorderManager(
 				new ShadowBorder()));
 
-		outputDockable = createDockableWindow(outputWindow, "Output",
-				DockableWindowContentPanel.CLOSE_BUTTON,
-				DockingManager.SOUTH_REGION, 0.8f);
-		
-		DockableWindow problems = createDockableWindow(errorWindow, "Problems",
-				outputDockable, DockableWindowContentPanel.CLOSE_BUTTON);
-		
-		
-		DockableWindow javaScript = createDockableWindow(jsWindow,
-				"Javascript", outputDockable,
-				DockableWindowContentPanel.CLOSE_BUTTON);
-
-		DockableWindow wsvd = createDockableWindow(workspaceWindow,
-				"Workspace", DockableWindowContentPanel.CLOSE_BUTTON,
-				DockingManager.EAST_REGION, 0.8f);
+		float xSplit = 0.88f;
+		float ySplit = 0.82f;
+		outputDockable = createDockableWindow(
+				outputWindow, "Output",
+				DockableWindowContentPanel.CLOSE_BUTTON,
+				DockingManager.SOUTH_REGION, ySplit);
+		
+		DockableWindow problems = createDockableWindow(
+				errorWindow, "Problems", outputDockable, 
+				DockableWindowContentPanel.CLOSE_BUTTON);
+		
+		DockableWindow javaScript = createDockableWindow(
+				jsWindow, "Javascript",	outputDockable,	
+				DockableWindowContentPanel.CLOSE_BUTTON);
+
+		DockableWindow wsvd = createDockableWindow(
+				workspaceWindow, "Workspace", 
+				DockableWindowContentPanel.CLOSE_BUTTON,
+				DockingManager.EAST_REGION, xSplit);
+
 		DockableWindow propertyEditor = createDockableWindow(
 				propertyEditorWindow, "Property editor", wsvd,
 				DockableWindowContentPanel.CLOSE_BUTTON,
-				DockingManager.NORTH_REGION, 0.5f);
-		DockableWindow toolbox = createDockableWindow(toolboxWindow,
-				"Editor tools", propertyEditor,
-				DockableWindowContentPanel.HEADER
-						| DockableWindowContentPanel.CLOSE_BUTTON,
-				DockingManager.SOUTH_REGION, 0.5f);
-		DockableWindow tiw = createDockableWindow(toolInterfaceWindow,
-				"Tool controls", toolbox,
+				DockingManager.NORTH_REGION, ySplit);
+
+		DockableWindow tiw = createDockableWindow(
+				toolInterfaceWindow, "Tool controls", propertyEditor,
 				DockableWindowContentPanel.CLOSE_BUTTON,
-				DockingManager.SOUTH_REGION, 0.5f);
-
-		documentPlaceholder = createDockableWindow(new DocumentPlaceholder(),
-				"", null, outputDockable, 0, DockingManager.NORTH_REGION, 0.8f,
-				"DocumentPlaceholder");
+				DockingManager.SOUTH_REGION, 0.4f);
+
+		DockableWindow toolbox = createDockableWindow(
+				toolboxWindow, "Editor tools", tiw,
+				DockableWindowContentPanel.HEADER | DockableWindowContentPanel.CLOSE_BUTTON,
+				DockingManager.SOUTH_REGION, 0.82f);
+
+		documentPlaceholder = createDockableWindow(
+				new DocumentPlaceholder(), "", null, outputDockable, 
+				0, DockingManager.NORTH_REGION, ySplit, "DocumentPlaceholder");
 
 		DockingManager.display(outputDockable);
-		EffectsManager.setPreview(new AlphaPreview(Color.BLACK, Color.GRAY,
-				0.5f));
+		EffectsManager.setPreview(new AlphaPreview(Color.BLACK, Color.GRAY,	0.5f));
 
-		DockableWindow tasks = createDockableWindow(new TaskManagerWindow(), "Tasks", outputDockable,
+		DockableWindow tasks = createDockableWindow(
+				new TaskManagerWindow(), "Tasks", outputDockable,
 				DockableWindowContentPanel.CLOSE_BUTTON);
 
 		setVisible(true);
@@ -718,8 +747,9 @@
 		saveDockingLayout();
 
 		content.remove(rootDockingPort);
-
-		framework.setConfigVar("gui.main.maximised", Boolean.toString((getExtendedState() & JFrame.MAXIMIZED_BOTH) != 0));
+		
+		boolean maximised = ((getExtendedState() & JFrame.MAXIMIZED_BOTH) != 0);
+		framework.setConfigVar("gui.main.maximised", Boolean.toString(maximised));
 		framework.setConfigVar("gui.main.width", Integer.toString(getWidth()));
 		framework.setConfigVar("gui.main.height", Integer.toString(getHeight()));
 
@@ -928,7 +958,6 @@
 				}
 				openWork(f);
 			}
-			lastOpenPath = fc.getCurrentDirectory().getPath();
 		} else {
 			throw new OperationCancelledException("Open operation cancelled by user.");
 		}
@@ -943,6 +972,7 @@
 					createEditorWindow(we);
 				}
 				pushRecentFile(f.getPath(), true);
+				lastOpenPath = f.getParent();
 			} catch (DeserialisationException e) {
 				JOptionPane.showMessageDialog(this,
 					"A problem was encountered while trying to load \""	+ f.getPath() + "\".\n" 
@@ -964,7 +994,6 @@
 				}
 				mergeWork(f);
 			}
-			lastOpenPath = fc.getCurrentDirectory().getPath();
 		} else {
 			throw new OperationCancelledException("Merge operation cancelled by user.");
 		}
@@ -1098,7 +1127,6 @@
 			for (File f : fc.getSelectedFiles()) {
 				importFrom(f, importers);
 			}
-			lastOpenPath = fc.getCurrentDirectory().getPath();
 		}
 	}
 
@@ -1111,6 +1139,7 @@
 						ModelEntry me = Import.importFromFile(importer, f);
 						me.getModel().setTitle(FileUtils.getFileNameWithoutExtension(f));
 						framework.getWorkspace().add(Path.<String> empty(), f.getName(), me, false, me.isVisual());
+						lastOpenPath = f.getParent();
 						break;
 					} catch (IOException e) {
 						e.printStackTrace();

=== modified file 'build_distr.sh'
--- build_distr.sh	2015-01-26 22:10:33 +0000
+++ build_distr.sh	2015-03-17 14:02:13 +0000
@@ -92,9 +92,3 @@
 do
     cp -r $src_dir/$i $distr_dir/
 done
-
-# Copy config
-if [ -e $src_dir/config ]
-then
-    cp -r $src_dir/config $distr_dir/
-fi

=== modified file 'build_distr_linux.sh'
--- build_distr_linux.sh	2015-02-28 23:14:51 +0000
+++ build_distr_linux.sh	2015-03-17 14:02:13 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 src_dir="."
-distr_dir="../../workcraft_3.0.4_alpha"
+distr_dir="../../workcraft_3.0.4"
 template_dir="../../distr-template-linux"
 
 ./build_distr.sh -s $src_dir -d $distr_dir -t $template_dir

=== modified file 'build_distr_windows.sh'
--- build_distr_windows.sh	2015-02-28 23:14:51 +0000
+++ build_distr_windows.sh	2015-03-17 14:02:13 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 src_dir="."
-distr_dir="../../workcraft_3.0.4_alpha"
+distr_dir="../../workcraft_3.0.4"
 template_dir="../../distr-template-windows"
 
 ./build_distr.sh -s $src_dir -d $distr_dir -t $template_dir