Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Connection list rows show the database name after the host, so connections that share a name and host are easier to tell apart. (#1535)
- Save as Favorite uses Cmd+D again. The Cmd+Control+D set in 0.47.0 is reserved by macOS for Look Up, so it never fired.
- Editor toolbar buttons show their keyboard shortcut in the tooltip, and it updates if you rebind the shortcut.
- Window toolbar layout: the connection and database selectors are now navigation items pinned to the left, and the Refresh and Save buttons move to the right next to the tab and query controls. Toolbars customized before this change reset once to the new layout.

### Fixed

Expand Down
8 changes: 5 additions & 3 deletions TablePro/Core/Services/Infrastructure/MainWindowToolbar.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import TableProPluginKit
internal final class MainWindowToolbar: NSObject, NSToolbarDelegate {
private static let lifecycleLogger = Logger(subsystem: "com.TablePro", category: "NativeTabLifecycle")

internal static let toolbarIdentifier = NSToolbar.Identifier("com.TablePro.main.toolbar")
internal static let toolbarIdentifier = NSToolbar.Identifier("com.TablePro.main.toolbar.v2")

weak var coordinator: MainContentCoordinator?

Expand Down Expand Up @@ -77,9 +77,9 @@ internal final class MainWindowToolbar: NSObject, NSToolbarDelegate {
Self.sidebarToggle,
.sidebarTrackingSeparator,
Self.connectionGroup,
Self.refreshSaveGroup,
Self.principal,
.flexibleSpace,
Self.refreshSaveGroup,
Self.quickSwitcher,
Self.newTab,
Self.previewSQL,
Expand Down Expand Up @@ -110,7 +110,7 @@ internal final class MainWindowToolbar: NSObject, NSToolbarDelegate {
case Self.sidebarToggle:
return makeSidebarToggleItem(coordinator: coordinator)
case Self.connectionGroup:
return makeGroup(
let group = makeGroup(
id: itemIdentifier,
label: String(localized: "Connection"),
subitems: [subitemConnection(), subitemDatabase()],
Expand All @@ -119,6 +119,8 @@ internal final class MainWindowToolbar: NSObject, NSToolbarDelegate {
DatabaseToolbarButton(coordinator: coordinator)
}
)
group.isNavigational = true
return group
case Self.principal:
let item = hostingItem(
id: itemIdentifier,
Expand Down
Loading
Loading