Changeset 1039 for trunk/src

Timestamp:

04/27/16 14:15:47 (8 years ago)

Author:

davidb

Message:

Main Addition: full-screen audience mode. Also some whitespace and comment tidy-up.

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (4 diffs)
• DisplayIO.java (modified) (3 diffs)
• FrameGraphics.java (modified) (4 diffs)

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

@@ -117 +117 @@
                     _startFrame = "home1";
                 }
-                
+
                 // Prepare all expeditee and swing data on the AWT event thread.
                 SwingUtilities.invokeLater(new Runnable() {
@@ -267 +267 @@
                  */
                 setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
+                
                 // Expeditee handles its own repainting of AWT/Swing components
                 RepaintManager.setCurrentManager(ExpediteeRepaintManager.getInstance());
@@ -435 +435 @@
          */
         public void componentShown(ComponentEvent e) {
+                DisplayIO.fullScreenTransitionPending=false;
         }
 
@@ -447 +448 @@
 
         public void windowClosed(WindowEvent e) {
-                exit();
+                if (!DisplayIO.fullScreenTransitionPending) {
+                        exit();
+                }
         }
 

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

@@ -23 +23 @@
 import java.awt.Cursor;
 import java.awt.Dimension;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Point;
@@ -90 +92 @@
         private static HashSet<DisplayIOObserver> _displayIOObservers = new HashSet<DisplayIOObserver>();
 
+        private static GraphicsDevice screen = null;
+    
         /**
          * The title to display in the Title bar.
          */
-        public static String TITLE = "ExpDev";
+        public static String TITLE = "Expedite";
 
         private DisplayIO() {
@@ -116 +120 @@
                 _BackedUpFrames[0] = new Stack<String>();
                 _BackedUpFrames[1] = new Stack<String>();
-        }
-
+
+                GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+                screen = ge.getDefaultScreenDevice();
+                if (!screen.isFullScreenSupported()) {
+                        // Can this be printed to the MessageBuffer
+                        MessageBay.errorMessage("Full-screen mode not supported");
+                        screen =null;
+                }
+        }
+
+        public static boolean fullScreenTransitionPending = false;
+        public static int beforeFullScreenWidth  = 0;
+        public static int beforeFullScreenHeight = 0;
+        public static boolean fullScreenCapable()
+        {
+                return (screen!=null);
+        }
+        
+        public static void enterFullScreenMode()
+        {
+                if (screen!=null) {
+                        // Move all these routines to Browser?
+                        beforeFullScreenWidth  = _Browser.getWidth();
+                        beforeFullScreenHeight = _Browser.getHeight();
+                        
+                        fullScreenTransitionPending=true;
+                        _Browser.dispose();
+                        _Browser.setUndecorated(true);
+                        _Browser.pack();
+                        _Browser.setVisible(true);
+                        
+                        screen.setFullScreenWindow(_Browser);
+                
+                }
+                else {
+                        System.err.println("Warning: DisplayIO::enterFullScreenMode() called when not available -- ignoring");
+                }
+        }
+        
+        public static void leaveFullScreenMode()
+        {
+                fullScreenTransitionPending=true;
+                _Browser.dispose();
+                _Browser.setUndecorated(false);
+                _Browser.setSizes(new Dimension(beforeFullScreenWidth, beforeFullScreenHeight));
+                
+                screen.setFullScreenWindow(null);
+                _Browser.pack();
+                _Browser.setVisible(true);
+        }
+        
+        
         /**
          * Notifies observers that the frame has changed.

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

@@ -24 +24 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.Image;
@@ -69 +70 @@
 
         public static final int MODE_XRAY = 2;
-
-        // Start in XRay mode so that errors aren't thrown when parsing the profile
-        // frame if it has images on it
+        
+        public static final int MODE_AUDIENCE_FULLSCREEN = 4;
+        
+
+        // The following used to be true in the past:
+        //   Start in XRay mode so that errors aren't thrown when parsing the profile
+        //   frame if it has images on it
+        // More recently, so Exploratory Search starts up correctly with images
+        // rendered (rather than their @i form) the following assignment was changed
+        // to MODE_AUDIENCE.  No issue of parse errors has not been seen
         private static int _Mode = MODE_AUDIENCE;
 
@@ -87 +95 @@
                         ToggleXRayMode();
                 }
-
-                if (_Mode == MODE_AUDIENCE) {
+        
+
+                if (_Mode == MODE_AUDIENCE_FULLSCREEN) {
                         _Mode = MODE_NORMAL;
-                } else {
+                        DisplayIO.leaveFullScreenMode();
+                }
+                else if (_Mode == MODE_AUDIENCE) {
+                        if (DisplayIO.fullScreenCapable()) {
+                                // Don't need to worry about UpdateConnectedToAnnotations, as this
+                                // will have already been taken care of going to the 'first stage' of
+                                // audience mode (MODE_AUDIENCE)
+                                _Mode = MODE_AUDIENCE_FULLSCREEN;
+                                DisplayIO.enterFullScreenMode();
+                        }
+                        else {
+                                // return to normal mode
+                                _Mode = MODE_NORMAL;
+                        }
+                } 
+                else { // must currently be in regular mode => move to audience mode
                         _Mode = MODE_AUDIENCE;
                         ItemUtils.UpdateConnectedToAnnotations(current.getItems());
@@ -143 +167 @@
          */
         public static boolean isAudienceMode() {
-                return _Mode == MODE_AUDIENCE;
+                return (_Mode == MODE_AUDIENCE) || (_Mode == MODE_AUDIENCE_FULLSCREEN);
         }