Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
Update to 2024.7-beta.5: Fix german translation and add version strin…
Browse files Browse the repository at this point in the history 
…g to frame title
  • Loading branch information
@danieldieeins
danieldieeins committed Jun 26, 2024
1 parent 4e3cbb7 commit cf56a80
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 28 deletions.
2 changes: 1 addition & 1 deletion application-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>

<artifactId>application-main</artifactId>
<version>2024.7-beta.4</version>
<version>2024.7-beta.5</version>

<properties>
<maven.compiler.source>17</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion application-main/src/main/java/com/zyneonstudios/application/frame/web/ApplicationFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public NexusApplication getApplication() {

// Method to set title bar properties
public void setTitlebar(String title, Color background, Color foreground) {
setTitle("Zyneon Application ("+title+", "+ ApplicationConfig.getOS()+")"); // Set frame title
setTitle("Zyneon Application ("+title+", v"+ApplicationConfig.getApplicationVersion()+", "+ ApplicationConfig.getOS()+")"); // Set frame title
setTitleBackground(background); // Set title bar background color
setTitleForeground(foreground); // Set title bar foreground color
}
Expand Down
3 changes: 2 additions & 1 deletion ...on-main/src/main/java/com/zyneonstudios/application/frame/web/CustomApplicationFrame.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.zyneonstudios.application.frame.web;

import com.zyneonstudios.application.main.ApplicationConfig;
import com.zyneonstudios.application.main.NexusApplication;

import javax.swing.*;
Expand All @@ -24,7 +25,7 @@ public class CustomApplicationFrame extends ApplicationFrame {
public CustomApplicationFrame(NexusApplication application, String url, String jcefPath) {
super(application,url,jcefPath); // Call superclass constructor
setUndecorated(true); // Remove default window decorations
title = " Zyneon Application"; // Set default title
title = " Zyneon Application (v"+ApplicationConfig.getApplicationVersion()+")"; // Set default title
JPanel customTitleBar = createCustomTitleBar(); // Create custom title bar
getContentPane().add(customTitleBar, BorderLayout.NORTH); // Add custom title bar to content pane
addDragAndDropFunctionality(); // Add drag-and-drop functionality
Expand Down
Binary file modified application-main/src/main/resources/content.zip
View file
Binary file not shown.
20 changes: 15 additions & 5 deletions application-ui/content/de/discover.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<script src="../assets/cronos/javascript/app-menu.js"></script>
<script src="../assets/application/javascript/app-shared.js"></script>
<script src="../assets/application/javascript/app-discover.js"></script>
<script>console.log("[CONNECTOR] init.discover"); init();</script>
<script>searchTerm = "Klicke zum Suchen"; console.log("[CONNECTOR] init.discover"); init();</script>
</head>
<body>
<div class="flex full">
Expand Down Expand Up @@ -76,14 +76,14 @@ <h4>Spiele</h4>
<h4 class="danger" id="close-search-button" onclick="closeSearch();">X</h4>
<label>
<select id="search-type-select">
<option>App-Module</option>
<option value="modules">App-Module</option>
</select>
</label>
</div>
</div>
<div class="search-bar flex">
<label>
<input type="text" placeholder="Suche deaktiviert" id="search-bar" onclick="openSearch();" disabled>
<input type="text" placeholder="Search disabled" id="search-bar" onclick="openSearch();" disabled>
</label>
<i class='bx bx-search-alt'></i>
</div>
Expand All @@ -99,14 +99,25 @@ <h4 class="danger" id="close-search-button" onclick="closeSearch();">X</h4>
</div>
</div>
<div id="search-content">
<div class="result-overlay"></div>
<div class="card result-card" id="result-template">
<div class="flex">
<div class="result-image">
<img alt="result image" onclick="connector('java.overlay');" src="../assets/application/images/templates/thumbnail.png">
<img alt="result image" src="../assets/application/images/templates/thumbnail.png">
</div>
<div class="result-details">
<div class="flex">
<h2 class="result-title">Titel</h2>
<h2 class="result-author">von <span class="result-authors">Autoren</span></h2>
</div>
<p class="result-description">
Beschreibung
</p>
<p class="result-meta">
Meta-Informationen
</p>
<div class="result-actions">
<a><i class='bx bx-spreadsheet'></i> Mehr</a>
</div>
</div>
</div>
Expand All @@ -117,5 +128,4 @@ <h2 class="result-title">Titel</h2>
</div>
</div>
</body>
<script>searchTerm = "Klicke zum Suchen"</script>
</html>
40 changes: 20 additions & 20 deletions application-ui/content/de/settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,33 +63,33 @@
<div class="cnt">
<div id="overlay">
<iframe id="overlay-frame"></iframe>
<a class="close-overlay button danger hover-wiggle wiggle-low" onclick="disableOverlay();">Schließen <i class='bx bx-x'></i></a>
<a class="close-overlay button danger hover-wiggle wiggle-low" onclick="disableOverlay();">Close <i class='bx bx-x'></i></a>
</div>
<div class="settings">
<div class="settings-menu">
<div class="card card-disabled">
<h2>Einstellungen</h2>
<h2>Settings</h2>
</div>
<div class="card settings-menu-card card-disabled">
<h3>Navigation</h3>
<ul>
<li id="settings-general-button" onclick="setContent('settings-general');">
<li id="settings-general-button" onclick="setContent('settings-general'); connector('sync.settings.general');">
<i class='bx bx-compass'></i>
<p>Allgemeine Optionen</p>
</li>
<li id="settings-global-button" onclick="setContent('settings-global');">
<li id="settings-global-button" onclick="setContent('settings-global'); connector('sync.settings.global');">
<i class='bx bx-globe'></i>
<p>Globale Optionen</p>
</li>
<li id="settings-indexes-button" onclick="setContent('settings-indexes');">
<li id="settings-indexes-button" onclick="setContent('settings-indexes'); connector('sync.settings.indexes');">
<i class='bx bx-sort-down'></i>
<p>Index Optionen</p>
</li>
<li id="settings-modules-button" onclick="setContent('settings-modules');">
<li id="settings-modules-button" onclick="setContent('settings-modules'); connector('sync.settings.modules');">
<i class='bx bx-extension'></i>
<p>Modul Optionen</p>
</li>
<li id="settings-about-button" onclick="setContent('settings-about');">
<li id="settings-about-button" onclick="setContent('settings-about'); connector('sync.settings.about');">
<i class='bx bx-info-circle'></i>
<p>Über NEXUS App</p>
</li>
Expand All @@ -100,7 +100,7 @@ <h3>Module</h3>
<li id="settings-module-template">
<i></i>
<img alt="settings menu entry icon" src="">
<p>Menüeintrag laden...</p>
<p>Lade Moduleintrag...</p>
</li>
</ul>
<script>connector('init.settings.modules');</script>
Expand All @@ -117,7 +117,7 @@ <h3>Aktionen</h3>
</li>
<li onclick="connector('sync.exit')" class="danger">
<i class='bx bx-exit'></i>
<p>App beenden</p>
<p>App schließen</p>
</li>
</ul>
</div>
Expand All @@ -129,7 +129,7 @@ <h2 id="settings-title"></h2>
<div class="card settings-content-card card-disabled">
<div id="settings-general">
<div class="group" id="settings-general-startup">
<h4>Beim Starten</h4>
<h4>Beim Start</h4>
<h3>
Startseite
<span class="select">
Expand All @@ -144,7 +144,7 @@ <h3>
</h3>
<div id="updater-settings">
<h3>
Auf Updates prüfen
Auf Aktualisierungen prüfen
<span class="checkbox">
<label>
<input type="checkbox" id="updater-settings-enable-updates" onclick="toggleUpdates();">
Expand All @@ -157,11 +157,11 @@ <h3>
</span>
</h3>
<h3>
Updatekanal
Aktualisierungskanal
<span class="select">
<label>
<select id="updater-settings-update-channel" onchange="syncUpdates();">
<option value="experimental">Experimentell (aktuell,test)</option>
<option value="experimental">Experimentell (aktuell, test)</option>
<option value="stable">Stabil (empfohlen)</option>
</select>
</label>
Expand All @@ -170,23 +170,23 @@ <h3>
</div>
</div>
<div class="group" id="settings-general-appearance">
<h4>Erscheinung</h4>
<h4>Appearance</h4>
<h3>
Aussehen
Theme
<span class="select">
<label>
<select id="appearance-settings-theme" onchange="syncTheme();">
<option value="automatic">Standard: System</option>
<option value="../assets/cronos/css/app-colors-dark.css">Standard: Dunkel</option>
<option value="../assets/cronos/css/app-colors-light.css">Standard: Hell</option>
<option value="../assets/application/css/app-colors-oled.css">Standard: OLED (Beta)</option>
<option value="../assets/cronos/css/app-colors-dark.css">Standard: Dark</option>
<option value="../assets/cronos/css/app-colors-light.css">Standard: Light</option>
<option value="../assets/application/css/app-colors-oled.css">Standard: OLED (BETA)</option>
<option value="../assets/application/css/app-colors-zyneon.css">Standard: Zyneon</option>
</select><script>document.getElementById("appearance-settings-theme").value = colors;</script>
</label>
</span>
</h3>
<h3>
Sprache
Language
<span class="select">
<label>
<select id="appearance-settings-language" onchange="syncLanguage();">
Expand All @@ -209,7 +209,7 @@ <h3>
</div>
<div id="settings-about">
<div class="card">
${application.version}
<span id="settings-global-application-version">${application.version}</span>
</div>
</div>
<!--TODO: Add other setting pages-->
Expand Down

0 comments on commit cf56a80

Please sign in to comment.