Implement homepage setting

javierllorente · Oct 12, 2024 · 383ed74 · 383ed74
1 parent 9f7f3aa
commit 383ed74
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/src/main/java/com/javierllorente/obsfx/App.java b/src/main/java/com/javierllorente/obsfx/App.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Javier Llorente <javier@opensuse.org>
+ * Copyright (C) 2023-2024 Javier Llorente <javier@opensuse.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ public class App extends Application {
     public static final String USERNAME = "username";
     public static final String PASSWORD = "password";
     public static final String API_URI = "api_uri";
+    public static final String HOMEPAGE = "homepage";
     public static final String AUTOLOGIN = "autologin"; 
 
     private final String applicationStyle = "style.css";

diff --git a/src/main/java/com/javierllorente/obsfx/BrowserController.java b/src/main/java/com/javierllorente/obsfx/BrowserController.java
@@ -167,6 +167,11 @@ public void initialize(URL url, ResourceBundle rb) {
         initPackageListView();
         initTabPane();
 
+        String username = preferences.get(App.USERNAME, "");
+        if (!username.isBlank()) {
+            String homepage = preferences.get(App.HOMEPAGE, "home:" + username);
+            locationTextField.setText(homepage);
+        }
         Platform.runLater(() -> locationTextField.requestFocus());
 
         bookmarksController.setBrowserController(this);
@@ -698,6 +703,10 @@ public void startProjectsTask() {
         new Thread(projectsTask).start();
         projectsTask.setOnSucceeded((t) -> {
             projects = projectsTask.getValue();
+            if (!locationTextField.getText().isBlank()) {
+                // Load homepage
+                load(locationTextField.getText());
+            }
             progressIndicator.setVisible(false);
         });
         projectsTask.setOnFailed((t) -> {
@@ -773,7 +782,7 @@ private void handleAbout() {
 
     public void autoLogin() {
         if (preferences.getBoolean(App.AUTOLOGIN, false)) {
-            handleLogin();
+            handleLogin();            
         }
     }
 
@@ -993,6 +1002,7 @@ private void updatePreferences(Map<String, String> data) {
         preferences.put(App.USERNAME, data.get(App.USERNAME));
         preferences.put(App.PASSWORD, data.get(App.PASSWORD));
         preferences.put(App.API_URI, data.get(App.API_URI));
+        preferences.put(App.HOMEPAGE, data.get(App.HOMEPAGE));
         preferences.put(App.AUTOLOGIN, data.get(App.AUTOLOGIN));
     }
 

diff --git a/src/main/java/com/javierllorente/obsfx/dialog/SettingsDialog.java b/src/main/java/com/javierllorente/obsfx/dialog/SettingsDialog.java
@@ -44,6 +44,7 @@
 public class SettingsDialog extends Dialog<Map<String, String>> {
 
     private TextField apiUriField;
+    private TextField homepageField;
 
     public SettingsDialog(Window window, Preferences preferences) {
         super();
@@ -82,6 +83,10 @@ public SettingsDialog(Window window, Preferences preferences) {
         apiUriField.setPrefWidth(260.0);
         apiUriField.setText(preferences.get(App.API_URI, ""));
 
+        homepageField = new TextField();
+        homepageField.setPrefWidth(260.0);
+        homepageField.setText(preferences.get(App.HOMEPAGE, ""));
+
         CheckBox autoLoginCheckBox = new CheckBox();
         autoLoginCheckBox.setSelected(preferences.getBoolean(App.AUTOLOGIN, false));
 
@@ -91,8 +96,10 @@ public SettingsDialog(Window window, Preferences preferences) {
         gridPane.add(passwordField, 1, 1);
         gridPane.add(new Label(App.getBundle().getString("settings.apiuri")), 0, 2);
         gridPane.add(apiUriField, 1, 2);
-        gridPane.add(new Label(App.getBundle().getString("settings.autologin")), 0, 3);
-        gridPane.add(autoLoginCheckBox, 1, 3);
+        gridPane.add(new Label(App.getBundle().getString("settings.homepage")), 0, 3);
+        gridPane.add(homepageField, 1, 3);
+        gridPane.add(new Label(App.getBundle().getString("settings.autologin")), 0, 4);
+        gridPane.add(autoLoginCheckBox, 1, 4);
 
         getDialogPane().setContent(gridPane);
         setResizable(true); // FIXME: Workaround for JavaFX 11
@@ -113,6 +120,7 @@ public SettingsDialog(Window window, Preferences preferences) {
                     Logger.getLogger(SettingsDialog.class.getName()).log(Level.SEVERE, null, ex);
                 }
                 data.put(App.API_URI, apiUriField.getText());
+                data.put(App.HOMEPAGE, homepageField.getText());
                 data.put(App.AUTOLOGIN, String.valueOf(autoLoginCheckBox.isSelected()));
                 return data;
             }

diff --git a/src/main/resources/com/javierllorente/obsfx/i18n/ApplicationBundle.properties b/src/main/resources/com/javierllorente/obsfx/i18n/ApplicationBundle.properties
@@ -49,6 +49,7 @@ shortcuts.download = Open download page
 shortcuts.exit = Exit
 settings.autologin = Autologin
 settings.apiuri = API URI:
+settings.homepage = Homepage:
 settings.username = Username:
 settings.password = password:
 settings.save = Save

diff --git a/src/main/resources/com/javierllorente/obsfx/i18n/ApplicationBundle_es_ES.properties b/src/main/resources/com/javierllorente/obsfx/i18n/ApplicationBundle_es_ES.properties
@@ -50,6 +50,7 @@ shortcuts.exit = Salir
 shortcuts.switch_tabs = Cambiar de pesta\u00f1a
 settings.autologin = Inicio autom\u00e1tico de sesi\u00f3n
 settings.apiuri = URI de la API:
+settings.homepage = P\u00e1gina de inicio:
 settings.email = Correo electr\u00f3nico:
 settings.username = Nombre de usuario:
 settings.password = Contrase\u00f1a: