Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/setup-dotn…
Browse files Browse the repository at this point in the history
…et-4
  • Loading branch information
DaveyJonesBitPail authored Dec 7, 2023
2 parents fa644f5 + 9a727b0 commit 0e86d59
Show file tree
Hide file tree
Showing 18 changed files with 337 additions and 100 deletions.
26 changes: 26 additions & 0 deletions .github/DISCUSSION_TEMPLATE/czi-compress-feature-requests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
labels: ["czicompress", "enhancement"]
body:
- type: textarea
id: problem
attributes:
label: Is your feature request related to a problem? Please describe.
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when...
validations:
required: true

- type: textarea
id: alternatives
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: true

- type: textarea
id: context
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
validations:
required: false
16 changes: 16 additions & 0 deletions .github/DISCUSSION_TEMPLATE/czi-compress-feedback.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
labels: ["czicompress", "feedback"]
body:
- type: markdown
attributes:
value: |
Thank you for your interest in CZI Compress!
Your feedback helps us improve 💪
- type: textarea
id: content
attributes:
label: Feedback
description: Tell us your thoughts!
validations:
required: true
10 changes: 10 additions & 0 deletions .github/DISCUSSION_TEMPLATE/czi-compress-questions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
labels: ["czicompress", "question"]
body:
- type: textarea
id: question
attributes:
label: Question
description: Please add any screenshots or logs if applicable
validations:
required: true
26 changes: 26 additions & 0 deletions .github/DISCUSSION_TEMPLATE/czi-shrink-feature-requests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
labels: ["czishrink", "enhancement"]
body:
- type: textarea
id: problem
attributes:
label: Is your feature request related to a problem? Please describe.
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when...
validations:
required: true

- type: textarea
id: alternatives
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: true

- type: textarea
id: context
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
validations:
required: false
16 changes: 16 additions & 0 deletions .github/DISCUSSION_TEMPLATE/czi-shrink-feedback.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
labels: ["czishrink", "feedback"]
body:
- type: markdown
attributes:
value: |
Thank you for your interest in CZI Shrink!
Your feedback helps us improve 💪
- type: textarea
id: content
attributes:
label: Feedback
description: Tell us your thoughts!
validations:
required: true
10 changes: 10 additions & 0 deletions .github/DISCUSSION_TEMPLATE/czi-shrink-questions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
labels: ["czishrink", "question"]
body:
- type: textarea
id: question
attributes:
label: Question
description: Please add any screenshots or logs if applicable
validations:
required: true
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

76 changes: 76 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
---
name: "🕷️ Bug report"
description: Create a report to help us improve
labels:
- bug
body:
- type: dropdown
id: toolaffected
attributes:
label: Which tool is affected?
description: CZI Shrink is the GUI application while CZI Compress refers to the CLI tool.
multiple: false
options:
- CZI Compress
- CZI Shrink
validations:
required: true

- type: textarea
attributes:
label: Description
description: Describe the bug and add screenshots if possible/applicable.
placeholder: A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
attributes:
label: Steps to reproduce
description: Please include screenshots (if applicable) and relevant logs.
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true

- type: textarea
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true

- type: dropdown
attributes:
label: OS
description: What operating system are you using?
multiple: false
options:
- Windows
- MacOS
- Linux
validations:
required: true

- type: input
attributes:
label: OS Version
description: What version and flavor (if applicable) of your OS are you using?
placeholder: Ubuntu 23.10 | Sonoma 14.1.2 | Windows 11 23H2
validations:
required: true

- type: textarea
attributes:
label: Other Context
description: Please add any other context that may be relevant.
validations:
required: false
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
blank_issues_enabled: false
contact_links:
- name: "\U0000270D CZI Shrink Feedback"
url: https://github.com/ZEISS/czicompress/discussions/new?category=czi-shrink-feedback
about: Feedback for the GUI tool CZI Shrink
- name: "\U0001F4A1 CZI Shrink Feature Request"
url: https://github.com/ZEISS/czicompress/discussions/new?category=czi-shrink-feature-requests
about: Feature request for the GUI tool CZI Shrink
- name: "\U0000003F CZI Shrink Questions"
url: https://github.com/ZEISS/czicompress/discussions/new?category=czi-shrink-questions
about: Questions about the GUI tool CZI Shrink
- name: "\U0000270D CZI Compress Feedback"
url: https://github.com/ZEISS/czicompress/discussions/new?category=czi-compress-feedback
about: Feedback for the CLI tool CZI Compress
- name: "\U0001F4A1 CZI Compress Feature Request"
url: https://github.com/ZEISS/czicompress/discussions/new?category=czi-compress-feature-requests
about: Feature request for the CLI tool CZI Compress
- name: "\U0000003F CZI Compress Questions"
url: https://github.com/ZEISS/czicompress/discussions/new?category=czi-compress-questions
about: Questions about the CLI tool CZI Compress
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

10 changes: 10 additions & 0 deletions .github/advanced-issue-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
policy:
- section:
- id: [toolaffected]
block-list: ['None', 'Other']
label:
- name: czicompress
keys: ['CZI Compress']
- name: 'czishrink'
keys: ['CZI Shrink']
30 changes: 30 additions & 0 deletions .github/workflows/issue_labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Bug issue labeler
on:
issues:
types: [opened]

permissions:
contents: read

jobs:
label-component:
runs-on: ubuntu-latest

permissions:
issues: write

steps:
- uses: actions/checkout@v3

- name: Parse issue form
uses: stefanbuck/github-issue-parser@c1a559d78bfb8dd05216dab9ffd2b91082ff5324
id: issue-parser
with:
template-path: .github/ISSUE_TEMPLATE/bug_report.yml

- name: Set labels based on toolaffected field
uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
with:
issue-form: ${{ steps.issue-parser.outputs.jsonString }}
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion czishrink/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@

<!-- Version -->
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<VersionPrefix>1.1.6<!--bugfix/timespan_format_greater_than_24h_addendum--></VersionPrefix>
<VersionPrefix>1.2.0<!--feature/add-feedback-button--></VersionPrefix>
</PropertyGroup>
</Project>
8 changes: 8 additions & 0 deletions czishrink/netczicompress/ViewModels/AboutViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public AboutViewModel(IFileLauncher launcher, IProgramNameAndVersion info)
this.CloseAboutCommand = ReactiveCommand.Create(() => this.IsVisible = false);
this.ShowAboutCommand = ReactiveCommand.Create(() => this.IsVisible = true);
this.ShowTextFileCommand = ReactiveCommand.CreateFromTask<string>(this.OpenTextFile);
this.OpenUrlCommand = ReactiveCommand.CreateFromTask<string>(this.OpenUrlLink);
this.ProgramVersionAndCopyRight = $"{info}, © 2023 Carl Zeiss Microscopy GmbH and others";
this.launcher = launcher;
}
Expand All @@ -41,9 +42,16 @@ public AboutViewModel(IFileLauncher launcher, IProgramNameAndVersion info)

public ICommand ShowTextFileCommand { get; }

public ICommand OpenUrlCommand { get; }

private Task OpenTextFile(string filename)
{
var fullFilename = System.IO.Path.Combine(AppContext.BaseDirectory, filename);
return this.launcher.Launch(fullFilename);
}

private Task OpenUrlLink(string url)
{
return this.launcher.Launch(url);
}
}
2 changes: 2 additions & 0 deletions czishrink/netczicompress/ViewModels/IAboutViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ public interface IAboutViewModel
string LibraryName { get; }

ICommand ShowTextFileCommand { get; }

ICommand OpenUrlCommand { get; }
}
Loading

0 comments on commit 0e86d59

Please sign in to comment.