X-Git-Url: https://git.pterodactylus.net/?p=jSite2.git;a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FFileManager.java;h=e9d6f3fad3fdddf74db8f44c2bd2ce8e7a41bc60;hp=dc0becdf9a045b5bf688b34ed156f7abcf922cba;hb=24a8594886b8b33ceae843571a662467ee9f8db7;hpb=df04b7034a7b7e672e87519d00b26a669615eff6

diff --git a/src/net/pterodactylus/jsite/gui/FileManager.java b/src/net/pterodactylus/jsite/gui/FileManager.java
index dc0becd..e9d6f3f 100644
--- a/src/net/pterodactylus/jsite/gui/FileManager.java
+++ b/src/net/pterodactylus/jsite/gui/FileManager.java
@@ -106,9 +106,6 @@ public class FileManager extends JDialog implements I18nable, ActionListener, Tr
 	/** The “set default file” action. */
 	private I18nAction setDefaultFileAction;
 
-	/** The “insert” action. */
-	private I18nAction insertAction;
-
 	/** The “project files” label. */
 	private I18nLabel projectFilesLabel;
 
@@ -140,13 +137,7 @@ public class FileManager extends JDialog implements I18nable, ActionListener, Tr
 	private JTextField fileSizeTextField;
 
 	/** The “override” label. */
-	private I18nLabel overrideLabel;
-
-	/** The “override active” action. */
-	private I18nAction overrideAction;
-
-	/** The “override action” checkbox. */
-	private JCheckBox overrideCheckBox;
+	private I18nLabel fileSettingsLabel;
 
 	/** The context menu for the tree. */
 	private JPopupMenu treeContextMenu;
@@ -266,24 +257,6 @@ public class FileManager extends JDialog implements I18nable, ActionListener, Tr
 				project.setDefaultFile(completePath);
 			}
 		};
-		insertAction = new I18nAction("fileManager.menu.item.insert") {
-
-			/**
-			 * {@inheritDoc}
-			 */
-			public void actionPerformed(ActionEvent e) {
-				/* TODO */
-			}
-		};
-		overrideAction = new I18nAction("fileManager.checkbox.overrideActive") {
-
-			/**
-			 * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
-			 */
-			public void actionPerformed(ActionEvent actionEvent) {
-				/* TODO */
-			}
-		};
 		applyInsertOverrideAction = new I18nAction("fileManager.menu.item.applyInsertOverride") {
 
 			/**
@@ -398,15 +371,12 @@ public class FileManager extends JDialog implements I18nable, ActionListener, Tr
 		propertiesPanel.add(fileSizeTextField, new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(12, 12, 0, 0), 0, 0));
 
 		/* override settings. */
-		overrideLabel = new I18nLabel("fileManager.label.override");
-		overrideLabel.setFont(overrideLabel.getFont().deriveFont(Font.BOLD));
-		propertiesPanel.add(overrideLabel, new GridBagConstraints(0, 4, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(24, 0, 0, 0), 0, 0));
-
-		overrideCheckBox = new JCheckBox(overrideAction);
-		propertiesPanel.add(overrideCheckBox, new GridBagConstraints(0, 5, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(12, 24, 0, 0), 0, 0));
+		fileSettingsLabel = new I18nLabel("fileManager.label.fileSettings");
+		fileSettingsLabel.setFont(fileSettingsLabel.getFont().deriveFont(Font.BOLD));
+		propertiesPanel.add(fileSettingsLabel, new GridBagConstraints(0, 4, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(24, 0, 0, 0), 0, 0));
 
 		/* glue panel. */
-		propertiesPanel.add(new JPanel(), new GridBagConstraints(0, 6, 2, 1, 1.0, 1.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
+		propertiesPanel.add(new JPanel(), new GridBagConstraints(0, 7, 2, 1, 1.0, 1.0, GridBagConstraints.LINE_START, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
 
 		/* action button panel */
 		JPanel actionButtonPanel = new JPanel(new FlowLayout(FlowLayout.LEADING, 12, 12));
@@ -484,6 +454,7 @@ public class FileManager extends JDialog implements I18nable, ActionListener, Tr
 		} else {
 			setDefaultFileAction.setEnabled(false);
 		}
+		overrideMenu.setVisible(selectedProjectFileWrappers.size() > 1);
 		treeContextMenu.show(fileTree, mouseEvent.getX(), mouseEvent.getY());
 	}
 
@@ -621,7 +592,6 @@ public class FileManager extends JDialog implements I18nable, ActionListener, Tr
 		filePathTextField.setText("");
 		fileNameTextField.setText("");
 		fileSizeTextField.setText("");
-		overrideAction.setEnabled(false);
 		if ((selectedPaths != null) && (selectedPaths.length == 1)) {
 			Object lastPathComponent = selectedPaths[0].getLastPathComponent();
 			if (!(lastPathComponent instanceof ProjectFileWrapper)) {
@@ -641,8 +611,8 @@ public class FileManager extends JDialog implements I18nable, ActionListener, Tr
 				fileNameTextField.setText(projectFile.getName());
 				fileSizeTextField.setText(String.valueOf(projectFile.getSize()));
 			}
-			overrideAction.setEnabled(true);
 		} else if ((selectedPaths != null) && (selectedPaths.length > 1)) {
+			/* TODO */
 		}
 	}