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 @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **Data Grid preferences: removed "Confirm DML staging applications"** — it changed the SQL destructive-query confirmation (DROP / TRUNCATE / DELETE) and controlled nothing else.
- **About shows the real version** instead of a hardcoded 0.4.17.
- **MCP Server pane** — MongoDB connections can be shared (the server already had MongoDB tools), type badges use product names, the `querya-mcp` path is on its own line, copying configs and regenerating the token are separate, and recent calls are rows with a status icon.
- **One monospace font outside the result grid** — PostgreSQL, Redis and MongoDB views, the DML and destructive-query dialogs, the recovery screen, the welcome tour and monospace badges used the system's generic `monospace` family and looked different from the SQL editor; they now use the editor's font stack (#1633).

### Planned

Expand Down
7 changes: 5 additions & 2 deletions lib/features/mongodb/mongo_aggregation_workspace.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart' as material;
import 'package:flutter/services.dart';
import 'package:querya_desktop/core/database/mongodb_connection.dart';
import 'package:querya_desktop/core/database/mongodb_service.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/features/mongodb/mongo_aggregation_stage.dart';
import 'package:querya_desktop/features/mongodb/mongo_documents_json_view.dart';
import 'package:querya_desktop/features/mongodb/mongo_documents_table_view.dart';
Expand Down Expand Up @@ -652,7 +653,8 @@ class _StageCardState extends material.State<_StageCard> {
maxLines: null,
minLines: 3,
style: const material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 12.5,
height: 1.4,
),
Expand Down Expand Up @@ -810,7 +812,8 @@ class _ExportDialogState extends material.State<_ExportDialog> {
child: material.SelectableText(
code,
style: const material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 12.5,
height: 1.45,
),
Expand Down
20 changes: 14 additions & 6 deletions lib/features/mongodb/mongo_document_tree_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:convert';
import 'package:flutter/material.dart' as material;
import 'package:flutter/services.dart';
import 'package:mongo_dart/mongo_dart.dart' show ObjectId;
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/features/mongodb/mongo_ejson.dart';
import 'package:querya_desktop/features/mongodb/mongo_field_codec.dart';
import 'package:querya_desktop/shared/widgets/app_toast.dart';
Expand Down Expand Up @@ -318,7 +319,9 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
'_id: $idString',
style: material.TextStyle(
fontSize: 11,
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
color: cs.mutedForeground,
),
),
Expand Down Expand Up @@ -540,7 +543,8 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
Text(
keyLabel,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
fontWeight: material.FontWeight.w600,
color: matchesSearch && _searchQuery.isNotEmpty
Expand All @@ -552,7 +556,8 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
Text(
badgeLabel,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 11,
color: cs.mutedForeground,
),
Expand Down Expand Up @@ -615,7 +620,8 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
Text(
keyLabel,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
fontWeight: material.FontWeight.w500,
color: isMatch ? cs.primary : cs.foreground,
Expand All @@ -624,7 +630,8 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
Text(
': ',
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
color: cs.mutedForeground,
),
Expand All @@ -634,7 +641,8 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
valueDisplay,
overflow: TextOverflow.ellipsis,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
fontStyle:
value == null ? material.FontStyle.italic : material.FontStyle.normal,
Expand Down
11 changes: 8 additions & 3 deletions lib/features/mongodb/mongo_documents_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:querya_desktop/core/database/destructive_sql_detector.dart';
import 'package:querya_desktop/core/database/mongodb_connection.dart';
import 'package:querya_desktop/core/database/mongodb_service.dart';
import 'package:querya_desktop/core/storage/app_settings.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/features/mongodb/mongo_add_document_dialog.dart';
import 'package:querya_desktop/features/mongodb/mongo_document_tree_view.dart';
import 'package:querya_desktop/features/mongodb/mongo_documents_json_view.dart';
Expand Down Expand Up @@ -797,7 +798,9 @@ class _DocumentCardState extends State<_DocumentCard> {
maxLines: 1,
style: material.TextStyle(
fontSize: 12,
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
color: scs.mutedForeground,
),
),
Expand Down Expand Up @@ -850,7 +853,8 @@ class MongoFieldList extends StatelessWidget {
overflow: TextOverflow.ellipsis,
style: material.TextStyle(
fontSize: 12,
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontWeight: material.FontWeight.w600,
color: colorScheme.foreground,
),
Expand All @@ -864,7 +868,8 @@ class MongoFieldList extends StatelessWidget {
maxLines: 1,
style: material.TextStyle(
fontSize: 12,
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
color: shadcnCs.mutedForeground,
),
),
Expand Down
5 changes: 4 additions & 1 deletion lib/features/mongodb/mongo_indexes_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:async' show unawaited;
import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/database/mongodb_connection.dart';
import 'package:querya_desktop/core/database/mongodb_service.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/features/mongodb/mongo_create_index_dialog.dart';
import 'package:querya_desktop/features/mongodb/mongo_index_info.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
Expand Down Expand Up @@ -406,7 +407,9 @@ class _IndexCard extends material.StatelessWidget {
material.SelectableText(
index.keysFormatted,
style: const material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
fontWeight: material.FontWeight.w500,
),
Expand Down
8 changes: 6 additions & 2 deletions lib/features/mongodb/mongo_query_workspace.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:querya_desktop/core/database/mongodb_connection.dart';
import 'package:querya_desktop/core/editor/querya_code_editor.dart';
import 'package:querya_desktop/core/editor/querya_code_language.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/features/mongodb/mongo_documents_json_view.dart';
import 'package:querya_desktop/features/mongodb/mongo_documents_table_view.dart';
import 'package:querya_desktop/features/mongodb/mongo_query_executor.dart';
Expand Down Expand Up @@ -242,7 +243,9 @@ class _MongoQueryWorkspaceState extends material.State<MongoQueryWorkspace> {
maxLines: 2,
overflow: material.TextOverflow.ellipsis,
style: const material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
),
),
Expand Down Expand Up @@ -500,7 +503,8 @@ class _MongoQueryWorkspaceState extends material.State<MongoQueryWorkspace> {
tab.error!,
style: material.TextStyle(
color: cs.destructive,
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 12.5,
),
),
Expand Down
4 changes: 3 additions & 1 deletion lib/features/onboarding/welcome_tour_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter/material.dart' as material;
import 'package:flutter/services.dart';
import 'package:querya_desktop/core/layout/window_layout.dart';
import 'package:querya_desktop/core/storage/app_settings.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/core/theme/querya_workbench_theme.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';
Expand Down Expand Up @@ -79,7 +80,8 @@ class KbdBadge extends StatelessWidget {
style: TextStyle(
fontSize: fontSize,
fontWeight: material.FontWeight.w600,
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
color: Theme.of(context).colorScheme.foreground,
),
),
Expand Down
25 changes: 19 additions & 6 deletions lib/features/postgresql/postgres_browser_views.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/database/postgres_service.dart';
import 'package:querya_desktop/core/database/postgres_metadata.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';

Expand Down Expand Up @@ -165,7 +166,9 @@ class _PostgresIndexListViewState
material.SelectableText(
r.indexDef,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 11,
height: 1.4,
color: cs.foreground,
Expand Down Expand Up @@ -331,7 +334,9 @@ class _PostgresTriggerListViewState
material.SelectableText(
r.definition,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 11,
height: 1.4,
color: cs.foreground,
Expand Down Expand Up @@ -470,7 +475,9 @@ class _PostgresTypeListViewState extends material.State<PostgresTypeListView> {
child: material.Text(
r.name,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
color: cs.foreground,
),
Expand Down Expand Up @@ -616,7 +623,9 @@ class _PostgresExtensionListViewState
child: material.Text(
r.name,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
fontWeight: material.FontWeight.w600,
color: cs.foreground,
Expand Down Expand Up @@ -772,7 +781,9 @@ class _PostgresFdwListViewState extends material.State<PostgresFdwListView> {
child: material.Text(
'${r.name}${r.handler != null ? ' · ${r.handler}' : ''}',
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
color: cs.foreground,
),
Expand All @@ -799,7 +810,9 @@ class _PostgresFdwListViewState extends material.State<PostgresFdwListView> {
child: material.Text(
'${r.serverName} → ${r.fdwName}',
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
color: cs.foreground,
),
Expand Down
5 changes: 4 additions & 1 deletion lib/features/postgresql/postgres_routine_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:querya_desktop/core/database/postgres_service.dart';
import 'package:querya_desktop/core/editor/querya_code_editor.dart';
import 'package:querya_desktop/core/editor/querya_code_language.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/features/workspace/sql_editor_chrome.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';
Expand Down Expand Up @@ -233,7 +234,9 @@ class _PostgresRoutineViewState extends material.State<PostgresRoutineView> {
fontSize: 12,
fontWeight: material.FontWeight.w600,
color: cs.foreground,
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
),
),
),
Expand Down
12 changes: 9 additions & 3 deletions lib/features/postgresql/postgres_sequence_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/database/postgres_connection.dart';
import 'package:querya_desktop/core/database/postgres_service.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';

Expand Down Expand Up @@ -214,7 +215,9 @@ class _PostgresSequenceViewState extends material.State<PostgresSequenceView> {
material.SelectableText(
d.lastValue,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 16,
color: cs.foreground,
),
Expand Down Expand Up @@ -245,7 +248,9 @@ class _PostgresSequenceViewState extends material.State<PostgresSequenceView> {
child: material.SelectableText(
d.ddl,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback:
QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
height: 1.45,
color: cs.foreground,
Expand Down Expand Up @@ -276,7 +281,8 @@ class _PostgresSequenceViewState extends material.State<PostgresSequenceView> {
child: material.SelectableText(
v,
style: material.TextStyle(
fontFamily: 'monospace',
fontFamily: QueryaTypography.mono,
fontFamilyFallback: QueryaTypography.monoFontFamilyFallback,
fontSize: 12,
color: cs.foreground,
),
Expand Down
Loading
Loading