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 bracket collisions #6468

Closed
wants to merge 41 commits into from
Closed

Fix bracket collisions #6468

wants to merge 41 commits into from

Conversation

btut
Copy link
Contributor

@btut btut commented May 12, 2020

Brackets in regular expressions were interpreted as brackets for fields. This change allows users to define regular expressions that contain brackets. This led to an exception before.

  • Change in CHANGELOG.md described (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

btut added 30 commits May 7, 2020 16:38
Implemented a task progress dialog using a TaskProgressView.
Tasks show up, but without info. Neither the progress nor title and
message are shown.
There now i a progress indicator at the rightmost postition of JabRefs
toolbar. It shows the average progress of all running background tasks.
Clicking it will show a TaskProgressDialog.

still looks ugly and the binding to the average progress does not seem
to be working.
This makes the view work with download tasks for example. Most other
tasks are still shown without title, message (because none are set) and
progress.
Also, there are a lot of tasks somehow.

The progress indicator in the main view still does not work as I can't
get the bindings to work.
The progress indicator is now successfully bound to the list of tasks.
However, tasks do not show up in the dialogue any more.
When using ObjectProperties in the list of tasks, we can use EasyBind to
convert the list into a list of tasks which in turn can be bound to the
list of tasks in the view.

With this, the basic functionality works. There is a progress indicator
in the toolbar that shows the average progress of all running background
tasks. It is indeterminate if any task has indeterminate progress and
shows 100% if no tasks are running.

Clicking it opens an overview of all running tasks and their progress.

Currently, there are many tasks running all the time. The only tasks
that were adapted for this to be pretty are the download tasks, and they
are also still missing an icon.
These are shorter and therefore the task progress view does not need a
horizontal scroll bar.
For consistency with other variables
Make showProgressDialogAndWait actually not only show but also wait.
The dialog that is shown when the user quits JabRef during ongoing
background tasks now shows which background tasks are still running.

When all of them complete or the user chooses to quit anyway, JabRef
quits.

The user can also cancel the dialog. In that case, the dialog closes and
JobRef remains running.
There are still some ImportOrder errors though where I can see no issue.
This makes the dialog that pops up if background tasks are running wait
for pending saves.
Set the pref-width when the indicator is determinate to keep the
indeterminate state from making the indicator wider.
@btut
Copy link
Contributor Author

btut commented May 12, 2020

Damn it, I branched from my other PR. Sorry. I hope this is ok as the other PR is ready to be merged anyway.

@Siedlerchr
Copy link
Member

I think the easiest way to fix this "history mess" is to create a new branch from master and cherry pick the relevant commits,
https://www.previousnext.com.au/blog/intro-cherry-picking-git
You find all commits by running gitk

@btut btut closed this May 12, 2020
@btut btut deleted the fix/regexBrackets branch May 12, 2020 09:03
@btut
Copy link
Contributor Author

btut commented May 12, 2020

Sorry, fixed in #6469

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.

3 participants