From 7766a67abf1cd5b3442bd0e5ace1fedffdc6cdf2 Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 7 Nov 2024 00:15:10 +0000 Subject: [PATCH] Small browser fixes --- .../main/java/io/xpipe/app/browser/BrowserOverviewComp.java | 5 ++++- .../main/java/io/xpipe/app/browser/BrowserWelcomeComp.java | 3 ++- app/src/main/java/io/xpipe/app/prefs/AppPrefs.java | 5 +++++ .../resources/io/xpipe/app/resources/style/sidebar-comp.css | 4 ++-- .../main/resources/io/xpipe/app/resources/style/style.css | 2 +- lang/uacc/strings/translations_da.properties | 2 +- lang/uacc/strings/translations_de.properties | 2 +- lang/uacc/strings/translations_en.properties | 2 +- lang/uacc/strings/translations_es.properties | 2 +- lang/uacc/strings/translations_fr.properties | 2 +- lang/uacc/strings/translations_it.properties | 2 +- lang/uacc/strings/translations_ja.properties | 2 +- lang/uacc/strings/translations_nl.properties | 2 +- lang/uacc/strings/translations_pt.properties | 2 +- lang/uacc/strings/translations_ru.properties | 2 +- lang/uacc/strings/translations_tr.properties | 2 +- lang/uacc/strings/translations_zh.properties | 2 +- 17 files changed, 26 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java index f0ea684c9..76ed1d007 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserOverviewComp.java @@ -3,6 +3,7 @@ package io.xpipe.app.browser; import io.xpipe.app.browser.file.BrowserFileOverviewComp; import io.xpipe.app.browser.fs.OpenFileSystemModel; import io.xpipe.app.comp.base.SimpleTitledPaneComp; +import io.xpipe.app.core.AppFont; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.impl.VerticalComp; @@ -77,6 +78,8 @@ public class BrowserOverviewComp extends SimpleComp { var recentPane = new SimpleTitledPaneComp(AppI18n.observable("recent"), recentOverview); var vbox = new VerticalComp(List.of(recentPane, commonPane, rootsPane)).styleClass("overview"); - return vbox.createRegion(); + var r = vbox.createRegion(); + AppFont.medium(r); + return r; } } diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java index c0e6a5513..9c9f51340 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java @@ -140,13 +140,14 @@ public class BrowserWelcomeComp extends SimpleComp { .hide(empty) .accessibleTextKey("restoreAllSessions"); layout.getChildren().add(tile.createRegion()); + AppFont.medium(layout); return layout; } private Comp entryButton(BrowserSavedState.Entry e, BooleanProperty disable) { var entry = DataStorage.get().getStoreEntryIfPresent(e.getUuid()); var graphic = entry.get().getEffectiveIconFile(); - var view = PrettyImageHelper.ofFixedSize(graphic, 30, 24); + var view = PrettyImageHelper.ofFixedSize(graphic, 22, 16); return new ButtonComp( new SimpleStringProperty(DataStorage.get().getStoreEntryDisplayName(entry.get())), view.createRegion(), diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java index 210ae29e6..f1f4b570f 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java @@ -9,6 +9,7 @@ import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.storage.DataStorage; import io.xpipe.app.terminal.ExternalTerminalType; +import io.xpipe.app.terminal.TerminalView; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.PasswordLockSecretValue; import io.xpipe.app.util.XPipeSession; @@ -568,6 +569,10 @@ public class AppPrefs { ErrorEvent.fromThrowable(e).expected().build().handle(); storageDirectory.setValue(DEFAULT_STORAGE_DIR); } + + if (!TerminalView.isSupported()) { + enableTerminalDocking.set(false); + } } private void loadSharedRemote() { diff --git a/app/src/main/resources/io/xpipe/app/resources/style/sidebar-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/sidebar-comp.css index ace344cbf..13c478471 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/sidebar-comp.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/sidebar-comp.css @@ -5,11 +5,11 @@ -fx-border-color: -color-border-default; } -.root:dark .sidebar-comp { +.root:dark:separate-frame .sidebar-comp { -fx-background-color: derive(-color-bg-default, 10%); } -.root:light .sidebar-comp { +.root:light:separate-frame .sidebar-comp { -fx-background-color: derive(-color-bg-default, -1%); } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/style.css b/app/src/main/resources/io/xpipe/app/resources/style/style.css index ed1e8bc22..9d9d0756f 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/style.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/style.css @@ -5,7 +5,7 @@ } */ -.root { +.root:light, .root:dark { -fx-background-color: transparent; } diff --git a/lang/uacc/strings/translations_da.properties b/lang/uacc/strings/translations_da.properties index 02d735bc5..e1e6be620 100644 --- a/lang/uacc/strings/translations_da.properties +++ b/lang/uacc/strings/translations_da.properties @@ -1,6 +1,6 @@ communityDescription=Et power-værktøj til forbindelser, der er perfekt til dit personlige brug. upgradeDescription=Professionel forbindelsesstyring til hele din serverinfrastruktur. -discoverPlans=Opdag planer +discoverPlans=Opdag opgraderingsmuligheder extendProfessional=Opgrader til de nyeste professionelle funktioner communityItem1=Ubegrænsede forbindelser til ikke-kommercielle systemer og værktøjer communityItem2=Problemfri integration med dine installerede terminaler og editorer diff --git a/lang/uacc/strings/translations_de.properties b/lang/uacc/strings/translations_de.properties index 411c58d0e..92b5232ae 100644 --- a/lang/uacc/strings/translations_de.properties +++ b/lang/uacc/strings/translations_de.properties @@ -1,6 +1,6 @@ communityDescription=Ein Power-Tool für Verbindungen, das perfekt für deine persönlichen Anwendungsfälle ist. upgradeDescription=Professionelles Verbindungsmanagement für deine gesamte Serverinfrastruktur. -discoverPlans=Pläne entdecken +discoverPlans=Upgrade-Optionen entdecken extendProfessional=Upgrade auf die neuesten professionellen Funktionen communityItem1=Unbegrenzte Verbindungen zu nicht-kommerziellen Systemen und Tools communityItem2=Nahtlose Integration mit deinen installierten Terminals und Editoren diff --git a/lang/uacc/strings/translations_en.properties b/lang/uacc/strings/translations_en.properties index 1b746abdc..ef1e44741 100644 --- a/lang/uacc/strings/translations_en.properties +++ b/lang/uacc/strings/translations_en.properties @@ -1,6 +1,6 @@ communityDescription=A connection power-tool perfect for your personal use cases. upgradeDescription=Professional connection management for your entire server infrastructure. -discoverPlans=Discover plans +discoverPlans=Discover upgrade options extendProfessional=Upgrade to latest professional features communityItem1=Unlimited connections to non-commercial systems and tools communityItem2=Seamless integration with your installed terminals and editors diff --git a/lang/uacc/strings/translations_es.properties b/lang/uacc/strings/translations_es.properties index 3e5ee02f8..1f22f5c77 100644 --- a/lang/uacc/strings/translations_es.properties +++ b/lang/uacc/strings/translations_es.properties @@ -1,6 +1,6 @@ communityDescription=Una herramienta de conexión perfecta para tus casos de uso personal. upgradeDescription=Gestión profesional de conexiones para toda tu infraestructura de servidores. -discoverPlans=Descubrir planes +discoverPlans=Descubre las opciones de actualización extendProfessional=Actualiza a las últimas funciones profesionales communityItem1=Conexiones ilimitadas a sistemas y herramientas no comerciales communityItem2=Integración perfecta con tus terminales y editores instalados diff --git a/lang/uacc/strings/translations_fr.properties b/lang/uacc/strings/translations_fr.properties index 1ea040635..fc1651dcd 100644 --- a/lang/uacc/strings/translations_fr.properties +++ b/lang/uacc/strings/translations_fr.properties @@ -1,6 +1,6 @@ communityDescription=Un outil puissant de connexion parfait pour tes cas d'utilisation personnels. upgradeDescription=Gestion professionnelle des connexions pour l'ensemble de ton infrastructure de serveurs. -discoverPlans=Découvrir les plans +discoverPlans=Découvre les options de mise à niveau extendProfessional=Mise à jour vers les dernières fonctionnalités professionnelles communityItem1=Connexions illimitées à des systèmes et outils non commerciaux communityItem2=Intégration transparente avec les terminaux et les éditeurs que tu as installés diff --git a/lang/uacc/strings/translations_it.properties b/lang/uacc/strings/translations_it.properties index a5a3575e3..de4a19056 100644 --- a/lang/uacc/strings/translations_it.properties +++ b/lang/uacc/strings/translations_it.properties @@ -1,6 +1,6 @@ communityDescription=Uno strumento di connessione perfetto per i tuoi casi d'uso personali. upgradeDescription=Gestione professionale delle connessioni per tutta la tua infrastruttura server. -discoverPlans=Scoprire i piani +discoverPlans=Scoprire le opzioni di aggiornamento extendProfessional=Aggiornamento alle ultime funzionalità professionali communityItem1=Connessioni illimitate a sistemi e strumenti non commerciali communityItem2=Integrazione perfetta con i terminali e gli editor installati diff --git a/lang/uacc/strings/translations_ja.properties b/lang/uacc/strings/translations_ja.properties index 26cc1c6d6..620b3eac1 100644 --- a/lang/uacc/strings/translations_ja.properties +++ b/lang/uacc/strings/translations_ja.properties @@ -1,6 +1,6 @@ communityDescription=個人的なユースケースに最適な接続パワーツール。 upgradeDescription=サーバーインフラ全体のプロフェッショナルな接続管理 -discoverPlans=プランを発見する +discoverPlans=アップグレードオプションを発見する extendProfessional=最新のプロフェッショナル機能にアップグレードする communityItem1=非商用システムやツールに無制限に接続できる communityItem2=インストールされている端末やエディターとのシームレスな統合 diff --git a/lang/uacc/strings/translations_nl.properties b/lang/uacc/strings/translations_nl.properties index 828722d45..2310cac1a 100644 --- a/lang/uacc/strings/translations_nl.properties +++ b/lang/uacc/strings/translations_nl.properties @@ -1,6 +1,6 @@ communityDescription=Een power-tool voor verbindingen, perfect voor persoonlijk gebruik. upgradeDescription=Professioneel verbindingsbeheer voor je hele serverinfrastructuur. -discoverPlans=Plannen ontdekken +discoverPlans=Upgrade-opties ontdekken extendProfessional=Upgrade naar de nieuwste professionele functies communityItem1=Onbeperkte verbindingen met niet-commerciële systemen en hulpmiddelen communityItem2=Naadloze integratie met je geïnstalleerde terminals en editors diff --git a/lang/uacc/strings/translations_pt.properties b/lang/uacc/strings/translations_pt.properties index dbd4aa607..6a8c4b023 100644 --- a/lang/uacc/strings/translations_pt.properties +++ b/lang/uacc/strings/translations_pt.properties @@ -1,6 +1,6 @@ communityDescription=Uma ferramenta de ligação perfeita para os teus casos de utilização pessoal. upgradeDescription=Gestão profissional das ligações para toda a tua infraestrutura de servidores. -discoverPlans=Descobre planos +discoverPlans=Descobre as opções de atualização extendProfessional=Actualiza para as funcionalidades profissionais mais recentes communityItem1=Ligações ilimitadas a sistemas e ferramentas não comerciais communityItem2=Integração perfeita com os teus terminais e editores instalados diff --git a/lang/uacc/strings/translations_ru.properties b/lang/uacc/strings/translations_ru.properties index 03c75b826..732a016c9 100644 --- a/lang/uacc/strings/translations_ru.properties +++ b/lang/uacc/strings/translations_ru.properties @@ -1,6 +1,6 @@ communityDescription=Инструмент для соединения, идеально подходящий для твоих личных целей. upgradeDescription=Профессиональное управление соединениями для всей твоей серверной инфраструктуры. -discoverPlans=Узнай планы +discoverPlans=Узнайте о возможностях обновления extendProfessional=Обновись до последних профессиональных функций communityItem1=Неограниченное количество подключений к некоммерческим системам и инструментам communityItem2=Бесшовная интеграция с установленными у тебя терминалами и редакторами diff --git a/lang/uacc/strings/translations_tr.properties b/lang/uacc/strings/translations_tr.properties index 6c800aea1..147f9adad 100644 --- a/lang/uacc/strings/translations_tr.properties +++ b/lang/uacc/strings/translations_tr.properties @@ -1,6 +1,6 @@ communityDescription=Kişisel kullanım durumlarınız için mükemmel bir bağlantı güç aracı. upgradeDescription=Tüm sunucu altyapınız için profesyonel bağlantı yönetimi. -discoverPlans=Planları keşfedin +discoverPlans=Yükseltme seçeneklerini keşfedin extendProfessional=En son profesyonel özelliklere yükseltme communityItem1=Ticari olmayan sistemlere ve araçlara sınırsız bağlantı communityItem2=Kurulu terminalleriniz ve editörlerinizle sorunsuz entegrasyon diff --git a/lang/uacc/strings/translations_zh.properties b/lang/uacc/strings/translations_zh.properties index 8c13b6e8a..673ebbdf5 100644 --- a/lang/uacc/strings/translations_zh.properties +++ b/lang/uacc/strings/translations_zh.properties @@ -1,6 +1,6 @@ communityDescription=最适合您个人使用的连接动力工具。 upgradeDescription=为您的整个服务器基础设施提供专业的连接管理。 -discoverPlans=发现计划 +discoverPlans=发现升级选项 extendProfessional=升级到最新的专业功能 communityItem1=无限连接非商业系统和工具 communityItem2=与已安装的终端和编辑器无缝集成