jknapp
5888aeb603
## Major Changes ### Build System - Replace requirements.txt with pyproject.toml for modern dependency management - Support for uv package manager alongside pip - Update PyInstaller spec files for new dependencies and structure ### Desktop GUI (Tkinter → PySide6) - Complete rewrite of UI using PySide6/Qt6 - New modular structure in gui/ directory: - main_window.py: Main application window - macro_editor.py: Macro creation/editing dialog - command_builder.py: Visual command sequence builder - Modern dark theme with consistent styling - System tray integration ### Web Server (Flask → FastAPI) - Migrate from Flask/Waitress to FastAPI/Uvicorn - Add WebSocket support for real-time updates - Full CRUD API for macro management - Image upload endpoint ### Web Interface → PWA - New web/ directory with standalone static files - PWA manifest and service worker for installability - Offline caching support - Full macro editing from web interface - Responsive mobile-first design - Command builder UI matching desktop functionality ### Macro System Enhancement - New command sequence model replacing simple text/app types - Command types: text, key, hotkey, wait, app - Support for delays between commands (wait in ms) - Support for key presses between commands (enter, tab, etc.) - Automatic migration of existing macros to new format - Backward compatibility maintained ### Files Added - pyproject.toml - gui/__init__.py, main_window.py, macro_editor.py, command_builder.py - gui/widgets/__init__.py - web/index.html, manifest.json, service-worker.js - web/css/styles.css, web/js/app.js - web/icons/icon-192.png, icon-512.png ### Files Removed - requirements.txt (replaced by pyproject.toml) - ui_components.py (replaced by gui/ modules) - web_templates.py (replaced by web/ static files) - main.spec (consolidated into platform-specific specs) ### Files Modified - main.py: Simplified entry point for PySide6 - macro_manager.py: Command sequence model and migration - web_server.py: FastAPI implementation - config.py: Version bump to 0.9.0 - All .spec files: Updated for PySide6 and new structure - README.md: Complete rewrite for v0.9.0 - .gitea/workflows/release.yml: Disabled pending build testing 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
547 lines
9.4 KiB
CSS
547 lines
9.4 KiB
CSS
/* MacroPad PWA Styles */
|
|
|
|
:root {
|
|
--bg-color: #2e2e2e;
|
|
--fg-color: #ffffff;
|
|
--highlight-color: #3e3e3e;
|
|
--accent-color: #007acc;
|
|
--button-bg: #505050;
|
|
--button-hover: #606060;
|
|
--tab-bg: #404040;
|
|
--tab-selected: #007acc;
|
|
--danger-color: #dc3545;
|
|
--success-color: #28a745;
|
|
--warning-color: #ffc107;
|
|
}
|
|
|
|
* {
|
|
box-sizing: border-box;
|
|
margin: 0;
|
|
padding: 0;
|
|
}
|
|
|
|
body {
|
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
|
|
background-color: var(--bg-color);
|
|
color: var(--fg-color);
|
|
min-height: 100vh;
|
|
overflow-x: hidden;
|
|
}
|
|
|
|
/* Header */
|
|
.header {
|
|
background-color: var(--highlight-color);
|
|
padding: 1rem;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
position: sticky;
|
|
top: 0;
|
|
z-index: 100;
|
|
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
|
|
}
|
|
|
|
.header h1 {
|
|
font-size: 1.5rem;
|
|
font-weight: 600;
|
|
}
|
|
|
|
.header-actions {
|
|
display: flex;
|
|
gap: 0.5rem;
|
|
}
|
|
|
|
.header-btn {
|
|
background: var(--accent-color);
|
|
color: white;
|
|
border: none;
|
|
padding: 0.5rem 1rem;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
font-size: 0.9rem;
|
|
transition: background 0.2s;
|
|
}
|
|
|
|
.header-btn:hover {
|
|
background: #0096ff;
|
|
}
|
|
|
|
.header-btn.secondary {
|
|
background: var(--button-bg);
|
|
}
|
|
|
|
.header-btn.secondary:hover {
|
|
background: var(--button-hover);
|
|
}
|
|
|
|
/* Tabs */
|
|
.tabs {
|
|
display: flex;
|
|
gap: 0.25rem;
|
|
padding: 0.5rem 1rem;
|
|
background: var(--bg-color);
|
|
overflow-x: auto;
|
|
-webkit-overflow-scrolling: touch;
|
|
}
|
|
|
|
.tab {
|
|
background: var(--tab-bg);
|
|
color: var(--fg-color);
|
|
border: none;
|
|
padding: 0.5rem 1rem;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
white-space: nowrap;
|
|
transition: background 0.2s;
|
|
}
|
|
|
|
.tab:hover {
|
|
background: var(--button-hover);
|
|
}
|
|
|
|
.tab.active {
|
|
background: var(--tab-selected);
|
|
}
|
|
|
|
/* Macro Grid */
|
|
.macro-grid {
|
|
display: grid;
|
|
grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
|
|
gap: 1rem;
|
|
padding: 1rem;
|
|
}
|
|
|
|
.macro-card {
|
|
background: var(--button-bg);
|
|
border-radius: 8px;
|
|
padding: 1rem;
|
|
display: flex;
|
|
flex-direction: column;
|
|
align-items: center;
|
|
cursor: pointer;
|
|
transition: transform 0.1s, background 0.2s;
|
|
min-height: 120px;
|
|
}
|
|
|
|
.macro-card:hover {
|
|
background: var(--button-hover);
|
|
transform: translateY(-2px);
|
|
}
|
|
|
|
.macro-card:active {
|
|
transform: translateY(0);
|
|
}
|
|
|
|
.macro-card.executing {
|
|
animation: pulse 0.3s ease-in-out;
|
|
}
|
|
|
|
@keyframes pulse {
|
|
0% { transform: scale(1); }
|
|
50% { transform: scale(0.95); background: var(--accent-color); }
|
|
100% { transform: scale(1); }
|
|
}
|
|
|
|
.macro-image {
|
|
width: 64px;
|
|
height: 64px;
|
|
object-fit: contain;
|
|
margin-bottom: 0.5rem;
|
|
border-radius: 4px;
|
|
}
|
|
|
|
.macro-image-placeholder {
|
|
width: 64px;
|
|
height: 64px;
|
|
background: var(--highlight-color);
|
|
border-radius: 4px;
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
margin-bottom: 0.5rem;
|
|
font-size: 1.5rem;
|
|
}
|
|
|
|
.macro-name {
|
|
text-align: center;
|
|
font-size: 0.9rem;
|
|
word-break: break-word;
|
|
}
|
|
|
|
.macro-edit-btn {
|
|
position: absolute;
|
|
top: 4px;
|
|
right: 4px;
|
|
background: rgba(0, 0, 0, 0.5);
|
|
color: white;
|
|
border: none;
|
|
border-radius: 4px;
|
|
padding: 4px 8px;
|
|
cursor: pointer;
|
|
opacity: 0;
|
|
transition: opacity 0.2s;
|
|
}
|
|
|
|
.macro-card {
|
|
position: relative;
|
|
}
|
|
|
|
.macro-card:hover .macro-edit-btn {
|
|
opacity: 1;
|
|
}
|
|
|
|
/* Modal */
|
|
.modal-overlay {
|
|
position: fixed;
|
|
top: 0;
|
|
left: 0;
|
|
right: 0;
|
|
bottom: 0;
|
|
background: rgba(0, 0, 0, 0.7);
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
z-index: 200;
|
|
padding: 1rem;
|
|
}
|
|
|
|
.modal {
|
|
background: var(--highlight-color);
|
|
border-radius: 8px;
|
|
width: 100%;
|
|
max-width: 500px;
|
|
max-height: 90vh;
|
|
overflow-y: auto;
|
|
}
|
|
|
|
.modal-header {
|
|
display: flex;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
padding: 1rem;
|
|
border-bottom: 1px solid var(--bg-color);
|
|
}
|
|
|
|
.modal-header h2 {
|
|
font-size: 1.2rem;
|
|
}
|
|
|
|
.modal-close {
|
|
background: none;
|
|
border: none;
|
|
color: var(--fg-color);
|
|
font-size: 1.5rem;
|
|
cursor: pointer;
|
|
padding: 0.25rem;
|
|
}
|
|
|
|
.modal-body {
|
|
padding: 1rem;
|
|
}
|
|
|
|
.modal-footer {
|
|
display: flex;
|
|
justify-content: flex-end;
|
|
gap: 0.5rem;
|
|
padding: 1rem;
|
|
border-top: 1px solid var(--bg-color);
|
|
}
|
|
|
|
/* Form Elements */
|
|
.form-group {
|
|
margin-bottom: 1rem;
|
|
}
|
|
|
|
.form-group label {
|
|
display: block;
|
|
margin-bottom: 0.25rem;
|
|
font-size: 0.9rem;
|
|
color: #aaa;
|
|
}
|
|
|
|
.form-group input,
|
|
.form-group select {
|
|
width: 100%;
|
|
padding: 0.5rem;
|
|
background: var(--bg-color);
|
|
border: 1px solid var(--button-bg);
|
|
border-radius: 4px;
|
|
color: var(--fg-color);
|
|
font-size: 1rem;
|
|
}
|
|
|
|
.form-group input:focus,
|
|
.form-group select:focus {
|
|
outline: none;
|
|
border-color: var(--accent-color);
|
|
}
|
|
|
|
/* Command Builder */
|
|
.command-list {
|
|
background: var(--bg-color);
|
|
border-radius: 4px;
|
|
padding: 0.5rem;
|
|
min-height: 100px;
|
|
max-height: 300px;
|
|
overflow-y: auto;
|
|
}
|
|
|
|
.command-item {
|
|
background: var(--button-bg);
|
|
border-radius: 4px;
|
|
padding: 0.5rem;
|
|
margin-bottom: 0.5rem;
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 0.5rem;
|
|
}
|
|
|
|
.command-item:last-child {
|
|
margin-bottom: 0;
|
|
}
|
|
|
|
.command-type {
|
|
background: var(--accent-color);
|
|
color: white;
|
|
padding: 0.25rem 0.5rem;
|
|
border-radius: 4px;
|
|
font-size: 0.75rem;
|
|
text-transform: uppercase;
|
|
min-width: 50px;
|
|
text-align: center;
|
|
}
|
|
|
|
.command-value {
|
|
flex: 1;
|
|
font-family: monospace;
|
|
font-size: 0.9rem;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
white-space: nowrap;
|
|
}
|
|
|
|
.command-actions {
|
|
display: flex;
|
|
gap: 0.25rem;
|
|
}
|
|
|
|
.command-actions button {
|
|
background: var(--highlight-color);
|
|
border: none;
|
|
color: var(--fg-color);
|
|
padding: 0.25rem 0.5rem;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
font-size: 0.8rem;
|
|
}
|
|
|
|
.command-actions button:hover {
|
|
background: var(--button-hover);
|
|
}
|
|
|
|
.command-actions button.delete {
|
|
color: var(--danger-color);
|
|
}
|
|
|
|
.add-command-btns {
|
|
display: flex;
|
|
flex-wrap: wrap;
|
|
gap: 0.5rem;
|
|
margin-top: 0.5rem;
|
|
}
|
|
|
|
.add-command-btn {
|
|
background: var(--button-bg);
|
|
border: none;
|
|
color: var(--fg-color);
|
|
padding: 0.5rem 0.75rem;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
font-size: 0.85rem;
|
|
transition: background 0.2s;
|
|
}
|
|
|
|
.add-command-btn:hover {
|
|
background: var(--accent-color);
|
|
}
|
|
|
|
/* Buttons */
|
|
.btn {
|
|
padding: 0.5rem 1rem;
|
|
border: none;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
font-size: 0.9rem;
|
|
transition: background 0.2s;
|
|
}
|
|
|
|
.btn-primary {
|
|
background: var(--accent-color);
|
|
color: white;
|
|
}
|
|
|
|
.btn-primary:hover {
|
|
background: #0096ff;
|
|
}
|
|
|
|
.btn-secondary {
|
|
background: var(--button-bg);
|
|
color: white;
|
|
}
|
|
|
|
.btn-secondary:hover {
|
|
background: var(--button-hover);
|
|
}
|
|
|
|
.btn-danger {
|
|
background: var(--danger-color);
|
|
color: white;
|
|
}
|
|
|
|
.btn-danger:hover {
|
|
background: #c82333;
|
|
}
|
|
|
|
/* Status/Toast Messages */
|
|
.toast-container {
|
|
position: fixed;
|
|
bottom: 1rem;
|
|
right: 1rem;
|
|
z-index: 300;
|
|
}
|
|
|
|
.toast {
|
|
background: var(--highlight-color);
|
|
color: var(--fg-color);
|
|
padding: 0.75rem 1rem;
|
|
border-radius: 4px;
|
|
margin-top: 0.5rem;
|
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
|
|
animation: slideIn 0.3s ease-out;
|
|
}
|
|
|
|
.toast.success {
|
|
border-left: 4px solid var(--success-color);
|
|
}
|
|
|
|
.toast.error {
|
|
border-left: 4px solid var(--danger-color);
|
|
}
|
|
|
|
@keyframes slideIn {
|
|
from {
|
|
transform: translateX(100%);
|
|
opacity: 0;
|
|
}
|
|
to {
|
|
transform: translateX(0);
|
|
opacity: 1;
|
|
}
|
|
}
|
|
|
|
/* Connection Status */
|
|
.connection-status {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 0.5rem;
|
|
font-size: 0.8rem;
|
|
color: #aaa;
|
|
}
|
|
|
|
.status-dot {
|
|
width: 8px;
|
|
height: 8px;
|
|
border-radius: 50%;
|
|
background: var(--danger-color);
|
|
}
|
|
|
|
.status-dot.connected {
|
|
background: var(--success-color);
|
|
}
|
|
|
|
/* Empty State */
|
|
.empty-state {
|
|
text-align: center;
|
|
padding: 3rem 1rem;
|
|
color: #888;
|
|
}
|
|
|
|
.empty-state p {
|
|
margin-bottom: 1rem;
|
|
}
|
|
|
|
/* Loading */
|
|
.loading {
|
|
display: flex;
|
|
justify-content: center;
|
|
padding: 2rem;
|
|
}
|
|
|
|
.spinner {
|
|
width: 40px;
|
|
height: 40px;
|
|
border: 3px solid var(--button-bg);
|
|
border-top-color: var(--accent-color);
|
|
border-radius: 50%;
|
|
animation: spin 1s linear infinite;
|
|
}
|
|
|
|
@keyframes spin {
|
|
to { transform: rotate(360deg); }
|
|
}
|
|
|
|
/* Mobile Optimizations */
|
|
@media (max-width: 480px) {
|
|
.header h1 {
|
|
font-size: 1.2rem;
|
|
}
|
|
|
|
.macro-grid {
|
|
grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
|
|
gap: 0.75rem;
|
|
padding: 0.75rem;
|
|
}
|
|
|
|
.macro-card {
|
|
padding: 0.75rem;
|
|
min-height: 100px;
|
|
}
|
|
|
|
.macro-image,
|
|
.macro-image-placeholder {
|
|
width: 48px;
|
|
height: 48px;
|
|
}
|
|
|
|
.modal {
|
|
max-width: 100%;
|
|
margin: 0.5rem;
|
|
}
|
|
}
|
|
|
|
/* Install Banner */
|
|
.install-banner {
|
|
background: var(--accent-color);
|
|
color: white;
|
|
padding: 0.75rem 1rem;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
}
|
|
|
|
.install-banner button {
|
|
background: white;
|
|
color: var(--accent-color);
|
|
border: none;
|
|
padding: 0.5rem 1rem;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
font-weight: 600;
|
|
}
|
|
|
|
.install-banner .dismiss {
|
|
background: transparent;
|
|
color: white;
|
|
padding: 0.5rem;
|
|
}
|