Skip to content

Commit

Permalink
Improved icons.
Browse files Browse the repository at this point in the history
  • Loading branch information
albertus82 committed Oct 23, 2016
1 parent af044f0 commit ba3f8d8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions src/main/java/it/albertus/router/gui/AboutDialog.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package it.albertus.router.gui;

import it.albertus.jface.listener.LinkSelectionListener;
import it.albertus.router.resources.Messages;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
Expand All @@ -15,6 +12,9 @@
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Shell;

import it.albertus.jface.listener.LinkSelectionListener;
import it.albertus.router.resources.Messages;

public class AboutDialog extends Dialog {

private String message = "";
Expand Down Expand Up @@ -47,7 +47,7 @@ private void createContents(final Shell shell) {
shell.setLayout(new GridLayout(2, false));

final Label icon = new Label(shell, SWT.NONE);
icon.setImage(Images.MAIN_ICONS[3]);
icon.setImage(Images.MAIN_ICONS[6]);
GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 3);
icon.setLayoutData(gridData);

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/it/albertus/router/gui/Images.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@

public class Images {

/* Icona principale dell'applicazione (in vari formati) */
// Icona principale dell'applicazione (in vari formati)
public static final Image[] MAIN_ICONS = loadIcons("main.ico");

/* Icone base per l'area di notifica (16x16) */
public static final Image TRAY_ICON_ACTIVE = Images.MAIN_ICONS[1];
// Icone base per l'area di notifica (16x16)
public static final Image TRAY_ICON_ACTIVE = Images.MAIN_ICONS[2];
public static final Image TRAY_ICON_INACTIVE = loadIcons("inactive.ico")[0];

/* Simboli in sovraimpressione per l'area di notifica (16x16, non utilizzabili da soli) */
// Simboli in sovraimpressione per l'area di notifica (16x16, non utilizzabili da soli)
private static final Image TRAY_ICON_OVERLAY_CLOCK = loadIcons("clock.ico")[0];
private static final Image TRAY_ICON_OVERLAY_ERROR = loadIcons("error.ico")[0];
private static final Image TRAY_ICON_OVERLAY_LOCK = loadIcons("lock.ico")[0];
private static final Image TRAY_ICON_OVERLAY_WARNING = loadIcons("warning.ico")[0];

/* Icone composte per l'area di notifica (16x16) */
// Icone composte per l'area di notifica (16x16)
public static final Image TRAY_ICON_ACTIVE_WARNING = new DecorationOverlayIcon(TRAY_ICON_ACTIVE, ImageDescriptor.createFromImage(Images.TRAY_ICON_OVERLAY_WARNING), IDecoration.BOTTOM_RIGHT).createImage();
public static final Image TRAY_ICON_ACTIVE_LOCK = new DecorationOverlayIcon(TRAY_ICON_ACTIVE, ImageDescriptor.createFromImage(Images.TRAY_ICON_OVERLAY_LOCK), IDecoration.BOTTOM_RIGHT).createImage();
public static final Image TRAY_ICON_INACTIVE_CLOCK = new DecorationOverlayIcon(TRAY_ICON_INACTIVE, ImageDescriptor.createFromImage(Images.TRAY_ICON_OVERLAY_CLOCK), IDecoration.BOTTOM_RIGHT).createImage();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/it/albertus/router/server/WebServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
public class WebServer extends BaseHttpServer {

static {
// System.setProperty("sun.net.httpserver.clockTick", "1");
// System.setProperty("sun.net.httpserver.timerMillis", "1");
System.setProperty("sun.net.httpserver.maxReqTime", "3");
System.setProperty("sun.net.httpserver.maxRspTime", "3");
// System.getProperty("sun.net.httpserver.debug", Boolean.TRUE.toString());
// System.setProperty("sun.net.httpserver.clockTick", "1");
// System.setProperty("sun.net.httpserver.timerMillis", "1");
// System.getProperty("sun.net.httpserver.debug", Boolean.TRUE.toString());
}

private static class Singleton {
Expand Down
Binary file modified src/main/resources/it/albertus/router/gui/main.icns
Binary file not shown.
Binary file modified src/main/resources/it/albertus/router/gui/main.ico
Binary file not shown.

0 comments on commit ba3f8d8

Please sign in to comment.