Merge lp:~tapaal-contributor/tapaal/simple-workspace-issues-1849780 into lp:tapaal

[Peter Haahr Taankvist]

Toggling advanced/simple workspace should now do the correct checks and update the GUI accordingly.

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2019-10-05 08:05:24 +0000
+++ src/pipe/gui/GuiFrame.java	2019-10-28 20:35:41 +0000
@@ -1020,18 +1020,34 @@
 		QueryDialog.setAdvancedView(advanced);
 		showComponents(advanced);
 		showConstants(advanced);
-
+		showConstantsAction.setSelected(advanced);
+		showComponentsAction.setSelected(advanced);
+		showQueriesAction.setSelected(true);
 		//Queries and enabled transitions should always be shown
 		showQueries(true);
 		showEnabledTransitionsList(true);
 		showToolTips(true);
 		CreateGui.getCurrentTab().setResizeingDefault();
-		if(!showZeroToInfinityIntervals()){
-			showZeroToInfinityIntervalsCheckBox.doClick();
-		}
-		if(!showTokenAge()){
-			showTokenAgeCheckBox.doClick();
-		}
+		if(advanced) {
+			
+			if(!showZeroToInfinityIntervals()){
+				showZeroToInfinityIntervalsCheckBox.doClick();
+			}
+			if(!showTokenAge()){
+				showTokenAgeCheckBox.doClick();
+			}
+			
+		} else {
+			if(showZeroToInfinityIntervals()) {
+				showZeroToInfinityIntervalsCheckBox.doClick();
+			}
+			if(showTokenAge()) {
+				showTokenAgeCheckBox.doClick();
+			}
+		}
+		
+		
+		
 		//Delay-enabled Transitions
 		//showDelayEnabledTransitions(advanced);
 		DelayEnabledTransitionControl.getInstance().setValue(new BigDecimal("0.1"));