mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 04:08:01 +00:00
Renamed forge.view.bazaar to forge.gui.bazaar for consistency.
This commit is contained in:
6
.gitattributes
vendored
6
.gitattributes
vendored
@@ -12324,6 +12324,9 @@ src/main/java/forge/gui/MultiPhaseProgressMonitorWithETA.java svneol=native#text
|
|||||||
src/main/java/forge/gui/SOverlayUtils.java -text
|
src/main/java/forge/gui/SOverlayUtils.java -text
|
||||||
src/main/java/forge/gui/UnsortedListModel.java -text
|
src/main/java/forge/gui/UnsortedListModel.java -text
|
||||||
src/main/java/forge/gui/WrapLayout.java -text
|
src/main/java/forge/gui/WrapLayout.java -text
|
||||||
|
src/main/java/forge/gui/bazaar/ViewItem.java -text
|
||||||
|
src/main/java/forge/gui/bazaar/ViewStall.java svneol=native#text/plain
|
||||||
|
src/main/java/forge/gui/bazaar/package-info.java svneol=native#text/plain
|
||||||
src/main/java/forge/gui/deckeditor/CDeckEditorUI.java -text
|
src/main/java/forge/gui/deckeditor/CDeckEditorUI.java -text
|
||||||
src/main/java/forge/gui/deckeditor/DeckImport.java -text
|
src/main/java/forge/gui/deckeditor/DeckImport.java -text
|
||||||
src/main/java/forge/gui/deckeditor/MenuCommon.java svneol=native#text/plain
|
src/main/java/forge/gui/deckeditor/MenuCommon.java svneol=native#text/plain
|
||||||
@@ -12594,9 +12597,6 @@ src/main/java/forge/view/arcane/util/GlowText.java svneol=native#text/plain
|
|||||||
src/main/java/forge/view/arcane/util/ImageUtil.java svneol=native#text/plain
|
src/main/java/forge/view/arcane/util/ImageUtil.java svneol=native#text/plain
|
||||||
src/main/java/forge/view/arcane/util/UI.java svneol=native#text/plain
|
src/main/java/forge/view/arcane/util/UI.java svneol=native#text/plain
|
||||||
src/main/java/forge/view/arcane/util/package-info.java svneol=native#text/plain
|
src/main/java/forge/view/arcane/util/package-info.java svneol=native#text/plain
|
||||||
src/main/java/forge/view/bazaar/ViewItem.java -text
|
|
||||||
src/main/java/forge/view/bazaar/ViewStall.java svneol=native#text/plain
|
|
||||||
src/main/java/forge/view/bazaar/package-info.java svneol=native#text/plain
|
|
||||||
src/main/java/forge/view/package-info.java svneol=native#text/plain
|
src/main/java/forge/view/package-info.java svneol=native#text/plain
|
||||||
src/main/java/net/slightlymagic/braids/BaseProgressMonitor.java svneol=native#text/plain
|
src/main/java/net/slightlymagic/braids/BaseProgressMonitor.java svneol=native#text/plain
|
||||||
src/main/java/net/slightlymagic/braids/BraidsProgressMonitor.java svneol=native#text/plain
|
src/main/java/net/slightlymagic/braids/BraidsProgressMonitor.java svneol=native#text/plain
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package forge.control.bazaar;
|
package forge.control.bazaar;
|
||||||
|
|
||||||
import forge.view.bazaar.ViewStall;
|
import forge.gui.bazaar.ViewStall;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO: Write javadoc for this type.
|
* TODO: Write javadoc for this type.
|
||||||
@@ -9,12 +9,12 @@ import forge.view.bazaar.ViewStall;
|
|||||||
public class ControlStall {
|
public class ControlStall {
|
||||||
private final ViewStall view;
|
private final ViewStall view;
|
||||||
|
|
||||||
/** @param v0   {@link forge.view.bazaar.ViewStall} */
|
/** @param v0   {@link forge.gui.bazaar.ViewStall} */
|
||||||
public ControlStall(ViewStall v0) {
|
public ControlStall(ViewStall v0) {
|
||||||
this.view = v0;
|
this.view = v0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return {@link forge.view.bazaar.ViewStall} */
|
/** @return {@link forge.gui.bazaar.ViewStall} */
|
||||||
public ViewStall getView() {
|
public ViewStall getView() {
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package forge.view.bazaar;
|
package forge.gui.bazaar;
|
||||||
|
|
||||||
import java.awt.Font;
|
import java.awt.Font;
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package forge.view.bazaar;
|
package forge.gui.bazaar;
|
||||||
|
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
/** Views (as in model-view-controller) for Forge. */
|
/** Views (as in model-view-controller) for Forge. */
|
||||||
package forge.view.bazaar;
|
package forge.gui.bazaar;
|
||||||
|
|
||||||
@@ -71,7 +71,7 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet, IVDoc {
|
|||||||
.fontSize(15).build();
|
.fontSize(15).build();
|
||||||
private final FLabel lblTitle = new FLabel.Builder()
|
private final FLabel lblTitle = new FLabel.Builder()
|
||||||
.text("Title Hasn't Been Set Yet").fontAlign(SwingConstants.CENTER)
|
.text("Title Hasn't Been Set Yet").fontAlign(SwingConstants.CENTER)
|
||||||
.fontSize(16).build();
|
.fontSize(18).build();
|
||||||
private final FLabel lblNextChallengeInWins = new FLabel.Builder()
|
private final FLabel lblNextChallengeInWins = new FLabel.Builder()
|
||||||
.fontSize(15).build();
|
.fontSize(15).build();
|
||||||
private final FLabel btnCurrentDeck = new FLabel.Builder()
|
private final FLabel btnCurrentDeck = new FLabel.Builder()
|
||||||
@@ -90,6 +90,8 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet, IVDoc {
|
|||||||
pnlTitle.setLayout(new MigLayout("insets 0, gap 0"));
|
pnlTitle.setLayout(new MigLayout("insets 0, gap 0"));
|
||||||
pnlTitle.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));
|
pnlTitle.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));
|
||||||
pnlTitle.add(lblTitle, "w 100%, h 100%, gap 0 0 0 0");
|
pnlTitle.add(lblTitle, "w 100%, h 100%, gap 0 0 0 0");
|
||||||
|
pnlTitle.setBorder(null);
|
||||||
|
pnlTitle.setCornerDiameter(0);
|
||||||
|
|
||||||
populateStats();
|
populateStats();
|
||||||
populateStart();
|
populateStart();
|
||||||
@@ -134,7 +136,7 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet, IVDoc {
|
|||||||
parentCell.getBody().removeAll();
|
parentCell.getBody().removeAll();
|
||||||
parentCell.getBody().setOpaque(false);
|
parentCell.getBody().setOpaque(false);
|
||||||
parentCell.getBody().setLayout(new MigLayout("insets 0, gap 0, wrap"));
|
parentCell.getBody().setLayout(new MigLayout("insets 0, gap 0, wrap"));
|
||||||
parentCell.getBody().add(pnlTitle, "w 94%!, h 30px!, gap 3% 0 15px 15px");
|
parentCell.getBody().add(pnlTitle, "w 100%!, h 30px!, gap 0 0 0 0");
|
||||||
parentCell.getBody().add(pnlStats, "w 94%!, gap 3% 0 0 20px");
|
parentCell.getBody().add(pnlStats, "w 94%!, gap 3% 0 0 20px");
|
||||||
parentCell.getBody().add(scrChallenges, "w 94%!, pushy, growy, gap 3% 0 0 0");
|
parentCell.getBody().add(scrChallenges, "w 94%!, pushy, growy, gap 3% 0 0 0");
|
||||||
parentCell.getBody().add(pnlStart, "w 94%, gap 3% 0 15px 5%");
|
parentCell.getBody().add(pnlStart, "w 94%, gap 3% 0 15px 5%");
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ import javax.swing.SwingUtilities;
|
|||||||
import net.miginfocom.swing.MigLayout;
|
import net.miginfocom.swing.MigLayout;
|
||||||
import forge.Command;
|
import forge.Command;
|
||||||
import forge.control.ControlBazaarUI;
|
import forge.control.ControlBazaarUI;
|
||||||
|
import forge.gui.bazaar.ViewStall;
|
||||||
import forge.gui.toolbox.FLabel;
|
import forge.gui.toolbox.FLabel;
|
||||||
import forge.gui.toolbox.FPanel;
|
import forge.gui.toolbox.FPanel;
|
||||||
import forge.gui.toolbox.FSkin;
|
import forge.gui.toolbox.FSkin;
|
||||||
import forge.quest.bazaar.QuestBazaarManager;
|
import forge.quest.bazaar.QuestBazaarManager;
|
||||||
import forge.view.bazaar.ViewStall;
|
|
||||||
|
|
||||||
|
|
||||||
/** Lays out containers and borders for resizeable layout and
|
/** Lays out containers and borders for resizeable layout and
|
||||||
@@ -95,7 +95,7 @@ public class ViewBazaarUI extends FPanel {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO: Write javadoc for this method.
|
* TODO: Write javadoc for this method.
|
||||||
* @return {@link forge.view.bazaar.ViewStall}
|
* @return {@link forge.gui.bazaar.ViewStall}
|
||||||
*/
|
*/
|
||||||
public ViewStall getPnlSingleStall() {
|
public ViewStall getPnlSingleStall() {
|
||||||
return this.pnlSingleStall;
|
return this.pnlSingleStall;
|
||||||
|
|||||||
Reference in New Issue
Block a user