Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

feat(gui): redraw the sidebar's add and new-thread icons

RoversXdfe610f3f9b3
diff --git a/assets/ui/project-add.svg b/assets/ui/project-add.svg
new file mode 100644
index 00000000..d45c93cd
--- /dev/null
+++ b/assets/ui/project-add.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+ <path d="M21 12.5V18a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h3.17a2 2 0 0 1 1.42.59L11 6h1" />
+ <path d="M19 2.5v6" />
+ <path d="M16 5.5h6" />
+</svg>
diff --git a/thinkterm-i18n/i18n/de-DE.ftl b/thinkterm-i18n/i18n/de-DE.ftl
index 87491866..b1090803 100644
--- a/thinkterm-i18n/i18n/de-DE.ftl
+++ b/thinkterm-i18n/i18n/de-DE.ftl
@@ -374,6 +374,7 @@ sidebar-settings = Einstellungen
tooltip-sidebar-settings = Einstellungen
tooltip-sidebar-view-options = Ansichtsoptionen
tooltip-sidebar-thread-search = Thread finden
+tooltip-sidebar-new-project = Workspace hinzufügen
tooltip-sidebar-ssh-hosts = Remote-Hosts
tooltip-sidebar-live-overview = Live-Übersicht
tooltip-sidebar-notifications = Mitteilungen
diff --git a/thinkterm-i18n/i18n/en-US.ftl b/thinkterm-i18n/i18n/en-US.ftl
index fab43287..fe124da2 100644
--- a/thinkterm-i18n/i18n/en-US.ftl
+++ b/thinkterm-i18n/i18n/en-US.ftl
@@ -374,6 +374,7 @@ sidebar-settings = Settings
tooltip-sidebar-settings = Settings
tooltip-sidebar-view-options = View Options
tooltip-sidebar-thread-search = Find Thread
+tooltip-sidebar-new-project = Add workspace
tooltip-sidebar-ssh-hosts = Remote Hosts
tooltip-sidebar-live-overview = Live Overview
tooltip-sidebar-notifications = Notifications
diff --git a/thinkterm-i18n/i18n/fr-FR.ftl b/thinkterm-i18n/i18n/fr-FR.ftl
index 304e1e6b..8d40aa56 100644
--- a/thinkterm-i18n/i18n/fr-FR.ftl
+++ b/thinkterm-i18n/i18n/fr-FR.ftl
@@ -374,6 +374,7 @@ sidebar-settings = Réglages
tooltip-sidebar-settings = Réglages
tooltip-sidebar-view-options = Options d'affichage
tooltip-sidebar-thread-search = Trouver un fil
+tooltip-sidebar-new-project = Ajouter un espace de travail
tooltip-sidebar-ssh-hosts = Hôtes distants
tooltip-sidebar-live-overview = Aperçu en direct
tooltip-sidebar-notifications = Notifications
diff --git a/thinkterm-i18n/i18n/ja-JP.ftl b/thinkterm-i18n/i18n/ja-JP.ftl
index e1be9275..3c64b264 100644
--- a/thinkterm-i18n/i18n/ja-JP.ftl
+++ b/thinkterm-i18n/i18n/ja-JP.ftl
@@ -371,6 +371,7 @@ sidebar-settings = 設定
tooltip-sidebar-settings = 設定
tooltip-sidebar-view-options = 表示オプション
tooltip-sidebar-thread-search = スレッドを検索
+tooltip-sidebar-new-project = ワークスペースを追加
tooltip-sidebar-ssh-hosts = リモートホスト
tooltip-sidebar-live-overview = ライブ概要
tooltip-sidebar-notifications = 通知
diff --git a/thinkterm-i18n/i18n/ru-RU.ftl b/thinkterm-i18n/i18n/ru-RU.ftl
index a29900d8..eefc0a6a 100644
--- a/thinkterm-i18n/i18n/ru-RU.ftl
+++ b/thinkterm-i18n/i18n/ru-RU.ftl
@@ -369,6 +369,7 @@ sidebar-settings = Настройки
tooltip-sidebar-settings = Настройки
tooltip-sidebar-view-options = Параметры вида
tooltip-sidebar-thread-search = Найти ветку
+tooltip-sidebar-new-project = Добавить рабочую область
tooltip-sidebar-ssh-hosts = Удалённые узлы
tooltip-sidebar-live-overview = Обзор в реальном времени
tooltip-sidebar-notifications = Уведомления
diff --git a/thinkterm-i18n/i18n/zh-CN.ftl b/thinkterm-i18n/i18n/zh-CN.ftl
index 6c026eba..71a40953 100644
--- a/thinkterm-i18n/i18n/zh-CN.ftl
+++ b/thinkterm-i18n/i18n/zh-CN.ftl
@@ -371,6 +371,7 @@ sidebar-settings = 设置
tooltip-sidebar-settings = 设置
tooltip-sidebar-view-options = 视图选项
tooltip-sidebar-thread-search = 查找线程
+tooltip-sidebar-new-project = 添加工作区
tooltip-sidebar-ssh-hosts = 远程主机
tooltip-sidebar-live-overview = 实时总览
tooltip-sidebar-notifications = 通知
diff --git a/wezterm-gui/src/termwindow/mod.rs b/wezterm-gui/src/termwindow/mod.rs
index b6ac4956..12c6ef63 100644
--- a/wezterm-gui/src/termwindow/mod.rs
+++ b/wezterm-gui/src/termwindow/mod.rs
@@ -1767,11 +1767,14 @@ mod tooltip_tests {
#[test]
fn every_icon_only_sidebar_button_has_a_name() {
- // These five carry no text of their own, so the hover tag is the only
+ // These carry no text of their own, so the hover tag is the only
// place their name appears.
for item_type in [
UIItemType::WorkspaceSidebarSettings,
UIItemType::WorkspaceSidebarThreadSearch,
+ UIItemType::ProjectNew,
+ UIItemType::WorkspaceThreadNew(String::new()),
+ UIItemType::ThreadRefGroupNewThread(String::new()),
UIItemType::WorkspaceSidebarViewOptions,
UIItemType::WorkspaceSidebarSshHosts,
UIItemType::WorkspaceSidebarLiveOverview,
@@ -2301,6 +2304,10 @@ pub fn tooltip_label_for(item_type: &UIItemType) -> Option<String> {
let key = match item_type {
UIItemType::WorkspaceSidebarSettings => "tooltip-sidebar-settings",
UIItemType::WorkspaceSidebarThreadSearch => "tooltip-sidebar-thread-search",
+ UIItemType::ProjectNew => "tooltip-sidebar-new-project",
+ UIItemType::WorkspaceThreadNew(_) | UIItemType::ThreadRefGroupNewThread(_) => {
+ "sidebar-new-thread"
+ }
UIItemType::WorkspaceSidebarViewOptions => "tooltip-sidebar-view-options",
UIItemType::WorkspaceSidebarSshHosts => "tooltip-sidebar-ssh-hosts",
UIItemType::WorkspaceSidebarLiveOverview => "tooltip-sidebar-live-overview",
diff --git a/wezterm-gui/src/termwindow/ui/icons.rs b/wezterm-gui/src/termwindow/ui/icons.rs
index 923dce03..e253f98b 100644
--- a/wezterm-gui/src/termwindow/ui/icons.rs
+++ b/wezterm-gui/src/termwindow/ui/icons.rs
@@ -105,6 +105,7 @@ pub enum SvgIcon {
CircleX,
CirclePlus,
SquarePlus,
+ SquarePen,
Square,
SquareRoundCorner,
SquareStack,
@@ -147,6 +148,9 @@ pub enum SvgIcon {
/// The mux server of the README's architecture diagram: a host whose
/// sessions live on it, which is what ThinkTerm Connect means.
MuxServer,
+ /// A folder with its plus in a gap at the top right: the sidebar's new
+ /// project button.
+ ProjectAdd,
/// Apple's mark, tinted like the rest rather than painted in its own
/// black: drawn white, it vanishes on a light theme.
Apple,
@@ -409,6 +413,7 @@ impl SvgIcon {
Self::SquarePlus => {
include_bytes!("../../../../third_party/lucide/icons/square-plus.svg")
}
+ Self::SquarePen => include_bytes!("../../../../third_party/lucide/icons/square-pen.svg"),
Self::SquareStack => {
include_bytes!("../../../../third_party/lucide/icons/square-stack.svg")
}
@@ -468,6 +473,7 @@ impl SvgIcon {
include_bytes!("../../../../third_party/lucide/icons/hard-drive.svg")
}
Self::MuxServer => include_bytes!("../../../../assets/ui/mux-server.svg"),
+ Self::ProjectAdd => include_bytes!("../../../../assets/ui/project-add.svg"),
Self::QrCode => include_bytes!("../../../../third_party/lucide/icons/qr-code.svg"),
Self::Smartphone => {
include_bytes!("../../../../third_party/lucide/icons/smartphone.svg")
@@ -953,6 +959,7 @@ mod tests {
SvgIcon::Folder,
SvgIcon::FolderOpen,
SvgIcon::FolderPlus,
+ SvgIcon::ProjectAdd,
SvgIcon::FolderTree,
SvgIcon::Globe,
SvgIcon::Info,
diff --git a/wezterm-gui/src/termwindow/ui/sidebar.rs b/wezterm-gui/src/termwindow/ui/sidebar.rs
index 398fc82c..9e89e98d 100644
--- a/wezterm-gui/src/termwindow/ui/sidebar.rs
+++ b/wezterm-gui/src/termwindow/ui/sidebar.rs
@@ -57,6 +57,9 @@ const WORKSPACE_SECTION_LABEL_GAP: usize = 12;
/// `workspace_sidebar_hidden_statuses` cannot be cleared from the UI.
const SHOW_SIDEBAR_VIEW_OPTIONS: bool = false;
+/// Room between New Thread's row and the list under it.
+const TOP_ACTION_BOTTOM_GAP: usize = 16;
+
/// Diameter for every round sidebar action button, and the height of the
/// New Thread pill beside them. Also their corner radius, since they are all
/// fully rounded.
@@ -1265,7 +1268,8 @@ impl crate::TermWindow {
if reconnect_row_height > 0 {
y += reconnect_row_height + self.ui_px(SIDEBAR_INSET);
}
- let list_top = y + top_action_y_offset + top_action_height + self.ui_px(SIDEBAR_INSET);
+ let list_top =
+ y + top_action_y_offset + top_action_height + self.ui_px(TOP_ACTION_BOTTOM_GAP);
WorkspaceSidebarLayout {
panel_x,
@@ -2072,7 +2076,7 @@ impl crate::TermWindow {
};
self.paint_sidebar_icon(
layers,
- SvgIcon::CirclePlus,
+ SvgIcon::SquarePen,
top_action_icon_x,
top_action_icon_y,
top_action_icon_size,
@@ -2461,7 +2465,7 @@ impl crate::TermWindow {
);
self.paint_sidebar_icon(
layers,
- SvgIcon::FolderPlus,
+ SvgIcon::ProjectAdd,
button_x + ((section_button_size.saturating_sub(section_icon_size)) / 2),
button_y + ((section_button_size.saturating_sub(section_icon_size)) / 2),
section_icon_size,
@@ -2639,7 +2643,7 @@ impl crate::TermWindow {
);
self.paint_sidebar_icon(
layers,
- SvgIcon::Plus,
+ SvgIcon::CirclePlus,
project_action_x
+ ((project_action_size.saturating_sub(action_icon_size)) / 2),
project_action_y
@@ -3049,7 +3053,7 @@ impl crate::TermWindow {
);
self.paint_sidebar_icon(
layers,
- SvgIcon::Plus,
+ SvgIcon::CirclePlus,
group_action_x + ((group_action_size.saturating_sub(action_icon_size)) / 2),
group_action_y + ((group_action_size.saturating_sub(action_icon_size)) / 2),
action_icon_size,
@@ -3673,7 +3677,7 @@ impl crate::TermWindow {
};
self.paint_sidebar_icon(
layers,
- SvgIcon::CirclePlus,
+ SvgIcon::SquarePen,
top_action_icon_x,
top_action_icon_y,
top_action_icon_size,