[Git][java-team/jameica][master] 6 commits: New upstream version 2.10.0+dfsg
Jochen Sprickerhof
gitlab at salsa.debian.org
Fri Dec 25 22:22:08 GMT 2020
Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / jameica
Commits:
1873b3d8 by Jochen Sprickerhof at 2020-12-25T23:13:39+01:00
New upstream version 2.10.0+dfsg
- - - - -
9f35d460 by Jochen Sprickerhof at 2020-12-25T23:13:42+01:00
Update upstream source from tag 'upstream/2.10.0+dfsg'
Update to upstream version '2.10.0+dfsg'
with Debian dir 8b9cf80e75f2791069c42fb299b8200f73061b0b
- - - - -
4ecd3498 by Jochen Sprickerhof at 2020-12-25T23:16:11+01:00
update copyright
- - - - -
06c4eadf by Jochen Sprickerhof at 2020-12-25T23:18:12+01:00
bump policy version (no changes)
- - - - -
9dba1bda by Jochen Sprickerhof at 2020-12-25T23:20:01+01:00
drop gitlab-ci
- - - - -
91fa9141 by Jochen Sprickerhof at 2020-12-25T23:21:55+01:00
Update changelog for 2.10.0+dfsg-1 release
- - - - -
24 changed files:
- .classpath
- build/BUILD
- build/ChangeLog
- build/build.properties
- build/jameica-macos64.sh
- build/launch4j-win32.xml
- build/launch4j-win64.xml
- debian/changelog
- debian/control
- debian/copyright
- − debian/gitlab-ci.yml
- build.gradle → download.gradle
- plugin.xml
- src/de/willuhn/jameica/gui/GUI.java
- + src/de/willuhn/jameica/gui/internal/action/NavigationToggle.java
- src/de/willuhn/jameica/gui/internal/controller/SettingsControl.java
- src/de/willuhn/jameica/gui/internal/views/Settings.java
- src/de/willuhn/jameica/gui/parts/InfoPanel.java
- src/de/willuhn/jameica/services/RepositoryService.java
- + src/img/150/view-fullscreen.png
- + src/img/200/view-fullscreen.png
- + src/img/300/view-fullscreen.png
- + src/img/view-fullscreen.png
- src/lang/system_messages_en.properties
Changes:
=====================================
.classpath
=====================================
@@ -8,7 +8,7 @@
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/nanoxml/nanoxml-2.2.3.jar" sourcepath="lib.src/nanoxml/nanoxml-2.2.3.src.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/swt/linux64/swt.jar" sourcepath="lib.src/swt/linux/swt.src.zip"/>
+ <classpathentry exported="true" kind="lib" path="lib/swt/linux64/swt.jar" sourcepath="lib.src/swt/linux64/src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/swt/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar"/>
<classpathentry exported="true" kind="lib" path="lib/swt/org.eclipse.osgi_3.10.1.v20140909-1633.jar"/>
<classpathentry exported="true" kind="lib" path="lib/swt/org.eclipse.jface_3.10.1.v20140813-1009.jar"/>
@@ -19,7 +19,7 @@
<classpathentry kind="lib" path="lib/splash.jar"/>
<classpathentry exported="true" kind="lib" path="lib/paperclips/net.sf.paperclips_1.0.4.jar" sourcepath="lib.src/paperclips/net.sf.paperclips_1.0.4.src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/paperclips/net.sf.paperclips.ui_1.0.4.jar" sourcepath="lib.src/paperclips/net.sf.paperclips_1.0.4.src.zip"/>
- <classpathentry exported="true" kind="lib" path="lib/jakarta_commons/commons-lang-2.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jakarta_commons/commons-lang-2.6.jar" sourcepath="/home/willuhn/.m2/repository/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/swt/org.eclipse.core.commands_3.6.100.v20140528-1422.jar"/>
<classpathentry kind="lib" path="lib/swt/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar"/>
=====================================
build/BUILD
=====================================
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
-#Fri Sep 06 12:05:41 CEST 2019
-build.number=455
+#Fri Nov 27 13:56:27 CET 2020
+build.number=479
=====================================
build/ChangeLog
=====================================
@@ -1,4 +1,15 @@
-2019-09-06 Version 2.8.5
+2020-11-27 Version 2.10
+
+ * NEW: 0136 Neue Launcher für Windows mit aktualisierter Versionsnummer
+ * NEW: 0135 JRE-Update für Windows und Mac auf 11.0.9.1_1
+ * NEW: 0134 Update auf SWT 4.17 für für linux64, linux-arm64 (jetzt offiziell von Eclipse untestützt), win64 und macos64
+ * NEW: 0133 Parameter "-Dsun.security.smartcardio.library" zu jameica-macos64.sh hinzugefügt - für MacOS Big Sur nötig - siehe https://homebanking-hilfe.de/forum/topic.php?p=157884#real157884
+ * NEW: 0132 Fenster-Position auch im Maximiert-Zustand speichern - siehe https://homebanking-hilfe.de/forum/topic.php?p=157397#real157397
+ * NEW: 0131 Sprache wieder per Datei->Einstellungen konfigurierbar
+ * NEW: 0130 Update auf SWT 4.14 für linux64, win64 und macos64 - für die 32Bit-Plattformen gibt es keine neueren SWT-Versionen mehr (mit dieser Version werden in GTK3 auch endlich die Theme-Farben auf dem Plasma-Desktop korrekt berücksichtigt)
+ * BUG: 0129 Fehlender Scrollbalken in der Liste der Zertifikate unter Datei->Einstellungen
+ * NEW: 0128 Funktion zum Ein-/Ausblenden der Navigation
+ * NEW: 0127 Neues Plugin-Repository https://hibiscus.tvbrowser.org aufgenommen
2019-11-01 Version 2.8.6
=====================================
build/build.properties
=====================================
@@ -79,9 +79,9 @@ classpath.openbsd = ${define.jarfilename} /usr/local/share/java/cl
## Wenn fuer Win32/Win64/MacOS64 ein JRE gebundelt werden soll, muss hier der Pfad zu der ZIP/TAR.GZ-Datei des JRE angegeben werden
## Ausserdem muss Ant dann mit dem Parameter "-Djre.embedd=true" aufgerufen werden
## Beispiel:
-define.jre.win32 = ../jre/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.5_10.zip
-define.jre.win64 = ../jre/OpenJDK11U-jre_x64_windows_hotspot_11.0.5_10.zip
-define.jre.macos64 = ../jre/OpenJDK11U-jre_x64_mac_hotspot_11.0.5_10.tar.gz
+define.jre.win32 = ../jre/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.9.1_1.zip
+define.jre.win64 = ../jre/OpenJDK11U-jre_x64_windows_hotspot_11.0.9.1_1.zip
+define.jre.macos64 = ../jre/OpenJDK11U-jre_x64_mac_hotspot_11.0.9.1_1.tar.gz
signjar.keystore = /home/willuhn/.jameica/jameica.ca/jameica.ca.keystore
signjar.storepass = /home/willuhn/.jameica/jameica.ca/jameica.ca.storepass
=====================================
build/jameica-macos64.sh
=====================================
@@ -8,4 +8,4 @@ cd "${BASEDIR}"
## Wir verwenden generell nur noch die embedded Java-Version unter MacOS
JAVACMD="${BASEDIR}/jre-macos64/Contents/Home/bin/java"
-exec "${JAVACMD}" -Xdock:name="Jameica" -Xmx512m -Xss64m -XstartOnFirstThread -jar "${BASEDIR}/jameica-macos64.jar" -o "$@" >/dev/null
+exec "${JAVACMD}" -Dsun.security.smartcardio.library=/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC -Xdock:name="Jameica" -Xmx512m -Xss64m -XstartOnFirstThread -jar "${BASEDIR}/jameica-macos64.jar" -o "$@" >/dev/null
\ No newline at end of file
=====================================
build/launch4j-win32.xml
=====================================
@@ -25,12 +25,12 @@
<opt>-Xmx512m -Djava.net.preferIPv4Stack=true -Dswt.autoScale=quarter</opt>
</jre>
<versionInfo>
- <fileVersion>2.8.4.0</fileVersion>
- <txtFileVersion>2.8.4</txtFileVersion>
+ <fileVersion>2.10.0.0</fileVersion>
+ <txtFileVersion>2.10.0</txtFileVersion>
<fileDescription>Jameica</fileDescription>
<copyright>Olaf Willuhn</copyright>
- <productVersion>2.8.4.0</productVersion>
- <txtProductVersion>2.8.4</txtProductVersion>
+ <productVersion>2.10.0.0</productVersion>
+ <txtProductVersion>2.10.0</txtProductVersion>
<productName>Jameica</productName>
<companyName>Olaf Willuhn</companyName>
<internalName>jameica-win32</internalName>
=====================================
build/launch4j-win64.xml
=====================================
@@ -25,12 +25,12 @@
<opt>-Xmx512m -Xss64m -Djava.net.preferIPv4Stack=true -Dswt.autoScale=quarter</opt>
</jre>
<versionInfo>
- <fileVersion>2.8.4.0</fileVersion>
- <txtFileVersion>2.8.4</txtFileVersion>
+ <fileVersion>2.10.0.0</fileVersion>
+ <txtFileVersion>2.10.0</txtFileVersion>
<fileDescription>Jameica</fileDescription>
<copyright>Olaf Willuhn</copyright>
- <productVersion>2.8.4.0</productVersion>
- <txtProductVersion>2.8.4</txtProductVersion>
+ <productVersion>2.10.0.0</productVersion>
+ <txtProductVersion>2.10.0</txtProductVersion>
<productName>Jameica</productName>
<companyName>Olaf Willuhn</companyName>
<internalName>jameica-win64</internalName>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+jameica (2.10.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 2.10.0+dfsg
+ * update copyright
+ * bump policy version (no changes)
+ * drop gitlab-ci
+
+ -- Jochen Sprickerhof <jspricke at debian.org> Fri, 25 Dec 2020 23:21:52 +0100
+
jameica (2.8.6+dfsg-3) unstable; urgency=medium
* Add libmckoisqldb-java dependency
=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends:
libpaperclips-java,
velocity
Rules-Requires-Root: no
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/jameica.git
Vcs-Browser: https://salsa.debian.org/java-team/jameica
Homepage: https://www.willuhn.de/products/jameica/
=====================================
debian/copyright
=====================================
@@ -5,7 +5,7 @@ Files-Excluded: lib lib.src build/jameica-win32.exe build/jameica-win64.exe
Comment: binary libraries
Files: *
-Copyright: 2004-2018 Olaf Willuhn <info at willuhn.de>
+Copyright: 2004-2019 Olaf Willuhn <info at willuhn.de>
License: GPL-2+-with-CLASSPATH-exception
Jameica is licensed under the terms of the GNU General Public License version
2 or later.
=====================================
debian/gitlab-ci.yml deleted
=====================================
@@ -1,3 +0,0 @@
-include:
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
=====================================
build.gradle → download.gradle
=====================================
=====================================
plugin.xml
=====================================
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<system name="Jameica" version="2.8.6">
+<system name="Jameica" version="2.10.0">
<description>Jameica - Java based messages interchange</description>
- <url>https://www.willuhn.de/products/jameica/releases/2.8/jameica/jameica-2.8.6.zip</url>
+ <url>https://www.willuhn.de/products/jameica/releases/2.10/jameica/jameica-2.10.0.zip</url>
<homepage>https://www.willuhn.de/projects/jameica</homepage>
<license>GPL - http://www.gnu.org/copyleft/gpl.html</license>
@@ -13,20 +13,21 @@
</classfinder>
<menu>
- <item id="jameica.menu.file" name="&Datei">
- <item id="jameica.menu.bookmarks" name="&Lesezeichen..." shortcut="CTRL+L" icon="starred.png" action="de.willuhn.jameica.gui.internal.action.BookmarkSearch" />
- <item id="jameica.menu.back" name="&Zurck" shortcut="ALT+ARROW_LEFT" icon="go-previous.png" action="de.willuhn.jameica.gui.internal.action.Back" />
+ <item id="jameica.menu.file" name="&Datei">
+ <item id="jameica.menu.bookmarks" name="&Lesezeichen..." shortcut="CTRL+L" icon="starred.png" action="de.willuhn.jameica.gui.internal.action.BookmarkSearch" />
+ <item id="jameica.menu.back" name="&Zurck" shortcut="ALT+ARROW_LEFT" icon="go-previous.png" action="de.willuhn.jameica.gui.internal.action.Back" />
+ <item id="jameica.menu.navigation.toggle" name="&Navigation ein-/ausblenden" shortcut="ALT+N" icon="view-fullscreen.png" action="de.willuhn.jameica.gui.internal.action.NavigationToggle" />
<item name="-" />
- <item id="jameica.menu.settings" name="&Einstellungen" shortcut="CTRL+E" icon="document-properties.png" action="de.willuhn.jameica.gui.internal.action.Settings" />
- <item id="jameica.menu.backups" name="&Backups verwalten" icon="document-save.png" action="de.willuhn.jameica.gui.internal.action.Backup" />
- <item id="jameica.menu.updates" name="&Plugins online suchen..." icon="emblem-package.png" action="de.willuhn.jameica.gui.internal.action.PluginListOpen" />
+ <item id="jameica.menu.settings" name="&Einstellungen" shortcut="CTRL+E" icon="document-properties.png" action="de.willuhn.jameica.gui.internal.action.Settings" />
+ <item id="jameica.menu.backups" name="&Backups verwalten" icon="document-save.png" action="de.willuhn.jameica.gui.internal.action.Backup" />
+ <item id="jameica.menu.updates" name="&Plugins online suchen..." icon="emblem-package.png" action="de.willuhn.jameica.gui.internal.action.PluginListOpen" />
<item name="-" />
- <item id="jameica.menu.masterpassword" name="&Master-Passwort ndern" icon="stock_keyring.png" action="de.willuhn.jameica.gui.internal.action.ChangePassword" />
+ <item id="jameica.menu.masterpassword" name="&Master-Passwort ndern" icon="stock_keyring.png" action="de.willuhn.jameica.gui.internal.action.ChangePassword" />
<item name="-" />
- <item id="jameica.menu.quit" name="Beenden" shortcut="CTRL+Q" icon="window-close.png" action="de.willuhn.jameica.gui.internal.action.FileClose" />
+ <item id="jameica.menu.quit" name="Beenden" shortcut="CTRL+Q" icon="window-close.png" action="de.willuhn.jameica.gui.internal.action.FileClose" />
</item>
<item name="Hilfe">
- <item name="&ber" icon="gtk-info.png" action="de.willuhn.jameica.gui.internal.action.About" />
+ <item name="&ber" icon="gtk-info.png" action="de.willuhn.jameica.gui.internal.action.About" />
<item name="-" />
<item name="Lizenzinformationen" icon="text-x-generic.png" action="de.willuhn.jameica.gui.internal.action.License" />
</item>
=====================================
src/de/willuhn/jameica/gui/GUI.java
=====================================
@@ -93,11 +93,13 @@ public class GUI implements ApplicationController
private ApplicationCallback callback = null;
private StyleFactory styleFactory = null;
+ private SashForm sash = null;
private Navigation navi = null;
private Menu menu = null;
private View view = null;
private StatusBar statusBar = null;
private SashForm left = null;
+ private Composite right = null;
private FormTextPart help = null;
private AbstractView currentView = null;
@@ -133,10 +135,10 @@ public class GUI implements ApplicationController
////////////////////////////////////////////////////////////////////////
// Netbook-Mode
- // Wenn das Display weniger als 700 Pixel hoch ist, aktivieren wir
+ // Wenn das Display weniger als 800 Pixel hoch ist, aktivieren wir
// automatisch den "Netbook"-Mode
Rectangle r = GUI.getDisplay().getBounds();
- if (r.height < 700)
+ if (r.height < 800)
{
Logger.info("display height smaller than 700px (" + r.width + "x" + r.width + ") - auto-activating netbook mode");
Customizing.SETTINGS.setAttribute("application.scrollview",true);
@@ -177,6 +179,7 @@ public class GUI implements ApplicationController
SWTUtil.getImage("hibiscus-icon-64x64.png"),
SWTUtil.getImage("hibiscus-icon-128x128.png"),
SWTUtil.getImage("hibiscus-icon-256x256.png")
+
});
}
getShell().setText(name);
@@ -199,11 +202,11 @@ public class GUI implements ApplicationController
////////////////////////////////////////////////////////////////////////
// init Layout
- final SashForm sash = new SashForm(getShell(), SWT.HORIZONTAL);
- sash.setLayout(SWTUtil.createGrid(1,true));
- sash.setLayoutData(new GridData(GridData.FILL_BOTH));
+ this.sash = new SashForm(getShell(), SWT.HORIZONTAL);
+ this.sash.setLayout(SWTUtil.createGrid(1,true));
+ this.sash.setLayoutData(new GridData(GridData.FILL_BOTH));
- this.left = new SashForm(sash, SWT.VERTICAL);
+ this.left = new SashForm(this.sash, SWT.VERTICAL);
this.left.setLayout(SWTUtil.createGrid(1,true));
this.left.setLayoutData(new GridData(GridData.FILL_BOTH));
//
@@ -235,12 +238,12 @@ public class GUI implements ApplicationController
////////////////////////////////////////////////////////////////////////
// init content view
- Composite right = new Composite(sash, SWT.NONE);
- right.setLayout(SWTUtil.createGrid(1,true));
- right.setLayoutData(new GridData(GridData.FILL_BOTH));
+ this.right = new Composite(this.sash, SWT.NONE);
+ this.right.setLayout(SWTUtil.createGrid(1,true));
+ this.right.setLayoutData(new GridData(GridData.FILL_BOTH));
Logger.info("adding content view");
view = new View();
- view.paint(right);
+ view.paint(this.right);
//
////////////////////////////////////////////////////////////////////////
@@ -257,8 +260,8 @@ public class GUI implements ApplicationController
SETTINGS.setAttribute("navi.height.1",i[1]);
}
});
- sash.setWeights(new int[] {SETTINGS.getInt("main.width.0",1), SETTINGS.getInt("main.width.1",3)});
- sash.addDisposeListener(new DisposeListener() {
+ this.sash.setWeights(new int[] {SETTINGS.getInt("main.width.0",1), SETTINGS.getInt("main.width.1",3)});
+ this.sash.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e)
{
if (sash == null || sash.isDisposed())
@@ -268,8 +271,8 @@ public class GUI implements ApplicationController
SETTINGS.setAttribute("main.width.1",i[1]);
}
});
- if (Customizing.SETTINGS.getBoolean("application.hidenavigation",false))
- sash.setMaximizedControl(right);
+
+ toggleNavigation();
//
////////////////////////////////////////////////////////////////////////
@@ -352,7 +355,7 @@ public class GUI implements ApplicationController
if (maximized)
{
Logger.info("window size: maximized");
- getShell().setLocation(0,0);
+ getShell().setLocation(x,y); // Bei maximized ebenfalls die Position angeben - Anwendung kann sich ja auf dem zweiten Screen befunden haben
getShell().setMaximized(true);
}
else
@@ -1049,6 +1052,15 @@ public class GUI implements ApplicationController
gui.callback = new ApplicationCallbackSWT();
return gui.callback;
}
+
+ /**
+ * Blendet die Navigation ein oder aus.
+ */
+ public static void toggleNavigation()
+ {
+ final boolean hide = Customizing.SETTINGS.getBoolean("application.hidenavigation",false);
+ gui.sash.setMaximizedControl(hide ? gui.right : null);
+ }
/**
* @see de.willuhn.jameica.system.ApplicationController#start(de.willuhn.jameica.system.BackgroundTask)
=====================================
src/de/willuhn/jameica/gui/internal/action/NavigationToggle.java
=====================================
@@ -0,0 +1,43 @@
+/**********************************************************************
+ *
+ * Copyright (c) 2019 Olaf Willuhn
+ * All rights reserved.
+ *
+ * This software is copyrighted work licensed under the terms of the
+ * Jameica License. Please consult the file "LICENSE" for details.
+ *
+ **********************************************************************/
+
+package de.willuhn.jameica.gui.internal.action;
+
+import de.willuhn.jameica.gui.Action;
+import de.willuhn.jameica.gui.GUI;
+import de.willuhn.jameica.messaging.StatusBarMessage;
+import de.willuhn.jameica.system.Application;
+import de.willuhn.jameica.system.Customizing;
+import de.willuhn.util.ApplicationException;
+import de.willuhn.util.I18N;
+
+/**
+ * Action zum Ein-/Ausklappen der Navigation.
+ */
+public class NavigationToggle implements Action
+{
+ private final static I18N i18n = Application.getI18n();
+
+ /**
+ * @see de.willuhn.jameica.gui.Action#handleAction(java.lang.Object)
+ */
+ @Override
+ public void handleAction(Object context) throws ApplicationException
+ {
+ boolean hide = Customizing.SETTINGS.getBoolean("application.hidenavigation",false);
+ Customizing.SETTINGS.setAttribute("application.hidenavigation",!hide);
+ if (!hide)
+ {
+ String text = "Whlen Sie \"Datei->Navigation ein-/ausblenden\" zum Wiedereinblenden der Navigation";
+ Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr(text),StatusBarMessage.TYPE_INFO));
+ }
+ GUI.toggleNavigation();
+ }
+}
=====================================
src/de/willuhn/jameica/gui/internal/controller/SettingsControl.java
=====================================
@@ -10,6 +10,10 @@
package de.willuhn.jameica.gui.internal.controller;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
@@ -57,6 +61,7 @@ public class SettingsControl extends AbstractControl
private IntegerInput httpsProxyPort;
private CheckboxInput systemProxy;
private CheckboxInput askWorkDir;
+ private SelectInput locale;
private TablePart certs;
private CheckboxInput trustJavaCerts;
@@ -218,6 +223,26 @@ public class SettingsControl extends AbstractControl
}
return this.askWorkDir;
}
+
+ /**
+ * Liefert eine Auswahlbox fuer die Sprache.
+ * @return Auswahlbox fuer die Sprache.
+ */
+ public SelectInput getLocale()
+ {
+ if (this.locale != null)
+ return this.locale;
+
+ final List<Locale> list = new ArrayList<Locale>();
+ list.add(Locale.GERMANY);
+ list.add(Locale.ENGLISH);
+
+ this.locale = new SelectInput(list,Application.getConfig().getLocale());
+ this.locale.setAttribute("displayName");
+
+ return this.locale;
+ }
+
/**
* Liefert eine Tabelle mit den installierten Zertifikaten.
* @return Tabelle mit einer Liste der installierten Zertifikate.
@@ -334,6 +359,10 @@ public class SettingsControl extends AbstractControl
BootstrapSettings.setAskWorkdir(((Boolean)getAskWorkdir().getValue()).booleanValue());
+ final Locale l = (Locale) this.getLocale().getValue();
+ restartNeeded |= !Application.getConfig().getLocale().equals(l);
+ config.setLocale(l);
+
restartNeeded |= getProxyPort().hasChanged();
Integer proxyPort = (Integer) getProxyPort().getValue();
config.setProxyPort(proxyPort == null ? -1 : proxyPort.intValue());
=====================================
src/de/willuhn/jameica/gui/internal/views/Settings.java
=====================================
@@ -66,9 +66,10 @@ public class Settings extends AbstractView implements Extendable
/////////////////////////////////////////////////////////////////
// System-Einstellungen
- TabGroup system = new TabGroup(getTabFolder(),i18n.tr("System"));
+ TabGroup system = new TabGroup(getTabFolder(),i18n.tr("System"),true);
system.addHeadline(i18n.tr("System-Einstellungen"));
+ system.addLabelPair(i18n.tr("Sprache"), control.getLocale());
system.addLabelPair(i18n.tr("Log-Level"), control.getLogLevel());
// Nur anzeigen, wenn der User die Option deaktiviert hat
=====================================
src/de/willuhn/jameica/gui/parts/InfoPanel.java
=====================================
@@ -263,7 +263,7 @@ public class InfoPanel implements Part
// Kommentar
{
- Label comment = new Label(this.extend(DrawState.COMMENT_BEFORE,this.comp,null),SWT.NONE);
+ Label comment = new Label(this.extend(DrawState.COMMENT_BEFORE,this.comp,null),SWT.WRAP);
comment.setBackground(bg);
comment.setFont(Font.SMALL.getSWTFont());
comment.setForeground(Color.COMMENT.getSWTColor());
=====================================
src/de/willuhn/jameica/services/RepositoryService.java
=====================================
@@ -81,7 +81,8 @@ public class RepositoryService implements Bootable
"https://www.willuhn.de/products/jameica/updates/extensions",
"https://www.jverein.de/updates/",
"https://scripting-updates.derrichter.de/",
- "https://www.open4me.de/hibiscus/"
+ "https://www.open4me.de/hibiscus/",
+ "https://hibiscus.tvbrowser.org/"
};
private final static de.willuhn.jameica.system.Settings settings = new de.willuhn.jameica.system.Settings(RepositoryService.class);
=====================================
src/img/150/view-fullscreen.png
=====================================
Binary files /dev/null and b/src/img/150/view-fullscreen.png differ
=====================================
src/img/200/view-fullscreen.png
=====================================
Binary files /dev/null and b/src/img/200/view-fullscreen.png differ
=====================================
src/img/300/view-fullscreen.png
=====================================
Binary files /dev/null and b/src/img/300/view-fullscreen.png differ
=====================================
src/img/view-fullscreen.png
=====================================
Binary files /dev/null and b/src/img/view-fullscreen.png differ
=====================================
src/lang/system_messages_en.properties
=====================================
@@ -355,5 +355,6 @@ Fingerabdr\u00FCcke=Fingerprints
Repository-URL\ hinzugef\u00FCgt=Repository-URL\ added
Zertifikat=Certificate
Das\ Zertifikat\ des\ Repositories\ wurde\ ge\u00E4ndert\!\nM\u00F6chten\ Sie\ den\ Vorgang\ dennoch\ fortsetzen\ und\ das\ neue\ Zertifikat\ importieren?=The\ certificate\ of\ the\ repository\ has\ been\ changed!\nWould you\ like\ to\ proceed\ and\ import\ the\ new\ certificate?
-Bitte\ geben\ Sie\ das\ Verzeichnis\ an,\ in\ dem\ Sie\ das\ Zertifikat\ speichern\ m\u00F6chten=Please\ select\ folder\ to\ save\ the\ certificate\
-
+Bitte\ geben\ Sie\ das\ Verzeichnis\ an,\ in\ dem\ Sie\ das\ Zertifikat\ speichern\ m\u00F6chten=Please\ select\ folder\ to\ save\ the\ certificate
+Sprache=Language
+&Navigation\ ein-/ausblenden=Show/Hide &navigation
View it on GitLab: https://salsa.debian.org/java-team/jameica/-/compare/0c9d8c23e3a8bdae3de2203c0039a7365fd6e7d7...91fa9141cc145fec26be25b389b6067505c7d5e1
--
View it on GitLab: https://salsa.debian.org/java-team/jameica/-/compare/0c9d8c23e3a8bdae3de2203c0039a7365fd6e7d7...91fa9141cc145fec26be25b389b6067505c7d5e1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201225/0cdc8f76/attachment.html>
More information about the pkg-java-commits
mailing list