sarsoo/fmframework
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

add view album/artist buttons

Browse Source
This commit is contained in:
aj 2019-05-07 11:00:43 +01:00
parent fdac060b98
commit 56436c8cca
4 changed files with 163 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/main/java/sarsoo/fmframework/fx/controller/borderpane/AlbumBorderPaneController.java
View File

@ -1,25 +1,31 @@
package sarsoo.fmframework.fx.controller.borderpane; package sarsoo.fmframework.fx.controller.borderpane;
import java.awt.Desktop;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.concurrent.Service; import javafx.concurrent.Service;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.control.Button;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import sarsoo.fmframework.fm.FmUserNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.fx.chart.GenrePieChartTitledPane; import sarsoo.fmframework.fx.FmFramework;
import sarsoo.fmframework.fx.controller.info.AlbumPaneController; import sarsoo.fmframework.fx.controller.info.AlbumPaneController;
import sarsoo.fmframework.fx.controller.info.ArtistPaneController; import sarsoo.fmframework.fx.tab.ArtistTab;
import sarsoo.fmframework.log.Logger;
import sarsoo.fmframework.log.entry.ErrorEntry;
import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Album;
import sarsoo.fmframework.music.Artist;
import sarsoo.fmframework.net.Key; import sarsoo.fmframework.net.Key;
import sarsoo.fmframework.net.Network; import sarsoo.fmframework.net.Network;
import sarsoo.fmframework.util.Reference; import sarsoo.fmframework.util.Reference;
public class AlbumBorderPaneController extends FMObjBorderPaneController{ public class AlbumBorderPaneController extends FMObjBorderPaneController {
AlbumPaneController infoPaneController; AlbumPaneController infoPaneController;
Album album; Album album;
@ -42,6 +48,39 @@ public class AlbumBorderPaneController extends FMObjBorderPaneController{
e.printStackTrace(); e.printStackTrace();
} }
setInfoView(); setInfoView();
Button openRym = new Button("view rym");
Button viewArtist = new Button("view artist");
openRym.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent e) {
Network.openURL(album.getRymURL());
}
});
if (album.getArtist() != null) {
viewArtist.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent e) {
try {
FmFramework.getController().addTab(new ArtistTab(album.getArtist()));
} catch (IOException e1) {
e1.printStackTrace();
}
}
});
} else {
viewArtist.setDisable(true);
}
toolBar.getItems().add(openRym);
toolBar.getItems().add(viewArtist);
// if(album.getUrl() == null) {
buttonViewOnline.setDisable(true);
// }
} }
@Override @Override
@ -63,11 +102,21 @@ public class AlbumBorderPaneController extends FMObjBorderPaneController{
} }
@Override @Override
@FXML
protected void handleViewOnline(ActionEvent event) { protected void handleViewOnline(ActionEvent event) {
Network.openURL(album.getUrl()); System.out.println(album.getUrl());
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
try {
Desktop.getDesktop().browse(new URI(album.getUrl()));
} catch (Exception e) {
Logger.getLog().logError(new ErrorEntry("Can't Open"));
}
}
// Network.openURL(album.getUrl());
} }
@Override @Override
@FXML
protected void handleRefresh(ActionEvent event) { protected void handleRefresh(ActionEvent event) {
Service<Void> service = new Service<Void>() { Service<Void> service = new Service<Void>() {

20
src/main/java/sarsoo/fmframework/fx/controller/borderpane/ArtistBorderPaneController.java
View File

@ -1,6 +1,9 @@
package sarsoo.fmframework.fx.controller.borderpane; package sarsoo.fmframework.fx.controller.borderpane;
import java.awt.Desktop;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.concurrent.Service; import javafx.concurrent.Service;
@ -10,7 +13,6 @@ import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import sarsoo.fmframework.fm.FmUserNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.fx.chart.GenrePieChartTitledPane;
import sarsoo.fmframework.fx.controller.info.ArtistPaneController; import sarsoo.fmframework.fx.controller.info.ArtistPaneController;
import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.Artist;
import sarsoo.fmframework.net.Key; import sarsoo.fmframework.net.Key;
@ -40,6 +42,10 @@ public class ArtistBorderPaneController extends FMObjBorderPaneController{
e.printStackTrace(); e.printStackTrace();
} }
setInfoView(); setInfoView();
// if(artist.getUrl() == null) {
buttonViewOnline.setDisable(true);
// }
} }
@Override @Override
@ -61,11 +67,21 @@ public class ArtistBorderPaneController extends FMObjBorderPaneController{
} }
@Override @Override
@FXML
protected void handleViewOnline(ActionEvent event) { protected void handleViewOnline(ActionEvent event) {
Network.openURL(artist.getUrl()); System.out.println(artist.getUrl());
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
try {
Desktop.getDesktop().browse(new URI(artist.getUrl()));
} catch (IOException | URISyntaxException e) {
e.printStackTrace();
}
}
// Network.openURL(artist.getUrl());
} }
@Override @Override
@FXML
protected void handleRefresh(ActionEvent event) { protected void handleRefresh(ActionEvent event) {
Service<Void> service = new Service<Void>() { Service<Void> service = new Service<Void>() {

3
src/main/java/sarsoo/fmframework/fx/controller/borderpane/FMObjBorderPaneController.java
View File

@ -31,6 +31,9 @@ public abstract class FMObjBorderPaneController {
@FXML @FXML
protected Button buttonViewInfo; protected Button buttonViewInfo;
@FXML
protected Button buttonViewOnline;
@FXML @FXML
protected BorderPane borderPane; protected BorderPane borderPane;

65
src/main/java/sarsoo/fmframework/fx/controller/borderpane/TrackBorderPaneController.java
View File

@ -1,25 +1,30 @@
package sarsoo.fmframework.fx.controller.borderpane; package sarsoo.fmframework.fx.controller.borderpane;
import java.awt.Desktop;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.concurrent.Service; import javafx.concurrent.Service;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.control.Button;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import sarsoo.fmframework.fm.FmUserNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.fx.chart.GenrePieChartTitledPane; import sarsoo.fmframework.fx.FmFramework;
import sarsoo.fmframework.fx.controller.info.ArtistPaneController;
import sarsoo.fmframework.fx.controller.info.TrackPaneController; import sarsoo.fmframework.fx.controller.info.TrackPaneController;
import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.fx.tab.AlbumTab;
import sarsoo.fmframework.fx.tab.ArtistTab;
import sarsoo.fmframework.music.Track; import sarsoo.fmframework.music.Track;
import sarsoo.fmframework.net.Key; import sarsoo.fmframework.net.Key;
import sarsoo.fmframework.net.Network; import sarsoo.fmframework.net.Network;
import sarsoo.fmframework.util.Reference; import sarsoo.fmframework.util.Reference;
public class TrackBorderPaneController extends FMObjBorderPaneController{ public class TrackBorderPaneController extends FMObjBorderPaneController {
TrackPaneController infoPaneController; TrackPaneController infoPaneController;
Track track; Track track;
@ -42,6 +47,46 @@ public class TrackBorderPaneController extends FMObjBorderPaneController{
e.printStackTrace(); e.printStackTrace();
} }
setInfoView(); setInfoView();
Button viewAlbum = new Button("view album");
Button viewArtist = new Button("view artist");
if (track.getAlbum() != null) {
viewAlbum.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent e) {
try {
FmFramework.getController().addTab(new AlbumTab(track.getAlbum()));
} catch (IOException e1) {
e1.printStackTrace();
}
}
});
}else {
viewAlbum.setDisable(true);
}
if (track.getArtist() != null) {
viewArtist.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent e) {
try {
FmFramework.getController().addTab(new ArtistTab(track.getArtist()));
} catch (IOException e1) {
e1.printStackTrace();
}
}
});
}else {
viewArtist.setDisable(true);
}
toolBar.getItems().add(viewAlbum);
toolBar.getItems().add(viewArtist);
// if(track.getUrl() == null) {
buttonViewOnline.setDisable(true);
// }
} }
@Override @Override
@ -63,11 +108,21 @@ public class TrackBorderPaneController extends FMObjBorderPaneController{
} }
@Override @Override
@FXML
protected void handleViewOnline(ActionEvent event) { protected void handleViewOnline(ActionEvent event) {
Network.openURL(track.getUrl()); System.out.println(track.getUrl());
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
try {
Desktop.getDesktop().browse(new URI(track.getUrl()));
} catch (IOException | URISyntaxException e) {
e.printStackTrace();
}
}
// Network.openURL(track.getUrl());
} }
@Override @Override
@FXML
protected void handleRefresh(ActionEvent event) { protected void handleRefresh(ActionEvent event) {
Service<Void> service = new Service<Void>() { Service<Void> service = new Service<Void>() {