Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NomadGUI
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Instrument Control
NomadGUI
Commits
98842055
Commit
98842055
authored
4 years ago
by
helene ortiz
Browse files
Options
Downloads
Patches
Plain Diff
On close, save view state of launch pad only for main client and if
server is still running.
parent
9e212893
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-1
1 addition, 1 deletion
ChangeLog
src/main/java/fr/ill/ics/client/control/MainWindow.java
+5
-2
5 additions, 2 deletions
src/main/java/fr/ill/ics/client/control/MainWindow.java
with
6 additions
and
3 deletions
ChangeLog
+
1
−
1
View file @
98842055
...
...
@@ -4,7 +4,7 @@
* Post area in chat: now "multilined". Remove placeholder "Send message".
* For remote clients, if remote control is disabled, display info in window title and nothing about token state.
* New login button for remote access login screen.
* On close, save view state of launch pad only for main client.
* On close, save view state of launch pad only for main client
and if server is still running
.
4.0.18 29/05/2020
------
...
...
This diff is collapsed.
Click to expand it.
src/main/java/fr/ill/ics/client/control/MainWindow.java
+
5
−
2
View file @
98842055
...
...
@@ -442,8 +442,11 @@ public class MainWindow implements ServerConfigurationChangeListener, ServerEnde
ConfigManager
.
getInstance
().
savePreference
(
ConfigManager
.
MAGNIFY_FACTOR_INDEX
,
Magnifier
.
getScaleIndex
()
+
""
);
if
(
ConfigManager
.
getInstance
().
isMainClient
())
{
String
property
=
ConfigManager
.
LAUNCH_PAD_TEXT_MODE
+
"="
+
String
.
valueOf
(
CommandWindow
.
getInstance
().
getServerTabButton
().
getCommandWorkspace
().
isInTextMode
());
ResourceManager
.
getInstance
().
saveFile
(
ConfigManager
.
GLOBAL_PREFERENCES_FILE
,
property
,
ResourceManager
.
PROPERTIES_FILE
,
true
);
boolean
serverRunning
=
ServerConnection
.
getInstance
(
CommandZoneWrapper
.
SERVER_ID
).
serverExists
();
if
(
serverRunning
)
{
String
property
=
ConfigManager
.
LAUNCH_PAD_TEXT_MODE
+
"="
+
String
.
valueOf
(
CommandWindow
.
getInstance
().
getServerTabButton
().
getCommandWorkspace
().
isInTextMode
());
ResourceManager
.
getInstance
().
saveFile
(
ConfigManager
.
GLOBAL_PREFERENCES_FILE
,
property
,
ResourceManager
.
PROPERTIES_FILE
,
true
);
}
}
else
{
ConfigManager
.
getInstance
().
savePreference
(
ConfigManager
.
REMOTE_USER_NAME
,
UserConnection
.
getInstance
().
getUserName
());
ConfigManager
.
getInstance
().
savePreference
(
ConfigManager
.
REMOTE_INSTRUMENT
,
RemoteControlManager
.
getInstance
().
getInstrumentName
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment