From: David ‘Bombe’ Roden Date: Sun, 1 Jun 2008 14:33:14 +0000 (+0200) Subject: remove old override stuff X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=24a8594886b8b33ceae843571a662467ee9f8db7;p=jSite2.git remove old override stuff --- 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 */ } } diff --git a/src/net/pterodactylus/jsite/i18n/jSite.properties b/src/net/pterodactylus/jsite/i18n/jSite.properties index ef99606..b5bdb61 100644 --- a/src/net/pterodactylus/jsite/i18n/jSite.properties +++ b/src/net/pterodactylus/jsite/i18n/jSite.properties @@ -361,26 +361,8 @@ fileManager.label.fileName.mnemonic: VK_UNDEFINED fileManager.label.fileSize.name: File size fileManager.label.fileSize.mnemonic: VK_UNDEFINED -fileManager.label.override.name: Override -fileManager.label.override.mnemonic: VK_UNDEFINED - -fileManager.checkbox.overrideActive.name: Override active -fileManager.checkbox.overrideActive.mnemonic: VK_A -fileManager.checkbox.overrideActive.accelerator: Ctrl-VK_A -fileManager.checkbox.overrideActive.shortDescription: Whether the settings for this file should be overridden -fileManager.checkbox.overrideActive.longDescription: Whether the settings for this file should be overridden - -fileManager.checkbox.insertFile.name: Insert file -fileManager.checkbox.insertFile.mnemonic: VK_I -fileManager.checkbox.insertFile.accelerator: Ctrl-VK_I -fileManager.checkbox.insertFile.shortDescription: Whether to insert this file -fileManager.checkbox.insertFile.longDescription: Whether to insert this file - -fileManager.checkbox.useCustomMimeType.name: Use custom MIME type -fileManager.checkbox.useCustomMimeType.mnemonic: VK_M -fileManager.checkbox.useCustomMimeType.accelerator: Ctrl-VK_M -fileManager.checkbox.useCustomMimeType.shortDescription: Use a custom MIME type for the file -fileManager.checkbox.useCustomMimeType.longDescription: Use a cusstom MIME type for the file +fileManager.label.fileSettings.name: File Settings +fileManager.label.fileSettings.mnemonic: VK_UNDEFINED fileManager.menu.item.setDefaultFile.name: Set as default file fileManager.menu.item.setDefaultFile.mnemonic: VK_D diff --git a/src/net/pterodactylus/jsite/i18n/jSite_de.properties b/src/net/pterodactylus/jsite/i18n/jSite_de.properties index 486074e..72f68a8 100644 --- a/src/net/pterodactylus/jsite/i18n/jSite_de.properties +++ b/src/net/pterodactylus/jsite/i18n/jSite_de.properties @@ -361,26 +361,8 @@ fileManager.label.fileName.mnemonic: VK_UNDEFINED fileManager.label.fileSize.name: Dateigr\u00f6\u00dfe fileManager.label.fileSize.mnemonic: VK_UNDEFINED -fileManager.label.override.name: Vorgaben -fileManager.label.override.mnemonic: VK_UNDEFINED - -fileManager.checkbox.overrideActive.name: Andere Einstellungen -fileManager.checkbox.overrideActive.mnemonic: VK_A -fileManager.checkbox.overrideActive.accelerator: Ctrl-VK_A -fileManager.checkbox.overrideActive.shortDescription: Anderen Einstellungen für diese Datei aktivieren -fileManager.checkbox.overrideActive.longDescription: Anderen Einstellungen für diese Datei aktivieren - -fileManager.checkbox.insertFile.name: Datei einf\u00fcgen -fileManager.checkbox.insertFile.mnemonic: VK_E -fileManager.checkbox.insertFile.accelerator: Ctrl-VK_E -fileManager.checkbox.insertFile.shortDescription: Legt fest, ob diese Datei eingef\u00fcgt werden soll -fileManager.checkbox.insertFile.longDescription: Legt fest, ob diese Datei eingef\u00fcgt werden soll - -fileManager.checkbox.useCustomMimeType.name: Anderen MIME-Typ benutzen -fileManager.checkbox.useCustomMimeType.mnemonic: VK_M -fileManager.checkbox.useCustomMimeType.accelerator: Ctrl-VK_M -fileManager.checkbox.useCustomMimeType.shortDescription: Einen anderen MIME-Typ f\u00fcr die Datei benutzen -fileManager.checkbox.useCustomMimeType.longDescription: Einen anderen MIME-Typ f\u00fcr die Datei benutzen +fileManager.label.fileSettings.name: Dateieinstellungen +fileManager.label.fileSettings.mnemonic: VK_UNDEFINED fileManager.menu.item.setDefaultFile.name: Als Indexdatei benutzen fileManager.menu.item.setDefaultFile.mnemonic: VK_I