sqlshell 0.1.9__py3-none-any.whl → 0.2.1__py3-none-any.whl

sqlshell/menus.py

@@ -0,0 +1,171 @@
+"""
+Menu creation and management for SQLShell application.
+This module contains functions to create and manage the application's menus.
+"""
+
+def create_file_menu(main_window):
+    """Create the File menu with project management actions.
+    
+    Args:
+        main_window: The SQLShell main window instance
+        
+    Returns:
+        The created File menu
+    """
+    # Create File menu
+    file_menu = main_window.menuBar().addMenu('&File')
+    
+    # Project management actions
+    new_project_action = file_menu.addAction('New Project')
+    new_project_action.setShortcut('Ctrl+N')
+    new_project_action.triggered.connect(main_window.new_project)
+    
+    open_project_action = file_menu.addAction('Open Project...')
+    open_project_action.setShortcut('Ctrl+O')
+    open_project_action.triggered.connect(main_window.open_project)
+    
+    # Add Recent Projects submenu
+    main_window.recent_projects_menu = file_menu.addMenu('Recent Projects')
+    main_window.update_recent_projects_menu()
+    
+    # Add Quick Access submenu for files
+    main_window.quick_access_menu = file_menu.addMenu('Quick Access Files')
+    main_window.update_quick_access_menu()
+    
+    save_project_action = file_menu.addAction('Save Project')
+    save_project_action.setShortcut('Ctrl+S')
+    save_project_action.triggered.connect(main_window.save_project)
+    
+    save_project_as_action = file_menu.addAction('Save Project As...')
+    save_project_as_action.setShortcut('Ctrl+Shift+S')
+    save_project_as_action.triggered.connect(main_window.save_project_as)
+    
+    file_menu.addSeparator()
+    
+    exit_action = file_menu.addAction('Exit')
+    exit_action.setShortcut('Ctrl+Q')
+    exit_action.triggered.connect(main_window.close)
+    
+    return file_menu
+
+
+def create_view_menu(main_window):
+    """Create the View menu with window management options.
+    
+    Args:
+        main_window: The SQLShell main window instance
+        
+    Returns:
+        The created View menu
+    """
+    # Create View menu
+    view_menu = main_window.menuBar().addMenu('&View')
+    
+    # Maximized window option
+    maximize_action = view_menu.addAction('Maximize Window')
+    maximize_action.setShortcut('F11')
+    maximize_action.triggered.connect(main_window.toggle_maximize_window)
+    
+    # Zoom submenu
+    zoom_menu = view_menu.addMenu('Zoom')
+    
+    zoom_in_action = zoom_menu.addAction('Zoom In')
+    zoom_in_action.setShortcut('Ctrl++')
+    zoom_in_action.triggered.connect(lambda: main_window.change_zoom(1.1))
+    
+    zoom_out_action = zoom_menu.addAction('Zoom Out')
+    zoom_out_action.setShortcut('Ctrl+-')
+    zoom_out_action.triggered.connect(lambda: main_window.change_zoom(0.9))
+    
+    reset_zoom_action = zoom_menu.addAction('Reset Zoom')
+    reset_zoom_action.setShortcut('Ctrl+0')
+    reset_zoom_action.triggered.connect(lambda: main_window.reset_zoom())
+    
+    return view_menu
+
+
+def create_tab_menu(main_window):
+    """Create the Tab menu with tab management actions.
+    
+    Args:
+        main_window: The SQLShell main window instance
+        
+    Returns:
+        The created Tab menu
+    """
+    # Create Tab menu
+    tab_menu = main_window.menuBar().addMenu('&Tab')
+    
+    new_tab_action = tab_menu.addAction('New Tab')
+    new_tab_action.setShortcut('Ctrl+T')
+    new_tab_action.triggered.connect(main_window.add_tab)
+    
+    duplicate_tab_action = tab_menu.addAction('Duplicate Current Tab')
+    duplicate_tab_action.setShortcut('Ctrl+D')
+    duplicate_tab_action.triggered.connect(main_window.duplicate_current_tab)
+    
+    rename_tab_action = tab_menu.addAction('Rename Current Tab')
+    rename_tab_action.setShortcut('Ctrl+R')
+    rename_tab_action.triggered.connect(main_window.rename_current_tab)
+    
+    close_tab_action = tab_menu.addAction('Close Current Tab')
+    close_tab_action.setShortcut('Ctrl+W')
+    close_tab_action.triggered.connect(main_window.close_current_tab)
+    
+    return tab_menu
+
+
+def create_preferences_menu(main_window):
+    """Create the Preferences menu with user settings.
+    
+    Args:
+        main_window: The SQLShell main window instance
+        
+    Returns:
+        The created Preferences menu
+    """
+    # Create Preferences menu
+    preferences_menu = main_window.menuBar().addMenu('&Preferences')
+    
+    # Auto-load recent project option
+    auto_load_action = preferences_menu.addAction('Auto-load Most Recent Project')
+    auto_load_action.setCheckable(True)
+    auto_load_action.setChecked(main_window.auto_load_recent_project)
+    auto_load_action.triggered.connect(lambda checked: toggle_auto_load(main_window, checked))
+    
+    return preferences_menu
+
+
+def toggle_auto_load(main_window, checked):
+    """Toggle the auto-load recent project setting.
+    
+    Args:
+        main_window: The SQLShell main window instance
+        checked: Boolean indicating whether the option is checked
+    """
+    main_window.auto_load_recent_project = checked
+    main_window.save_recent_projects()  # Save the preference
+    main_window.statusBar().showMessage(
+        f"Auto-load most recent project {'enabled' if checked else 'disabled'}", 
+        2000
+    )
+
+
+def setup_menubar(main_window):
+    """Set up the complete menu bar for the application.
+    
+    Args:
+        main_window: The SQLShell main window instance
+    """
+    # Create the menu bar (in case it doesn't exist)
+    menubar = main_window.menuBar()
+    
+    # Create menus
+    file_menu = create_file_menu(main_window)
+    view_menu = create_view_menu(main_window)
+    tab_menu = create_tab_menu(main_window)
+    preferences_menu = create_preferences_menu(main_window)
+    
+    # You can add more menus here in the future
+    
+    return menubar 

sqlshell/query_tab.py

@@ -1,11 +1,14 @@
+import os
 from PyQt6.QtWidgets import (QWidget, QVBoxLayout, QHBoxLayout, QLabel, 
-                             QPushButton, QFrame, QHeaderView, QTableWidget, QSplitter, QApplication)
+                             QPushButton, QFrame, QHeaderView, QTableWidget, QSplitter, QApplication, 
+                             QToolButton, QMenu)
 from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QIcon
 
 from sqlshell.editor import SQLEditor
 from sqlshell.syntax_highlighter import SQLSyntaxHighlighter
 from sqlshell.ui import FilterHeader
+from sqlshell.styles import get_row_count_label_stylesheet
 
 class QueryTab(QWidget):
     def __init__(self, parent, results_title="RESULTS"):
@@ -52,6 +55,9 @@ class QueryTab(QWidget):
                 completer.setModel(model)
                 self.query_edit.set_completer(completer)
         
+        # Connect keyboard events for direct handling of Ctrl+Enter
+        self.query_edit.installEventFilter(self)
+        
         query_layout.addWidget(self.query_edit)
         
         # Button row
@@ -98,7 +104,7 @@ class QueryTab(QWidget):
         header_layout.addStretch()
         
         self.row_count_label = QLabel("")
-        self.row_count_label.setStyleSheet("color: #7F8C8D; font-style: italic;")
+        self.row_count_label.setStyleSheet(get_row_count_label_stylesheet())
         header_layout.addWidget(self.row_count_label)
         
         results_layout.addLayout(header_layout)
@@ -169,4 +175,27 @@ class QueryTab(QWidget):
     def export_to_parquet(self):
         """Export results to Parquet"""
         if hasattr(self.parent, 'export_to_parquet'):
-            self.parent.export_to_parquet() 
+            self.parent.export_to_parquet()
+            
+    def eventFilter(self, obj, event):
+        """Event filter to intercept Ctrl+Enter and send it to the main window"""
+        from PyQt6.QtCore import QEvent, Qt
+        
+        # Check if it's a key press event
+        if event.type() == QEvent.Type.KeyPress:
+            # Check for Ctrl+Enter specifically
+            if (event.key() == Qt.Key.Key_Return and 
+                event.modifiers() & Qt.KeyboardModifier.ControlModifier):
+                
+                # Hide any autocomplete popup if it's visible
+                if hasattr(obj, 'completer') and obj.completer and obj.completer.popup().isVisible():
+                    obj.completer.popup().hide()
+                
+                # Execute the query via the parent (main window)
+                if hasattr(self.parent, 'execute_query'):
+                    self.parent.execute_query()
+                    # Mark event as handled
+                    return True
+                    
+        # Default - let the event propagate normally
+        return super().eventFilter(obj, event) 

sqlshell/styles.py

@@ -0,0 +1,257 @@
+def get_application_stylesheet(colors):
+    """Generate the application's stylesheet using the provided color scheme.
+    
+    Args:
+        colors: A dictionary containing color definitions for the application
+        
+    Returns:
+        A string containing the complete Qt stylesheet
+    """
+    return f"""
+        QMainWindow {{
+            background-color: {colors['background']};
+        }}
+        
+        QWidget {{
+            color: {colors['text']};
+            font-family: 'Segoe UI', 'Arial', sans-serif;
+        }}
+        
+        QLabel {{
+            font-size: 13px;
+            padding: 2px;
+        }}
+        
+        QLabel#header_label {{
+            font-size: 16px;
+            font-weight: bold;
+            color: {colors['primary']};
+            padding: 8px 0;
+        }}
+        
+        QPushButton {{
+            background-color: {colors['secondary']};
+            color: white;
+            border: none;
+            border-radius: 4px;
+            padding: 8px 16px;
+            font-weight: bold;
+            font-size: 13px;
+            min-height: 30px;
+        }}
+        
+        QPushButton:hover {{
+            background-color: #2980B9;
+        }}
+        
+        QPushButton:pressed {{
+            background-color: #1F618D;
+        }}
+        
+        QPushButton#primary_button {{
+            background-color: {colors['accent']};
+        }}
+        
+        QPushButton#primary_button:hover {{
+            background-color: #16A085;
+        }}
+        
+        QPushButton#primary_button:pressed {{
+            background-color: #0E6655;
+        }}
+        
+        QPushButton#danger_button {{
+            background-color: {colors['error']};
+        }}
+        
+        QPushButton#danger_button:hover {{
+            background-color: #CB4335;
+        }}
+        
+        QToolButton {{
+            background-color: transparent;
+            border: none;
+            border-radius: 4px;
+            padding: 4px;
+        }}
+        
+        QToolButton:hover {{
+            background-color: rgba(52, 152, 219, 0.2);
+        }}
+        
+        QFrame#sidebar {{
+            background-color: {colors['primary']};
+            border-radius: 0px;
+        }}
+        
+        QFrame#content_panel {{
+            background-color: white;
+            border-radius: 8px;
+            border: 1px solid {colors['border']};
+        }}
+        
+        QListWidget {{
+            background-color: white;
+            border-radius: 4px;
+            border: 1px solid {colors['border']};
+            padding: 4px;
+            outline: none;
+        }}
+        
+        QListWidget::item {{
+            padding: 8px;
+            border-radius: 4px;
+        }}
+        
+        QListWidget::item:selected {{
+            background-color: {colors['secondary']};
+            color: white;
+        }}
+        
+        QListWidget::item:hover:!selected {{
+            background-color: #E3F2FD;
+        }}
+        
+        QTableWidget {{
+            background-color: white;
+            alternate-background-color: #F8F9FA;
+            border-radius: 4px;
+            border: 1px solid {colors['border']};
+            gridline-color: #E0E0E0;
+            outline: none;
+        }}
+        
+        QTableWidget::item {{
+            padding: 4px;
+        }}
+        
+        QTableWidget::item:selected {{
+            background-color: rgba(52, 152, 219, 0.2);
+            color: {colors['text']};
+        }}
+        
+        QHeaderView::section {{
+            background-color: {colors['primary']};
+            color: white;
+            padding: 8px;
+            border: none;
+            font-weight: bold;
+        }}
+        
+        QSplitter::handle {{
+            background-color: {colors['border']};
+        }}
+        
+        QStatusBar {{
+            background-color: {colors['primary']};
+            color: white;
+            padding: 8px;
+        }}
+        
+        QTabWidget::pane {{
+            border: 1px solid {colors['border']};
+            border-radius: 4px;
+            top: -1px;
+            background-color: white;
+        }}
+        
+        QTabBar::tab {{
+            background-color: {colors['light_bg']};
+            color: {colors['text']};
+            border: 1px solid {colors['border']};
+            border-bottom: none;
+            border-top-left-radius: 4px;
+            border-top-right-radius: 4px;
+            padding: 8px 12px;
+            margin-right: 2px;
+            min-width: 80px;
+        }}
+        
+        QTabBar::tab:selected {{
+            background-color: white;
+            border-bottom: 1px solid white;
+        }}
+        
+        QTabBar::tab:hover:!selected {{
+            background-color: #E3F2FD;
+        }}
+        
+        QTabBar::close-button {{
+            image: url(close.png);
+            subcontrol-position: right;
+        }}
+        
+        QTabBar::close-button:hover {{
+            background-color: rgba(255, 0, 0, 0.2);
+            border-radius: 2px;
+        }}
+        
+        QPlainTextEdit, QTextEdit {{
+            background-color: white;
+            border-radius: 4px;
+            border: 1px solid {colors['border']};
+            padding: 8px;
+            selection-background-color: #BBDEFB;
+            selection-color: {colors['text']};
+            font-family: 'Consolas', 'Courier New', monospace;
+            font-size: 14px;
+        }}
+    """
+
+def get_tab_corner_stylesheet():
+    """Get the stylesheet for the tab corner widget with the + button"""
+    return """
+        QToolButton {
+            background-color: transparent;
+            border: none;
+            border-radius: 4px;
+            padding: 4px;
+            font-weight: bold;
+            font-size: 16px;
+            color: #3498DB;
+        }
+        QToolButton:hover {
+            background-color: rgba(52, 152, 219, 0.2);
+        }
+        QToolButton:pressed {
+            background-color: rgba(52, 152, 219, 0.4);
+        }
+    """
+
+def get_context_menu_stylesheet():
+    """Get the stylesheet for context menus"""
+    return """
+        QMenu {
+            background-color: white;
+            border: 1px solid #BDC3C7;
+            padding: 5px;
+        }
+        QMenu::item {
+            padding: 5px 20px;
+        }
+        QMenu::item:selected {
+            background-color: #3498DB;
+            color: white;
+        }
+        QMenu::separator {
+            height: 1px;
+            background-color: #BDC3C7;
+            margin: 5px 15px;
+        }
+    """
+
+def get_header_label_stylesheet():
+    """Get the stylesheet for header labels"""
+    return "color: white; font-weight: bold; font-size: 14px;"
+
+def get_db_info_label_stylesheet():
+    """Get the stylesheet for database info label"""
+    return "color: rgba(255, 255, 255, 0.8); padding: 8px 0; font-size: 13px;"
+
+def get_tables_header_stylesheet():
+    """Get the stylesheet for tables header"""
+    return "color: white; font-weight: bold; font-size: 14px; margin-top: 8px;"
+
+def get_row_count_label_stylesheet():
+    """Get the stylesheet for row count label"""
+    return "color: #7F8C8D; font-size: 12px; font-style: italic; padding: 8px 0;"