Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/yusufm/VisiCut into yusuf…

…m-master
  • Loading branch information...
t-oster committed Oct 31, 2019
2 parents 91f203d + 0e25b72 commit 68070b76dfc1bc80ce7a5c3dfe2fbc1687c37b1f
Showing with 11 additions and 11 deletions.
  1. +1 −1 .travis.yml
  2. +10 −10 src/com/t_oster/visicut/gui/MainView.java
@@ -1,6 +1,6 @@
language: java
jdk:
- openjdk8
- openjdk9
- openjdk11

before_install:
@@ -22,11 +22,11 @@
// It is loaded dynamically iff JavaFX is available:
// import com.tur0kk.thingiverse.gui.ThingiverseLoginDialog;
import com.tur0kk.thingiverse.gui.ThingiverseDialog;
import com.apple.eawt.AppEvent.AboutEvent;
import com.apple.eawt.AppEvent.OpenFilesEvent;
import com.apple.eawt.AppEvent.PreferencesEvent;
import com.apple.eawt.AppEvent.QuitEvent;
import com.apple.eawt.QuitResponse;
import java.awt.desktop.AboutEvent;
import java.awt.desktop.OpenFilesEvent;
import java.awt.desktop.PreferencesEvent;
import java.awt.desktop.QuitEvent;
import java.awt.desktop.QuitResponse;
import com.frochr123.fabqr.FabQRFunctions;
import com.frochr123.fabqr.gui.FabQRUploadDialog;
import com.frochr123.gui.QRWebcamScanDialog;
@@ -312,9 +312,9 @@ public void componentHidden(ComponentEvent ce)

if (Helper.isMacOS())
{
com.apple.eawt.Application macApplication = com.apple.eawt.Application.getApplication();
java.awt.Desktop macApplication = java.awt.Desktop.getDesktop();
jmPreferences.setVisible(false);
macApplication.setPreferencesHandler(new com.apple.eawt.PreferencesHandler()
macApplication.setPreferencesHandler(new java.awt.desktop.PreferencesHandler()
{

public void handlePreferences(PreferencesEvent pe)
@@ -323,7 +323,7 @@ public void handlePreferences(PreferencesEvent pe)
}
});
exitMenuItem.setVisible(false);
macApplication.setQuitHandler(new com.apple.eawt.QuitHandler()
macApplication.setQuitHandler(new java.awt.desktop.QuitHandler()
{

public void handleQuitRequestWith(QuitEvent qe, QuitResponse qr)
@@ -332,15 +332,15 @@ public void handleQuitRequestWith(QuitEvent qe, QuitResponse qr)
}
});
aboutMenuItem.setVisible(false);
macApplication.setAboutHandler(new com.apple.eawt.AboutHandler()
macApplication.setAboutHandler(new java.awt.desktop.AboutHandler()
{

public void handleAbout(AboutEvent ae)
{
MainView.this.aboutMenuItemActionPerformed(null);
}
});
macApplication.setOpenFileHandler(new com.apple.eawt.OpenFilesHandler()
macApplication.setOpenFileHandler(new java.awt.desktop.OpenFilesHandler()
{

public void openFiles(OpenFilesEvent ofe)

0 comments on commit 68070b7

Please sign in to comment.
You can’t perform that action at this time.