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

Add auto-reload modified files option #1611

Merged
merged 9 commits into from
Dec 25, 2022
Merged

Add auto-reload modified files option #1611

merged 9 commits into from
Dec 25, 2022

Conversation

sdottaka
Copy link
Member

@sdottaka sdottaka commented Dec 16, 2022

This PR adds an "Auto-reload modified files:" combobox to the General category of the Options dialog.

image

”Only on window activated" means that the file will be reloaded only when the WinMerge window is activated, even if the file being viewed has been modified by an external application.

"Immediately" means that the file will be reloaded immediately when an external application modifies the file being viewed.

Remove(static_cast<uintptr_t>(-1));
}

unsigned DirWatcher::DirWatcherThreadProc()

Check warning

Code scanning / CodeQL

Poorly documented large function

Poorly documented function: fewer than 2% comments for a function of 164 lines.
Src/DirWatcher.cpp Fixed Show fixed Hide fixed
@sdottaka sdottaka changed the title [WIP] Add DirWatcher Add auto-reload modified files option Dec 25, 2022
@sdottaka sdottaka added this to the v2.16.25 milestone Dec 25, 2022
@sdottaka sdottaka marked this pull request as ready for review December 25, 2022 12:22
@sdottaka sdottaka merged commit 8ab91f8 into master Dec 25, 2022
@sdottaka sdottaka deleted the filewatcher branch December 25, 2022 12:30
Marcello-mco added a commit to Marcello-mco/winmerge that referenced this pull request Dec 25, 2022
Translation for " Add auto-reload modified files option (WinMerge#1611)"
sdottaka pushed a commit that referenced this pull request Dec 25, 2022
Translation for " Add auto-reload modified files option (#1611)"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant