Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI fixes #76

Merged
merged 2 commits into from
Aug 21, 2024
Merged

UI fixes #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
527c5b3
fix: fix the UI
Umatriz Aug 21, 2024
6ca104f
fix: remove unnecessary logs
Umatriz Aug 21, 2024
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
5 changes: 0 additions & 5 deletions crates/client/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Remove console window in release builds
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]

use anyhow::anyhow;
use collections::{AssetsCollection, GameDownloadingCollection, GameRunnerCollection, JavaCollection};
use context::MyContext;
use eframe::{
Expand Down Expand Up @@ -194,10 +193,6 @@ impl eframe::App for MyTabs {

egui::warn_if_debug_build(ui);

if ui.button("Cause an error").clicked() {
Err::<(), _>(anyhow!("Error!")).report_error();
}

let is_errors = { !ERRORS_POOL.read().is_empty() };
if is_errors {
let button = egui::Button::new(RichText::new("Errors").color(ui.visuals().error_fg_color));
Expand Down
5 changes: 0 additions & 5 deletions crates/client/src/views/add_profile_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,6 @@ impl View for AddProfileMenu<'_> {
});

if matches!(self.menu_state.selected_loader_buf, Loader::Fabric { .. }) {
ui.label(
RichText::new("Warn: Fabric version will not run if you have not installed Vanilla version previously")
.color(ui.visuals().warn_fg_color),
);

if !self.menu_state.fabric_versions.is_empty() {
if let Loader::Fabric { version } = &mut self.menu_state.selected_loader_buf {
egui::ComboBox::from_label("Select Fabric version")
Expand Down
8 changes: 5 additions & 3 deletions crates/client/src/views/downloading_progress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use eframe::egui::{self, Layout};
use egui_task_manager::TaskManager;

use super::{profiles::InstancesState, View};
Expand All @@ -10,10 +9,13 @@ pub struct DownloadingProgress<'a> {

impl View for DownloadingProgress<'_> {
fn ui(self, ui: &mut eframe::egui::Ui) {
ui.with_layout(Layout::top_down_justified(egui::Align::Min), |ui| {
ui.vertical(|ui| {
for collection in self.manager.iter_collections() {
for task in collection.iter_tasks() {
ui.group(|ui| task.ui(ui));
ui.group(|ui| {
ui.set_width(ui.available_width());
task.ui(ui)
});
}
}
});
Expand Down
233 changes: 119 additions & 114 deletions crates/client/src/views/profile_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ impl View for ProfileInfo<'_> {
egui::Window::new("Import mods")
.open(&mut self.profile_info_state.is_import_window_open)
.show(ui.ctx(), |ui| {
egui::ScrollArea::vertical().show(ui, |ui| {
egui::ScrollArea::both().show(ui, |ui| {
ui.label("Paste the import code");
let response = ui.text_edit_singleline(&mut self.profile_info_state.mods_to_import_string);
let button = ui.button("Check for conflicts");
Expand Down Expand Up @@ -280,6 +280,8 @@ impl View for ProfileInfo<'_> {
self.profile_info_state.mods_to_import.clear();
self.profile_info_state.conflicts.clear();
self.profile_info_state.mods_to_import_string.clear();

toasts::add(|toasts| toasts.success("Successfully imported mods"));
}
});
});
Expand All @@ -289,148 +291,151 @@ impl View for ProfileInfo<'_> {
.show(ui.ctx(), |ui| {
let mods = &self.profile.read().mods.mods;

egui::Grid::new("export_mods_selection").show(ui, |ui| {
if ui.button("Add all").clicked() {
self.profile_info_state.included_mods.iter_mut().for_each(|s| *s = true);
};

if ui.button("Remove all").clicked() {
self.profile_info_state.included_mods.iter_mut().for_each(|s| *s = false);
};
egui::ScrollArea::both().show(ui, |ui| {
egui::Grid::new("export_mods_selection").show(ui, |ui| {
if ui.button("Add all").clicked() {
self.profile_info_state.included_mods.iter_mut().for_each(|s| *s = true);
};

ui.end_row();
if ui.button("Remove all").clicked() {
self.profile_info_state.included_mods.iter_mut().for_each(|s| *s = false);
};

for (modification, state) in mods.iter().zip(self.profile_info_state.included_mods.iter_mut()) {
ui.checkbox(state, "");
mod_info_ui(ui, modification);
ui.end_row();
}
});

if ui
.add_enabled(
!self.profile_info_state.included_mods.iter().all(|s| !s),
egui::Button::new("Finish exporting"),
)
.on_hover_text("The export code will include all the mods that have the checkbox checked")
.clicked()
{
let mods = mods
.iter()
.zip(self.profile_info_state.included_mods.iter())
.filter(|(_, s)| **s)
.map(|(m, _)| m.clone())
.map(|mut m| {
m.is_downloaded = false;
m
})
.collect::<Vec<_>>();

if let Some(export_code) = serde_json::to_string(&mods).report_error() {
ui.ctx().copy_text(export_code);
}
for (modification, state) in mods.iter().zip(self.profile_info_state.included_mods.iter_mut()) {
ui.checkbox(state, "");
mod_info_ui(ui, modification);
ui.end_row();
}
});

toasts::add(|toasts| toasts.success("Copied the export code to the clipboard"));
}
if ui
.add_enabled(
!self.profile_info_state.included_mods.iter().all(|s| !s),
egui::Button::new("Finish exporting"),
)
.on_hover_text("The export code will include all the mods that have the checkbox checked")
.clicked()
{
let mods = mods
.iter()
.zip(self.profile_info_state.included_mods.iter())
.filter(|(_, s)| **s)
.map(|(m, _)| m.clone())
.map(|mut m| {
m.is_downloaded = false;
m
})
.collect::<Vec<_>>();

if let Some(export_code) = serde_json::to_string(&mods).report_error() {
ui.ctx().copy_text(export_code);
}

toasts::add(|toasts| toasts.success("Copied the export code to the clipboard"));
}
});
});

ui.heading("Profile");
egui::ScrollArea::both().auto_shrink([false, true]).show(ui, |ui| {
ui.heading("Profile");

ui.small("Don't forget to save the changes!");
ui.small("Don't forget to save the changes!");

ui.label("Profile name");
TextEdit::singleline(&mut self.profile_info_state.profile_name).show(ui);
ui.label("Profile name");
TextEdit::singleline(&mut self.profile_info_state.profile_name).show(ui);

ui.label("JVM arguments");
ui.label("JVM arguments");

ui.small("Each element should represent only one argument.");
ui.small("Each element should represent only one argument.");

ui.vertical(|ui| {
egui::Grid::new("jvm_arguments_ui").show(ui, |ui| {
self.profile_info_state.profile_jvm_args.retain_mut(|i| {
ui.scope(|ui| {
ui.set_min_width(150.0);
ui.text_edit_singleline(i);
ui.vertical(|ui| {
egui::Grid::new("jvm_arguments_ui").show(ui, |ui| {
self.profile_info_state.profile_jvm_args.retain_mut(|i| {
ui.scope(|ui| {
ui.set_min_width(150.0);
ui.text_edit_singleline(i);
});
let response = ui.button("❌");
ui.end_row();
*i = i.trim().to_string();
!response.clicked()
});
let response = ui.button("❌");
ui.end_row();
*i = i.trim().to_string();
!response.clicked()
});
});

ui.horizontal(|ui| {
ui.text_edit_singleline(&mut self.profile_info_state.jvm_arg_to_add);
if ui.button("Add").clicked() {
let value = std::mem::take(&mut self.profile_info_state.jvm_arg_to_add).trim().to_string();
self.profile_info_state.profile_jvm_args.push(value)
};
ui.horizontal(|ui| {
ui.text_edit_singleline(&mut self.profile_info_state.jvm_arg_to_add);
if ui.button("Add").clicked() {
let value = std::mem::take(&mut self.profile_info_state.jvm_arg_to_add).trim().to_string();
self.profile_info_state.profile_jvm_args.push(value)
};
});
});
});

ui.horizontal(|ui| {
if ui.button("Save").clicked() {
{
let mut profile = self.profile.write();
profile.profile.name.clone_from(&self.profile_info_state.profile_name);
if let ProfileState::Downloaded(instance) = &mut profile.profile.state {
instance.jvm_arguments_mut().clone_from(&self.profile_info_state.profile_jvm_args);
}
ui.horizontal(|ui| {
if ui.button("Save").clicked() {
{
let mut profile = self.profile.write();
profile.profile.name.clone_from(&self.profile_info_state.profile_name);
if let ProfileState::Downloaded(instance) = &mut profile.profile.state {
instance.jvm_arguments_mut().clone_from(&self.profile_info_state.profile_jvm_args);
}

if let Some(instance) = self.profiles.find_instance(profile.profile.id.instance()) {
if let Some(profile) = instance.write().find_profile_mut(profile.profile.id) {
profile.name.clone_from(&self.profile_info_state.profile_name);
if let Some(instance) = self.profiles.find_instance(profile.profile.id.instance()) {
if let Some(profile) = instance.write().find_profile_mut(profile.profile.id) {
profile.name.clone_from(&self.profile_info_state.profile_name);
}
}
}
}

self.profiles
.update_instance_config(self.profile.read().profile.id.instance())
.report_error();
self.profiles.update_profile_config(self.profile.read().profile.id).report_error();
}
self.profiles
.update_instance_config(self.profile.read().profile.id.instance())
.report_error();
self.profiles.update_profile_config(self.profile.read().profile.id).report_error();
}

if ui.button("Reset").clicked() {
self.profile_info_state.set_profile_to_edit(&self.profile.read());
}
});
if ui.button("Reset").clicked() {
self.profile_info_state.set_profile_to_edit(&self.profile.read());
self.profile_info_state.jvm_arg_to_add.clear();
}
});

ui.heading("Mods");
ui.heading("Mods");

ui.add_enabled_ui(self.profile.read().profile.loader().support_mods(), |ui| {
ui.toggle_button(&mut self.profile_info_state.is_import_window_open, "Import mods");
if ui
.toggle_button(&mut self.profile_info_state.is_export_window_open, "Export mods")
.clicked()
{
self.profile_info_state.included_mods = vec![true; self.profile.read().mods.mods.len()];
}
ui.add_enabled_ui(self.profile.read().profile.loader().support_mods(), |ui| {
ui.toggle_button(&mut self.profile_info_state.is_import_window_open, "Import mods");
if ui
.toggle_button(&mut self.profile_info_state.is_export_window_open, "Export mods")
.clicked()
{
self.profile_info_state.included_mods = vec![true; self.profile.read().mods.mods.len()];
}

if ui
.button("Open mods folder")
.on_hover_text("Open a folder where mods for this profile are located.")
.clicked()
{
let profile_id = self.profile.read().profile.id;
let path = mods_stash_path_for_profile(profile_id);
if ui
.button("Open mods folder")
.on_hover_text("Open a folder where mods for this profile are located.")
.clicked()
{
let profile_id = self.profile.read().profile.id;
let path = mods_stash_path_for_profile(profile_id);

if !path.exists() {
std::fs::create_dir_all(&path).report_error();
}
if let Ok(path) = std::fs::canonicalize(path) {
open_directory_native(path).report_error();
if !path.exists() {
std::fs::create_dir_all(&path).report_error();
}
if let Ok(path) = std::fs::canonicalize(path) {
open_directory_native(path).report_error();
}
}
}
});
});

if ui.button("Browse mods").clicked() {
let kind = TabKind::Mods {
profile: self.profile.clone(),
};
self.tabs_state.0.insert(kind.id(), kind);
}
if ui.button("Browse mods").clicked() {
let kind = TabKind::Mods {
profile: self.profile.clone(),
};
self.tabs_state.0.insert(kind.id(), kind);
}

egui::ScrollArea::vertical().min_scrolled_width(ui.available_width()).show(ui, |ui| {
let (mut vec, profile_id) = {
let profile = &mut self.profile.write();
(std::mem::take(&mut profile.mods.mods), profile.profile.id)
Expand Down
2 changes: 0 additions & 2 deletions crates/nomi-core/src/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ where
Ok(body)
}

#[tracing::instrument(skip_all, fields(path = path.as_ref().to_string_lossy().to_string()), err)]
pub fn read_toml_config_sync<T>(path: impl AsRef<Path>) -> anyhow::Result<T>
where
T: DeserializeOwned + ?Sized,
Expand All @@ -41,7 +40,6 @@ where
runtime.block_on(read_toml_config::<T>(path))
}

#[tracing::instrument(skip_all, fields(path = path.as_ref().to_string_lossy().to_string()), err)]
pub fn write_toml_config_sync<T>(data: &T, path: impl AsRef<Path>) -> anyhow::Result<()>
where
T: Serialize + ?Sized,
Expand Down
1 change: 0 additions & 1 deletion crates/nomi-core/tests/forge_new_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

use nomi_core::{
configs::profile::{ProfileState, VersionProfile},
downloads::traits::Downloader,
Expand Down
Loading