[med-svn] [Git][med-team/jam-lib][upstream] New upstream version 0.1.git20240425.aec45be+dfsg
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Fri Oct 11 11:22:23 BST 2024
Étienne Mollier pushed to branch upstream at Debian Med / jam-lib
Commits:
fc4520e0 by Étienne Mollier at 2024-10-11T11:18:33+02:00
New upstream version 0.1.git20240425.aec45be+dfsg
- - - - -
6 changed files:
- build.xml
- src/jam/console/ConsoleApplication.java
- src/jam/framework/AboutBox.java
- src/jam/framework/Application.java
- src/jam/framework/MultiDocApplication.java
- src/jam/mac/Utils.java
Changes:
=====================================
build.xml
=====================================
@@ -31,7 +31,7 @@
<condition property="isMac">
<os family="mac"/>
</condition>
- <javac source="1.6" target="1.6" srcdir="${src}" destdir="${build}">
+ <javac source="1.8" target="1.8" srcdir="${src}" destdir="${build}">
<include name="jam/**/*"/>
<exclude name="jam/**/maconly/*"/>
<exclude name="jam/**/java9only/*"/>
=====================================
src/jam/console/ConsoleApplication.java
=====================================
@@ -14,6 +14,7 @@ import jam.framework.MenuBarFactory;
import jam.framework.DocumentFrame;
import javax.swing.*;
+import java.awt.*;
import java.io.File;
import java.io.IOException;
@@ -27,16 +28,21 @@ public class ConsoleApplication extends Application {
}
public ConsoleApplication(String nameString, String titleString, String aboutString, Icon icon, boolean dontAskSave) throws IOException {
- this(new ConsoleMenuBarFactory(), nameString, titleString, aboutString, icon, dontAskSave);
+ this(new ConsoleMenuBarFactory(), nameString, titleString, aboutString, null, null, icon, dontAskSave);
+ }
+
+ public ConsoleApplication(String nameString, String titleString, String aboutString, Color aboutBackground, Color aboutForeground, Icon icon, boolean dontAskSave) throws IOException {
+ this(new ConsoleMenuBarFactory(), nameString, titleString, aboutString, aboutBackground, aboutForeground, icon, dontAskSave);
}
public ConsoleApplication(MenuBarFactory menuBarFactory, String nameString, String aboutString, Icon icon, boolean dontAskSave) throws IOException {
- this(menuBarFactory, nameString, nameString, aboutString, icon, dontAskSave);
+ this(menuBarFactory, nameString, nameString, aboutString, null, null, icon, dontAskSave);
}
- public ConsoleApplication(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString, Icon icon, boolean dontAskSave) throws IOException {
+ public ConsoleApplication(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString, Color aboutBackground, Color aboutForeground,
+ Icon icon, boolean dontAskSave) throws IOException {
- super(menuBarFactory, nameString, titleString, aboutString, icon);
+ super(menuBarFactory, nameString, titleString, aboutString, aboutBackground, aboutForeground, icon, null, null);
this.dontAskSave = dontAskSave;
=====================================
src/jam/framework/AboutBox.java
=====================================
@@ -25,6 +25,14 @@ public class AboutBox extends AbstractFrame {
* and centers it over the parent component.
*/
public AboutBox(String title, String message, Icon icon) {
+ this(title, message, icon, null,null);
+ }
+
+ /**
+ * Creates an AboutBox with a given title, message and icon
+ * and centers it over the parent component.
+ */
+ public AboutBox(String title, String message, Icon icon, Color background, Color foreground) {
super();
if (icon != null) {
@@ -48,14 +56,16 @@ public class AboutBox extends AbstractFrame {
JPanel contentsPanel = new JPanel(new GridBagLayout());
contentsPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
- contentsPanel.setBackground(Color.white);
+ contentsPanel.setBackground(background != null ? background : Color.white);
+ contentsPanel.setForeground(foreground != null ? foreground : Color.black);
// JLabel iconLabel = new JLabel(icon, JLabel.CENTER);
JLabel titleLabel = new JLabel(title, JLabel.CENTER);
Font font = titleLabel.getFont();
titleLabel.setFont(font.deriveFont(32.0f).deriveFont(Font.PLAIN));
- titleLabel.setIcon(icon);
+ titleLabel.setForeground(foreground);
+ titleLabel.setIcon(IconUtils.resize(icon, 96, 96));
GridBagConstraints c = new GridBagConstraints();
c.gridwidth = GridBagConstraints.REMAINDER;
=====================================
src/jam/framework/Application.java
=====================================
@@ -37,6 +37,8 @@ public abstract class Application {
private static String nameString;
private static String titleString;
private static String aboutString;
+ private static Color aboutBackground;
+ private static Color aboutForeground;
private static String websiteURLString;
private static String helpURLString;
@@ -70,6 +72,14 @@ public abstract class Application {
return aboutString;
}
+ public static Color getAboutBackground() {
+ return aboutBackground;
+ }
+
+ public static Color getAboutForeground() {
+ return aboutForeground;
+ }
+
public static String getWebsiteURLString() {
return websiteURLString;
}
@@ -93,11 +103,19 @@ public abstract class Application {
public Application(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString, Icon icon,
String websiteURLString, String helpURLString) {
+ this(menuBarFactory, nameString, titleString, aboutString, null, null, icon, websiteURLString, helpURLString);
+ }
+
+ public Application(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString,
+ Color aboutBackground, Color aboutForeground, Icon icon,
+ String websiteURLString, String helpURLString) {
Application.menuBarFactory = menuBarFactory;
Application.nameString = nameString;
Application.titleString = titleString;
Application.aboutString = aboutString;
+ Application.aboutBackground = aboutBackground;
+ Application.aboutForeground = aboutForeground;
Application.websiteURLString = websiteURLString;
Application.helpURLString = helpURLString;
Application.icon = icon;
@@ -172,7 +190,7 @@ public abstract class Application {
protected abstract JFrame getDefaultFrame();
public void doAbout() {
- AboutBox aboutBox = new AboutBox(getTitleString(), getAboutString(), getIcon());
+ AboutBox aboutBox = new AboutBox(getTitleString(), getAboutString(), getIcon(), getAboutBackground(), getAboutForeground());
//aboutBox.initialize(); //causes about frame to have the menu system from the main frame.
aboutBox.setVisible(true);
}
=====================================
src/jam/framework/MultiDocApplication.java
=====================================
@@ -16,6 +16,7 @@ package jam.framework;
import jam.mac.Utils;
import javax.swing.*;
+import java.awt.*;
import java.io.File;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -56,6 +57,10 @@ public class MultiDocApplication extends Application {
super(menuBarFactory, nameString, titleString, aboutString, icon, websiteURLString, helpURLString);
}
+ public MultiDocApplication(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString, Color aboutBackground, Color aboutForeground, Icon icon, String websiteURLString, String helpURLString) {
+ super(menuBarFactory, nameString, titleString, aboutString, aboutBackground, aboutForeground, icon, websiteURLString, helpURLString);
+ }
+
public final void initialize() {
// Register the application with the OK. Prior to Java 1.9 this was just
// for Mac OS X. Now it uses java.desktop.Desktop to be cross platform
=====================================
src/jam/mac/Utils.java
=====================================
@@ -40,6 +40,8 @@ public class Utils {
try {
adapter = Class.forName("jam.java9only.ApplicationAdapter");
+ } catch(UnsupportedClassVersionError e) {
+ // probably not Java 9 then...
} catch (Exception e) {
// do nothing...
}
View it on GitLab: https://salsa.debian.org/med-team/jam-lib/-/commit/fc4520e0c162d8fe1083e67a5edece86f83b1b71
--
View it on GitLab: https://salsa.debian.org/med-team/jam-lib/-/commit/fc4520e0c162d8fe1083e67a5edece86f83b1b71
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/debian-med-commit/attachments/20241011/c96006d5/attachment-0001.htm>
More information about the debian-med-commit
mailing list