diff --git a/src/main/java/zander/Start.java b/src/main/java/zander/Start.java index a0be718..507d68e 100644 --- a/src/main/java/zander/Start.java +++ b/src/main/java/zander/Start.java @@ -12,9 +12,6 @@ public class Start { public static final String CURATOR_VERSION = "1.0"; public static void main(String[] args) { - // TODO debug - System.setProperty("sun.java2d.uiScale", "2"); - registerSecretsFactories(); SwingUtilities.invokeLater(() -> new LibrarySelectFrame(args)); } diff --git a/src/main/java/zander/ui/library/LibraryCreateDialog.java b/src/main/java/zander/ui/library/LibraryCreateDialog.java index fa904c2..7768425 100644 --- a/src/main/java/zander/ui/library/LibraryCreateDialog.java +++ b/src/main/java/zander/ui/library/LibraryCreateDialog.java @@ -70,7 +70,7 @@ public class LibraryCreateDialog extends JDialog { passwordLabel = new JLabel("Password:"); passwordField = new JPasswordField(10); ftpModeLabel = new JLabel("FTP Mode:"); - ftpModeCombo = new JComboBox(new String[] { "Active", "Passive" }); + ftpModeCombo = new JComboBox(new String[] { "Passive", "Active" }); defaultPathCheck = new JCheckBox("Use default library location"); defaultPathCheck.setSelected(true); pathLabel = new JLabel("Library Path:"); diff --git a/src/main/java/zander/ui/library/LibraryEditDialog.java b/src/main/java/zander/ui/library/LibraryEditDialog.java index 8770768..852ed4d 100644 --- a/src/main/java/zander/ui/library/LibraryEditDialog.java +++ b/src/main/java/zander/ui/library/LibraryEditDialog.java @@ -78,8 +78,8 @@ public class LibraryEditDialog extends JDialog { passwordField = new JPasswordField(10); passwordField.setText(password); ftpModeLabel = new JLabel("FTP Mode:"); - ftpModeCombo = new JComboBox(new String[] { "Active", "Passive" }); - ftpModeCombo.setSelectedIndex(passiveMode ? 1 : 0); + ftpModeCombo = new JComboBox(new String[] { "Passive", "Active" }); + ftpModeCombo.setSelectedIndex(passiveMode ? 0 : 1); defaultPathCheck = new JCheckBox("Use default library location"); pathLabel = new JLabel("Library Path:"); pathField = new FileChooserField(10, file, new File(LibrarySelectFrame.DEFAULT_LIBRARY_PATH)); diff --git a/src/main/java/zander/ui/library/LibraryImportDialog.java b/src/main/java/zander/ui/library/LibraryImportDialog.java index 98488e4..30fee9d 100644 --- a/src/main/java/zander/ui/library/LibraryImportDialog.java +++ b/src/main/java/zander/ui/library/LibraryImportDialog.java @@ -62,7 +62,7 @@ public class LibraryImportDialog extends JDialog { passwordLabel = new JLabel("Password:"); passwordField = new JPasswordField(10); ftpModeLabel = new JLabel("FTP Mode:"); - ftpModeCombo = new JComboBox(new String[] { "Active", "Passive" }); + ftpModeCombo = new JComboBox(new String[] { "Passive", "Active" }); fileLabel = new JLabel("Source:"); fileField = new FileChooserField(10); fileField.getChooser().setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); diff --git a/src/main/resources/docs/library-create-dialog.png b/src/main/resources/docs/library-create-dialog.png index d9a0909..7238f5e 100644 Binary files a/src/main/resources/docs/library-create-dialog.png and b/src/main/resources/docs/library-create-dialog.png differ diff --git a/src/main/resources/docs/library-edit-dialog.png b/src/main/resources/docs/library-edit-dialog.png index 7a47b0e..93d6b92 100644 Binary files a/src/main/resources/docs/library-edit-dialog.png and b/src/main/resources/docs/library-edit-dialog.png differ diff --git a/src/main/resources/docs/library-import-dialog.png b/src/main/resources/docs/library-import-dialog.png index 11addc7..b0b62f2 100644 Binary files a/src/main/resources/docs/library-import-dialog.png and b/src/main/resources/docs/library-import-dialog.png differ diff --git a/src/main/resources/docs/local-library-settings.html b/src/main/resources/docs/local-library-settings.html index 6be9f2d..3aa4e31 100644 --- a/src/main/resources/docs/local-library-settings.html +++ b/src/main/resources/docs/local-library-settings.html @@ -4,18 +4,22 @@

Local Library Settings

Overview

- These dialogs create, import or alter the settings of libraries. These settings are primarily - for use of Curator and will not affect the Art Museum website. + These dialogs create, import or alter the settings of libraries. These + settings are primarily for use of Curator and will not affect the Art + Museum website.

Local vs Remote Library
- Remore libraries are instances of the Art Museum website. They are connected to by FTP. - Any changes made to them will be reflected in their respective Art Museum instance. + Remore libraries are instances of the Art Museum website. They are + connected to by FTP. Any changes made to them will be reflected in their + respective Art Museum instance.
- Local libraries, or caches, are instances of libraries located on your computer. When you connect - to a remote library, a local library is automatically created and sync with its remote counterpart. - Every time you connect to a remote library, its local counterpart is updated in this way. + Local libraries, or caches, are instances of libraries located on your + computer. When you connect to a remote library, a local library is + automatically created and sync with its remote counterpart. Every time + you connect to a remote library, its local counterpart is updated in this + way.

The library creation and remote import dialog.

@@ -29,16 +33,25 @@

The local library import dialog.

Options

    -
  • Name: library name in the select dialog. Does not affect website.
    • -
  • URL: url in the select dialog. Can be blank. Does not affect the website.
    • -
  • FTP: FTP server to connect to. Must be in the format of 'ftp://hostname:port/path/to/library'. - Protocol can also be FTPS by replacing 'ftp://' with 'ftps://'.
    • -
  • Username & Password: username and password to use to connect to FTP server.
    • -
  • Library Location (Source): location to save caches in. If 'User default library location' - is checked, it will be stored in the directory set in the global settings menu. +
  • Name: library name in the select dialog. Does not affect + website.
    • +
  • URL: url in the select dialog. Can be blank. Does not affect + the website.
    • +
  • FTP: FTP server to connect to. Must be in the format of + 'ftp://hostname:port/path/to/library'. Encryption is supported via + FTPS. To enable it, replace 'ftp://' with 'ftps://'.
    • +
  • Username & Password: username and password to use to connect to + FTP server.
    • +
  • FTP Mode: Whether to use active (PORT) or passive (PASV) FTP + mode. If you are unsure, it's best to start with passive and change to + active if you are having trouble connecting.
    • +
  • Library Location (Source): location to save caches in. If 'User + default library location' is checked, it will be stored in the directory + set in the global settings menu. See: Global Settings
    • -
  • Clear Cahce: clear library cahce. This does NOT affect the remote library. It only - clears the local cache. Doing this will cause a full re-download of the remote library next time it is +
  • Clear Cahce: clear library cahce. This does NOT affect + the remote library. It only clears the local cache. Doing this will + cause a full re-download of the remote library next time it is oppened.