Skip to content

Commit da62351

Browse files
committed
UI fixes and enhancements
1 parent d8ea426 commit da62351

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

src/main/java/nsusbloader/Controllers/FilesDropHandle.java

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
import javafx.scene.Scene;
2424
import javafx.scene.control.Button;
2525
import javafx.scene.control.Label;
26-
import javafx.scene.control.ProgressBar;
2726
import javafx.scene.control.ProgressIndicator;
2827
import javafx.scene.image.Image;
29-
import javafx.scene.layout.HBox;
3028
import javafx.scene.layout.Pane;
3129
import javafx.scene.layout.Priority;
3230
import javafx.scene.layout.VBox;
31+
import javafx.scene.text.TextAlignment;
3332
import javafx.stage.Stage;
3433
import nsusbloader.AppPreferences;
3534
import nsusbloader.MediatorControl;
@@ -41,11 +40,6 @@
4140
public class FilesDropHandle {
4241

4342
public FilesDropHandle(List<File> files, String filesRegex, String foldersRegex){
44-
45-
//
46-
// TODO: ADD GRAPHICS BEFORE RELEASE !
47-
//
48-
4943
FilesDropHandleTask filesDropHandleTask = new FilesDropHandleTask(files, filesRegex, foldersRegex);
5044

5145
ResourceBundle resourceBundle = MediatorControl.getInstance().getResourceBundle();
@@ -54,9 +48,10 @@ public FilesDropHandle(List<File> files, String filesRegex, String foldersRegex)
5448
ProgressIndicator progressIndicator = new ProgressIndicator();
5549
progressIndicator.setProgress(ProgressIndicator.INDETERMINATE_PROGRESS);
5650

57-
Label downloadStatusLabel = new Label();
58-
downloadStatusLabel.setWrapText(true);
59-
downloadStatusLabel.textProperty().bind(filesDropHandleTask.messageProperty());
51+
Label statusLabel = new Label();
52+
statusLabel.setWrapText(true);
53+
statusLabel.setTextAlignment(TextAlignment.CENTER);
54+
statusLabel.textProperty().bind(filesDropHandleTask.messageProperty());
6055

6156
Pane fillerPane1 = new Pane();
6257
Pane fillerPane2 = new Pane();
@@ -68,23 +63,23 @@ public FilesDropHandle(List<File> files, String filesRegex, String foldersRegex)
6863
parentVBox.setPadding(new Insets(5.0));
6964
parentVBox.setFillWidth(true);
7065
parentVBox.getChildren().addAll(
71-
downloadStatusLabel,
66+
statusLabel,
7267
fillerPane1,
7368
progressIndicator,
7469
fillerPane2,
7570
cancelButton
76-
); // TODO:FIX
71+
);
7772

7873
VBox.setVgrow(fillerPane1, Priority.ALWAYS);
7974
VBox.setVgrow(fillerPane2, Priority.ALWAYS);
8075

8176
Stage stage = new Stage();
8277
stage.setTitle(resourceBundle.getString("windowTitleAddingFiles"));
8378
stage.getIcons().addAll(
84-
new Image("/res/dwnload_ico32x32.png"), //TODO: REDRAW
85-
new Image("/res/dwnload_ico48x48.png"),
86-
new Image("/res/dwnload_ico64x64.png"),
87-
new Image("/res/dwnload_ico128x128.png")
79+
new Image("/res/info_ico32x32.png"),
80+
new Image("/res/info_ico48x48.png"),
81+
new Image("/res/info_ico64x64.png"),
82+
new Image("/res/info_ico128x128.png")
8883
);
8984
stage.setMinWidth(300);
9085
stage.setMinHeight(175);
14.1 KB
Loading
8.05 KB
Loading
11.5 KB
Loading
12 KB
Loading

0 commit comments

Comments
 (0)