Skip to content

Add back ImageToolbox#1421

Merged
hahn-kev merged 14 commits intomasterfrom
add-back-imagetoolbox
May 20, 2025
Merged

Add back ImageToolbox#1421
hahn-kev merged 14 commits intomasterfrom
add-back-imagetoolbox

Conversation

@hahn-kev
Copy link
Copy Markdown
Contributor

@hahn-kev hahn-kev commented Apr 1, 2025

fixes problems in downstream dependents which expected this to be used. This is fixing an issue caused by #1358

Some changes from the original version:

  • no longer supporting Mono/Linux on winforms via OpenFileDialogAdapters, see b9e6626 for details
  • removed a mono specific test
  • disabled strict mode in the localization manager to fix the broken tests

if you just want to view the changes I made to the code as it was before Joseph removed it you can see this diff: https://github.com/sillsdev/libpalaso/pull/1421/files/baa8e3f335db0b70a96cd3b4154840596d8db430..7e0a2f65c3159c518bad8447da6d40dbfd7ba73c


This change is Reviewable

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 1, 2025

Palaso Tests

     4 files  ± 0       4 suites  ±0   10m 22s ⏱️ -8s
 4 978 tests + 5   4 744 ✅ +1  234 💤 + 4  0 ❌ ±0 
16 186 runs  +15  15 482 ✅ +3  704 💤 +12  0 ❌ ±0 

Results for commit d22a3c9. ± Comparison against base commit 10e9ac3.

♻️ This comment has been updated with latest results.

Copy link
Copy Markdown

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link
Copy Markdown
Contributor

@andrew-polk andrew-polk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving based solely on the diff link Kevin posted.

Copy link
Copy Markdown
Contributor

@imnasnainaec imnasnainaec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 29 files reviewed, 2 unresolved discussions (waiting on @josephmyers)


a discussion (no related file):
CHANGELOG probably needs updating for this change.


SIL.Windows.Forms/ImageToolbox/AcquireImageControl.cs line 115 at r2 (raw file):

							// cross-platform compatibility.  It's not worth messing with DialogAdapters at
							// this point just to get this feature, which might not be cross-platform.
							if (!DoubleCheckFileFilter(dlg.Filter, dlg.FileName))

The comment above this line (and perhaps the logic it describes) needs to be updated now that DialogAdapters aren't being used.

@hahn-kev
Copy link
Copy Markdown
Contributor Author

hahn-kev commented Apr 8, 2025

@imnasnainaec done

Copy link
Copy Markdown
Contributor

@imnasnainaec imnasnainaec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 29 files reviewed, 2 unresolved discussions (waiting on @hahn-kev and @josephmyers)


a discussion (no related file):

Previously, imnasnainaec (D. Ror.) wrote…

CHANGELOG probably needs updating for this change.

Oh, #1358 had no mention in the CHANGELOG of the ImageToolbox removal, so I'm not sure how/whether to mention its restoration. Perhaps just a CHANGELOG entry for what was was changed from the prior ImageToolbox?


SIL.Windows.Forms/ImageToolbox/ImageToolboxButtons.Designer.cs line 86 at r3 (raw file):

        ///   Looks up a localized resource of type System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap camera64x64 {

It looks like the three bitmap images camera64x64, credits, and scanner64x64 aren't used.

@tombogle
Copy link
Copy Markdown
Contributor

tombogle commented Apr 8, 2025

Previously, imnasnainaec (D. Ror.) wrote…

Oh, #1358 had no mention in the CHANGELOG of the ImageToolbox removal, so I'm not sure how/whether to mention its restoration. Perhaps just a CHANGELOG entry for what was was changed from the prior ImageToolbox?

If no release version went out since the change (guessing not), then I think we only need to mention what changed. If there was an intervening release version, then the changelog should probably be retroactively modified to show both the removal and re-addition.

@hahn-kev
Copy link
Copy Markdown
Contributor Author

hahn-kev commented Apr 9, 2025

@tombogle this is fixing a change in #1358 how would I check if that went out in a release?

@tombogle
Copy link
Copy Markdown
Contributor

tombogle commented Apr 9, 2025

You can see the releases here. Unfortunately, instead of giving an exact date, it says version 15.0 was released 3 months ago. I looked at the repo to see the actual date associated with the v15.0.0 tag. Since that was on January 7, the thing you're fixing never went out as a stable release.

@hahn-kev
Copy link
Copy Markdown
Contributor Author

Alright, I've added a changelog entry recording that we removed linux support

@hahn-kev hahn-kev requested a review from imnasnainaec April 11, 2025 03:54
@tombogle
Copy link
Copy Markdown
Contributor

If there's someone who is actually acquainted with this code or works on a program affected by it, they would probably be best suited to doing the review. Otherwise, I can look at it. I guess I'd just do a diff with the previous versions of these files from early January to see what changed.

@andrew-polk
Copy link
Copy Markdown
Contributor

If there's someone who is actually acquainted with this code or works on a program affected by it, they would probably be best suited to doing the review. Otherwise, I can look at it. I guess I'd just do a diff with the previous versions of these files from early January to see what changed.

@tombogle
Above, Kevin posted a link with a diff. I used that to approve the changes.

@hahn-kev hahn-kev enabled auto-merge (squash) April 14, 2025 02:41
@josephmyers
Copy link
Copy Markdown
Collaborator

josephmyers commented Apr 17, 2025

You can see the releases here. Unfortunately, instead of giving an exact date, it says version 15.0 was released 3 months ago. I looked at the repo to see the actual date associated with the v15.0.0 tag. Since that was on January 7, the thing you're fixing never went out as a stable release.

Also, you can hover over the "3 months ago" to get the exact datetime. v15.0 says Jan 7th, 18:43 Z

Copy link
Copy Markdown
Contributor Author

@hahn-kev hahn-kev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dismissed @tombogle from a discussion.
Reviewable status: 0 of 30 files reviewed, all discussions resolved (waiting on @imnasnainaec and @josephmyers)

@hahn-kev hahn-kev dismissed imnasnainaec’s stale review May 20, 2025 03:41

issue has been resolved

@hahn-kev hahn-kev merged commit 0624a96 into master May 20, 2025
11 of 12 checks passed
@hahn-kev hahn-kev deleted the add-back-imagetoolbox branch May 20, 2025 03:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants