Sort fields in Settings by name

common/src/main/java/ctbrec/Settings.java

@@ -10,13 +10,6 @@ import ctbrec.event.EventHandlerConfiguration;
 
 public class Settings {
 
-    public enum ProxyType {
-        DIRECT,
-        HTTP,
-        SOCKS4,
-        SOCKS5
-    }
-
     public enum DirectoryStructure {
         FLAT("all recordings in one directory"),
         ONE_PER_MODEL("one directory for each model"),
@@ -33,84 +26,92 @@ public class Settings {
         }
     }
 
-    public boolean singlePlayer = true;
+    public enum ProxyType {
-    public boolean showPlayerStarting = false;
+        DIRECT,
-    public boolean localRecording = true;
+        HTTP,
-    public int httpPort = 8080;
+        SOCKS4,
-    public int httpTimeout = 10000;
+        SOCKS5
-    public String httpUserAgentMobile = "Mozilla/5.0 (Android 9.0; Mobile; rv:63.0) Gecko/63.0 Firefox/63.0";
+    }
-    public String httpUserAgent = "Mozilla/5.0 Gecko/20100101 Firefox/62.0";
+
-    public String httpServer = "localhost";
-    public String recordingsDir = System.getProperty("user.home") + File.separator + "ctbrec";
-    public DirectoryStructure recordingsDirStructure = DirectoryStructure.FLAT;
-    public long minimumSpaceLeftInBytes = 0;
-    public int minimumLengthInSeconds = 0;
-    public String mediaPlayer = "/usr/bin/mpv";
-    public String postProcessing = "";
-    public String username = ""; // chaturbate username TODO maybe rename this onetime
-    public String password = ""; // chaturbate password TODO maybe rename this onetime
-    public String chaturbateBaseUrl = "https://chaturbate.com";
-    public String bongaUsername = "";
-    public String bongaPassword = "";
     public String bongacamsBaseUrl = "https://bongacams.com";
-    public String mfcUsername = "";
+    public String bongaPassword = "";
-    public String mfcPassword = "";
+    public String bongaUsername = "";
-    public String mfcBaseUrl = "https://www.myfreecams.com";
-    public String mfcModelsTableSortColumn = "";
-    public String mfcModelsTableSortType = "";
-    public double[] mfcModelsTableColumnWidths = new double[0];
-    public String mfcModelsTableFilter = "";
-    public List<String> mfcDisabledModelsTableColumns = new ArrayList<>();
-    public boolean mfcIgnoreUpscaled = false;
-    public String camsodaUsername = "";
-    public String camsodaPassword = "";
-    public String cam4Username = "";
     public String cam4Password = "";
-    public String fc2liveUsername = "";
+    public String cam4Username = "";
+    public String camsodaPassword = "";
+    public String camsodaUsername = "";
+    public String chaturbateBaseUrl = "https://chaturbate.com";
+    public boolean chooseStreamQuality = false;
+    public String colorAccent = "#FFFFFF";
+    public String colorBase = "#FFFFFF";
+    public int concurrentRecordings = 0;
+    public boolean determineResolution = false;
+    public List<String> disabledSites = new ArrayList<>();
+    public List<EventHandlerConfiguration> eventHandlers = new ArrayList<>();
     public String fc2livePassword = "";
-    public String livejasminUsername = "";
+    public String fc2liveUsername = "";
-    public String livejasminPassword = "";
+    public String flirt4freePassword;
+    public String flirt4freeUsername;
+    public boolean generatePlaylist = true;
+    public int httpPort = 8080;
+    public String httpServer = "localhost";
+    public int httpTimeout = 10000;
+    public String httpUserAgent = "Mozilla/5.0 Gecko/20100101 Firefox/62.0";
+    public String httpUserAgentMobile = "Mozilla/5.0 (Android 9.0; Mobile; rv:63.0) Gecko/63.0 Firefox/63.0";
+    public byte[] key = null;
+    public String lastDownloadDir = "";
     public String livejasminBaseUrl = "https://www.livejasmin.com";
     public boolean livejasminBetaAcknowledged = false;
-    public String streamateUsername = "";
+    public String livejasminPassword = "";
-    public String streamatePassword = "";
+    public String livejasminUsername = "";
-    public String lastDownloadDir = "";
+    public boolean livePreviews = false;
-
+    public boolean localRecording = true;
+    public int maximumResolution = 0;
+    public String mediaPlayer = "/usr/bin/mpv";
+    public String mfcBaseUrl = "https://www.myfreecams.com";
+    public List<String> mfcDisabledModelsTableColumns = new ArrayList<>();
+    public boolean mfcIgnoreUpscaled = false;
+    public double[] mfcModelsTableColumnWidths = new double[0];
+    public String mfcModelsTableFilter = "";
+    public String mfcModelsTableSortColumn = "";
+    public String mfcModelsTableSortType = "";
+    public String mfcPassword = "";
+    public String mfcUsername = "";
+    public int minimumLengthInSeconds = 0;
+    public long minimumSpaceLeftInBytes = 0;
+    public Map<String, String> modelNotes = new HashMap<>();
     public List<Model> models = new ArrayList<>();
     public List<Model> modelsIgnored = new ArrayList<>();
-    public List<EventHandlerConfiguration> eventHandlers = new ArrayList<>();
-    public boolean determineResolution = false;
-    public boolean livePreviews = false;
-    public boolean requireAuthentication = false;
-    public boolean chooseStreamQuality = false;
-    public int maximumResolution = 0;
-    public int concurrentRecordings = 0;
-    public byte[] key = null;
-    public ProxyType proxyType = ProxyType.DIRECT;
-    public String proxyHost;
-    public String proxyPort;
-    public String proxyUser;
-    public String proxyPassword;
-    public String startTab = "Settings";
-    public int thumbWidth = 180;
-    public boolean updateThumbnails = true;
-    public int windowWidth = 1340;
-    public int windowHeight = 800;
-    public boolean windowMaximized = false;
-    public int windowX;
-    public int windowY;
-    public int splitRecordings = 0;
-    public List<String> disabledSites = new ArrayList<>();
-    public String colorBase = "#FFFFFF";
-    public String colorAccent = "#FFFFFF";
     public int onlineCheckIntervalInSecs = 60;
     public int overviewUpdateIntervalInSecs = 10;
+    public String password = ""; // chaturbate password TODO maybe rename this onetime
+    public String postProcessing = "";
+    public String proxyHost;
+    public String proxyPassword;
+    public String proxyPort;
+    public ProxyType proxyType = ProxyType.DIRECT;
+    public String proxyUser;
+    public double[] recordedModelsColumnWidths = new double[0];
     public String recordedModelsSortColumn = "";
     public String recordedModelsSortType = "";
-    public double[] recordedModelsColumnWidths = new double[0];
+    public double[] recordingsColumnWidths = new double[0];
+    public String recordingsDir = System.getProperty("user.home") + File.separator + "ctbrec";
+    public DirectoryStructure recordingsDirStructure = DirectoryStructure.FLAT;
     public String recordingsSortColumn = "";
     public String recordingsSortType = "";
-    public double[] recordingsColumnWidths = new double[0];
+    public boolean requireAuthentication = false;
-    public boolean generatePlaylist = true;
+    public boolean showPlayerStarting = false;
-    public Map<String, String> modelNotes = new HashMap<>();
+    public boolean singlePlayer = true;
+    public int splitRecordings = 0;
+    public String startTab = "Settings";
+    public String streamatePassword = "";
+    public String streamateUsername = "";
+    public int thumbWidth = 180;
+    public boolean updateThumbnails = true;
+    public String username = ""; // chaturbate username TODO maybe rename this onetime
+    public int windowHeight = 800;
+    public boolean windowMaximized = false;
+    public int windowWidth = 1340;
+    public int windowX;
+    public int windowY;
 }