Open
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
46 changes: 44 additions & 2 deletions src/ui/app.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use crate::db::{
ConnectionConfig, ConnectionManager, DatabaseInfo, QueryResult, SchemaInfo, SslMode, TableInfo,
};
use crate::editor::{HistoryEntry, QueryHistory, TextBuffer};
use crate::ui::Theme;
use crate::ui::{Theme, ThemeName};

pub const SPINNER_FRAMES: &[char] = &['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

Expand DownExpand Up@@ -198,8 +198,13 @@ impl App {
initial_config.password.len(),
];

let theme = match Self::load_theme_preference() {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};

Self {
theme: Theme::dark(),
theme,
focus: Focus::ConnectionDialog,
should_quit: false,

Expand DownExpand Up@@ -298,9 +303,46 @@ impl App {
}
}

pub fn toggle_theme(&mut self) {
let new_name = self.theme.name.toggle();
self.theme = match new_name {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};
Self::save_theme_preference(new_name);
}

fn save_theme_preference(theme_name: ThemeName) {
if let Some(config_dir) = dirs::config_dir() {
let pgrsql_dir = config_dir.join("pgrsql");
let _ = std::fs::create_dir_all(&pgrsql_dir);
let _ = std::fs::write(pgrsql_dir.join("theme"), theme_name.as_str());
}
}

fn load_theme_preference() -> ThemeName {
if let Some(config_dir) = dirs::config_dir() {
let path = config_dir.join("pgrsql").join("theme");
if let Ok(content) = std::fs::read_to_string(path) {
return match content.trim() {
"light" => ThemeName::Light,
_ => ThemeName::Dark,
};
}
}
ThemeName::Dark
}

pub async fn handle_input(&mut self, key: KeyEvent) -> Result<()> {
// Global shortcuts
match (key.code, key.modifiers) {
// Ctrl+Shift+T: Toggle theme (works in all contexts except connection dialog text input)
// Note: most terminals report Ctrl+Shift+T as Char('T') with only CONTROL;
// the SHIFT modifier is implicit in the uppercase letter.
(KeyCode::Char('T'), m) if m.contains(KeyModifiers::CONTROL) => {
self.toggle_theme();
return Ok(());
}
(KeyCode::Char('?'), _) if self.focus != Focus::Editor => {
self.show_help = !self.show_help;
if self.show_help {
Expand Down
9 changes: 7 additions & 2 deletions src/ui/components.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,8 +633,12 @@ fn draw_status_bar(frame: &mut Frame, app: &App, area: Rect) {
Style::default().fg(theme.text_muted).bg(theme.bg_secondary)
};

// Right section: help hints
let right_text = "? Help | Ctrl+Q/D Quit ";
// Right section: theme indicator + help hints
let theme_indicator = match app.theme.name {
crate::ui::ThemeName::Dark => "Dark",
crate::ui::ThemeName::Light => "Light",
};
let right_text = format!("{} | ? Help | Ctrl+Q/D Quit ", theme_indicator);

// Calculate padding
let left_len = left_text.len() as u16;
Expand DownExpand Up@@ -945,6 +949,7 @@ fn draw_help_overlay(frame: &mut Frame, app: &App) {
" GLOBAL",
" Ctrl+Q/D Quit",
" Ctrl+C Connect dialog",
" Ctrl+Shift+T Toggle theme",
" ? Toggle help",
"",
" NAVIGATION",
Expand Down
25 changes: 25 additions & 0 deletions src/ui/theme.rs
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
use ratatui::style::{Color, Modifier, Style};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ThemeName {
Dark,
Light,
}

#[allow(dead_code)]
pub struct Theme {
pub name: ThemeName,
// Background colors
pub bg_primary: Color,
pub bg_secondary: Color,
Expand DownExpand Up@@ -43,10 +50,27 @@ impl Default for Theme {
}
}

impl ThemeName {
pub fn toggle(self) -> Self {
match self {
ThemeName::Dark => ThemeName::Light,
ThemeName::Light => ThemeName::Dark,
}
}

pub fn as_str(&self) -> &'static str {
match self {
ThemeName::Dark => "dark",
ThemeName::Light => "light",
}
}
}

#[allow(dead_code)]
impl Theme {
pub fn dark() -> Self {
Self {
name: ThemeName::Dark,
// Background colors - dark blue-gray palette
bg_primary: Color::Rgb(24, 26, 33),
bg_secondary: Color::Rgb(30, 33, 43),
Expand DownExpand Up@@ -85,6 +109,7 @@ impl Theme {

pub fn light() -> Self {
Self {
name: ThemeName::Light,
bg_primary: Color::Rgb(250, 250, 252),
bg_secondary: Color::Rgb(240, 240, 245),
bg_tertiary: Color::Rgb(230, 230, 238),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
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
46 changes: 44 additions & 2 deletions src/ui/app.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use crate::db::{
ConnectionConfig, ConnectionManager, DatabaseInfo, QueryResult, SchemaInfo, SslMode, TableInfo,
};
use crate::editor::{HistoryEntry, QueryHistory, TextBuffer};
use crate::ui::Theme;
use crate::ui::{Theme, ThemeName};

pub const SPINNER_FRAMES: &[char] = &['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

Expand DownExpand Up@@ -198,8 +198,13 @@ impl App {
initial_config.password.len(),
];

let theme = match Self::load_theme_preference() {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};

Self {
theme: Theme::dark(),
theme,
focus: Focus::ConnectionDialog,
should_quit: false,

Expand DownExpand Up@@ -298,9 +303,46 @@ impl App {
}
}

pub fn toggle_theme(&mut self) {
let new_name = self.theme.name.toggle();
self.theme = match new_name {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};
Self::save_theme_preference(new_name);
}

fn save_theme_preference(theme_name: ThemeName) {
if let Some(config_dir) = dirs::config_dir() {
let pgrsql_dir = config_dir.join("pgrsql");
let _ = std::fs::create_dir_all(&pgrsql_dir);
let _ = std::fs::write(pgrsql_dir.join("theme"), theme_name.as_str());
}
}

fn load_theme_preference() -> ThemeName {
if let Some(config_dir) = dirs::config_dir() {
let path = config_dir.join("pgrsql").join("theme");
if let Ok(content) = std::fs::read_to_string(path) {
return match content.trim() {
"light" => ThemeName::Light,
_ => ThemeName::Dark,
};
}
}
ThemeName::Dark
}

pub async fn handle_input(&mut self, key: KeyEvent) -> Result<()> {
// Global shortcuts
match (key.code, key.modifiers) {
// Ctrl+Shift+T: Toggle theme (works in all contexts except connection dialog text input)
// Note: most terminals report Ctrl+Shift+T as Char('T') with only CONTROL;
// the SHIFT modifier is implicit in the uppercase letter.
(KeyCode::Char('T'), m) if m.contains(KeyModifiers::CONTROL) => {
self.toggle_theme();
return Ok(());
}
(KeyCode::Char('?'), _) if self.focus != Focus::Editor => {
self.show_help = !self.show_help;
if self.show_help {
Expand Down
9 changes: 7 additions & 2 deletions src/ui/components.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,8 +633,12 @@ fn draw_status_bar(frame: &mut Frame, app: &App, area: Rect) {
Style::default().fg(theme.text_muted).bg(theme.bg_secondary)
};

// Right section: help hints
let right_text = "? Help | Ctrl+Q/D Quit ";
// Right section: theme indicator + help hints
let theme_indicator = match app.theme.name {
crate::ui::ThemeName::Dark => "Dark",
crate::ui::ThemeName::Light => "Light",
};
let right_text = format!("{} | ? Help | Ctrl+Q/D Quit ", theme_indicator);

// Calculate padding
let left_len = left_text.len() as u16;
Expand DownExpand Up@@ -945,6 +949,7 @@ fn draw_help_overlay(frame: &mut Frame, app: &App) {
" GLOBAL",
" Ctrl+Q/D Quit",
" Ctrl+C Connect dialog",
" Ctrl+Shift+T Toggle theme",
" ? Toggle help",
"",
" NAVIGATION",
Expand Down
25 changes: 25 additions & 0 deletions src/ui/theme.rs
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
use ratatui::style::{Color, Modifier, Style};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ThemeName {
Dark,
Light,
}

#[allow(dead_code)]
pub struct Theme {
pub name: ThemeName,
// Background colors
pub bg_primary: Color,
pub bg_secondary: Color,
Expand DownExpand Up@@ -43,10 +50,27 @@ impl Default for Theme {
}
}

impl ThemeName {
pub fn toggle(self) -> Self {
match self {
ThemeName::Dark => ThemeName::Light,
ThemeName::Light => ThemeName::Dark,
}
}

pub fn as_str(&self) -> &'static str {
match self {
ThemeName::Dark => "dark",
ThemeName::Light => "light",
}
}
}

#[allow(dead_code)]
impl Theme {
pub fn dark() -> Self {
Self {
name: ThemeName::Dark,
// Background colors - dark blue-gray palette
bg_primary: Color::Rgb(24, 26, 33),
bg_secondary: Color::Rgb(30, 33, 43),
Expand DownExpand Up@@ -85,6 +109,7 @@ impl Theme {

pub fn light() -> Self {
Self {
name: ThemeName::Light,
bg_primary: Color::Rgb(250, 250, 252),
bg_secondary: Color::Rgb(240, 240, 245),
bg_tertiary: Color::Rgb(230, 230, 238),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
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
46 changes: 44 additions & 2 deletions src/ui/app.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use crate::db::{
ConnectionConfig, ConnectionManager, DatabaseInfo, QueryResult, SchemaInfo, SslMode, TableInfo,
};
use crate::editor::{HistoryEntry, QueryHistory, TextBuffer};
use crate::ui::Theme;
use crate::ui::{Theme, ThemeName};

pub const SPINNER_FRAMES: &[char] = &['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

Expand DownExpand Up@@ -198,8 +198,13 @@ impl App {
initial_config.password.len(),
];

let theme = match Self::load_theme_preference() {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};

Self {
theme: Theme::dark(),
theme,
focus: Focus::ConnectionDialog,
should_quit: false,

Expand DownExpand Up@@ -298,9 +303,46 @@ impl App {
}
}

pub fn toggle_theme(&mut self) {
let new_name = self.theme.name.toggle();
self.theme = match new_name {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};
Self::save_theme_preference(new_name);
}

fn save_theme_preference(theme_name: ThemeName) {
if let Some(config_dir) = dirs::config_dir() {
let pgrsql_dir = config_dir.join("pgrsql");
let _ = std::fs::create_dir_all(&pgrsql_dir);
let _ = std::fs::write(pgrsql_dir.join("theme"), theme_name.as_str());
}
}

fn load_theme_preference() -> ThemeName {
if let Some(config_dir) = dirs::config_dir() {
let path = config_dir.join("pgrsql").join("theme");
if let Ok(content) = std::fs::read_to_string(path) {
return match content.trim() {
"light" => ThemeName::Light,
_ => ThemeName::Dark,
};
}
}
ThemeName::Dark
}

pub async fn handle_input(&mut self, key: KeyEvent) -> Result<()> {
// Global shortcuts
match (key.code, key.modifiers) {
// Ctrl+Shift+T: Toggle theme (works in all contexts except connection dialog text input)
// Note: most terminals report Ctrl+Shift+T as Char('T') with only CONTROL;
// the SHIFT modifier is implicit in the uppercase letter.
(KeyCode::Char('T'), m) if m.contains(KeyModifiers::CONTROL) => {
self.toggle_theme();
return Ok(());
}
(KeyCode::Char('?'), _) if self.focus != Focus::Editor => {
self.show_help = !self.show_help;
if self.show_help {
Expand Down
9 changes: 7 additions & 2 deletions src/ui/components.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,8 +633,12 @@ fn draw_status_bar(frame: &mut Frame, app: &App, area: Rect) {
Style::default().fg(theme.text_muted).bg(theme.bg_secondary)
};

// Right section: help hints
let right_text = "? Help | Ctrl+Q/D Quit ";
// Right section: theme indicator + help hints
let theme_indicator = match app.theme.name {
crate::ui::ThemeName::Dark => "Dark",
crate::ui::ThemeName::Light => "Light",
};
let right_text = format!("{} | ? Help | Ctrl+Q/D Quit ", theme_indicator);

// Calculate padding
let left_len = left_text.len() as u16;
Expand DownExpand Up@@ -945,6 +949,7 @@ fn draw_help_overlay(frame: &mut Frame, app: &App) {
" GLOBAL",
" Ctrl+Q/D Quit",
" Ctrl+C Connect dialog",
" Ctrl+Shift+T Toggle theme",
" ? Toggle help",
"",
" NAVIGATION",
Expand Down
25 changes: 25 additions & 0 deletions src/ui/theme.rs
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
use ratatui::style::{Color, Modifier, Style};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ThemeName {
Dark,
Light,
}

#[allow(dead_code)]
pub struct Theme {
pub name: ThemeName,
// Background colors
pub bg_primary: Color,
pub bg_secondary: Color,
Expand DownExpand Up@@ -43,10 +50,27 @@ impl Default for Theme {
}
}

impl ThemeName {
pub fn toggle(self) -> Self {
match self {
ThemeName::Dark => ThemeName::Light,
ThemeName::Light => ThemeName::Dark,
}
}

pub fn as_str(&self) -> &'static str {
match self {
ThemeName::Dark => "dark",
ThemeName::Light => "light",
}
}
}

#[allow(dead_code)]
impl Theme {
pub fn dark() -> Self {
Self {
name: ThemeName::Dark,
// Background colors - dark blue-gray palette
bg_primary: Color::Rgb(24, 26, 33),
bg_secondary: Color::Rgb(30, 33, 43),
Expand DownExpand Up@@ -85,6 +109,7 @@ impl Theme {

pub fn light() -> Self {
Self {
name: ThemeName::Light,
bg_primary: Color::Rgb(250, 250, 252),
bg_secondary: Color::Rgb(240, 240, 245),
bg_tertiary: Color::Rgb(230, 230, 238),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
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
46 changes: 44 additions & 2 deletions src/ui/app.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use crate::db::{
ConnectionConfig, ConnectionManager, DatabaseInfo, QueryResult, SchemaInfo, SslMode, TableInfo,
};
use crate::editor::{HistoryEntry, QueryHistory, TextBuffer};
use crate::ui::Theme;
use crate::ui::{Theme, ThemeName};

pub const SPINNER_FRAMES: &[char] = &['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

Expand DownExpand Up@@ -198,8 +198,13 @@ impl App {
initial_config.password.len(),
];

let theme = match Self::load_theme_preference() {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};

Self {
theme: Theme::dark(),
theme,
focus: Focus::ConnectionDialog,
should_quit: false,

Expand DownExpand Up@@ -298,9 +303,46 @@ impl App {
}
}

pub fn toggle_theme(&mut self) {
let new_name = self.theme.name.toggle();
self.theme = match new_name {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};
Self::save_theme_preference(new_name);
}

fn save_theme_preference(theme_name: ThemeName) {
if let Some(config_dir) = dirs::config_dir() {
let pgrsql_dir = config_dir.join("pgrsql");
let _ = std::fs::create_dir_all(&pgrsql_dir);
let _ = std::fs::write(pgrsql_dir.join("theme"), theme_name.as_str());
}
}

fn load_theme_preference() -> ThemeName {
if let Some(config_dir) = dirs::config_dir() {
let path = config_dir.join("pgrsql").join("theme");
if let Ok(content) = std::fs::read_to_string(path) {
return match content.trim() {
"light" => ThemeName::Light,
_ => ThemeName::Dark,
};
}
}
ThemeName::Dark
}

pub async fn handle_input(&mut self, key: KeyEvent) -> Result<()> {
// Global shortcuts
match (key.code, key.modifiers) {
// Ctrl+Shift+T: Toggle theme (works in all contexts except connection dialog text input)
// Note: most terminals report Ctrl+Shift+T as Char('T') with only CONTROL;
// the SHIFT modifier is implicit in the uppercase letter.
(KeyCode::Char('T'), m) if m.contains(KeyModifiers::CONTROL) => {
self.toggle_theme();
return Ok(());
}
(KeyCode::Char('?'), _) if self.focus != Focus::Editor => {
self.show_help = !self.show_help;
if self.show_help {
Expand Down
9 changes: 7 additions & 2 deletions src/ui/components.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,8 +633,12 @@ fn draw_status_bar(frame: &mut Frame, app: &App, area: Rect) {
Style::default().fg(theme.text_muted).bg(theme.bg_secondary)
};

// Right section: help hints
let right_text = "? Help | Ctrl+Q/D Quit ";
// Right section: theme indicator + help hints
let theme_indicator = match app.theme.name {
crate::ui::ThemeName::Dark => "Dark",
crate::ui::ThemeName::Light => "Light",
};
let right_text = format!("{} | ? Help | Ctrl+Q/D Quit ", theme_indicator);

// Calculate padding
let left_len = left_text.len() as u16;
Expand DownExpand Up@@ -945,6 +949,7 @@ fn draw_help_overlay(frame: &mut Frame, app: &App) {
" GLOBAL",
" Ctrl+Q/D Quit",
" Ctrl+C Connect dialog",
" Ctrl+Shift+T Toggle theme",
" ? Toggle help",
"",
" NAVIGATION",
Expand Down
25 changes: 25 additions & 0 deletions src/ui/theme.rs
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
use ratatui::style::{Color, Modifier, Style};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ThemeName {
Dark,
Light,
}

#[allow(dead_code)]
pub struct Theme {
pub name: ThemeName,
// Background colors
pub bg_primary: Color,
pub bg_secondary: Color,
Expand DownExpand Up@@ -43,10 +50,27 @@ impl Default for Theme {
}
}

impl ThemeName {
pub fn toggle(self) -> Self {
match self {
ThemeName::Dark => ThemeName::Light,
ThemeName::Light => ThemeName::Dark,
}
}

pub fn as_str(&self) -> &'static str {
match self {
ThemeName::Dark => "dark",
ThemeName::Light => "light",
}
}
}

#[allow(dead_code)]
impl Theme {
pub fn dark() -> Self {
Self {
name: ThemeName::Dark,
// Background colors - dark blue-gray palette
bg_primary: Color::Rgb(24, 26, 33),
bg_secondary: Color::Rgb(30, 33, 43),
Expand DownExpand Up@@ -85,6 +109,7 @@ impl Theme {

pub fn light() -> Self {
Self {
name: ThemeName::Light,
bg_primary: Color::Rgb(250, 250, 252),
bg_secondary: Color::Rgb(240, 240, 245),
bg_tertiary: Color::Rgb(230, 230, 238),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
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
46 changes: 44 additions & 2 deletions src/ui/app.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use crate::db::{
ConnectionConfig, ConnectionManager, DatabaseInfo, QueryResult, SchemaInfo, SslMode, TableInfo,
};
use crate::editor::{HistoryEntry, QueryHistory, TextBuffer};
use crate::ui::Theme;
use crate::ui::{Theme, ThemeName};

pub const SPINNER_FRAMES: &[char] = &['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

Expand DownExpand Up@@ -198,8 +198,13 @@ impl App {
initial_config.password.len(),
];

let theme = match Self::load_theme_preference() {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};

Self {
theme: Theme::dark(),
theme,
focus: Focus::ConnectionDialog,
should_quit: false,

Expand DownExpand Up@@ -298,9 +303,46 @@ impl App {
}
}

pub fn toggle_theme(&mut self) {
let new_name = self.theme.name.toggle();
self.theme = match new_name {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};
Self::save_theme_preference(new_name);
}

fn save_theme_preference(theme_name: ThemeName) {
if let Some(config_dir) = dirs::config_dir() {
let pgrsql_dir = config_dir.join("pgrsql");
let _ = std::fs::create_dir_all(&pgrsql_dir);
let _ = std::fs::write(pgrsql_dir.join("theme"), theme_name.as_str());
}
}

fn load_theme_preference() -> ThemeName {
if let Some(config_dir) = dirs::config_dir() {
let path = config_dir.join("pgrsql").join("theme");
if let Ok(content) = std::fs::read_to_string(path) {
return match content.trim() {
"light" => ThemeName::Light,
_ => ThemeName::Dark,
};
}
}
ThemeName::Dark
}

pub async fn handle_input(&mut self, key: KeyEvent) -> Result<()> {
// Global shortcuts
match (key.code, key.modifiers) {
// Ctrl+Shift+T: Toggle theme (works in all contexts except connection dialog text input)
// Note: most terminals report Ctrl+Shift+T as Char('T') with only CONTROL;
// the SHIFT modifier is implicit in the uppercase letter.
(KeyCode::Char('T'), m) if m.contains(KeyModifiers::CONTROL) => {
self.toggle_theme();
return Ok(());
}
(KeyCode::Char('?'), _) if self.focus != Focus::Editor => {
self.show_help = !self.show_help;
if self.show_help {
Expand Down
9 changes: 7 additions & 2 deletions src/ui/components.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,8 +633,12 @@ fn draw_status_bar(frame: &mut Frame, app: &App, area: Rect) {
Style::default().fg(theme.text_muted).bg(theme.bg_secondary)
};

// Right section: help hints
let right_text = "? Help | Ctrl+Q/D Quit ";
// Right section: theme indicator + help hints
let theme_indicator = match app.theme.name {
crate::ui::ThemeName::Dark => "Dark",
crate::ui::ThemeName::Light => "Light",
};
let right_text = format!("{} | ? Help | Ctrl+Q/D Quit ", theme_indicator);

// Calculate padding
let left_len = left_text.len() as u16;
Expand DownExpand Up@@ -945,6 +949,7 @@ fn draw_help_overlay(frame: &mut Frame, app: &App) {
" GLOBAL",
" Ctrl+Q/D Quit",
" Ctrl+C Connect dialog",
" Ctrl+Shift+T Toggle theme",
" ? Toggle help",
"",
" NAVIGATION",
Expand Down
25 changes: 25 additions & 0 deletions src/ui/theme.rs
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
use ratatui::style::{Color, Modifier, Style};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ThemeName {
Dark,
Light,
}

#[allow(dead_code)]
pub struct Theme {
pub name: ThemeName,
// Background colors
pub bg_primary: Color,
pub bg_secondary: Color,
Expand DownExpand Up@@ -43,10 +50,27 @@ impl Default for Theme {
}
}

impl ThemeName {
pub fn toggle(self) -> Self {
match self {
ThemeName::Dark => ThemeName::Light,
ThemeName::Light => ThemeName::Dark,
}
}

pub fn as_str(&self) -> &'static str {
match self {
ThemeName::Dark => "dark",
ThemeName::Light => "light",
}
}
}

#[allow(dead_code)]
impl Theme {
pub fn dark() -> Self {
Self {
name: ThemeName::Dark,
// Background colors - dark blue-gray palette
bg_primary: Color::Rgb(24, 26, 33),
bg_secondary: Color::Rgb(30, 33, 43),
Expand DownExpand Up@@ -85,6 +109,7 @@ impl Theme {

pub fn light() -> Self {
Self {
name: ThemeName::Light,
bg_primary: Color::Rgb(250, 250, 252),
bg_secondary: Color::Rgb(240, 240, 245),
bg_tertiary: Color::Rgb(230, 230, 238),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
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
46 changes: 44 additions & 2 deletions src/ui/app.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use crate::db::{
ConnectionConfig, ConnectionManager, DatabaseInfo, QueryResult, SchemaInfo, SslMode, TableInfo,
};
use crate::editor::{HistoryEntry, QueryHistory, TextBuffer};
use crate::ui::Theme;
use crate::ui::{Theme, ThemeName};

pub const SPINNER_FRAMES: &[char] = &['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

Expand DownExpand Up@@ -198,8 +198,13 @@ impl App {
initial_config.password.len(),
];

let theme = match Self::load_theme_preference() {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};

Self {
theme: Theme::dark(),
theme,
focus: Focus::ConnectionDialog,
should_quit: false,

Expand DownExpand Up@@ -298,9 +303,46 @@ impl App {
}
}

pub fn toggle_theme(&mut self) {
let new_name = self.theme.name.toggle();
self.theme = match new_name {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};
Self::save_theme_preference(new_name);
}

fn save_theme_preference(theme_name: ThemeName) {
if let Some(config_dir) = dirs::config_dir() {
let pgrsql_dir = config_dir.join("pgrsql");
let _ = std::fs::create_dir_all(&pgrsql_dir);
let _ = std::fs::write(pgrsql_dir.join("theme"), theme_name.as_str());
}
}

fn load_theme_preference() -> ThemeName {
if let Some(config_dir) = dirs::config_dir() {
let path = config_dir.join("pgrsql").join("theme");
if let Ok(content) = std::fs::read_to_string(path) {
return match content.trim() {
"light" => ThemeName::Light,
_ => ThemeName::Dark,
};
}
}
ThemeName::Dark
}

pub async fn handle_input(&mut self, key: KeyEvent) -> Result<()> {
// Global shortcuts
match (key.code, key.modifiers) {
// Ctrl+Shift+T: Toggle theme (works in all contexts except connection dialog text input)
// Note: most terminals report Ctrl+Shift+T as Char('T') with only CONTROL;
// the SHIFT modifier is implicit in the uppercase letter.
(KeyCode::Char('T'), m) if m.contains(KeyModifiers::CONTROL) => {
self.toggle_theme();
return Ok(());
}
(KeyCode::Char('?'), _) if self.focus != Focus::Editor => {
self.show_help = !self.show_help;
if self.show_help {
Expand Down
9 changes: 7 additions & 2 deletions src/ui/components.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,8 +633,12 @@ fn draw_status_bar(frame: &mut Frame, app: &App, area: Rect) {
Style::default().fg(theme.text_muted).bg(theme.bg_secondary)
};

// Right section: help hints
let right_text = "? Help | Ctrl+Q/D Quit ";
// Right section: theme indicator + help hints
let theme_indicator = match app.theme.name {
crate::ui::ThemeName::Dark => "Dark",
crate::ui::ThemeName::Light => "Light",
};
let right_text = format!("{} | ? Help | Ctrl+Q/D Quit ", theme_indicator);

// Calculate padding
let left_len = left_text.len() as u16;
Expand DownExpand Up@@ -945,6 +949,7 @@ fn draw_help_overlay(frame: &mut Frame, app: &App) {
" GLOBAL",
" Ctrl+Q/D Quit",
" Ctrl+C Connect dialog",
" Ctrl+Shift+T Toggle theme",
" ? Toggle help",
"",
" NAVIGATION",
Expand Down
25 changes: 25 additions & 0 deletions src/ui/theme.rs
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
use ratatui::style::{Color, Modifier, Style};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ThemeName {
Dark,
Light,
}

#[allow(dead_code)]
pub struct Theme {
pub name: ThemeName,
// Background colors
pub bg_primary: Color,
pub bg_secondary: Color,
Expand DownExpand Up@@ -43,10 +50,27 @@ impl Default for Theme {
}
}

impl ThemeName {
pub fn toggle(self) -> Self {
match self {
ThemeName::Dark => ThemeName::Light,
ThemeName::Light => ThemeName::Dark,
}
}

pub fn as_str(&self) -> &'static str {
match self {
ThemeName::Dark => "dark",
ThemeName::Light => "light",
}
}
}

#[allow(dead_code)]
impl Theme {
pub fn dark() -> Self {
Self {
name: ThemeName::Dark,
// Background colors - dark blue-gray palette
bg_primary: Color::Rgb(24, 26, 33),
bg_secondary: Color::Rgb(30, 33, 43),
Expand DownExpand Up@@ -85,6 +109,7 @@ impl Theme {

pub fn light() -> Self {
Self {
name: ThemeName::Light,
bg_primary: Color::Rgb(250, 250, 252),
bg_secondary: Color::Rgb(240, 240, 245),
bg_tertiary: Color::Rgb(230, 230, 238),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
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
46 changes: 44 additions & 2 deletions src/ui/app.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use crate::db::{
ConnectionConfig, ConnectionManager, DatabaseInfo, QueryResult, SchemaInfo, SslMode, TableInfo,
};
use crate::editor::{HistoryEntry, QueryHistory, TextBuffer};
use crate::ui::Theme;
use crate::ui::{Theme, ThemeName};

pub const SPINNER_FRAMES: &[char] = &['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

Expand DownExpand Up@@ -198,8 +198,13 @@ impl App {
initial_config.password.len(),
];

let theme = match Self::load_theme_preference() {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};

Self {
theme: Theme::dark(),
theme,
focus: Focus::ConnectionDialog,
should_quit: false,

Expand DownExpand Up@@ -298,9 +303,46 @@ impl App {
}
}

pub fn toggle_theme(&mut self) {
let new_name = self.theme.name.toggle();
self.theme = match new_name {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};
Self::save_theme_preference(new_name);
}

fn save_theme_preference(theme_name: ThemeName) {
if let Some(config_dir) = dirs::config_dir() {
let pgrsql_dir = config_dir.join("pgrsql");
let _ = std::fs::create_dir_all(&pgrsql_dir);
let _ = std::fs::write(pgrsql_dir.join("theme"), theme_name.as_str());
}
}

fn load_theme_preference() -> ThemeName {
if let Some(config_dir) = dirs::config_dir() {
let path = config_dir.join("pgrsql").join("theme");
if let Ok(content) = std::fs::read_to_string(path) {
return match content.trim() {
"light" => ThemeName::Light,
_ => ThemeName::Dark,
};
}
}
ThemeName::Dark
}

pub async fn handle_input(&mut self, key: KeyEvent) -> Result<()> {
// Global shortcuts
match (key.code, key.modifiers) {
// Ctrl+Shift+T: Toggle theme (works in all contexts except connection dialog text input)
// Note: most terminals report Ctrl+Shift+T as Char('T') with only CONTROL;
// the SHIFT modifier is implicit in the uppercase letter.
(KeyCode::Char('T'), m) if m.contains(KeyModifiers::CONTROL) => {
self.toggle_theme();
return Ok(());
}
(KeyCode::Char('?'), _) if self.focus != Focus::Editor => {
self.show_help = !self.show_help;
if self.show_help {
Expand Down
9 changes: 7 additions & 2 deletions src/ui/components.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,8 +633,12 @@ fn draw_status_bar(frame: &mut Frame, app: &App, area: Rect) {
Style::default().fg(theme.text_muted).bg(theme.bg_secondary)
};

// Right section: help hints
let right_text = "? Help | Ctrl+Q/D Quit ";
// Right section: theme indicator + help hints
let theme_indicator = match app.theme.name {
crate::ui::ThemeName::Dark => "Dark",
crate::ui::ThemeName::Light => "Light",
};
let right_text = format!("{} | ? Help | Ctrl+Q/D Quit ", theme_indicator);

// Calculate padding
let left_len = left_text.len() as u16;
Expand DownExpand Up@@ -945,6 +949,7 @@ fn draw_help_overlay(frame: &mut Frame, app: &App) {
" GLOBAL",
" Ctrl+Q/D Quit",
" Ctrl+C Connect dialog",
" Ctrl+Shift+T Toggle theme",
" ? Toggle help",
"",
" NAVIGATION",
Expand Down
25 changes: 25 additions & 0 deletions src/ui/theme.rs
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
use ratatui::style::{Color, Modifier, Style};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ThemeName {
Dark,
Light,
}

#[allow(dead_code)]
pub struct Theme {
pub name: ThemeName,
// Background colors
pub bg_primary: Color,
pub bg_secondary: Color,
Expand DownExpand Up@@ -43,10 +50,27 @@ impl Default for Theme {
}
}

impl ThemeName {
pub fn toggle(self) -> Self {
match self {
ThemeName::Dark => ThemeName::Light,
ThemeName::Light => ThemeName::Dark,
}
}

pub fn as_str(&self) -> &'static str {
match self {
ThemeName::Dark => "dark",
ThemeName::Light => "light",
}
}
}

#[allow(dead_code)]
impl Theme {
pub fn dark() -> Self {
Self {
name: ThemeName::Dark,
// Background colors - dark blue-gray palette
bg_primary: Color::Rgb(24, 26, 33),
bg_secondary: Color::Rgb(30, 33, 43),
Expand DownExpand Up@@ -85,6 +109,7 @@ impl Theme {

pub fn light() -> Self {
Self {
name: ThemeName::Light,
bg_primary: Color::Rgb(250, 250, 252),
bg_secondary: Color::Rgb(240, 240, 245),
bg_tertiary: Color::Rgb(230, 230, 238),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
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
46 changes: 44 additions & 2 deletions src/ui/app.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use crate::db::{
ConnectionConfig, ConnectionManager, DatabaseInfo, QueryResult, SchemaInfo, SslMode, TableInfo,
};
use crate::editor::{HistoryEntry, QueryHistory, TextBuffer};
use crate::ui::Theme;
use crate::ui::{Theme, ThemeName};

pub const SPINNER_FRAMES: &[char] = &['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];

Expand DownExpand Up@@ -198,8 +198,13 @@ impl App {
initial_config.password.len(),
];

let theme = match Self::load_theme_preference() {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};

Self {
theme: Theme::dark(),
theme,
focus: Focus::ConnectionDialog,
should_quit: false,

Expand DownExpand Up@@ -298,9 +303,46 @@ impl App {
}
}

pub fn toggle_theme(&mut self) {
let new_name = self.theme.name.toggle();
self.theme = match new_name {
ThemeName::Dark => Theme::dark(),
ThemeName::Light => Theme::light(),
};
Self::save_theme_preference(new_name);
}

fn save_theme_preference(theme_name: ThemeName) {
if let Some(config_dir) = dirs::config_dir() {
let pgrsql_dir = config_dir.join("pgrsql");
let _ = std::fs::create_dir_all(&pgrsql_dir);
let _ = std::fs::write(pgrsql_dir.join("theme"), theme_name.as_str());
}
}

fn load_theme_preference() -> ThemeName {
if let Some(config_dir) = dirs::config_dir() {
let path = config_dir.join("pgrsql").join("theme");
if let Ok(content) = std::fs::read_to_string(path) {
return match content.trim() {
"light" => ThemeName::Light,
_ => ThemeName::Dark,
};
}
}
ThemeName::Dark
}

pub async fn handle_input(&mut self, key: KeyEvent) -> Result<()> {
// Global shortcuts
match (key.code, key.modifiers) {
// Ctrl+Shift+T: Toggle theme (works in all contexts except connection dialog text input)
// Note: most terminals report Ctrl+Shift+T as Char('T') with only CONTROL;
// the SHIFT modifier is implicit in the uppercase letter.
(KeyCode::Char('T'), m) if m.contains(KeyModifiers::CONTROL) => {
self.toggle_theme();
return Ok(());
}
(KeyCode::Char('?'), _) if self.focus != Focus::Editor => {
self.show_help = !self.show_help;
if self.show_help {
Expand Down
9 changes: 7 additions & 2 deletions src/ui/components.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -633,8 +633,12 @@ fn draw_status_bar(frame: &mut Frame, app: &App, area: Rect) {
Style::default().fg(theme.text_muted).bg(theme.bg_secondary)
};

// Right section: help hints
let right_text = "? Help | Ctrl+Q/D Quit ";
// Right section: theme indicator + help hints
let theme_indicator = match app.theme.name {
crate::ui::ThemeName::Dark => "Dark",
crate::ui::ThemeName::Light => "Light",
};
let right_text = format!("{} | ? Help | Ctrl+Q/D Quit ", theme_indicator);

// Calculate padding
let left_len = left_text.len() as u16;
Expand DownExpand Up@@ -945,6 +949,7 @@ fn draw_help_overlay(frame: &mut Frame, app: &App) {
" GLOBAL",
" Ctrl+Q/D Quit",
" Ctrl+C Connect dialog",
" Ctrl+Shift+T Toggle theme",
" ? Toggle help",
"",
" NAVIGATION",
Expand Down
25 changes: 25 additions & 0 deletions src/ui/theme.rs
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
use ratatui::style::{Color, Modifier, Style};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ThemeName {
Dark,
Light,
}

#[allow(dead_code)]
pub struct Theme {
pub name: ThemeName,
// Background colors
pub bg_primary: Color,
pub bg_secondary: Color,
Expand DownExpand Up@@ -43,10 +50,27 @@ impl Default for Theme {
}
}

impl ThemeName {
pub fn toggle(self) -> Self {
match self {
ThemeName::Dark => ThemeName::Light,
ThemeName::Light => ThemeName::Dark,
}
}

pub fn as_str(&self) -> &'static str {
match self {
ThemeName::Dark => "dark",
ThemeName::Light => "light",
}
}
}

#[allow(dead_code)]
impl Theme {
pub fn dark() -> Self {
Self {
name: ThemeName::Dark,
// Background colors - dark blue-gray palette
bg_primary: Color::Rgb(24, 26, 33),
bg_secondary: Color::Rgb(30, 33, 43),
Expand DownExpand Up@@ -85,6 +109,7 @@ impl Theme {

pub fn light() -> Self {
Self {
name: ThemeName::Light,
bg_primary: Color::Rgb(250, 250, 252),
bg_secondary: Color::Rgb(240, 240, 245),
bg_tertiary: Color::Rgb(230, 230, 238),
Expand Down