Changeset 1464 for trunk

Timestamp:

11/29/19 15:38:16 (4 years ago)

Author:

bnemhaus

Message:

Your current surrogate mode is now shown down the bottom, along with the help text.

File:

• trunk/src/org/expeditee/gui/MessageBay.java (modified) (4 diffs)

trunk/src/org/expeditee/gui/MessageBay.java

@@ -30 +30 @@
 import org.expeditee.core.Font;
 import org.expeditee.core.Image;
+import org.expeditee.encryption.items.surrogates.Label;
 import org.expeditee.gio.EcosystemManager;
 import org.expeditee.gio.GraphicsManager;
@@ -67 +68 @@
         
         private static Text _authorisedUser = null;
+        
+        private static Text _surrogateMode = null;
 
         /** Buffer image of the message window. */
@@ -206 +209 @@
                 if (AuthenticatorBrowser.isAuthenticated() && _authorisedUser != null) {
                         FrameGraphics.PaintItem(_authorisedUser);
+                }
+                
+                if (Label.isInSurrogateMode() && _surrogateMode != null) {
+                        FrameGraphics.PaintItem(_surrogateMode);
                 }
 
@@ -472 +479 @@
                 }
                 
-                _authorisedUser = new Text("Username: " + UserSettings.UserName.get());
+                _authorisedUser = new Text("Username: " + System.getProperty("user.name"));
                 _authorisedUser.setFont(new Font(Text.MONOSPACED_FONT));
                 _authorisedUser.setY(95);
                 _authorisedUser.setAnchorRight(1);
+                
+                if (Label.isInSurrogateMode()) {
+                        List<String> accessibleLabelsNames = Label.getAccessibleLabelsNames(DisplayController.getCurrentFrame().getPrimaryBody());
+                        if (accessibleLabelsNames.size() == 0) {
+                                _surrogateMode = new Text("Surrogate Mode: Unprivileged");
+                        } else {
+                                String list = String.join(",", accessibleLabelsNames);
+                                if (accessibleLabelsNames.size() > 1) { 
+                                        list = "(" + list + ")";
+                                } 
+                                _surrogateMode = new Text("Surrogate Mode: " + list);
+                        }
+                        _surrogateMode.setFont(new Font(Text.MONOSPACED_FONT));
+                        _surrogateMode.setY(75);
+                        _surrogateMode.setAnchorRight(1);
+                } else {
+                        if (_surrogateMode != null) {
+                                _surrogateMode.setVisible(false);
+                        }
+                }
 
                 // invalidateFullBay();