External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GUI: added visual progress bar in download images dialog (#8566)

Browse source
This commit is contained in:
Oleg Agafonov 2023-03-19 21:53:22 +04:00
parent e48f024909
commit ca993eae39
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadServiceInfo.java
View file

@ -16,6 +16,8 @@ public interface DownloadServiceInfo {
void updateGlobalMessage(String text);
void updateProgressMessage(String text);
void updateProgressMessage(String text, int progressCurrent, int progressNeed);
void showDownloadControls(boolean needToShow);

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java
View file

@ -250,7 +250,11 @@ public enum ScryfallImageSource implements CardImageSource {
private void updatePrepareStats(DownloadServiceInfo service, int need, int current) {
synchronized (service.getSync()) {
service.updateProgressMessage(String.format("Preparing download list... %d of %d", current, need));
service.updateProgressMessage(
String.format("Preparing download list... %d of %d", current, need),
current,
need
);
}
}

13
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java
View file

@ -260,7 +260,16 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
@Override
public void updateProgressMessage(String text) {
updateProgressMessage(text, 0, 0);
}
@Override
public void updateProgressMessage(String text, int progressCurrent, int progressNeed) {
this.uiDialog.getProgressBar().setString(text);
// set values to 0 to disable progress bar
this.uiDialog.getProgressBar().setMaximum(progressNeed);
this.uiDialog.getProgressBar().setValue(progressCurrent);
}
@Override
@ -409,7 +418,7 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
? "%d of %d (%d cards/%d tokens) image downloads finished! Please close!"
: "%d of %d (%d cards/%d tokens) image downloads finished! Please wait! [%.1f Mb]",
0, imageSum, cardCount, tokenCount, mb
));
), 0, imageSum);
}
private static String createDownloadName(CardInfo card) {
@ -989,7 +998,7 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
// downloading
float mb = ((needDownloadCount - lastCardIndex) * selectedSource.getAverageSize()) / 1024;
updateProgressMessage(String.format("%d of %d image downloads finished! Please wait! [%.1f Mb]",
lastCardIndex, needDownloadCount, mb));
lastCardIndex, needDownloadCount, mb), lastCardIndex, needDownloadCount);
} else {
// finished
List<CardDownloadData> downloadedCards = Collections.synchronizedList(new ArrayList<>());