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

Add right-click menu to desktop advanced search

Browse Source
This commit is contained in:
drdev
2015-09-20 17:02:21 +00:00
parent 22bfc9f1e3
commit 0220a00f94
4 changed files with 71 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
View File

@@ -163,13 +163,14 @@ public class CardManager extends ItemManager<PaperCard> {
public void run() {
AdvancedSearchFilter<PaperCard> filter = itemManager.getFilter(AdvancedSearchFilter.class);
if (filter != null) {
if (filter.edit()) {
itemManager.applyNewOrModifiedFilter(filter);
}
filter.edit();
}
else {
filter = new AdvancedSearchFilter<PaperCard>(itemManager);
if (filter.edit()) {
itemManager.lockFiltering = true; //ensure filter not applied until added
boolean result = filter.edit();
itemManager.lockFiltering = false;
if (result) {
itemManager.addFilter(filter);
}
}

9
forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
View File

@@ -232,13 +232,14 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
public void run() {
AdvancedSearchFilter<DeckProxy> filter = getFilter(AdvancedSearchFilter.class);
if (filter != null) {
if (filter.edit()) {
applyNewOrModifiedFilter(filter);
}
filter.edit();
}
else {
filter = new AdvancedSearchFilter<DeckProxy>(DeckManager.this);
if (filter.edit()) {
lockFiltering = true; //ensure filter not applied until added
boolean result = filter.edit();
lockFiltering = false;
if (result) {
addFilter(filter);
}
}

2
forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
View File

@@ -860,7 +860,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
}
//apply filters and focus existing filter's main component if filtering not locked
protected void applyNewOrModifiedFilter(final ItemFilter<? extends T> filter) {
public void applyNewOrModifiedFilter(final ItemFilter<? extends T> filter) {
if (this.lockFiltering) {
filter.afterFiltersApplied(); //ensure this called even if filters currently locked
return;

61
forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java
View File

@@ -2,15 +2,20 @@ package forge.itemmanager.filters;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.MouseEvent;
import forge.UiCommand;
import forge.gui.GuiUtils;
import forge.interfaces.IButton;
import forge.item.InventoryItem;
import forge.itemmanager.AdvancedSearch;
import forge.itemmanager.ItemManager;
import forge.itemmanager.AdvancedSearch.IFilterControl;
import forge.toolbox.FLabel;
import forge.toolbox.FMouseAdapter;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedPanel;
import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
@@ -41,6 +46,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
@Override
public void reset() {
model.reset();
editDialog = null;
}
@Override
@@ -56,6 +62,50 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
@Override
protected final void buildWidget(JPanel widget) {
label = new FLabel.Builder().fontAlign(SwingConstants.LEFT).fontSize(12).build();
label.addMouseListener(new FMouseAdapter() {
@Override
public void onLeftDoubleClick(final MouseEvent e) {
edit();
}
@Override
public void onRightClick(final MouseEvent e) {
final JPopupMenu menu = new JPopupMenu("AdvancedSearchContextMenu");
boolean hasFilters = !isEmpty();
if (hasFilters) {
//add a menu item for each filter to allow easily editing just that filter
for (final IFilterControl<T> control : model.getControls()) {
GuiUtils.addMenuItem(menu, FSkin.encodeSymbols(control.getFilter().toString(), false), null, new Runnable() {
@Override
public void run() {
model.editFilterControl(control, onFilterChange);
}
});
}
GuiUtils.addSeparator(menu);
}
GuiUtils.addMenuItem(menu, "Edit Expression", null, new Runnable() {
@Override
public void run() {
edit();
}
});
if (hasFilters) {
GuiUtils.addMenuItem(menu, "Clear Filter", null, new Runnable() {
@Override
public void run() {
reset();
itemManager.applyNewOrModifiedFilter(AdvancedSearchFilter.this);
}
});
}
menu.show(e.getComponent(), e.getX(), e.getY());
}
});
model.setLabel(label);
widget.add(label);
}
@@ -77,6 +127,15 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
return false;
}
private final Runnable onFilterChange = new Runnable() {
@Override
public void run() {
//update expression when edit screen closed or a single filter is changed
model.updateExpression();
itemManager.applyNewOrModifiedFilter(AdvancedSearchFilter.this);
}
};
@SuppressWarnings("serial")
private class EditDialog {
private static final int WIDTH = 400;
@@ -120,7 +179,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
optionPane.dispose();
if (result != 1) {
model.updateExpression(); //update expression when dialog accepted
onFilterChange.run();
return true;
}
return false;