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.

Sign up for GitHub

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

Jump to bottom

Projector Screen Margins #190

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Projector Screen Margins #190

wants to merge 29 commits into from

Commits on Jul 5, 2019

  1. Support margins via config file for custom coords

    @dallonf
    dallonf committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    c885875 View commit details
    Browse the repository at this point in the history

  2. Apply margins to monitor display

    @dallonf
    dallonf committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    e114841 View commit details
    Browse the repository at this point in the history

  3. Save display margins in a single property line

    @dallonf
    dallonf committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    69dedb2 View commit details
    Browse the repository at this point in the history

  4. Started adding margin settings UI

    @dallonf
    dallonf committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    a613c44 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2019

  1. Add other margin fields

    @dallonf
    dallonf committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    e1e2f9d View commit details
    Browse the repository at this point in the history

  2. Only show margins UI for projector settings

    @dallonf
    dallonf committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    e9ec095 View commit details
    Browse the repository at this point in the history

  3. Can now save margin from settings UI

    @dallonf
    dallonf committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    0478cc6 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2019

  1. Can now set margins via UI

    @dallonf
    dallonf committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    a1b982a View commit details
    Browse the repository at this point in the history

  2. Rename "display margin" to "projector margin"

    @dallonf
    dallonf committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    50997e7 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2019

  1. Use margin when updating bounds

    @dallonf
    dallonf committed Aug 7, 2019
    Configuration menu
    Copy the full SHA
    f90d81f View commit details
    Browse the repository at this point in the history

  2. Start constraining margins to 99%

    @dallonf
    dallonf committed Aug 7, 2019
    Configuration menu
    Copy the full SHA
    1f89c6e View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2019

  1. Constrain all margin fields to a total of 99%

    @dallonf
    dallonf committed Aug 31, 2019
    Configuration menu
    Copy the full SHA
    45edae7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/margins-settings-ui 

    # Conflicts:
#	Quelea/languages/gb.lang
#	Quelea/src/main/java/org/quelea/windows/options/OptionsDisplaySetupPanel.java
#	Quelea/src/main/java/org/quelea/windows/options/SingleDisplayPanel.java
    @dallonf
    dallonf committed Aug 31, 2019
    Configuration menu
    Copy the full SHA
    095a3dd View commit details
    Browse the repository at this point in the history

  3. Start adapting margin options to new options UI

    @dallonf
    dallonf committed Aug 31, 2019
    Configuration menu
    Copy the full SHA
    09d2568 View commit details
    Browse the repository at this point in the history

  4. Refactor DisplayGroup so I can add new fields to it

    @dallonf
    dallonf committed Aug 31, 2019
    Configuration menu
    Copy the full SHA
    26d4f7b View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2019

  1. Added marginTop

    @dallonf
    dallonf committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    09bd17c View commit details
    Browse the repository at this point in the history

  2. Can now edit the full margin

    @dallonf
    dallonf committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    b09885e View commit details
    Browse the repository at this point in the history

  3. Correctly load margins from properties

    @dallonf
    dallonf committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    44349d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2019

  1. Validation for margin properties

    @dallonf
    dallonf committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    1ce64cb View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. Merge remote-tracking branch 'upstream/master' into feature/margins-s… 

    …ettings-ui
    @dallonf
    dallonf committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    b539b6c View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Remove unused imports

    @dallonf
    dallonf committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    3068f57 View commit details
    Browse the repository at this point in the history

  2. Refactor long DisplayGroup constructor

    @dallonf
    dallonf committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    e85aaaf View commit details
    Browse the repository at this point in the history

  3. Use sliders for margin settings

    @dallonf
    dallonf committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    5a9061d View commit details
    Browse the repository at this point in the history

  4. Use PercentSliderControl for margin settings

    @dallonf
    dallonf committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    ab863f5 View commit details
    Browse the repository at this point in the history

  5. Oops, one more unused import

    @dallonf
    dallonf committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    0d2d1a3 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2019

  1. Merge remote-tracking branch 'upstream/master' into feature/margins-s… 

    …ettings-ui

# Conflicts:
#	Quelea/languages/gb.lang
    @dallonf
    dallonf committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    1c8e07e View commit details
    Browse the repository at this point in the history

  2. Don't set fullscreen if margins are set

    @dallonf
    dallonf committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    436c3aa View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2019

  1. Move margins check

    @dallonf
    dallonf committed Oct 19, 2019
    Configuration menu
    Copy the full SHA
    7bf77f3 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. Merge branch 'master' into feature/margins-settings-ui

    @berry120
    berry120 authored Dec 10, 2019
    Configuration menu
    Copy the full SHA
    930be83 View commit details
    Browse the repository at this point in the history