skins manager, console, and server list

Author: Earth1283

pymcl/console_window.py

@@ -0,0 +1,165 @@
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtGui import QFont, QColor, QAction, QFontDatabase
+from PyQt6.QtWidgets import (
+    QWidget,
+    QVBoxLayout,
+    QTextEdit,
+    QPushButton,
+    QHBoxLayout,
+    QApplication,
+    QCheckBox,
+    QLabel,
+    QFrame
+)
+
+class ConsoleWindow(QWidget):
+    def __init__(self, parent=None):
+        super().__init__(parent, Qt.WindowType.Window)
+        self.setWindowTitle("Game Console")
+        self.resize(900, 650)
+        self.auto_scroll = True
+        
+        layout = QVBoxLayout(self)
+        layout.setContentsMargins(0, 0, 0, 0)
+        layout.setSpacing(0)
+        
+        # Toolbar
+        toolbar = QFrame()
+        toolbar.setStyleSheet("background-color: #252526; border-bottom: 1px solid #333;")
+        toolbar_layout = QHBoxLayout(toolbar)
+        toolbar_layout.setContentsMargins(10, 8, 10, 8)
+        
+        title = QLabel("Output Log")
+        title.setStyleSheet("font-weight: bold; color: #ddd; font-size: 13px;")
+        toolbar_layout.addWidget(title)
+        
+        toolbar_layout.addStretch(1)
+        
+        self.auto_scroll_check = QCheckBox("Auto-scroll")
+        self.auto_scroll_check.setChecked(True)
+        self.auto_scroll_check.setStyleSheet("color: #ccc;")
+        self.auto_scroll_check.toggled.connect(self.set_auto_scroll)
+        toolbar_layout.addWidget(self.auto_scroll_check)
+        
+        self.copy_btn = QPushButton("Copy")
+        self.copy_btn.setCursor(Qt.CursorShape.PointingHandCursor)
+        self.copy_btn.clicked.connect(self.copy_logs)
+        toolbar_layout.addWidget(self.copy_btn)
+        
+        self.clear_btn = QPushButton("Clear")
+        self.clear_btn.setCursor(Qt.CursorShape.PointingHandCursor)
+        self.clear_btn.clicked.connect(self.clear_logs)
+        toolbar_layout.addWidget(self.clear_btn)
+        
+        layout.addWidget(toolbar)
+        
+        # Console Output
+        self.text_edit = QTextEdit()
+        self.text_edit.setReadOnly(True)
+        self.text_edit.setObjectName("console_output")
+        self.text_edit.setLineWrapMode(QTextEdit.LineWrapMode.NoWrap) # Logs are better without wrap usually
+        
+        # Font selection
+        preferred_fonts = ["JetBrains Mono", "Cascadia Code", "Fira Code", "Consolas", "Menlo", "Courier New"]
+        font_family = "Monospace"
+        for font in preferred_fonts:
+            if font in QFontDatabase.families():
+                font_family = font
+                break
+                
+        font = QFont(font_family)
+        font.setStyleHint(QFont.StyleHint.Monospace)
+        font.setPointSize(10)
+        self.text_edit.setFont(font)
+        
+        layout.addWidget(self.text_edit)
+        
+        # Apply Dark Theme
+        self.setStyleSheet("""
+            QWidget {
+                background-color: #1e1e1e;
+                color: #d4d4d4;
+            }
+            QTextEdit {
+                background-color: #1e1e1e;
+                color: #cccccc;
+                border: none;
+                padding: 5px;
+                selection-background-color: #264f78;
+            }
+            QPushButton {
+                background-color: #3c3c3c;
+                color: white;
+                border: none;
+                padding: 6px 12px;
+                border-radius: 3px;
+                font-size: 12px;
+            }
+            QPushButton:hover {
+                background-color: #4a4a4a;
+            }
+            QPushButton:pressed {
+                background-color: #2d2d2d;
+            }
+            QScrollBar:vertical {
+                border: none;
+                background: #1e1e1e;
+                width: 14px;
+                margin: 0px;
+            }
+            QScrollBar::handle:vertical {
+                background: #424242;
+                min-height: 20px;
+                border-radius: 0px;
+            }
+            QScrollBar::handle:vertical:hover {
+                background: #4f4f4f;
+            }
+            QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical {
+                height: 0px;
+            }
+            QCheckBox {
+                spacing: 5px;
+            }
+            QCheckBox::indicator {
+                width: 13px;
+                height: 13px;
+                border: 1px solid #555;
+                border-radius: 2px;
+                background: #1e1e1e;
+            }
+            QCheckBox::indicator:checked {
+                background: #007acc;
+                border-color: #007acc;
+            }
+        """)
+
+    def set_auto_scroll(self, checked):
+        self.auto_scroll = checked
+
+    @pyqtSlot(str)
+    def append_log(self, text):
+        # Basic color highlighting
+        color = "#cccccc" # default gray
+        if "[ERROR]" in text or "Exception" in text or "at " in text or "FATAL" in text: 
+            color = "#ff6b6b" # soft red
+        elif "[WARN]" in text:
+            color = "#f1c40f" # yellow
+        elif "[INFO]" in text:
+            color = "#6ab04c" # green
+        elif "DEBUG" in text:
+            color = "#569cd6" # blue
+            
+        formatted_text = f'<span style="color:{color};">{text}</span>'
+        self.text_edit.append(formatted_text)
+        
+        if self.auto_scroll:
+            scrollbar = self.text_edit.verticalScrollBar()
+            scrollbar.setValue(scrollbar.maximum())
+
+    def copy_logs(self):
+        clipboard = QApplication.clipboard()
+        clipboard.setText(self.text_edit.toPlainText())
+
+    def clear_logs(self):
+        self.text_edit.clear()

pymcl/main_window.py

@@ -41,6 +41,9 @@
 from .launch_page import LaunchPage
 from .settings_page import SettingsPage
 from .background_widget import BackgroundWidget
+from .console_window import ConsoleWindow
+from .servers_page import ServersPage
+from .skin_manager import SkinManagerPage
 
 
 class MainWindow(QMainWindow):
@@ -61,6 +64,9 @@ def __init__(self):
 
         self.image_files = []
         self.current_image_index = 0
+        
+        # New console window
+        self.console_window = ConsoleWindow()
 
         self.setWindowTitle(APP_NAME)
         self.setMinimumSize(900, 500)
@@ -121,9 +127,20 @@ def init_ui(self):
         main_layout.setContentsMargins(20, 20, 20, 20)
         main_layout.setSpacing(20)
 
-        # Left navigation
+        # Left navigation Scroll Area
+        left_scroll = QScrollArea()
+        left_scroll.setWidgetResizable(True)
+        left_scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
+        left_scroll.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
+        left_scroll.setFrameShape(QFrame.Shape.NoFrame)
+        left_scroll.setStyleSheet("background: transparent;") # Transparent background
+        
+        # Left navigation container
         left_widget = QWidget()
         left_widget.setObjectName("left_title_container")
+        # Ensure the widget itself has transparent bg if styled otherwise in stylesheet
+        left_widget.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) 
+        
         left_layout = QVBoxLayout(left_widget)
         left_layout.setSpacing(5)
         left_layout.setContentsMargins(10, 10, 10, 10)
@@ -150,6 +167,16 @@ def init_ui(self):
         self.nav_launch_button.setCursor(Qt.CursorShape.PointingHandCursor)
         left_layout.addWidget(self.nav_launch_button)
 
+        self.nav_servers_button = QPushButton("Servers")
+        self.nav_servers_button.setObjectName("nav_button")
+        self.nav_servers_button.setCursor(Qt.CursorShape.PointingHandCursor)
+        left_layout.addWidget(self.nav_servers_button)
+
+        self.nav_skins_button = QPushButton("Skins")
+        self.nav_skins_button.setObjectName("nav_button")
+        self.nav_skins_button.setCursor(Qt.CursorShape.PointingHandCursor)
+        left_layout.addWidget(self.nav_skins_button)
+
         self.nav_mods_button = QPushButton("Mods")
         self.nav_mods_button.setObjectName("nav_button")
         self.nav_mods_button.setCursor(Qt.CursorShape.PointingHandCursor)
@@ -165,8 +192,16 @@ def init_ui(self):
         self.nav_settings_button.setCursor(Qt.CursorShape.PointingHandCursor)
         left_layout.addWidget(self.nav_settings_button)
 
+        self.nav_console_button = QPushButton("Console")
+        self.nav_console_button.setObjectName("nav_button")
+        self.nav_console_button.setCursor(Qt.CursorShape.PointingHandCursor)
+        self.nav_console_button.clicked.connect(self.show_console)
+        left_layout.addWidget(self.nav_console_button)
+
         left_layout.addStretch(1)
-        main_layout.addWidget(left_widget, 2)
+        
+        left_scroll.setWidget(left_widget)
+        main_layout.addWidget(left_scroll, 2)
 
         # Right content
         content_frame = QFrame()
@@ -184,16 +219,22 @@ def init_ui(self):
         self.settings_page.settings_saved.connect(self.reload_background_settings)
         self.mods_page = ModsPage()
         self.mod_browser_page = ModBrowserPage()
+        self.servers_page = ServersPage()
+        self.skin_manager_page = SkinManagerPage()
 
-        self.stacked_widget.addWidget(self.launch_page)
-        self.stacked_widget.addWidget(self.mods_page)
-        self.stacked_widget.addWidget(self.mod_browser_page)
-        self.stacked_widget.addWidget(self.settings_page)
+        self.stacked_widget.addWidget(self.launch_page)       # Index 0
+        self.stacked_widget.addWidget(self.servers_page)      # Index 1
+        self.stacked_widget.addWidget(self.skin_manager_page) # Index 2
+        self.stacked_widget.addWidget(self.mods_page)         # Index 3
+        self.stacked_widget.addWidget(self.mod_browser_page)  # Index 4
+        self.stacked_widget.addWidget(self.settings_page)     # Index 5
 
         self.nav_launch_button.clicked.connect(lambda: self.switch_page(0, self.nav_launch_button))
-        self.nav_mods_button.clicked.connect(lambda: self.switch_page(1, self.nav_mods_button))
-        self.nav_browse_mods_button.clicked.connect(lambda: self.switch_page(2, self.nav_browse_mods_button))
-        self.nav_settings_button.clicked.connect(lambda: self.switch_page(3, self.nav_settings_button))
+        self.nav_servers_button.clicked.connect(lambda: self.switch_page(1, self.nav_servers_button))
+        self.nav_skins_button.clicked.connect(lambda: self.switch_page(2, self.nav_skins_button))
+        self.nav_mods_button.clicked.connect(lambda: self.switch_page(3, self.nav_mods_button))
+        self.nav_browse_mods_button.clicked.connect(lambda: self.switch_page(4, self.nav_browse_mods_button))
+        self.nav_settings_button.clicked.connect(lambda: self.switch_page(5, self.nav_settings_button))
 
         # Connect signals from launch page to main window slots
         self.launch_page.username_input.textChanged.connect(self.save_settings)
@@ -240,7 +281,7 @@ def switch_page(self, index, button):
             self.mod_browser_page.set_launch_filters(version, loader_param)
 
         # Update nav button styles
-        for btn in [self.nav_launch_button, self.nav_mods_button, self.nav_browse_mods_button, self.nav_settings_button]:
+        for btn in [self.nav_launch_button, self.nav_mods_button, self.nav_browse_mods_button, self.nav_settings_button, self.nav_servers_button, self.nav_skins_button]:
             btn.setObjectName("nav_button")
         button.setObjectName("nav_button_active")
         self.apply_styles()
@@ -301,6 +342,7 @@ def on_login_success(self, info: MicrosoftInfo):
         self.minecraft_info = info
         self.update_status(f"Logged in as {info['username']}")
         self.launch_page.microsoft_login_button.setText(f"Logged in as {info['username']}")
+        self.skin_manager_page.set_microsoft_info(info)
 
     def load_microsoft_info(self):
         info = self.microsoft_auth.load_microsoft_info()
@@ -314,6 +356,7 @@ def load_microsoft_info(self):
                 self.update_status(f"Logged in as {info['username']}")
                 self.launch_page.microsoft_login_button.setText(f"Logged in as {info['username']}")
                 self.launch_page.auth_method_combo.setCurrentText("Microsoft")
+                self.skin_manager_page.set_microsoft_info(info)
             else:
                 self.update_status("Failed to refresh token. Please login again.")
 
@@ -517,6 +560,12 @@ def save_settings(self):
         self.config_manager.set("last_version", self.launch_page.version_combo.currentText())
         self.config_manager.save()
 
+    @pyqtSlot()
+    def show_console(self):
+        self.console_window.show()
+        self.console_window.raise_()
+        self.console_window.activateWindow()
+
     @pyqtSlot()
     def start_launch(self):
         modifiers = QApplication.keyboardModifiers()
@@ -569,6 +618,10 @@ def start_launch(self):
         self.launch_page.status_label.setText("Starting worker thread...")
         self.launch_page.progress_bar.setRange(0, 100)
         self.launch_page.progress_bar.setValue(0)
+        
+        # Clear console and show it
+        self.console_window.clear_logs()
+        self.console_window.show()
 
         self.worker_thread = QThread()
         self.worker = Worker(version, options, mod_loader_type)
@@ -578,6 +631,7 @@ def start_launch(self):
 
         self.worker.progress.connect(self.update_progress)
         self.worker.status.connect(self.update_status)
+        self.worker.log_output.connect(self.console_window.append_log) # Connect logs
         self.worker.finished.connect(self.on_launch_finished)
 
         self.worker.finished.connect(self.worker_thread.quit)