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

Markers - Add timestamps #7947

Merged
merged 10 commits into from
Oct 29, 2020
Merged

Conversation

Freddo3000
Copy link
Contributor

When merged this pull request will:

  • Add a checkbox when creating/editing markers to add a timestamp suffix.
  • Requires a watch
  • Move IDCs to macros.

image
image

Credit to @milaq for https://github.com/milaq/arma3_timemarkers from which this was inspired.

@BrettMayson
Copy link
Member

Should instead be an option under direction, rather than tucked in the corner

Freddo3000 and others added 2 commits October 7, 2020 10:30
Co-authored-by: Brett <brett@bmandesigns.com>
Co-authored-by: Brett <brett@bmandesigns.com>
@Freddo3000
Copy link
Contributor Author

Should instead be an option under direction, rather than tucked in the corner

I figured that considering it ties into the description, it should be close to it. I also wanted to keep the vertical space down.

@BrettMayson
Copy link
Member

I figured that considering it ties into the description, it should be close to it. I also wanted to keep the vertical space down.

Vertical space is less of a concern than UX, maybe it could go under description then rather than at the bottom to keep it closer to related fields (Description)

@Freddo3000
Copy link
Contributor Author

image

@Freddo3000 Freddo3000 requested a review from bux October 7, 2020 11:16
@PabstMirror
Copy link
Contributor

Freddo3000#1
I want to prevent this when editing markers
20201009103537_1

I tested an idea I had that uses a special asci char (that just looks like a space) to indicate that a timecode follows.
fnc_initInsertMarker:95

    if !((markerText GVAR(editingMarker)) isEqualTo "") then {
        // fill text input with text from marker which is being edited
        private _originalText = markerText GVAR(editingMarker);
        private _timeIndex = _originalText find ((toString [129]) + "["); // 129 just looks like a space
        if (_timeIndex > 0 ) then { _originalText = _originalText select [0,_timeIndex]; }; // stip off timecode
        _text ctrlSetText _originalText;
    };

fnc_onButtonClickConfirm:30

        "%1%2[%3%4]",
        ctrlText _description,
        toString [129],....

This means when you edit a marker it will automatically update the timecode instead of appending it.

@Drofseh
Copy link
Contributor

Drofseh commented Oct 16, 2020

I could see it being useful to have a history sometimes TEXT [1345] [1353] [1405].

Maybe a second button to add instead of replace?

@Freddo3000
Copy link
Contributor Author

I could see it being useful to have a history sometimes TEXT [1345] [1353] [1405].

Maybe a second button to add instead of replace?

At that point you might as well place a new marker, imo.

@Drofseh
Copy link
Contributor

Drofseh commented Oct 17, 2020

I could see it being useful to have a history sometimes TEXT [1345] [1353] [1405].
Maybe a second button to add instead of replace?

At that point you might as well place a new marker, imo.

yah maybe...

Copy link
Member

@veteran29 veteran29 left a comment

Choose a reason for hiding this comment

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

LGTM

@PabstMirror PabstMirror added this to the 3.13.5 milestone Oct 21, 2020
@PabstMirror PabstMirror merged commit afb3dad into acemod:master Oct 29, 2020
@Freddo3000 Freddo3000 deleted the markers/timestamps branch October 29, 2020 18:42
};

_description ctrlSetText format [ // Add timestamp suffix
"%1%2[%2%3]",
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't seem right?
description, space, space, time

you give 4 parameter but only use 3, and the space seems wrong

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah looks like I made a typo, should probably be "%1%2[%3%4]"

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, am-pm is completely broken in this pull request. Even if this part was repaired, am-pm will not be shown for 12 and 24-hours, and even if that part is repaired, it will show the wrong one.

Should all be fixed here: https://github.com/acemod/ACE3/pull/8034/files#diff-4b395ce5b5e0cc52ea30d46cdc2cb9d5fea1eb22d6ca4cfe885b60ef68b1e45eR48

@jonpas jonpas added kind/feature Release Notes: **ADDED:** and removed kind/added feature labels Oct 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants