diff --git a/README.md b/README.md index a75ae1046d..250f71abb3 100644 --- a/README.md +++ b/README.md @@ -115,46 +115,46 @@ Stirling-PDF currently supports 40 languages! | Language | Progress | | -------------------------------------------- | -------------------------------------- | -| Arabic (العربية) (ar_AR) |  | -| Azerbaijani (Azərbaycan Dili) (az_AZ) |  | -| Basque (Euskara) (eu_ES) |  | +| Arabic (العربية) (ar_AR) |  | +| Azerbaijani (Azərbaycan Dili) (az_AZ) |  | +| Basque (Euskara) (eu_ES) |  | | Bulgarian (Български) (bg_BG) |  | -| Catalan (Català) (ca_CA) |  | -| Croatian (Hrvatski) (hr_HR) |  | -| Czech (Česky) (cs_CZ) |  | +| Catalan (Català) (ca_CA) |  | +| Croatian (Hrvatski) (hr_HR) |  | +| Czech (Česky) (cs_CZ) |  | | Danish (Dansk) (da_DK) |  | | Dutch (Nederlands) (nl_NL) |  | | English (English) (en_GB) |  | | English (US) (en_US) |  | -| French (Français) (fr_FR) |  | -| German (Deutsch) (de_DE) |  | -| Greek (Ελληνικά) (el_GR) |  | -| Hindi (हिंदी) (hi_IN) |  | -| Hungarian (Magyar) (hu_HU) |  | -| Indonesian (Bahasa Indonesia) (id_ID) |  | -| Irish (Gaeilge) (ga_IE) |  | -| Italian (Italiano) (it_IT) |  | -| Japanese (日本語) (ja_JP) |  | -| Korean (한국어) (ko_KR) |  | +| French (Français) (fr_FR) |  | +| German (Deutsch) (de_DE) |  | +| Greek (Ελληνικά) (el_GR) |  | +| Hindi (हिंदी) (hi_IN) |  | +| Hungarian (Magyar) (hu_HU) |  | +| Indonesian (Bahasa Indonesia) (id_ID) |  | +| Irish (Gaeilge) (ga_IE) |  | +| Italian (Italiano) (it_IT) |  | +| Japanese (日本語) (ja_JP) |  | +| Korean (한국어) (ko_KR) |  | | Norwegian (Norsk) (no_NB) |  | | Persian (فارسی) (fa_IR) |  | -| Polish (Polski) (pl_PL) |  | -| Portuguese (Português) (pt_PT) |  | -| Portuguese Brazilian (Português) (pt_BR) |  | -| Romanian (Română) (ro_RO) |  | -| Russian (Русский) (ru_RU) |  | +| Polish (Polski) (pl_PL) |  | +| Portuguese (Português) (pt_PT) |  | +| Portuguese Brazilian (Português) (pt_BR) |  | +| Romanian (Română) (ro_RO) |  | +| Russian (Русский) (ru_RU) |  | | Serbian Latin alphabet (Srpski) (sr_LATN_RS) |  | -| Simplified Chinese (简体中文) (zh_CN) |  | -| Slovakian (Slovensky) (sk_SK) |  | +| Simplified Chinese (简体中文) (zh_CN) |  | +| Slovakian (Slovensky) (sk_SK) |  | | Slovenian (Slovenščina) (sl_SI) |  | -| Spanish (Español) (es_ES) |  | -| Swedish (Svenska) (sv_SE) |  | -| Thai (ไทย) (th_TH) |  | +| Spanish (Español) (es_ES) |  | +| Swedish (Svenska) (sv_SE) |  | +| Thai (ไทย) (th_TH) |  | | Tibetan (བོད་ཡིག་) (bo_CN) |  | -| Traditional Chinese (繁體中文) (zh_TW) |  | -| Turkish (Türkçe) (tr_TR) |  | -| Ukrainian (Українська) (uk_UA) |  | -| Vietnamese (Tiếng Việt) (vi_VN) |  | +| Traditional Chinese (繁體中文) (zh_TW) |  | +| Turkish (Türkçe) (tr_TR) |  | +| Ukrainian (Українська) (uk_UA) |  | +| Vietnamese (Tiếng Việt) (vi_VN) |  | | Malayalam (മലയാളം) (ml_IN) |  | ## Stirling PDF Enterprise diff --git a/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java b/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java index b8fa08739d..3bcc48715b 100644 --- a/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java +++ b/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java @@ -258,12 +258,6 @@ public class AppConfig { return false; } - @Bean(name = "GoogleDriveEnabled") - @Profile("default") - public boolean googleDriveEnabled() { - return false; - } - @Bean(name = "license") @Profile("default") public String licenseType() { diff --git a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java index 7eeace787a..14704d8257 100644 --- a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java +++ b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java @@ -530,7 +530,6 @@ public class ApplicationProperties { private boolean ssoAutoLogin; private boolean database; private CustomMetadata customMetadata = new CustomMetadata(); - private GoogleDrive googleDrive = new GoogleDrive(); @Data public static class CustomMetadata { @@ -549,26 +548,6 @@ public class ApplicationProperties { : producer; } } - - @Data - public static class GoogleDrive { - private boolean enabled; - private String clientId; - private String apiKey; - private String appId; - - public String getClientId() { - return clientId == null || clientId.trim().isEmpty() ? "" : clientId; - } - - public String getApiKey() { - return apiKey == null || apiKey.trim().isEmpty() ? "" : apiKey; - } - - public String getAppId() { - return appId == null || appId.trim().isEmpty() ? "" : appId; - } - } } @Data diff --git a/app/common/src/test/java/stirling/software/common/model/ApplicationPropertiesLogicTest.java b/app/common/src/test/java/stirling/software/common/model/ApplicationPropertiesLogicTest.java index da83fd4620..66078099fe 100644 --- a/app/common/src/test/java/stirling/software/common/model/ApplicationPropertiesLogicTest.java +++ b/app/common/src/test/java/stirling/software/common/model/ApplicationPropertiesLogicTest.java @@ -109,22 +109,6 @@ class ApplicationPropertiesLogicTest { assertTrue(ex.getMessage().toLowerCase().contains("not supported")); } - @Test - void premium_google_drive_getters_return_empty_string_on_null_or_blank() { - Premium.ProFeatures.GoogleDrive gd = new Premium.ProFeatures.GoogleDrive(); - - assertEquals("", gd.getClientId()); - assertEquals("", gd.getApiKey()); - assertEquals("", gd.getAppId()); - - gd.setClientId(" id "); - gd.setApiKey(" key "); - gd.setAppId(" app "); - assertEquals(" id ", gd.getClientId()); - assertEquals(" key ", gd.getApiKey()); - assertEquals(" app ", gd.getAppId()); - } - @Test void ui_getters_return_null_for_blank() { ApplicationProperties.Ui ui = new ApplicationProperties.Ui(); diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java index 6d9263270e..072471e5cd 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java @@ -98,11 +98,6 @@ public class ConfigController { if (applicationContext.containsBean("license")) { configData.put("license", applicationContext.getBean("license", String.class)); } - if (applicationContext.containsBean("GoogleDriveEnabled")) { - configData.put( - "GoogleDriveEnabled", - applicationContext.getBean("GoogleDriveEnabled", Boolean.class)); - } if (applicationContext.containsBean("SSOAutoLogin")) { configData.put( "SSOAutoLogin", diff --git a/app/core/src/main/resources/messages_en_GB.properties b/app/core/src/main/resources/messages_en_GB.properties index 405643877d..99fb34b0db 100644 --- a/app/core/src/main/resources/messages_en_GB.properties +++ b/app/core/src/main/resources/messages_en_GB.properties @@ -1946,6 +1946,25 @@ viewer.zoomIn=Zoom in # Tool Picker toolPicker.searchPlaceholder=Search tools... toolPicker.noToolsFound=No tools found +toolPanel.toggle.legacy=Switch to legacy mode +toolPanel.toggle.sidebar=Switch to sidebar mode +toolPanel.placeholder=Choose a tool to get started +toolPanel.legacy.heading=All tools (legacy view) +toolPanel.legacy.tagline=Browse and launch tools while keeping the classic full-width gallery. +toolPanel.legacy.descriptionsOn=Showing descriptions +toolPanel.legacy.descriptionsOff=Descriptions hidden +toolPanel.legacy.noResults=Try adjusting your search or toggle descriptions to find what you need. +toolPanel.legacy.matchedSynonym=Matches "{{text}}" +toolPanel.modePrompt.title=Choose how you browse tools +toolPanel.modePrompt.description=Preview both layouts and decide how you want to explore Stirling PDF tools. +toolPanel.modePrompt.sidebarTitle=Advanced sidebar +toolPanel.modePrompt.sidebarDescription=Keep tools alongside your workspace for quick switching. +toolPanel.modePrompt.recommended=Recommended +toolPanel.modePrompt.chooseSidebar=Use advanced sidebar +toolPanel.modePrompt.legacyTitle=Legacy fullscreen +toolPanel.modePrompt.legacyDescription=Browse every tool in a catalogue that covers the workspace until you pick one. +toolPanel.modePrompt.chooseLegacy=Use legacy fullscreen +toolPanel.modePrompt.dismiss=Maybe later pageEditor.reset=Reset Changes pageEditor.zoomIn=Zoom In pageEditor.zoomOut=Zoom Out @@ -1958,3 +1977,39 @@ viewer.nextPage=Next Page viewer.pageNavigation=Page Navigation viewer.currentPage=Current Page viewer.totalPages=Total Pages +toolPanel.legacy.favorites=Favourites +toolPanel.legacy.recent=Recently used +toolPanel.legacy.favorite=Add to favourites +toolPanel.legacy.unfavorite=Remove from favourites +toolPanel.legacy.settings.title=Customise appearance +toolPanel.legacy.settings.iconBackground.label=Tool icon background +toolPanel.legacy.settings.iconBackground.description=When to show coloured backgrounds behind tool icons +toolPanel.legacy.settings.iconBackground.none=None +toolPanel.legacy.settings.iconBackground.hover=On hover +toolPanel.legacy.settings.iconBackground.always=Always +toolPanel.legacy.settings.iconColor.label=Tool icon colour +toolPanel.legacy.settings.iconColor.description=Colour scheme for tool icons +toolPanel.legacy.settings.iconColor.colored=Coloured +toolPanel.legacy.settings.iconColor.vibrant=Vibrant +toolPanel.legacy.settings.iconColor.monochrome=Monochrome +toolPanel.legacy.settings.sectionTitle.label=Section titles +toolPanel.legacy.settings.sectionTitle.description=Colour for category section titles +toolPanel.legacy.settings.sectionTitle.colored=Coloured +toolPanel.legacy.settings.sectionTitle.neutral=Neutral +toolPanel.legacy.settings.headerIcon.label=Section header icons +toolPanel.legacy.settings.headerIcon.description=Colour for Favourites/Recent icons +toolPanel.legacy.settings.headerIcon.colored=Coloured +toolPanel.legacy.settings.headerIcon.monochrome=Monochrome +toolPanel.legacy.settings.headerBadge.label=Section header badges +toolPanel.legacy.settings.headerBadge.description=Colour for count badges in section headers +toolPanel.legacy.settings.headerBadge.colored=Coloured +toolPanel.legacy.settings.headerBadge.neutral=Neutral +toolPanel.legacy.settings.border.label=Tool item borders +toolPanel.legacy.settings.border.description=Show borders around tool items +toolPanel.legacy.settings.border.visible=Visible +toolPanel.legacy.settings.border.hidden=Hidden +toolPanel.legacy.settings.hover.label=Hover effect intensity +toolPanel.legacy.settings.hover.description=How prominent the hover effect should be +toolPanel.legacy.settings.hover.subtle=Subtle +toolPanel.legacy.settings.hover.moderate=Moderate +toolPanel.legacy.settings.hover.prominent=Prominent diff --git a/app/core/src/main/resources/settings.yml.template b/app/core/src/main/resources/settings.yml.template index 465f95fb6e..8143ba4c29 100644 --- a/app/core/src/main/resources/settings.yml.template +++ b/app/core/src/main/resources/settings.yml.template @@ -76,11 +76,6 @@ premium: author: username creator: Stirling-PDF producer: Stirling-PDF - googleDrive: - enabled: false - clientId: '' - apiKey: '' - appId: '' enterpriseFeatures: audit: enabled: true # Enable audit logging diff --git a/app/core/src/main/resources/templates/fragments/common.html b/app/core/src/main/resources/templates/fragments/common.html index d3b888a1d7..973822b583 100644 --- a/app/core/src/main/resources/templates/fragments/common.html +++ b/app/core/src/main/resources/templates/fragments/common.html @@ -422,10 +422,6 @@ -