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

fix(ui) - Convert theme save and delete dialogs to use ConfirmDialog popup. #3062

Merged
merged 8 commits into from
Jan 28, 2023

Conversation

philmoz
Copy link
Collaborator

@philmoz philmoz commented Jan 19, 2023

Use the popup dialog instead of the full screen alert page.
Add strings for translation.

@Eldenroot
Copy link
Contributor

Eldenroot commented Jan 19, 2023

Hi translators,

Please, add your translations. Thank you!

@Eldenroot
Copy link
Contributor

PR created :)

@ajjjjjjjj
Copy link
Contributor

PL

#define TR_DELETE_THEME                "Usunąć motyw?"
#define TR_SAVE_THEME                  "Zapisać motyw?"

@ParkerEde
Copy link
Contributor

DE
#define TR_DELETE_THEME "Theme löschen?"
#define TR_SAVE_THEME "Theme speichern?"

@robustini
Copy link
Contributor

IT
#define TR_DELETE_THEME "Cancello Tema?"
#define TR_SAVE_THEME "Salvo Tema?"

@ulfhedlund
Copy link
Contributor

SE
#define TR_DELETE_THEME "Radera tema?"
#define TR_SAVE_THEME "Spara tema?"

@pfeerick pfeerick added color Related generally to color LCD radios translation labels Jan 19, 2023
@pfeerick pfeerick added this to the 2.9 milestone Jan 19, 2023
@ToshihiroMakuuchi
Copy link
Contributor

JP
#define TR_DELETE_THEME "テーマを削除しますか?"
#define TR_SAVE_THEME "テーマを保存しますか?"

ulfhedlund added a commit to ulfhedlund/edgetx that referenced this pull request Jan 20, 2023
@HThuren
Copy link
Contributor

HThuren commented Jan 21, 2023

don't forget danish :-)

DA
#define TR_DELETE_THEME "Slet tema?"
#define TR_SAVE_THEME "Gem tema?"

@HThuren
Copy link
Contributor

HThuren commented Jan 21, 2023

don't forget danish :-)

DA #define TR_DELETE_THEME "Slet tema?" #define TR_SAVE_THEME "Gem tema?"

Thank you :-)

@philmoz philmoz force-pushed the theme-save-and-delete branch from b12dcd2 to c3d42e6 Compare January 25, 2023 07:50
@pfeerick pfeerick self-assigned this Jan 26, 2023
@philmoz philmoz force-pushed the theme-save-and-delete branch from c3d42e6 to 586c478 Compare January 26, 2023 10:03
@pfeerick
Copy link
Member

pfeerick commented Jan 27, 2023

Confirm dialog is good... but am I missing something... unless I select YES there is no way to leave the theme edit screen now?

@philmoz
Copy link
Collaborator Author

philmoz commented Jan 27, 2023

Confirm dialog is good... but am I missing something... unless I select YES there is no way to leave the theme edit screen now?

Hmmm. When I select No it closes the dialog and exits the edit screen?

@pfeerick
Copy link
Member

pfeerick commented Jan 27, 2023

Hm... the github build for 586c478 isn't for me... no returns/stays at the edit screen - can only exit via yes. edit: Same for both TX16S and EL18/NV14... so something weird going on here. Damn... it's either EMing or locking up at power down at times also now. Ok, EM is probably part of original radio theme code... it also just EM'd for #3078 on save, and this isn't the first time I've seen this happen with the theme code. :-/

@philmoz
Copy link
Collaborator Author

philmoz commented Jan 27, 2023

The RTN button would exit the dialog without calling the 'cancelHandler' from the theme editor - were you using this?
I've pushed a change to fix it.

Not sure about the crashing - have not seen this in the simulator.

@pfeerick
Copy link
Member

pfeerick commented Jan 27, 2023

I think I may have narrowed the EM trigger (on radio) to being somewhat related editing the 'active' theme so will have to try and pin down a reproducable scenario and hope either simu will do it also or set the debugger up again.

This was on-screen buttons only - RTN behaved the same. Again, with 586c478 (i.e. before I introduced any changes ;) )

msrdc_AmNX8lnthc.mp4

@pfeerick
Copy link
Member

Now pressing RTN at the confirm prompt gets me out back to the themes list, but via the touchscreen No it still stays at the edit theme page.

@philmoz
Copy link
Collaborator Author

philmoz commented Jan 27, 2023

Ok, I get the problem if I flash it to my radio; but it works fine in the Companion simulator ???

@pfeerick
Copy link
Member

Ouch... so both simu and radio show it, but not the fully simulator? 😭

@philmoz
Copy link
Collaborator Author

philmoz commented Jan 27, 2023

Simu on MacOS works ok - does not show the problem. Bizarre!

@ParkerEde
Copy link
Contributor

I use the standalone simulator under Windows and can confirm it. If I make a change and want to close without saving, I remain in the edit screen. It doesn't matter whether I use the standalone simulator or the simulator run from Companion.

@philmoz
Copy link
Collaborator Author

philmoz commented Jan 27, 2023

If I revert to the full screen dialog then it works as expected on my radio.

Testing just now I got the lockup on the radio after using the theme editor and then it rebooted into EM after pulling the battery.

Looks like there are a few issues with all this - I will be away for a few days and will look into it next week.

@pfeerick
Copy link
Member

Yes, the theme editor has had more than its share of issues... but slowly getting there. I'll leave this on hold then until we can dig a little deeper.

@pfeerick pfeerick marked this pull request as draft January 27, 2023 12:05
@philmoz
Copy link
Collaborator Author

philmoz commented Jan 27, 2023

Had a thought early this morning so one more change to try.
This now works on my TX16S.

@philmoz
Copy link
Collaborator Author

philmoz commented Jan 27, 2023

So far no more crashes on my TX16S in the theme editor (touch wood). This last change may have helped here as well.

@pfeerick
Copy link
Member

pfeerick commented Jan 28, 2023

Agreed... it seems to be back to normal on TX16S/EL18 - can exit the theme editor when choosing no or yes via touch or hard key. No lockup on save or poweroff. I was able to make the TX16S EM again when saving a change to the active theme. However, I was also able to get it to EM when changing from the custom theme to the default theme... so I suspect the issue is specific to reading/writing/applying the theme settings, not this PR. Since the theme editor is actually "pre yaml", it has its own yaml writing implementation, rather than using the ... system version? ... so that could be where that issue is.

@pfeerick pfeerick marked this pull request as ready for review January 28, 2023 00:39
@pfeerick pfeerick merged commit e9b8a23 into EdgeTX:main Jan 28, 2023
@zyren
Copy link
Contributor

zyren commented Jan 30, 2023


CN
#define TR_DELETE_THEME "删除主题?"
#define TR_SAVE_THEME "保存主题?"



TW
#define TR_DELETE_THEME "刪除主題?"
#define TR_SAVE_THEME "保存主題?"


pfeerick pushed a commit that referenced this pull request Feb 8, 2023
* Updated translations, error fixes etc

* Minor changes

* Minor updates

* Update for PR #2998

* Added strings for PR #2998

* Minor error fix

* Two new strings translated

* Fixed spelling mistake

* Another minor fix

* Added translations for PR #3062

* Just a few corrections

* Add files via upload

New translations added

* Changes after PR #3119 translation clean up
@philmoz philmoz deleted the theme-save-and-delete branch September 20, 2023 02:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
color Related generally to color LCD radios translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants