mirror of
https://codeberg.org/vyn/mirai.git
synced 2025-07-01 17:03:19 +00:00
Remove unused code
This commit is contained in:
parent
2e1e5db5ea
commit
f2f472a595
GPG key ID:
E1B2BE34E7A971E7
10 changed files with 6 additions and 170 deletions
|
|
@ -31,7 +31,6 @@ add_subdirectory(external/evalyte-cpp-common)
|
|||
add_executable(mirai
|
||||
src/main.cpp
|
||||
src/windows/AppWindow/AppWindow.cpp
|
||||
src/windows/SettingsWindow/SettingsWindow.cpp
|
||||
src/SeleniteSetup.cpp
|
||||
src/shared/Utils.cpp
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
import { AppWindowModels } from "windows/AppWindow/Models.slint";
|
||||
import { AppWindowActions } from "windows/AppWindow/Actions.slint";
|
||||
import { AppWindow } from "windows/AppWindow/AppWindow.slint";
|
||||
import { SettingsWindow } from "windows/SettingsWindow/SettingsWindow.slint";
|
||||
import { Utils } from "shared/Utils.slint";
|
||||
import { Palette } from "@selenite";
|
||||
|
||||
export { Utils, Palette, AppWindow, AppWindowModels, AppWindowActions, SettingsWindow }
|
||||
export { Utils, Palette, AppWindow, AppWindowModels, AppWindowActions }
|
||||
|
|
|
|||
|
|
@ -17,22 +17,6 @@ export struct SaveTaskData {
|
|||
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 {
|
||||
eventSourceId: int,
|
||||
eventId: int,
|
||||
|
|
@ -48,8 +32,6 @@ export struct CreateEventParams {
|
|||
export global AppWindowActions {
|
||||
callback task-clicked(int, int);
|
||||
callback source-clicked(int);
|
||||
callback open-settings-window();
|
||||
callback open-add-source-window();
|
||||
callback add-source(name: string, path: string);
|
||||
callback edit-source(sourceId: int, name: string, path: string);
|
||||
|
||||
|
|
|
|||
|
|
@ -12,28 +12,22 @@
|
|||
#include "mirai-core/MarkdownDataProvider.h"
|
||||
#include "mirai-core/Mirai.h"
|
||||
#include "selenite/palette.h"
|
||||
#include "slint.h"
|
||||
#include "slint_string.h"
|
||||
#include "ui.h"
|
||||
#include <bits/chrono.h>
|
||||
#include <cassert>
|
||||
#include <charconv>
|
||||
#include <chrono>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <ctime>
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <ostream>
|
||||
#include <print>
|
||||
#include <ranges>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <vector>
|
||||
|
||||
AppWindow::AppWindow(mirai::Mirai *miraiInstance)
|
||||
: miraiInstance_(miraiInstance), settingsWindow_(miraiInstance), view_(miraiInstance)
|
||||
: miraiInstance_(miraiInstance), view_(miraiInstance)
|
||||
{
|
||||
sources_ = std::make_shared<slint::VectorModel<ui::Source>>();
|
||||
days_ = std::make_shared<slint::VectorModel<ui::Day>>();
|
||||
|
|
@ -120,20 +114,6 @@ void AppWindow::setupCallbacks()
|
|||
miraiInstance_->onSourceDeleted([&](int id) {
|
||||
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) {
|
||||
auto source = miraiInstance_->getSourceById(sourceId);
|
||||
|
|
@ -264,24 +244,6 @@ void AppWindow::setupCallbacks()
|
|||
view_.update();
|
||||
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>>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "../SettingsWindow/SettingsWindow.h"
|
||||
#include "mirai-core/Mirai.h"
|
||||
#include "mirai-core/View.h"
|
||||
#include "slint.h"
|
||||
|
|
@ -35,7 +34,6 @@ class AppWindow
|
|||
std::shared_ptr<slint::VectorModel<ui::TaskData>> unscheduledTasks_;
|
||||
|
||||
slint::ComponentHandle<ui::AppWindow> mainWindow_ = ui::AppWindow::create();
|
||||
SettingsWindow settingsWindow_;
|
||||
|
||||
mirai::Mirai *miraiInstance_;
|
||||
mirai::View view_;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import { AppWindowModels } from "Models.slint";
|
||||
import { Button, VerticalBox, CheckBox } from "std-widgets.slint";
|
||||
import { MainView } from "views/TasksView.slint";
|
||||
import { SettingsWindow } from "../SettingsWindow/SettingsWindow.slint";
|
||||
import { Palette } from "@selenite";
|
||||
import { CalendarView } from "views/CalendarView.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
|
||||
|
|
|
|||
|
|
@ -38,8 +38,9 @@ export component CalendarView inherits Rectangle {
|
|||
height: 1px;
|
||||
}
|
||||
Calendar {
|
||||
delete-event-request(source-id, event-id) => { debug("DEELTE", source-id);AppWindowActions.delete-event(source-id, event-id) }
|
||||
init => { debug("cal len", AppWindowModels.calendar.length) }
|
||||
delete-event-request(source-id, event-id) => {
|
||||
AppWindowActions.delete-event(source-id, event-id)
|
||||
}
|
||||
days: AppWindowModels.calendar;
|
||||
current-date: Utils.current-date;
|
||||
current-time: Utils.current-time;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
@ -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_;
|
||||
};
|
||||
|
|
@ -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
|
||||
Loading…
Add table
Add a link
Reference in a new issue