diff --git a/de.wt.bgg.feature/.project b/de.wt.bgg.feature/.project new file mode 100644 index 0000000..be89475 --- /dev/null +++ b/de.wt.bgg.feature/.project @@ -0,0 +1,17 @@ + + + de.wt.bgg.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/de.wt.bgg.feature/build.properties b/de.wt.bgg.feature/build.properties new file mode 100644 index 0000000..82ab19c --- /dev/null +++ b/de.wt.bgg.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/de.wt.bgg.feature/feature.xml b/de.wt.bgg.feature/feature.xml new file mode 100644 index 0000000..37e311b --- /dev/null +++ b/de.wt.bgg.feature/feature.xml @@ -0,0 +1,27 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + diff --git a/de.wt.bgg.product/.project b/de.wt.bgg.product/.project new file mode 100644 index 0000000..a578aa4 --- /dev/null +++ b/de.wt.bgg.product/.project @@ -0,0 +1,11 @@ + + + de.wt.bgg.product + + + + + + + + diff --git a/de.wt.bgg.product/bggtool.product b/de.wt.bgg.product/bggtool.product new file mode 100644 index 0000000..6432ffd --- /dev/null +++ b/de.wt.bgg.product/bggtool.product @@ -0,0 +1,56 @@ + + + + + + + + + + + -clearPersistedState + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/de.wt.bgg.ui/.classpath b/de.wt.bgg.ui/.classpath new file mode 100644 index 0000000..b862a29 --- /dev/null +++ b/de.wt.bgg.ui/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/de.wt.bgg.ui/.project b/de.wt.bgg.ui/.project new file mode 100644 index 0000000..ef4584b --- /dev/null +++ b/de.wt.bgg.ui/.project @@ -0,0 +1,28 @@ + + + de.wt.bgg.ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/de.wt.bgg.ui/Application.e4xmi b/de.wt.bgg.ui/Application.e4xmi new file mode 100644 index 0000000..9540b95 --- /dev/null +++ b/de.wt.bgg.ui/Application.e4xmi @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/de.wt.bgg.ui/META-INF/MANIFEST.MF b/de.wt.bgg.ui/META-INF/MANIFEST.MF new file mode 100644 index 0000000..c3a0d71 --- /dev/null +++ b/de.wt.bgg.ui/META-INF/MANIFEST.MF @@ -0,0 +1,17 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Secondtry +Bundle-SymbolicName: de.wt.bgg.ui;singleton:=true +Bundle-Version: 1.0.0.qualifier +Automatic-Module-Name: de.wt.secondtry +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.17.0", + org.eclipse.swt;bundle-version="3.113.0", + org.eclipse.e4.core.di;bundle-version="1.7.500", + org.eclipse.e4.ui.workbench;bundle-version="1.11.0", + org.eclipse.e4.ui.di;bundle-version="1.2.700", + org.eclipse.e4.core.di.extensions;bundle-version="0.15.400", + javax.annotation;bundle-version="1.2.0", + org.eclipse.jface;bundle-version="3.18.0" +Import-Package: org.eclipse.e4.ui.model.application.descriptor.basic, + org.eclipse.e4.ui.model.application.ui.basic diff --git a/de.wt.bgg.ui/build.properties b/de.wt.bgg.ui/build.properties new file mode 100644 index 0000000..14919a9 --- /dev/null +++ b/de.wt.bgg.ui/build.properties @@ -0,0 +1,5 @@ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + Application.e4xmi +source.. = src/ diff --git a/de.wt.bgg.ui/plugin.xml b/de.wt.bgg.ui/plugin.xml new file mode 100644 index 0000000..36affc7 --- /dev/null +++ b/de.wt.bgg.ui/plugin.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/de.wt.bgg.ui/src/de/wt/bgg/data/BggResult.java b/de.wt.bgg.ui/src/de/wt/bgg/data/BggResult.java new file mode 100644 index 0000000..41cbc48 --- /dev/null +++ b/de.wt.bgg.ui/src/de/wt/bgg/data/BggResult.java @@ -0,0 +1,6 @@ +package de.wt.bgg.data; + +/// This class contains and handles the result table for initial BGG result +public class BggResult { + +} diff --git a/de.wt.bgg.ui/src/de/wt/bgg/ui/contributions/SourceFilterBggUser.java b/de.wt.bgg.ui/src/de/wt/bgg/ui/contributions/SourceFilterBggUser.java new file mode 100644 index 0000000..a55408a --- /dev/null +++ b/de.wt.bgg.ui/src/de/wt/bgg/ui/contributions/SourceFilterBggUser.java @@ -0,0 +1,86 @@ +package de.wt.bgg.ui.contributions; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; + +/// These are the controls to retrieve IDs for a given BGG user +/// Filters can be set for the state of the thing in the user's collection +/// (i.e. owned, previously owned, wishlist, etc.) +public class SourceFilterBggUser extends Composite { + + public SourceFilterBggUser(final Composite parent, int style) { + super(parent, style); + + Group gFilters = new Group(parent, SWT.SHADOW_ETCHED_IN); + gFilters.setText(""); + + GridData gdFilters = new GridData(SWT.FILL, SWT.FILL, true, true); + gFilters.setLayoutData(gdFilters); + + GridLayout filterLayout = new GridLayout(4, false); + gFilters.setLayout(filterLayout); + + Label lblUser = new Label(gFilters, SWT.LEFT); + lblUser.setText("User name: "); + lblUser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + + Combo cbUserName = new Combo(gFilters, SWT.DROP_DOWN); + cbUserName.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + + Button btEditUsers = new Button(gFilters, SWT.PUSH); + btEditUsers.setText("edit users"); + btEditUsers.setEnabled(false); + btEditUsers.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + // TODO: implement edit users + + + + Label infoLabel = new Label(gFilters, SWT.LEFT); + infoLabel.setText("Select which flags are used as filter. Filters follow 'AND' rule."); + GridData gdInfo = new GridData(SWT.FILL, SWT.FILL, true, false); + gdInfo.horizontalSpan = 4; + infoLabel.setLayoutData(gdInfo); + + makeFilter(gFilters, "owned", 1); + makeFilter(gFilters, "want to play", 2); + + makeFilter(gFilters, "previously owned", 2); + makeFilter(gFilters, "want to buy", 2); + + makeFilter(gFilters, "for trade", 0); + makeFilter(gFilters, "wishlist", 2); + + makeFilter(gFilters, "wanted", 2); + makeFilter(gFilters, "preordered", 2); + + this.requestLayout(); + } + + + /// Create a control for a filter. + // Filters are tristate: include iff has flag, include iff it does not have the flag, + // don't care if it has that flag. + // TODO: are there more convenient widgets for this? drop-down needs two clicks to set... + private void makeFilter(Composite parent, String filterName, int defaultIdx) { + Combo filterCombo = new Combo(parent, SWT.READ_ONLY); + filterCombo.add("ignored"); + filterCombo.add("is"); + filterCombo.add("is not"); + filterCombo.select(defaultIdx); + filterCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + + Label filterLabel = new Label(parent, SWT.LEFT); + filterLabel.setText(filterName); + filterLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + } + + public String toString() { + return "from BGG user"; + } +} diff --git a/de.wt.bgg.ui/src/de/wt/bgg/ui/contributions/SourceFilterGeeklist.java b/de.wt.bgg.ui/src/de/wt/bgg/ui/contributions/SourceFilterGeeklist.java new file mode 100644 index 0000000..9ac470f --- /dev/null +++ b/de.wt.bgg.ui/src/de/wt/bgg/ui/contributions/SourceFilterGeeklist.java @@ -0,0 +1,37 @@ +package de.wt.bgg.ui.contributions; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; + +public class SourceFilterGeeklist extends Composite { + + public SourceFilterGeeklist(final Composite parent, int style) { + super(parent, style); + + Group gFilters = new Group(parent, SWT.SHADOW_ETCHED_IN); + gFilters.setText("Filters"); + GridData gdFilters = new GridData(SWT.FILL, SWT.FILL, true, true); + gFilters.setLayoutData(gdFilters); + + GridLayout filterLayout = new GridLayout(2, false); + gFilters.setLayout(filterLayout); + + Label lblGeeklist = new Label(gFilters, SWT.LEFT); + lblGeeklist.setText("Geeklist ID: "); + lblGeeklist.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + + Combo cbGeeklistId = new Combo(gFilters, SWT.DROP_DOWN); + cbGeeklistId.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + + this.requestLayout(); + } + + public String toString() { + return "from Geeklist"; + } +} diff --git a/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/BggResultPart.java b/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/BggResultPart.java new file mode 100644 index 0000000..c0c181b --- /dev/null +++ b/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/BggResultPart.java @@ -0,0 +1,19 @@ +package de.wt.bgg.ui.parts; + +import javax.annotation.PostConstruct; + +import org.eclipse.swt.SWT; +//import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; + +public class BggResultPart { + + @PostConstruct + public void createControls(Composite parent) { + //GridData tableGrid = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL); + Label lblTable = new Label(parent, SWT.LEFT); + lblTable.setText("I am a table"); + //lblTable.setLayoutData(tableGrid); + } +} diff --git a/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/GamesListPart.java b/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/GamesListPart.java new file mode 100644 index 0000000..80559b3 --- /dev/null +++ b/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/GamesListPart.java @@ -0,0 +1,5 @@ +package de.wt.bgg.ui.parts; + +public class GamesListPart { + +} diff --git a/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/LoadFromBggPart.java b/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/LoadFromBggPart.java new file mode 100644 index 0000000..07453b0 --- /dev/null +++ b/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/LoadFromBggPart.java @@ -0,0 +1,178 @@ +package de.wt.bgg.ui.parts; + +import java.util.Arrays; +import java.util.List; + +import javax.annotation.PostConstruct; + +import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.ComboViewer; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; + +import de.wt.bgg.ui.contributions.SourceFilterBggUser; +import de.wt.bgg.ui.contributions.SourceFilterGeeklist; + +/// Has controls to download a list of thing IDs (+some meta info) from BGG. +/// There are different ways to configure which IDs to retrieve. +public class LoadFromBggPart { + private Composite parent; + private Composite filterComposite; //< current composite that is shown in filter area + + /// show different filter controls depending on selection in cbSource ComboViewer + public void showFilter(IStructuredSelection selection) { + String elem = (String) selection.getFirstElement(); + + // we already have the selected filter area in place, do nothing + if(filterComposite != null && filterComposite.toString() == elem) { + return; + } + + // if we need a different filter area, dispose the old one before creating a new one + if(filterComposite != null) { + filterComposite.dispose(); + } + + // now that we know the composite is either null or a different one from the one already shown, + // and the old one was disposed above, create the new one: + if(elem == "from BGG user") { + System.out.println("construct " + elem); + filterComposite = new SourceFilterBggUser(parent, SWT.FILL); + filterComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + parent.requestLayout(); + } else if (elem == "from geeklist") { + System.out.println("construct " + elem); + filterComposite = new SourceFilterGeeklist(parent, SWT.FILL); + filterComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + parent.requestLayout(); + } else { + System.out.println("construct " + elem + " (not implemented yet, try another one)"); + } + + } + + + public static Display getDisplay() { + Display display = Display.getCurrent(); + // may be null if outside the UI thread + if (display == null) + display = Display.getDefault(); + return display; + } + + + @PostConstruct + public void createControls(Composite parent) { + this.parent = parent; + + // TODO: where do I define this properly? child setting the layout of its parent doesn't feel right + GridLayout layout = new GridLayout(2, false); + parent.setLayout(layout); + + + // contains configuration options for download of the bgg thing ID list + Group dlConfigGroup = new Group(parent, SWT.SHADOW_ETCHED_IN); + GridData configGrid = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL); + dlConfigGroup.setText("Configure download..."); + dlConfigGroup.setLayoutData(configGrid); + + GridLayout layoutG = new GridLayout(2, false); + dlConfigGroup.setLayout(layoutG); + + Label lblSource = new Label(dlConfigGroup, SWT.LEFT); + lblSource.setText("Source: "); + lblSource.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); + + // choose the bgg data source + ComboViewer cbSource = new ComboViewer(dlConfigGroup, SWT.READ_ONLY); + cbSource.setContentProvider(ArrayContentProvider.getInstance()); + + List sources = Arrays.asList(new String[] { "from BGG user", "from geeklist", "from family", "by rank", "by year", "by age", "search"}); + cbSource.setInput(sources); + // TODO: implement all the sources + + cbSource.setSelection(new StructuredSelection(sources.get(0))); + cbSource.addSelectionChangedListener(new ISelectionChangedListener() { + @Override + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (IStructuredSelection) event + .getSelection(); + if (selection.size() > 0) { + showFilter(selection); + } + } + + }); + + + // choose the bgg sub-site + Label lblTopic = new Label(dlConfigGroup, SWT.LEFT); + lblTopic.setText("Subpage: "); + lblTopic.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); + + ComboViewer cbTopic = new ComboViewer(dlConfigGroup, SWT.READ_ONLY); + cbTopic.setContentProvider(ArrayContentProvider.getInstance()); + List sites = Arrays.asList(new String[] { "Boardgames", "RPGs", "RPG Items", "Videogames", "Accessories" }); + cbTopic.setInput(sites); + cbTopic.setSelection(new StructuredSelection(sites.get(0))); + + + // choose action on result list + Label lblAct = new Label(dlConfigGroup, SWT.LEFT); + lblAct.setText("Action on result: "); + lblAct.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL)); + + ComboViewer cbAct = new ComboViewer(dlConfigGroup, SWT.READ_ONLY); + cbAct.setContentProvider(ArrayContentProvider.getInstance()); + List actions = Arrays.asList(new String[] { "add", "replace", "subtract", "AND", "Mis"}); + cbAct.setInput(actions); + cbAct.setSelection(new StructuredSelection(actions.get(0))); + + + // prepare area to display filter controls in +// filterArea = new Composite(parent, SWT.FILL); +// filterArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + showFilter((IStructuredSelection)cbSource.getSelection()); // set content to initial selection + + + // Start retrieval when download button is pushed + Button btDownload = new Button(parent, SWT.PUSH); + // TODO: how do I locate icons? + try { + Image dlIcon = new Image(getDisplay(), + getClass().getResourceAsStream("C:\\Users/goya/workspace/icons/icons/material_design/png/download-button.png")); + btDownload.setImage(dlIcon); + } + catch(Exception ex) { + btDownload.setText("Download now"); + } + btDownload.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + System.out.println("Called!"); + } + }); + btDownload.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, false, false)); + + + + + + } + + + // DISPOSE images! +} diff --git a/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/LoadGameDetailsPart.java b/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/LoadGameDetailsPart.java new file mode 100644 index 0000000..737af18 --- /dev/null +++ b/de.wt.bgg.ui/src/de/wt/bgg/ui/parts/LoadGameDetailsPart.java @@ -0,0 +1,5 @@ +package de.wt.bgg.ui.parts; + +public class LoadGameDetailsPart { + +}