Compare commits
12 Commits
a2ef1bf2d5
...
sounds
| Author | SHA1 | Date | |
|---|---|---|---|
| 7301186102 | |||
|
|
f1ed8d36c4 | ||
|
|
69b10b0864 | ||
| faeac6c96f | |||
| 35dfedd5c9 | |||
| b4c74f098b | |||
| 61a2458f83 | |||
| d5a4628281 | |||
| 5456b6c5fd | |||
| 6bdf31cb26 | |||
| 8737720af6 | |||
| 0c7b2d3bdb |
@@ -10,8 +10,11 @@ pyinstaller `
|
|||||||
--hidden-import wx._xml `
|
--hidden-import wx._xml `
|
||||||
--add-data "FiraCode-Regular.ttf;." `
|
--add-data "FiraCode-Regular.ttf;." `
|
||||||
--add-data "FiraCode-SemiBold.ttf;." `
|
--add-data "FiraCode-SemiBold.ttf;." `
|
||||||
|
--add-data "src\sounds\*;sounds" `
|
||||||
--add-data "venv\Lib\site-packages\irc\codes.txt;irc" `
|
--add-data "venv\Lib\site-packages\irc\codes.txt;irc" `
|
||||||
--add-data "icon.ico;." `
|
--add-data "icon.ico;." `
|
||||||
|
--add-data "src\channel.ico;." `
|
||||||
|
--add-data "src\server.ico;." `
|
||||||
--icon "icon.ico" `
|
--icon "icon.ico" `
|
||||||
"src/main.py"
|
"src/main.py"
|
||||||
|
|
||||||
|
|||||||
1207
src/IRCPanel.py
1207
src/IRCPanel.py
File diff suppressed because it is too large
Load Diff
275
src/LocalServer.py
Normal file
275
src/LocalServer.py
Normal file
@@ -0,0 +1,275 @@
|
|||||||
|
import ipaddress
|
||||||
|
import logging
|
||||||
|
import socket
|
||||||
|
import threading
|
||||||
|
from typing import Callable, Iterable, List, Optional
|
||||||
|
|
||||||
|
from irc import server as irc_server
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def _default_log_callback(message: str, color=None, bold: bool = False):
|
||||||
|
"""Fallback logger when UI callback is not available."""
|
||||||
|
logger.info(message)
|
||||||
|
|
||||||
|
|
||||||
|
class LocalOnlyIRCServer(irc_server.IRCServer):
|
||||||
|
"""IRC server that only accepts connections from local/LAN addresses."""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
server_address,
|
||||||
|
request_handler_class,
|
||||||
|
allowed_networks: Iterable[ipaddress.IPv4Network],
|
||||||
|
blocked_callback: Optional[Callable[[str], None]] = None,
|
||||||
|
):
|
||||||
|
self.allowed_networks = list(allowed_networks)
|
||||||
|
self.blocked_callback = blocked_callback
|
||||||
|
super().__init__(server_address, request_handler_class)
|
||||||
|
|
||||||
|
def verify_request(self, request, client_address):
|
||||||
|
try:
|
||||||
|
ip = ipaddress.ip_address(client_address[0])
|
||||||
|
for network in self.allowed_networks:
|
||||||
|
if ip in network:
|
||||||
|
return super().verify_request(request, client_address)
|
||||||
|
except ValueError:
|
||||||
|
logger.warning("Rejected malformed IP address: %s", client_address[0])
|
||||||
|
return False
|
||||||
|
|
||||||
|
if self.blocked_callback:
|
||||||
|
self.blocked_callback(client_address[0])
|
||||||
|
logger.warning("Rejected non-LAN connection from %s", client_address[0])
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
class LocalServerManager:
|
||||||
|
"""Manages the background IRC server lifecycle."""
|
||||||
|
|
||||||
|
DEFAULT_CHANNELS = ["#lobby"]
|
||||||
|
DEFAULT_ALLOWED_NETWORKS = [
|
||||||
|
ipaddress.ip_network("127.0.0.0/8"), # Loopback
|
||||||
|
ipaddress.ip_network("10.0.0.0/8"), # RFC1918
|
||||||
|
ipaddress.ip_network("172.16.0.0/12"), # RFC1918
|
||||||
|
ipaddress.ip_network("192.168.0.0/16"), # RFC1918
|
||||||
|
ipaddress.ip_network("169.254.0.0/16"), # Link-local
|
||||||
|
]
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
log_callback: Callable[[str, Optional[object], bool], None] = _default_log_callback,
|
||||||
|
listen_host: str = "0.0.0.0",
|
||||||
|
listen_port: int = 6667,
|
||||||
|
):
|
||||||
|
self.log_callback = log_callback or _default_log_callback
|
||||||
|
self.listen_host = listen_host
|
||||||
|
self.listen_port = listen_port
|
||||||
|
self.allowed_networks = list(self.DEFAULT_ALLOWED_NETWORKS)
|
||||||
|
self._channels = list(self.DEFAULT_CHANNELS)
|
||||||
|
|
||||||
|
self._server: Optional[LocalOnlyIRCServer] = None
|
||||||
|
self._thread: Optional[threading.Thread] = None
|
||||||
|
self._lock = threading.RLock()
|
||||||
|
self._running = threading.Event()
|
||||||
|
self._ready = threading.Event()
|
||||||
|
self._error: Optional[Exception] = None
|
||||||
|
|
||||||
|
# Public API ---------------------------------------------------------
|
||||||
|
def start(self, timeout: float = 5.0):
|
||||||
|
"""Start the background IRC server."""
|
||||||
|
with self._lock:
|
||||||
|
if self._running.is_set():
|
||||||
|
raise RuntimeError("Local IRC server is already running.")
|
||||||
|
|
||||||
|
self._running.set()
|
||||||
|
self._ready.clear()
|
||||||
|
self._error = None
|
||||||
|
|
||||||
|
self._thread = threading.Thread(
|
||||||
|
target=self._serve_forever,
|
||||||
|
name="Local-IRC-Server",
|
||||||
|
daemon=True,
|
||||||
|
)
|
||||||
|
self._thread.start()
|
||||||
|
|
||||||
|
if not self._ready.wait(timeout):
|
||||||
|
self._running.clear()
|
||||||
|
raise TimeoutError("Local IRC server failed to start in time.")
|
||||||
|
|
||||||
|
if self._error:
|
||||||
|
raise self._error
|
||||||
|
|
||||||
|
def stop(self, timeout: float = 5.0):
|
||||||
|
"""Stop the IRC server if it is running."""
|
||||||
|
with self._lock:
|
||||||
|
if not self._running.is_set():
|
||||||
|
return
|
||||||
|
|
||||||
|
server = self._server
|
||||||
|
thread = self._thread
|
||||||
|
|
||||||
|
if server:
|
||||||
|
server.shutdown()
|
||||||
|
server.server_close()
|
||||||
|
|
||||||
|
if thread:
|
||||||
|
thread.join(timeout=timeout)
|
||||||
|
|
||||||
|
with self._lock:
|
||||||
|
self._server = None
|
||||||
|
self._thread = None
|
||||||
|
self._running.clear()
|
||||||
|
self._ready.clear()
|
||||||
|
|
||||||
|
def is_running(self) -> bool:
|
||||||
|
return self._running.is_set()
|
||||||
|
|
||||||
|
def set_listen_host(self, host: str):
|
||||||
|
"""Update the bind address. Local server must be stopped."""
|
||||||
|
with self._lock:
|
||||||
|
if self._running.is_set():
|
||||||
|
raise RuntimeError("Stop the server before changing the interface.")
|
||||||
|
self.listen_host = host
|
||||||
|
self._log(f"Local server interface set to {host}.")
|
||||||
|
|
||||||
|
def get_channels(self) -> List[str]:
|
||||||
|
with self._lock:
|
||||||
|
return list(self._channels)
|
||||||
|
|
||||||
|
def set_channels(self, channels: Iterable[str]):
|
||||||
|
cleaned = self._sanitize_channels(channels)
|
||||||
|
with self._lock:
|
||||||
|
self._channels = cleaned or list(self.DEFAULT_CHANNELS)
|
||||||
|
|
||||||
|
if self.is_running():
|
||||||
|
self._log(
|
||||||
|
"Channel list updated. Restart local server to apply changes.",
|
||||||
|
bold=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Internal helpers ---------------------------------------------------
|
||||||
|
def _serve_forever(self):
|
||||||
|
try:
|
||||||
|
server = LocalOnlyIRCServer(
|
||||||
|
(self.listen_host, self.listen_port),
|
||||||
|
irc_server.IRCClient,
|
||||||
|
self.allowed_networks,
|
||||||
|
blocked_callback=lambda ip: self._log(
|
||||||
|
f"Blocked connection attempt from {ip}", bold=False
|
||||||
|
),
|
||||||
|
)
|
||||||
|
server.servername = socket.gethostname() or "wxirc-local"
|
||||||
|
|
||||||
|
with self._lock:
|
||||||
|
self._server = server
|
||||||
|
seed_channels = self._channels or list(self.DEFAULT_CHANNELS)
|
||||||
|
for channel in seed_channels:
|
||||||
|
server.channels.setdefault(channel, irc_server.IRCChannel(channel))
|
||||||
|
|
||||||
|
self._log(
|
||||||
|
f"Local IRC server listening on {self.listen_host}:{self.listen_port}",
|
||||||
|
bold=True,
|
||||||
|
)
|
||||||
|
self._ready.set()
|
||||||
|
server.serve_forever()
|
||||||
|
except Exception as exc:
|
||||||
|
logger.exception("Local IRC server failed: %s", exc)
|
||||||
|
self._error = exc
|
||||||
|
self._ready.set()
|
||||||
|
self._log(f"Local server error: {exc}", bold=True)
|
||||||
|
finally:
|
||||||
|
self._running.clear()
|
||||||
|
self._log("Local IRC server stopped.")
|
||||||
|
|
||||||
|
def _sanitize_channels(self, channels: Iterable[str]) -> List[str]:
|
||||||
|
unique = []
|
||||||
|
seen = set()
|
||||||
|
for channel in channels:
|
||||||
|
if not channel:
|
||||||
|
continue
|
||||||
|
name = channel.strip()
|
||||||
|
if not name.startswith("#"):
|
||||||
|
name = f"#{name}"
|
||||||
|
if not self._is_valid_channel(name):
|
||||||
|
continue
|
||||||
|
if name.lower() not in seen:
|
||||||
|
unique.append(name)
|
||||||
|
seen.add(name.lower())
|
||||||
|
return unique
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _is_valid_channel(name: str) -> bool:
|
||||||
|
if len(name) < 2:
|
||||||
|
return False
|
||||||
|
allowed = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_#"
|
||||||
|
return all(ch in allowed for ch in name)
|
||||||
|
|
||||||
|
def _log(self, message: str, color=None, bold: bool = False):
|
||||||
|
try:
|
||||||
|
self.log_callback(message, color, bold)
|
||||||
|
except Exception:
|
||||||
|
logger.info(message)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
import argparse
|
||||||
|
import sys
|
||||||
|
import signal
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description="Run a local-only IRC server."
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--host", type=str, default="0.0.0.0",
|
||||||
|
help="Bind host (default: 0.0.0.0)"
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--port", type=int, default=6667,
|
||||||
|
help="Bind port (default: 6667)"
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--channels", type=str, default="#lobby",
|
||||||
|
help="Comma-separated list of channels (default: #lobby)"
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--verbose", action="store_true",
|
||||||
|
help="Enable verbose logging"
|
||||||
|
)
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
# Set up logging
|
||||||
|
logging.basicConfig(
|
||||||
|
level=logging.DEBUG if args.verbose else logging.INFO,
|
||||||
|
format="%(asctime)s [%(levelname)s] %(message)s"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Initialize the server manager
|
||||||
|
manager = LocalServerManager(
|
||||||
|
listen_host=args.host,
|
||||||
|
listen_port=args.port
|
||||||
|
)
|
||||||
|
manager.set_channels([ch.strip() for ch in args.channels.split(",") if ch.strip()])
|
||||||
|
|
||||||
|
# Handle Ctrl+C gracefully
|
||||||
|
def signal_handler(sig, frame):
|
||||||
|
print("\nStopping server...")
|
||||||
|
manager.stop()
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
|
signal.signal(signal.SIGINT, signal_handler)
|
||||||
|
|
||||||
|
try:
|
||||||
|
manager.start()
|
||||||
|
print(f"IRC server running on {args.host}:{args.port}")
|
||||||
|
# Keep the main thread alive while server runs
|
||||||
|
while manager.is_running():
|
||||||
|
import time
|
||||||
|
time.sleep(1)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error: {e}")
|
||||||
|
manager.stop()
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
main()
|
||||||
@@ -19,6 +19,7 @@ class NotesDialog(wx.Frame):
|
|||||||
style=wx.DEFAULT_FRAME_STYLE)
|
style=wx.DEFAULT_FRAME_STYLE)
|
||||||
|
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
|
self.theme = getattr(parent, "theme", None)
|
||||||
self.notes_data = notes_data or defaultdict(dict)
|
self.notes_data = notes_data or defaultdict(dict)
|
||||||
self.current_note_key = None
|
self.current_note_key = None
|
||||||
self.updating_title = False
|
self.updating_title = False
|
||||||
@@ -27,7 +28,7 @@ class NotesDialog(wx.Frame):
|
|||||||
self.last_save_time = time.time()
|
self.last_save_time = time.time()
|
||||||
self.auto_save_interval = 2 # seconds - reduced for immediate saving
|
self.auto_save_interval = 2 # seconds - reduced for immediate saving
|
||||||
|
|
||||||
self.SetBackgroundColour(wx.Colour(245, 245, 245))
|
self.SetBackgroundColour(self.get_theme_colour("window_bg", wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW)))
|
||||||
|
|
||||||
# Set icon if parent has one
|
# Set icon if parent has one
|
||||||
if parent:
|
if parent:
|
||||||
@@ -61,6 +62,11 @@ class NotesDialog(wx.Frame):
|
|||||||
if self.GetParent().GetId() == pId:
|
if self.GetParent().GetId() == pId:
|
||||||
self.GetParent().Close()
|
self.GetParent().Close()
|
||||||
|
|
||||||
|
def get_theme_colour(self, key, fallback):
|
||||||
|
if self.theme and key in self.theme:
|
||||||
|
return self.theme[key]
|
||||||
|
return fallback
|
||||||
|
|
||||||
def create_controls(self):
|
def create_controls(self):
|
||||||
# Create menu bar
|
# Create menu bar
|
||||||
self.create_menu_bar()
|
self.create_menu_bar()
|
||||||
@@ -72,6 +78,7 @@ class NotesDialog(wx.Frame):
|
|||||||
|
|
||||||
# Left panel - notes list
|
# Left panel - notes list
|
||||||
left_panel = wx.Panel(splitter)
|
left_panel = wx.Panel(splitter)
|
||||||
|
left_panel.SetBackgroundColour(self.get_theme_colour("sidebar_bg", left_panel.GetBackgroundColour()))
|
||||||
left_sizer = wx.BoxSizer(wx.VERTICAL)
|
left_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
|
|
||||||
notes_label = wx.StaticText(left_panel, label="Your Notes:")
|
notes_label = wx.StaticText(left_panel, label="Your Notes:")
|
||||||
@@ -101,6 +108,7 @@ class NotesDialog(wx.Frame):
|
|||||||
|
|
||||||
# Right panel - editor
|
# Right panel - editor
|
||||||
right_panel = wx.Panel(splitter)
|
right_panel = wx.Panel(splitter)
|
||||||
|
right_panel.SetBackgroundColour(self.get_theme_colour("content_bg", right_panel.GetBackgroundColour()))
|
||||||
right_sizer = wx.BoxSizer(wx.VERTICAL)
|
right_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
|
|
||||||
title_label = wx.StaticText(right_panel, label="Note Title:")
|
title_label = wx.StaticText(right_panel, label="Note Title:")
|
||||||
@@ -226,6 +234,7 @@ class NotesDialog(wx.Frame):
|
|||||||
|
|
||||||
def setup_editor_toolbar(self, parent):
|
def setup_editor_toolbar(self, parent):
|
||||||
self.toolbar = wx.Panel(parent)
|
self.toolbar = wx.Panel(parent)
|
||||||
|
self.toolbar.SetBackgroundColour(self.get_theme_colour("control_bg", self.toolbar.GetBackgroundColour()))
|
||||||
toolbar_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
toolbar_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||||
|
|
||||||
# Text formatting buttons
|
# Text formatting buttons
|
||||||
|
|||||||
@@ -229,24 +229,41 @@ class ScanWizardResultsPage(adv.WizardPageSimple):
|
|||||||
start_callback(params)
|
start_callback(params)
|
||||||
|
|
||||||
def on_scan_progress(self, scanned, total):
|
def on_scan_progress(self, scanned, total):
|
||||||
|
try:
|
||||||
total = max(total, 1)
|
total = max(total, 1)
|
||||||
self.gauge.SetRange(total)
|
self.gauge.SetRange(total)
|
||||||
self.gauge.SetValue(min(scanned, total))
|
self.gauge.SetValue(min(scanned, total))
|
||||||
self.summary.SetLabel(f"Scanning… {scanned}/{total} hosts checked")
|
self.summary.SetLabel(f"Scanning… {scanned}/{total} hosts checked")
|
||||||
|
except RuntimeError:
|
||||||
|
# C++ SHIT
|
||||||
|
logger.debug("Scan progress update after controls destroyed; ignoring")
|
||||||
|
|
||||||
def on_scan_result(self, server_info):
|
def on_scan_result(self, server_info):
|
||||||
|
"""Handle a single discovered server row."""
|
||||||
|
try:
|
||||||
idx = self.results_list.InsertItem(self.results_list.GetItemCount(), server_info["address"])
|
idx = self.results_list.InsertItem(self.results_list.GetItemCount(), server_info["address"])
|
||||||
self.results_list.SetItem(idx, 1, str(server_info["port"]))
|
self.results_list.SetItem(idx, 1, str(server_info["port"]))
|
||||||
self.results_list.SetItem(idx, 2, server_info.get("banner", "IRC server detected"))
|
self.results_list.SetItem(idx, 2, server_info.get("banner", "IRC server detected"))
|
||||||
self.discovered.append(server_info)
|
self.discovered.append(server_info)
|
||||||
self.summary.SetLabel(f"Found {len(self.discovered)} {"server" if self.discovered == 1 else "servers"}")
|
self.summary.SetLabel(
|
||||||
|
f"Found {len(self.discovered)} {'server' if len(self.discovered) == 1 else 'servers'}"
|
||||||
|
)
|
||||||
|
except RuntimeError:
|
||||||
|
logger.debug("Scan result update after controls destroyed; ignoring")
|
||||||
|
|
||||||
def on_scan_complete(self, results):
|
def on_scan_complete(self, results):
|
||||||
|
"""Final scan completion callback."""
|
||||||
|
try:
|
||||||
if results:
|
if results:
|
||||||
self.summary.SetLabel(f"Scan complete : {len(results)} {"server" if len(results) == 1 else "servers"} ready.")
|
self.summary.SetLabel(
|
||||||
|
f"Scan complete : {len(results)} "
|
||||||
|
f"{'server' if len(results) == 1 else 'servers'} ready."
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
self.summary.SetLabel("Scan complete : no IRC servers discovered.")
|
self.summary.SetLabel("Scan complete : no IRC servers discovered.")
|
||||||
self._toggle_buttons()
|
self._toggle_buttons()
|
||||||
|
except RuntimeError:
|
||||||
|
logger.debug("Scan completion update after controls destroyed; ignoring")
|
||||||
|
|
||||||
def on_quick_connect(self, event):
|
def on_quick_connect(self, event):
|
||||||
row = self.results_list.GetFirstSelected()
|
row = self.results_list.GetFirstSelected()
|
||||||
|
|||||||
99
src/Win32API.py
Normal file
99
src/Win32API.py
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
import ctypes
|
||||||
|
from ctypes import wintypes
|
||||||
|
import time
|
||||||
|
|
||||||
|
SW_HIDE = 0
|
||||||
|
SW_SHOW = 5
|
||||||
|
|
||||||
|
GWL_EXSTYLE = -20
|
||||||
|
WS_EX_TOOLWINDOW = 0x00000080
|
||||||
|
WS_EX_APPWINDOW = 0x00040000
|
||||||
|
WS_EX_LAYERED = 0x80000
|
||||||
|
LWA_ALPHA = 0x2
|
||||||
|
|
||||||
|
|
||||||
|
class Win32API:
|
||||||
|
def __init__(self, hwnd):
|
||||||
|
self.hwnd = hwnd
|
||||||
|
self.hidden = False
|
||||||
|
self._load_api()
|
||||||
|
|
||||||
|
def _load_api(self):
|
||||||
|
user32 = ctypes.windll.user32
|
||||||
|
|
||||||
|
self.ShowWindow = user32.ShowWindow
|
||||||
|
self.GetWindowLong = user32.GetWindowLongW
|
||||||
|
self.SetWindowLong = user32.SetWindowLongW
|
||||||
|
self._RegisterHotKey = user32.RegisterHotKey
|
||||||
|
self._SetLayeredWindowAttributes = user32.SetLayeredWindowAttributes
|
||||||
|
|
||||||
|
self.ShowWindow.argtypes = [wintypes.HWND, ctypes.c_int]
|
||||||
|
self.GetWindowLong.argtypes = [wintypes.HWND, ctypes.c_int]
|
||||||
|
self.SetWindowLong.argtypes = [wintypes.HWND, ctypes.c_int, ctypes.c_long]
|
||||||
|
self._RegisterHotKey.argtypes = [
|
||||||
|
wintypes.HWND,
|
||||||
|
wintypes.INT,
|
||||||
|
wintypes.UINT,
|
||||||
|
wintypes.UINT,
|
||||||
|
]
|
||||||
|
self._SetLayeredWindowAttributes.argtypes = [
|
||||||
|
wintypes.HWND,
|
||||||
|
wintypes.COLORREF,
|
||||||
|
wintypes.BYTE,
|
||||||
|
wintypes.DWORD,
|
||||||
|
]
|
||||||
|
|
||||||
|
def remove_from_taskbar(self):
|
||||||
|
style = self.GetWindowLong(self.hwnd, GWL_EXSTYLE)
|
||||||
|
new_style = (style & ~WS_EX_APPWINDOW) | WS_EX_TOOLWINDOW
|
||||||
|
self.SetWindowLong(self.hwnd, GWL_EXSTYLE, new_style)
|
||||||
|
|
||||||
|
def hide(self):
|
||||||
|
self.ShowWindow(self.hwnd, SW_HIDE)
|
||||||
|
self.hidden = True
|
||||||
|
|
||||||
|
def show(self):
|
||||||
|
self.ShowWindow(self.hwnd, SW_SHOW)
|
||||||
|
self.hidden = False
|
||||||
|
|
||||||
|
def toggle(self, fade=True, duration=500, steps=20):
|
||||||
|
"""Toggle window visibility with optional fade effect"""
|
||||||
|
if self.hidden:
|
||||||
|
if fade:
|
||||||
|
self.fade_in(duration, steps)
|
||||||
|
else:
|
||||||
|
self.show()
|
||||||
|
else:
|
||||||
|
if fade:
|
||||||
|
self.fade_out(duration, steps)
|
||||||
|
else:
|
||||||
|
self.hide()
|
||||||
|
|
||||||
|
|
||||||
|
def register_hotkey(self, hotkey_id, key, modifiers):
|
||||||
|
vk = ord(key.upper())
|
||||||
|
return self._RegisterHotKey(None, hotkey_id, modifiers, vk)
|
||||||
|
|
||||||
|
def _set_layered(self):
|
||||||
|
style = self.GetWindowLong(self.hwnd, GWL_EXSTYLE)
|
||||||
|
self.SetWindowLong(self.hwnd, GWL_EXSTYLE, style | WS_EX_LAYERED)
|
||||||
|
|
||||||
|
def fade_in(self, duration=50, steps=50):
|
||||||
|
self.show()
|
||||||
|
self._set_layered()
|
||||||
|
for idx in range(steps + 1):
|
||||||
|
alpha = int(255 * (idx / steps))
|
||||||
|
self._SetLayeredWindowAttributes(self.hwnd, 0, alpha, LWA_ALPHA)
|
||||||
|
ctypes.windll.kernel32.Sleep(int(duration / steps))
|
||||||
|
self.hidden = False
|
||||||
|
|
||||||
|
def fade_out(self, duration=50, steps=50):
|
||||||
|
self._set_layered()
|
||||||
|
for idx in range(steps + 1):
|
||||||
|
alpha = int(255 * (1 - idx /steps))
|
||||||
|
self._SetLayeredWindowAttributes(self.hwnd, 0, alpha, LWA_ALPHA)
|
||||||
|
ctypes.windll.kernel32.Sleep(int(duration / steps))
|
||||||
|
self.hidden = True
|
||||||
|
self.hide()
|
||||||
|
|
||||||
|
|
||||||
97
src/Win32SoundHandler.py
Normal file
97
src/Win32SoundHandler.py
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
import ctypes
|
||||||
|
import logging
|
||||||
|
from ctypes import wintypes
|
||||||
|
|
||||||
|
# Set up logging
|
||||||
|
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
def get_resource_path(relative_path):
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
try:
|
||||||
|
base_path = sys._MEIPASS
|
||||||
|
except Exception:
|
||||||
|
project_root = os.path.abspath(os.path.join(os.path.dirname(__file__)))
|
||||||
|
base_path = project_root
|
||||||
|
full_path = os.path.normpath(os.path.join(base_path, relative_path))
|
||||||
|
return full_path
|
||||||
|
|
||||||
|
class Win32SoundHandler:
|
||||||
|
def __init__(self, hwnd):
|
||||||
|
self.hwnd = hwnd
|
||||||
|
self.SND_ALIAS = 0x00010000
|
||||||
|
self.SND_FILENAME = 0x00020000
|
||||||
|
self.SND_ASYNC = 0x00000001
|
||||||
|
self._setup_playsoundapi()
|
||||||
|
|
||||||
|
def _setup_playsoundapi(self):
|
||||||
|
winmm = ctypes.windll.winmm
|
||||||
|
self.PlaySoundW = winmm.PlaySoundW
|
||||||
|
self.PlaySoundW.argtypes = (
|
||||||
|
wintypes.LPCWSTR,
|
||||||
|
wintypes.HMODULE,
|
||||||
|
wintypes.DWORD
|
||||||
|
)
|
||||||
|
self.PlaySoundW.restype = wintypes.BOOL
|
||||||
|
|
||||||
|
def play_info_sound(self):
|
||||||
|
self.PlaySoundW("SystemAsterisk", None, self.SND_ALIAS | self.SND_ASYNC)
|
||||||
|
|
||||||
|
def play_error_sound(self):
|
||||||
|
self.PlaySoundW("SystemHand", None, self.SND_ALIAS | self.SND_ASYNC)
|
||||||
|
|
||||||
|
def play_warn_sound(self):
|
||||||
|
self.PlaySoundW("SystemExclamation", None, self.SND_ALIAS | self.SND_ASYNC)
|
||||||
|
|
||||||
|
def play_question_sound(self):
|
||||||
|
self.PlaySoundW("SystemQuestion", None, self.SND_ALIAS | self.SND_ASYNC)
|
||||||
|
|
||||||
|
def play_default_sound(self):
|
||||||
|
self.PlaySoundW("SystemDefault", None, self.SND_ALIAS | self.SND_ASYNC)
|
||||||
|
|
||||||
|
def play_notification_sound(self):
|
||||||
|
self.PlaySoundW("SystemNotification", None, self.SND_ALIAS | self.SND_ASYNC)
|
||||||
|
|
||||||
|
def play_mail_sound(self):
|
||||||
|
self.PlaySoundW("MailBeep", None, self.SND_ALIAS | self.SND_ASYNC)
|
||||||
|
|
||||||
|
def play_exit_sound(self):
|
||||||
|
self.PlaySoundW("SystemExit", None, self.SND_ALIAS | self.SND_ASYNC)
|
||||||
|
|
||||||
|
def play_connect_server_or_channel(self):
|
||||||
|
try:
|
||||||
|
sound_path = get_resource_path("sounds/space-pdj.wav")
|
||||||
|
import os
|
||||||
|
if os.path.exists(sound_path):
|
||||||
|
self.PlaySoundW(sound_path, None, self.SND_FILENAME | self.SND_ASYNC)
|
||||||
|
else:
|
||||||
|
logger.warning(f"Sound file not found: {sound_path}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing popout click sound: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def play_popout_click(self):
|
||||||
|
try:
|
||||||
|
sound_path = get_resource_path("sounds/startup.wav")
|
||||||
|
import os
|
||||||
|
if os.path.exists(sound_path):
|
||||||
|
self.PlaySoundW(sound_path, None, self.SND_FILENAME | self.SND_ASYNC)
|
||||||
|
else:
|
||||||
|
logger.warning(f"Sound file not found: {sound_path}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing popout click sound: {e}")
|
||||||
|
|
||||||
|
def play_msg_recv(self):
|
||||||
|
try:
|
||||||
|
sound_path = get_resource_path("sounds/balloon.wav")
|
||||||
|
import os
|
||||||
|
if os.path.exists(sound_path):
|
||||||
|
self.PlaySoundW(sound_path, None, self.SND_FILENAME | self.SND_ASYNC)
|
||||||
|
else:
|
||||||
|
logger.warning(f"Sound file not found: {sound_path}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing message received sound: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
BIN
src/channel.ico
Normal file
BIN
src/channel.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 97 KiB |
696
src/main.py
696
src/main.py
@@ -1,4 +1,6 @@
|
|||||||
import wx
|
import wx
|
||||||
|
import wx.aui
|
||||||
|
import wx.lib.agw.aui as aui
|
||||||
import irc.client
|
import irc.client
|
||||||
import threading
|
import threading
|
||||||
import re
|
import re
|
||||||
@@ -16,7 +18,9 @@ from PrivacyNoticeDialog import PrivacyNoticeDialog
|
|||||||
from IRCPanel import IRCPanel
|
from IRCPanel import IRCPanel
|
||||||
from AboutDialog import AboutDialog
|
from AboutDialog import AboutDialog
|
||||||
from NotesDialog import NotesDialog
|
from NotesDialog import NotesDialog
|
||||||
|
if os.name == "nt": from Win32API import Win32API ; from Win32SoundHandler import Win32SoundHandler
|
||||||
from ScanWizard import ScanWizardDialog
|
from ScanWizard import ScanWizardDialog
|
||||||
|
from LocalServer import LocalServerManager
|
||||||
|
|
||||||
# Set up logging
|
# Set up logging
|
||||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||||
@@ -39,12 +43,214 @@ class UIUpdate:
|
|||||||
self.args = args
|
self.args = args
|
||||||
self.kwargs = kwargs
|
self.kwargs = kwargs
|
||||||
|
|
||||||
|
|
||||||
|
class ManageChannelsDialog(wx.Dialog):
|
||||||
|
"""Simple dialog for curating the local server channel allowlist."""
|
||||||
|
|
||||||
|
def __init__(self, parent, channels):
|
||||||
|
super().__init__(parent, title="Manage Local Channels", size=(360, 420))
|
||||||
|
try:
|
||||||
|
self.SetIcon(parent.GetIcon())
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
panel = wx.Panel(self)
|
||||||
|
panel.SetBackgroundColour(parent.theme["window_bg"])
|
||||||
|
|
||||||
|
main_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
|
info = wx.StaticText(
|
||||||
|
panel,
|
||||||
|
label="Channels are shared with anyone on your LAN who joins the built-in server.",
|
||||||
|
)
|
||||||
|
info.Wrap(320)
|
||||||
|
main_sizer.Add(info, 0, wx.ALL | wx.EXPAND, 8)
|
||||||
|
|
||||||
|
self.list_box = wx.ListBox(panel)
|
||||||
|
for channel in channels:
|
||||||
|
self.list_box.Append(channel)
|
||||||
|
main_sizer.Add(self.list_box, 1, wx.ALL | wx.EXPAND, 8)
|
||||||
|
|
||||||
|
input_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||||
|
self.channel_input = wx.TextCtrl(panel, style=wx.TE_PROCESS_ENTER)
|
||||||
|
self.channel_input.SetHint("#channel-name")
|
||||||
|
add_btn = wx.Button(panel, label="Add")
|
||||||
|
input_sizer.Add(self.channel_input, 1, wx.RIGHT, 4)
|
||||||
|
input_sizer.Add(add_btn, 0)
|
||||||
|
main_sizer.Add(input_sizer, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 8)
|
||||||
|
|
||||||
|
remove_btn = wx.Button(panel, label="Remove Selected")
|
||||||
|
reset_btn = wx.Button(panel, label="Reset to #lobby")
|
||||||
|
btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||||
|
btn_sizer.Add(remove_btn, 1, wx.RIGHT, 4)
|
||||||
|
btn_sizer.Add(reset_btn, 1)
|
||||||
|
main_sizer.Add(btn_sizer, 0, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, 8)
|
||||||
|
|
||||||
|
button_bar = wx.StdDialogButtonSizer()
|
||||||
|
ok_btn = wx.Button(panel, wx.ID_OK)
|
||||||
|
cancel_btn = wx.Button(panel, wx.ID_CANCEL)
|
||||||
|
button_bar.AddButton(ok_btn)
|
||||||
|
button_bar.AddButton(cancel_btn)
|
||||||
|
button_bar.Realize()
|
||||||
|
main_sizer.Add(button_bar, 0, wx.ALL | wx.EXPAND, 8)
|
||||||
|
|
||||||
|
panel.SetSizer(main_sizer)
|
||||||
|
|
||||||
|
# Bindings
|
||||||
|
add_btn.Bind(wx.EVT_BUTTON, self.on_add)
|
||||||
|
remove_btn.Bind(wx.EVT_BUTTON, self.on_remove)
|
||||||
|
reset_btn.Bind(wx.EVT_BUTTON, self.on_reset)
|
||||||
|
self.channel_input.Bind(wx.EVT_TEXT_ENTER, self.on_add)
|
||||||
|
ok_btn.Bind(wx.EVT_BUTTON, self.on_ok)
|
||||||
|
|
||||||
|
def get_channels(self):
|
||||||
|
return [self.list_box.GetString(i) for i in range(self.list_box.GetCount())]
|
||||||
|
|
||||||
|
def on_add(self, event):
|
||||||
|
value = self.channel_input.GetValue().strip()
|
||||||
|
if not value:
|
||||||
|
return
|
||||||
|
if not value.startswith('#'):
|
||||||
|
value = f"#{value}"
|
||||||
|
if not self._is_valid_channel(value):
|
||||||
|
wx.MessageBox(
|
||||||
|
"Channel names may contain letters, numbers, -, and _ only.",
|
||||||
|
"Invalid Channel",
|
||||||
|
wx.OK | wx.ICON_WARNING,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
if self.list_box.FindString(value) != wx.NOT_FOUND:
|
||||||
|
wx.MessageBox("Channel already exists.", "Duplicate Channel", wx.OK | wx.ICON_INFORMATION)
|
||||||
|
return
|
||||||
|
self.list_box.Append(value)
|
||||||
|
self.channel_input.Clear()
|
||||||
|
|
||||||
|
def on_remove(self, event):
|
||||||
|
selection = self.list_box.GetSelection()
|
||||||
|
if selection != wx.NOT_FOUND:
|
||||||
|
self.list_box.Delete(selection)
|
||||||
|
|
||||||
|
def on_reset(self, event):
|
||||||
|
self.list_box.Clear()
|
||||||
|
self.list_box.Append("#lobby")
|
||||||
|
|
||||||
|
def on_ok(self, event):
|
||||||
|
if self.list_box.GetCount() == 0:
|
||||||
|
wx.MessageBox("Add at least one channel before saving.", "No Channels", wx.OK | wx.ICON_INFORMATION)
|
||||||
|
return
|
||||||
|
event.Skip()
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _is_valid_channel(name):
|
||||||
|
if len(name) < 2:
|
||||||
|
return False
|
||||||
|
allowed = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_#"
|
||||||
|
return all(ch in allowed for ch in name)
|
||||||
|
|
||||||
|
|
||||||
|
class InterfaceSelectDialog(wx.Dialog):
|
||||||
|
"""Dialog that lets the user pick which local interface the server should bind to."""
|
||||||
|
|
||||||
|
def __init__(self, parent, current_host="127.0.0.1"):
|
||||||
|
super().__init__(parent, title="Select Network Interface", size=(420, 380))
|
||||||
|
try:
|
||||||
|
self.SetIcon(parent.GetIcon())
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
self.selected_host = current_host
|
||||||
|
panel = wx.Panel(self)
|
||||||
|
panel.SetBackgroundColour(parent.theme["window_bg"])
|
||||||
|
main_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
|
|
||||||
|
info = wx.StaticText(
|
||||||
|
panel,
|
||||||
|
label="Choose the Network interface where your server should run:\n"
|
||||||
|
"You are EXPOSING a Server to your LOCAL Network, this may give away who you are!\n",
|
||||||
|
)
|
||||||
|
info.Wrap(380)
|
||||||
|
main_sizer.Add(info, 0, wx.ALL | wx.EXPAND, 10)
|
||||||
|
|
||||||
|
self.interface_list = wx.ListCtrl(panel, style=wx.LC_REPORT | wx.BORDER_SUNKEN)
|
||||||
|
self.interface_list.InsertColumn(0, "Interface", width=180)
|
||||||
|
self.interface_list.InsertColumn(1, "Address", width=180)
|
||||||
|
|
||||||
|
self.interfaces = self._gather_interfaces()
|
||||||
|
current_index = 0
|
||||||
|
for idx, entry in enumerate[tuple[str, str]](self.interfaces):
|
||||||
|
name, address = entry
|
||||||
|
self.interface_list.InsertItem(idx, name)
|
||||||
|
self.interface_list.SetItem(idx, 1, address)
|
||||||
|
if address == current_host:
|
||||||
|
current_index = idx
|
||||||
|
self.interface_list.Select(current_index)
|
||||||
|
self.interface_list.EnsureVisible(current_index)
|
||||||
|
if self.interfaces:
|
||||||
|
self.selected_host = self.interfaces[current_index][1]
|
||||||
|
self.interface_list.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_select)
|
||||||
|
self.interface_list.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.on_activate)
|
||||||
|
main_sizer.Add(self.interface_list, 1, wx.ALL | wx.EXPAND, 10)
|
||||||
|
|
||||||
|
button_bar = wx.StdDialogButtonSizer()
|
||||||
|
ok_btn = wx.Button(panel, wx.ID_OK)
|
||||||
|
cancel_btn = wx.Button(panel, wx.ID_CANCEL)
|
||||||
|
button_bar.AddButton(ok_btn)
|
||||||
|
button_bar.AddButton(cancel_btn)
|
||||||
|
button_bar.Realize()
|
||||||
|
main_sizer.Add(button_bar, 0, wx.ALL | wx.EXPAND, 10)
|
||||||
|
|
||||||
|
ok_btn.Bind(wx.EVT_BUTTON, self.on_ok)
|
||||||
|
|
||||||
|
panel.SetSizer(main_sizer)
|
||||||
|
|
||||||
|
def on_select(self, event):
|
||||||
|
index = event.GetIndex()
|
||||||
|
_, address = self.interfaces[index]
|
||||||
|
self.selected_host = address
|
||||||
|
|
||||||
|
def _gather_interfaces(self):
|
||||||
|
entries = [
|
||||||
|
("Loopback only", "127.0.0.1"),
|
||||||
|
("All interfaces", "0.0.0.0"),
|
||||||
|
]
|
||||||
|
try:
|
||||||
|
import psutil
|
||||||
|
|
||||||
|
seen = {addr for _, addr in entries}
|
||||||
|
for name, addrs in psutil.net_if_addrs().items():
|
||||||
|
for addr in addrs:
|
||||||
|
if addr.family == socket.AF_INET and addr.address not in seen:
|
||||||
|
label = f"{name}"
|
||||||
|
entries.append((label, addr.address))
|
||||||
|
seen.add(addr.address)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Unable to enumerate network interfaces: {e}")
|
||||||
|
|
||||||
|
return entries
|
||||||
|
|
||||||
|
def get_selected_host(self):
|
||||||
|
return self.selected_host
|
||||||
|
|
||||||
|
def on_activate(self, event):
|
||||||
|
self.on_select(event)
|
||||||
|
self.EndModal(wx.ID_OK)
|
||||||
|
|
||||||
|
def on_ok(self, event):
|
||||||
|
index = self.interface_list.GetFirstSelected()
|
||||||
|
if index == -1 and self.interfaces:
|
||||||
|
wx.MessageBox("Select an interface before starting the server.", "No Interface Selected", wx.OK | wx.ICON_INFORMATION)
|
||||||
|
return
|
||||||
|
if index != -1:
|
||||||
|
_, address = self.interfaces[index]
|
||||||
|
self.selected_host = address
|
||||||
|
event.Skip()
|
||||||
|
|
||||||
|
|
||||||
class IRCFrame(wx.Frame):
|
class IRCFrame(wx.Frame):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super().__init__(None, title="wxIRC", size=(1200, 700))
|
super().__init__(None, title="wxIRC", size=(1200, 700))
|
||||||
|
|
||||||
# Apply white theme
|
# Determine platform theme once
|
||||||
self.apply_white_theme()
|
self.theme = self.build_theme()
|
||||||
|
self.apply_theme()
|
||||||
|
|
||||||
# Show privacy notice first
|
# Show privacy notice first
|
||||||
self.show_privacy_notice()
|
self.show_privacy_notice()
|
||||||
@@ -70,6 +276,12 @@ class IRCFrame(wx.Frame):
|
|||||||
self.timestamps = True
|
self.timestamps = True
|
||||||
|
|
||||||
self.notes_data = defaultdict(dict)
|
self.notes_data = defaultdict(dict)
|
||||||
|
self.server_menu_items = {}
|
||||||
|
self.local_bind_host = "127.0.0.1"
|
||||||
|
self.local_server_manager = LocalServerManager(
|
||||||
|
log_callback=self.log_local_server,
|
||||||
|
listen_host=self.local_bind_host,
|
||||||
|
)
|
||||||
|
|
||||||
# User color mapping - darker colors for white theme
|
# User color mapping - darker colors for white theme
|
||||||
self.user_colors = {}
|
self.user_colors = {}
|
||||||
@@ -91,6 +303,18 @@ class IRCFrame(wx.Frame):
|
|||||||
self.motd_lines = []
|
self.motd_lines = []
|
||||||
self.collecting_motd = False
|
self.collecting_motd = False
|
||||||
|
|
||||||
|
self.hwnd = self.GetHandle()
|
||||||
|
self.ctrl = Win32API(self.hwnd)
|
||||||
|
|
||||||
|
# Initialize sound handler for Windows
|
||||||
|
if os.name == "nt":
|
||||||
|
self.sound_handler = Win32SoundHandler(self.hwnd)
|
||||||
|
else:
|
||||||
|
self.sound_handler = None
|
||||||
|
|
||||||
|
# Sound toggle state (enabled by default)
|
||||||
|
self.sounds_enabled = True
|
||||||
|
|
||||||
self.setup_irc_handlers()
|
self.setup_irc_handlers()
|
||||||
self.create_menubar()
|
self.create_menubar()
|
||||||
self.setup_ui()
|
self.setup_ui()
|
||||||
@@ -121,23 +345,84 @@ class IRCFrame(wx.Frame):
|
|||||||
self.Bind(wx.EVT_MENU, self.on_find_previous, id=1002)
|
self.Bind(wx.EVT_MENU, self.on_find_previous, id=1002)
|
||||||
self.Bind(wx.EVT_MENU, self.on_quick_escape, id=1003)
|
self.Bind(wx.EVT_MENU, self.on_quick_escape, id=1003)
|
||||||
|
|
||||||
def apply_white_theme(self):
|
HOTKEY_ID = 1
|
||||||
"""Apply white theme to the application"""
|
MOD_CONTROL = 0x0002
|
||||||
|
MOD_ALT = 0x0001
|
||||||
|
|
||||||
|
# Register directly on the wx.Frame
|
||||||
|
self.RegisterHotKey(HOTKEY_ID, MOD_CONTROL | MOD_ALT, ord('H'))
|
||||||
|
self.Bind(wx.EVT_HOTKEY, self.on_hotkey, id=HOTKEY_ID)
|
||||||
|
|
||||||
|
def on_hotkey(self, event):
|
||||||
|
self.ctrl.toggle()
|
||||||
|
|
||||||
|
def build_theme(self):
|
||||||
|
"""Build a small theme descriptor that respects the host platform."""
|
||||||
try:
|
try:
|
||||||
# Set system colors for white theme
|
|
||||||
self.SetBackgroundColour(wx.Colour(255, 255, 255))
|
|
||||||
self.SetForegroundColour(wx.Colour(0, 0, 0))
|
|
||||||
|
|
||||||
# Set system settings for light theme
|
|
||||||
sys_settings = wx.SystemSettings()
|
sys_settings = wx.SystemSettings()
|
||||||
|
system_window = sys_settings.GetColour(wx.SYS_COLOUR_WINDOW)
|
||||||
|
system_text = sys_settings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
|
||||||
|
system_face = sys_settings.GetColour(wx.SYS_COLOUR_BTNFACE)
|
||||||
|
|
||||||
|
is_windows = wx.Platform == "__WXMSW__"
|
||||||
|
if is_windows:
|
||||||
|
window_bg = wx.Colour(255, 255, 255)
|
||||||
|
control_bg = wx.Colour(240, 240, 240)
|
||||||
|
text = wx.Colour(0, 0, 0)
|
||||||
|
else:
|
||||||
|
window_bg = system_window
|
||||||
|
control_bg = system_face
|
||||||
|
text = system_text
|
||||||
|
|
||||||
|
sidebar_delta = 15 if self._is_light_colour(window_bg) else -20
|
||||||
|
sidebar_bg = self._adjust_colour(control_bg if control_bg.IsOk() else window_bg, sidebar_delta)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"window_bg": window_bg,
|
||||||
|
"content_bg": window_bg,
|
||||||
|
"text": text,
|
||||||
|
"sidebar_bg": sidebar_bg,
|
||||||
|
"control_bg": control_bg if control_bg.IsOk() else window_bg,
|
||||||
|
"force_light": is_windows,
|
||||||
|
}
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Error applying white theme: {e}")
|
logger.error(f"Error building theme: {e}")
|
||||||
|
# Fallback to a simple light theme
|
||||||
|
return {
|
||||||
|
"window_bg": wx.Colour(255, 255, 255),
|
||||||
|
"content_bg": wx.Colour(255, 255, 255),
|
||||||
|
"text": wx.Colour(0, 0, 0),
|
||||||
|
"sidebar_bg": wx.Colour(240, 240, 240),
|
||||||
|
"control_bg": wx.Colour(240, 240, 240),
|
||||||
|
"force_light": True,
|
||||||
|
}
|
||||||
|
|
||||||
|
def _is_light_colour(self, colour):
|
||||||
|
"""Simple luminance check to know if a colour is light."""
|
||||||
|
luminance = 0.299 * colour.Red() + 0.587 * colour.Green() + 0.114 * colour.Blue()
|
||||||
|
return luminance >= 128
|
||||||
|
|
||||||
|
def _adjust_colour(self, colour, delta):
|
||||||
|
"""Lighten or darken a colour by delta."""
|
||||||
|
def clamp(value):
|
||||||
|
return max(0, min(255, value))
|
||||||
|
return wx.Colour(
|
||||||
|
clamp(colour.Red() + delta),
|
||||||
|
clamp(colour.Green() + delta),
|
||||||
|
clamp(colour.Blue() + delta),
|
||||||
|
)
|
||||||
|
|
||||||
|
def apply_theme(self):
|
||||||
|
"""Apply the detected theme."""
|
||||||
|
try:
|
||||||
|
self.SetBackgroundColour(self.theme["window_bg"])
|
||||||
|
self.SetForegroundColour(self.theme["text"])
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error applying theme: {e}")
|
||||||
|
|
||||||
def show_privacy_notice(self):
|
def show_privacy_notice(self):
|
||||||
"""Show privacy notice dialog at startup"""
|
"""Show privacy notice dialog at startup"""
|
||||||
dlg = PrivacyNoticeDialog(self)
|
dlg = PrivacyNoticeDialog(self)
|
||||||
dlg.ShowModal()
|
|
||||||
dlg.Destroy()
|
dlg.Destroy()
|
||||||
|
|
||||||
def get_user_color(self, username):
|
def get_user_color(self, username):
|
||||||
@@ -199,12 +484,12 @@ class IRCFrame(wx.Frame):
|
|||||||
def setup_ui(self):
|
def setup_ui(self):
|
||||||
"""Setup UI components with white theme"""
|
"""Setup UI components with white theme"""
|
||||||
panel = wx.Panel(self)
|
panel = wx.Panel(self)
|
||||||
panel.SetBackgroundColour(wx.Colour(255, 255, 255)) # White background
|
panel.SetBackgroundColour(self.theme["window_bg"])
|
||||||
main_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
main_sizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||||
|
|
||||||
# Left sidebar - light gray for contrast
|
# Left sidebar - light gray for contrast
|
||||||
left_panel = wx.Panel(panel)
|
left_panel = wx.Panel(panel)
|
||||||
left_panel.SetBackgroundColour(wx.Colour(240, 240, 240)) # Light gray
|
left_panel.SetBackgroundColour(self.theme["sidebar_bg"])
|
||||||
left_sizer = wx.BoxSizer(wx.VERTICAL)
|
left_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
|
|
||||||
conn_box = wx.StaticBox(left_panel, label="Connection")
|
conn_box = wx.StaticBox(left_panel, label="Connection")
|
||||||
@@ -268,19 +553,35 @@ class IRCFrame(wx.Frame):
|
|||||||
|
|
||||||
left_panel.SetSizer(left_sizer)
|
left_panel.SetSizer(left_sizer)
|
||||||
|
|
||||||
# Center - Notebook
|
self.notebook = wx.aui.AuiNotebook(panel, style=
|
||||||
self.notebook = wx.Notebook(panel)
|
wx.aui.AUI_NB_DEFAULT_STYLE |
|
||||||
self.notebook.SetBackgroundColour(wx.Colour(255, 255, 255))
|
wx.aui.AUI_NB_CLOSE_ON_ACTIVE_TAB |
|
||||||
|
wx.aui.AUI_NB_MIDDLE_CLICK_CLOSE
|
||||||
|
)
|
||||||
|
self.notebook.SetBackgroundColour(self.theme["content_bg"])
|
||||||
|
|
||||||
|
# Setup tab icons
|
||||||
|
self.setup_tab_icons()
|
||||||
|
|
||||||
|
# Bind close event
|
||||||
|
self.notebook.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.on_notebook_page_close)
|
||||||
|
|
||||||
# Server panel
|
|
||||||
server_panel = IRCPanel(self.notebook, self)
|
server_panel = IRCPanel(self.notebook, self)
|
||||||
server_panel.set_target("SERVER")
|
server_panel.set_target("SERVER")
|
||||||
|
|
||||||
|
idx = self.notebook.GetPageCount()
|
||||||
self.notebook.AddPage(server_panel, "Server")
|
self.notebook.AddPage(server_panel, "Server")
|
||||||
|
|
||||||
|
# THIS is the missing line
|
||||||
|
if self.icon_server != -1:
|
||||||
|
self.notebook.SetPageImage(idx, self.icon_server)
|
||||||
|
|
||||||
self.channels["SERVER"] = server_panel
|
self.channels["SERVER"] = server_panel
|
||||||
|
|
||||||
|
|
||||||
# Right sidebar - Users - light gray for contrast
|
# Right sidebar - Users - light gray for contrast
|
||||||
right_panel = wx.Panel(panel)
|
right_panel = wx.Panel(panel)
|
||||||
right_panel.SetBackgroundColour(wx.Colour(240, 240, 240)) # Light gray
|
right_panel.SetBackgroundColour(self.theme["sidebar_bg"])
|
||||||
right_sizer = wx.BoxSizer(wx.VERTICAL)
|
right_sizer = wx.BoxSizer(wx.VERTICAL)
|
||||||
|
|
||||||
users_box = wx.StaticBox(right_panel, label="Users")
|
users_box = wx.StaticBox(right_panel, label="Users")
|
||||||
@@ -335,8 +636,12 @@ class IRCFrame(wx.Frame):
|
|||||||
file_menu = wx.Menu()
|
file_menu = wx.Menu()
|
||||||
file_menu.Append(300, "&About", "About wxIRC Client")
|
file_menu.Append(300, "&About", "About wxIRC Client")
|
||||||
file_menu.AppendSeparator()
|
file_menu.AppendSeparator()
|
||||||
|
self.sound_toggle_item = file_menu.AppendCheckItem(301, "Toggle &Sounds")
|
||||||
|
self.sound_toggle_item.Check(True) # Sounds enabled by default
|
||||||
|
file_menu.AppendSeparator()
|
||||||
file_menu.Append(wx.ID_EXIT, "E&xit\tCtrl+Q")
|
file_menu.Append(wx.ID_EXIT, "E&xit\tCtrl+Q")
|
||||||
self.Bind(wx.EVT_MENU, self.on_about, id=300)
|
self.Bind(wx.EVT_MENU, self.on_about, id=300)
|
||||||
|
self.Bind(wx.EVT_MENU, self.on_toggle_sounds, id=301)
|
||||||
self.Bind(wx.EVT_MENU, self.on_close, id=wx.ID_EXIT)
|
self.Bind(wx.EVT_MENU, self.on_close, id=wx.ID_EXIT)
|
||||||
|
|
||||||
# Edit menu with search
|
# Edit menu with search
|
||||||
@@ -383,15 +688,37 @@ class IRCFrame(wx.Frame):
|
|||||||
self.Bind(wx.EVT_MENU, self.on_menu_help, id=207)
|
self.Bind(wx.EVT_MENU, self.on_menu_help, id=207)
|
||||||
self.Bind(wx.EVT_MENU, self.on_scan_local_network, id=210)
|
self.Bind(wx.EVT_MENU, self.on_scan_local_network, id=210)
|
||||||
|
|
||||||
|
# IRC Server menu
|
||||||
|
server_menu = wx.Menu()
|
||||||
|
start_item = server_menu.Append(401, "Start Local Server")
|
||||||
|
stop_item = server_menu.Append(402, "Stop Local Server")
|
||||||
|
stop_item.Enable(False)
|
||||||
|
server_menu.AppendSeparator()
|
||||||
|
manage_item = server_menu.Append(403, "Manage Channels...")
|
||||||
|
self.server_menu_items = {
|
||||||
|
"start": start_item,
|
||||||
|
"stop": stop_item,
|
||||||
|
"manage": manage_item,
|
||||||
|
}
|
||||||
|
self.Bind(wx.EVT_MENU, self.on_start_local_server, id=401)
|
||||||
|
self.Bind(wx.EVT_MENU, self.on_stop_local_server, id=402)
|
||||||
|
self.Bind(wx.EVT_MENU, self.on_manage_local_channels, id=403)
|
||||||
|
|
||||||
menubar.Append(file_menu, "&File")
|
menubar.Append(file_menu, "&File")
|
||||||
menubar.Append(edit_menu, "&Edit")
|
menubar.Append(edit_menu, "&Edit")
|
||||||
menubar.Append(channel_menu, "&Channel")
|
menubar.Append(channel_menu, "&Channel")
|
||||||
menubar.Append(tools_menu, "&Tools")
|
menubar.Append(tools_menu, "&Tools")
|
||||||
|
menubar.Append(server_menu, "&IRC Server")
|
||||||
|
|
||||||
self.SetMenuBar(menubar)
|
self.SetMenuBar(menubar)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Error creating menu: {e}")
|
logger.error(f"Error creating menu: {e}")
|
||||||
|
|
||||||
|
def on_toggle_sounds(self, event):
|
||||||
|
"""Toggle sound effects on/off"""
|
||||||
|
self.sounds_enabled = self.sound_toggle_item.IsChecked()
|
||||||
|
logger.info(f"Sounds {'enabled' if self.sounds_enabled else 'disabled'}")
|
||||||
|
|
||||||
def on_about(self, event):
|
def on_about(self, event):
|
||||||
"""Show About dialog"""
|
"""Show About dialog"""
|
||||||
try:
|
try:
|
||||||
@@ -400,6 +727,11 @@ class IRCFrame(wx.Frame):
|
|||||||
dlg.Destroy()
|
dlg.Destroy()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Error showing about dialog: {e}")
|
logger.error(f"Error showing about dialog: {e}")
|
||||||
|
if self.sound_handler and self.sounds_enabled:
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_error_sound()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
def on_notes(self, event):
|
def on_notes(self, event):
|
||||||
"""Open notes editor dialog"""
|
"""Open notes editor dialog"""
|
||||||
@@ -420,6 +752,11 @@ class IRCFrame(wx.Frame):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Error opening notes dialog: {e}")
|
logger.error(f"Error opening notes dialog: {e}")
|
||||||
self.log_server(f"Error opening notes: {e}", wx.Colour(255, 0, 0))
|
self.log_server(f"Error opening notes: {e}", wx.Colour(255, 0, 0))
|
||||||
|
if self.sound_handler and self.sounds_enabled:
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_error_sound()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
def on_notes_closed(self, event=None):
|
def on_notes_closed(self, event=None):
|
||||||
"""Handle notes frame closing"""
|
"""Handle notes frame closing"""
|
||||||
@@ -586,6 +923,13 @@ class IRCFrame(wx.Frame):
|
|||||||
self.SetStatusText("Connection failed")
|
self.SetStatusText("Connection failed")
|
||||||
logger.error(f"Connection failed: {error_msg}")
|
logger.error(f"Connection failed: {error_msg}")
|
||||||
|
|
||||||
|
# Play error sound
|
||||||
|
if self.sound_handler and self.sounds_enabled:
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_error_sound()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing connection failure sound: {e}")
|
||||||
|
|
||||||
def disconnect(self):
|
def disconnect(self):
|
||||||
"""Safely disconnect from IRC server"""
|
"""Safely disconnect from IRC server"""
|
||||||
try:
|
try:
|
||||||
@@ -615,6 +959,13 @@ class IRCFrame(wx.Frame):
|
|||||||
|
|
||||||
def on_disconnect_cleanup(self):
|
def on_disconnect_cleanup(self):
|
||||||
"""Clean up after disconnect"""
|
"""Clean up after disconnect"""
|
||||||
|
# Play disconnect notification sound
|
||||||
|
if self.sound_handler and self.sounds_enabled:
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_warn_sound()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing disconnect sound: {e}")
|
||||||
|
|
||||||
with self.connection_lock:
|
with self.connection_lock:
|
||||||
self.connection = None
|
self.connection = None
|
||||||
self.is_connecting = False
|
self.is_connecting = False
|
||||||
@@ -782,38 +1133,76 @@ Available commands:
|
|||||||
user_color = self.get_user_color(self.nick)
|
user_color = self.get_user_color(self.nick)
|
||||||
timestamp = self.get_timestamp()
|
timestamp = self.get_timestamp()
|
||||||
self.channels[target].add_formatted_message(timestamp, self.nick, args, user_color, is_action=True)
|
self.channels[target].add_formatted_message(timestamp, self.nick, args, user_color, is_action=True)
|
||||||
elif cmd == "nick" and self.is_connected():
|
elif cmd == "nick":
|
||||||
|
if self.is_connected():
|
||||||
self.connection.nick(args)
|
self.connection.nick(args)
|
||||||
elif cmd == "join" and self.is_connected():
|
else:
|
||||||
if args and not args.startswith('#'):
|
self.safe_ui_update(self.log_server, f"Not connected. Cannot change nickname.", wx.Colour(255, 0, 0))
|
||||||
|
elif cmd == "join":
|
||||||
|
if self.is_connected():
|
||||||
|
if not args:
|
||||||
|
self.safe_ui_update(self.log_server, f"Usage: /join <channel>", wx.Colour(255, 0, 0))
|
||||||
|
else:
|
||||||
|
if not args.startswith('#'):
|
||||||
args = '#' + args
|
args = '#' + args
|
||||||
self.connection.join(args)
|
self.connection.join(args)
|
||||||
elif cmd == "part" and self.is_connected():
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Not connected. Cannot join channel.", wx.Colour(255, 0, 0))
|
||||||
|
elif cmd == "part":
|
||||||
|
if self.is_connected():
|
||||||
channel = args if args else target
|
channel = args if args else target
|
||||||
self.connection.part(channel)
|
self.connection.part(channel)
|
||||||
elif cmd == "quit" and self.is_connected():
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Not connected. Cannot part channel.", wx.Colour(255, 0, 0))
|
||||||
|
elif cmd == "quit":
|
||||||
|
if self.is_connected():
|
||||||
reason = args if args else "Goodbye"
|
reason = args if args else "Goodbye"
|
||||||
self.connection.quit(reason)
|
self.connection.quit(reason)
|
||||||
elif cmd == "msg" and self.is_connected():
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Not connected.", wx.Colour(255, 0, 0))
|
||||||
|
elif cmd == "msg":
|
||||||
|
if self.is_connected():
|
||||||
nick_msg = args.split(' ', 1)
|
nick_msg = args.split(' ', 1)
|
||||||
if len(nick_msg) == 2:
|
if len(nick_msg) == 2:
|
||||||
self.connection.privmsg(nick_msg[0], nick_msg[1])
|
self.connection.privmsg(nick_msg[0], nick_msg[1])
|
||||||
elif cmd == "whois" and self.is_connected():
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Usage: /msg <nick> <message>", wx.Colour(255, 0, 0))
|
||||||
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Not connected. Cannot send private message.", wx.Colour(255, 0, 0))
|
||||||
|
elif cmd == "whois":
|
||||||
|
if self.is_connected():
|
||||||
|
if args:
|
||||||
self.connection.whois([args])
|
self.connection.whois([args])
|
||||||
elif cmd == "kick" and self.is_connected():
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Usage: /whois <nick>", wx.Colour(255, 0, 0))
|
||||||
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Not connected. Cannot perform WHOIS.", wx.Colour(255, 0, 0))
|
||||||
|
elif cmd == "kick":
|
||||||
|
if self.is_connected():
|
||||||
|
if args:
|
||||||
kick_args = args.split(' ', 1)
|
kick_args = args.split(' ', 1)
|
||||||
user = kick_args[0]
|
user = kick_args[0]
|
||||||
reason = kick_args[1] if len(kick_args) > 1 else "Kicked"
|
reason = kick_args[1] if len(kick_args) > 1 else "Kicked"
|
||||||
self.connection.kick(target, user, reason)
|
self.connection.kick(target, user, reason)
|
||||||
elif cmd == "topic" and self.is_connected():
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Usage: /kick <user> [reason]", wx.Colour(255, 0, 0))
|
||||||
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Not connected. Cannot kick user.", wx.Colour(255, 0, 0))
|
||||||
|
elif cmd == "topic":
|
||||||
|
if self.is_connected():
|
||||||
if args:
|
if args:
|
||||||
self.connection.topic(target, args)
|
self.connection.topic(target, args)
|
||||||
else:
|
else:
|
||||||
self.connection.topic(target)
|
self.connection.topic(target)
|
||||||
elif cmd == "away" and self.is_connected():
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Not connected. Cannot get/set topic.", wx.Colour(255, 0, 0))
|
||||||
|
elif cmd == "away":
|
||||||
|
if self.is_connected():
|
||||||
self.connection.send_raw(f"AWAY :{args}" if args else "AWAY")
|
self.connection.send_raw(f"AWAY :{args}" if args else "AWAY")
|
||||||
self.away = bool(args)
|
self.away = bool(args)
|
||||||
self.safe_ui_update(self.away_item.Check, self.away)
|
self.safe_ui_update(self.away_item.Check, self.away)
|
||||||
|
else:
|
||||||
|
self.safe_ui_update(self.log_server, f"Not connected. Cannot set away status.", wx.Colour(255, 0, 0))
|
||||||
else:
|
else:
|
||||||
self.safe_ui_update(self.log_server, f"Unknown command: {cmd}. Use /help for available commands.", wx.Colour(255, 0, 0))
|
self.safe_ui_update(self.log_server, f"Unknown command: {cmd}. Use /help for available commands.", wx.Colour(255, 0, 0))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -831,12 +1220,19 @@ Available commands:
|
|||||||
try:
|
try:
|
||||||
if channel in self.channels and channel != "SERVER":
|
if channel in self.channels and channel != "SERVER":
|
||||||
def _close_channel():
|
def _close_channel():
|
||||||
|
# Find and delete the page
|
||||||
for i in range(self.notebook.GetPageCount()):
|
for i in range(self.notebook.GetPageCount()):
|
||||||
if self.notebook.GetPageText(i) == channel:
|
if self.notebook.GetPageText(i) == channel:
|
||||||
self.notebook.DeletePage(i)
|
self.notebook.DeletePage(i)
|
||||||
break
|
break
|
||||||
|
|
||||||
|
# Clean up channel data
|
||||||
|
if channel in self.channels:
|
||||||
del self.channels[channel]
|
del self.channels[channel]
|
||||||
|
|
||||||
|
if channel in self.channel_users:
|
||||||
|
del self.channel_users[channel]
|
||||||
|
|
||||||
idx = self.channel_list.FindString(channel)
|
idx = self.channel_list.FindString(channel)
|
||||||
if idx != wx.NOT_FOUND:
|
if idx != wx.NOT_FOUND:
|
||||||
self.channel_list.Delete(idx)
|
self.channel_list.Delete(idx)
|
||||||
@@ -852,11 +1248,24 @@ Available commands:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Error logging server message: {e}")
|
logger.error(f"Error logging server message: {e}")
|
||||||
|
|
||||||
|
def log_local_server(self, message, color=None, bold=False):
|
||||||
|
"""Bridge LocalServerManager log output into the Server tab."""
|
||||||
|
display_color = color or wx.Colour(34, 139, 34) # Forest green
|
||||||
|
self.safe_ui_update(
|
||||||
|
self.log_server,
|
||||||
|
f"[Local Server] {message}",
|
||||||
|
display_color,
|
||||||
|
bold,
|
||||||
|
)
|
||||||
|
|
||||||
def log_channel_message(self, channel, username, message, is_action=False, is_system=False):
|
def log_channel_message(self, channel, username, message, is_action=False, is_system=False):
|
||||||
"""Log a message to a channel with username coloring"""
|
"""Log a message to a channel with username coloring"""
|
||||||
try:
|
try:
|
||||||
|
# Don't create new channels if they don't exist and we're trying to log to them
|
||||||
if channel not in self.channels:
|
if channel not in self.channels:
|
||||||
self.safe_ui_update(self.add_channel, channel)
|
# Only create channel if it's being opened by the user, not just receiving messages
|
||||||
|
return
|
||||||
|
|
||||||
if channel in self.channels:
|
if channel in self.channels:
|
||||||
timestamp = self.get_timestamp()
|
timestamp = self.get_timestamp()
|
||||||
|
|
||||||
@@ -879,12 +1288,140 @@ Available commands:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Error logging channel message: {e}")
|
logger.error(f"Error logging channel message: {e}")
|
||||||
|
|
||||||
|
def setup_tab_icons(self):
|
||||||
|
try:
|
||||||
|
self.tab_image_list = wx.ImageList(32, 32)
|
||||||
|
|
||||||
|
# Icon file names to search for
|
||||||
|
icon_files = {
|
||||||
|
'server': 'server.ico',
|
||||||
|
'channel': 'channel.ico',
|
||||||
|
'query': 'channel.ico' # Reuse channel.ico for queries if no query.ico exists
|
||||||
|
}
|
||||||
|
|
||||||
|
# Search paths for icons
|
||||||
|
base_paths = [
|
||||||
|
os.path.dirname(__file__),
|
||||||
|
get_resource_path(""),
|
||||||
|
os.path.join(os.getcwd(), "src"),
|
||||||
|
]
|
||||||
|
|
||||||
|
# Try to load each icon
|
||||||
|
loaded_icons = {}
|
||||||
|
for icon_type, filename in icon_files.items():
|
||||||
|
icon_path = None
|
||||||
|
for base_path in base_paths:
|
||||||
|
test_path = os.path.join(base_path, filename)
|
||||||
|
if os.path.exists(test_path):
|
||||||
|
icon_path = test_path
|
||||||
|
break
|
||||||
|
|
||||||
|
if icon_path:
|
||||||
|
try:
|
||||||
|
img = wx.Image(icon_path, wx.BITMAP_TYPE_ICO)
|
||||||
|
img = img.Scale(32, 32, wx.IMAGE_QUALITY_HIGH)
|
||||||
|
bmp = wx.Bitmap(img)
|
||||||
|
loaded_icons[icon_type] = self.tab_image_list.Add(bmp)
|
||||||
|
logger.info(f"Loaded {icon_type} icon from {icon_path}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Failed to load {icon_type} icon: {e}")
|
||||||
|
loaded_icons[icon_type] = -1
|
||||||
|
else:
|
||||||
|
logger.info(f"{filename} not found for {icon_type}")
|
||||||
|
loaded_icons[icon_type] = -1
|
||||||
|
|
||||||
|
# Assign icon indices
|
||||||
|
self.icon_server = loaded_icons.get('server', -1)
|
||||||
|
self.icon_channel = loaded_icons.get('channel', -1)
|
||||||
|
self.icon_query = loaded_icons.get('query', -1)
|
||||||
|
|
||||||
|
# Use fallback icons if any failed to load
|
||||||
|
if self.icon_server == -1 or self.icon_channel == -1 or self.icon_query == -1:
|
||||||
|
logger.info("Using fallback icons for missing icon files")
|
||||||
|
self._setup_fallback_icons()
|
||||||
|
|
||||||
|
self.notebook.SetImageList(self.tab_image_list)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error setting up tab icons: {e}")
|
||||||
|
self.icon_server = -1
|
||||||
|
self.icon_channel = -1
|
||||||
|
self.icon_query = -1
|
||||||
|
|
||||||
|
def _setup_fallback_icons(self):
|
||||||
|
"""Setup fallback icons using wx.ArtProvider."""
|
||||||
|
try:
|
||||||
|
self.icon_server = self.tab_image_list.Add(
|
||||||
|
wx.ArtProvider.GetBitmap(wx.ART_INFORMATION, wx.ART_OTHER, (48, 48))
|
||||||
|
)
|
||||||
|
self.icon_channel = self.tab_image_list.Add(
|
||||||
|
wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, (48, 48))
|
||||||
|
)
|
||||||
|
self.icon_query = self.tab_image_list.Add(
|
||||||
|
wx.ArtProvider.GetBitmap(wx.ART_HELP, wx.ART_OTHER, (48, 48))
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error setting up fallback icons: {e}")
|
||||||
|
self.icon_server = -1
|
||||||
|
self.icon_channel = -1
|
||||||
|
self.icon_query = -1
|
||||||
|
|
||||||
|
def on_notebook_page_close(self, event):
|
||||||
|
"""Handle tab close button clicks"""
|
||||||
|
try:
|
||||||
|
page_idx = event.GetSelection()
|
||||||
|
channel = self.notebook.GetPageText(page_idx)
|
||||||
|
|
||||||
|
if channel == "Server":
|
||||||
|
event.Veto()
|
||||||
|
wx.MessageBox("Can't close Server!", "Error", wx.OK | wx.ICON_ERROR)
|
||||||
|
return
|
||||||
|
|
||||||
|
if channel in self.channels:
|
||||||
|
del self.channels[channel]
|
||||||
|
|
||||||
|
if channel in self.channel_users:
|
||||||
|
del self.channel_users[channel]
|
||||||
|
|
||||||
|
# Remove from channel list
|
||||||
|
idx = self.channel_list.FindString(channel)
|
||||||
|
if idx != wx.NOT_FOUND:
|
||||||
|
self.channel_list.Delete(idx)
|
||||||
|
|
||||||
|
if channel.startswith('#') and self.is_connected():
|
||||||
|
try:
|
||||||
|
self.connection.part(channel)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Allow the close to proceed
|
||||||
|
event.Skip()
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error closing tab: {e}")
|
||||||
|
event.Skip()
|
||||||
|
|
||||||
def add_channel(self, channel):
|
def add_channel(self, channel):
|
||||||
|
"""Add a new channel/query tab with appropriate icon"""
|
||||||
try:
|
try:
|
||||||
if channel not in self.channels:
|
if channel not in self.channels:
|
||||||
panel = IRCPanel(self.notebook, self)
|
panel = IRCPanel(self.notebook, self)
|
||||||
panel.set_target(channel)
|
panel.set_target(channel)
|
||||||
self.notebook.AddPage(panel, channel)
|
|
||||||
|
# Determine icon based on channel type
|
||||||
|
if channel == "SERVER":
|
||||||
|
icon_idx = getattr(self, 'icon_server', -1)
|
||||||
|
elif channel.startswith('#'):
|
||||||
|
icon_idx = getattr(self, 'icon_channel', -1)
|
||||||
|
else:
|
||||||
|
icon_idx = getattr(self, 'icon_query', -1)
|
||||||
|
|
||||||
|
# Add page with icon (if icon_idx is -1, no icon will be shown)
|
||||||
|
if icon_idx >= 0:
|
||||||
|
self.notebook.AddPage(panel, channel, select=True, imageId=icon_idx)
|
||||||
|
else:
|
||||||
|
self.notebook.AddPage(panel, channel, select=True)
|
||||||
|
|
||||||
self.channels[channel] = panel
|
self.channels[channel] = panel
|
||||||
|
|
||||||
if channel.startswith('#'):
|
if channel.startswith('#'):
|
||||||
@@ -901,6 +1438,11 @@ Available commands:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Error opening scan wizard: {e}")
|
logger.error(f"Error opening scan wizard: {e}")
|
||||||
self.log_server(f"Scan wizard failed to open: {e}", wx.Colour(255, 0, 0))
|
self.log_server(f"Scan wizard failed to open: {e}", wx.Colour(255, 0, 0))
|
||||||
|
if self.sound_handler and self.sounds_enabled:
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_error_sound()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
def quick_connect(self, server, port):
|
def quick_connect(self, server, port):
|
||||||
"""Populate connection fields and initiate a connection if idle."""
|
"""Populate connection fields and initiate a connection if idle."""
|
||||||
@@ -920,6 +1462,65 @@ Available commands:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
# Menu handlers
|
# Menu handlers
|
||||||
|
def update_server_menu_state(self):
|
||||||
|
try:
|
||||||
|
if not self.server_menu_items:
|
||||||
|
return
|
||||||
|
running = self.local_server_manager.is_running()
|
||||||
|
self.server_menu_items["start"].Enable(not running)
|
||||||
|
self.server_menu_items["stop"].Enable(running)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error updating server menu state: {e}")
|
||||||
|
|
||||||
|
def on_start_local_server(self, event):
|
||||||
|
try:
|
||||||
|
dlg = InterfaceSelectDialog(self, self.local_bind_host)
|
||||||
|
result = dlg.ShowModal()
|
||||||
|
if result != wx.ID_OK:
|
||||||
|
dlg.Destroy()
|
||||||
|
return
|
||||||
|
selected_host = dlg.get_selected_host()
|
||||||
|
dlg.Destroy()
|
||||||
|
|
||||||
|
if selected_host != self.local_bind_host:
|
||||||
|
self.local_server_manager.set_listen_host(selected_host)
|
||||||
|
self.local_bind_host = selected_host
|
||||||
|
|
||||||
|
self.local_server_manager.start()
|
||||||
|
self.update_server_menu_state()
|
||||||
|
self.SetStatusText(f"Local IRC server running on {self.local_bind_host}:6667 (LAN only)")
|
||||||
|
self.log_local_server(f"Server is online and listening on {self.local_bind_host}:6667.")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to start local server: {e}")
|
||||||
|
self.log_local_server(f"Failed to start: {e}", wx.Colour(255, 0, 0), bold=True)
|
||||||
|
wx.MessageBox(f"Could not start local IRC server:\n{e}", "Server Error", wx.OK | wx.ICON_ERROR)
|
||||||
|
self.update_server_menu_state()
|
||||||
|
|
||||||
|
def on_stop_local_server(self, event):
|
||||||
|
try:
|
||||||
|
self.local_server_manager.stop()
|
||||||
|
self.update_server_menu_state()
|
||||||
|
self.SetStatusText("Local IRC server stopped")
|
||||||
|
self.log_local_server("Server stopped.")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to stop local server: {e}")
|
||||||
|
self.log_local_server(f"Failed to stop: {e}", wx.Colour(255, 0, 0), bold=True)
|
||||||
|
|
||||||
|
def on_manage_local_channels(self, event):
|
||||||
|
try:
|
||||||
|
dlg = ManageChannelsDialog(self, self.local_server_manager.get_channels())
|
||||||
|
if dlg.ShowModal() == wx.ID_OK:
|
||||||
|
channels = dlg.get_channels()
|
||||||
|
self.local_server_manager.set_channels(channels)
|
||||||
|
self.log_local_server(
|
||||||
|
f"Manage Channels updated: {', '.join(channels)}",
|
||||||
|
wx.Colour(0, 100, 0),
|
||||||
|
)
|
||||||
|
dlg.Destroy()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error managing local channels: {e}")
|
||||||
|
wx.MessageBox(f"Unable to open Manage Channels: {e}", "Error", wx.OK | wx.ICON_ERROR)
|
||||||
|
|
||||||
def on_menu_join(self, event):
|
def on_menu_join(self, event):
|
||||||
try:
|
try:
|
||||||
dlg = wx.TextEntryDialog(self, "Enter channel name:", "Join Channel")
|
dlg = wx.TextEntryDialog(self, "Enter channel name:", "Join Channel")
|
||||||
@@ -1050,6 +1651,13 @@ COMMANDS (type /help in chat for full list):
|
|||||||
self.log_server("Connected to server!", wx.Colour(0, 128, 0), bold=True) # Dark green
|
self.log_server("Connected to server!", wx.Colour(0, 128, 0), bold=True) # Dark green
|
||||||
self.log_server(f"Welcome message: {' '.join(event.arguments)}", wx.Colour(0, 100, 0))
|
self.log_server(f"Welcome message: {' '.join(event.arguments)}", wx.Colour(0, 100, 0))
|
||||||
|
|
||||||
|
# Play welcome/connection sound
|
||||||
|
if self.sound_handler and self.sounds_enabled:
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_connect_server_or_channel()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing welcome sound: {e}")
|
||||||
|
|
||||||
# Auto-join channels
|
# Auto-join channels
|
||||||
for channel in self.auto_join_channels:
|
for channel in self.auto_join_channels:
|
||||||
if not channel.startswith('#'):
|
if not channel.startswith('#'):
|
||||||
@@ -1069,6 +1677,13 @@ COMMANDS (type /help in chat for full list):
|
|||||||
self.safe_ui_update(self.add_channel, channel)
|
self.safe_ui_update(self.add_channel, channel)
|
||||||
self.log_server(f"Joined channel {channel}", wx.Colour(0, 128, 0)) # Dark green
|
self.log_server(f"Joined channel {channel}", wx.Colour(0, 128, 0)) # Dark green
|
||||||
|
|
||||||
|
# Play sound when we join a channel
|
||||||
|
if self.sound_handler and self.sounds_enabled:
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_connect_server_or_channel()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing channel join sound: {e}")
|
||||||
|
|
||||||
self.log_channel_message(channel, nick, f"→ {nick} joined", is_system=True)
|
self.log_channel_message(channel, nick, f"→ {nick} joined", is_system=True)
|
||||||
|
|
||||||
if nick not in self.channel_users[channel]:
|
if nick not in self.channel_users[channel]:
|
||||||
@@ -1126,6 +1741,13 @@ COMMANDS (type /help in chat for full list):
|
|||||||
else:
|
else:
|
||||||
self.log_channel_message(channel, nick, message)
|
self.log_channel_message(channel, nick, message)
|
||||||
|
|
||||||
|
# Play sound notification only for real user messages (not from self)
|
||||||
|
if self.sound_handler and self.sounds_enabled and nick.lower() != self.nick.lower():
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_msg_recv()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing message sound: {e}")
|
||||||
|
|
||||||
# Highlight own nick in messages
|
# Highlight own nick in messages
|
||||||
if self.nick.lower() in message.lower():
|
if self.nick.lower() in message.lower():
|
||||||
self.safe_ui_update(wx.Bell)
|
self.safe_ui_update(wx.Bell)
|
||||||
@@ -1143,6 +1765,13 @@ COMMANDS (type /help in chat for full list):
|
|||||||
self.log_channel_message(nick, nick, message, is_action=True)
|
self.log_channel_message(nick, nick, message, is_action=True)
|
||||||
else:
|
else:
|
||||||
self.log_channel_message(nick, nick, message)
|
self.log_channel_message(nick, nick, message)
|
||||||
|
|
||||||
|
# Play mail sound for private messages
|
||||||
|
if self.sound_handler and self.sounds_enabled and nick.lower() != self.nick.lower():
|
||||||
|
try:
|
||||||
|
self.sound_handler.play_mail_sound()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error playing private message sound: {e}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Error in privmsg handler: {e}")
|
logger.error(f"Error in privmsg handler: {e}")
|
||||||
|
|
||||||
@@ -1317,6 +1946,9 @@ COMMANDS (type /help in chat for full list):
|
|||||||
if self.ui_timer and self.ui_timer.IsRunning():
|
if self.ui_timer and self.ui_timer.IsRunning():
|
||||||
self.ui_timer.Stop()
|
self.ui_timer.Stop()
|
||||||
|
|
||||||
|
if self.local_server_manager and self.local_server_manager.is_running():
|
||||||
|
self.local_server_manager.stop()
|
||||||
|
|
||||||
# Notes data will be lost when app closes (RAM only)
|
# Notes data will be lost when app closes (RAM only)
|
||||||
# User can save to file if they want persistence
|
# User can save to file if they want persistence
|
||||||
|
|
||||||
@@ -1341,14 +1973,12 @@ if os.name == 'nt':
|
|||||||
ctypes.windll.user32.SetProcessDPIAware()
|
ctypes.windll.user32.SetProcessDPIAware()
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
else:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
try:
|
try:
|
||||||
if os.name == 'nt':
|
if os.name == 'nt':
|
||||||
enable_high_dpi()
|
enable_high_dpi()
|
||||||
|
|
||||||
app = wx.App()
|
app = wx.App()
|
||||||
frame = IRCFrame()
|
frame = IRCFrame()
|
||||||
frame.SetIcon(wx.Icon(get_resource_path("icon.ico"), wx.BITMAP_TYPE_ICO))
|
frame.SetIcon(wx.Icon(get_resource_path("icon.ico"), wx.BITMAP_TYPE_ICO))
|
||||||
|
|||||||
BIN
src/server.ico
Normal file
BIN
src/server.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 106 KiB |
BIN
src/sounds/balloon.wav
Normal file
BIN
src/sounds/balloon.wav
Normal file
Binary file not shown.
BIN
src/sounds/space-pdj.wav
Normal file
BIN
src/sounds/space-pdj.wav
Normal file
Binary file not shown.
BIN
src/sounds/startup.wav
Normal file
BIN
src/sounds/startup.wav
Normal file
Binary file not shown.
Reference in New Issue
Block a user