From 4f84b1633c3f3c9a8af2fa5e15b29fb1b728bb2e Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 18 Mar 2012 02:14:41 +0100 Subject: [PATCH] Add insert priority to preferences panel. --- src/de/todesbaum/jsite/gui/PreferencesPage.java | 45 +++++++++++++++++++++++++ src/de/todesbaum/jsite/i18n/jSite.properties | 1 + src/de/todesbaum/jsite/i18n/jSite_de.properties | 1 + src/de/todesbaum/jsite/i18n/jSite_fr.properties | 1 + 4 files changed, 48 insertions(+) diff --git a/src/de/todesbaum/jsite/gui/PreferencesPage.java b/src/de/todesbaum/jsite/gui/PreferencesPage.java index 8885caa..66ab6ab 100644 --- a/src/de/todesbaum/jsite/gui/PreferencesPage.java +++ b/src/de/todesbaum/jsite/gui/PreferencesPage.java @@ -30,6 +30,7 @@ import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JCheckBox; +import javax.swing.JComboBox; import javax.swing.JFileChooser; import javax.swing.JLabel; import javax.swing.JPanel; @@ -39,6 +40,7 @@ import javax.swing.JTextField; import de.todesbaum.jsite.i18n.I18n; import de.todesbaum.jsite.i18n.I18nContainer; import de.todesbaum.jsite.main.ConfigurationLocator.ConfigurationLocation; +import de.todesbaum.util.freenet.fcp2.PriorityClass; import de.todesbaum.util.swing.TWizard; import de.todesbaum.util.swing.TWizardPage; @@ -70,6 +72,9 @@ public class PreferencesPage extends TWizardPage { /** Action when selecting “use early encode.” */ private Action useEarlyEncodeAction; + /** Action when a priority was selected. */ + private Action priorityAction; + /** The text field containing the directory. */ private JTextField tempDirectoryTextField; @@ -82,6 +87,9 @@ public class PreferencesPage extends TWizardPage { /** Whether to use “early encode.” */ private boolean useEarlyEncode; + /** The prioriy for inserts. */ + private PriorityClass priority; + /** The “default” button. */ private JRadioButton defaultTempDirectory; @@ -100,6 +108,9 @@ public class PreferencesPage extends TWizardPage { /** The “use early encode” checkbox. */ private JCheckBox useEarlyEncodeCheckBox; + /** The insert priority select box. */ + private JComboBox insertPriorityComboBox; + /** * Creates a new “preferences” page. * @@ -231,6 +242,25 @@ public class PreferencesPage extends TWizardPage { } /** + * Returns the configured insert priority. + * + * @return The insert priority + */ + public PriorityClass getPriority() { + return priority; + } + + /** + * Sets the insert priority. + * + * @param priority + * The insert priority + */ + public void setPriority(PriorityClass priority) { + insertPriorityComboBox.setSelectedItem(priority); + } + + /** * {@inheritDoc} */ @Override @@ -314,6 +344,13 @@ public class PreferencesPage extends TWizardPage { useEarlyEncode = useEarlyEncodeCheckBox.isSelected(); } }; + priorityAction = new AbstractAction(I18n.getMessage("jsite.preferences.insert-options.priority")) { + + @SuppressWarnings("synthetic-access") + public void actionPerformed(ActionEvent actionEvent) { + priority = (PriorityClass) insertPriorityComboBox.getSelectedItem(); + } + }; I18nContainer.getInstance().registerRunnable(new Runnable() { @@ -389,6 +426,13 @@ public class PreferencesPage extends TWizardPage { useEarlyEncodeCheckBox = new JCheckBox(useEarlyEncodeAction); preferencesPanel.add(useEarlyEncodeCheckBox, new GridBagConstraints(0, 8, 3, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0)); + final JLabel insertPriorityLabel = new JLabel(I18n.getMessage("jsite.preferences.insert-options.priority")); + preferencesPanel.add(insertPriorityLabel, new GridBagConstraints(0, 9, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new Insets(6, 18, 0, 0), 0, 0)); + + insertPriorityComboBox = new JComboBox(new PriorityClass[] { PriorityClass.MINIMUM, PriorityClass.PREFETCH, PriorityClass.BULK, PriorityClass.UPDATABLE, PriorityClass.SEMI_INTERACTIVE, PriorityClass.INTERACTIVE, PriorityClass.MAXIMUM }); + insertPriorityComboBox.setAction(priorityAction); + preferencesPanel.add(insertPriorityComboBox, new GridBagConstraints(1, 9, 2, 1, 1.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.VERTICAL, new Insets(0, 18, 0, 0), 0, 0)); + I18nContainer.getInstance().registerRunnable(new Runnable() { /** @@ -398,6 +442,7 @@ public class PreferencesPage extends TWizardPage { tempDirectoryLabel.setText("" + I18n.getMessage("jsite.preferences.temp-directory") + ""); configurationDirectoryLabel.setText("" + I18n.getMessage("jsite.preferences.config-directory") + ""); insertOptionsLabel.setText("" + I18n.getMessage("jsite.preferences.insert-options") + ""); + insertPriorityLabel.setText(I18n.getMessage("jsite.preferences.insert-options.priority")); } }); diff --git a/src/de/todesbaum/jsite/i18n/jSite.properties b/src/de/todesbaum/jsite/i18n/jSite.properties index ce76032..e897179 100644 --- a/src/de/todesbaum/jsite/i18n/jSite.properties +++ b/src/de/todesbaum/jsite/i18n/jSite.properties @@ -79,6 +79,7 @@ jsite.preferences.config-directory.home=Home directory jsite.preferences.config-directory.custom=Custom directory jsite.preferences.insert-options=Insert options jsite.preferences.insert-options.use-early-encode=Generate final URI early +jsite.preferences.insert-options.priority=Priority jsite.insert.heading=Project insert jsite.insert.description=Please wait while the project is being inserted. diff --git a/src/de/todesbaum/jsite/i18n/jSite_de.properties b/src/de/todesbaum/jsite/i18n/jSite_de.properties index b59134e..2fd1564 100644 --- a/src/de/todesbaum/jsite/i18n/jSite_de.properties +++ b/src/de/todesbaum/jsite/i18n/jSite_de.properties @@ -79,6 +79,7 @@ jsite.preferences.config-directory.home=Benutzerverzeichnis jsite.preferences.config-directory.custom=Angegebenes Verzeichnis jsite.preferences.insert-options=Einf\u00fcgeoptionen jsite.preferences.insert-options.use-early-encode=Endg\u00fcltige URI fr\u00fcher berechnen +jsite.preferences.insert-options.priority=Priorit\u00e4t jsite.insert.heading=Projekt einf\u00fcgen jsite.insert.description=Bitte warten Sie, w\u00e4hrend das Projekt eingef\u00fcgt wird. diff --git a/src/de/todesbaum/jsite/i18n/jSite_fr.properties b/src/de/todesbaum/jsite/i18n/jSite_fr.properties index 816c3a9..143ef16 100644 --- a/src/de/todesbaum/jsite/i18n/jSite_fr.properties +++ b/src/de/todesbaum/jsite/i18n/jSite_fr.properties @@ -79,6 +79,7 @@ jsite.preferences.config-directory.home=Home directory jsite.preferences.config-directory.custom=Custom directory jsite.preferences.insert-options=Insert options jsite.preferences.insert-options.use-early-encode=Generate final URI early +jsite.preferences.insert-options.priority=Priority jsite.insert.heading=Projet d'insertion jsite.insert.description=Veuillez attendre durant l'insertion du projet. -- 2.7.4