The PR solves the problem where the merge dialog hides when working with a newer version of macOS (cf. #27). Also, a lineEdit becomes read-only.
A minor change was made to the way the merge dialog is presented (from show() to exec_()). A caveat is that this change will make the main window inaccessible when working on the merge function. However, I think the user would want to interact with the main window while merging...
Additionally, I made the lineEdit for the merge destination read-only. I think we don't want the user to type in the destination path.
I confirmed this works on both macOS (14.5) and Windows.
The PR solves the problem where the merge dialog hides when working with a newer version of macOS (cf. #27). Also, a lineEdit becomes read-only.
A minor change was made to the way the merge dialog is presented (from
show()
toexec_()
). A caveat is that this change will make the main window inaccessible when working on the merge function. However, I think the user would want to interact with the main window while merging...Additionally, I made the lineEdit for the merge destination read-only. I think we don't want the user to type in the destination path.
I confirmed this works on both macOS (14.5) and Windows.