[PR #2341] [MERGED] Revamp the windows tray code #10862

Closed
opened 2026-04-12 23:13:22 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/2341
Author: @dhiltgen
Created: 2/4/2024
Status: Merged
Merged: 2/4/2024
Merged by: @dhiltgen

Base: appHead: win_app


📝 Commits (1)

  • 55ce8af Revamp the windows tray code

📊 Changes

24 files changed (+1200 additions, -165 deletions)

View changed files

📝 app/lifecycle/lifecycle.go (+45 -7)
app/lifecycle/logging.go (+55 -0)
app/lifecycle/logging_nonwindows.go (+9 -0)
app/lifecycle/logging_windows.go (+19 -0)
📝 app/lifecycle/paths.go (+4 -3)
📝 app/lifecycle/server.go (+13 -33)
📝 app/lifecycle/updater.go (+33 -18)
📝 app/ollama.iss (+2 -1)
📝 app/store/store.go (+13 -8)
app/tray/commontray/types.go (+24 -0)
📝 app/tray/tray.go (+8 -67)
app/tray/tray_nonwindows.go (+13 -0)
app/tray/tray_windows.go (+10 -0)
app/tray/types.go (+0 -21)
app/tray/wintray/eventloop.go (+193 -0)
app/tray/wintray/messages.go (+10 -0)
app/tray/wintray/notifyicon.go (+66 -0)
app/tray/wintray/tray.go (+531 -0)
app/tray/wintray/w32api.go (+89 -0)
app/tray/wintray/winclass.go (+45 -0)

...and 4 more files

📄 Description

To get more control over our windows app this pulls the win32 logic into our Go code instead of using an upstream library.

Still gobs of debug logging that I'll clean up soon, but it's now functional. The upgrade flow doesn't work yet of course.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/2341 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 2/4/2024 **Status:** ✅ Merged **Merged:** 2/4/2024 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `app` ← **Head:** `win_app` --- ### 📝 Commits (1) - [`55ce8af`](https://github.com/ollama/ollama/commit/55ce8af9b889f61eea12f23d2250d2255e71b69e) Revamp the windows tray code ### 📊 Changes **24 files changed** (+1200 additions, -165 deletions) <details> <summary>View changed files</summary> 📝 `app/lifecycle/lifecycle.go` (+45 -7) ➕ `app/lifecycle/logging.go` (+55 -0) ➕ `app/lifecycle/logging_nonwindows.go` (+9 -0) ➕ `app/lifecycle/logging_windows.go` (+19 -0) 📝 `app/lifecycle/paths.go` (+4 -3) 📝 `app/lifecycle/server.go` (+13 -33) 📝 `app/lifecycle/updater.go` (+33 -18) 📝 `app/ollama.iss` (+2 -1) 📝 `app/store/store.go` (+13 -8) ➕ `app/tray/commontray/types.go` (+24 -0) 📝 `app/tray/tray.go` (+8 -67) ➕ `app/tray/tray_nonwindows.go` (+13 -0) ➕ `app/tray/tray_windows.go` (+10 -0) ➖ `app/tray/types.go` (+0 -21) ➕ `app/tray/wintray/eventloop.go` (+193 -0) ➕ `app/tray/wintray/messages.go` (+10 -0) ➕ `app/tray/wintray/notifyicon.go` (+66 -0) ➕ `app/tray/wintray/tray.go` (+531 -0) ➕ `app/tray/wintray/w32api.go` (+89 -0) ➕ `app/tray/wintray/winclass.go` (+45 -0) _...and 4 more files_ </details> ### 📄 Description To get more control over our windows app this pulls the win32 logic into our Go code instead of using an upstream library. Still gobs of debug logging that I'll clean up soon, but it's now functional. The upgrade flow doesn't work yet of course. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-12 23:13:22 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#10862