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

Added a dedicated fill and replace tool #345

Draft
wants to merge 145 commits into
base: master
Choose a base branch
from
Draft

Added a dedicated fill and replace tool #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
2f8b4e2
Cleaned up the version select UI
gentlegiantJGC May 9, 2021
187006e
Fixed some scaling issues in the version select
gentlegiantJGC May 9, 2021
2bcbecc
Split the version select module into a package
gentlegiantJGC May 9, 2021
a7311f6
Switched the version select events to class events
gentlegiantJGC May 9, 2021
6248c8d
Split base_select into a package
gentlegiantJGC May 11, 2021
0060e41
Fixed the demo code not exiting
gentlegiantJGC May 11, 2021
ca7fb6d
Removed the format change event
gentlegiantJGC May 11, 2021
c9623d5
Reformatted
gentlegiantJGC May 11, 2021
761bc5c
Added a little documentation and demo code
gentlegiantJGC May 11, 2021
05a97ba
Removed depreciated GetAny method
gentlegiantJGC May 11, 2021
65c7d19
Added the start of the updated fill and replace UI
gentlegiantJGC May 11, 2021
88951c8
Added a version select to the fill replace ui
gentlegiantJGC May 12, 2021
6c8068b
Split properties module into a package
gentlegiantJGC May 12, 2021
1ff9db1
Moved the properties demo code into a main file
gentlegiantJGC May 12, 2021
a9f8a8b
Reformatted
gentlegiantJGC May 12, 2021
b1d3f98
Added a dialog to pick the block from
gentlegiantJGC May 12, 2021
5178f03
Merge branch 'master' into impl-fill
gentlegiantJGC May 29, 2021
c367aa9
Added demo code for the UI elements
gentlegiantJGC May 29, 2021
d8f35e1
Added titles to each of the demos
gentlegiantJGC May 30, 2021
b306289
Rewritten the property select UI
gentlegiantJGC May 30, 2021
f2b14f7
Partially added a wildcard property UI
gentlegiantJGC May 30, 2021
caaa91e
Merge branch 'master' into impl-fill
gentlegiantJGC Jun 26, 2021
5b9f54b
Reformatted
gentlegiantJGC Jun 26, 2021
73c12da
Split up the single properties classes
gentlegiantJGC Jun 30, 2021
517040e
Reformatted
gentlegiantJGC Jun 30, 2021
30939ca
Cleaned up some name issues
gentlegiantJGC Jun 30, 2021
57b015c
Renamed packages and modules to be more readable
gentlegiantJGC Jun 30, 2021
9118e4c
Moved wildcard properties into a package
gentlegiantJGC Jun 30, 2021
669e772
Renamed classes to be simpler
gentlegiantJGC Jun 30, 2021
96cbd39
Cleaned up events and multiple variant
gentlegiantJGC Jun 30, 2021
eaa638d
Restructured the minecraft object UI elements
gentlegiantJGC Jul 1, 2021
8ec2d5b
Renamed version_select package to version
gentlegiantJGC Jul 1, 2021
2692728
Reformatted
gentlegiantJGC Jul 1, 2021
65351ea
Split up BlockDefine
gentlegiantJGC Jul 1, 2021
dc6d95a
Added a wildcard block defining UI
gentlegiantJGC Jul 1, 2021
6e3060b
Merge branch 'master' into impl-fill
gentlegiantJGC Jul 3, 2021
ac38415
Restructured base_define to be a package
gentlegiantJGC Jul 3, 2021
e901230
Added an abstract API class for all define objects
gentlegiantJGC Jul 3, 2021
6e2b248
Moved the define widget into a sub-package
gentlegiantJGC Jul 3, 2021
9657f49
Cleaned up some data types
gentlegiantJGC Jul 3, 2021
119ead8
Restructured the base block API
gentlegiantJGC Jul 4, 2021
af1e163
Merge branch 'master' into impl-fill
gentlegiantJGC Jul 5, 2021
6704887
Added a block define button and moved the block define widget
gentlegiantJGC Jul 7, 2021
6c68f9a
Added a note about a bug
gentlegiantJGC Jul 7, 2021
0d5ec45
Reformatted
gentlegiantJGC Jul 7, 2021
fe79faf
Added a method to the wildcard properties to get all values defined
gentlegiantJGC Jul 7, 2021
a83f591
Cleaned up the platform and version select
gentlegiantJGC Jul 11, 2021
589afae
Made a resource id manager and made block subclass that
gentlegiantJGC Jul 12, 2021
b34fd71
Moved panel style into a single input rather than in kwargs
gentlegiantJGC Jul 12, 2021
f025ebb
Fixed an attribute name
gentlegiantJGC Jul 12, 2021
a46db27
Reworked the select classes
gentlegiantJGC Jul 12, 2021
8e0c830
Renamed the block identifier storage class
gentlegiantJGC Jul 12, 2021
2ee1b4b
Reformatted
gentlegiantJGC Jul 12, 2021
e8520e7
Reworked the biome identifier select widget
gentlegiantJGC Jul 12, 2021
a3005e2
Reformatted
gentlegiantJGC Jul 12, 2021
8e5ae2c
Added missing update method to identifier select
gentlegiantJGC Jul 12, 2021
da48d8c
Readded Base to some of the state classes
gentlegiantJGC Jul 12, 2021
3141011
Renamed update method to push to avoid confusion with the wx Update m…
gentlegiantJGC Jul 24, 2021
750f4d3
Converted base_define back to a module
gentlegiantJGC Jul 24, 2021
24cfca5
Fixed the comboxbox set method generating events
gentlegiantJGC Jul 24, 2021
3f6bb02
Fixed setting through property rather than method
gentlegiantJGC Jul 24, 2021
0ac8a2e
Fixed the populate base name method not using the search entry
gentlegiantJGC Jul 24, 2021
859423f
Rewritten biome define
gentlegiantJGC Jul 24, 2021
cfaa19d
If no version is given to the state manager it will use the newest ve…
gentlegiantJGC Jul 24, 2021
7f00b24
Reformatted
gentlegiantJGC Jul 24, 2021
9d5fbe4
Improved UI updating and added some demo code for biome define
gentlegiantJGC Jul 24, 2021
aeab7b8
Fixed some issues with the base identifier select
gentlegiantJGC Jul 24, 2021
a22ca9a
Added another freeze and thaw to the base identifier select
gentlegiantJGC Jul 24, 2021
8d2e45c
Reverted to use of properties for external use
gentlegiantJGC Jul 25, 2021
f802ae3
Moved the freeze thaw and changed logic into the push method
gentlegiantJGC Jul 25, 2021
f3233a2
Modified the version and platform on change logic
gentlegiantJGC Jul 25, 2021
3905d64
Added a state manager for normal and wildcard properties
gentlegiantJGC Jul 27, 2021
4a3ce08
Moved the private setter methods out of the abstract API
gentlegiantJGC Jul 27, 2021
9d4ac34
Reworked the single properties select UI
gentlegiantJGC Jul 30, 2021
dbc0864
Added some imports to the init file
gentlegiantJGC Jul 30, 2021
247e028
Cleaned up some typing
gentlegiantJGC Jul 30, 2021
d8454cd
Added a force option to push method
gentlegiantJGC Jul 30, 2021
7fb4f61
Cleaned up the base property select class
gentlegiantJGC Jul 30, 2021
a9c0e8a
Fixed some issues in the single properties select
gentlegiantJGC Jul 30, 2021
956085a
Fixed the wrong property reference
gentlegiantJGC Aug 2, 2021
fb9a773
Reformatted
gentlegiantJGC Aug 2, 2021
c56df6d
Fixed the multiple property select
gentlegiantJGC Aug 2, 2021
7760fe1
Fixed an issue with the multi custom block property ui
gentlegiantJGC Aug 3, 2021
5e8ce86
Merge branch 'master' into impl-fill
gentlegiantJGC Aug 3, 2021
ce07e38
Reworked the BlockDefine UIs
gentlegiantJGC Aug 3, 2021
9fa6964
Added custom events for the block change UI
gentlegiantJGC Aug 4, 2021
0cc5796
Fixed an issue with the wildcard define UI
gentlegiantJGC Aug 4, 2021
680b8d1
Moved api package up a level to avoid a circular import
gentlegiantJGC Aug 26, 2021
c3cd1af
Added the block select buttons
gentlegiantJGC Aug 26, 2021
95c4152
Made the text in the button left aligned
gentlegiantJGC Aug 26, 2021
bd133f0
Reformatted
gentlegiantJGC Aug 26, 2021
55f8ae8
Merge branch 'master' into impl-fill
gentlegiantJGC Aug 26, 2021
711a50e
Cleaned up version number and block location typing
gentlegiantJGC Aug 26, 2021
174adcc
Cleaned up and fixed some issues in the fill and new block UIs
gentlegiantJGC Aug 30, 2021
cc2c41e
Removed the old block dialog
gentlegiantJGC Aug 30, 2021
8620696
Cleaned up the state management a little
gentlegiantJGC Sep 1, 2021
78c059e
Reformatted
gentlegiantJGC Sep 1, 2021
4bb188b
Deferred tool creation until they are first shown
gentlegiantJGC Sep 4, 2021
244488f
Added an event to enable size propagation upwards
gentlegiantJGC Sep 8, 2021
5b15785
Added default DoGetBestSize method to SimpleScrollablePanel
gentlegiantJGC Sep 8, 2021
1bf487e
Added optional max character length to the block buttons
gentlegiantJGC Sep 8, 2021
7e2aaec
Removed old replace operation DoGetBestClientSize method
gentlegiantJGC Sep 8, 2021
26a3bb6
Added a semi-working fill replace tool UI
gentlegiantJGC Sep 8, 2021
b3b73df
Reformatted
gentlegiantJGC Sep 8, 2021
48c0f97
Made it easier to extend the block UI elements
gentlegiantJGC Sep 12, 2021
d11b5af
Fixed some sizing issues
gentlegiantJGC Sep 12, 2021
5f5a71b
Added a custom button that adds a from source component
gentlegiantJGC Sep 12, 2021
f79b167
Added the start of a state managing system
gentlegiantJGC Sep 14, 2021
2169380
Renamed state file and added property state
gentlegiantJGC Sep 16, 2021
5c2de34
Reformatted
gentlegiantJGC Sep 16, 2021
12ac050
Added a state holder class
gentlegiantJGC Sep 16, 2021
094f6b3
Fixed __enter__ method
gentlegiantJGC Sep 16, 2021
c4a52ae
Fixed function using builtin name
gentlegiantJGC Sep 16, 2021
374c2c6
Rewritten the platform and version select widgets
gentlegiantJGC Sep 16, 2021
e17d773
Reworked the identifier select UI elements to use the new state system
gentlegiantJGC Sep 16, 2021
0d57f03
Cleanup and fixed some calls
gentlegiantJGC Sep 16, 2021
ea4d8f0
Forced state inputs to be keyword arguments
gentlegiantJGC Sep 17, 2021
6d1fb83
Fixed flickering issue during searching
gentlegiantJGC Sep 17, 2021
e22f968
Improved the SimpleChoiceAny UI
gentlegiantJGC Sep 20, 2021
126c44f
Updated imports to use ChoiceRaw
gentlegiantJGC Sep 20, 2021
add65b9
Fixed some issues in state
gentlegiantJGC Sep 20, 2021
000d75a
Renamed automatic and manual to vanilla and modded
gentlegiantJGC Sep 20, 2021
24b6be5
Fixed some issues in the ChoiceRaw and added optional default
gentlegiantJGC Sep 21, 2021
78f4c24
Fixed some issues setting properties in the state
gentlegiantJGC Sep 21, 2021
ec01204
Reworked the single property select UI to use the state system
gentlegiantJGC Sep 21, 2021
e4383f7
Reformatted
gentlegiantJGC Sep 21, 2021
74bda05
Rewritten the property select UI elements to use the new state system
gentlegiantJGC Oct 3, 2021
b9fad64
Modified default sort behaviour of ChoiceRaw
gentlegiantJGC Oct 5, 2021
11b0288
Fixed some issues in the state manager
gentlegiantJGC Oct 5, 2021
8b9177c
Reworked the block define widgets
gentlegiantJGC Oct 5, 2021
31102e2
Reformatted
gentlegiantJGC Oct 5, 2021
87ea5b4
Fixed some issues in the updated define UI elements
gentlegiantJGC Oct 5, 2021
90baaa2
Exposed the translation manager held by the state
gentlegiantJGC Oct 6, 2021
4616096
Implemented the block define buttons
gentlegiantJGC Oct 6, 2021
ddc419e
Reformatted and cleanup
gentlegiantJGC Oct 6, 2021
dfebe1e
Removed the old state system
gentlegiantJGC Oct 6, 2021
a8b99e6
Fixed error deepcopying the state class
gentlegiantJGC Oct 6, 2021
75b5d37
Compacted the state manager
gentlegiantJGC Oct 7, 2021
4654b1a
Simplified the widget init method
gentlegiantJGC Oct 11, 2021
262d3ce
Cleanup
gentlegiantJGC Oct 11, 2021
576a8ac
Fixed some issues with the state
gentlegiantJGC Oct 13, 2021
fcc101e
Modified the state enum
gentlegiantJGC Oct 13, 2021
4106b2a
Fixed some issues with the blocks buttons
gentlegiantJGC Oct 13, 2021
0502c30
Modified the fill replace tool to use the new state system
gentlegiantJGC Oct 13, 2021
6bf3744
Localised the Minecraft object widget labels
gentlegiantJGC Oct 13, 2021
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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,5 @@ venv.bak/
/world_temp
/resource_packs
/plugins
/config
/cache
*.config
**/cache
107 changes: 0 additions & 107 deletions amulet_map_editor/api/wx/ui/base_define.py
View file
Open in desktop

This file was deleted.

214 changes: 0 additions & 214 deletions amulet_map_editor/api/wx/ui/base_select.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion amulet_map_editor/api/wx/ui/biome_select/__init__.py
View file
Open in desktop

This file was deleted.

Loading