Remove unused code

This commit is contained in:
Vyn 2025-06-24 10:13:49 +02:00
parent 2e1e5db5ea
commit f2f472a595
Signed by: vyn
GPG key ID: E1B2BE34E7A971E7
10 changed files with 6 additions and 170 deletions

View file

@ -31,7 +31,6 @@ add_subdirectory(external/evalyte-cpp-common)
add_executable(mirai add_executable(mirai
src/main.cpp src/main.cpp
src/windows/AppWindow/AppWindow.cpp src/windows/AppWindow/AppWindow.cpp
src/windows/SettingsWindow/SettingsWindow.cpp
src/SeleniteSetup.cpp src/SeleniteSetup.cpp
src/shared/Utils.cpp src/shared/Utils.cpp
) )

View file

@ -1,8 +1,7 @@
import { AppWindowModels } from "windows/AppWindow/Models.slint"; import { AppWindowModels } from "windows/AppWindow/Models.slint";
import { AppWindowActions } from "windows/AppWindow/Actions.slint"; import { AppWindowActions } from "windows/AppWindow/Actions.slint";
import { AppWindow } from "windows/AppWindow/AppWindow.slint"; import { AppWindow } from "windows/AppWindow/AppWindow.slint";
import { SettingsWindow } from "windows/SettingsWindow/SettingsWindow.slint";
import { Utils } from "shared/Utils.slint"; import { Utils } from "shared/Utils.slint";
import { Palette } from "@selenite"; import { Palette } from "@selenite";
export { Utils, Palette, AppWindow, AppWindowModels, AppWindowActions, SettingsWindow } export { Utils, Palette, AppWindow, AppWindowModels, AppWindowActions }

View file

@ -17,22 +17,6 @@ export struct SaveTaskData {
date: Date, date: Date,
} }
export struct NewEventParams {
title: string,
date: Date,
startsAt: Time,
endsAt: Time
}
export struct SaveEventParams {
sourceId: int,
id: int,
title: string,
date: Date,
startsAt: Time,
endsAt: Time
}
struct OpenNewTaskFormParams { struct OpenNewTaskFormParams {
eventSourceId: int, eventSourceId: int,
eventId: int, eventId: int,
@ -48,8 +32,6 @@ export struct CreateEventParams {
export global AppWindowActions { export global AppWindowActions {
callback task-clicked(int, int); callback task-clicked(int, int);
callback source-clicked(int); callback source-clicked(int);
callback open-settings-window();
callback open-add-source-window();
callback add-source(name: string, path: string); callback add-source(name: string, path: string);
callback edit-source(sourceId: int, name: string, path: string); callback edit-source(sourceId: int, name: string, path: string);

View file

@ -12,28 +12,22 @@
#include "mirai-core/MarkdownDataProvider.h" #include "mirai-core/MarkdownDataProvider.h"
#include "mirai-core/Mirai.h" #include "mirai-core/Mirai.h"
#include "selenite/palette.h" #include "selenite/palette.h"
#include "slint.h"
#include "slint_string.h" #include "slint_string.h"
#include "ui.h" #include "ui.h"
#include <bits/chrono.h> #include <bits/chrono.h>
#include <cassert> #include <cassert>
#include <charconv>
#include <chrono> #include <chrono>
#include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <ctime>
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <ostream>
#include <print> #include <print>
#include <ranges>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <vector> #include <vector>
AppWindow::AppWindow(mirai::Mirai *miraiInstance) AppWindow::AppWindow(mirai::Mirai *miraiInstance)
: miraiInstance_(miraiInstance), settingsWindow_(miraiInstance), view_(miraiInstance) : miraiInstance_(miraiInstance), view_(miraiInstance)
{ {
sources_ = std::make_shared<slint::VectorModel<ui::Source>>(); sources_ = std::make_shared<slint::VectorModel<ui::Source>>();
days_ = std::make_shared<slint::VectorModel<ui::Day>>(); days_ = std::make_shared<slint::VectorModel<ui::Day>>();
@ -120,20 +114,6 @@ void AppWindow::setupCallbacks()
miraiInstance_->onSourceDeleted([&](int id) { miraiInstance_->onSourceDeleted([&](int id) {
refreshModels(); refreshModels();
}); });
actions().on_open_settings_window([&]() {
settingsWindow_.open();
});
actions().on_open_add_source_window([&]() {
// addSourceWindow_.open();
});
/*actions().on_open_edit_source_window([&](int sourceId) {*/
/*auto source = miraiInstance_->getSourceById(sourceId);*/
/*assert(source);*/
/*editSourceWindow_.open(source);*/
/*});*/
actions().on_open_add_event_window([&]() {
// editEventWindow_.open();
});
actions().on_task_clicked([&](int sourceId, int taskId) { actions().on_task_clicked([&](int sourceId, int taskId) {
auto source = miraiInstance_->getSourceById(sourceId); auto source = miraiInstance_->getSourceById(sourceId);
@ -264,24 +244,6 @@ void AppWindow::setupCallbacks()
view_.update(); view_.update();
reloadTasks(); reloadTasks();
}); });
/*actions().on_save_event([&](ui::SaveEventParams newEventParams) {*/
/*const ui::Date &date = newEventParams.date;*/
/*const std::string dateStr = SlintDateToStdString(date);*/
/*auto source = miraiInstance_->getSourceById(newEventParams.sourceId);*/
/*assert(source);*/
/*auto event = source->getEventById(newEventParams.id);*/
/*assert(event);*/
/*event->setTitle(std::string(newEventParams.title));*/
/*event->setStartTime(SlintTimeToMiraiTime(newEventParams.startsAt));*/
/*event->setEndTime(SlintTimeToMiraiTime(newEventParams.endsAt));*/
/*// TODO we can't change the date of the event for now.*/
/*miraiInstance_->save();*/
/*view_.update();*/
/*reloadTasks();*/
/*});*/
} }
std::shared_ptr<slint::VectorModel<slint::SharedString>> std::shared_ptr<slint::VectorModel<slint::SharedString>>

View file

@ -6,7 +6,6 @@
#pragma once #pragma once
#include "../SettingsWindow/SettingsWindow.h"
#include "mirai-core/Mirai.h" #include "mirai-core/Mirai.h"
#include "mirai-core/View.h" #include "mirai-core/View.h"
#include "slint.h" #include "slint.h"
@ -35,7 +34,6 @@ class AppWindow
std::shared_ptr<slint::VectorModel<ui::TaskData>> unscheduledTasks_; std::shared_ptr<slint::VectorModel<ui::TaskData>> unscheduledTasks_;
slint::ComponentHandle<ui::AppWindow> mainWindow_ = ui::AppWindow::create(); slint::ComponentHandle<ui::AppWindow> mainWindow_ = ui::AppWindow::create();
SettingsWindow settingsWindow_;
mirai::Mirai *miraiInstance_; mirai::Mirai *miraiInstance_;
mirai::View view_; mirai::View view_;

View file

@ -1,7 +1,6 @@
import { AppWindowModels } from "Models.slint"; import { AppWindowModels } from "Models.slint";
import { Button, VerticalBox, CheckBox } from "std-widgets.slint"; import { Button, VerticalBox, CheckBox } from "std-widgets.slint";
import { MainView } from "views/TasksView.slint"; import { MainView } from "views/TasksView.slint";
import { SettingsWindow } from "../SettingsWindow/SettingsWindow.slint";
import { Palette } from "@selenite"; import { Palette } from "@selenite";
import { CalendarView } from "views/CalendarView.slint"; import { CalendarView } from "views/CalendarView.slint";
import { VButton } from "../../../external/selenite/components/Button.slint"; import { VButton } from "../../../external/selenite/components/Button.slint";
@ -70,4 +69,4 @@ export component AppWindow inherits Window {
} }
} }
export { AppWindowModels, Palette, SettingsWindow } // Export to make it visible to the C++ backend export { AppWindowModels, Palette } // Export to make it visible to the C++ backend

View file

@ -38,8 +38,9 @@ export component CalendarView inherits Rectangle {
height: 1px; height: 1px;
} }
Calendar { Calendar {
delete-event-request(source-id, event-id) => { debug("DEELTE", source-id);AppWindowActions.delete-event(source-id, event-id) } delete-event-request(source-id, event-id) => {
init => { debug("cal len", AppWindowModels.calendar.length) } AppWindowActions.delete-event(source-id, event-id)
}
days: AppWindowModels.calendar; days: AppWindowModels.calendar;
current-date: Utils.current-date; current-date: Utils.current-date;
current-time: Utils.current-time; current-time: Utils.current-time;

View file

@ -1,50 +0,0 @@
/*
* Mirai. Copyright (C) 2024 Vyn
* This file is licensed under version 3 of the GNU General Public License (GPL-3.0-only)
* The license can be found in the LICENSE file or at https://www.gnu.org/licenses/gpl-3.0.txt
*/
#include "SettingsWindow.h"
#include "../../SeleniteSetup.h"
#include "evalyte-cpp-common/evalyte.h"
#include "mirai-core/DataProvider.h"
#include "mirai-core/MarkdownDataProvider.h"
#include "mirai-core/Mirai.h"
#include "slint.h"
#include "slint_string.h"
#include <bits/chrono.h>
#include <cassert>
#include <cstdio>
#include <cstdlib>
#include <ctime>
#include <memory>
#include <optional>
#include <print>
#include <string>
SettingsWindow::SettingsWindow(mirai::Mirai *miraiInstance) : miraiInstance_(miraiInstance)
{
const auto palettePath = std::string(getenv("HOME")) + "/.config/evalyte/theme.json";
const auto palette = selenite::parseJson(palettePath);
if (palette.has_value()) {
setSelenitePalette(window_->global<ui::Palette>(), palette.value());
}
setupCallbacks();
}
void SettingsWindow::setupCallbacks()
{
}
void SettingsWindow::open()
{
window_->show();
}
void SettingsWindow::close()
{
window_->hide();
}

View file

@ -1,28 +0,0 @@
/*
* Mirai. Copyright (C) 2024 Vyn
* This file is licensed under version 3 of the GNU General Public License (GPL-3.0-only)
* The license can be found in the LICENSE file or at https://www.gnu.org/licenses/gpl-3.0.txt
*/
#pragma once
#include "mirai-core/Mirai.h"
#include "slint.h"
#include "ui.h"
class SettingsWindow
{
public:
SettingsWindow(mirai::Mirai *mirai);
void open();
void close();
private:
void setupCallbacks();
std::shared_ptr<slint::VectorModel<ui::Source>> sources_;
slint::ComponentHandle<ui::SettingsWindow> window_ = ui::SettingsWindow::create();
mirai::Mirai *miraiInstance_;
};

View file

@ -1,26 +0,0 @@
import { AppWindowModels } from "../AppWindow/Models.slint";
import { Button, VerticalBox, CheckBox } from "std-widgets.slint";
import { VText, VTextInput, Palette } from "@selenite";
export component SettingsWindow inherits Window {
title: "Mirai - Settings";
min-height: 100px;
max-height: 4000px; // needed, otherwise the window wants to fit the content (on Swaywm)
background: Palette.background;
VerticalLayout {
padding: 16px;
spacing: 8px;
for source[source-index] in AppWindowModels.sources-selected: VerticalLayout {
VText {
text: source.name;
}
VTextInput {
text: source.path;
}
}
}
}
export { AppWindowModels, Palette } // Export to make it visible to the C++ backend