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

Improving the view menu and hiding the open refine dialog #9390

Closed
wants to merge 10 commits into from

Conversation

Fidel365
Copy link
Contributor

Fixes issues partially #9374, #9368 and #9366 and replaces PR #9383 .
@rdstern this is where I got, you can review it but I will finish the small remaining items on monday, Enjoy your weekend!

@rdstern
Copy link
Collaborator

rdstern commented Jan 24, 2025

@Fidel365 that is coming on, but it also makes me nervous. So I have one more small task on #9366, in b) below. Then I suggest we merge. Then have a separate pull request on #9368.
a) The #9374 item of hiding Open Refine seems fine now.
b) The #9366 move of the Swap Data and Column Metadata, and adding Data Frame Metadata is almost ok.
For that, you can't have both items ticked. So, if (say) Swap Column Metadata is ticked and active, then if you tick Swap DataFrame Metadata, then you should automatically unick the other swap - and vv.
c) I quite strongly suggest you complete those two and then merge and attack #9368 as a separate pull request. The code for the View Windows stuff is apparently a can of worms, so lets not mix it with simpler tasks,

@Fidel365
Copy link
Contributor Author

@rdstern I'm working to resolve the issue of the toolbar column metadata not coming at first load hence getting an empty column metadata, alongside the translation of the items in a fresh PR that will mainly tackle the other issue.

@Fidel365 Fidel365 mentioned this pull request Feb 3, 2025
Copy link
Collaborator

@rdstern rdstern left a comment

Choose a reason for hiding this comment

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

@Fidel365 I missed this and was waiting for it.
@N-thony I am approving in the hope it can get into this release. Be very nice, because visible, and completes the toolbar changes.
There is a small point not working yet, which should become a new minor issue. When the data and metadata are swapped, there is no tick in the toolbar drop-downs. But happy to live with that for now. The change is important to have soon.

@N-thony N-thony requested a review from derekagorhom February 10, 2025 09:34
@Fidel365
Copy link
Contributor Author

Fidel365 commented Feb 10, 2025

@rdstern I think someone else changes on this may have been merged to.main, this was all well, and the checkboxes were working corresponding to each other, I see now even column metadata and dataframe metadata; not as before but now they have the same issue.
As I updated this branch to master

@Fidel365
Copy link
Contributor Author

@rdstern I can work on the last part you mentioned in a minute once this is merged, I'm unable to work here directly since I pulled the changes and It happen to have conflicts in vb.

Copy link
Contributor

@derekagorhom derekagorhom left a comment

Choose a reason for hiding this comment

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

@N-thony over to you

Copy link
Collaborator

@N-thony N-thony left a comment

Choose a reason for hiding this comment

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

@Fidel365 just a few questions.
At the same time, can you include PR #9393 here?

Comment on lines +706 to +710
Private Sub ClearAllPanels()
splDataOutput.Panel1.Controls.Clear()
splMetadata.Panel1.Controls.Clear()
splExtraWindows.Panel2.Controls.Clear()
End Sub
Copy link
Collaborator

Choose a reason for hiding this comment

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

is this needed?

Comment on lines +713 to +717
Private Sub UpdateMenuStates(selectedMenuItem As ToolStripMenuItem)
mnuViewSwapDataAndMetadata.Checked = (selectedMenuItem Is mnuViewSwapDataAndMetadata)
mnuViewSwapDataAndDataframeMetadata.Checked = (selectedMenuItem Is mnuViewSwapDataAndDataframeMetadata)
mnuViewSwapDataAndScript.Checked = (selectedMenuItem Is mnuViewSwapDataAndScript)
End Sub
Copy link
Collaborator

Choose a reason for hiding this comment

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

also this, do we need it?

Comment on lines +2611 to +2616
Private Sub mnuViewSwapDataAndDataframeMetadata_CheckStateChanged(sender As Object, e As EventArgs) Handles mnuViewSwapDataAndDataframeMetadata.CheckStateChanged
If Not mnuViewSwapDataAndDataframeMetadata.Checked AndAlso Not mnuViewDataView.Checked AndAlso mnuViewDataFrameMetadata.Checked Then
mnuViewDataFrameMetadata.Checked = False
mnuViewDataView.Checked = True
End If
End Sub
Copy link
Collaborator

Choose a reason for hiding this comment

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

do we need this sub?

@Fidel365
Copy link
Contributor Author

@derekagorhom I can work on the changes all together in a pr fresh from this one, as I cannot push again here, I mean this can be merged and I pull request again for the changes

@N-thony
Copy link
Collaborator

N-thony commented Feb 10, 2025

@derekagorhom I can work on the changes all together in a pr fresh from this one, as I cannot push again here, I mean this can be merged and I pull request again for the changes

Can you resolve my comments?

splDataOutput.Panel1.Controls.Add(ucrColumnMeta)
splMetadata.Panel1.Controls.Add(ucrDataViewer)
mnuViewColumnMetadata.Text = "Data View"
mnuViewDataView.Text = "Column Metadata"
mnuSwapDataMetadata.Checked = True
UpdateMenuStates(mnuViewSwapDataAndMetadata)
Copy link
Collaborator

Choose a reason for hiding this comment

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

we can simply have mnuViewSwapDataAndMetadata.Checked = True here

splMetadata.Panel1.Controls.Add(ucrDataViewer)
mnuViewColumnMetadata.Text = "Data View"
mnuViewDataView.Text = "Dataframe Metadata"
UpdateMenuStates(mnuViewSwapDataAndDataframeMetadata)
Copy link
Collaborator

Choose a reason for hiding this comment

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

same here mnuViewSwapDataAndDataframeMetadata.Checked = True

splDataOutput.Panel1.Controls.Add(ucrScriptWindow)
splExtraWindows.Panel2.Controls.Add(ucrDataViewer)
mnuViewLogScript.Text = "Data View"
mnuViewDataView.Text = "Log/Script"
mnuSwapDataLogScript.Checked = True
UpdateMenuStates(mnuViewSwapDataAndScript)
Copy link
Collaborator

Choose a reason for hiding this comment

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

mnuViewSwapDataAndScript.Checked = True

@Fidel365
Copy link
Contributor Author

@N-thony perhaps have a look now at pr #9435

@Fidel365 Fidel365 closed this Feb 11, 2025
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.

4 participants