external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't enable choose directory button in migrate mode

Browse Source
This commit is contained in:
myk
2013-03-12 19:31:14 +00:00
parent d58d3ecfd6
commit 76ab5f6a2d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/gui/DialogMigrateProfile.java
View File

@@ -76,7 +76,7 @@ public class DialogMigrateProfile {
p.setOpaque(false);
p.setBackgroundTexture(FSkin.getIcon(FSkin.Backgrounds.BG_TEXTURE));
boolean isMigration = !StringUtils.isEmpty(forcedSrcDir);
final boolean isMigration = !StringUtils.isEmpty(forcedSrcDir);
// header
p.add(new FLabel.Builder().text((isMigration ? "Migrate" : "Import") + " profile data").fontSize(15).build(), "center");
@@ -177,7 +177,9 @@ public class DialogMigrateProfile {
analyzer.execute();
_analyzerActive = true;
}
_btnChooseDir.setEnabled(true);
if (!isMigration) {
_btnChooseDir.setEnabled(true);
}
}
};
analyzerStarter.execute();
@@ -428,7 +430,7 @@ public class DialogMigrateProfile {
MigrationSourceAnalyzer.AnalysisCallback cb = new MigrationSourceAnalyzer.AnalysisCallback() {
@Override
public boolean checkCancel() { try{Thread.sleep(1);}catch(InterruptedException e) {} return _cancel; }
public boolean checkCancel() { return _cancel; }
@Override
public void addOp(OpType type, File src, File dest) {

6
src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java
View File

@@ -52,7 +52,7 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
private final FLabel btnDownloadPics = _makeButton("Download LQ Card Pictures");
private final FLabel btnDownloadQuestImages = _makeButton("Download Quest Images");
private final FLabel btnReportBug = _makeButton("Report a Bug");
private final FLabel btnImportPictures = _makeButton("Import Pictures");
private final FLabel btnImportPictures = _makeButton("Import Data");
private final FLabel btnHowToPlay = _makeButton("How To Play");
private final FLabel btnDownloadPrices = _makeButton("Download Card Prices");
private final FLabel btnLicensing = _makeButton("License Details");
@@ -79,7 +79,7 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
pnlContent.add(_makeLabel("Download up-to-date price list for in-game card shops."), constraintsLBL);
pnlContent.add(btnImportPictures, constraintsBTN);
pnlContent.add(_makeLabel("Import card pictures from a local version of Forge."), constraintsLBL);
pnlContent.add(_makeLabel("Import data from a local directory."), constraintsLBL);
pnlContent.add(btnReportBug, constraintsBTN);
pnlContent.add(_makeLabel("Something broken?"), constraintsLBL);
@@ -88,7 +88,7 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
pnlContent.add(_makeLabel("Rules of the Game."), constraintsLBL);
pnlContent.add(btnLicensing, constraintsBTN);
pnlContent.add(_makeLabel("About Forge"), constraintsLBL);
pnlContent.add(_makeLabel("Forge legalese."), constraintsLBL);
scrContent.setBorder(null);
}