On Sunday 29 June 2008 18:21, bombe at freenetproject.org wrote:
> Author: bombe
> Date: 2008-06-29 17:21:26 +0000 (Sun, 29 Jun 2008)
> New Revision: 20870
>
> Modified:
> trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
> trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java
> Log:
> version 0.5:
> hide container and replacement sections
> make mime type combo box editable
It should be possible to implement manual container selection in jSite
*without* requiring any additional functionality in the node. All you need to
do is insert zip files, and then insert redirects to files within them (using
the existing implicit containers support), no?
>
> Modified: trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
> ===================================================================
> --- trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
2008-06-29 17:16:21 UTC (rev 20869)
> +++ trunk/apps/jSite/src/de/todesbaum/jsite/gui/ProjectFilesPage.java
2008-06-29 17:21:26 UTC (rev 20870)
> @@ -74,7 +74,7 @@
>
> /**
> * Wizard page that lets the user manage the files of a project.
> - *
> + *
> * @author David ?Bombe? Roden <bombe at freenetproject.org>
> */
> public class ProjectFilesPage extends TWizardPage implements
ActionListener, ListSelectionListener, DocumentListener, FileScannerListener,
ChangeListener {
> @@ -123,7 +123,7 @@
>
> /**
> * Creates a new project file page.
> - *
> + *
> * @param wizard
> * The wizard the page belongs to
> */
> @@ -214,7 +214,7 @@
>
> /**
> * Creates the panel contains the project file list and options.
> - *
> + *
> * @return The created panel
> */
> private JComponent createProjectFilesPanel() {
> @@ -267,6 +267,7 @@
>
fileOptionsMIMETypeComboBox.setToolTipText(I18n.getMessage("jsite.project-files.mime-type.tooltip"));
> fileOptionsMIMETypeComboBox.setName("project-files.mime-type");
> fileOptionsMIMETypeComboBox.addActionListener(this);
> + fileOptionsMIMETypeComboBox.setEditable(true);
> fileOptionsMIMETypeComboBox.setEnabled(false);
>
> final TLabel mimeTypeLabel = new
TLabel(I18n.getMessage("jsite.project-files.mime-type") + ":", KeyEvent.VK_M,
fileOptionsMIMETypeComboBox);
> @@ -279,13 +280,21 @@
> fileOptionsContainerComboBox.setName("project-files.container");
> fileOptionsContainerComboBox.addActionListener(this);
> fileOptionsContainerComboBox.setEnabled(false);
> + fileOptionsContainerComboBox.setVisible(false);
>
> final TLabel containerLabel = new
TLabel(I18n.getMessage("jsite.project-files.container") + ":", KeyEvent.VK_C,
fileOptionsContainerComboBox);
> + containerLabel.setVisible(false);
> + JButton addContainerButton = new JButton(addContainerAction);
> + addContainerButton.setVisible(false);
> + JButton editContainerButton = new JButton(editContainerAction);
> + editContainerButton.setVisible(false);
> + JButton deleteContainerButton = new
> JButton(deleteContainerAction);
> + deleteContainerButton.setVisible(false);
> fileOptionsPanel.add(containerLabel, new GridBagConstraints(0,
> 6, 1, 1,
0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.NONE, new
Insets(6, 18, 0, 0), 0, 0));
> fileOptionsPanel.add(fileOptionsContainerComboBox, new
GridBagConstraints(1, 6, 1, 1, 1.0, 0.0, GridBagConstraints.LINE_START,
GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
> - fileOptionsPanel.add(new JButton(addContainerAction), new
GridBagConstraints(2, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
> - fileOptionsPanel.add(new JButton(editContainerAction), new
GridBagConstraints(3, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
> - fileOptionsPanel.add(new JButton(deleteContainerAction), new
GridBagConstraints(4, 6, 1, 1, 0.0, 0.0, GridBagConstraints.LINE_START,
GridBagConstraints.HORIZONTAL, new Insets(6, 6, 0, 0), 0, 0));
> + fileOptionsPanel.add(addContainerButton, new
> GridBagConstraints(2, 6, 1,
1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(6, 6, 0, 0), 0, 0));
> + fileOptionsPanel.add(editContainerButton, new
> GridBagConstraints(3, 6, 1,
1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(6, 6, 0, 0), 0, 0));
> + fileOptionsPanel.add(deleteContainerButton, new
> GridBagConstraints(4, 6,
1, 1, 0.0, 0.0, GridBagConstraints.LINE_START, GridBagConstraints.HORIZONTAL,
new Insets(6, 6, 0, 0), 0, 0));
>
> JPanel fileOptionsReplacementPanel = new JPanel(new
FlowLayout(FlowLayout.LEADING, 6, 6));
> fileOptionsReplacementPanel.setBorder(new EmptyBorder(-6, -6,
> -6, -6));
> @@ -295,6 +304,7 @@
>
replacementCheckBox.setToolTipText(I18n.getMessage("jsite.project-files.replacement.tooltip"));
> replacementCheckBox.addActionListener(this);
> replacementCheckBox.setEnabled(false);
> + replacementCheckBox.setVisible(false);
> fileOptionsReplacementPanel.add(replacementCheckBox);
>
> replaceEditionRangeSpinner = new JSpinner(new
> SpinnerNumberModel(0, 0,
99, 1));
> @@ -302,7 +312,9 @@
>
replaceEditionRangeSpinner.setToolTipText(I18n.getMessage("jsite.project-files.replacement.edition-range.tooltip"));
> replaceEditionRangeSpinner.addChangeListener(this);
> replaceEditionRangeSpinner.setEnabled(false);
> + replaceEditionRangeSpinner.setVisible(false);
> final JLabel editionRangeLabel = new
JLabel(I18n.getMessage("jsite.project-files.replacement.edition-range"));
> + editionRangeLabel.setVisible(false);
> fileOptionsReplacementPanel.add(editionRangeLabel);
> fileOptionsReplacementPanel.add(replaceEditionRangeSpinner);
>
> @@ -335,7 +347,7 @@
>
> /**
> * Sets the project whose files to manage.
> - *
> + *
> * @param project
> * The project whose files to manage
> */
> @@ -354,7 +366,7 @@
>
> /**
> * Returns a list of all project files.
> - *
> + *
> * @return All project files
> */
> private List<String> getProjectFiles() {
> @@ -610,7 +622,7 @@
> /**
> * Updates the options of the currently selected file with the changes
made
> * in the ?custom key? textfield.
> - *
> + *
> * @param documentEvent
> * The document event to process
> */
>
> Modified: trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java
> ===================================================================
> --- trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java 2008-06-29
17:16:21 UTC (rev 20869)
> +++ trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java 2008-06-29
17:21:26 UTC (rev 20870)
> @@ -27,7 +27,7 @@
> public class Version {
>
> /** The version. */
> - private static final String VERSION = "0.4.12.2";
> + private static final String VERSION = "0.5";
>
> /**
> * Returns the version.
>
> _______________________________________________
> cvs mailing list
> cvs at freenetproject.org
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL:
<https://emu.freenetproject.org/pipermail/devl/attachments/20080805/19ce0e76/attachment.pgp>
