Add multiple languages (i18n) support.
Now you can add a version in profile manage page. Add install java button and dialog.
This commit is contained in:
+229
-42
@@ -6,23 +6,33 @@ from PySide6.QtGui import QDesktopServices, QIcon
|
||||
from PySide6.QtWidgets import (
|
||||
QFileDialog, QFormLayout, QFrame, QHBoxLayout, QLabel, QLineEdit,
|
||||
QMessageBox, QPushButton, QScrollArea, QSizePolicy, QSpinBox,
|
||||
QVBoxLayout, QWidget,
|
||||
QVBoxLayout, QWidget, QMenu, QComboBox,
|
||||
)
|
||||
|
||||
from manager.profile import ProfileDetail, ProfileManager, ProfileSummary, UpdateProfileRequest
|
||||
from manager.game import AvailableVersion
|
||||
from pages.add_modded_version import AddModdedVersionDialog
|
||||
|
||||
|
||||
class ManageProfileItem(QPushButton):
|
||||
selected = Signal(object)
|
||||
|
||||
def __init__(self, app, profile: ProfileSummary, parent=None):
|
||||
def __init__(self, app, profile: ProfileSummary,
|
||||
parent=None,
|
||||
delete_callback=None,
|
||||
duplicate_callback=None):
|
||||
super().__init__(parent)
|
||||
self.app = app
|
||||
self.profile = profile
|
||||
self.setObjectName("manageProfileItem")
|
||||
self.setCheckable(True)
|
||||
self.setCursor(Qt.CursorShape.PointingHandCursor)
|
||||
self.setMinimumHeight(64)
|
||||
|
||||
# Callback
|
||||
self.delete_callback = delete_callback
|
||||
self.duplicate_callback = duplicate_callback
|
||||
|
||||
layout = QHBoxLayout(self)
|
||||
layout.setContentsMargins(12, 8, 12, 8)
|
||||
layout.setSpacing(12)
|
||||
@@ -48,19 +58,57 @@ class ManageProfileItem(QPushButton):
|
||||
layout.addLayout(texts, 1)
|
||||
self.clicked.connect(lambda: self.selected.emit(self.profile))
|
||||
|
||||
# Enable right click menu
|
||||
self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
|
||||
self.customContextMenuRequested.connect(self.show_right_click_menu)
|
||||
|
||||
def show_right_click_menu(self, position):
|
||||
menu = QMenu(self)
|
||||
|
||||
duplicate_action = menu.addAction(self.app.tr_text("Duplicate"))
|
||||
remove_action = menu.addAction(self.app.tr_text("Delete"))
|
||||
|
||||
menu.addAction(duplicate_action)
|
||||
menu.addAction(remove_action)
|
||||
|
||||
def duplicate_callback():
|
||||
self.duplicate_callback(self.profile)
|
||||
|
||||
def delete_callback():
|
||||
self.delete_callback(self.profile)
|
||||
|
||||
if callable(self.duplicate_callback):
|
||||
duplicate_action.triggered.connect(duplicate_callback)
|
||||
|
||||
if callable(self.delete_callback):
|
||||
remove_action.triggered.connect(delete_callback)
|
||||
|
||||
global_position = self.mapToGlobal(position)
|
||||
menu.exec(global_position)
|
||||
|
||||
|
||||
class ManageProfilePage(QWidget):
|
||||
"""Select a profile on the left and edit its launcher settings on the right."""
|
||||
"""
|
||||
Profile manage page
|
||||
"""
|
||||
|
||||
VERSION_CATEGORIES = (
|
||||
("Vanilla", "vanilla"),
|
||||
("Modded", "modded"),
|
||||
("Custom", "custom"),
|
||||
)
|
||||
|
||||
def __init__(self, app, parent=None):
|
||||
super().__init__(parent)
|
||||
self.app = app
|
||||
self.profile_manager: ProfileManager = app.profile_manager
|
||||
self.manifest_manager = app.game_manager.manifest
|
||||
self.selected_profile_id: str | None = None
|
||||
self.profile_items: dict[str, ManageProfileItem] = {}
|
||||
self.version_options: list[AvailableVersion] = []
|
||||
|
||||
root = QVBoxLayout(self)
|
||||
title = QLabel("Manage Profiles (Experimental)")
|
||||
title = QLabel(self.app.tr_text("Manage Profiles"))
|
||||
title.setObjectName("manageTitle")
|
||||
root.addWidget(title)
|
||||
|
||||
@@ -68,6 +116,7 @@ class ManageProfilePage(QWidget):
|
||||
columns.setSpacing(12)
|
||||
root.addLayout(columns, 1)
|
||||
|
||||
# Widgets
|
||||
self.list_scroll = self._scroll_area("manageProfileListScroll")
|
||||
self.list_content = QWidget()
|
||||
self.list_layout = QVBoxLayout(self.list_content)
|
||||
@@ -87,7 +136,7 @@ class ManageProfilePage(QWidget):
|
||||
self.options_scroll.setWidget(self.options_content)
|
||||
columns.addWidget(self.options_scroll, 3)
|
||||
|
||||
self.empty_label = QLabel("Select a profile from the list to edit its settings.")
|
||||
self.empty_label = QLabel(self.app.tr_text("Select a profile from the list to edit its settings."))
|
||||
self.empty_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||
self.empty_label.setWordWrap(True)
|
||||
self.options_layout.addWidget(self.empty_label, 1)
|
||||
@@ -101,45 +150,58 @@ class ManageProfilePage(QWidget):
|
||||
form.setVerticalSpacing(12)
|
||||
|
||||
self.name_edit = QLineEdit()
|
||||
self.version_edit = QLineEdit()
|
||||
self.type_edit = QLineEdit()
|
||||
self.version_dropdown = QComboBox()
|
||||
self.version_dropdown.setObjectName("Dropdown")
|
||||
self.version_dropdown.setSizePolicy(
|
||||
QSizePolicy.Policy.Expanding,
|
||||
QSizePolicy.Policy.Fixed,
|
||||
)
|
||||
self.version_dropdown.setSizeAdjustPolicy(
|
||||
QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon
|
||||
)
|
||||
self.version_dropdown.setMinimumContentsLength(24)
|
||||
self.type_dropdown = QComboBox()
|
||||
self.type_dropdown.setObjectName("Dropdown")
|
||||
self.game_dir_edit = QLineEdit()
|
||||
self.java_args_edit = QLineEdit()
|
||||
self.icon_edit = QLineEdit()
|
||||
self.width_spin = self._dimension_spin()
|
||||
self.height_spin = self._dimension_spin()
|
||||
|
||||
form.addRow("Profile name", self.name_edit)
|
||||
form.addRow("Version ID", self.version_edit)
|
||||
form.addRow("Profile type", self.type_edit)
|
||||
form.addRow("Game directory", self.game_dir_edit)
|
||||
form.addRow("Java arguments", self.java_args_edit)
|
||||
form.addRow("Icon", self.icon_edit)
|
||||
form.addRow(self.app.tr_text("Profile name"), self.name_edit)
|
||||
form.addRow(self.app.tr_text("Type"), self.type_dropdown)
|
||||
form.addRow(self.app.tr_text("Version"), self.version_dropdown)
|
||||
form.addRow(self.app.tr_text("Game directory"), self.game_dir_edit)
|
||||
form.addRow(self.app.tr_text("Java arguments"), self.java_args_edit)
|
||||
form.addRow(self.app.tr_text("Icon"), self.icon_edit)
|
||||
|
||||
resolution = QHBoxLayout()
|
||||
resolution.addWidget(self.width_spin)
|
||||
resolution.addWidget(QLabel("×"))
|
||||
resolution.addWidget(self.height_spin)
|
||||
form.addRow("Resolution", resolution)
|
||||
form.addRow(self.app.tr_text("Resolution"), resolution)
|
||||
editor_layout.addLayout(form)
|
||||
|
||||
file_actions = QHBoxLayout()
|
||||
open_button = QPushButton("Open Profile Folder")
|
||||
add_version_button = QPushButton(self.app.tr_text("Add Modded Version"))
|
||||
add_version_button.clicked.connect(self.open_add_modded_version_dialog)
|
||||
open_button = QPushButton(self.app.tr_text("Open Profile Folder"))
|
||||
open_button.clicked.connect(self.open_profile_folder)
|
||||
import_button = QPushButton("Import Mods…")
|
||||
import_button = QPushButton(self.app.tr_text("Import Mods…"))
|
||||
import_button.clicked.connect(self.import_mods)
|
||||
file_actions.addWidget(add_version_button)
|
||||
file_actions.addWidget(open_button)
|
||||
file_actions.addWidget(import_button)
|
||||
file_actions.addStretch()
|
||||
editor_layout.addLayout(file_actions)
|
||||
|
||||
actions = QHBoxLayout()
|
||||
duplicate_button = QPushButton("Duplicate")
|
||||
duplicate_button = QPushButton(self.app.tr_text("Duplicate"))
|
||||
duplicate_button.clicked.connect(self.duplicate_profile)
|
||||
delete_button = QPushButton("Delete")
|
||||
delete_button = QPushButton(self.app.tr_text("Delete"))
|
||||
delete_button.setObjectName("dangerButton")
|
||||
delete_button.clicked.connect(self.delete_profile)
|
||||
save_button = QPushButton("Save Changes")
|
||||
save_button = QPushButton(self.app.tr_text("Save Changes"))
|
||||
save_button.setObjectName("saveProfileButton")
|
||||
save_button.clicked.connect(self.save_profile)
|
||||
actions.addWidget(duplicate_button)
|
||||
@@ -152,9 +214,11 @@ class ManageProfilePage(QWidget):
|
||||
self.options_layout.addStretch()
|
||||
self.editor.hide()
|
||||
|
||||
self.profile_manager.profiles_changed.connect(self.load_profiles)
|
||||
self.type_dropdown.currentIndexChanged.connect(self._filter_versions)
|
||||
self.profile_manager.profiles_changed.connect(self.refresh_profiles)
|
||||
self.app.apply_qss(Path("manage_profile.qss"), self.setStyleSheet)
|
||||
self.load_profiles()
|
||||
self._load_type_dropdown()
|
||||
self.refresh_profiles()
|
||||
|
||||
@staticmethod
|
||||
def _scroll_area(name: str) -> QScrollArea:
|
||||
@@ -165,31 +229,68 @@ class ManageProfilePage(QWidget):
|
||||
area.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
|
||||
return area
|
||||
|
||||
@staticmethod
|
||||
def _dimension_spin() -> QSpinBox:
|
||||
def _dimension_spin(self) -> QSpinBox:
|
||||
spin = QSpinBox()
|
||||
spin.setRange(0, 16384)
|
||||
spin.setSpecialValueText("Default")
|
||||
spin.setSpecialValueText(self.app.tr_text("Default"))
|
||||
spin.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
|
||||
return spin
|
||||
|
||||
def _load_type_dropdown(self) -> None:
|
||||
self.type_dropdown.blockSignals(True)
|
||||
self.type_dropdown.clear()
|
||||
for display_name, category in self.VERSION_CATEGORIES:
|
||||
self.type_dropdown.addItem(self.app.tr_text(display_name), category)
|
||||
self.type_dropdown.blockSignals(False)
|
||||
|
||||
def refresh_profiles(self) -> None:
|
||||
self.version_options = self.manifest_manager.list_available_profile_versions()
|
||||
self.load_profiles()
|
||||
|
||||
def _filter_versions(self, _index: int = -1) -> None:
|
||||
selected_category = self.type_dropdown.currentData()
|
||||
selected_option = self.version_dropdown.currentData()
|
||||
selected_id = (
|
||||
selected_option.id
|
||||
if isinstance(selected_option, AvailableVersion)
|
||||
else None
|
||||
)
|
||||
|
||||
self.version_dropdown.blockSignals(True)
|
||||
self.version_dropdown.clear()
|
||||
|
||||
for option in self.version_options:
|
||||
if option.source == selected_category:
|
||||
self.version_dropdown.addItem(option.display_name, option)
|
||||
|
||||
if selected_id is not None:
|
||||
self._select_version(selected_id)
|
||||
|
||||
self.version_dropdown.blockSignals(False)
|
||||
|
||||
def load_profiles(self) -> None:
|
||||
while self.list_layout.count():
|
||||
item = self.list_layout.takeAt(0)
|
||||
if item.widget():
|
||||
item.widget().deleteLater()
|
||||
|
||||
self.profile_items.clear()
|
||||
|
||||
profiles = self.profile_manager.list_profiles()
|
||||
for profile in profiles:
|
||||
item = ManageProfileItem(self.app, profile, self.list_content)
|
||||
item = ManageProfileItem(self.app, profile,
|
||||
self.list_content,
|
||||
duplicate_callback=self.duplicate_profile,
|
||||
delete_callback=self.delete_profile)
|
||||
item.selected.connect(self.select_profile)
|
||||
self.profile_items[profile.id] = item
|
||||
self.list_layout.addWidget(item)
|
||||
|
||||
available_ids = {profile.id for profile in profiles}
|
||||
|
||||
if self.selected_profile_id not in available_ids:
|
||||
self.selected_profile_id = None
|
||||
|
||||
if self.selected_profile_id is None and profiles:
|
||||
current = self.profile_manager.get_current_profile_id()
|
||||
selected = next((p for p in profiles if p.id == current), profiles[0])
|
||||
@@ -203,19 +304,53 @@ class ManageProfilePage(QWidget):
|
||||
|
||||
def select_profile(self, profile: ProfileSummary) -> None:
|
||||
detail = self.profile_manager.get_profile(profile.id)
|
||||
|
||||
if detail is None:
|
||||
return
|
||||
|
||||
self.selected_profile_id = profile.id
|
||||
|
||||
for profile_id, item in self.profile_items.items():
|
||||
item.setChecked(profile_id == profile.id)
|
||||
|
||||
self._set_detail(detail)
|
||||
self.empty_label.hide()
|
||||
self.editor.show()
|
||||
|
||||
def _select_version(self, version_id: str) -> None:
|
||||
for index in range(self.version_dropdown.count()):
|
||||
data = self.version_dropdown.itemData(index)
|
||||
|
||||
if isinstance(data, AvailableVersion) and data.id == version_id:
|
||||
self.version_dropdown.setCurrentIndex(index)
|
||||
return
|
||||
|
||||
def _select_type(self, category: str) -> None:
|
||||
index = self.type_dropdown.findData(category)
|
||||
if index >= 0:
|
||||
self.type_dropdown.setCurrentIndex(index)
|
||||
|
||||
def _set_detail(self, profile: ProfileDetail) -> None:
|
||||
self.name_edit.setText(profile.name)
|
||||
self.version_edit.setText(profile.version_id)
|
||||
self.type_edit.setText(profile.version_type)
|
||||
option = next(
|
||||
(item for item in self.version_options if item.id == profile.version_id),
|
||||
None,
|
||||
)
|
||||
|
||||
# Preserve profiles imported from another launcher, even when their
|
||||
# version manifest is not available locally anymore.
|
||||
if option is None:
|
||||
option = AvailableVersion(
|
||||
id=profile.version_id,
|
||||
display_name=f"{profile.version_id} (Unavailable)",
|
||||
version_type=profile.version_type or "custom",
|
||||
source="custom",
|
||||
)
|
||||
self.version_options.append(option)
|
||||
|
||||
self._select_type(option.source)
|
||||
self._filter_versions()
|
||||
self._select_version(profile.version_id)
|
||||
self.game_dir_edit.setText(str(profile.game_dir or ""))
|
||||
self.java_args_edit.setText(profile.java_args)
|
||||
self.icon_edit.setText(profile.icon)
|
||||
@@ -226,87 +361,139 @@ class ManageProfilePage(QWidget):
|
||||
def _profile_dir(self) -> Path | None:
|
||||
if self.selected_profile_id is None:
|
||||
return None
|
||||
|
||||
detail = self.profile_manager.get_profile(self.selected_profile_id)
|
||||
|
||||
if detail is None:
|
||||
return None
|
||||
|
||||
return detail.game_dir or Path(self.app.default_game_dir)
|
||||
|
||||
def save_profile(self) -> None:
|
||||
if self.selected_profile_id is None:
|
||||
return
|
||||
|
||||
width, height = self.width_spin.value(), self.height_spin.value()
|
||||
|
||||
if (width == 0) != (height == 0):
|
||||
self.app.widget_manager.signal.show_warning_message.emit(
|
||||
"Set both resolution values, or set both to Default."
|
||||
self.app.tr_text("Set both resolution values, or set both to Default.")
|
||||
)
|
||||
return
|
||||
|
||||
game_dir_text = self.game_dir_edit.text().strip()
|
||||
version = self.version_dropdown.currentData()
|
||||
|
||||
if not isinstance(version, AvailableVersion):
|
||||
self.app.widget_manager.signal.show_warning_message.emit(
|
||||
self.app.tr_text("Select a version.")
|
||||
)
|
||||
return
|
||||
|
||||
request = UpdateProfileRequest(
|
||||
name=self.name_edit.text().strip(),
|
||||
version_id=self.version_edit.text().strip(),
|
||||
version_type=self.type_edit.text().strip(),
|
||||
version_id=version.id,
|
||||
version_type=version.version_type,
|
||||
game_dir=Path(game_dir_text) if game_dir_text else None,
|
||||
java_args=self.java_args_edit.text(),
|
||||
icon=self.icon_edit.text().strip(),
|
||||
resolution=(width, height) if width and height else None,
|
||||
)
|
||||
|
||||
if self.profile_manager.validate_update(request).is_valid and self.profile_manager.update_profile(
|
||||
self.selected_profile_id, request
|
||||
):
|
||||
self.profile_manager.save()
|
||||
self.app.widget_manager.signal.show_info_message.emit("Profile settings saved.")
|
||||
self.app.widget_manager.signal.show_info_message.emit(
|
||||
self.app.tr_text("Profile settings saved.")
|
||||
)
|
||||
else:
|
||||
errors = self.profile_manager.validate_update(request).errors
|
||||
if errors:
|
||||
self.app.widget_manager.signal.show_warning_message.emit("\n".join(errors.values()))
|
||||
|
||||
def open_add_modded_version_dialog(self) -> None:
|
||||
dialog = AddModdedVersionDialog(self.app, self)
|
||||
dialog.version_created.connect(self._modded_version_created)
|
||||
dialog.exec()
|
||||
|
||||
def _modded_version_created(self, version_id: str) -> None:
|
||||
self.version_options = self.manifest_manager.list_available_profile_versions()
|
||||
# self._select_type("modded")
|
||||
# self._filter_versions()
|
||||
# self._select_version(version_id)
|
||||
self.app.widget_manager.signal.show_info_message.emit(
|
||||
self.app.tr_text("Modded version {version_id} added.", version_id=version_id)
|
||||
)
|
||||
|
||||
def open_profile_folder(self) -> None:
|
||||
profile_dir = self._profile_dir()
|
||||
|
||||
if profile_dir is None:
|
||||
return
|
||||
|
||||
profile_dir.mkdir(parents=True, exist_ok=True)
|
||||
QDesktopServices.openUrl(QUrl.fromLocalFile(str(profile_dir.resolve())))
|
||||
|
||||
def import_mods(self) -> None:
|
||||
profile_dir = self._profile_dir()
|
||||
|
||||
if profile_dir is None:
|
||||
return
|
||||
|
||||
files, _ = QFileDialog.getOpenFileNames(
|
||||
self, "Import Mods", "", "Minecraft mods (*.jar *.zip);;All files (*)"
|
||||
self, self.app.tr_text("Import Mods"), "", "Minecraft mods (*.jar *.zip);;All files (*)"
|
||||
)
|
||||
|
||||
if not files:
|
||||
return
|
||||
|
||||
mods_dir = profile_dir / "mods"
|
||||
mods_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
try:
|
||||
for source in files:
|
||||
shutil.copy2(source, mods_dir / Path(source).name)
|
||||
except OSError as error:
|
||||
self.app.widget_manager.signal.show_error_message.emit(f"Unable to import mod: {error}")
|
||||
self.app.widget_manager.signal.show_error_message.emit(
|
||||
self.app.tr_text("Unable to import mod: {error}", error=error)
|
||||
)
|
||||
return
|
||||
|
||||
self.app.widget_manager.signal.show_info_message.emit(
|
||||
f"Imported {len(files)} mod(s) into {mods_dir}."
|
||||
self.app.tr_text(
|
||||
"Imported {count} mod(s) into {directory}.",
|
||||
count=len(files), directory=mods_dir,
|
||||
)
|
||||
)
|
||||
|
||||
def duplicate_profile(self) -> None:
|
||||
if self.selected_profile_id is None:
|
||||
def duplicate_profile(self, profile: ProfileSummary | None=None) -> None:
|
||||
if self.selected_profile_id is None and profile is None:
|
||||
return
|
||||
new_id = self.profile_manager.duplicate_profile(self.selected_profile_id)
|
||||
|
||||
profile_id = self.selected_profile_id
|
||||
|
||||
new_id = self.profile_manager.duplicate_profile(profile_id)
|
||||
|
||||
if new_id:
|
||||
self.selected_profile_id = new_id
|
||||
self.load_profiles()
|
||||
self.profile_manager.save()
|
||||
|
||||
def delete_profile(self) -> None:
|
||||
if self.selected_profile_id is None:
|
||||
def delete_profile(self, profile: ProfileSummary | None=None) -> None:
|
||||
if self.selected_profile_id is None and profile is None:
|
||||
return
|
||||
|
||||
profile_id = self.selected_profile_id
|
||||
|
||||
answer = QMessageBox.question(
|
||||
self, "Delete Profile", "Delete this profile? Game files will not be removed.",
|
||||
self,
|
||||
self.app.tr_text("Delete Profile"),
|
||||
self.app.tr_text("Delete this profile? Game files will not be removed."),
|
||||
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
|
||||
QMessageBox.StandardButton.No,
|
||||
)
|
||||
if answer == QMessageBox.StandardButton.Yes:
|
||||
profile_id = self.selected_profile_id
|
||||
self.selected_profile_id = None
|
||||
if self.profile_manager.remove_profile(profile_id):
|
||||
self.selected_profile_id = None
|
||||
self.profile_manager.save()
|
||||
|
||||
Reference in New Issue
Block a user