dataframe-textual 2.10.1__tar.gz → 2.12.0__tar.gz

{dataframe_textual-2.10.1 → dataframe_textual-2.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 2.10.1
+Version: 2.12.0
 Summary: Interactive terminal viewer/editor for tabular data
 Project-URL: Homepage, https://github.com/need47/dataframe-textual
 Project-URL: Repository, https://github.com/need47/dataframe-textual.git
@@ -195,6 +195,7 @@ options:
   -N, --n-rows N        Stop after reading N rows from CSV/TSV
   -n, --null NULL [NULL ...]
                         Values to interpret as null values when reading CSV/TSV
+  --theme [THEME]       Set the theme for the application (use 'list' to see available themes)
 ```
 
 ### CLI Examples
@@ -233,6 +234,9 @@ dv -l 3 -a 1 -I messy_scientific_data.csv
 # Process compressed data
 dv data.csv.gz
 zcat compressed_data.csv.gz | dv -f csv
+
+# Choose the `monokai` theme
+dv --theme monokai data.csv
 ```
 
 ## Keyboard Shortcuts
@@ -247,8 +251,8 @@ zcat compressed_data.csv.gz | dv -f csv
 | `<` | Move to previous tab |
 | `b` | Cycle through tabs |
 | `B` | Toggle tab bar visibility |
-| `q` | Close current tab (prompts to save unsaved changes) |
-| `Q` | Close all tabs and app (prompts to save unsaved changes) |
+| `q` | Quit current tab (prompts to save unsaved changes) |
+| `Q` | Quit all tabs and app (prompts to save unsaved changes) |
 | `Ctrl+Q` | Force to quit app (regardless of unsaved changes) |
 | `Ctrl+T` | Save current tab to file |
 | `Ctrl+S` | Save all tabs to file |
@@ -306,9 +310,9 @@ zcat compressed_data.csv.gz | dv -f csv
 | `_` (underscore) | Toggle column full width |
 | `z` | Freeze rows and columns |
 | `,` | Toggle thousand separator for numeric display |
-| `&` | Set current row as the new header row | 
+| `&` | Set current row as the new header row |
 | `h` | Hide current column |
-| `H` | Show all hidden rows/columns |
+| `H` | Show all hidden columns |
 
 #### Editing
 
@@ -499,7 +503,7 @@ Both operations show selected rows but with fundamentally different effects:
 **When to use View** (`v` or `V`):
 - Exploring or analyzing data safely
 - Switching between different perspectives
-- Press `H` to restore hidden rows (and hidden columns)
+- Press `q` to return to main table
 
 **When to use Filter** (`"`):
 - Cleaning data (removing unwanted rows)
@@ -678,7 +682,7 @@ This is useful for:
 
 **Hide/Show Columns** (`h` / `H`):
 - `h` - Temporarily hide current column (data preserved)
-- `H` - Restore all hidden columns and rows
+- `H` - Restore all hidden columns
 
 ### 12. Column & Row Reordering
 

{dataframe_textual-2.10.1 → dataframe_textual-2.12.0}/README.md

@@ -156,6 +156,7 @@ options:
   -N, --n-rows N        Stop after reading N rows from CSV/TSV
   -n, --null NULL [NULL ...]
                         Values to interpret as null values when reading CSV/TSV
+  --theme [THEME]       Set the theme for the application (use 'list' to see available themes)
 ```
 
 ### CLI Examples
@@ -194,6 +195,9 @@ dv -l 3 -a 1 -I messy_scientific_data.csv
 # Process compressed data
 dv data.csv.gz
 zcat compressed_data.csv.gz | dv -f csv
+
+# Choose the `monokai` theme
+dv --theme monokai data.csv
 ```
 
 ## Keyboard Shortcuts
@@ -208,8 +212,8 @@ zcat compressed_data.csv.gz | dv -f csv
 | `<` | Move to previous tab |
 | `b` | Cycle through tabs |
 | `B` | Toggle tab bar visibility |
-| `q` | Close current tab (prompts to save unsaved changes) |
-| `Q` | Close all tabs and app (prompts to save unsaved changes) |
+| `q` | Quit current tab (prompts to save unsaved changes) |
+| `Q` | Quit all tabs and app (prompts to save unsaved changes) |
 | `Ctrl+Q` | Force to quit app (regardless of unsaved changes) |
 | `Ctrl+T` | Save current tab to file |
 | `Ctrl+S` | Save all tabs to file |
@@ -267,9 +271,9 @@ zcat compressed_data.csv.gz | dv -f csv
 | `_` (underscore) | Toggle column full width |
 | `z` | Freeze rows and columns |
 | `,` | Toggle thousand separator for numeric display |
-| `&` | Set current row as the new header row | 
+| `&` | Set current row as the new header row |
 | `h` | Hide current column |
-| `H` | Show all hidden rows/columns |
+| `H` | Show all hidden columns |
 
 #### Editing
 
@@ -460,7 +464,7 @@ Both operations show selected rows but with fundamentally different effects:
 **When to use View** (`v` or `V`):
 - Exploring or analyzing data safely
 - Switching between different perspectives
-- Press `H` to restore hidden rows (and hidden columns)
+- Press `q` to return to main table
 
 **When to use Filter** (`"`):
 - Cleaning data (removing unwanted rows)
@@ -639,7 +643,7 @@ This is useful for:
 
 **Hide/Show Columns** (`h` / `H`):
 - `h` - Temporarily hide current column (data preserved)
-- `H` - Restore all hidden columns and rows
+- `H` - Restore all hidden columns
 
 ### 12. Column & Row Reordering
 

{dataframe_textual-2.10.1 → dataframe_textual-2.12.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dataframe-textual"
-version = "2.10.1"
+version = "2.12.0"
 description = "Interactive terminal viewer/editor for tabular data"
 readme = "README.md"
 requires-python = ">=3.11"

{dataframe_textual-2.10.1 → dataframe_textual-2.12.0}/src/dataframe_textual/__main__.py

@@ -4,6 +4,8 @@ import argparse
 import sys
 from pathlib import Path
 
+from textual.theme import BUILTIN_THEMES
+
 from . import __version__
 from .common import SUPPORTED_FORMATS, load_dataframe
 from .data_frame_viewer import DataFrameViewer
@@ -81,7 +83,23 @@ def cli() -> argparse.Namespace:
     parser.add_argument("-N", "--n-rows", metavar="N", type=int, help="Stop after reading N rows from CSV/TSV")
     parser.add_argument("-n", "--null", nargs="+", help="Values to interpret as null values when reading CSV/TSV")
 
+    parser.add_argument(
+        "--theme",
+        nargs="?",
+        const="list",
+        help="Set the theme for the application (use 'list' to see available themes)",
+    )
+
     args = parser.parse_args()
+
+    # List available themes and exit
+    if args.theme == "list":
+        print("Available themes:")
+        for theme in BUILTIN_THEMES:
+            print(f"  - {theme}")
+        sys.exit(0)
+
+    # Handle files
     if args.files is None:
         args.files = []
 
@@ -119,7 +137,7 @@ def main() -> None:
         truncate_ragged_lines=args.truncate_ragged_lines,
         n_rows=args.n_rows,
     )
-    app = DataFrameViewer(*sources)
+    app = DataFrameViewer(*sources, theme=args.theme)
     app.run()
 
 

{dataframe_textual-2.10.1 → dataframe_textual-2.12.0}/src/dataframe_textual/data_frame_table.py

@@ -242,7 +242,7 @@ class DataFrameTable(DataTable):
         ("ctrl+u", "reset", "Reset to initial state"),
         # Display
         ("h", "hide_column", "Hide column"),
-        ("H", "show_hidden_rows_columns", "Show hidden rows/columns"),
+        ("H", "show_hidden_columns", "Show hidden column(s)"),
         ("tilde", "toggle_row_labels", "Toggle row labels"),  # `~`
         ("K", "cycle_cursor_type", "Cycle cursor mode"),  # `K`
         ("z", "freeze_row_column", "Freeze rows/columns"),
@@ -731,9 +731,9 @@ class DataFrameTable(DataTable):
         """Set cursor row as the new header row."""
         self.do_set_cursor_row_as_header()
 
-    def action_show_hidden_rows_columns(self) -> None:
-        """Show all hidden rows/columns."""
-        self.do_show_hidden_rows_columns()
+    def action_show_hidden_columns(self) -> None:
+        """Show all hidden columns."""
+        self.do_show_hidden_columns()
 
     def action_sort_ascending(self) -> None:
         """Sort by current column in ascending order."""
@@ -1847,27 +1847,22 @@ class DataFrameTable(DataTable):
 
         # self.notify(f"Set row [$success]{ridx + 1}[/] as header", title="Set Row as Header")
 
-    def do_show_hidden_rows_columns(self) -> None:
-        """Show all hidden rows/columns by recreating the table."""
-        if not self.hidden_columns and self.df_view is None:
-            # self.notify("No hidden rows or columns to show", title="Show Hidden Rows/Columns", severity="warning")
+    def do_show_hidden_columns(self) -> None:
+        """Show all hidden columns by recreating the table."""
+        if not self.hidden_columns:
+            # self.notify("No hidden columns to show", title="Show Hidden Column(s)", severity="warning")
             return
 
         # Add to history
-        self.add_history("Showed hidden rows/columns")
+        self.add_history("Showed hidden column(s)")
 
-        # If in a filtered view, restore the full dataframe
-        if self.df_view is not None:
-            self.df = self.df_view
-            self.df_view = None
-
-        # Clear hidden rows/columns tracking
+        # Clear hidden columns tracking
         self.hidden_columns.clear()
 
         # Recreate table for display
         self.setup_table()
 
-        # self.notify("Showed hidden row(s) and/or hidden column(s)", title="Show Hidden Rows/Columns")
+        # self.notify("Showed hidden column(s)", title="Show Hidden Column(s)")
 
     # Sort
     def do_sort_by_column(self, descending: bool = False) -> None:

{dataframe_textual-2.10.1 → dataframe_textual-2.12.0}/src/dataframe_textual/data_frame_viewer.py

@@ -58,8 +58,8 @@ class DataFrameViewer(App):
     """).strip()
 
     BINDINGS = [
-        ("q", "close_tab", "Close current tab"),
-        ("Q", "close_all_tabs", "Close all tabs and quit app"),
+        ("q", "quit", "Quit from view or close current tab"),
+        ("Q", "quit_all", "Quit app after closing all tabs"),
         ("B", "toggle_tab_bar", "Toggle Tab Bar"),
         ("f1", "toggle_help_panel", "Help"),
         ("ctrl+o", "open_file", "Open File"),
@@ -88,7 +88,7 @@ class DataFrameViewer(App):
         }
     """
 
-    def __init__(self, *sources: Source) -> None:
+    def __init__(self, *sources: Source, theme: str | None = None) -> None:
         """Initialize the DataFrame Viewer application.
 
         Loads data from provided sources and prepares the tabbed interface.
@@ -96,9 +96,11 @@ class DataFrameViewer(App):
         Args:
             sources: sources to load dataframes from, each as a tuple of
                      (DataFrame, filename, tabname).
+            theme: Optional; The theme to use for the application.
         """
         super().__init__()
         self.sources = sources
+        self.theme = theme
         self.tabs: dict[TabPane, DataFrameTable] = {}
         self.help_panel = None
 
@@ -242,21 +244,21 @@ class DataFrameViewer(App):
         """
         self.push_screen(OpenFileScreen(), self.do_open_file)
 
-    def action_close_tab(self) -> None:
-        """Close the current tab.
+    def action_quit(self) -> None:
+        """Quit from the view or the current tab.
 
         Checks for unsaved changes and prompts the user to save if needed.
         If this is the last tab, exits the app.
         """
-        self.do_close_tab()
+        self.do_quit()
 
-    def action_close_all_tabs(self) -> None:
-        """Close all tabs and exit the app.
+    def action_quit_all(self) -> None:
+        """Quit app after closing all tabs.
 
         Checks if any tabs have unsaved changes. If yes, opens a confirmation dialog.
         Otherwise, quits immediately.
         """
-        self.do_close_all_tabs()
+        self.do_quit_all()
 
     def action_save_current_tab(self) -> None:
         """Open a save dialog to save current tab to file."""
@@ -486,16 +488,33 @@ class DataFrameViewer(App):
         self.tabbed.active = tab.id
         table.focus()
 
-    def do_close_tab(self) -> None:
-        """Close the currently active tab.
+    def do_quit(self) -> None:
+        """Quit from the view or the current tab.
 
-        Removes the active tab from the interface. If only one tab remains and no more
-        can be closed, the application exits instead.
+        When in a view, return to main table. Otherwise, close the active tab.
+        If only one tab remains and no more tabs can be closed, exits the application.
         """
         try:
             if not (table := self.active_table):
                 return
 
+            # In a view - return to main table
+            if table.df_view is not None:
+                # Remove from history
+                while table.histories_undo:
+                    h = table.histories_undo[-1]
+                    if h.description.startswith("Viewed rows by expression"):
+                        table.histories_undo.pop()
+                    else:
+                        break
+
+                table.add_history("Return to main table")
+                table.df = table.df_view
+                table.df_view = None
+                table.setup_table()
+
+                return
+
             def _on_save_confirm(result: bool) -> None:
                 """Handle the "save before closing?" confirmation."""
                 if result:
@@ -540,7 +559,7 @@ class DataFrameViewer(App):
         except Exception:
             pass
 
-    def do_close_all_tabs(self) -> None:
+    def do_quit_all(self) -> None:
         """Close all tabs and quit the app.
 
         Checks if any tabs have unsaved changes. If yes, opens a confirmation dialog.

{dataframe_textual-2.10.1 → dataframe_textual-2.12.0}/src/dataframe_textual/table_screen.py

@@ -134,8 +134,10 @@ class TableScreen(ModalScreen):
         else:
             self.dftable.view_rows((expr, cidx, False, True))
 
-        # Dismiss the current modal screen
-        self.app.pop_screen()
+        # Dismiss modal screen(s) to return to main table
+        while len(self.app._screen_stack) > 1:
+            self.app.pop_screen()
+            break
 
     def show_frequency(self, cidx_name_value: tuple[int, str, Any] | None) -> None:
         """Show frequency by the selected value.

{dataframe_textual-2.10.1 → dataframe_textual-2.12.0}/uv.lock

@@ -171,7 +171,7 @@ wheels = [
 
 [[package]]
 name = "dataframe-textual"
-version = "2.10.1"
+version = "2.12.0"
 source = { editable = "." }
 dependencies = [
     { name = "polars" },