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.

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

qtFRED variables editor #6150

Open
wants to merge 154 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
5d0ee56
fix support structs
JohnAFernandez Dec 29, 2023
7c15ade
Finish Loop for saving variables
JohnAFernandez Jan 6, 2024
98a5ff4
Initial Dialog
JohnAFernandez Mar 31, 2024
e7583dd
start creating Model and helper structs
JohnAFernandez Dec 22, 2023
64b54d1
Start writing apply and reject methods
JohnAFernandez Apr 1, 2024
52cc1f1
Make sure flags are included
JohnAFernandez Jan 6, 2024
286a96e
save progress
JohnAFernandez Apr 7, 2024
cad4f69
Save progress
JohnAFernandez Apr 7, 2024
2827e93
Continue writing editor model functions
JohnAFernandez Apr 7, 2024
5575ab4
Finish setContainerValueType
JohnAFernandez Apr 8, 2024
aea3966
Add logic for addcontainer
JohnAFernandez Apr 8, 2024
fa27b8d
MOAR FUNCTIONS!
JohnAFernandez Apr 10, 2024
d665c61
Starting progress on initializeData
JohnAFernandez Apr 11, 2024
de54dea
save progress
JohnAFernandez Apr 12, 2024
a125b8b
Fixup the Variables Dialog
JohnAFernandez Apr 12, 2024
e1ed5fd
Fixes to allow building
JohnAFernandez Apr 12, 2024
9ef5679
Create the Validate Function
JohnAFernandez Apr 12, 2024
11fac90
Add missing functions
JohnAFernandez Apr 12, 2024
2934e99
Progress on applyModel
JohnAFernandez Apr 12, 2024
e60cf65
Write part of onVariablesTableUpdated
JohnAFernandez Apr 13, 2024
bc059bd
Add Variable Editor Trigger To Loadout Dialog
JohnAFernandez Apr 13, 2024
c9f4982
Add apply trigger on validated data
JohnAFernandez Apr 13, 2024
6e10ee6
Add TrimNumberString function
JohnAFernandez Apr 13, 2024
2ad0571
Make sure that setVariableType signals failure
JohnAFernandez Apr 13, 2024
4cac920
Add more dialog functions
JohnAFernandez Apr 13, 2024
8d40952
Finish adding Variable change options
JohnAFernandez Apr 13, 2024
d4f8706
Add contents to UpdateContainerOptions
JohnAFernandez Apr 14, 2024
1581d9d
Save progress
JohnAFernandez Apr 14, 2024
3d5c43e
Fix model functions by using index
JohnAFernandez Apr 16, 2024
7938169
Don't forget lookup by name functions
JohnAFernandez Apr 16, 2024
e1662d8
Fix many typos from lack of linter
JohnAFernandez Apr 16, 2024
364e39c
more fixes
JohnAFernandez Apr 17, 2024
bd75eff
Make sure that tables have contents
JohnAFernandez Apr 17, 2024
2431069
more progress
JohnAFernandez Apr 17, 2024
a57949c
getting closer to correct width
JohnAFernandez Apr 17, 2024
6fe5ab7
Fix No Persistence not updating
JohnAFernandez Apr 17, 2024
94057c5
Clean up container data updates
JohnAFernandez Apr 18, 2024
7d7b6ee
Prevent crash from empty source string
JohnAFernandez Apr 18, 2024
83fde5a
Actually, upgrade the lambda
JohnAFernandez Apr 18, 2024
f61649e
Add type text to container Table
JohnAFernandez Apr 18, 2024
e425463
Finish addMapItem and upgrade getcontainernames
JohnAFernandez Apr 18, 2024
a06cb0c
More progress on updateContainerDataOptions
JohnAFernandez Apr 18, 2024
2a33713
Fixes and add a couple more UI functions
JohnAFernandez Apr 20, 2024
7c37628
Add get item rows to reduce duplicate code
JohnAFernandez Apr 20, 2024
e7b0f61
Start applying currentVariableRow
JohnAFernandez Apr 20, 2024
ad74c21
Edit onVariablesTableUpdated
JohnAFernandez Apr 21, 2024
bb838ea
Place getCurrentContainerRow in more places
JohnAFernandez Apr 21, 2024
72271be
Getting closer to completion of basics
JohnAFernandez Apr 21, 2024
3bec6d8
No const here
JohnAFernandez Apr 21, 2024
6bd3b43
Don't forget extra line left by accident
JohnAFernandez Apr 21, 2024
6264656
As far as I can tell populating items is done
JohnAFernandez Apr 21, 2024
314ba92
Fix Compiler Errors
JohnAFernandez Apr 21, 2024
792cf0a
More fixes
JohnAFernandez Apr 21, 2024
ce32ef3
Linter Fixes
JohnAFernandez Apr 21, 2024
474527e
More Linter Fixes
JohnAFernandez Apr 21, 2024
29754ca
More Linter Fixes
JohnAFernandez Apr 21, 2024
3698cbe
Hopefully Final Linter mistakes
JohnAFernandez Apr 21, 2024
22663cb
Finish Dialog Code
JohnAFernandez Apr 21, 2024
a82db02
Fix missing function
JohnAFernandez Apr 21, 2024
209e905
Add copy Container Function
JohnAFernandez Apr 21, 2024
4e669f9
don't forget to change name.
JohnAFernandez Apr 21, 2024
91723be
And stub another function for now
JohnAFernandez Apr 21, 2024
7f0666c
More Fixes, but Requires Linter For more progress
JohnAFernandez Apr 21, 2024
f38dbae
Save changes to transfer over
JohnAFernandez Apr 22, 2024
beaadbb
Merge branch 'qtFRED-variables-editor' of https://github.com/JohnAFer…
JohnAFernandez Apr 22, 2024
d147330
Fix null item crash
JohnAFernandez Apr 22, 2024
7f1e72e
Some final ui adjustments
JohnAFernandez Apr 22, 2024
3c7639a
And one more apparently
JohnAFernandez Apr 22, 2024
9dfc6d7
Fixes for UI bugs
JohnAFernandez Apr 22, 2024
84cad8c
More Fixes and polish
JohnAFernandez Apr 22, 2024
dd44d7d
Fixing more issues
JohnAFernandez Apr 22, 2024
a18ac34
Fix Linter errors
JohnAFernandez Apr 22, 2024
8801672
Fix more linter errors
JohnAFernandez Apr 22, 2024
4f0f57e
Clean up the model in a few places
JohnAFernandez Apr 22, 2024
3a5a2ab
Linter errors from recent changes
JohnAFernandez Apr 23, 2024
55380f7
Start on SetContainerListOrMap
JohnAFernandez Apr 23, 2024
2a4894d
start implementing unified values in containers
JohnAFernandez Apr 24, 2024
6134a42
Ton of fixes from testing
JohnAFernandez Apr 26, 2024
4324b41
More Fixes and Tweaks based on testing
JohnAFernandez Apr 26, 2024
5503aec
Fix filtering out zero by accident
JohnAFernandez Apr 26, 2024
4bb8456
Further Fix and Rename function for clarity
JohnAFernandez Apr 26, 2024
c24457f
Add Clamping Function
JohnAFernandez Apr 26, 2024
ed3fcc8
Switch Key Options and Data Options
JohnAFernandez Apr 26, 2024
d143add
Fixes to container options updates
JohnAFernandez Apr 26, 2024
ec4e504
Hopefully fix Variable Persistence Not saving
JohnAFernandez Apr 26, 2024
fc11ddc
Fixes Based On Linter and Testing
JohnAFernandez Apr 26, 2024
6e6b409
Fix add container and add item rows
JohnAFernandez Apr 26, 2024
94dbd95
Fix nullptr on copy
JohnAFernandez Apr 26, 2024
dac5fbe
Fix more Container issues based on testing
JohnAFernandez Apr 27, 2024
c984fae
Add Accept and Reject Signal Reactions
JohnAFernandez Apr 28, 2024
0c2d1a7
Save Changes
JohnAFernandez Apr 28, 2024
e902f6d
More change based on testing
JohnAFernandez Apr 28, 2024
a8cc7d2
Appease the linter
JohnAFernandez Apr 28, 2024
f1dd864
More Fixes Based on testing
JohnAFernandez Apr 29, 2024
c5b0332
More Fixes Based On Testing
JohnAFernandez Apr 29, 2024
898f8a9
Increase size of dialog to store info better
JohnAFernandez Apr 29, 2024
5ee2112
Fix Containers not deleting
JohnAFernandez Apr 29, 2024
4677fb8
Start Applying List values to Keys, etc.
JohnAFernandez Apr 29, 2024
cf356ed
Finish writing change from list to map
JohnAFernandez Apr 29, 2024
d333694
Adding Button for Key/Value Swap
JohnAFernandez Apr 30, 2024
ba263d6
Trying to fixup The map/list switch function
JohnAFernandez Apr 30, 2024
237bd53
Rename this variable for clarity
JohnAFernandez Apr 30, 2024
2a8ec9c
Write setContainerKeyType
JohnAFernandez Apr 30, 2024
824b5bb
Write addNewVariable overload for typed items
JohnAFernandez Apr 30, 2024
72b1363
Implement sift up and down buttons
JohnAFernandez May 1, 2024
eda645d
Make sure delete button changes text
JohnAFernandez May 1, 2024
8340427
Make sure shift buttons apply the model
JohnAFernandez May 1, 2024
d04ce61
Add swap keys and values button
JohnAFernandez May 1, 2024
5076224
Fixes based on linter
JohnAFernandez May 4, 2024
d7c4c54
Bug fixes according to testing
JohnAFernandez May 4, 2024
c9e11d4
Fixes Based On Testing
JohnAFernandez May 4, 2024
e1b9832
Fixes Based on Testing
JohnAFernandez May 4, 2024
98e78ec
Fix Containers Not Restoring Deleted Items
JohnAFernandez May 4, 2024
8dde6d4
More spacing adjustments and text changes
JohnAFernandez May 4, 2024
3120d6d
Fix the Addition of variables by typing
JohnAFernandez May 4, 2024
03083d1
Implement a few missing container item features
JohnAFernandez May 5, 2024
87fd99f
Finish implementation of type formatting option
JohnAFernandez May 5, 2024
b9b36d2
Fix Shift up and down buttons
JohnAFernandez May 5, 2024
e4886db
Fix shift up and down buttons
JohnAFernandez May 5, 2024
9b29e75
Fix overflow return values
JohnAFernandez May 5, 2024
621030a
Fix various issues
JohnAFernandez May 5, 2024
bc5f986
Bug fixes from testing
JohnAFernandez May 11, 2024
cd3464d
Make sure string items can be deleted
JohnAFernandez May 11, 2024
e66803a
Further Bug fixes based on testing
JohnAFernandez May 11, 2024
d557a6e
More Bug fixes
JohnAFernandez May 11, 2024
20f992f
Fix Not being able to add map items by value
JohnAFernandez May 11, 2024
df77615
Various Fixes Based on Testing
JohnAFernandez May 12, 2024
e855fc8
Check for conversion availability with same algo
JohnAFernandez May 12, 2024
e502cdf
Finish the validation function
JohnAFernandez May 13, 2024
b053131
Connect the x with prereject instead of reject.
JohnAFernandez May 13, 2024
455d2c9
Add to Apply()
JohnAFernandez May 14, 2024
e7f6fa3
Upgrade Container Copying
JohnAFernandez May 14, 2024
c53e6b1
Finish Safe to Alter Options in Model Update
JohnAFernandez May 14, 2024
492683d
Add A check to safeToAlter functions
JohnAFernandez May 14, 2024
62a4351
Finish safe to alter variable functions
JohnAFernandez May 15, 2024
7da79c1
Add sorting to other function calls
JohnAFernandez May 15, 2024
3be4d0b
Fixes based on testing and linters
JohnAFernandez May 16, 2024
c51bc08
linter fix
JohnAFernandez May 16, 2024
d432f9b
Make to loop over the right constraint
JohnAFernandez May 16, 2024
039866d
Linter Fixes
JohnAFernandez May 16, 2024
e5e2729
Add non-numeric keys to warning messages
JohnAFernandez May 16, 2024
ad7e713
Override the virtual reject function
JohnAFernandez May 16, 2024
87367d6
Make sure Keys and Items are proper length
JohnAFernandez May 16, 2024
07a389a
Typo
JohnAFernandez May 16, 2024
860e28f
Finish applying data from model to mission
JohnAFernandez May 17, 2024
d1829a9
Fix Eternal flags being set with no persistence
JohnAFernandez May 17, 2024
768f88b
Linter Fixes
JohnAFernandez May 17, 2024
2cf24cb
Trying to fix this mystifying error
JohnAFernandez May 17, 2024
d8c7a63
This should actually fix it.
JohnAFernandez May 17, 2024
7229fdc
Fix variable read and write
JohnAFernandez May 18, 2024
77062e2
Make sure check eternal boxes are properly enabled
JohnAFernandez May 18, 2024
ab7aa63
Whoops
JohnAFernandez May 18, 2024
29fa8c4
Final Fixes
JohnAFernandez May 19, 2024
23254c9
Allow the loadout dialog to open varaible dialog
JohnAFernandez May 22, 2024
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
Prev Previous commit
Next Next commit
Whoops
  • Loading branch information
JohnAFernandez committed May 18, 2024
commit ab7aa635692f2c883965a4fdcce4baa8f2dc11f9
4 changes: 2 additions & 2 deletions qtfred/src/ui/dialogs/VariableDialog.cpp
Original file line number Diff line number Diff line change
@@ -793,7 +793,7 @@ void VariableDialog::onSaveVariableAsEternalCheckboxClicked()
}

// If the model returns the old status, then the change failed and we're out of sync.
if (ui->setVariableAsEternalcheckbox->isChecked() != _model->setVariableEternalFlag(row, ui->setVariableAsEternalcheckbox->isChecked())) {
if (ui->setVariableAsEternalcheckbox->isChecked() == _model->setVariableEternalFlag(row, ui->setVariableAsEternalcheckbox->isChecked())) {
applyModel();
} else {
ui->setVariableAsEternalcheckbox->setChecked(!ui->setVariableAsEternalcheckbox->isChecked());
@@ -809,7 +809,7 @@ void VariableDialog::onNetworkVariableCheckboxClicked()
}

// If the model returns the old status, then the change failed and we're out of sync.
if (ui->networkVariableCheckbox->isChecked() != _model->setVariableNetworkStatus(row, ui->networkVariableCheckbox->isChecked())) {
if (ui->networkVariableCheckbox->isChecked() == _model->setVariableNetworkStatus(row, ui->networkVariableCheckbox->isChecked())) {
applyModel();
} else {
ui->networkVariableCheckbox->setChecked(!ui->networkVariableCheckbox->isChecked());
Loading