Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/ui/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,12 @@ def __init__(self, config_manager=None):
self.animation_manager = AnimationManager(self.pet_label, self.config)
self.animation_manager.play_state("idle")

# Применяем прозрачность из конфига
# Применяем прозрачность и размер из конфига
if self.config:
self.set_opacity(self.config.get("opacity"))
pet_size = self.config.get("pet_size")
else:
pet_size = 100

self.last_state_before_drag = "idle"

Expand All @@ -55,7 +58,7 @@ def __init__(self, config_manager=None):
self.is_dragging = False
self.shake_count = 0
self.last_shake_time = 0
self.original_size = QSize(100, 100)
self.original_size = QSize(pet_size, pet_size)

# Начальный размер
self.resize(self.original_size)
Expand Down Expand Up @@ -91,6 +94,14 @@ def set_opacity(self, value):
"""Устанавливает прозрачность окна (0-100)"""
self.setWindowOpacity(value / 100.0)

def set_pet_size(self, size_px):
"""Динамически изменяет базовый размер питомца в пикселях."""
if self.config:
self.config.set("pet_size", size_px)
self.original_size = QSize(size_px, size_px)
self.resize(self.original_size)
self.animation_manager.update_size(self.size())

def set_always_on_top(self, enabled):
"""Включает или выключает режим 'Поверх всех окон' динамически"""
if self.config:
Expand Down
16 changes: 16 additions & 0 deletions src/ui/settings_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,21 @@ def __init__(self, config, parent=None):
self.opacity_slider.valueChanged.connect(lambda v: self.opacity_val_label.setText(f"{v}%"))
layout.addWidget(self.opacity_slider)

# Размер питомца
size_header_layout = QHBoxLayout()
size_header_layout.addWidget(QLabel("Размер котика:"))
self.size_val_label = QLabel(f"{self.config.get('pet_size')} px")
self.size_val_label.setStyleSheet("font-weight: bold; color: #555;")
size_header_layout.addStretch()
size_header_layout.addWidget(self.size_val_label)
layout.addLayout(size_header_layout)

self.size_slider = QSlider(Qt.Horizontal)
self.size_slider.setRange(50, 250)
self.size_slider.setValue(self.config.get("pet_size"))
self.size_slider.valueChanged.connect(lambda v: self.size_val_label.setText(f"{v} px"))
layout.addWidget(self.size_slider)

# Интервал растяжки
layout.addWidget(QLabel("Интервал растяжки (мин):"))
self.stretch_spin = QSpinBox()
Expand Down Expand Up @@ -168,6 +183,7 @@ def save_settings(self):
self.config.set("always_on_top", self.always_on_top_check.isChecked())
self.config.set("volume", self.volume_slider.value())
self.config.set("opacity", self.opacity_slider.value())
self.config.set("pet_size", self.size_slider.value())
self.config.set("stretch_interval", self.stretch_spin.value())
self.config.set("pomodoro_work", self.pomodoro_work_spin.value())
self.config.set("pomodoro_break", self.pomodoro_break_spin.value())
Expand Down
3 changes: 2 additions & 1 deletion src/ui/tray_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,10 @@ def start_break_timer(self, checked=False):
def show_settings(self, checked=False):
dialog = SettingsDialog(self.window.config, self.window)
if dialog.exec():
# Обновляем скин и прозрачность в реальном времени
# Обновляем скин, прозрачность и размер в реальном времени
self.window.animation_manager.set_skin(self.window.config.get("skin"))
self.window.set_opacity(self.window.config.get("opacity"))
self.window.set_pet_size(self.window.config.get("pet_size"))
# Обновляем меню скинов
self.update_skin_menu()
# Обновляем режим "Поверх всех окон" в реальном времени
Expand Down
3 changes: 2 additions & 1 deletion src/utils/config_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ class ConfigManager:
"volume": 70,
"language": "ru",
"skin": "default",
"opacity": 100
"opacity": 100,
"pet_size": 100
}

def __init__(self, config_path="settings.json"):
Expand Down
31 changes: 31 additions & 0 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,37 @@ def test_always_on_top_logic(self):
flags = window.windowFlags()
self.assertFalse(bool(flags & Qt.WindowStaysOnTopHint))
self.assertFalse(config.get("always_on_top"))
window.close()

def test_pet_size_logic(self):
os.environ["QT_QPA_PLATFORM"] = "offscreen"
from PySide6.QtWidgets import QApplication
app = QApplication.instance() or QApplication([])

config = ConfigManager(self.config_path)

# 1. Проверяем значение по умолчанию (100)
self.assertEqual(config.get("pet_size"), 100)

# 2. Перезаписываем значение в конфиге
config.set("pet_size", 150)
self.assertEqual(config.get("pet_size"), 150)

# 3. Инициализируем окно PetWindow с размером 150
window = PetWindow(config)
self.assertEqual(window.original_size.width(), 150)
self.assertEqual(window.original_size.height(), 150)
self.assertEqual(window.width(), 150)
self.assertEqual(window.height(), 150)

# 4. Динамически меняем размер на 200 через set_pet_size
window.set_pet_size(200)
self.assertEqual(window.original_size.width(), 200)
self.assertEqual(window.original_size.height(), 200)
self.assertEqual(window.width(), 200)
self.assertEqual(window.height(), 200)
self.assertEqual(config.get("pet_size"), 200)
window.close()

def test_config_manager(self):
config = ConfigManager(self.config_path)
Expand Down
Binary file modified verification/screenshots/stats_history.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.