Næster version
This commit is contained in:
@@ -24,24 +24,32 @@ SETTINGS_KEY_SERVER_URL = "online/server_url"
|
||||
SETTINGS_KEY_LANGUAGE = "appearance/language"
|
||||
SETTINGS_KEY_BETWEEN_SEC = "playback/between_seconds"
|
||||
SETTINGS_KEY_WORKSHOP_MIN = "playback/workshop_minutes"
|
||||
SETTINGS_KEY_MAIN_DEVICE = "playback/audio_device_main"
|
||||
SETTINGS_KEY_PREV_DEVICE = "playback/audio_device_preview"
|
||||
SETTINGS_KEY_AFTER_SONG = "playback/after_song_mode"
|
||||
SETTINGS_KEY_AFTER_DELAY = "playback/after_song_delay"
|
||||
|
||||
|
||||
def load_settings() -> dict:
|
||||
s = QSettings("LineDance", "Player")
|
||||
return {
|
||||
"dark_theme": s.value(SETTINGS_KEY_THEME, True, type=bool),
|
||||
"demo_seconds": s.value(SETTINGS_KEY_DEMO_SEC, 10, type=int),
|
||||
"demo_fade_seconds": s.value(SETTINGS_KEY_DEMO_FADE, 5, type=int),
|
||||
"volume": s.value(SETTINGS_KEY_VOLUME, 78, type=int),
|
||||
"mail_client": s.value(SETTINGS_KEY_MAIL_CLIENT, "auto"),
|
||||
"mail_path": s.value(SETTINGS_KEY_MAIL_PATH, ""),
|
||||
"auto_login": s.value(SETTINGS_KEY_AUTO_LOGIN, False, type=bool),
|
||||
"username": s.value(SETTINGS_KEY_USERNAME, ""),
|
||||
"password": s.value(SETTINGS_KEY_PASSWORD, ""),
|
||||
"server_url": s.value(SETTINGS_KEY_SERVER_URL, "http://localhost:8000"),
|
||||
"language": s.value(SETTINGS_KEY_LANGUAGE, "da"),
|
||||
"between_seconds": s.value(SETTINGS_KEY_BETWEEN_SEC, 60, type=int),
|
||||
"workshop_minutes": s.value(SETTINGS_KEY_WORKSHOP_MIN, 10, type=int),
|
||||
"dark_theme": s.value(SETTINGS_KEY_THEME, True, type=bool),
|
||||
"demo_seconds": s.value(SETTINGS_KEY_DEMO_SEC, 10, type=int),
|
||||
"demo_fade_seconds": s.value(SETTINGS_KEY_DEMO_FADE, 5, type=int),
|
||||
"volume": s.value(SETTINGS_KEY_VOLUME, 78, type=int),
|
||||
"mail_client": s.value(SETTINGS_KEY_MAIL_CLIENT, "auto"),
|
||||
"mail_path": s.value(SETTINGS_KEY_MAIL_PATH, ""),
|
||||
"auto_login": s.value(SETTINGS_KEY_AUTO_LOGIN, False, type=bool),
|
||||
"username": s.value(SETTINGS_KEY_USERNAME, ""),
|
||||
"password": s.value(SETTINGS_KEY_PASSWORD, ""),
|
||||
"server_url": s.value(SETTINGS_KEY_SERVER_URL, "http://localhost:8000"),
|
||||
"language": s.value(SETTINGS_KEY_LANGUAGE, "da"),
|
||||
"between_seconds": s.value(SETTINGS_KEY_BETWEEN_SEC, 60, type=int),
|
||||
"workshop_minutes": s.value(SETTINGS_KEY_WORKSHOP_MIN, 10, type=int),
|
||||
"audio_device_main": s.value(SETTINGS_KEY_MAIN_DEVICE, ""),
|
||||
"audio_device_preview":s.value(SETTINGS_KEY_PREV_DEVICE, ""),
|
||||
"after_song_mode": s.value(SETTINGS_KEY_AFTER_SONG, "manual"),
|
||||
"after_song_delay": s.value(SETTINGS_KEY_AFTER_DELAY, 2, type=int),
|
||||
}
|
||||
|
||||
|
||||
@@ -60,6 +68,10 @@ def save_settings(values: dict):
|
||||
s.setValue(SETTINGS_KEY_LANGUAGE, values.get("language", "da"))
|
||||
s.setValue(SETTINGS_KEY_BETWEEN_SEC, values.get("between_seconds", 60))
|
||||
s.setValue(SETTINGS_KEY_WORKSHOP_MIN,values.get("workshop_minutes", 10))
|
||||
s.setValue(SETTINGS_KEY_MAIN_DEVICE, values.get("audio_device_main", ""))
|
||||
s.setValue(SETTINGS_KEY_PREV_DEVICE, values.get("audio_device_preview", ""))
|
||||
s.setValue(SETTINGS_KEY_AFTER_SONG, values.get("after_song_mode", "manual"))
|
||||
s.setValue(SETTINGS_KEY_AFTER_DELAY, values.get("after_song_delay", 2))
|
||||
|
||||
|
||||
class SettingsDialog(QDialog):
|
||||
@@ -191,6 +203,63 @@ class SettingsDialog(QDialog):
|
||||
grp2_layout.addRow("Tid per workshop:", self._spin_workshop)
|
||||
|
||||
layout.addWidget(grp2)
|
||||
|
||||
# Reaktion når sang slutter
|
||||
from PyQt6.QtWidgets import QRadioButton, QButtonGroup
|
||||
grp3 = QGroupBox("Når en sang slutter")
|
||||
grp3_layout = QVBoxLayout(grp3)
|
||||
grp3_layout.setSpacing(8)
|
||||
|
||||
self._radio_manual = QRadioButton("Manuel — marker næste klar, vent på ▶")
|
||||
self._radio_auto_demo = QRadioButton("Auto-demo — afspil demo af næste sang automatisk")
|
||||
self._radio_auto_play = QRadioButton("Auto-play — start næste sang automatisk")
|
||||
|
||||
self._after_song_group = QButtonGroup(self)
|
||||
self._after_song_group.addButton(self._radio_manual, 0)
|
||||
self._after_song_group.addButton(self._radio_auto_demo, 1)
|
||||
self._after_song_group.addButton(self._radio_auto_play, 2)
|
||||
|
||||
grp3_layout.addWidget(self._radio_manual)
|
||||
grp3_layout.addWidget(self._radio_auto_demo)
|
||||
grp3_layout.addWidget(self._radio_auto_play)
|
||||
|
||||
delay_row = QHBoxLayout()
|
||||
delay_row.addWidget(QLabel(" Pause før næste starter:"))
|
||||
self._spin_after_delay = QSpinBox()
|
||||
self._spin_after_delay.setRange(0, 30)
|
||||
self._spin_after_delay.setSuffix(" sekunder")
|
||||
self._spin_after_delay.setFixedWidth(160)
|
||||
self._spin_after_delay.setToolTip(
|
||||
"Bruges til auto-demo og auto-play.\n"
|
||||
"Antal sekunder der ventes inden næste sang starter."
|
||||
)
|
||||
delay_row.addWidget(self._spin_after_delay)
|
||||
delay_row.addStretch()
|
||||
grp3_layout.addLayout(delay_row)
|
||||
|
||||
layout.addWidget(grp3)
|
||||
grp3 = QGroupBox("Lydenheder")
|
||||
grp3_layout = QFormLayout(grp3)
|
||||
|
||||
from player.player import Player as _Player
|
||||
devices = _Player.get_audio_devices()
|
||||
device_items = [("Standard", "")] + [(d["name"], d["id"]) for d in devices]
|
||||
|
||||
self._combo_main_device = QComboBox()
|
||||
self._combo_preview_device = QComboBox()
|
||||
for name, did in device_items:
|
||||
self._combo_main_device.addItem(name, did)
|
||||
self._combo_preview_device.addItem(name, did)
|
||||
|
||||
grp3_layout.addRow("Hoved-afspiller (sal):", self._combo_main_device)
|
||||
grp3_layout.addRow("Preview (høretelefoner):", self._combo_preview_device)
|
||||
|
||||
note3 = QLabel("Preview-afspilleren bruges til at lytte til sange i biblioteket\nudenom at afbryde den sang der spiller i salen.")
|
||||
note3.setObjectName("result_count")
|
||||
note3.setWordWrap(True)
|
||||
grp3_layout.addRow(note3)
|
||||
layout.addWidget(grp3)
|
||||
|
||||
layout.addStretch()
|
||||
return tab
|
||||
|
||||
@@ -359,22 +428,52 @@ class SettingsDialog(QDialog):
|
||||
self._user_input.setEnabled(auto)
|
||||
self._pass_input.setEnabled(auto)
|
||||
|
||||
# Lydenheder
|
||||
main_dev = v.get("audio_device_main", "")
|
||||
preview_dev = v.get("audio_device_preview", "")
|
||||
for i in range(self._combo_main_device.count()):
|
||||
if self._combo_main_device.itemData(i) == main_dev:
|
||||
self._combo_main_device.setCurrentIndex(i)
|
||||
break
|
||||
for i in range(self._combo_preview_device.count()):
|
||||
if self._combo_preview_device.itemData(i) == preview_dev:
|
||||
self._combo_preview_device.setCurrentIndex(i)
|
||||
break
|
||||
|
||||
# Reaktion når sang slutter
|
||||
mode = v.get("after_song_mode", "manual")
|
||||
if mode == "auto_demo":
|
||||
self._radio_auto_demo.setChecked(True)
|
||||
elif mode == "auto_play":
|
||||
self._radio_auto_play.setChecked(True)
|
||||
else:
|
||||
self._radio_manual.setChecked(True)
|
||||
self._spin_after_delay.setValue(v.get("after_song_delay", 2))
|
||||
|
||||
# ── Gem ───────────────────────────────────────────────────────────────────
|
||||
|
||||
def _save_and_close(self):
|
||||
values = {
|
||||
"dark_theme": self._chk_dark.isChecked(),
|
||||
"demo_seconds": self._spin_demo.value(),
|
||||
"demo_fade_seconds": self._spin_fade.value(),
|
||||
"between_seconds": self._spin_between.value(),
|
||||
"workshop_minutes": self._spin_workshop.value(),
|
||||
"mail_client": self._mail_combo.currentData(),
|
||||
"mail_path": self._mail_path.text().strip(),
|
||||
"auto_login": self._chk_auto_login.isChecked(),
|
||||
"username": self._user_input.text().strip(),
|
||||
"password": self._pass_input.text(),
|
||||
"server_url": self._server_url.text().strip() or "http://localhost:8000",
|
||||
"language": self._lang_combo.currentData(),
|
||||
"dark_theme": self._chk_dark.isChecked(),
|
||||
"demo_seconds": self._spin_demo.value(),
|
||||
"demo_fade_seconds": self._spin_fade.value(),
|
||||
"between_seconds": self._spin_between.value(),
|
||||
"workshop_minutes": self._spin_workshop.value(),
|
||||
"mail_client": self._mail_combo.currentData(),
|
||||
"mail_path": self._mail_path.text().strip(),
|
||||
"auto_login": self._chk_auto_login.isChecked(),
|
||||
"username": self._user_input.text().strip(),
|
||||
"password": self._pass_input.text(),
|
||||
"server_url": self._server_url.text().strip() or "http://localhost:8000",
|
||||
"language": self._lang_combo.currentData(),
|
||||
"audio_device_main": self._combo_main_device.currentData() or "",
|
||||
"audio_device_preview":self._combo_preview_device.currentData() or "",
|
||||
"after_song_mode": (
|
||||
"auto_demo" if self._radio_auto_demo.isChecked() else
|
||||
"auto_play" if self._radio_auto_play.isChecked() else
|
||||
"manual"
|
||||
),
|
||||
"after_song_delay": self._spin_after_delay.value(),
|
||||
}
|
||||
save_settings(values)
|
||||
self._values = values
|
||||
|
||||
Reference in New Issue
Block a user