Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d19b91963 | ||
|
|
43a2c4f57b |
No files matched your search
@@ -0,0 +1,51 @@
|
|||||||
|
---
|
||||||
|
name: Gebogen lijnen
|
||||||
|
overview: Lijnen en pijlen krijgen buigpunten waardoor een vloeiende kromme door alle punten loopt. Bij een geselecteerde lijn staat tussen elk paar punten een spook-greep; slepen daarvan maakt een nieuw buigpunt, dubbelklikken op een buigpunt verwijdert het.
|
||||||
|
todos:
|
||||||
|
- id: model
|
||||||
|
content: "LineAnnotation: Bends-lijst, Catmull-Rom-naar-Bezier helper, Render/Bounds/HitTest/Move/Clone aanpassen, pijlpunt langs raaklijn"
|
||||||
|
status: completed
|
||||||
|
- id: handles
|
||||||
|
content: "Grepen: buigpunten + spook-grepen, BeginHandleDrag voegt buigpunt in, RemoveHandle; IsGhostHandle/RemoveHandle in Annotation"
|
||||||
|
status: completed
|
||||||
|
- id: surface
|
||||||
|
content: "AnnotationSurface: spook-grepen anders tekenen, echte grepen voorrang bij HitHandle"
|
||||||
|
status: completed
|
||||||
|
- id: editor
|
||||||
|
content: "EditorWindow: dubbelklik op buigpunt verwijdert het (met undo), hint-tekst bijwerken"
|
||||||
|
status: completed
|
||||||
|
isProject: false
|
||||||
|
---
|
||||||
|
|
||||||
|
# Gebogen lijnen en pijlen
|
||||||
|
|
||||||
|
## Gedrag
|
||||||
|
- Selecteer een lijn of pijl: je ziet de begin- en eindgreep, de buigpunten en, halverwege elk stuk van de kromme, een kleine halfdoorzichtige spook-greep.
|
||||||
|
- Sleep je een spook-greep, dan wordt die een echt buigpunt en volgt de lijn de muis (zoals in je screenshot).
|
||||||
|
- Dubbelklik op een buigpunt verwijdert het. Beide acties kun je ongedaan maken.
|
||||||
|
- De kromme loopt precies door alle punten (Catmull-Rom, omgezet naar kubische Beziers). De pijlpunt volgt de richting van het laatste stuk.
|
||||||
|
|
||||||
|
## Wijzigingen
|
||||||
|
|
||||||
|
**[src/Kniip/Editor/Annotations/LineAnnotation.cs](src/Kniip/Editor/Annotations/LineAnnotation.cs)**
|
||||||
|
- Nieuw: `List<Point> Bends`, met `Start + Bends + End` als doorlooppunten.
|
||||||
|
- Een helper bouwt de Bezier-segmenten. Voor `Bounds`, `HitTest` en de posities van de spook-grepen gebruikt hij bemonsterde punten (ongeveer 16 per segment). Zonder buigpunten blijft alles gelijk aan nu.
|
||||||
|
- `Render`: een `StreamGeometry` met `BezierTo`. Bij een pijl wordt de richting bepaald door `End` min het laatste controlepunt. Het laatste segment eindigt op het basispunt van de pijlpunt.
|
||||||
|
- Grepen: index 0 is `Start` en 1 is `End`, zodat bestaande code blijft werken. Daarna volgen de buigpunten en dan de spook-grepen (het Bezier-punt bij t=0,5 van elk segment).
|
||||||
|
- `BeginHandleDrag`: bij een spook-greep wordt een buigpunt op de juiste plek in `Bends` ingevoegd en het actieve buigpunt onthouden. `MoveHandle` verplaatst daarna dat punt.
|
||||||
|
- Met Shift blijft `SnapAngle` werken voor begin en eind, maar dan ten opzichte van het naastliggende punt.
|
||||||
|
- `Move` verschuift ook alle buigpunten. `Clone` maakt een diepe kopie van `Bends`, nodig voor ongedaan maken (zelfde patroon als in `HighlightAnnotation`).
|
||||||
|
|
||||||
|
**[src/Kniip/Editor/Annotations/Annotation.cs](src/Kniip/Editor/Annotations/Annotation.cs)**
|
||||||
|
- `public virtual bool IsGhostHandle(int index) => false;`
|
||||||
|
- `public virtual bool RemoveHandle(int index) => false;` (LineAnnotation verwijdert hiermee een buigpunt)
|
||||||
|
|
||||||
|
**[src/Kniip/Editor/AnnotationSurface.cs](src/Kniip/Editor/AnnotationSurface.cs)**
|
||||||
|
- `DrawSelection` tekent spook-grepen als kleinere, halfdoorzichtige cirkels. `HitHandle` controleert eerst de echte grepen en daarna pas de spook-grepen, zodat een echte greep voorrang krijgt als ze overlappen.
|
||||||
|
|
||||||
|
**[src/Kniip/Editor/EditorWindow.xaml.cs](src/Kniip/Editor/EditorWindow.xaml.cs)** (rond regel 452)
|
||||||
|
- In `Surface_MouseLeftButtonDown`: als op een greep geklikt wordt met `e.ClickCount == 2` en `_selected.RemoveHandle(handle)` slaagt, dan volgen `Commit(_pending)` en `InvalidateVisual`, en stopt de verwerking daar. Anders start het bestaande sleepgedrag.
|
||||||
|
- Optioneel: in `UpdateHint` een korte tip toevoegen voor lijnen ("Sleep het middenpunt om te buigen, dubbelklik om een punt te verwijderen").
|
||||||
|
|
||||||
|
## Niet nodig
|
||||||
|
Exporteren gaat via `Render` in [src/Kniip/Editor/DocumentRenderer.cs](src/Kniip/Editor/DocumentRenderer.cs) en werkt dus automatisch. Ook het aanmaken van lijnen (`UpdateCreating`) blijft ongewijzigd: nieuwe lijnen zijn recht.
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
---
|
||||||
|
name: Schermafdruk vertraging
|
||||||
|
overview: "Tray-submenu \"Schermafdruk vertraging: Xs\" (0-60 s, slider plus getalveld) dat rechthoek- en vensterknipsels uitstelt, met een klein aftelvenster bij de muis dat met Esc te annuleren is."
|
||||||
|
todos:
|
||||||
|
- id: setting
|
||||||
|
content: CaptureDelaySeconds toevoegen aan AppSettings (0-60, standaard 0)
|
||||||
|
status: completed
|
||||||
|
- id: tray
|
||||||
|
content: Tray-submenu met TrackBar + NumericUpDown, SetCaptureDelay en CaptureDelayChanged in TrayIcon
|
||||||
|
status: completed
|
||||||
|
- id: countdown
|
||||||
|
content: CountdownWindow (niet-activerend, volgt muis, Elapsed/Cancelled) maken
|
||||||
|
status: completed
|
||||||
|
- id: app
|
||||||
|
content: BeginDelayedSnip in App.xaml.cs, Esc-binding tijdelijk, StartNewSnip onvertraagd, instelling opslaan
|
||||||
|
status: completed
|
||||||
|
- id: changelog
|
||||||
|
content: CHANGELOG.md bijwerken
|
||||||
|
status: completed
|
||||||
|
- id: release
|
||||||
|
content: CHANGELOG 1.1.5-item, build.ps1 draaien, commit/tag 1.1.5 en pushen
|
||||||
|
status: in_progress
|
||||||
|
isProject: false
|
||||||
|
---
|
||||||
|
|
||||||
|
# Schermafdruk vertraging (0-60 s)
|
||||||
|
|
||||||
|
## Gedrag
|
||||||
|
- In het tray-menu komt direct onder "Venster knippen" een item `Schermafdruk vertraging: 0s` met een submenu.
|
||||||
|
- In het submenu staan een slider (0-60) en een getalveld (`NumericUpDown`, 0-60) die met elkaar meelopen. De tekst van het hoofditem werkt meteen bij, bijvoorbeeld `Schermafdruk vertraging: 5s`.
|
||||||
|
- 0 betekent uit: dan werkt alles zoals nu.
|
||||||
|
- De vertraging geldt voor "Rechthoek knippen" en "Venster knippen", via de tray en via de sneltoetsen. Screencasts en "Nieuw knipsel" na het sluiten van de editor (`StartNewSnip`) gaan zonder vertraging.
|
||||||
|
- Tijdens het aftellen staat een klein, altijd-bovenop, niet-focusstelend venstertje bij de muis met de resterende seconden. Het scherm wordt pas vastgelegd nadat dat venster weg is, zodat het niet in de schermafdruk komt. Met Esc (of een klik op het venster) annuleer je.
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
flowchart LR
|
||||||
|
trigger["Tray of sneltoets"] --> check{"Delay groter dan 0?"}
|
||||||
|
check -->|nee| snip["BeginSnip: scherm bevriezen"]
|
||||||
|
check -->|ja| countdown["CountdownWindow bij muis"]
|
||||||
|
countdown -->|"Esc of klik"| cancel[Geannuleerd]
|
||||||
|
countdown -->|"tijd om"| closeWin["Venster sluiten, korte pauze"] --> snip
|
||||||
|
```
|
||||||
|
|
||||||
|
## Wijzigingen
|
||||||
|
|
||||||
|
**[src/Kniip/Settings/AppSettings.cs](src/Kniip/Settings/AppSettings.cs)**
|
||||||
|
- Nieuwe instelling `public int CaptureDelaySeconds { get; set; }` (standaard 0), met een doc-comment in dezelfde stijl. Bij het lezen begrenzen tot 0-60.
|
||||||
|
|
||||||
|
**[src/Kniip/Infrastructure/TrayIcon.cs](src/Kniip/Infrastructure/TrayIcon.cs)**
|
||||||
|
- `_delayItem` (een `ToolStripMenuItem`) met in de `DropDownItems` een `ToolStripControlHost` om een klein `Panel`: daarin een `TrackBar` (0-60, `TickFrequency` 5) en een `NumericUpDown` met het label "seconden".
|
||||||
|
- `public void SetCaptureDelay(int seconds)` zet de besturingselementen en de menutekst.
|
||||||
|
- `public event Action<int>? CaptureDelayChanged`: wordt afgevuurd als de waarde wijzigt. Opslaan gebeurt pas bij `DropDownClosed`, zodat niet elke stap van de slider een schrijfactie wordt.
|
||||||
|
- Toetsen in het getalveld mogen het menu niet sluiten. Als dat in de praktijk toch gebeurt, krijgt het hostpaneel focus en geven we Enter/Esc expliciet door.
|
||||||
|
|
||||||
|
**[src/Kniip/App.xaml.cs](src/Kniip/App.xaml.cs)**
|
||||||
|
- Bij het opstarten: `_tray.SetCaptureDelay(Settings.CaptureDelaySeconds)` en `CaptureDelayChanged` koppelen. De koppeling zet `Settings.CaptureDelaySeconds` en roept `SettingsStore.Save` aan.
|
||||||
|
- `BeginRegionSnip`/`BeginWindowSnip` gaan via een nieuwe `BeginDelayedSnip(bool pickWindow)`:
|
||||||
|
- Als de vertraging 0 is, of er al een knipsel loopt, of er al wordt afgeteld, gaat het direct naar `BeginSnip`. Een tweede sneltoets tijdens het aftellen wordt genegeerd.
|
||||||
|
- Anders wordt een `CountdownWindow` gestart. Na afloop sluit dat venster en volgt een `DispatcherTimer` van circa 150 ms (zelfde idee als `StartNewSnip`), daarna `BeginSnip(pickWindow)`.
|
||||||
|
- Esc tijdens het aftellen: tijdelijk een `Escape`-binding toevoegen aan `HotkeyHook.Bindings` die het aftellen annuleert, en daarna via `ApplyHotkeys()` herstellen. `HotkeyHook.Capture` gebruiken we niet, want dat slokt alle toetsen op, en de gebruiker moet tijdens het aftellen juist zijn scherm kunnen klaarzetten.
|
||||||
|
- `StartNewSnip` blijft `BeginRegionSnip` direct aanroepen, maar dan via de onvertraagde route (`BeginSnip(false)`).
|
||||||
|
|
||||||
|
**Nieuw: `src/Kniip/Capture/CountdownWindow.xaml(.cs)`**
|
||||||
|
- Een klein, rond-hoekig WPF-venster zonder rand: `Topmost`, `ShowActivated=False`, `ShowInTaskbar=False`, met `WS_EX_NOACTIVATE`/`WS_EX_TOOLWINDOW` zodat de focus bij het actieve programma blijft. De opmaak is vergelijkbaar met [`SnipToast.xaml`](src/Kniip/Notifications/SnipToast.xaml).
|
||||||
|
- Toont een groot getal en de tekst "Esc om te annuleren". Er loopt een `DispatcherTimer` van 1 s. Het venster schuift mee met de muis (positie bijwerken op dezelfde tick of op een snellere tick van circa 50 ms).
|
||||||
|
- Events `Elapsed` en `Cancelled`. Een muisklik op het venster telt als annuleren.
|
||||||
|
|
||||||
|
## Release 1.1.5
|
||||||
|
De versienummers in [build.ps1](build.ps1), [installer/Kniip.iss](installer/Kniip.iss), [src/Kniip/Kniip.csproj](src/Kniip/Kniip.csproj) en [README.md](README.md) staan al op 1.1.5. Tag `1.1.5` bestaat nog niet. Deze functie gaat dus mee in dezelfde release als de ShareX-indeling, het vergrootglas en de geschiedenis.
|
||||||
|
- [CHANGELOG.md](CHANGELOG.md): in de bestaande sectie `## 1.1.5 - 2026-11-09` onder **Nieuw** een item toevoegen in dezelfde stijl, bijvoorbeeld: **Schermafdruk vertraging.** In het systeemvakmenu staat **Schermafdruk vertraging: 0s**. Stel daar met de schuifbalk of het getalveld 0 tot 60 seconden in. Daarna wachten **Rechthoek knippen** en **Venster knippen** (ook via de sneltoets) zo lang voordat het scherm bevriest. Bij de muis telt een venstertje af, en met Esc annuleer je. 0 betekent geen vertraging; screencasts wachten niet.
|
||||||
|
- `.\build.ps1` draaien en controleren dat de build en de installer slagen.
|
||||||
|
- Commit "1.1.5" met alle openstaande 1.1.5-wijzigingen, waaronder de nieuwe History- en Magnifier-bestanden. Daarna tag `1.1.5` en pushen, net als bij 1.1.4. De release op git.hibbit.net maak je zelf aan; ik lever de changelogtekst aan.
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
---
|
||||||
|
name: ShareX-indeling editor
|
||||||
|
overview: "Een tweede editor-indeling toevoegen in de stijl van ShareX: bovenaan de bewerkgereedschappen met daaronder de eigenschappenbalk, onderaan een aparte balk met zoom en de opslag-, upload- en kopieerknoppen. De indeling is te kiezen in Instellingen (tab Editor) en via het rechtsklikmenu van de werkbalk. Uitbrengen als versie 1.1.5."
|
||||||
|
todos:
|
||||||
|
- id: settings
|
||||||
|
content: EditorLayout-enum, EditorLayout- en SplitToolbarOrder-instelling toevoegen aan AppSettings
|
||||||
|
status: completed
|
||||||
|
- id: xaml
|
||||||
|
content: ActionBar met ActionItems (ToolbarPanel) toevoegen aan EditorWindow.xaml
|
||||||
|
status: completed
|
||||||
|
- id: code
|
||||||
|
content: "Werkbalkcode ombouwen: items verdelen over twee panelen, labels/vergrendelen/verbergen/volgorde/omwisselen per paneel, menu Indeling, bijsnijden, OnActivated"
|
||||||
|
status: completed
|
||||||
|
- id: settingsui
|
||||||
|
content: Radioknoppen voor de indeling in de Editor-tab van Instellingen plus herstellen naar standaard
|
||||||
|
status: completed
|
||||||
|
- id: version
|
||||||
|
content: Versie 1.1.5 in csproj, build.ps1 en Kniip.iss en een CHANGELOG-regel
|
||||||
|
status: completed
|
||||||
|
- id: verify
|
||||||
|
content: Bouwen en beide indelingen handmatig testen
|
||||||
|
status: completed
|
||||||
|
isProject: false
|
||||||
|
---
|
||||||
|
|
||||||
|
# ShareX-achtige editor-indeling (versie 1.1.5)
|
||||||
|
|
||||||
|
## Indeling
|
||||||
|
|
||||||
|
- **Eén werkbalk** (standaard, zoals nu): alles in `ToolbarItems`, positie Boven/Onder/Links/Rechts blijft werken.
|
||||||
|
- **Gesplitst (zoals ShareX)**:
|
||||||
|
- Boven, gecentreerd: Selecteren, Rechthoek ... Vervagen, Bijsnijden, met daarnaast Wissen, Ongedaan maken, Opnieuw en Verwijderen. Direct daaronder de bestaande eigenschappenbalk `PropsBar` (die al gecentreerd is).
|
||||||
|
- Onder, boven de statusbalk: links Nieuw en Screencast, in het midden Uitzoomen / 100% / Inzoomen, rechts Instellingen, Opslaan, Uploaden en Kopiëren (met tekstlabels, want daar is ruimte).
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
flowchart TB
|
||||||
|
topBar["Boven: gereedschappen + ongedaan maken"]
|
||||||
|
props["Eigenschappenbalk: kleur, dikte, lijnstijl"]
|
||||||
|
canvas["Canvas"]
|
||||||
|
bottomBar["Onder: Nieuw, Screencast | Zoom | Instellingen, Opslaan, Uploaden, Kopiëren"]
|
||||||
|
status["Statusbalk"]
|
||||||
|
topBar --> props --> canvas --> bottomBar --> status
|
||||||
|
```
|
||||||
|
|
||||||
|
## Wijzigingen
|
||||||
|
|
||||||
|
**[src/Kniip/Settings/AppSettings.cs](src/Kniip/Settings/AppSettings.cs)**
|
||||||
|
- Nieuwe enum `EditorLayout { Single, Split }` en `public EditorLayout EditorLayout { get; set; } = EditorLayout.Single;`
|
||||||
|
- Aparte `List<string> SplitToolbarOrder`, zodat versleepte volgordes van beide indelingen elkaar niet overschrijven. `ToolbarHidden` blijft gedeeld.
|
||||||
|
|
||||||
|
**[src/Kniip/Editor/EditorWindow.xaml](src/Kniip/Editor/EditorWindow.xaml)**
|
||||||
|
- Een tweede `Border x:Name="ActionBar" DockPanel.Dock="Bottom"` (na de statusbalk gedeclareerd, dus erboven) met `local:ToolbarPanel x:Name="ActionItems"`, dezelfde `ContextMenuOpening`- en `OrderChanged`-handlers en standaard `Collapsed`.
|
||||||
|
- De knoppen zelf blijven op één plek in de XAML staan; de code verdeelt ze over de panelen.
|
||||||
|
|
||||||
|
**[src/Kniip/Editor/EditorWindow.xaml.cs](src/Kniip/Editor/EditorWindow.xaml.cs)** (rond regels 141-362 voor de werkbalk)
|
||||||
|
- In `InitializeToolbar` alle items één keer in een dictionary `_toolbarItems` (id naar element) vastleggen, plus een vaste set id's die in de gesplitste indeling onderaan komen: `New, Screencast, Spacer, ZoomOut, Zoom, ZoomIn, Spacer2, Settings, Save, Upload, Copy` (plus de bijbehorende scheidingslijnen).
|
||||||
|
- `ApplyToolbarOrder` ombouwen tot `ApplyToolbarLayout()`: beide panelen leegmaken en de items volgens de opgeslagen volgorde (`ToolbarOrder` of `SplitToolbarOrder`) verdelen over `ToolbarItems` en `ActionItems`. De logica voor nieuwe items die na hun standaardvoorganger komen, blijft hetzelfde. In de gesplitste indeling krijgt het bovenste paneel `HorizontalAlignment=Center`, `Toolbar` vast `Dock.Top` en wordt `ActionBar` getoond.
|
||||||
|
- Alle plekken die nu `ToolbarItems.Items` gebruiken, laten werken op beide panelen: `SelectTool` (regel 368), "Knoppen tonen", `ResetToolbar`, de vergrendeling (`IsLocked` op beide panelen, achtergrondkleur op beide balken) en `OrderChanged` (de volgorde van boven + onder samen opslaan in `SplitToolbarOrder`).
|
||||||
|
- `UpdateToolbarLayout` en `SetActionLabelsVisible` per paneel laten rekenen, zodat de labels op de onderbalk zichtbaar blijven, ook als de bovenbalk vol is. De lus op regel 236 stopt bij het `ToolbarPanel` waarin het label staat, in plaats van alleen bij `ToolbarItems`.
|
||||||
|
- `SwapToolbarGroups` werkt op het paneel waarop is rechtsgeklikt.
|
||||||
|
- Rechtsklikmenu: een nieuw submenu "Indeling" met "Eén werkbalk" en "Gesplitst (zoals ShareX)". "Positie" alleen tonen bij Eén werkbalk.
|
||||||
|
- Op regel 935, waar `Toolbar` tijdens bijsnijden wordt verborgen, ook `ActionBar` verbergen (alleen als de gesplitste indeling aanstaat).
|
||||||
|
- In `OnActivated` (regel 1508) `ApplyToolbarLayout()` aanroepen als de indeling is veranderd, zodat een wijziging in Instellingen meteen zichtbaar is in een open editor (zoals dat nu ook gebeurt met `ApplySaveButton`).
|
||||||
|
|
||||||
|
**[src/Kniip/Settings/SettingsWindow.xaml](src/Kniip/Settings/SettingsWindow.xaml) en [.xaml.cs](src/Kniip/Settings/SettingsWindow.xaml.cs)**
|
||||||
|
- In de tab Editor (regel 252) een kopje "Werkbalk" met twee radioknoppen `LayoutSingleRadio` / `LayoutSplitRadio` en een korte uitleg, op dezelfde manier geladen en opgeslagen als `SaveOnlyRadio` / `SaveAndCopyRadio`.
|
||||||
|
- Bij het herstellen van de standaardinstellingen (regel 466) ook `EditorLayout` en `SplitToolbarOrder` meenemen.
|
||||||
|
|
||||||
|
**Versie 1.1.5**
|
||||||
|
- `<Version>1.1.5</Version>` in [src/Kniip/Kniip.csproj](src/Kniip/Kniip.csproj), de standaardwaarde in [build.ps1](build.ps1) (regel 16) en `#define AppVersion` in [installer/Kniip.iss](installer/Kniip.iss).
|
||||||
|
- In [CHANGELOG.md](CHANGELOG.md) bovenaan `## 1.1.5 - 2026-11-09`, onder `### Nieuw`: **Werkbalkindeling zoals ShareX.**
|
||||||
|
|
||||||
|
## Controle
|
||||||
|
- Bouwen met `build.ps1`, daarna beide indelingen uitproberen: wisselen via Instellingen en via het rechtsklikmenu, knoppen verslepen en verbergen, bijsnijden, een smal venster (de balken moeten netjes doorlopen naar een nieuwe regel) en "Standaard herstellen".
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
---
|
||||||
|
name: Update-melding blauwe stip
|
||||||
|
overview: kniip controleert op de achtergrond (bij het starten en daarna elke 24 uur, uit te zetten in Instellingen) op een nieuwe versie. Als die er is, krijgen de knop Instellingen in de editor-werkbalk en de tab Update in Instellingen een blauwe stip.
|
||||||
|
todos:
|
||||||
|
- id: setting
|
||||||
|
content: CheckForUpdates toevoegen aan AppSettings
|
||||||
|
status: completed
|
||||||
|
- id: notifier
|
||||||
|
content: UpdateNotifier maken (controle na het starten en elke 24 uur, AvailabilityChanged-event, Report)
|
||||||
|
status: completed
|
||||||
|
- id: app
|
||||||
|
content: "UpdateNotifier koppelen in App: aanroepen bij het opstarten en in SaveSettings"
|
||||||
|
status: completed
|
||||||
|
- id: editor-badge
|
||||||
|
content: Blauwe stip op de knop Instellingen in EditorWindow
|
||||||
|
status: completed
|
||||||
|
- id: settings-tab
|
||||||
|
content: Blauwe stip op de tab Update, vinkje voor automatische controle, Report na handmatige controle
|
||||||
|
status: completed
|
||||||
|
- id: changelog-readme
|
||||||
|
content: CHANGELOG.md sectie 1.1.4 toevoegen en README bijwerken (achtergrondcontrole, versietabel, build-commentaar)
|
||||||
|
status: completed
|
||||||
|
- id: bump-version
|
||||||
|
content: Versie naar 1.1.4 in build.ps1, installer/Kniip.iss en src/Kniip/Kniip.csproj
|
||||||
|
status: completed
|
||||||
|
- id: build-release
|
||||||
|
content: build.ps1 draaien, commit "1.1.4", tag 1.1.4 en pushen; installer klaarzetten voor de release op git.hibbit.net
|
||||||
|
status: completed
|
||||||
|
isProject: false
|
||||||
|
---
|
||||||
|
|
||||||
|
# Blauwe update-melding bij Instellingen en de tab Update
|
||||||
|
|
||||||
|
## Huidige situatie
|
||||||
|
- [src/Kniip/Update/UpdateChecker.cs](src/Kniip/Update/UpdateChecker.cs) haalt releases op met `GetReleasesAsync`, maar dat gebeurt nu alleen in [src/Kniip/Settings/SettingsWindow.xaml.cs](src/Kniip/Settings/SettingsWindow.xaml.cs) zodra de tab Update geopend wordt (`Tabs_SelectionChanged` gevolgd door `CheckForUpdatesAsync`).
|
||||||
|
- De knop Instellingen staat in [src/Kniip/Editor/EditorWindow.xaml](src/Kniip/Editor/EditorWindow.xaml) (regel 318–321, glyph ``).
|
||||||
|
- `AccentBrush` is `#0067C0` (blauw) in [src/Kniip/App.xaml](src/Kniip/App.xaml), en die gebruiken we voor de stip.
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
flowchart LR
|
||||||
|
AppStart[App start] --> Notifier[UpdateNotifier]
|
||||||
|
Timer["Timer 24 uur"] --> Notifier
|
||||||
|
Notifier -->|GetReleasesAsync| Checker[UpdateChecker]
|
||||||
|
Notifier -->|AvailabilityChanged| EditorBadge[Stip op knop Instellingen]
|
||||||
|
Notifier -->|AvailabilityChanged| TabBadge[Stip op tab Update]
|
||||||
|
SettingsCheck[Handmatige controle in tab Update] -->|Report| Notifier
|
||||||
|
```
|
||||||
|
|
||||||
|
## Stappen
|
||||||
|
|
||||||
|
1. **Nieuwe instelling** in [src/Kniip/Settings/AppSettings.cs](src/Kniip/Settings/AppSettings.cs):
|
||||||
|
`public bool CheckForUpdates { get; set; } = true;`
|
||||||
|
|
||||||
|
2. **Nieuwe klasse `UpdateNotifier`** in `src/Kniip/Update/UpdateNotifier.cs`:
|
||||||
|
- Houdt `ReleaseInfo? Available` bij en `bool IsUpdateAvailable`, met een event `AvailabilityChanged` dat op de UI-thread wordt afgevuurd.
|
||||||
|
- `Apply(bool enabled)`: als de controle aanstaat, wordt die kort na het starten uitgevoerd (ongeveer 10 seconden vertraging, zodat het opstarten niet trager wordt) en daarna via een `DispatcherTimer` elke 24 uur. Als de controle uitstaat, stopt de timer en verdwijnt de stip.
|
||||||
|
- `CheckAsync()` roept `UpdateChecker.GetReleasesAsync` aan en vangt `UpdateException` stil af, zodat een achtergrondcontrole nooit een foutmelding toont.
|
||||||
|
- `Report(ReleaseInfo? newest)` wordt gebruikt door de handmatige controle in de tab Update, zodat de stip ook daarmee gelijkloopt.
|
||||||
|
- "Nieuwer" betekent hetzelfde als in `ShowReleases`: `r.Version > UpdateChecker.CurrentVersion`.
|
||||||
|
|
||||||
|
3. **App** ([src/Kniip/App.xaml.cs](src/Kniip/App.xaml.cs)):
|
||||||
|
- Een property `public UpdateNotifier Updates { get; } = new();`
|
||||||
|
- Bij het opstarten (na `ApplyHotkeys`) wordt `Updates.Apply(Settings.CheckForUpdates)` aangeroepen.
|
||||||
|
- In `SaveSettings()` gebeurt dat opnieuw, zodat het aan- of uitzetten van de controle direct effect heeft.
|
||||||
|
|
||||||
|
4. **Stip op de knop Instellingen** ([src/Kniip/Editor/EditorWindow.xaml](src/Kniip/Editor/EditorWindow.xaml) en `.xaml.cs`):
|
||||||
|
- De inhoud van de knop wordt een `Grid` met de bestaande glyph plus `<Ellipse x:Name="SettingsBadge" Width="8" Height="8" Fill="{StaticResource AccentBrush}" Stroke="White" StrokeThickness="1" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-2,-3,0" Visibility="Collapsed" />`.
|
||||||
|
- In de code-behind abonneert de editor zich op `App.Instance.Updates.AvailabilityChanged`. Bij een wijziging worden `SettingsBadge.Visibility` en de tooltip bijgewerkt (de tooltip wordt "Instellingen - nieuwe versie beschikbaar"). Bij `Closed` wordt het abonnement weer opgezegd.
|
||||||
|
|
||||||
|
5. **Stip op de tab Update en een vinkje voor de achtergrondcontrole** ([src/Kniip/Settings/SettingsWindow.xaml](src/Kniip/Settings/SettingsWindow.xaml) en `.xaml.cs`):
|
||||||
|
- De `Header` van `UpdateTab` wordt een horizontale `StackPanel` met de tekst "Update" en daarachter een blauwe `Ellipse x:Name="UpdateTabBadge"` van dezelfde stijl, met een margin links van 6.
|
||||||
|
- In de tab Update, onder `CurrentVersionText`, komt `<CheckBox x:Name="AutoUpdateCheckBox" Content="Automatisch controleren op nieuwe versies (bij starten en dagelijks)" />`. Die wordt gevuld in `LoadFrom`, bewaard in `Save_Click` en meegenomen bij Standaardinstellingen.
|
||||||
|
- Het venster abonneert zich op `AvailabilityChanged` om de zichtbaarheid van de stip te zetten, en zegt dat abonnement op bij `Closed`.
|
||||||
|
- Na een handmatige controle roept `ShowReleases` `App.Instance.Updates.Report(newer.FirstOrDefault())` aan.
|
||||||
|
|
||||||
|
## Gedrag
|
||||||
|
- De stip blijft zichtbaar zolang er een nieuwere versie is. Na het updaten start kniip met de nieuwe versie, en dan is er geen nieuwere versie meer, dus verdwijnt de stip vanzelf.
|
||||||
|
- Er komen geen extra meldingen in het systeemvak, zoals afgesproken.
|
||||||
|
|
||||||
|
## Changelog en release 1.1.4 (na de codewijzigingen)
|
||||||
|
|
||||||
|
6. **[CHANGELOG.md](CHANGELOG.md)**: bovenaan een nieuwe sectie `## 1.1.4 - 2026-11-09` in dezelfde stijl als de eerdere versies, bijvoorbeeld:
|
||||||
|
- Onder `### Nieuw`: **Melding bij een nieuwe versie.** kniip kijkt bij het starten en daarna elke dag of er een nieuwere versie is. Als die er is, staat er een blauwe stip op de knop **Instellingen** in de editor en op de tab **Update**. Je zet dit uit in de tab **Update** met **Automatisch controleren op nieuwe versies**.
|
||||||
|
- Onder `### Gewijzigd`: kniip zoekt nu standaard zelf op de achtergrond naar updates. Tot nu toe gebeurde dat alleen als je de tab **Update** opende, zoals vermeld bij 1.1.0.
|
||||||
|
7. **[README.md](README.md)**:
|
||||||
|
- In de versietabel 1.1.3 vervangen door 1.1.4, met de link `.../releases/download/1.1.4/Kniip-Setup-1.1.4.exe`.
|
||||||
|
- Het commentaar `# versie 1.1.3` bij het bouwen wordt `# versie 1.1.4`.
|
||||||
|
- Bij "Updaten vanuit kniip" komt een zin over de automatische controle en de blauwe stip.
|
||||||
|
8. **Versienummer** van 1.1.3 naar 1.1.4 in [build.ps1](build.ps1) (`$Version`), [installer/Kniip.iss](installer/Kniip.iss) (`#define AppVersion`) en [src/Kniip/Kniip.csproj](src/Kniip/Kniip.csproj) (`<Version>`).
|
||||||
|
9. **Bouwen en uitbrengen**, op dezelfde manier als bij 1.1.2 en 1.1.3:
|
||||||
|
- `.\build.ps1` draaien. Dat levert `artifacts\Kniip-1.1.4.exe` en `artifacts\Kniip-Setup-1.1.4.exe` op.
|
||||||
|
- Daarna `git add -A`, `git commit -m "1.1.4"`, `git tag 1.1.4` (zonder `v`, net als de vorige tags) en `git push origin HEAD` plus `git push origin 1.1.4`.
|
||||||
|
- De release op git.hibbit.net maak je, net als eerder, zelf aan. Je hangt daar `artifacts\Kniip-Setup-1.1.4.exe` aan als bijlage en plakt de 1.1.4-tekst uit de changelog in de beschrijving. Ik lever die tekst kant-en-klaar aan.
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
---
|
||||||
|
name: Vergrootglas bij selectie
|
||||||
|
overview: Add a magnifier (circular zoom with crosshair and X/Y coordinates near the cursor) to the snip overlay and the screencast region selector, with a settings checkbox that is on by default. Release as 1.1.5.
|
||||||
|
todos:
|
||||||
|
- id: setting
|
||||||
|
content: ShowMagnifier (default true) toevoegen aan AppSettings
|
||||||
|
status: completed
|
||||||
|
- id: control
|
||||||
|
content: "MagnifierControl maken: ronde zoom, raster, kruisdraad, X/Y-badge, plaatsing bij cursor met randcorrectie"
|
||||||
|
status: completed
|
||||||
|
- id: snip
|
||||||
|
content: Vergrootglas in RegionCaptureWindow + doorgeven vanuit App.BeginSnip
|
||||||
|
status: completed
|
||||||
|
- id: screencast
|
||||||
|
content: Vergrootglas in RegionSelectorWindow met vooraf vastgelegd beeld vanuit RecordingController.BeginSelection
|
||||||
|
status: completed
|
||||||
|
- id: settings-ui
|
||||||
|
content: Checkbox in SettingsWindow (tab Sneltoetsen) laden en opslaan
|
||||||
|
status: completed
|
||||||
|
- id: release
|
||||||
|
content: CHANGELOG 1.1.5, README, versienummers, build.ps1 draaien, commit/tag 1.1.5 en pushen
|
||||||
|
status: completed
|
||||||
|
isProject: false
|
||||||
|
---
|
||||||
|
|
||||||
|
# Vergrootglas bij het kiezen van een gebied (1.1.5)
|
||||||
|
|
||||||
|
## Starting point
|
||||||
|
- kniip has no magnifier yet. The snip overlay [src/Kniip/Capture/RegionCaptureWindow.xaml](src/Kniip/Capture/RegionCaptureWindow.xaml) shows a frozen screenshot (`Frozen`), a dim layer, the selection and a `W × H` badge.
|
||||||
|
- The screencast selector [src/Kniip/Recording/RegionSelectorWindow.xaml](src/Kniip/Recording/RegionSelectorWindow.xaml) is a transparent overlay over the live screen. It has no image to zoom into.
|
||||||
|
|
||||||
|
## Approach
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
flowchart LR
|
||||||
|
Settings["AppSettings.ShowMagnifier"] --> App["App.BeginSnip"]
|
||||||
|
Settings --> Rec["RecordingController.BeginSelection"]
|
||||||
|
App -->|"frozen image + flag"| Snip[RegionCaptureWindow]
|
||||||
|
Rec -->|"capture per screen + flag"| Sel[RegionSelectorWindow]
|
||||||
|
Snip --> Mag[MagnifierControl]
|
||||||
|
Sel --> Mag
|
||||||
|
```
|
||||||
|
|
||||||
|
1. **Setting**: in [src/Kniip/Settings/AppSettings.cs](src/Kniip/Settings/AppSettings.cs) add
|
||||||
|
`public bool ShowMagnifier { get; set; } = true;` with a Dutch doc comment.
|
||||||
|
2. **Shared control**: new `src/Kniip/Capture/MagnifierControl.xaml(.cs)` (UserControl, `IsHitTestVisible="False"`), styled like the screenshot:
|
||||||
|
- A round clipped area (about 130 DIP) showing an `Image` of the frozen bitmap with `NearestNeighbor` scaling. A `CroppedBitmap` of about 15x15 physical pixels around the cursor is enlarged around 8x.
|
||||||
|
- A pixel grid, a blue crosshair through the center pixel and a small square on the center pixel. The crosshair uses `AccentBrush`, the ring is white with a shadow.
|
||||||
|
- Below the circle, a badge in the same style as `SizeBadge` with `X: … Y: …` in physical screen coordinates.
|
||||||
|
- Method `Update(BitmapSource frozen, System.Drawing.Point physicalRelative, System.Drawing.Point screenPoint)`. Pixels outside the image are left black.
|
||||||
|
- Placement: bottom-right of the cursor at about 20 DIP offset. It flips left and/or up near the screen edge.
|
||||||
|
3. **Snip overlay** [src/Kniip/Capture/RegionCaptureWindow.xaml.cs](src/Kniip/Capture/RegionCaptureWindow.xaml.cs):
|
||||||
|
- Add a constructor parameter `bool showMagnifier` and add `<local:MagnifierControl x:Name="Magnifier" Visibility="Collapsed"/>` to the Grid.
|
||||||
|
- In `OnMouseMove`, update and show the magnifier while it is on (before and during dragging). Not in window-pick mode (`PicksWindow`), because exact pixels don't matter there. Hide it on `MouseLeave`.
|
||||||
|
- [src/Kniip/App.xaml.cs](src/Kniip/App.xaml.cs) `BeginSnip` passes `Settings.ShowMagnifier`.
|
||||||
|
4. **Screencast selector** [src/Kniip/Recording/RegionSelectorWindow.xaml.cs](src/Kniip/Recording/RegionSelectorWindow.xaml.cs):
|
||||||
|
- Add an optional `BitmapSource? frozen` constructor parameter. When it is set, the same magnifier runs in `OnMouseMove` (also while hovering over windows, because you can drag from there).
|
||||||
|
- [src/Kniip/Recording/RecordingController.cs](src/Kniip/Recording/RecordingController.cs) `BeginSelection`: if `_settings.ShowMagnifier` is on, call `ScreenGrabber.Capture(screen.Bounds)` per screen *before* the selectors are shown, so the overlay is not in the image. Otherwise pass `null`.
|
||||||
|
5. **Settings screen** [src/Kniip/Settings/SettingsWindow.xaml](src/Kniip/Settings/SettingsWindow.xaml) tab **Sneltoetsen**: below the hotkeys, add a card title "Gebied kiezen" with
|
||||||
|
`<CheckBox x:Name="MagnifierBox" Content="Vergrootglas tonen bij het kiezen van een gebied (knipsel en screencast)" />`.
|
||||||
|
In [SettingsWindow.xaml.cs](src/Kniip/Settings/SettingsWindow.xaml.cs), add a line to `LoadFrom` (around line 100) and to the save step (around line 444).
|
||||||
|
6. **Release 1.1.5**:
|
||||||
|
- [CHANGELOG.md](CHANGELOG.md) gets a new section `## 1.1.5 - 2026-11-09` with a **Nieuw** entry for the magnifier (round zoom with crosshair and X/Y, for both snips and screencasts) and how to turn it off.
|
||||||
|
- [README.md](README.md): the version table and build comment go to 1.1.5.
|
||||||
|
- Version 1.1.4 becomes 1.1.5 in [build.ps1](build.ps1), [installer/Kniip.iss](installer/Kniip.iss) and [src/Kniip/Kniip.csproj](src/Kniip/Kniip.csproj).
|
||||||
|
- Run `.\build.ps1`, then commit "1.1.5", tag `1.1.5` and push, the same way as 1.1.4. You create the release on git.hibbit.net yourself; I'll supply the changelog text.
|
||||||
@@ -2,6 +2,26 @@
|
|||||||
|
|
||||||
Alle noemenswaardige wijzigingen in kniip staan in dit bestand. De nieuwste versie staat bovenaan.
|
Alle noemenswaardige wijzigingen in kniip staan in dit bestand. De nieuwste versie staat bovenaan.
|
||||||
|
|
||||||
|
## 1.1.5 - 2026-11-09
|
||||||
|
|
||||||
|
### Nieuw
|
||||||
|
|
||||||
|
- **Werkbalkindeling zoals ShareX.** De editor kan nu ook twee werkbalken tonen: bovenaan de gereedschappen met daaronder de eigenschappen (kleur, dikte, lijnstijl), en onderaan een balk met **Nieuw** en **Screencast** links, de zoomknoppen in het midden en **Instellingen**, **Opslaan**, **Uploaden** en **Kopiëren** rechts. Kies de indeling in de instellingen onder **Editor** > **Werkbalk**, of klik met rechts op een werkbalk en kies **Indeling**.
|
||||||
|
- In beide werkbalken kun je knoppen verslepen (na ontgrendelen) en verbergen, net als bij één werkbalk. Beide indelingen onthouden hun eigen volgorde.
|
||||||
|
- De standaardindeling blijft één werkbalk.
|
||||||
|
- **Vergrootglas bij het kiezen van een gebied.** Bij het knippen van een rechthoek en bij het kiezen van een opnamegebied voor een screencast loopt naast de muisaanwijzer een rond vergrootglas mee. Je ziet de pixels rond de aanwijzer vergroot met een raster en een blauwe kruisdraad, en daaronder de schermcoördinaten (X en Y). Zo zet je een hoek precies op de goede pixel. Bij **Venster knippen** verschijnt het vergrootglas niet.
|
||||||
|
- Het vergrootglas staat standaard aan. Wil je het niet, zet dan in de instellingen onder **Sneltoetsen** > **Gebied kiezen** het vinkje **Vergrootglas tonen bij het kiezen van een gebied** uit.
|
||||||
|
- **Schermafdruk vertraging.** In het systeemvakmenu staat **Schermafdruk vertraging: 0s**. Stel daar met de schuifbalk of het getalveld 0 tot 60 seconden in. **Rechthoek knippen** en **Venster knippen** wachten dan zo lang voordat het scherm bevriest, ook via de sneltoets. Zo kun je eerst een menu openklappen of een tooltip laten verschijnen.
|
||||||
|
- Bij de muis telt een klein venster af. Dat venster komt zelf niet in het knipsel. Druk op Esc of klik op het venster om te annuleren.
|
||||||
|
- Bij 0 seconden knip je direct, zoals voorheen. Screencasts en de knop **Nieuw** in de editor wachten niet.
|
||||||
|
- **Geschiedenis.** kniip houdt nu bij wat je opslaat en uploadt: knipsels en screencasts, met het bestand en de link. Knipsels die je alleen kopieert of niet bewaart, komen er niet in. Het systeemvakmenu heeft vier nieuwe items:
|
||||||
|
- **Map openen**, met de map Schermafbeeldingen, je knipselmap en je screencastmap.
|
||||||
|
- **Geschiedenis...** opent een lijst met datum, soort, naam, map en link. Je kunt zoeken op naam of link.
|
||||||
|
- **Afbeeldingsgeschiedenis...** opent hetzelfde venster met miniaturen. Ook een knipsel dat je alleen hebt geüpload heeft een miniatuur.
|
||||||
|
- **Recente items** toont de laatste tien. Klik op een item om het te openen, of ga naar het submenu voor **Openen in de editor**, **Link kopiëren**, **Afbeelding kopiëren**, **Pad kopiëren** en **Tonen in map**.
|
||||||
|
|
||||||
|
Dubbelklik in het geschiedenisvenster om een item te openen. Klik met rechts voor dezelfde acties en voor **Uit geschiedenis verwijderen**. Met **Geschiedenis wissen** maak je de lijst leeg. Je bestanden en uploads blijven dan gewoon bestaan. kniip bewaart de laatste 500 items.
|
||||||
|
|
||||||
## 1.1.4 - 2026-11-09
|
## 1.1.4 - 2026-11-09
|
||||||
|
|
||||||
### Nieuw
|
### Nieuw
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ kniip is een annotatie-editor die naast het Windows Knipprogramma werkt. Maak ee
|
|||||||
|
|
||||||
| Versie | Installer |
|
| Versie | Installer |
|
||||||
| ------ | --------- |
|
| ------ | --------- |
|
||||||
| 1.1.4 | [Kniip-Setup-1.1.4.exe](https://git.hibbit.net/rogier/kniip/releases/download/1.1.4/Kniip-Setup-1.1.4.exe) |
|
| 1.1.5 | [Kniip-Setup-1.1.5.exe](https://git.hibbit.net/rogier/kniip/releases/download/1.1.5/Kniip-Setup-1.1.5.exe) |
|
||||||
|
|
||||||
Oudere versies vind je bij [alle releases](https://git.hibbit.net/rogier/kniip/releases).
|
Oudere versies vind je bij [alle releases](https://git.hibbit.net/rogier/kniip/releases).
|
||||||
|
|
||||||
@@ -70,7 +70,7 @@ Vereisten:
|
|||||||
Bouwen:
|
Bouwen:
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
.\build.ps1 # versie 1.1.4
|
.\build.ps1 # versie 1.1.5
|
||||||
.\build.ps1 -Version 1.2.0 # andere versie
|
.\build.ps1 -Version 1.2.0 # andere versie
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
# .\build.ps1 -SkipTest -> zonder testexe
|
# .\build.ps1 -SkipTest -> zonder testexe
|
||||||
|
|
||||||
param(
|
param(
|
||||||
[string]$Version = "1.1.4",
|
[string]$Version = "1.1.5",
|
||||||
[string]$Runtime = "win-x64",
|
[string]$Runtime = "win-x64",
|
||||||
[switch]$SkipTest
|
[switch]$SkipTest
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
#define AppName "kniip"
|
#define AppName "kniip"
|
||||||
#define AppExe "Kniip.exe"
|
#define AppExe "Kniip.exe"
|
||||||
#ifndef AppVersion
|
#ifndef AppVersion
|
||||||
#define AppVersion "1.1.4"
|
#define AppVersion "1.1.5"
|
||||||
#endif
|
#endif
|
||||||
#ifndef PublishDir
|
#ifndef PublishDir
|
||||||
#define PublishDir "..\artifacts\publish"
|
#define PublishDir "..\artifacts\publish"
|
||||||
|
|||||||
+94
-7
@@ -7,6 +7,7 @@ using System.Windows.Media.Imaging;
|
|||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
using Kniip.Capture;
|
using Kniip.Capture;
|
||||||
using Kniip.Editor;
|
using Kniip.Editor;
|
||||||
|
using Kniip.History;
|
||||||
using Kniip.Infrastructure;
|
using Kniip.Infrastructure;
|
||||||
using Kniip.Interop;
|
using Kniip.Interop;
|
||||||
using Kniip.Notifications;
|
using Kniip.Notifications;
|
||||||
@@ -23,8 +24,10 @@ public partial class App : Application
|
|||||||
private SingleInstance? _singleInstance;
|
private SingleInstance? _singleInstance;
|
||||||
private TrayIcon? _tray;
|
private TrayIcon? _tray;
|
||||||
private SettingsWindow? _settingsWindow;
|
private SettingsWindow? _settingsWindow;
|
||||||
|
private HistoryWindow? _historyWindow;
|
||||||
private readonly List<RegionCaptureWindow> _snipWindows = new();
|
private readonly List<RegionCaptureWindow> _snipWindows = new();
|
||||||
private List<SnappedWindow> _snipSnapshot = new();
|
private List<SnappedWindow> _snipSnapshot = new();
|
||||||
|
private CountdownWindow? _snipCountdown;
|
||||||
private uint? _ignoredClipboardSequence;
|
private uint? _ignoredClipboardSequence;
|
||||||
|
|
||||||
public static App Instance => (App)Current;
|
public static App Instance => (App)Current;
|
||||||
@@ -90,6 +93,12 @@ public partial class App : Application
|
|||||||
_tray.OpenFileRequested += OpenFileWithDialog;
|
_tray.OpenFileRequested += OpenFileWithDialog;
|
||||||
_tray.SnipRequested += BeginRegionSnip;
|
_tray.SnipRequested += BeginRegionSnip;
|
||||||
_tray.WindowSnipRequested += BeginWindowSnip;
|
_tray.WindowSnipRequested += BeginWindowSnip;
|
||||||
|
_tray.SetCaptureDelay(Settings.CaptureDelaySeconds);
|
||||||
|
_tray.CaptureDelayChanged += seconds =>
|
||||||
|
{
|
||||||
|
Settings.CaptureDelaySeconds = seconds;
|
||||||
|
SettingsStore.Save(Settings);
|
||||||
|
};
|
||||||
_tray.RecordRequested += () =>
|
_tray.RecordRequested += () =>
|
||||||
{
|
{
|
||||||
if (Recorder.Stage == RecordingStage.Idle)
|
if (Recorder.Stage == RecordingStage.Idle)
|
||||||
@@ -103,6 +112,8 @@ public partial class App : Application
|
|||||||
};
|
};
|
||||||
_tray.GifRequested += () => Recorder.Toggle(ScreencastFormat.Gif);
|
_tray.GifRequested += () => Recorder.Toggle(ScreencastFormat.Gif);
|
||||||
_tray.SettingsRequested += ShowSettings;
|
_tray.SettingsRequested += ShowSettings;
|
||||||
|
_tray.HistoryRequested += ShowHistory;
|
||||||
|
_tray.FoldersProvider = TrayFolders;
|
||||||
_tray.ExitRequested += ExitApplication;
|
_tray.ExitRequested += ExitApplication;
|
||||||
_tray.PauseChanged += _ => UpdateCapturePaused();
|
_tray.PauseChanged += _ => UpdateCapturePaused();
|
||||||
|
|
||||||
@@ -191,20 +202,59 @@ public partial class App : Application
|
|||||||
timer.Tick += (_, _) =>
|
timer.Tick += (_, _) =>
|
||||||
{
|
{
|
||||||
timer.Stop();
|
timer.Stop();
|
||||||
BeginRegionSnip();
|
BeginSnip(pickWindow: false);
|
||||||
};
|
};
|
||||||
timer.Start();
|
timer.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Bevriest alle schermen en laat een rechthoek slepen; het resultaat opent in de editor.</summary>
|
/// <summary>Bevriest alle schermen (na de ingestelde vertraging) en laat een rechthoek slepen; het resultaat opent in de editor.</summary>
|
||||||
public void BeginRegionSnip() => BeginSnip(pickWindow: false);
|
public void BeginRegionSnip() => BeginDelayedSnip(pickWindow: false);
|
||||||
|
|
||||||
/// <summary>Bevriest alle schermen en laat een venster aanklikken; het resultaat opent in de editor.</summary>
|
/// <summary>Bevriest alle schermen (na de ingestelde vertraging) en laat een venster aanklikken; het resultaat opent in de editor.</summary>
|
||||||
public void BeginWindowSnip() => BeginSnip(pickWindow: true);
|
public void BeginWindowSnip() => BeginDelayedSnip(pickWindow: true);
|
||||||
|
|
||||||
|
private void BeginDelayedSnip(bool pickWindow)
|
||||||
|
{
|
||||||
|
if (_snipCountdown != null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int seconds = Settings.CaptureDelaySeconds;
|
||||||
|
if (seconds <= 0 || _snipWindows.Count > 0)
|
||||||
|
{
|
||||||
|
BeginSnip(pickWindow);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var countdown = new CountdownWindow(seconds);
|
||||||
|
countdown.Elapsed += () =>
|
||||||
|
{
|
||||||
|
EndCountdown();
|
||||||
|
// Even wachten tot het aftelvenster echt van het scherm is.
|
||||||
|
var timer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(150) };
|
||||||
|
timer.Tick += (_, _) =>
|
||||||
|
{
|
||||||
|
timer.Stop();
|
||||||
|
BeginSnip(pickWindow);
|
||||||
|
};
|
||||||
|
timer.Start();
|
||||||
|
};
|
||||||
|
countdown.Cancelled += EndCountdown;
|
||||||
|
_snipCountdown = countdown;
|
||||||
|
ApplyHotkeys();
|
||||||
|
countdown.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void EndCountdown()
|
||||||
|
{
|
||||||
|
_snipCountdown = null;
|
||||||
|
ApplyHotkeys();
|
||||||
|
}
|
||||||
|
|
||||||
private void BeginSnip(bool pickWindow)
|
private void BeginSnip(bool pickWindow)
|
||||||
{
|
{
|
||||||
if (_snipWindows.Count > 0 || Recorder.Stage == RecordingStage.Selecting)
|
if (_snipWindows.Count > 0 || _snipCountdown != null || Recorder.Stage == RecordingStage.Selecting)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -218,7 +268,7 @@ public partial class App : Application
|
|||||||
var frozen = Screen.AllScreens.Select(screen => (screen, ScreenGrabber.Capture(screen.Bounds))).ToList();
|
var frozen = Screen.AllScreens.Select(screen => (screen, ScreenGrabber.Capture(screen.Bounds))).ToList();
|
||||||
foreach ((Screen screen, BitmapSource image) in frozen)
|
foreach ((Screen screen, BitmapSource image) in frozen)
|
||||||
{
|
{
|
||||||
var window = new RegionCaptureWindow(screen, image, windows);
|
var window = new RegionCaptureWindow(screen, image, windows, Settings.ShowMagnifier);
|
||||||
window.Finished += OnRegionSnipFinished;
|
window.Finished += OnRegionSnipFinished;
|
||||||
_snipWindows.Add(window);
|
_snipWindows.Add(window);
|
||||||
window.Show();
|
window.Show();
|
||||||
@@ -303,6 +353,12 @@ public partial class App : Application
|
|||||||
Bind(Settings.RecordHotkey, () => Recorder.Toggle(ScreencastFormat.Mp4));
|
Bind(Settings.RecordHotkey, () => Recorder.Toggle(ScreencastFormat.Mp4));
|
||||||
Bind(Settings.GifHotkey, () => Recorder.Toggle(ScreencastFormat.Gif));
|
Bind(Settings.GifHotkey, () => Recorder.Toggle(ScreencastFormat.Gif));
|
||||||
Bind(Settings.ClipboardHotkey, OpenFromClipboard);
|
Bind(Settings.ClipboardHotkey, OpenFromClipboard);
|
||||||
|
if (_snipCountdown is { } countdown)
|
||||||
|
{
|
||||||
|
// Alleen tijdens het aftellen; daarna moet Esc gewoon naar het actieve programma.
|
||||||
|
bindings[new HotkeyGesture(System.Windows.Input.ModifierKeys.None, System.Windows.Input.Key.Escape)] = countdown.Cancel;
|
||||||
|
}
|
||||||
|
|
||||||
HotkeyHook.Bindings = bindings;
|
HotkeyHook.Bindings = bindings;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -437,6 +493,37 @@ public partial class App : Application
|
|||||||
BringToFront(_settingsWindow);
|
BringToFront(_settingsWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ShowHistory(bool images)
|
||||||
|
{
|
||||||
|
if (_historyWindow == null)
|
||||||
|
{
|
||||||
|
_historyWindow = new HistoryWindow(images);
|
||||||
|
_historyWindow.Closed += (_, _) => _historyWindow = null;
|
||||||
|
_historyWindow.Show();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_historyWindow.ShowImages(images);
|
||||||
|
}
|
||||||
|
|
||||||
|
BringToFront(_historyWindow);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IReadOnlyList<(string Label, string? Path)> TrayFolders()
|
||||||
|
{
|
||||||
|
static string? Existing(params string?[] folders) =>
|
||||||
|
folders.FirstOrDefault(folder => folder is { Length: > 0 } && Directory.Exists(folder));
|
||||||
|
|
||||||
|
return new (string, string?)[]
|
||||||
|
{
|
||||||
|
("Schermafbeeldingen", Existing(CaptureCoordinator.ScreenshotsFolder)),
|
||||||
|
("Knipsels", Existing(Settings.SnipSaveFolder, Settings.LastSaveFolder,
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.MyPictures))),
|
||||||
|
("Screencasts", Existing(Settings.VideoSaveFolder, Settings.LastVideoFolder,
|
||||||
|
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), "kniip")))
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public void ShowBalloon(string title, string text) => _tray?.ShowBalloon(title, text);
|
public void ShowBalloon(string title, string text) => _tray?.ShowBalloon(title, text);
|
||||||
|
|
||||||
public void SaveSettings()
|
public void SaveSettings()
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<Window x:Class="Kniip.Capture.CountdownWindow"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
Title="kniip" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
|
||||||
|
Topmost="True" ShowInTaskbar="False" ShowActivated="False" ResizeMode="NoResize"
|
||||||
|
SizeToContent="WidthAndHeight" FontFamily="Segoe UI" UseLayoutRounding="True">
|
||||||
|
<Border Margin="10" Background="#FCFCFC" CornerRadius="8" BorderBrush="#DADADA" BorderThickness="1"
|
||||||
|
Cursor="Hand" MouseLeftButtonUp="Border_Click" ToolTip="Klik om te annuleren">
|
||||||
|
<Border.Effect>
|
||||||
|
<DropShadowEffect BlurRadius="14" ShadowDepth="2" Opacity="0.22" />
|
||||||
|
</Border.Effect>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="12,8,14,8">
|
||||||
|
<TextBlock x:Name="SecondsText" FontSize="28" FontWeight="SemiBold" Foreground="#0067C0"
|
||||||
|
MinWidth="34" TextAlignment="Center" VerticalAlignment="Center" />
|
||||||
|
<StackPanel Margin="10,0,0,0" VerticalAlignment="Center">
|
||||||
|
<TextBlock Text="Knipsel over" FontSize="12" FontWeight="SemiBold" />
|
||||||
|
<TextBlock Text="Esc om te annuleren" FontSize="11" Foreground="#5C5C5C" />
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
using System;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Threading;
|
||||||
|
using Kniip.Interop;
|
||||||
|
using Kniip.Recording;
|
||||||
|
using Rectangle = System.Drawing.Rectangle;
|
||||||
|
using Screen = System.Windows.Forms.Screen;
|
||||||
|
|
||||||
|
namespace Kniip.Capture;
|
||||||
|
|
||||||
|
/// <summary>Klein venster bij de muis dat aftelt tot een vertraagd knipsel; neemt nooit de focus over.</summary>
|
||||||
|
public partial class CountdownWindow : Window
|
||||||
|
{
|
||||||
|
private const int CursorOffset = 20;
|
||||||
|
|
||||||
|
private readonly DispatcherTimer _follow = new() { Interval = TimeSpan.FromMilliseconds(40) };
|
||||||
|
private readonly DateTime _end;
|
||||||
|
private bool _finished;
|
||||||
|
|
||||||
|
/// <summary>De tijd is om; het venster is dan al gesloten.</summary>
|
||||||
|
public event Action? Elapsed;
|
||||||
|
|
||||||
|
/// <summary>Geannuleerd met Esc of een klik; het venster is dan al gesloten.</summary>
|
||||||
|
public event Action? Cancelled;
|
||||||
|
|
||||||
|
public CountdownWindow(int seconds)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
Left = Top = -32000;
|
||||||
|
_end = DateTime.UtcNow.AddSeconds(seconds);
|
||||||
|
SecondsText.Text = seconds.ToString();
|
||||||
|
_follow.Tick += (_, _) => Tick();
|
||||||
|
SourceInitialized += (_, _) =>
|
||||||
|
{
|
||||||
|
NativeMethods.AddExtendedStyle(PhysicalWindow.Handle(this),
|
||||||
|
NativeMethods.WS_EX_TOOLWINDOW | NativeMethods.WS_EX_NOACTIVATE);
|
||||||
|
PhysicalWindow.ExcludeFromCapture(this);
|
||||||
|
};
|
||||||
|
ContentRendered += (_, _) => FollowCursor();
|
||||||
|
Closed += (_, _) =>
|
||||||
|
{
|
||||||
|
_follow.Stop();
|
||||||
|
if (!_finished)
|
||||||
|
{
|
||||||
|
_finished = true;
|
||||||
|
Cancelled?.Invoke();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
Show();
|
||||||
|
FollowCursor();
|
||||||
|
_follow.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Cancel() => Finish(Cancelled);
|
||||||
|
|
||||||
|
private void Tick()
|
||||||
|
{
|
||||||
|
TimeSpan left = _end - DateTime.UtcNow;
|
||||||
|
if (left <= TimeSpan.Zero)
|
||||||
|
{
|
||||||
|
Finish(Elapsed);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
SecondsText.Text = ((int)Math.Ceiling(left.TotalSeconds)).ToString();
|
||||||
|
FollowCursor();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FollowCursor()
|
||||||
|
{
|
||||||
|
if (!IsVisible)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
NativeMethods.GetCursorPos(out NativeMethods.POINT cursor);
|
||||||
|
Rectangle area = Screen.FromPoint(new System.Drawing.Point(cursor.X, cursor.Y)).WorkingArea;
|
||||||
|
Rectangle size = PhysicalWindow.GetBounds(this);
|
||||||
|
int x = cursor.X + CursorOffset, y = cursor.Y + CursorOffset;
|
||||||
|
if (x + size.Width > area.Right)
|
||||||
|
{
|
||||||
|
x = cursor.X - CursorOffset - size.Width;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (y + size.Height > area.Bottom)
|
||||||
|
{
|
||||||
|
y = cursor.Y - CursorOffset - size.Height;
|
||||||
|
}
|
||||||
|
|
||||||
|
x = Math.Max(area.Left, x);
|
||||||
|
y = Math.Max(area.Top, y);
|
||||||
|
if (x != size.X || y != size.Y)
|
||||||
|
{
|
||||||
|
PhysicalWindow.Place(this, new Rectangle(x, y, size.Width, size.Height), resize: false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Finish(Action? handler)
|
||||||
|
{
|
||||||
|
if (_finished)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_finished = true;
|
||||||
|
Close();
|
||||||
|
handler?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Border_Click(object sender, MouseButtonEventArgs e) => Cancel();
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<UserControl x:Class="Kniip.Capture.MagnifierControl"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
HorizontalAlignment="Left" VerticalAlignment="Top" IsHitTestVisible="False">
|
||||||
|
<StackPanel>
|
||||||
|
<Grid Width="120" Height="120">
|
||||||
|
<Grid.Effect>
|
||||||
|
<DropShadowEffect BlurRadius="10" ShadowDepth="2" Opacity="0.35" />
|
||||||
|
</Grid.Effect>
|
||||||
|
<Grid>
|
||||||
|
<Grid.Clip>
|
||||||
|
<EllipseGeometry Center="60,60" RadiusX="60" RadiusY="60" />
|
||||||
|
</Grid.Clip>
|
||||||
|
<Image x:Name="Zoom" Stretch="Fill" RenderOptions.BitmapScalingMode="NearestNeighbor" />
|
||||||
|
<Rectangle>
|
||||||
|
<Rectangle.Fill>
|
||||||
|
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile">
|
||||||
|
<DrawingBrush.Drawing>
|
||||||
|
<GeometryDrawing>
|
||||||
|
<GeometryDrawing.Pen>
|
||||||
|
<Pen Brush="#40000000" Thickness="0.5" />
|
||||||
|
</GeometryDrawing.Pen>
|
||||||
|
<GeometryDrawing.Geometry>
|
||||||
|
<RectangleGeometry Rect="0,0,8,8" />
|
||||||
|
</GeometryDrawing.Geometry>
|
||||||
|
</GeometryDrawing>
|
||||||
|
</DrawingBrush.Drawing>
|
||||||
|
</DrawingBrush>
|
||||||
|
</Rectangle.Fill>
|
||||||
|
</Rectangle>
|
||||||
|
<Rectangle Height="8" VerticalAlignment="Top" Margin="0,56,0,0" Fill="{StaticResource AccentBrush}" Opacity="0.55" />
|
||||||
|
<Rectangle Width="8" HorizontalAlignment="Left" Margin="56,0,0,0" Fill="{StaticResource AccentBrush}" Opacity="0.55" />
|
||||||
|
<Rectangle Width="10" Height="10" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="55,55,0,0"
|
||||||
|
Stroke="White" StrokeThickness="1" />
|
||||||
|
<Rectangle Width="8" Height="8" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="56,56,0,0"
|
||||||
|
Stroke="#202020" StrokeThickness="1" />
|
||||||
|
</Grid>
|
||||||
|
<Ellipse Stroke="White" StrokeThickness="2" />
|
||||||
|
</Grid>
|
||||||
|
<Border HorizontalAlignment="Center" Margin="0,6,0,0" Background="#E6202020" CornerRadius="4" Padding="6,2">
|
||||||
|
<TextBlock x:Name="CoordinateText" Foreground="White" FontSize="12" />
|
||||||
|
</Border>
|
||||||
|
</StackPanel>
|
||||||
|
</UserControl>
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
using System;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
|
||||||
|
namespace Kniip.Capture;
|
||||||
|
|
||||||
|
/// <summary>Rond vergrootglas met kruisdraad en coördinaten dat naast de muisaanwijzer meeloopt.</summary>
|
||||||
|
public partial class MagnifierControl : UserControl
|
||||||
|
{
|
||||||
|
private const int Pixels = 15;
|
||||||
|
private const double CursorOffset = 20;
|
||||||
|
|
||||||
|
private readonly WriteableBitmap _zoom = new(Pixels, Pixels, 96, 96, PixelFormats.Bgra32, null);
|
||||||
|
private readonly byte[] _buffer = new byte[Pixels * Pixels * 4];
|
||||||
|
|
||||||
|
public MagnifierControl()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
Zoom.Source = _zoom;
|
||||||
|
Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <param name="frozen">Vastgelegd beeld van het scherm.</param>
|
||||||
|
/// <param name="relative">Muispositie in pixels van <paramref name="frozen"/>.</param>
|
||||||
|
/// <param name="screen">Muispositie in fysieke bureaubladcoördinaten, voor de tekst.</param>
|
||||||
|
/// <param name="cursor">Muispositie in het venster (DIP).</param>
|
||||||
|
/// <param name="area">Grootte van het venster (DIP).</param>
|
||||||
|
public void Show(BitmapSource frozen, System.Drawing.Point relative, System.Drawing.Point screen, Point cursor, Size area)
|
||||||
|
{
|
||||||
|
CopyPixels(frozen, relative);
|
||||||
|
CoordinateText.Text = $"X: {screen.X} Y: {screen.Y}";
|
||||||
|
Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
|
||||||
|
Size size = DesiredSize;
|
||||||
|
double left = cursor.X + CursorOffset;
|
||||||
|
if (left + size.Width > area.Width)
|
||||||
|
{
|
||||||
|
left = cursor.X - CursorOffset - size.Width;
|
||||||
|
}
|
||||||
|
|
||||||
|
double top = cursor.Y + CursorOffset;
|
||||||
|
if (top + size.Height > area.Height)
|
||||||
|
{
|
||||||
|
top = cursor.Y - CursorOffset - size.Height;
|
||||||
|
}
|
||||||
|
|
||||||
|
Margin = new Thickness(Math.Max(0, left), Math.Max(0, top), 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Hide() => Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
private void CopyPixels(BitmapSource frozen, System.Drawing.Point center)
|
||||||
|
{
|
||||||
|
Array.Clear(_buffer);
|
||||||
|
for (int i = 3; i < _buffer.Length; i += 4)
|
||||||
|
{
|
||||||
|
_buffer[i] = 255;
|
||||||
|
}
|
||||||
|
|
||||||
|
int half = Pixels / 2;
|
||||||
|
int x0 = Math.Max(0, center.X - half);
|
||||||
|
int y0 = Math.Max(0, center.Y - half);
|
||||||
|
int x1 = Math.Min(frozen.PixelWidth, center.X + half + 1);
|
||||||
|
int y1 = Math.Min(frozen.PixelHeight, center.Y + half + 1);
|
||||||
|
if (x1 > x0 && y1 > y0)
|
||||||
|
{
|
||||||
|
int offset = ((y0 - (center.Y - half)) * Pixels + (x0 - (center.X - half))) * 4;
|
||||||
|
frozen.CopyPixels(new Int32Rect(x0, y0, x1 - x0, y1 - y0), _buffer, Pixels * 4, offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
_zoom.WritePixels(new Int32Rect(0, 0, Pixels, Pixels), _buffer, Pixels * 4, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
<Window x:Class="Kniip.Capture.RegionCaptureWindow"
|
<Window x:Class="Kniip.Capture.RegionCaptureWindow"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:local="clr-namespace:Kniip.Capture"
|
||||||
Title="kniip rechthoek knippen" WindowStyle="None" ResizeMode="NoResize"
|
Title="kniip rechthoek knippen" WindowStyle="None" ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False" Topmost="True" Cursor="Cross" FontFamily="Segoe UI" FontSize="13"
|
ShowInTaskbar="False" Topmost="True" Cursor="Cross" FontFamily="Segoe UI" FontSize="13"
|
||||||
Background="Black">
|
Background="Black">
|
||||||
@@ -13,6 +14,7 @@
|
|||||||
CornerRadius="4" Padding="6,2" Visibility="Collapsed" IsHitTestVisible="False">
|
CornerRadius="4" Padding="6,2" Visibility="Collapsed" IsHitTestVisible="False">
|
||||||
<TextBlock x:Name="SizeText" Foreground="White" FontSize="12" />
|
<TextBlock x:Name="SizeText" Foreground="White" FontSize="12" />
|
||||||
</Border>
|
</Border>
|
||||||
|
<local:MagnifierControl x:Name="Magnifier" />
|
||||||
<Border x:Name="Hint" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,28,0,0" Background="#F2FFFFFF"
|
<Border x:Name="Hint" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,28,0,0" Background="#F2FFFFFF"
|
||||||
CornerRadius="6" Padding="16,9" IsHitTestVisible="False">
|
CornerRadius="6" Padding="16,9" IsHitTestVisible="False">
|
||||||
<Border.Effect>
|
<Border.Effect>
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public partial class RegionCaptureWindow : Window
|
|||||||
private readonly Screen _screen;
|
private readonly Screen _screen;
|
||||||
private readonly BitmapSource _frozen;
|
private readonly BitmapSource _frozen;
|
||||||
private readonly IReadOnlyList<Rectangle>? _windows;
|
private readonly IReadOnlyList<Rectangle>? _windows;
|
||||||
|
private readonly bool _showMagnifier;
|
||||||
private Point? _dragStart;
|
private Point? _dragStart;
|
||||||
private bool _dragging;
|
private bool _dragging;
|
||||||
private Rectangle? _hover;
|
private Rectangle? _hover;
|
||||||
@@ -33,13 +34,16 @@ public partial class RegionCaptureWindow : Window
|
|||||||
internal Rectangle? SelectedArea { get; private set; }
|
internal Rectangle? SelectedArea { get; private set; }
|
||||||
|
|
||||||
/// <param name="windows">Vensterrechthoeken van boven naar onder; gezet = venster aanklikken in plaats van slepen.</param>
|
/// <param name="windows">Vensterrechthoeken van boven naar onder; gezet = venster aanklikken in plaats van slepen.</param>
|
||||||
internal RegionCaptureWindow(Screen screen, BitmapSource frozen, IReadOnlyList<Rectangle>? windows = null)
|
/// <param name="showMagnifier">Vergrootglas bij de muisaanwijzer tonen; niet bij venster aanklikken.</param>
|
||||||
|
internal RegionCaptureWindow(Screen screen, BitmapSource frozen, IReadOnlyList<Rectangle>? windows = null, bool showMagnifier = false)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_screen = screen;
|
_screen = screen;
|
||||||
_frozen = frozen;
|
_frozen = frozen;
|
||||||
_windows = windows;
|
_windows = windows;
|
||||||
|
_showMagnifier = showMagnifier && windows == null;
|
||||||
Frozen.Source = frozen;
|
Frozen.Source = frozen;
|
||||||
|
MouseLeave += (_, _) => Magnifier.Hide();
|
||||||
if (windows != null)
|
if (windows != null)
|
||||||
{
|
{
|
||||||
Cursor = Cursors.Hand;
|
Cursor = Cursors.Hand;
|
||||||
@@ -78,12 +82,19 @@ public partial class RegionCaptureWindow : Window
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Point position = e.GetPosition(this);
|
||||||
|
if (_showMagnifier)
|
||||||
|
{
|
||||||
|
System.Drawing.Point physical = ToPhysical(position);
|
||||||
|
var relative = new System.Drawing.Point(physical.X - _screen.Bounds.X, physical.Y - _screen.Bounds.Y);
|
||||||
|
Magnifier.Show(_frozen, relative, physical, position, new Size(ActualWidth, ActualHeight));
|
||||||
|
}
|
||||||
|
|
||||||
if (_dragStart is not Point start || e.LeftButton != MouseButtonState.Pressed)
|
if (_dragStart is not Point start || e.LeftButton != MouseButtonState.Pressed)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Point position = e.GetPosition(this);
|
|
||||||
if (!_dragging && (position - start).Length >= DragThreshold)
|
if (!_dragging && (position - start).Length >= DragThreshold)
|
||||||
{
|
{
|
||||||
_dragging = true;
|
_dragging = true;
|
||||||
|
|||||||
@@ -188,6 +188,16 @@
|
|||||||
</DockPanel>
|
</DockPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
<!-- Onderste werkbalk in de gesplitste indeling; de code verplaatst de acties hierheen -->
|
||||||
|
<Border x:Name="ActionBar" DockPanel.Dock="Bottom" Background="{StaticResource ToolbarBrush}" BorderBrush="{StaticResource DividerBrush}"
|
||||||
|
BorderThickness="0,1,0,0" Padding="8,6" Visibility="Collapsed"
|
||||||
|
SizeChanged="Toolbar_SizeChanged" ContextMenuOpening="Toolbar_ContextMenuOpening">
|
||||||
|
<Border.ContextMenu>
|
||||||
|
<ContextMenu x:Name="ActionBarMenu" />
|
||||||
|
</Border.ContextMenu>
|
||||||
|
<local:ToolbarPanel x:Name="ActionItems" OrderChanged="ToolbarItems_OrderChanged" />
|
||||||
|
</Border>
|
||||||
|
|
||||||
<!-- Gereedschappen en acties; rechtsklik voor vergrendelen, positie en zichtbare knoppen -->
|
<!-- Gereedschappen en acties; rechtsklik voor vergrendelen, positie en zichtbare knoppen -->
|
||||||
<Border x:Name="Toolbar" DockPanel.Dock="Top" Background="{StaticResource ToolbarBrush}" BorderBrush="{StaticResource DividerBrush}"
|
<Border x:Name="Toolbar" DockPanel.Dock="Top" Background="{StaticResource ToolbarBrush}" BorderBrush="{StaticResource DividerBrush}"
|
||||||
BorderThickness="0,0,0,1" Padding="8,6" SizeChanged="Toolbar_SizeChanged" ContextMenuOpening="Toolbar_ContextMenuOpening">
|
BorderThickness="0,0,0,1" Padding="8,6" SizeChanged="Toolbar_SizeChanged" ContextMenuOpening="Toolbar_ContextMenuOpening">
|
||||||
|
|||||||
@@ -35,11 +35,28 @@ public partial class EditorWindow : Window
|
|||||||
private static readonly CursorKind[] CursorKindValues = { CursorKind.Arrow, CursorKind.Click, CursorKind.Hand };
|
private static readonly CursorKind[] CursorKindValues = { CursorKind.Arrow, CursorKind.Click, CursorKind.Hand };
|
||||||
private static readonly BlurMode[] BlurModeValues = { BlurMode.Pixelate, BlurMode.Blur };
|
private static readonly BlurMode[] BlurModeValues = { BlurMode.Pixelate, BlurMode.Blur };
|
||||||
|
|
||||||
|
/// <summary>Standaardvolgorde in de gesplitste indeling: eerst de bovenste werkbalk, dan de onderste.</summary>
|
||||||
|
private static readonly string[] DefaultSplitOrder =
|
||||||
|
{
|
||||||
|
"Select", "Sep1", "Rectangle", "Ellipse", "Line", "Arrow", "Text", "Step", "Cursor", "Emoji", "Highlight", "Blur",
|
||||||
|
"Sep2", "Crop", "Sep3", "Undo", "Redo", "Delete", "Sep4", "Clear",
|
||||||
|
"New", "Screencast", "Spacer", "ZoomOut", "Zoom", "ZoomIn", "Spacer2", "Settings", "Sep5", "Save", "Upload", "Copy"
|
||||||
|
};
|
||||||
|
|
||||||
|
/// <summary>Items die in de gesplitste indeling op de onderste werkbalk staan.</summary>
|
||||||
|
private static readonly HashSet<string> SplitBottomIds = new()
|
||||||
|
{
|
||||||
|
"New", "Screencast", "Spacer", "ZoomOut", "Zoom", "ZoomIn", "Spacer2", "Settings", "Sep5", "Save", "Upload", "Copy"
|
||||||
|
};
|
||||||
|
|
||||||
private readonly EditorDocument _doc;
|
private readonly EditorDocument _doc;
|
||||||
private readonly UndoStack _undo = new();
|
private readonly UndoStack _undo = new();
|
||||||
private readonly AppSettings _settings;
|
private readonly AppSettings _settings;
|
||||||
private readonly DispatcherTimer _hintResetTimer = new() { Interval = TimeSpan.FromSeconds(3) };
|
private readonly DispatcherTimer _hintResetTimer = new() { Interval = TimeSpan.FromSeconds(3) };
|
||||||
private readonly List<string> _defaultToolbarOrder = new();
|
private readonly List<string> _defaultToolbarOrder = new();
|
||||||
|
private readonly List<string> _defaultSplitOrder = new();
|
||||||
|
private readonly Dictionary<string, UIElement> _toolbarItems = new();
|
||||||
|
private EditorLayout _appliedLayout;
|
||||||
|
|
||||||
private ToolKind _tool;
|
private ToolKind _tool;
|
||||||
private Annotation? _selected;
|
private Annotation? _selected;
|
||||||
@@ -140,45 +157,71 @@ public partial class EditorWindow : Window
|
|||||||
|
|
||||||
private void InitializeToolbar()
|
private void InitializeToolbar()
|
||||||
{
|
{
|
||||||
_defaultToolbarOrder.AddRange(ToolbarItems.Items.Select(ItemId));
|
|
||||||
ApplyToolbarOrder(_settings.ToolbarOrder);
|
|
||||||
foreach (UIElement item in ToolbarItems.Items)
|
foreach (UIElement item in ToolbarItems.Items)
|
||||||
|
{
|
||||||
|
_toolbarItems[ItemId(item)] = item;
|
||||||
|
_defaultToolbarOrder.Add(ItemId(item));
|
||||||
|
}
|
||||||
|
|
||||||
|
_defaultSplitOrder.AddRange(DefaultSplitOrder.Where(_toolbarItems.ContainsKey));
|
||||||
|
_defaultSplitOrder.AddRange(_defaultToolbarOrder.Except(_defaultSplitOrder));
|
||||||
|
ApplyToolbarLayout();
|
||||||
|
foreach (UIElement item in _toolbarItems.Values)
|
||||||
{
|
{
|
||||||
item.Visibility = _settings.ToolbarHidden.Contains(ItemId(item)) ? Visibility.Collapsed : Visibility.Visible;
|
item.Visibility = _settings.ToolbarHidden.Contains(ItemId(item)) ? Visibility.Collapsed : Visibility.Visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplyUploadButton();
|
ApplyUploadButton();
|
||||||
ApplyToolbarPosition();
|
|
||||||
ApplyToolbarLock();
|
ApplyToolbarLock();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ItemId(UIElement item) => ToolbarPanel.GetItemId(item) ?? string.Empty;
|
private static string ItemId(UIElement item) => ToolbarPanel.GetItemId(item) ?? string.Empty;
|
||||||
|
|
||||||
private void ApplyToolbarOrder(IReadOnlyList<string> saved)
|
private bool IsSplitLayout => _settings.EditorLayout == EditorLayout.Split;
|
||||||
|
|
||||||
|
private IEnumerable<UIElement> AllToolbarItems => ToolbarItems.Items.Concat(ActionItems.Items);
|
||||||
|
|
||||||
|
/// <summary>Items volgens de opgeslagen volgorde van de huidige indeling over de bovenste en onderste werkbalk verdelen.</summary>
|
||||||
|
private void ApplyToolbarLayout()
|
||||||
{
|
{
|
||||||
Dictionary<string, UIElement> byId = ToolbarItems.Items.ToDictionary(ItemId);
|
bool split = IsSplitLayout;
|
||||||
List<string> order = saved.Where(byId.ContainsKey).Distinct().ToList();
|
_appliedLayout = _settings.EditorLayout;
|
||||||
|
List<string> order = split
|
||||||
|
? MergeToolbarOrder(_settings.SplitToolbarOrder, _defaultSplitOrder)
|
||||||
|
: MergeToolbarOrder(_settings.ToolbarOrder, _defaultToolbarOrder);
|
||||||
|
|
||||||
|
ToolbarItems.Children.Clear();
|
||||||
|
ActionItems.Children.Clear();
|
||||||
|
foreach (string id in order)
|
||||||
|
{
|
||||||
|
(split && SplitBottomIds.Contains(id) ? ActionItems : ToolbarItems).Children.Add(_toolbarItems[id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
ToolbarItems.HorizontalAlignment = split ? HorizontalAlignment.Center : HorizontalAlignment.Stretch;
|
||||||
|
ActionBar.Visibility = split && !_toolbarsHidden ? Visibility.Visible : Visibility.Collapsed;
|
||||||
|
ApplyToolbarPosition();
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<string> MergeToolbarOrder(IReadOnlyList<string> saved, IReadOnlyList<string> defaults)
|
||||||
|
{
|
||||||
|
List<string> order = saved.Where(_toolbarItems.ContainsKey).Distinct().ToList();
|
||||||
|
|
||||||
// Items die nog niet in de opgeslagen volgorde staan (zoals nieuwe knoppen) komen na hun standaardvoorganger.
|
// Items die nog niet in de opgeslagen volgorde staan (zoals nieuwe knoppen) komen na hun standaardvoorganger.
|
||||||
for (int i = 0; i < _defaultToolbarOrder.Count; i++)
|
for (int i = 0; i < defaults.Count; i++)
|
||||||
{
|
{
|
||||||
string id = _defaultToolbarOrder[i];
|
string id = defaults[i];
|
||||||
if (!order.Contains(id))
|
if (!order.Contains(id))
|
||||||
{
|
{
|
||||||
order.Insert(i == 0 ? 0 : order.IndexOf(_defaultToolbarOrder[i - 1]) + 1, id);
|
order.Insert(i == 0 ? 0 : order.IndexOf(defaults[i - 1]) + 1, id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolbarItems.Children.Clear();
|
return order;
|
||||||
foreach (string id in order)
|
|
||||||
{
|
|
||||||
ToolbarItems.Children.Add(byId[id]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ApplyToolbarPosition()
|
private void ApplyToolbarPosition()
|
||||||
{
|
{
|
||||||
Dock dock = _settings.ToolbarPosition;
|
Dock dock = IsSplitLayout ? Dock.Top : _settings.ToolbarPosition;
|
||||||
bool vertical = dock is Dock.Left or Dock.Right;
|
bool vertical = dock is Dock.Left or Dock.Right;
|
||||||
DockPanel.SetDock(Toolbar, dock);
|
DockPanel.SetDock(Toolbar, dock);
|
||||||
ToolbarItems.Orientation = vertical ? Orientation.Vertical : Orientation.Horizontal;
|
ToolbarItems.Orientation = vertical ? Orientation.Vertical : Orientation.Horizontal;
|
||||||
@@ -196,8 +239,11 @@ public partial class EditorWindow : Window
|
|||||||
private void ApplyToolbarLock()
|
private void ApplyToolbarLock()
|
||||||
{
|
{
|
||||||
bool locked = _settings.ToolbarLocked;
|
bool locked = _settings.ToolbarLocked;
|
||||||
|
Brush background = locked ? (Brush)FindResource("ToolbarBrush") : new SolidColorBrush(Color.FromRgb(0xEA, 0xF2, 0xFB));
|
||||||
ToolbarItems.IsLocked = locked;
|
ToolbarItems.IsLocked = locked;
|
||||||
Toolbar.Background = locked ? (Brush)FindResource("ToolbarBrush") : new SolidColorBrush(Color.FromRgb(0xEA, 0xF2, 0xFB));
|
ActionItems.IsLocked = locked;
|
||||||
|
Toolbar.Background = background;
|
||||||
|
ActionBar.Background = background;
|
||||||
UpdateHint();
|
UpdateHint();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -209,73 +255,136 @@ public partial class EditorWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Labels alleen tonen als alles op één regel past; staat de werkbalk opzij, dan altijd alleen iconen.
|
|
||||||
private void UpdateToolbarLayout()
|
private void UpdateToolbarLayout()
|
||||||
{
|
{
|
||||||
if (ToolbarItems.Orientation == Orientation.Vertical)
|
UpdateActionLabels(Toolbar, ToolbarItems);
|
||||||
|
UpdateActionLabels(ActionBar, ActionItems);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Labels alleen tonen als alles op één regel past; staat de werkbalk opzij, dan altijd alleen iconen.
|
||||||
|
private void UpdateActionLabels(Border bar, ToolbarPanel panel)
|
||||||
|
{
|
||||||
|
List<TextBlock> labels = new[] { NewLabel, ClearLabel, ScreencastLabel, SaveLabel, UploadLabel, CopyLabel }
|
||||||
|
.Where(label => PanelOf(label) == panel).ToList();
|
||||||
|
if (labels.Count == 0)
|
||||||
{
|
{
|
||||||
SetActionLabelsVisible(false);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
double available = Toolbar.ActualWidth - Toolbar.Padding.Left - Toolbar.Padding.Right
|
if (panel.Orientation == Orientation.Vertical)
|
||||||
- Toolbar.BorderThickness.Left - Toolbar.BorderThickness.Right;
|
{
|
||||||
SetActionLabelsVisible(true);
|
SetActionLabelsVisible(panel, labels, false);
|
||||||
ToolbarItems.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
|
return;
|
||||||
SetActionLabelsVisible(ToolbarItems.SingleLineLength <= available);
|
}
|
||||||
|
|
||||||
|
double available = bar.ActualWidth - bar.Padding.Left - bar.Padding.Right
|
||||||
|
- bar.BorderThickness.Left - bar.BorderThickness.Right;
|
||||||
|
SetActionLabelsVisible(panel, labels, true);
|
||||||
|
panel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
|
||||||
|
SetActionLabelsVisible(panel, labels, panel.SingleLineLength <= available);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetActionLabelsVisible(bool visible)
|
private static ToolbarPanel? PanelOf(DependencyObject element)
|
||||||
|
{
|
||||||
|
for (DependencyObject? d = element; d != null; d = VisualTreeHelper.GetParent(d))
|
||||||
|
{
|
||||||
|
if (d is ToolbarPanel panel)
|
||||||
|
{
|
||||||
|
return panel;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void SetActionLabelsVisible(ToolbarPanel panel, IEnumerable<TextBlock> labels, bool visible)
|
||||||
{
|
{
|
||||||
Visibility visibility = visible ? Visibility.Visible : Visibility.Collapsed;
|
Visibility visibility = visible ? Visibility.Visible : Visibility.Collapsed;
|
||||||
foreach (TextBlock label in new[] { NewLabel, ClearLabel, ScreencastLabel, SaveLabel, UploadLabel, CopyLabel })
|
foreach (TextBlock label in labels)
|
||||||
{
|
{
|
||||||
label.Visibility = visibility;
|
label.Visibility = visibility;
|
||||||
|
|
||||||
// Anders geeft een directe Measure() van het paneel nog de gecachete knopbreedtes terug.
|
// Anders geeft een directe Measure() van het paneel nog de gecachete knopbreedtes terug.
|
||||||
for (DependencyObject? d = label; d != null && d != ToolbarItems; d = VisualTreeHelper.GetParent(d))
|
for (DependencyObject? d = label; d != null && d != panel; d = VisualTreeHelper.GetParent(d))
|
||||||
{
|
{
|
||||||
(d as UIElement)?.InvalidateMeasure();
|
(d as UIElement)?.InvalidateMeasure();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolbarItems.InvalidateMeasure();
|
panel.InvalidateMeasure();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ToolbarItems_OrderChanged(object? sender, EventArgs e)
|
private void ToolbarItems_OrderChanged(object? sender, EventArgs e)
|
||||||
{
|
{
|
||||||
_settings.ToolbarOrder = ToolbarItems.Items.Select(ItemId).ToList();
|
if (IsSplitLayout)
|
||||||
|
{
|
||||||
|
_settings.SplitToolbarOrder = AllToolbarItems.Select(ItemId).ToList();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_settings.ToolbarOrder = ToolbarItems.Items.Select(ItemId).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
UpdateToolbarLayout();
|
UpdateToolbarLayout();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetEditorLayout(EditorLayout layout)
|
||||||
|
{
|
||||||
|
_settings.EditorLayout = layout;
|
||||||
|
ApplyToolbarLayout();
|
||||||
|
}
|
||||||
|
|
||||||
private void Toolbar_ContextMenuOpening(object sender, ContextMenuEventArgs e)
|
private void Toolbar_ContextMenuOpening(object sender, ContextMenuEventArgs e)
|
||||||
{
|
{
|
||||||
ToolbarMenu.Items.Clear();
|
var bar = (Border)sender;
|
||||||
|
ToolbarPanel panel = bar == ActionBar ? ActionItems : ToolbarItems;
|
||||||
|
ContextMenu menu = bar.ContextMenu;
|
||||||
|
menu.Items.Clear();
|
||||||
|
|
||||||
var lockItem = new MenuItem { Header = "Werkbalk vergrendelen", IsCheckable = true, IsChecked = _settings.ToolbarLocked };
|
var lockItem = new MenuItem { Header = "Werkbalk vergrendelen", IsCheckable = true, IsChecked = _settings.ToolbarLocked };
|
||||||
lockItem.Click += (_, _) => SetToolbarLocked(lockItem.IsChecked);
|
lockItem.Click += (_, _) => SetToolbarLocked(lockItem.IsChecked);
|
||||||
ToolbarMenu.Items.Add(lockItem);
|
menu.Items.Add(lockItem);
|
||||||
|
|
||||||
var position = new MenuItem { Header = "Positie" };
|
var layout = new MenuItem { Header = "Indeling" };
|
||||||
foreach ((Dock dock, string label) in new[] { (Dock.Top, "Boven"), (Dock.Bottom, "Onder"), (Dock.Left, "Links"), (Dock.Right, "Rechts") })
|
foreach ((EditorLayout value, string label) in new[]
|
||||||
|
{
|
||||||
|
(EditorLayout.Single, "Eén werkbalk"),
|
||||||
|
(EditorLayout.Split, "Gesplitst: gereedschappen boven, opslaan onder (zoals ShareX)")
|
||||||
|
})
|
||||||
{
|
{
|
||||||
var item = new MenuItem { Header = label, IsCheckable = true, IsChecked = _settings.ToolbarPosition == dock };
|
var item = new MenuItem { Header = label, IsCheckable = true, IsChecked = _settings.EditorLayout == value };
|
||||||
item.Click += (_, _) =>
|
item.Click += (_, _) => SetEditorLayout(value);
|
||||||
{
|
layout.Items.Add(item);
|
||||||
_settings.ToolbarPosition = dock;
|
|
||||||
ApplyToolbarPosition();
|
|
||||||
};
|
|
||||||
position.Items.Add(item);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolbarMenu.Items.Add(position);
|
menu.Items.Add(layout);
|
||||||
|
|
||||||
var swap = new MenuItem { Header = "Groepen omwisselen" };
|
if (!IsSplitLayout)
|
||||||
swap.Click += (_, _) => SwapToolbarGroups();
|
{
|
||||||
ToolbarMenu.Items.Add(swap);
|
var position = new MenuItem { Header = "Positie" };
|
||||||
|
foreach ((Dock dock, string label) in new[] { (Dock.Top, "Boven"), (Dock.Bottom, "Onder"), (Dock.Left, "Links"), (Dock.Right, "Rechts") })
|
||||||
|
{
|
||||||
|
var item = new MenuItem { Header = label, IsCheckable = true, IsChecked = _settings.ToolbarPosition == dock };
|
||||||
|
item.Click += (_, _) =>
|
||||||
|
{
|
||||||
|
_settings.ToolbarPosition = dock;
|
||||||
|
ApplyToolbarPosition();
|
||||||
|
};
|
||||||
|
position.Items.Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
menu.Items.Add(position);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (panel.Items.Any(i => i is ToolbarSpacer))
|
||||||
|
{
|
||||||
|
var swap = new MenuItem { Header = "Groepen omwisselen" };
|
||||||
|
swap.Click += (_, _) => SwapToolbarGroups(panel);
|
||||||
|
menu.Items.Add(swap);
|
||||||
|
}
|
||||||
|
|
||||||
var buttons = new MenuItem { Header = "Knoppen tonen" };
|
var buttons = new MenuItem { Header = "Knoppen tonen" };
|
||||||
foreach (UIElement element in ToolbarItems.Items)
|
foreach (UIElement element in AllToolbarItems)
|
||||||
{
|
{
|
||||||
if (ToolbarPanel.GetTitle(element) is not { } title || (element == UploadButton && !CanUpload))
|
if (ToolbarPanel.GetTitle(element) is not { } title || (element == UploadButton && !CanUpload))
|
||||||
{
|
{
|
||||||
@@ -287,12 +396,12 @@ public partial class EditorWindow : Window
|
|||||||
buttons.Items.Add(item);
|
buttons.Items.Add(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolbarMenu.Items.Add(buttons);
|
menu.Items.Add(buttons);
|
||||||
ToolbarMenu.Items.Add(new Separator());
|
menu.Items.Add(new Separator());
|
||||||
|
|
||||||
var reset = new MenuItem { Header = "Standaard herstellen" };
|
var reset = new MenuItem { Header = "Standaard herstellen" };
|
||||||
reset.Click += (_, _) => ResetToolbar();
|
reset.Click += (_, _) => ResetToolbar();
|
||||||
ToolbarMenu.Items.Add(reset);
|
menu.Items.Add(reset);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetToolbarLocked(bool locked)
|
private void SetToolbarLocked(bool locked)
|
||||||
@@ -315,49 +424,50 @@ public partial class EditorWindow : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>De groepen tussen de flexibele ruimtes in omgekeerde volgorde zetten; een middengroep blijft in het midden.</summary>
|
/// <summary>De groepen tussen de flexibele ruimtes in omgekeerde volgorde zetten; een middengroep blijft in het midden.</summary>
|
||||||
private void SwapToolbarGroups()
|
private void SwapToolbarGroups(ToolbarPanel panel)
|
||||||
{
|
{
|
||||||
var groups = new List<List<string>> { new() };
|
var groups = new List<List<UIElement>> { new() };
|
||||||
var spacers = new List<string>();
|
var spacers = new List<UIElement>();
|
||||||
foreach (UIElement item in ToolbarItems.Items)
|
foreach (UIElement item in panel.Items)
|
||||||
{
|
{
|
||||||
if (item is ToolbarSpacer)
|
if (item is ToolbarSpacer)
|
||||||
{
|
{
|
||||||
spacers.Add(ItemId(item));
|
spacers.Add(item);
|
||||||
groups.Add(new List<string>());
|
groups.Add(new List<UIElement>());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
groups[^1].Add(ItemId(item));
|
groups[^1].Add(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
groups.Reverse();
|
groups.Reverse();
|
||||||
var order = new List<string>(groups[0]);
|
var order = new List<UIElement>(groups[0]);
|
||||||
for (int i = 0; i < spacers.Count; i++)
|
for (int i = 0; i < spacers.Count; i++)
|
||||||
{
|
{
|
||||||
order.Add(spacers[i]);
|
order.Add(spacers[i]);
|
||||||
order.AddRange(groups[i + 1]);
|
order.AddRange(groups[i + 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplyToolbarOrder(order);
|
panel.Children.Clear();
|
||||||
|
order.ForEach(item => panel.Children.Add(item));
|
||||||
ToolbarItems_OrderChanged(this, EventArgs.Empty);
|
ToolbarItems_OrderChanged(this, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ResetToolbar()
|
private void ResetToolbar()
|
||||||
{
|
{
|
||||||
_settings.ToolbarOrder = new List<string>();
|
_settings.ToolbarOrder = new List<string>();
|
||||||
|
_settings.SplitToolbarOrder = new List<string>();
|
||||||
_settings.ToolbarHidden = new List<string>();
|
_settings.ToolbarHidden = new List<string>();
|
||||||
_settings.ToolbarPosition = Dock.Top;
|
_settings.ToolbarPosition = Dock.Top;
|
||||||
_settings.ToolbarLocked = true;
|
_settings.ToolbarLocked = true;
|
||||||
ApplyToolbarOrder(_defaultToolbarOrder);
|
ApplyToolbarLayout();
|
||||||
foreach (UIElement item in ToolbarItems.Items)
|
foreach (UIElement item in _toolbarItems.Values)
|
||||||
{
|
{
|
||||||
item.Visibility = Visibility.Visible;
|
item.Visibility = Visibility.Visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplyUploadButton();
|
ApplyUploadButton();
|
||||||
ApplyToolbarPosition();
|
|
||||||
ApplyToolbarLock();
|
ApplyToolbarLock();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -365,7 +475,7 @@ public partial class EditorWindow : Window
|
|||||||
|
|
||||||
private void SelectTool(ToolKind tool)
|
private void SelectTool(ToolKind tool)
|
||||||
{
|
{
|
||||||
foreach (RadioButton button in ToolbarItems.Items.OfType<RadioButton>())
|
foreach (RadioButton button in _toolbarItems.Values.OfType<RadioButton>())
|
||||||
{
|
{
|
||||||
if ((string)button.Tag == tool.ToString())
|
if ((string)button.Tag == tool.ToString())
|
||||||
{
|
{
|
||||||
@@ -934,6 +1044,7 @@ public partial class EditorWindow : Window
|
|||||||
Visibility visibility = _toolbarsHidden ? Visibility.Collapsed : Visibility.Visible;
|
Visibility visibility = _toolbarsHidden ? Visibility.Collapsed : Visibility.Visible;
|
||||||
Toolbar.Visibility = visibility;
|
Toolbar.Visibility = visibility;
|
||||||
PropsBar.Visibility = visibility;
|
PropsBar.Visibility = visibility;
|
||||||
|
ActionBar.Visibility = IsSplitLayout ? visibility : Visibility.Collapsed;
|
||||||
if (_toolbarsHidden)
|
if (_toolbarsHidden)
|
||||||
{
|
{
|
||||||
ShowTemporaryHint("Werkbalken verborgen. Ctrl+H of rechtsklik op het canvas om ze terug te halen.");
|
ShowTemporaryHint("Werkbalken verborgen. Ctrl+H of rechtsklik op het canvas om ze terug te halen.");
|
||||||
@@ -1508,6 +1619,11 @@ public partial class EditorWindow : Window
|
|||||||
protected override void OnActivated(EventArgs e)
|
protected override void OnActivated(EventArgs e)
|
||||||
{
|
{
|
||||||
base.OnActivated(e);
|
base.OnActivated(e);
|
||||||
|
if (_appliedLayout != _settings.EditorLayout)
|
||||||
|
{
|
||||||
|
ApplyToolbarLayout();
|
||||||
|
}
|
||||||
|
|
||||||
ApplySaveButton();
|
ApplySaveButton();
|
||||||
ApplyUploadButton();
|
ApplyUploadButton();
|
||||||
}
|
}
|
||||||
@@ -1541,6 +1657,7 @@ public partial class EditorWindow : Window
|
|||||||
{
|
{
|
||||||
using System.IO.MemoryStream png = ImageExporter.EncodePng(image);
|
using System.IO.MemoryStream png = ImageExporter.EncodePng(image);
|
||||||
string url = await ZiplineUploader.UploadAsync(config, png, $"Knipsel {DateTime.Now:yyyy-MM-dd HHmmss}.png", "image/png");
|
string url = await ZiplineUploader.UploadAsync(config, png, $"Knipsel {DateTime.Now:yyyy-MM-dd HHmmss}.png", "image/png");
|
||||||
|
Kniip.History.HistoryStore.Add(Kniip.History.HistoryKind.Snip, null, url, image);
|
||||||
_dirty = false;
|
_dirty = false;
|
||||||
_exported = true;
|
_exported = true;
|
||||||
ShowTemporaryHint(ClipboardWriter.SetText(url)
|
ShowTemporaryHint(ClipboardWriter.SetText(url)
|
||||||
@@ -1637,6 +1754,7 @@ public partial class EditorWindow : Window
|
|||||||
App.Instance.Capture.IgnorePath(path);
|
App.Instance.Capture.IgnorePath(path);
|
||||||
BitmapSource image = DocumentRenderer.Export(_doc);
|
BitmapSource image = DocumentRenderer.Export(_doc);
|
||||||
ImageExporter.Save(image, path);
|
ImageExporter.Save(image, path);
|
||||||
|
Kniip.History.HistoryStore.Add(Kniip.History.HistoryKind.Snip, path, null, image);
|
||||||
_dirty = false;
|
_dirty = false;
|
||||||
_exported = true;
|
_exported = true;
|
||||||
string name = System.IO.Path.GetFileName(path);
|
string name = System.IO.Path.GetFileName(path);
|
||||||
|
|||||||
@@ -0,0 +1,102 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
|
using System.Windows;
|
||||||
|
using Kniip.Editor;
|
||||||
|
using Kniip.Infrastructure;
|
||||||
|
|
||||||
|
namespace Kniip.History;
|
||||||
|
|
||||||
|
/// <param name="Glyph">Teken uit Segoe Fluent Icons.</param>
|
||||||
|
public sealed record HistoryCommand(string Label, string Glyph, bool Enabled, Action Run);
|
||||||
|
|
||||||
|
/// <summary>Wat je met een item uit de geschiedenis kunt doen, gedeeld door het systeemvakmenu en het geschiedenisvenster.</summary>
|
||||||
|
public static class HistoryActions
|
||||||
|
{
|
||||||
|
/// <summary>De acties voor een item; null staat voor een scheidingslijn.</summary>
|
||||||
|
public static IReadOnlyList<HistoryCommand?> CommandsFor(HistoryEntry entry)
|
||||||
|
{
|
||||||
|
bool file = entry.FileExists;
|
||||||
|
bool url = entry.Url is { Length: > 0 };
|
||||||
|
bool image = file && entry.Kind == HistoryKind.Snip;
|
||||||
|
return new HistoryCommand?[]
|
||||||
|
{
|
||||||
|
new("Openen", "\uE8E5", file || url, () => Open(entry)),
|
||||||
|
new("Openen in de editor", "\uE70F", image, () => App.Instance.OpenFile(entry.FilePath!)),
|
||||||
|
new("Link openen", "\uE774", url, () => Launch(entry.Url!)),
|
||||||
|
null,
|
||||||
|
new("Link kopiëren", "\uE71B", url, () => Copy(entry.Url!)),
|
||||||
|
new("Afbeelding kopiëren", "\uE8C8", image, () => CopyImage(entry.FilePath!)),
|
||||||
|
new("Pad kopiëren", "\uE8C8", file, () => Copy(entry.FilePath!)),
|
||||||
|
new("Tonen in map", "\uE838", file, () => ShowInFolder(entry.FilePath!))
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Bestand in het standaardprogramma, anders de link in de browser.</summary>
|
||||||
|
public static void Open(HistoryEntry entry)
|
||||||
|
{
|
||||||
|
if (entry.FileExists)
|
||||||
|
{
|
||||||
|
Launch(entry.FilePath!);
|
||||||
|
}
|
||||||
|
else if (entry.Url is { Length: > 0 } url)
|
||||||
|
{
|
||||||
|
Launch(url);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MessageBox.Show($"Het bestand bestaat niet meer:\n{entry.FilePath}", "kniip", MessageBoxButton.OK, MessageBoxImage.Information);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void OpenFolder(string folder)
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(folder);
|
||||||
|
Launch(folder);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ShowInFolder(string path) =>
|
||||||
|
Run(() => Process.Start("explorer.exe", $"/select,\"{path}\""));
|
||||||
|
|
||||||
|
private static void Launch(string target) =>
|
||||||
|
Run(() => Process.Start(new ProcessStartInfo(target) { UseShellExecute = true }));
|
||||||
|
|
||||||
|
private static void Copy(string text)
|
||||||
|
{
|
||||||
|
if (!ClipboardWriter.SetText(text))
|
||||||
|
{
|
||||||
|
ClipboardBusy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void CopyImage(string path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!ClipboardWriter.SetImage(PixelUtil.LoadFile(path), path))
|
||||||
|
{
|
||||||
|
ClipboardBusy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show($"Kan '{Path.GetFileName(path)}' niet kopiëren.\n\n{ex.Message}", "kniip", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ClipboardBusy() =>
|
||||||
|
MessageBox.Show("Kopiëren is mislukt: het klembord is bezet. Probeer het opnieuw.", "kniip", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||||
|
|
||||||
|
private static void Run(Action action)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
action();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show($"Openen is mislukt.\n\n{ex.Message}", "kniip", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Kniip.History;
|
||||||
|
|
||||||
|
public enum HistoryKind
|
||||||
|
{
|
||||||
|
Snip,
|
||||||
|
Mp4,
|
||||||
|
Gif
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed class HistoryEntry
|
||||||
|
{
|
||||||
|
public string Id { get; set; } = Guid.NewGuid().ToString("N");
|
||||||
|
public DateTime Time { get; set; } = DateTime.Now;
|
||||||
|
public HistoryKind Kind { get; set; }
|
||||||
|
|
||||||
|
/// <summary>Opgeslagen bestand; leeg als het alleen is geüpload.</summary>
|
||||||
|
public string? FilePath { get; set; }
|
||||||
|
|
||||||
|
/// <summary>Link na het uploaden; leeg als het alleen is opgeslagen.</summary>
|
||||||
|
public string? Url { get; set; }
|
||||||
|
|
||||||
|
/// <summary>Bestandsnaam van de miniatuur in <see cref="HistoryStore.ThumbnailFolder"/>.</summary>
|
||||||
|
public string? Thumbnail { get; set; }
|
||||||
|
|
||||||
|
public int Width { get; set; }
|
||||||
|
public int Height { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
public string Name => FilePath is { Length: > 0 }
|
||||||
|
? Path.GetFileName(FilePath)
|
||||||
|
: Url is { Length: > 0 } ? Url[(Url.TrimEnd('/').LastIndexOf('/') + 1)..] : "";
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
public string KindText => Kind switch
|
||||||
|
{
|
||||||
|
HistoryKind.Mp4 => "Screencast (MP4)",
|
||||||
|
HistoryKind.Gif => "Screencast (GIF)",
|
||||||
|
_ => "Knipsel"
|
||||||
|
};
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
public bool FileExists => FilePath is { Length: > 0 } && File.Exists(FilePath);
|
||||||
|
}
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using Kniip.Infrastructure;
|
||||||
|
using Kniip.Settings;
|
||||||
|
|
||||||
|
namespace Kniip.History;
|
||||||
|
|
||||||
|
/// <summary>Wat er in kniip is opgeslagen of geüpload, nieuwste eerst.</summary>
|
||||||
|
public static class HistoryStore
|
||||||
|
{
|
||||||
|
private const int MaxEntries = 500;
|
||||||
|
private const int ThumbnailSize = 240;
|
||||||
|
|
||||||
|
private static readonly JsonSerializerOptions Options = new()
|
||||||
|
{
|
||||||
|
Converters = { new JsonStringEnumConverter() }
|
||||||
|
};
|
||||||
|
|
||||||
|
private static List<HistoryEntry>? _entries;
|
||||||
|
|
||||||
|
private static string FilePath => Path.Combine(SettingsStore.Folder, "history.json");
|
||||||
|
|
||||||
|
public static string ThumbnailFolder => Path.Combine(SettingsStore.Folder, "history");
|
||||||
|
|
||||||
|
public static event Action? Changed;
|
||||||
|
|
||||||
|
public static IReadOnlyList<HistoryEntry> Entries => Load();
|
||||||
|
|
||||||
|
public static void Add(HistoryKind kind, string? filePath, string? url, BitmapSource? preview)
|
||||||
|
{
|
||||||
|
var entry = new HistoryEntry { Kind = kind, FilePath = filePath, Url = url };
|
||||||
|
if (preview != null)
|
||||||
|
{
|
||||||
|
entry.Width = preview.PixelWidth;
|
||||||
|
entry.Height = preview.PixelHeight;
|
||||||
|
entry.Thumbnail = SaveThumbnail(entry.Id, preview);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<HistoryEntry> entries = Load();
|
||||||
|
entries.Insert(0, entry);
|
||||||
|
while (entries.Count > MaxEntries)
|
||||||
|
{
|
||||||
|
DeleteThumbnail(entries[^1]);
|
||||||
|
entries.RemoveAt(entries.Count - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
Save();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void Remove(HistoryEntry entry)
|
||||||
|
{
|
||||||
|
if (Load().Remove(entry))
|
||||||
|
{
|
||||||
|
DeleteThumbnail(entry);
|
||||||
|
Save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void Clear()
|
||||||
|
{
|
||||||
|
foreach (HistoryEntry entry in Load())
|
||||||
|
{
|
||||||
|
DeleteThumbnail(entry);
|
||||||
|
}
|
||||||
|
|
||||||
|
Load().Clear();
|
||||||
|
Save();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string? ThumbnailPath(HistoryEntry entry) =>
|
||||||
|
entry.Thumbnail is { Length: > 0 } name ? Path.Combine(ThumbnailFolder, name) : null;
|
||||||
|
|
||||||
|
/// <summary>Eerste beeld van een afbeelding of GIF, of null als dat niet lukt.</summary>
|
||||||
|
public static BitmapSource? PreviewOf(string file)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return PixelUtil.LoadFile(file);
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<HistoryEntry> Load()
|
||||||
|
{
|
||||||
|
if (_entries != null)
|
||||||
|
{
|
||||||
|
return _entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (File.Exists(FilePath))
|
||||||
|
{
|
||||||
|
_entries = JsonSerializer.Deserialize<List<HistoryEntry>>(File.ReadAllText(FilePath), Options);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
// Beschadigd bestand: met een lege geschiedenis verder.
|
||||||
|
}
|
||||||
|
|
||||||
|
_entries ??= new List<HistoryEntry>();
|
||||||
|
_entries.RemoveAll(entry => entry == null!);
|
||||||
|
return _entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void Save()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(SettingsStore.Folder);
|
||||||
|
File.WriteAllText(FilePath, JsonSerializer.Serialize(Load(), Options));
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
// De geschiedenis bijwerken mag opslaan of uploaden nooit laten mislukken.
|
||||||
|
}
|
||||||
|
|
||||||
|
Changed?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? SaveThumbnail(string id, BitmapSource image)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
double scale = Math.Min(1.0, (double)ThumbnailSize / Math.Max(image.PixelWidth, image.PixelHeight));
|
||||||
|
BitmapSource thumb = scale < 1 ? new TransformedBitmap(image, new ScaleTransform(scale, scale)) : image;
|
||||||
|
var encoder = new PngBitmapEncoder();
|
||||||
|
encoder.Frames.Add(BitmapFrame.Create(thumb));
|
||||||
|
Directory.CreateDirectory(ThumbnailFolder);
|
||||||
|
string name = id + ".png";
|
||||||
|
using var stream = new FileStream(Path.Combine(ThumbnailFolder, name), FileMode.Create, FileAccess.Write);
|
||||||
|
encoder.Save(stream);
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void DeleteThumbnail(HistoryEntry entry)
|
||||||
|
{
|
||||||
|
if (ThumbnailPath(entry) is not { } path)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
File.Delete(path);
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
// Blijft staan; een losse miniatuur kan geen kwaad.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IEnumerable<HistoryEntry> Recent(int count) => Load().Take(count);
|
||||||
|
}
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
<Window x:Class="Kniip.History.HistoryWindow"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
Title="kniip geschiedenis" Width="980" Height="620" MinWidth="560" MinHeight="360"
|
||||||
|
WindowStartupLocation="CenterScreen" Background="{StaticResource WindowBrush}"
|
||||||
|
FontFamily="Segoe UI" FontSize="13" Icon="pack://application:,,,/AppIcon.ico">
|
||||||
|
<Window.Resources>
|
||||||
|
<Style x:Key="ViewToggle" TargetType="RadioButton" BasedOn="{StaticResource ToolToggle}">
|
||||||
|
<Setter Property="Padding" Value="10,4" />
|
||||||
|
</Style>
|
||||||
|
<Style x:Key="RowStyle" TargetType="ListViewItem">
|
||||||
|
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
|
||||||
|
<EventSetter Event="MouseDoubleClick" Handler="Item_DoubleClick" />
|
||||||
|
<Style.Triggers>
|
||||||
|
<DataTrigger Binding="{Binding IsAvailable}" Value="False">
|
||||||
|
<Setter Property="Opacity" Value="0.5" />
|
||||||
|
</DataTrigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
<Style x:Key="TileStyle" TargetType="ListBoxItem">
|
||||||
|
<Setter Property="Padding" Value="0" />
|
||||||
|
<Setter Property="Margin" Value="4" />
|
||||||
|
<EventSetter Event="MouseDoubleClick" Handler="Item_DoubleClick" />
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="ListBoxItem">
|
||||||
|
<Border x:Name="Bd" Background="White" BorderBrush="#E0E0E0" BorderThickness="1" CornerRadius="6" Padding="6">
|
||||||
|
<ContentPresenter />
|
||||||
|
</Border>
|
||||||
|
<ControlTemplate.Triggers>
|
||||||
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
|
<Setter TargetName="Bd" Property="Background" Value="#F5F5F5" />
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="IsSelected" Value="True">
|
||||||
|
<Setter TargetName="Bd" Property="Background" Value="#1A0067C0" />
|
||||||
|
<Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource AccentBrush}" />
|
||||||
|
</Trigger>
|
||||||
|
<DataTrigger Binding="{Binding IsAvailable}" Value="False">
|
||||||
|
<Setter Property="Opacity" Value="0.5" />
|
||||||
|
</DataTrigger>
|
||||||
|
</ControlTemplate.Triggers>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
<DataTemplate x:Key="SmallThumb">
|
||||||
|
<Grid Width="40" Height="28">
|
||||||
|
<Image Source="{Binding Thumbnail}" Stretch="Uniform" RenderOptions.BitmapScalingMode="HighQuality" />
|
||||||
|
<TextBlock Text="" Style="{StaticResource IconText}" Foreground="{StaticResource SubtleTextBrush}"
|
||||||
|
Visibility="{Binding NoThumbnailVisibility}" />
|
||||||
|
</Grid>
|
||||||
|
</DataTemplate>
|
||||||
|
</Window.Resources>
|
||||||
|
|
||||||
|
<DockPanel Margin="12">
|
||||||
|
<DockPanel DockPanel.Dock="Top" Margin="0,0,0,10" LastChildFill="False">
|
||||||
|
<RadioButton x:Name="ListToggle" Style="{StaticResource ViewToggle}" GroupName="View" Checked="View_Checked">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<TextBlock Text="" Style="{StaticResource IconText}" Margin="0,0,6,0" />
|
||||||
|
<TextBlock Text="Lijst" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</RadioButton>
|
||||||
|
<RadioButton x:Name="GridToggle" Style="{StaticResource ViewToggle}" GroupName="View" Checked="View_Checked">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<TextBlock Text="" Style="{StaticResource IconText}" Margin="0,0,6,0" />
|
||||||
|
<TextBlock Text="Miniaturen" VerticalAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</RadioButton>
|
||||||
|
<Grid DockPanel.Dock="Right" Width="260" VerticalAlignment="Center">
|
||||||
|
<TextBox x:Name="SearchBox" Height="30" Padding="26,0,6,0" VerticalContentAlignment="Center"
|
||||||
|
TextChanged="SearchBox_TextChanged" />
|
||||||
|
<TextBlock Text="" Style="{StaticResource IconText}" FontSize="13" HorizontalAlignment="Left" Margin="8,0,0,0"
|
||||||
|
Foreground="{StaticResource SubtleTextBrush}" IsHitTestVisible="False" />
|
||||||
|
<TextBlock x:Name="SearchHint" Text="Zoeken op naam of link" Margin="27,0,0,0" VerticalAlignment="Center"
|
||||||
|
Foreground="{StaticResource SubtleTextBrush}" IsHitTestVisible="False" />
|
||||||
|
</Grid>
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<DockPanel DockPanel.Dock="Bottom" Margin="0,10,0,0" LastChildFill="False">
|
||||||
|
<TextBlock x:Name="CountText" VerticalAlignment="Center" Foreground="{StaticResource SubtleTextBrush}" />
|
||||||
|
<Button DockPanel.Dock="Right" Content="Sluiten" Style="{StaticResource SecondaryButton}" IsCancel="True" Click="Close_Click" />
|
||||||
|
<Button x:Name="ClearButton" DockPanel.Dock="Right" Content="Geschiedenis wissen..." Style="{StaticResource SecondaryButton}"
|
||||||
|
Click="Clear_Click" />
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<Grid>
|
||||||
|
<ListView x:Name="ListItems" ItemContainerStyle="{StaticResource RowStyle}" SelectionMode="Single"
|
||||||
|
BorderBrush="#E0E0E0" ContextMenuOpening="Items_ContextMenuOpening">
|
||||||
|
<ListView.ContextMenu>
|
||||||
|
<ContextMenu />
|
||||||
|
</ListView.ContextMenu>
|
||||||
|
<ListView.View>
|
||||||
|
<GridView>
|
||||||
|
<GridViewColumn Width="56" CellTemplate="{StaticResource SmallThumb}" />
|
||||||
|
<GridViewColumn Header="Datum" Width="140" DisplayMemberBinding="{Binding TimeText}" />
|
||||||
|
<GridViewColumn Header="Soort" Width="120" DisplayMemberBinding="{Binding Entry.KindText}" />
|
||||||
|
<GridViewColumn Header="Naam" Width="200" DisplayMemberBinding="{Binding Entry.Name}" />
|
||||||
|
<GridViewColumn Header="Map" Width="200" DisplayMemberBinding="{Binding Folder}" />
|
||||||
|
<GridViewColumn Header="Link" Width="220" DisplayMemberBinding="{Binding Entry.Url}" />
|
||||||
|
</GridView>
|
||||||
|
</ListView.View>
|
||||||
|
</ListView>
|
||||||
|
|
||||||
|
<ListBox x:Name="GridItems" ItemContainerStyle="{StaticResource TileStyle}" SelectionMode="Single" Visibility="Collapsed"
|
||||||
|
Background="Transparent" BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||||
|
ContextMenuOpening="Items_ContextMenuOpening">
|
||||||
|
<ListBox.ContextMenu>
|
||||||
|
<ContextMenu />
|
||||||
|
</ListBox.ContextMenu>
|
||||||
|
<ListBox.ItemsPanel>
|
||||||
|
<ItemsPanelTemplate>
|
||||||
|
<WrapPanel />
|
||||||
|
</ItemsPanelTemplate>
|
||||||
|
</ListBox.ItemsPanel>
|
||||||
|
<ListBox.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<StackPanel Width="180" ToolTip="{Binding ToolTip}">
|
||||||
|
<Grid Height="120" Background="#F3F3F3">
|
||||||
|
<Image Source="{Binding Thumbnail}" Stretch="Uniform" RenderOptions.BitmapScalingMode="HighQuality" />
|
||||||
|
<TextBlock Text="" Style="{StaticResource IconText}" FontSize="32"
|
||||||
|
Foreground="{StaticResource SubtleTextBrush}" Visibility="{Binding NoThumbnailVisibility}" />
|
||||||
|
</Grid>
|
||||||
|
<TextBlock Text="{Binding Entry.Name}" Margin="0,6,0,0" TextTrimming="CharacterEllipsis" />
|
||||||
|
<TextBlock Text="{Binding TimeText}" FontSize="12" Foreground="{StaticResource SubtleTextBrush}" />
|
||||||
|
</StackPanel>
|
||||||
|
</DataTemplate>
|
||||||
|
</ListBox.ItemTemplate>
|
||||||
|
</ListBox>
|
||||||
|
|
||||||
|
<TextBlock x:Name="EmptyText" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center"
|
||||||
|
Foreground="{StaticResource SubtleTextBrush}" Visibility="Collapsed"
|
||||||
|
Text="Nog niets in de geschiedenis.
Wat je in kniip opslaat of uploadt, komt hier te staan." />
|
||||||
|
</Grid>
|
||||||
|
</DockPanel>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Controls.Primitives;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
|
||||||
|
namespace Kniip.History;
|
||||||
|
|
||||||
|
public partial class HistoryWindow : Window
|
||||||
|
{
|
||||||
|
private List<HistoryRow> _rows = new();
|
||||||
|
|
||||||
|
public HistoryWindow(bool images)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
Reload();
|
||||||
|
ShowImages(images);
|
||||||
|
HistoryStore.Changed += Reload;
|
||||||
|
Closed += (_, _) => HistoryStore.Changed -= Reload;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ShowImages(bool images)
|
||||||
|
{
|
||||||
|
(images ? GridToggle : ListToggle).IsChecked = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Reload()
|
||||||
|
{
|
||||||
|
_rows = HistoryStore.Entries.Select(entry => new HistoryRow(entry)).ToList();
|
||||||
|
ListItems.ItemsSource = _rows;
|
||||||
|
GridItems.ItemsSource = _rows;
|
||||||
|
ApplyFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ApplyFilter()
|
||||||
|
{
|
||||||
|
string query = SearchBox.Text.Trim();
|
||||||
|
ICollectionView view = System.Windows.Data.CollectionViewSource.GetDefaultView(_rows);
|
||||||
|
view.Filter = query.Length == 0 ? null : item => ((HistoryRow)item).Matches(query);
|
||||||
|
int shown = view.Cast<object>().Count();
|
||||||
|
CountText.Text = query.Length == 0 ? $"{_rows.Count} items" : $"{shown} van {_rows.Count} items";
|
||||||
|
EmptyText.Visibility = _rows.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
|
||||||
|
ClearButton.IsEnabled = _rows.Count > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void View_Checked(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
bool images = GridToggle.IsChecked == true;
|
||||||
|
GridItems.Visibility = images ? Visibility.Visible : Visibility.Collapsed;
|
||||||
|
ListItems.Visibility = images ? Visibility.Collapsed : Visibility.Visible;
|
||||||
|
Title = images ? "kniip afbeeldingsgeschiedenis" : "kniip geschiedenis";
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
|
||||||
|
{
|
||||||
|
SearchHint.Visibility = SearchBox.Text.Length == 0 ? Visibility.Visible : Visibility.Collapsed;
|
||||||
|
ApplyFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Item_DoubleClick(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
if (sender is FrameworkElement { DataContext: HistoryRow row })
|
||||||
|
{
|
||||||
|
HistoryActions.Open(row.Entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Items_ContextMenuOpening(object sender, ContextMenuEventArgs e)
|
||||||
|
{
|
||||||
|
var list = (Selector)sender;
|
||||||
|
if (e.OriginalSource is DependencyObject source
|
||||||
|
&& ItemsControl.ContainerFromElement(list, source) is FrameworkElement { DataContext: HistoryRow clicked })
|
||||||
|
{
|
||||||
|
list.SelectedItem = clicked;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (list.SelectedItem is not HistoryRow row || list.ContextMenu is not { } menu)
|
||||||
|
{
|
||||||
|
e.Handled = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
menu.Items.Clear();
|
||||||
|
foreach (HistoryCommand? command in HistoryActions.CommandsFor(row.Entry))
|
||||||
|
{
|
||||||
|
menu.Items.Add(command == null ? new Separator() : MenuItemFor(command.Label, command.Glyph, command.Enabled, command.Run));
|
||||||
|
}
|
||||||
|
|
||||||
|
menu.Items.Add(new Separator());
|
||||||
|
menu.Items.Add(MenuItemFor("Uit geschiedenis verwijderen", "\uE74D", true, () => HistoryStore.Remove(row.Entry)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static MenuItem MenuItemFor(string label, string glyph, bool enabled, Action run)
|
||||||
|
{
|
||||||
|
var item = new MenuItem
|
||||||
|
{
|
||||||
|
Header = label,
|
||||||
|
IsEnabled = enabled,
|
||||||
|
Icon = new TextBlock { Text = glyph, Style = (Style)Application.Current.FindResource("IconText"), FontSize = 14 }
|
||||||
|
};
|
||||||
|
item.Click += (_, _) => run();
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Clear_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (MessageBox.Show(this, "De hele geschiedenis wissen? Je opgeslagen bestanden en uploads blijven gewoon bestaan.", "kniip",
|
||||||
|
MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
|
||||||
|
{
|
||||||
|
HistoryStore.Clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Close_Click(object sender, RoutedEventArgs e) => Close();
|
||||||
|
|
||||||
|
private sealed class HistoryRow
|
||||||
|
{
|
||||||
|
public HistoryRow(HistoryEntry entry)
|
||||||
|
{
|
||||||
|
Entry = entry;
|
||||||
|
IsAvailable = entry.FileExists || entry.Url is { Length: > 0 };
|
||||||
|
Thumbnail = LoadThumbnail(entry);
|
||||||
|
}
|
||||||
|
|
||||||
|
public HistoryEntry Entry { get; }
|
||||||
|
public bool IsAvailable { get; }
|
||||||
|
public ImageSource? Thumbnail { get; }
|
||||||
|
public Visibility NoThumbnailVisibility => Thumbnail == null ? Visibility.Visible : Visibility.Collapsed;
|
||||||
|
public string TimeText => Entry.Time.ToString("dd-MM-yyyy HH:mm:ss");
|
||||||
|
public string? Folder => Entry.FilePath is { Length: > 0 } path ? Path.GetDirectoryName(path) : null;
|
||||||
|
|
||||||
|
public string ToolTip => string.Join("\n", new[]
|
||||||
|
{
|
||||||
|
Entry.KindText + (Entry.Width > 0 ? $", {Entry.Width} x {Entry.Height}" : ""),
|
||||||
|
Entry.FilePath,
|
||||||
|
Entry.Url
|
||||||
|
}.Where(line => !string.IsNullOrEmpty(line)));
|
||||||
|
|
||||||
|
public bool Matches(string query) =>
|
||||||
|
Entry.Name.Contains(query, StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| (Entry.FilePath?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false)
|
||||||
|
|| (Entry.Url?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false);
|
||||||
|
|
||||||
|
private static ImageSource? LoadThumbnail(HistoryEntry entry)
|
||||||
|
{
|
||||||
|
if (HistoryStore.ThumbnailPath(entry) is not { } path || !File.Exists(path))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var image = new BitmapImage();
|
||||||
|
image.BeginInit();
|
||||||
|
image.CacheOption = BitmapCacheOption.OnLoad;
|
||||||
|
image.StreamSource = new MemoryStream(File.ReadAllBytes(path));
|
||||||
|
image.EndInit();
|
||||||
|
image.Freeze();
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
using Kniip.History;
|
||||||
|
|
||||||
namespace Kniip.Infrastructure;
|
namespace Kniip.Infrastructure;
|
||||||
|
|
||||||
@@ -15,6 +19,16 @@ internal sealed class TrayIcon : IDisposable
|
|||||||
private readonly ToolStripMenuItem _windowItem;
|
private readonly ToolStripMenuItem _windowItem;
|
||||||
private readonly ToolStripMenuItem _recordItem;
|
private readonly ToolStripMenuItem _recordItem;
|
||||||
private readonly ToolStripMenuItem _gifItem;
|
private readonly ToolStripMenuItem _gifItem;
|
||||||
|
private readonly ToolStripMenuItem _foldersItem;
|
||||||
|
private readonly ToolStripMenuItem _recentItem;
|
||||||
|
private readonly ToolStripMenuItem _delayItem;
|
||||||
|
private TrackBar _delaySlider = null!;
|
||||||
|
private NumericUpDown _delayNumber = null!;
|
||||||
|
private int _delaySeconds;
|
||||||
|
private int _savedDelaySeconds;
|
||||||
|
|
||||||
|
/// <summary>Nieuwe vertraging in seconden, afgevuurd bij het sluiten van het submenu als de waarde is gewijzigd.</summary>
|
||||||
|
public event Action<int>? CaptureDelayChanged;
|
||||||
|
|
||||||
public event Action? OpenFromClipboardRequested;
|
public event Action? OpenFromClipboardRequested;
|
||||||
public event Action? SnipRequested;
|
public event Action? SnipRequested;
|
||||||
@@ -26,6 +40,12 @@ internal sealed class TrayIcon : IDisposable
|
|||||||
public event Action? ExitRequested;
|
public event Action? ExitRequested;
|
||||||
public event Action<bool>? PauseChanged;
|
public event Action<bool>? PauseChanged;
|
||||||
|
|
||||||
|
/// <summary>Geschiedenisvenster openen; true = met miniaturen.</summary>
|
||||||
|
public event Action<bool>? HistoryRequested;
|
||||||
|
|
||||||
|
/// <summary>Mappen voor het submenu Map openen, opgevraagd bij het openen; een pad van null staat grijs.</summary>
|
||||||
|
public Func<IReadOnlyList<(string Label, string? Path)>>? FoldersProvider { get; set; }
|
||||||
|
|
||||||
public TrayIcon()
|
public TrayIcon()
|
||||||
{
|
{
|
||||||
var menu = new ContextMenuStrip();
|
var menu = new ContextMenuStrip();
|
||||||
@@ -40,12 +60,26 @@ internal sealed class TrayIcon : IDisposable
|
|||||||
menu.Items.Add(_snipItem);
|
menu.Items.Add(_snipItem);
|
||||||
_windowItem = new ToolStripMenuItem("Venster knippen", null, (_, _) => WindowSnipRequested?.Invoke());
|
_windowItem = new ToolStripMenuItem("Venster knippen", null, (_, _) => WindowSnipRequested?.Invoke());
|
||||||
menu.Items.Add(_windowItem);
|
menu.Items.Add(_windowItem);
|
||||||
|
_delayItem = BuildDelayItem();
|
||||||
|
menu.Items.Add(_delayItem);
|
||||||
_recordItem = new ToolStripMenuItem(RecordText, null, (_, _) => RecordRequested?.Invoke());
|
_recordItem = new ToolStripMenuItem(RecordText, null, (_, _) => RecordRequested?.Invoke());
|
||||||
menu.Items.Add(_recordItem);
|
menu.Items.Add(_recordItem);
|
||||||
_gifItem = new ToolStripMenuItem("Screencast opnemen (GIF)...", null, (_, _) => GifRequested?.Invoke());
|
_gifItem = new ToolStripMenuItem("Screencast opnemen (GIF)...", null, (_, _) => GifRequested?.Invoke());
|
||||||
menu.Items.Add(_gifItem);
|
menu.Items.Add(_gifItem);
|
||||||
menu.Items.Add(new ToolStripSeparator());
|
menu.Items.Add(new ToolStripSeparator());
|
||||||
|
|
||||||
|
_foldersItem = new ToolStripMenuItem("Map openen");
|
||||||
|
_foldersItem.DropDownItems.Add(new ToolStripMenuItem("..."));
|
||||||
|
_foldersItem.DropDownOpening += (_, _) => BuildFolders();
|
||||||
|
menu.Items.Add(_foldersItem);
|
||||||
|
menu.Items.Add("Geschiedenis...", null, (_, _) => HistoryRequested?.Invoke(false));
|
||||||
|
menu.Items.Add("Afbeeldingsgeschiedenis...", null, (_, _) => HistoryRequested?.Invoke(true));
|
||||||
|
_recentItem = new ToolStripMenuItem("Recente items");
|
||||||
|
_recentItem.DropDownItems.Add(new ToolStripMenuItem("..."));
|
||||||
|
_recentItem.DropDownOpening += (_, _) => BuildRecent();
|
||||||
|
menu.Items.Add(_recentItem);
|
||||||
|
menu.Items.Add(new ToolStripSeparator());
|
||||||
|
|
||||||
_pauseItem = new ToolStripMenuItem("Knipsels niet automatisch oppikken") { CheckOnClick = true };
|
_pauseItem = new ToolStripMenuItem("Knipsels niet automatisch oppikken") { CheckOnClick = true };
|
||||||
_pauseItem.CheckedChanged += (_, _) => PauseChanged?.Invoke(_pauseItem.Checked);
|
_pauseItem.CheckedChanged += (_, _) => PauseChanged?.Invoke(_pauseItem.Checked);
|
||||||
menu.Items.Add(_pauseItem);
|
menu.Items.Add(_pauseItem);
|
||||||
@@ -89,10 +123,178 @@ internal sealed class TrayIcon : IDisposable
|
|||||||
_icon.Text = recording ? $"{AppIdentity.DisplayName} - opname loopt" : IdleText;
|
_icon.Text = recording ? $"{AppIdentity.DisplayName} - opname loopt" : IdleText;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetCaptureDelay(int seconds)
|
||||||
|
{
|
||||||
|
_savedDelaySeconds = seconds;
|
||||||
|
ShowCaptureDelay(seconds);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ToolStripMenuItem BuildDelayItem()
|
||||||
|
{
|
||||||
|
var item = new ToolStripMenuItem();
|
||||||
|
_delaySlider = new TrackBar
|
||||||
|
{
|
||||||
|
Minimum = 0,
|
||||||
|
Maximum = Kniip.Settings.AppSettings.MaxCaptureDelaySeconds,
|
||||||
|
TickFrequency = 5,
|
||||||
|
LargeChange = 5,
|
||||||
|
SmallChange = 1,
|
||||||
|
AutoSize = false,
|
||||||
|
Width = 200,
|
||||||
|
Height = 32,
|
||||||
|
Location = new Point(4, 6)
|
||||||
|
};
|
||||||
|
_delayNumber = new NumericUpDown
|
||||||
|
{
|
||||||
|
Minimum = 0,
|
||||||
|
Maximum = Kniip.Settings.AppSettings.MaxCaptureDelaySeconds,
|
||||||
|
Width = 52,
|
||||||
|
Location = new Point(_delaySlider.Right + 6, 10),
|
||||||
|
TextAlign = HorizontalAlignment.Right
|
||||||
|
};
|
||||||
|
var unit = new Label
|
||||||
|
{
|
||||||
|
Text = "seconden",
|
||||||
|
AutoSize = true,
|
||||||
|
Location = new Point(_delayNumber.Right + 4, 13)
|
||||||
|
};
|
||||||
|
var panel = new Panel
|
||||||
|
{
|
||||||
|
Size = new Size(unit.Left + unit.PreferredWidth + 10, 44),
|
||||||
|
BackColor = ProfessionalColors.ToolStripDropDownBackground
|
||||||
|
};
|
||||||
|
_delaySlider.BackColor = panel.BackColor;
|
||||||
|
panel.Controls.AddRange(new Control[] { _delaySlider, _delayNumber, unit });
|
||||||
|
|
||||||
|
_delaySlider.ValueChanged += (_, _) => ShowCaptureDelay(_delaySlider.Value);
|
||||||
|
_delayNumber.ValueChanged += (_, _) => ShowCaptureDelay((int)_delayNumber.Value);
|
||||||
|
_delayNumber.KeyDown += (_, e) =>
|
||||||
|
{
|
||||||
|
if (e.KeyCode is Keys.Enter or Keys.Escape)
|
||||||
|
{
|
||||||
|
e.SuppressKeyPress = true;
|
||||||
|
_icon.ContextMenuStrip?.Close();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
item.DropDownItems.Add(new ToolStripControlHost(panel) { AutoSize = false, Size = panel.Size, Margin = Padding.Empty });
|
||||||
|
item.DropDownClosed += (_, _) =>
|
||||||
|
{
|
||||||
|
ShowCaptureDelay((int)_delayNumber.Value);
|
||||||
|
if (_delaySeconds != _savedDelaySeconds)
|
||||||
|
{
|
||||||
|
_savedDelaySeconds = _delaySeconds;
|
||||||
|
CaptureDelayChanged?.Invoke(_delaySeconds);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
item.Text = "Schermafdruk vertraging: 0s";
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ShowCaptureDelay(int seconds)
|
||||||
|
{
|
||||||
|
_delaySeconds = seconds;
|
||||||
|
if (_delaySlider.Value != seconds)
|
||||||
|
{
|
||||||
|
_delaySlider.Value = seconds;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((int)_delayNumber.Value != seconds)
|
||||||
|
{
|
||||||
|
_delayNumber.Value = seconds;
|
||||||
|
}
|
||||||
|
|
||||||
|
_delayItem.Text = $"Schermafdruk vertraging: {seconds}s";
|
||||||
|
}
|
||||||
|
|
||||||
private static string IdleText => AppIdentity.IsTest
|
private static string IdleText => AppIdentity.IsTest
|
||||||
? $"{AppIdentity.DisplayName} {Kniip.Update.UpdateChecker.CurrentVersion}"
|
? $"{AppIdentity.DisplayName} {Kniip.Update.UpdateChecker.CurrentVersion}"
|
||||||
: "kniip - annotaties voor het Knipprogramma";
|
: "kniip - annotaties voor het Knipprogramma";
|
||||||
|
|
||||||
|
private void BuildFolders()
|
||||||
|
{
|
||||||
|
_foldersItem.DropDownItems.Clear();
|
||||||
|
foreach ((string label, string? path) in FoldersProvider?.Invoke() ?? Array.Empty<(string, string?)>())
|
||||||
|
{
|
||||||
|
var item = new ToolStripMenuItem(label) { Enabled = path != null, ToolTipText = path };
|
||||||
|
if (path != null)
|
||||||
|
{
|
||||||
|
item.Click += (_, _) => HistoryActions.OpenFolder(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
_foldersItem.DropDownItems.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BuildRecent()
|
||||||
|
{
|
||||||
|
foreach (ToolStripItem old in _recentItem.DropDownItems)
|
||||||
|
{
|
||||||
|
old.Image?.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
_recentItem.DropDownItems.Clear();
|
||||||
|
List<HistoryEntry> entries = HistoryStore.Recent(10).ToList();
|
||||||
|
if (entries.Count == 0)
|
||||||
|
{
|
||||||
|
_recentItem.DropDownItems.Add(new ToolStripMenuItem("Nog niets opgeslagen") { Enabled = false });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (HistoryEntry entry in entries)
|
||||||
|
{
|
||||||
|
var item = new ToolStripMenuItem($"[{entry.Time:HH:mm:ss}] {entry.Url ?? entry.Name}")
|
||||||
|
{
|
||||||
|
Image = LoadThumbnail(entry),
|
||||||
|
ToolTipText = entry.FilePath
|
||||||
|
};
|
||||||
|
item.Click += (_, _) =>
|
||||||
|
{
|
||||||
|
_icon.ContextMenuStrip?.Close();
|
||||||
|
HistoryActions.Open(entry);
|
||||||
|
};
|
||||||
|
foreach (HistoryCommand? command in HistoryActions.CommandsFor(entry))
|
||||||
|
{
|
||||||
|
if (command == null)
|
||||||
|
{
|
||||||
|
item.DropDownItems.Add(new ToolStripSeparator());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
item.DropDownItems.Add(new ToolStripMenuItem(command.Label, null, (_, _) => command.Run()) { Enabled = command.Enabled });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_recentItem.DropDownItems.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Image? LoadThumbnail(HistoryEntry entry)
|
||||||
|
{
|
||||||
|
if (HistoryStore.ThumbnailPath(entry) is not { } path || !File.Exists(path))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var stream = new MemoryStream(File.ReadAllBytes(path));
|
||||||
|
using var image = Image.FromStream(stream);
|
||||||
|
Size size = SystemInformation.SmallIconSize;
|
||||||
|
double scale = Math.Min((double)size.Width / image.Width, (double)size.Height / image.Height);
|
||||||
|
var thumb = new Bitmap(size.Width, size.Height);
|
||||||
|
using Graphics g = Graphics.FromImage(thumb);
|
||||||
|
g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
|
||||||
|
int w = Math.Max(1, (int)(image.Width * scale)), h = Math.Max(1, (int)(image.Height * scale));
|
||||||
|
g.DrawImage(image, (size.Width - w) / 2, (size.Height - h) / 2, w, h);
|
||||||
|
return thumb;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void ShowBalloon(string title, string text) =>
|
public void ShowBalloon(string title, string text) =>
|
||||||
_icon.ShowBalloonTip(4000, title, text, ToolTipIcon.Info);
|
_icon.ShowBalloonTip(4000, title, text, ToolTipIcon.Info);
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
<Product>kniip</Product>
|
<Product>kniip</Product>
|
||||||
<Description>Annotatie-editor naast het Windows Knipprogramma</Description>
|
<Description>Annotatie-editor naast het Windows Knipprogramma</Description>
|
||||||
<Version>1.1.4</Version>
|
<Version>1.1.5</Version>
|
||||||
<SatelliteResourceLanguages>nl;en</SatelliteResourceLanguages>
|
<SatelliteResourceLanguages>nl;en</SatelliteResourceLanguages>
|
||||||
<!-- WPF regelt DPI via app.manifest; de WinForms-analyzer is hier niet van toepassing. -->
|
<!-- WPF regelt DPI via app.manifest; de WinForms-analyzer is hier niet van toepassing. -->
|
||||||
<NoWarn>$(NoWarn);WFAC010</NoWarn>
|
<NoWarn>$(NoWarn);WFAC010</NoWarn>
|
||||||
|
|||||||
@@ -132,9 +132,13 @@ internal sealed class RecordingController
|
|||||||
NativeMethods.GetCursorPos(out NativeMethods.POINT cursor);
|
NativeMethods.GetCursorPos(out NativeMethods.POINT cursor);
|
||||||
var cursorPoint = new System.Drawing.Point(cursor.X, cursor.Y);
|
var cursorPoint = new System.Drawing.Point(cursor.X, cursor.Y);
|
||||||
|
|
||||||
foreach (Screen screen in Screen.AllScreens)
|
// Vastleggen voordat de overlays er staan, anders zit hun grijze laag in het vergrootglas.
|
||||||
|
var frozen = Screen.AllScreens
|
||||||
|
.Select(screen => (screen, image: _settings.ShowMagnifier ? Kniip.Capture.ScreenGrabber.Capture(screen.Bounds) : null))
|
||||||
|
.ToList();
|
||||||
|
foreach ((Screen screen, System.Windows.Media.Imaging.BitmapSource? image) in frozen)
|
||||||
{
|
{
|
||||||
var selector = new RegionSelectorWindow(screen, windows);
|
var selector = new RegionSelectorWindow(screen, windows, image);
|
||||||
selector.Finished += OnRegionChosen;
|
selector.Finished += OnRegionChosen;
|
||||||
_selectors.Add(selector);
|
_selectors.Add(selector);
|
||||||
selector.Show();
|
selector.Show();
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<Window x:Class="Kniip.Recording.RegionSelectorWindow"
|
<Window x:Class="Kniip.Recording.RegionSelectorWindow"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:capture="clr-namespace:Kniip.Capture"
|
||||||
Title="kniip opnamegebied kiezen" WindowStyle="None" AllowsTransparency="True" ResizeMode="NoResize"
|
Title="kniip opnamegebied kiezen" WindowStyle="None" AllowsTransparency="True" ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False" Topmost="True" Cursor="Cross" FontFamily="Segoe UI" FontSize="13"
|
ShowInTaskbar="False" Topmost="True" Cursor="Cross" FontFamily="Segoe UI" FontSize="13"
|
||||||
Background="#01000000">
|
Background="#01000000">
|
||||||
@@ -12,6 +13,7 @@
|
|||||||
CornerRadius="4" Padding="6,2" Visibility="Collapsed" IsHitTestVisible="False">
|
CornerRadius="4" Padding="6,2" Visibility="Collapsed" IsHitTestVisible="False">
|
||||||
<TextBlock x:Name="SizeText" Foreground="White" FontSize="12" />
|
<TextBlock x:Name="SizeText" Foreground="White" FontSize="12" />
|
||||||
</Border>
|
</Border>
|
||||||
|
<capture:MagnifierControl x:Name="Magnifier" />
|
||||||
<Border x:Name="Hint" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,28,0,0" Background="#F2FFFFFF"
|
<Border x:Name="Hint" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,28,0,0" Background="#F2FFFFFF"
|
||||||
CornerRadius="6" Padding="16,9" IsHitTestVisible="False">
|
CornerRadius="6" Padding="16,9" IsHitTestVisible="False">
|
||||||
<Border.Effect>
|
<Border.Effect>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
using Rectangle = System.Drawing.Rectangle;
|
using Rectangle = System.Drawing.Rectangle;
|
||||||
using Screen = System.Windows.Forms.Screen;
|
using Screen = System.Windows.Forms.Screen;
|
||||||
|
|
||||||
@@ -19,6 +20,7 @@ public partial class RegionSelectorWindow : Window
|
|||||||
|
|
||||||
private readonly Screen _screen;
|
private readonly Screen _screen;
|
||||||
private readonly IReadOnlyList<Rectangle> _windows;
|
private readonly IReadOnlyList<Rectangle> _windows;
|
||||||
|
private readonly BitmapSource? _frozen;
|
||||||
private Point? _dragStart;
|
private Point? _dragStart;
|
||||||
private bool _dragging;
|
private bool _dragging;
|
||||||
private Rectangle? _hover;
|
private Rectangle? _hover;
|
||||||
@@ -26,15 +28,18 @@ public partial class RegionSelectorWindow : Window
|
|||||||
/// <summary>Gekozen gebied, of null bij annuleren.</summary>
|
/// <summary>Gekozen gebied, of null bij annuleren.</summary>
|
||||||
internal event Action<RecordingRegion?>? Finished;
|
internal event Action<RecordingRegion?>? Finished;
|
||||||
|
|
||||||
internal RegionSelectorWindow(Screen screen, IReadOnlyList<Rectangle> windows)
|
/// <param name="frozen">Beeld van het scherm voor het vergrootglas; null betekent geen vergrootglas.</param>
|
||||||
|
internal RegionSelectorWindow(Screen screen, IReadOnlyList<Rectangle> windows, BitmapSource? frozen = null)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_screen = screen;
|
_screen = screen;
|
||||||
_windows = windows;
|
_windows = windows;
|
||||||
|
_frozen = frozen;
|
||||||
SourceInitialized += (_, _) => PhysicalWindow.Place(this, screen.Bounds);
|
SourceInitialized += (_, _) => PhysicalWindow.Place(this, screen.Bounds);
|
||||||
Loaded += (_, _) => ShowSelection(null);
|
Loaded += (_, _) => ShowSelection(null);
|
||||||
MouseLeave += (_, _) =>
|
MouseLeave += (_, _) =>
|
||||||
{
|
{
|
||||||
|
Magnifier.Hide();
|
||||||
if (!_dragging)
|
if (!_dragging)
|
||||||
{
|
{
|
||||||
_hover = null;
|
_hover = null;
|
||||||
@@ -49,6 +54,13 @@ public partial class RegionSelectorWindow : Window
|
|||||||
{
|
{
|
||||||
base.OnMouseMove(e);
|
base.OnMouseMove(e);
|
||||||
Point position = e.GetPosition(this);
|
Point position = e.GetPosition(this);
|
||||||
|
if (_frozen != null)
|
||||||
|
{
|
||||||
|
System.Drawing.Point physical = ToPhysical(position);
|
||||||
|
var relative = new System.Drawing.Point(physical.X - _screen.Bounds.X, physical.Y - _screen.Bounds.Y);
|
||||||
|
Magnifier.Show(_frozen, relative, physical, position, new Size(ActualWidth, ActualHeight));
|
||||||
|
}
|
||||||
|
|
||||||
if (_dragStart is Point start && e.LeftButton == MouseButtonState.Pressed)
|
if (_dragStart is Point start && e.LeftButton == MouseButtonState.Pressed)
|
||||||
{
|
{
|
||||||
if (!_dragging && (position - start).Length >= DragThreshold)
|
if (!_dragging && (position - start).Length >= DragThreshold)
|
||||||
|
|||||||
@@ -419,6 +419,7 @@ public partial class ScreencastWindow : Window
|
|||||||
{
|
{
|
||||||
_kept = true;
|
_kept = true;
|
||||||
RememberChoices();
|
RememberChoices();
|
||||||
|
AddToHistory(target, null, target);
|
||||||
bool copy = _settings.SaveButton == SaveButtonChoice.SaveAndCopy;
|
bool copy = _settings.SaveButton == SaveButtonChoice.SaveAndCopy;
|
||||||
bool copied = !copy || ClipboardWriter.SetFile(target);
|
bool copied = !copy || ClipboardWriter.SetFile(target);
|
||||||
App.Instance.ShowBalloon(copy && copied ? "Screencast opgeslagen en gekopieerd" : "Screencast opgeslagen", target);
|
App.Instance.ShowBalloon(copy && copied ? "Screencast opgeslagen en gekopieerd" : "Screencast opgeslagen", target);
|
||||||
@@ -524,6 +525,7 @@ public partial class ScreencastWindow : Window
|
|||||||
|
|
||||||
_kept = true;
|
_kept = true;
|
||||||
RememberChoices();
|
RememberChoices();
|
||||||
|
AddToHistory(null, url, target);
|
||||||
bool copied = ClipboardWriter.SetText(url);
|
bool copied = ClipboardWriter.SetText(url);
|
||||||
SavedRun.Text = copied ? $"Geüpload; de link staat op het klembord: {url} " : $"Geüpload: {url} ";
|
SavedRun.Text = copied ? $"Geüpload; de link staat op het klembord: {url} " : $"Geüpload: {url} ";
|
||||||
OpenRun.Text = "Link openen";
|
OpenRun.Text = "Link openen";
|
||||||
@@ -553,6 +555,14 @@ public partial class ScreencastWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <param name="exported">Het geëxporteerde bestand, voor de miniatuur van een GIF.</param>
|
||||||
|
private void AddToHistory(string? file, string? url, string exported)
|
||||||
|
{
|
||||||
|
bool gif = Format == ScreencastFormat.Gif;
|
||||||
|
Kniip.History.HistoryStore.Add(gif ? Kniip.History.HistoryKind.Gif : Kniip.History.HistoryKind.Mp4, file, url,
|
||||||
|
gif ? Kniip.History.HistoryStore.PreviewOf(exported) : null);
|
||||||
|
}
|
||||||
|
|
||||||
private void RememberChoices()
|
private void RememberChoices()
|
||||||
{
|
{
|
||||||
_settings.LastScreencastFormat = Format;
|
_settings.LastScreencastFormat = Format;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using Kniip.Editor;
|
using Kniip.Editor;
|
||||||
@@ -32,6 +33,15 @@ public enum SaveButtonChoice
|
|||||||
SaveAndCopy
|
SaveAndCopy
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum EditorLayout
|
||||||
|
{
|
||||||
|
/// <summary>Eén werkbalk met gereedschappen en acties.</summary>
|
||||||
|
Single,
|
||||||
|
|
||||||
|
/// <summary>Gereedschappen boven, opslaan/kopiëren en zoom onder (zoals ShareX).</summary>
|
||||||
|
Split
|
||||||
|
}
|
||||||
|
|
||||||
public sealed class AppSettings
|
public sealed class AppSettings
|
||||||
{
|
{
|
||||||
public bool WatchClipboard { get; set; } = true;
|
public bool WatchClipboard { get; set; } = true;
|
||||||
@@ -94,6 +104,12 @@ public sealed class AppSettings
|
|||||||
/// <summary>Volgorde van de werkbalkitems (ItemId's); leeg betekent de standaardvolgorde.</summary>
|
/// <summary>Volgorde van de werkbalkitems (ItemId's); leeg betekent de standaardvolgorde.</summary>
|
||||||
public List<string> ToolbarOrder { get; set; } = new();
|
public List<string> ToolbarOrder { get; set; } = new();
|
||||||
|
|
||||||
|
/// <summary>Indeling van de werkbalk(en) in de editor.</summary>
|
||||||
|
public EditorLayout EditorLayout { get; set; } = EditorLayout.Single;
|
||||||
|
|
||||||
|
/// <summary>Volgorde van de werkbalkitems in de gesplitste indeling (boven, dan onder); leeg betekent de standaardvolgorde.</summary>
|
||||||
|
public List<string> SplitToolbarOrder { get; set; } = new();
|
||||||
|
|
||||||
public List<string> ToolbarHidden { get; set; } = new();
|
public List<string> ToolbarHidden { get; set; } = new();
|
||||||
|
|
||||||
/// <summary>Zipline-server waar Uploaden naartoe gaat; leeg betekent geen uploadknop.</summary>
|
/// <summary>Zipline-server waar Uploaden naartoe gaat; leeg betekent geen uploadknop.</summary>
|
||||||
@@ -102,6 +118,20 @@ public sealed class AppSettings
|
|||||||
/// <summary>Bij het starten en daarna dagelijks op de achtergrond kijken of er een nieuwere versie is.</summary>
|
/// <summary>Bij het starten en daarna dagelijks op de achtergrond kijken of er een nieuwere versie is.</summary>
|
||||||
public bool CheckForUpdates { get; set; } = true;
|
public bool CheckForUpdates { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>Vergrootglas met kruisdraad en coördinaten tonen bij het kiezen van een gebied (knipsel en screencast).</summary>
|
||||||
|
public bool ShowMagnifier { get; set; } = true;
|
||||||
|
|
||||||
|
private int _captureDelaySeconds;
|
||||||
|
|
||||||
|
/// <summary>Seconden wachten voordat een rechthoek- of vensterknipsel het scherm bevriest (0-60); 0 is direct.</summary>
|
||||||
|
public int CaptureDelaySeconds
|
||||||
|
{
|
||||||
|
get => _captureDelaySeconds;
|
||||||
|
set => _captureDelaySeconds = Math.Clamp(value, 0, MaxCaptureDelaySeconds);
|
||||||
|
}
|
||||||
|
|
||||||
|
public const int MaxCaptureDelaySeconds = 60;
|
||||||
|
|
||||||
public StyleSet StyleFor(ToolKind tool)
|
public StyleSet StyleFor(ToolKind tool)
|
||||||
{
|
{
|
||||||
if (!ToolStyles.TryGetValue(tool, out StyleSet? style))
|
if (!ToolStyles.TryGetValue(tool, out StyleSet? style))
|
||||||
|
|||||||
@@ -142,6 +142,8 @@
|
|||||||
ToolTip="Geen sneltoets gebruiken" />
|
ToolTip="Geen sneltoets gebruiken" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<TextBlock x:Name="HotkeyHint" Style="{StaticResource Hint}" Margin="0,0,0,4" />
|
<TextBlock x:Name="HotkeyHint" Style="{StaticResource Hint}" Margin="0,0,0,4" />
|
||||||
|
<TextBlock Text="Gebied kiezen" Style="{StaticResource CardTitle}" Margin="0,12,0,8" />
|
||||||
|
<CheckBox x:Name="MagnifierBox" Content="Vergrootglas tonen bij het kiezen van een gebied (knipsel en screencast)" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
@@ -253,6 +255,11 @@
|
|||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Text="Editor" Style="{StaticResource CardTitle}" />
|
<TextBlock Text="Editor" Style="{StaticResource CardTitle}" />
|
||||||
<CheckBox x:Name="StraightHighlightBox" Content="Markeerstift trekt standaard een rechte horizontale streep (Shift wisselt)" />
|
<CheckBox x:Name="StraightHighlightBox" Content="Markeerstift trekt standaard een rechte horizontale streep (Shift wisselt)" />
|
||||||
|
<TextBlock Text="Werkbalk" Style="{StaticResource CardTitle}" Margin="0,16,0,6" />
|
||||||
|
<RadioButton x:Name="LayoutSingleRadio" GroupName="EditorLayout" Content="Eén werkbalk met gereedschappen en acties" />
|
||||||
|
<RadioButton x:Name="LayoutSplitRadio" GroupName="EditorLayout" Content="Gesplitst zoals ShareX: gereedschappen boven, opslaan onder" />
|
||||||
|
<TextBlock Style="{StaticResource Hint}"
|
||||||
|
Text="Ook te wisselen via rechtsklik op de werkbalk in de editor. Daar kun je knoppen ook verslepen of verbergen." />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,10 @@ public partial class SettingsWindow : Window
|
|||||||
ActionOpenRadio.IsChecked = settings.Action == CaptureAction.OpenEditor;
|
ActionOpenRadio.IsChecked = settings.Action == CaptureAction.OpenEditor;
|
||||||
ActionNothingRadio.IsChecked = settings.Action == CaptureAction.Nothing;
|
ActionNothingRadio.IsChecked = settings.Action == CaptureAction.Nothing;
|
||||||
StraightHighlightBox.IsChecked = settings.StraightHighlight;
|
StraightHighlightBox.IsChecked = settings.StraightHighlight;
|
||||||
|
LayoutSplitRadio.IsChecked = settings.EditorLayout == EditorLayout.Split;
|
||||||
|
LayoutSingleRadio.IsChecked = settings.EditorLayout != EditorLayout.Split;
|
||||||
AutoUpdateCheckBox.IsChecked = settings.CheckForUpdates;
|
AutoUpdateCheckBox.IsChecked = settings.CheckForUpdates;
|
||||||
|
MagnifierBox.IsChecked = settings.ShowMagnifier;
|
||||||
|
|
||||||
_snipFolder = settings.SnipSaveFolder;
|
_snipFolder = settings.SnipSaveFolder;
|
||||||
_videoFolder = settings.VideoSaveFolder;
|
_videoFolder = settings.VideoSaveFolder;
|
||||||
@@ -441,7 +444,9 @@ public partial class SettingsWindow : Window
|
|||||||
: ActionNothingRadio.IsChecked == true ? CaptureAction.Nothing
|
: ActionNothingRadio.IsChecked == true ? CaptureAction.Nothing
|
||||||
: CaptureAction.Notify;
|
: CaptureAction.Notify;
|
||||||
_settings.StraightHighlight = StraightHighlightBox.IsChecked == true;
|
_settings.StraightHighlight = StraightHighlightBox.IsChecked == true;
|
||||||
|
_settings.EditorLayout = LayoutSplitRadio.IsChecked == true ? EditorLayout.Split : EditorLayout.Single;
|
||||||
_settings.CheckForUpdates = AutoUpdateCheckBox.IsChecked == true;
|
_settings.CheckForUpdates = AutoUpdateCheckBox.IsChecked == true;
|
||||||
|
_settings.ShowMagnifier = MagnifierBox.IsChecked == true;
|
||||||
StopListening();
|
StopListening();
|
||||||
_settings.SnipHotkey = _hotkeys["Snip"];
|
_settings.SnipHotkey = _hotkeys["Snip"];
|
||||||
_settings.WindowHotkey = _hotkeys["Window"];
|
_settings.WindowHotkey = _hotkeys["Window"];
|
||||||
@@ -466,6 +471,7 @@ public partial class SettingsWindow : Window
|
|||||||
_settings.ToolbarPosition = defaults.ToolbarPosition;
|
_settings.ToolbarPosition = defaults.ToolbarPosition;
|
||||||
_settings.ToolbarLocked = defaults.ToolbarLocked;
|
_settings.ToolbarLocked = defaults.ToolbarLocked;
|
||||||
_settings.ToolbarOrder = defaults.ToolbarOrder;
|
_settings.ToolbarOrder = defaults.ToolbarOrder;
|
||||||
|
_settings.SplitToolbarOrder = defaults.SplitToolbarOrder;
|
||||||
_settings.ToolbarHidden = defaults.ToolbarHidden;
|
_settings.ToolbarHidden = defaults.ToolbarHidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user