Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edit offer #1514

Merged
merged 19 commits into from
Apr 17, 2018
Merged

Edit offer #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
544b84e
Add style parameter for icon buttons
ripcurlx Apr 11, 2018
f5ee14a
Make CreateOfferView extendable and the groups configurable
ripcurlx Apr 13, 2018
395dfa9
Refactor variables
ripcurlx Apr 13, 2018
d9f6505
Add edit open offer view tab
ripcurlx Apr 13, 2018
0f5a283
Only add tab once
ripcurlx Apr 13, 2018
2eb2ecb
Extracted Create Offer code into Editable Offer abstract class
ripcurlx Apr 16, 2018
0adae19
Initialize edit form with data
ripcurlx Apr 16, 2018
50a45da
Add basic edit offer functionality
ripcurlx Apr 16, 2018
96beeb2
Reset fields to force re-validation
ripcurlx Apr 16, 2018
6e50e53
Split up edit open offer process in two steps
ripcurlx Apr 17, 2018
c98b185
Re-style deactivate/activate offer column and add edit offer column
ripcurlx Apr 17, 2018
11384ab
Update imports for de.jensd.fx and optimize imports
ripcurlx Apr 17, 2018
66d6d67
Clean up naming and structure of code to match existing style
ripcurlx Apr 17, 2018
238eb08
Add edit offer support for deactivated offers
ripcurlx Apr 17, 2018
1999bc9
Adapt scopes to be able to run existing tests again
ripcurlx Apr 17, 2018
2e174fb
Handle cancel offer in data model
ripcurlx Apr 17, 2018
94fc874
Add price in range check
ripcurlx Apr 17, 2018
8c2cb14
Prevent deletion of offer when edited
ripcurlx Apr 17, 2018
d1b7701
Remove padding on top of amount group
ripcurlx Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions src/main/java/bisq/desktop/bisq.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,20 @@ textfield */
-fx-text-fill: -bs-medium-grey;
}

.delete-icon {
-fx-fill: -bs-red;
}

.delete {
-fx-text-fill: -bs-error-red;
-fx-fill: -bs-error-red;
}

.delete:hover {
-fx-text-fill: -bs-black;
-fx-fill: -bs-black;
}

/*******************************************************************************
* *
* Images *
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/bisq/desktop/components/InfoAutoTooltipLabel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

import bisq.common.UserThread;

import de.jensd.fx.glyphs.GlyphIcons;

import org.controlsfx.control.PopOver;

import javafx.scene.Node;
Expand All @@ -32,10 +34,6 @@

import static bisq.desktop.util.FormBuilder.getIcon;



import de.jensd.fx.glyphs.GlyphIcons;

public class InfoAutoTooltipLabel extends AutoTooltipLabel {

private Text textIcon;
Expand Down
792 changes: 792 additions & 0 deletions src/main/java/bisq/desktop/main/offer/EditableOfferDataModel.java
View file
Open in desktop

Large diffs are not rendered by default.

Loading