[DEL] GUI: Fullscreen mode removed

Author: ChristianGruen

basex-core/.settings/dictionary.txt

@@ -56,7 +56,6 @@ ft
 ftcontains
 ftdata
 ftnot
-fullscreen
 fulltext
 gath
 gruen

basex-core/src/main/java/org/basex/core/Text.java

@@ -948,8 +948,6 @@ public interface Text {
   /** Command info. */
   String FILTER_SELECTED = lang("filter_selected");
   /** Command info. */
-  String FULLSCREEN = lang("fullscreen");
-  /** Command info. */
   String GO_BACK = lang("go_back");
   /** Command info. */
   String GO_FORWARD = lang("go_forward");

basex-core/src/main/java/org/basex/gui/GUI.java

@@ -69,8 +69,6 @@ public final class GUI extends JFrame implements BaseXWindow {
   /** Indicates if a running command or operation is updating. */
   public boolean updating;
 
-  /** Fullscreen flag. */
-  boolean fullscreen;
   /** Button panel. */
   final BaseXBack buttons;
   /** Navigation/input panel. */
@@ -101,11 +99,6 @@ public final class GUI extends JFrame implements BaseXWindow {
   /** Indicates if a command is running. */
   private boolean running;
 
-  /** Menu panel height. */
-  private int menuHeight;
-  /** Fullscreen Window. */
-  private JFrame fullscr;
-
   /** Password reader. */
   private static volatile PasswordReader pwReader;
 
@@ -581,19 +574,13 @@ void updateControl(final JComponent comp, final boolean show, final String layou
     if(comp == status) {
       if(show) top.add(comp, layout);
       else top.remove(comp);
-    } else if(comp == menu) {
-      if(!show) menuHeight = menu.getHeight();
-      final int s = show ? menuHeight : 0;
-      comp.setPreferredSize(new Dimension(comp.getPreferredSize().width, s));
-      menu.setSize(menu.getWidth(), s);
     } else if(show) {
       control.add(comp, layout);
     } else {
       control.remove(comp);
     }
     setContentBorder();
-    final Component frame = fullscr == null ? getRootPane() : fullscr;
-    frame.validate();
+    getRootPane().validate();
     refreshControls(false);
   }
 
@@ -631,57 +618,6 @@ public void refreshControls(final boolean result) {
     menu.refresh();
   }
 
-  /**
-   * Toggles fullscreen mode.
-   */
-  void fullscreen() {
-    fullscreen ^= true;
-    fullscreen(fullscreen);
-  }
-
-  /**
-   * Turns fullscreen mode on/off.
-   * @param full fullscreen flag
-   */
-  public void fullscreen(final boolean full) {
-    if(full ^ fullscr == null) return;
-
-    if(full) {
-      control.remove(buttons);
-      control.remove(nav);
-      getRootPane().remove(menu);
-      top.remove(status);
-      remove(top);
-      fullscr = new JFrame();
-      fullscr.setIconImage(getIconImage());
-      fullscr.setTitle(getTitle());
-      fullscr.setUndecorated(true);
-      fullscr.setJMenuBar(menu);
-      fullscr.add(top);
-      fullscr.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-    } else {
-      fullscr.removeAll();
-      fullscr.dispose();
-      fullscr = null;
-      if(!gopts.get(GUIOptions.SHOWBUTTONS)) control.add(buttons, BorderLayout.CENTER);
-      if(!gopts.get(GUIOptions.SHOWINPUT)) control.add(nav, BorderLayout.SOUTH);
-      if(!gopts.get(GUIOptions.SHOWSTATUS)) top.add(status, BorderLayout.SOUTH);
-      setJMenuBar(menu);
-      add(top);
-    }
-
-    gopts.set(GUIOptions.SHOWBUTTONS, !full);
-    gopts.set(GUIOptions.SHOWINPUT, !full);
-    gopts.set(GUIOptions.SHOWSTATUS, !full);
-    fullscreen = full;
-
-    GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().setFullScreenWindow(
-        fullscr);
-    setContentBorder();
-    updateControl(menu, !full, BorderLayout.NORTH);
-    setVisible(!full);
-  }
-
   @Override
   public GUI gui() {
     return this;

basex-core/src/main/java/org/basex/gui/GUIConstants.java

@@ -119,7 +119,7 @@ public final class GUIConstants {
   }, {
     C_SHOW_EDITOR, C_SHOW_PROJECT, C_FIND_CONTENTS, SEPARATOR,
     C_SHOW_RESULT, C_SHOW_INFO, SEPARATOR,
-    C_SHOW_BUTTONS, C_SHOW_INPUT_BAR, C_SHOW_STATUS_BAR, Prop.MAC ? null : C_FULLSCREEN
+    C_SHOW_BUTTONS, C_SHOW_INPUT_BAR, C_SHOW_STATUS_BAR
   }, {
     C_SHOW_MAP, C_SHOW_TREE, C_SHOW_FOLDER, C_SHOW_PLOT, C_SHOW_TABLE, C_SHOW_EXPLORE,
   }, {

basex-core/src/main/java/org/basex/gui/GUIMenuCmd.java

@@ -745,19 +745,6 @@ public void execute(final GUI gui) {
     }
   },
 
-  /** Fullscreen mode. */
-  C_FULLSCREEN(FULLSCREEN, Prop.MAC ? "% shift F" : "F11", false, true) {
-    @Override
-    public void execute(final GUI gui) {
-      gui.fullscreen();
-    }
-
-    @Override
-    public boolean selected(final GUI gui) {
-      return gui.fullscreen;
-    }
-  },
-
   /* OPTION MENU */
 
   /** Real-time execution on/off. */

basex-core/src/main/java/org/basex/gui/view/View.java

@@ -101,10 +101,7 @@ public void mousePressed(final MouseEvent e) {
 
   @Override
   public void keyPressed(final KeyEvent e) {
-    if(gui.updating) return;
-    if(ESCAPE.is(e)) gui.fullscreen(false);
-
-    if(gui.context.data() == null) return;
+    if(gui.updating || gui.context.data() == null) return;
     if(SPACE.is(e)) {
       gui.notify.mark(sc(e) ? 2 : e.isShiftDown() ? 1 : 0, null);
     } else if(ENTER.is(e)) {

basex-core/src/main/resources/lang/Chinese.lang

@@ -142,7 +142,6 @@ first_line_header    = 将第一行作为表头
 folder               = 文件夹
 fonts                = 字体
 format               = 格式
-fullscreen           = 全屏
 fulltext             = 全文检索
 fulltext_index       = 全文索引
 general              = 常规

basex-core/src/main/resources/lang/Dutch.lang

@@ -142,7 +142,6 @@ first_line_header    = Schakel deze optie in om een header te gebruiken
 folder               = Directory
 fonts                = Fonts
 format               = Formaat
-fullscreen           = Volledig scherm
 fulltext             = Full-Text
 fulltext_index       = Full-Text index
 general              = Algemeen

basex-core/src/main/resources/lang/English.lang

@@ -142,7 +142,6 @@ first_line_header    = Parse first line as table header
 folder               = Folder
 fonts                = Fonts
 format               = Format
-fullscreen           = Fullscreen
 fulltext             = Full-Text
 fulltext_index       = Full-Text Index
 general              = General

basex-core/src/main/resources/lang/French.lang

@@ -142,7 +142,6 @@ first_line_header    = Analyser la première ligne comme entête de tableau
 folder               = Dossier
 fonts                = Polices
 format               = Format
-fullscreen           = Plein écran
 fulltext             = Plein-texte
 fulltext_index       = Index plein-texte
 general              = Général