vyn/mirai
1
Fork 0
mirror of https://codeberg.org/vyn/mirai.git synced 2025-07-03 01:33:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use QFileDialog to chose files

Browse source
This commit is contained in:
Vyn 2024-05-05 15:58:56 +02:00
parent 375a1bfb2d
commit 7eb54cddce
5 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -6,12 +6,12 @@ set(CMAKE_CXX_STANDARD 20)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_COMPILE_WARNING_AS_ERROR ON) set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
find_package(Qt6 6.6 REQUIRED COMPONENTS Quick) find_package(Qt6 6.7 REQUIRED COMPONENTS Quick)
include_directories(src) include_directories(src)
include_directories(libs) include_directories(libs)
qt_standard_project_setup(REQUIRES 6.6) qt_standard_project_setup(REQUIRES 6.7)
add_library(mirai-core add_library(mirai-core
src/core/Mirai.h src/core/Mirai.cpp src/core/Mirai.h src/core/Mirai.cpp
@ -74,7 +74,6 @@ qt_add_qml_module(mirai
target_link_libraries(mirai PRIVATE Qt6::Quick) target_link_libraries(mirai PRIVATE Qt6::Quick)
target_link_libraries(mirai PRIVATE mirai-core) target_link_libraries(mirai PRIVATE mirai-core)
# Tests # Tests
add_subdirectory(libs/Catch2) add_subdirectory(libs/Catch2)
add_executable(tests tests/test.cpp) add_executable(tests tests/test.cpp)

7
src/Backend.cpp
View file

@ -11,13 +11,13 @@
#include "core/TodoMd.h" #include "core/TodoMd.h"
#include "cpp-utils/debug.h" #include "cpp-utils/debug.h"
#include <exception> #include <exception>
#include <sstream>
#include <iostream> #include <iostream>
#include <ostream> #include <ostream>
#include <qjsonarray.h> #include <qjsonarray.h>
#include <qjsonvalue.h> #include <qjsonvalue.h>
#include <qlogging.h> #include <qlogging.h>
#include <qvariant.h> #include <qvariant.h>
#include <sstream>
Backend::Backend() : todoView(&mirai) Backend::Backend() : todoView(&mirai)
{ {
@ -49,7 +49,7 @@ Backend::Backend() : todoView(&mirai)
mirai.loadFile(filePath.toString().toStdString()); mirai.loadFile(filePath.toString().toStdString());
loadingFileDuration.printTimeElapsed( loadingFileDuration.printTimeElapsed(
"Loading file duration of " + filePath.toString().toStdString() "Loading file duration of " + filePath.toString().toStdString()
); );
} }
auto jsonTagsConfig = json["tags"]; auto jsonTagsConfig = json["tags"];
@ -63,8 +63,6 @@ Backend::Backend() : todoView(&mirai)
qWarning() << "Couldn't find existing config file"; qWarning() << "Couldn't find existing config file";
} }
cpputils::debug::Timer updatingViewDuration; cpputils::debug::Timer updatingViewDuration;
todoView.update(); todoView.update();
updatingViewDuration.printTimeElapsed("Updating view duration"); updatingViewDuration.printTimeElapsed("Updating view duration");
@ -332,4 +330,5 @@ void Backend::saveConfig()
} }
configFile.write(QJsonDocument(rootJson).toJson()); configFile.write(QJsonDocument(rootJson).toJson());
configFile.close(); configFile.close();
qDebug() << "Config file saved";
} }

22
src/qml/Main.qml
View file

@ -112,4 +112,26 @@ Window {
} }
onWidthChanged: setFittingLayout() onWidthChanged: setFittingLayout()
Component.onCompleted: setFittingLayout() Component.onCompleted: setFittingLayout()
Popup {
id: taskFormPopup
width: parent.width * 0.75
implicitHeight: taskForm.height + padding * 2
x: Math.round((parent.width - width) / 2)
y: Math.round((parent.height * 0.4) / 2)
padding: 8
background: Rectangle {
border.color: colorPalette.selected.modalBorder
border.width: 2
color: colorPalette.selected.pane
radius: 4
}
TaskForm {
id: taskForm
width: parent.width
onConfirmed: {
taskFormPopup.close()
}
}
}
} }

22
src/qml/MainPanel.qml
View file

@ -87,26 +87,6 @@ Rectangle {
Popup {
id: taskFormPopup
width: parent.width * 0.75
implicitHeight: taskForm.height + padding * 2
x: Math.round((parent.width - width) / 2)
y: Math.round((parent.height * 0.4) / 2)
padding: 8
background: Rectangle {
border.color: colorPalette.selected.modalBorder
border.width: 2
color: colorPalette.selected.pane
radius: 4
}
TaskForm {
id: taskForm
width: parent.width
onConfirmed: {
taskFormPopup.close()
}
}
}
} }
} }

15
src/qml/forms/FilesForm.qml
View file

@ -8,6 +8,7 @@ import QtQuick
import QtQuick.Window import QtQuick.Window
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import QtQuick.Dialogs
import Mirai import Mirai
// WIP // WIP
@ -39,10 +40,19 @@ ColumnLayout {
} }
} }
FileDialog {
id: fileDialog
currentFolder: StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0]
onAccepted: {
console.log(selectedFile)
internal.paths = [...internal.paths, selectedFile]
}
}
AppButton { AppButton {
text: "+" text: "+ Add"
onClicked: { onClicked: {
internal.paths = [...internal.paths, ""] fileDialog.open()
} }
} }
@ -53,4 +63,3 @@ ColumnLayout {
} }
} }
} }