Skip to content
Snippets Groups Projects
Commit a3ba4c61 authored by helene ortiz's avatar helene ortiz
Browse files

Implement "breaking news", allowing to display a specific message at

start.
parent 97393c64
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@
* Update class variable currentContainers in Switcher class to avoid problems when hiding/showing composites.
* Bug fixed: toggle parallel on an atomic command box was not synchronised between clients.
* Bug fixed: remove calls to parseXMLFile (replaced by parseXMLString)
* Implement "breaking news", allowing to display a specific message at start.
4.0.117 22/06/2021
-------
......
......@@ -30,6 +30,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import fr.ill.ics.bridge.ChangeManager;
import fr.ill.ics.bridge.Controller;
import fr.ill.ics.bridge.ControllerManager;
import fr.ill.ics.bridge.ErrorManager;
import fr.ill.ics.bridge.LoginManager;
......@@ -63,8 +64,11 @@ import fr.ill.ics.client.view.util.dialog.DialogManager;
import fr.ill.ics.client.view.util.listener.INewCountRepeaterFileListener;
import fr.ill.ics.client.view.util.listener.INewSlicesFileListener;
import fr.ill.ics.common.Nomad;
import fr.ill.ics.core.property.Property;
import fr.ill.ics.core.property.PropertyManager;
import fr.ill.ics.nscclient.notification.commandzone.ClientDisconnectedPublisher;
import fr.ill.ics.nscclient.serverconnection.ServerConnection;
import fr.ill.ics.nscclient.sessionmanagement.SessionManager;
import fr.ill.ics.util.ConfigManager;
import fr.ill.ics.util.ServerException;
import fr.ill.ics.util.exception.CommandNotFoundException;
......@@ -947,7 +951,7 @@ public class MainWindow implements ServerConfigurationChangeListener, ServerEnde
close(-4);
}
/*
// Particular code at start
public void breakingNews() {
// D11: ask if current beamstop is the right one
......@@ -966,5 +970,4 @@ public class MainWindow implements ServerConfigurationChangeListener, ServerEnde
}
}
}
*/
}
......@@ -383,6 +383,6 @@ public abstract class MainWindowPeer {
public abstract int getX();
public abstract int getY();
//public abstract void breakingNews(String message);
public abstract void breakingNews(String message);
}
\ No newline at end of file
......@@ -68,6 +68,7 @@ import fr.ill.ics.client.view.startup.StartupSplashDialog;
import fr.ill.ics.client.view.startup.swt.SWTStartupSplashDialog;
import fr.ill.ics.client.view.test.SWTLotsOfComposites;
import fr.ill.ics.client.view.token.swt.SWTTokenWidget;
import fr.ill.ics.client.view.util.dialog.DialogManager;
import fr.ill.ics.client.view.util.swt.SWTWidgetResourceManager;
import fr.ill.ics.client.view.util.timer.TimePublisher;
import fr.ill.ics.client.view.util.timer.swt.SWTTimePublisher;
......@@ -390,6 +391,8 @@ public class SWTMainWindowPeer extends MainWindowPeer {
Magnifier.getInstance().init();
shell.setRedraw(true);
MainWindow.getInstance().breakingNews();
// A timer is used to dispatch server events
new ServerEventTimer(display);
......@@ -664,17 +667,16 @@ public class SWTMainWindowPeer extends MainWindowPeer {
return shell.getLocation().y;
}
/*
@Override
public void breakingNews(String message) {
boolean userSaysYes = DialogManager.getInstance().nomadYesNoMessageDialog(message, "");
if (!userSaysYes) {
MainWindow.getInstance().goToNode(SelectionPlugin.SETTINGS_ID, "BeamStop");
}
}
*/
/*
public void openWaitingProgressionDialog() {
// Create a waiting dialog
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment