From 7eba697dc2843d8563fff6e94e83798af65e5dd3 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 9 Dec 2022 10:55:50 -0600 Subject: [PATCH] moving code around for a better file structure --- librepresenter.desktop | 11 +++++++++-- src/present.png => present.png | Bin src/CMakeLists.txt | 22 +++++++++++----------- src/{ => cpp}/filemanager.cpp | 0 src/{ => cpp}/filemanager.h | 0 src/{ => cpp}/imagesqlmodel.cpp | 0 src/{ => cpp}/imagesqlmodel.h | 0 src/{ => cpp}/main.cpp | 0 src/{ => cpp}/mpv/mpvhelpers.h | 0 src/{ => cpp}/mpv/mpvobject.cpp | 0 src/{ => cpp}/mpv/mpvobject.h | 0 src/{ => cpp}/mpv/qthelper.hpp | 0 src/{ => cpp}/presentationsqlmodel.cpp | 0 src/{ => cpp}/presentationsqlmodel.h | 0 src/{ => cpp}/serviceitem.cpp | 0 src/{ => cpp}/serviceitem.h | 0 src/{ => cpp}/serviceitemmodel.cpp | 0 src/{ => cpp}/serviceitemmodel.h | 0 src/{ => cpp}/slide.cpp | 0 src/{ => cpp}/slide.h | 0 src/{ => cpp}/songsqlmodel.cpp | 0 src/{ => cpp}/songsqlmodel.h | 0 src/{ => cpp}/thumbnail.cpp | 0 src/{ => cpp}/thumbnail.h | 0 src/{ => cpp}/videosqlmodel.cpp | 0 src/{ => cpp}/videosqlmodel.h | 0 src/present.desktop | 11 ----------- 27 files changed, 20 insertions(+), 24 deletions(-) rename src/present.png => present.png (100%) rename src/{ => cpp}/filemanager.cpp (100%) rename src/{ => cpp}/filemanager.h (100%) rename src/{ => cpp}/imagesqlmodel.cpp (100%) rename src/{ => cpp}/imagesqlmodel.h (100%) rename src/{ => cpp}/main.cpp (100%) rename src/{ => cpp}/mpv/mpvhelpers.h (100%) rename src/{ => cpp}/mpv/mpvobject.cpp (100%) rename src/{ => cpp}/mpv/mpvobject.h (100%) rename src/{ => cpp}/mpv/qthelper.hpp (100%) rename src/{ => cpp}/presentationsqlmodel.cpp (100%) rename src/{ => cpp}/presentationsqlmodel.h (100%) rename src/{ => cpp}/serviceitem.cpp (100%) rename src/{ => cpp}/serviceitem.h (100%) rename src/{ => cpp}/serviceitemmodel.cpp (100%) rename src/{ => cpp}/serviceitemmodel.h (100%) rename src/{ => cpp}/slide.cpp (100%) rename src/{ => cpp}/slide.h (100%) rename src/{ => cpp}/songsqlmodel.cpp (100%) rename src/{ => cpp}/songsqlmodel.h (100%) rename src/{ => cpp}/thumbnail.cpp (100%) rename src/{ => cpp}/thumbnail.h (100%) rename src/{ => cpp}/videosqlmodel.cpp (100%) rename src/{ => cpp}/videosqlmodel.h (100%) delete mode 100644 src/present.desktop diff --git a/librepresenter.desktop b/librepresenter.desktop index d2edbaf..afde81c 100644 --- a/librepresenter.desktop +++ b/librepresenter.desktop @@ -1,4 +1,11 @@ [Desktop Entry] -Exec=presenter +Type=Application Name=Libre Presenter -Type=Application \ No newline at end of file +GenericName=Church Presentation +Comment=A Kirigami based church presenter +Exec=presenter %U +TryExec=presenter +Icon=present +StartupNotify=true +Terminal=false +Categories=presentation \ No newline at end of file diff --git a/src/present.png b/present.png similarity index 100% rename from src/present.png rename to present.png diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 08879ca..f931e3a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,17 +3,17 @@ add_executable(presenter main.cpp resources.qrc) target_sources(presenter PRIVATE - main.cpp resources.qrc - songsqlmodel.cpp songsqlmodel.h - serviceitemmodel.cpp serviceitemmodel.h - serviceitem.cpp serviceitem.h - slide.cpp slide.h - videosqlmodel.cpp videosqlmodel.h - imagesqlmodel.cpp imagesqlmodel.h - filemanager.cpp filemanager.h - presentationsqlmodel.cpp presentationsqlmodel.h - mpv/mpvobject.h mpv/mpvobject.cpp - mpv/qthelper.hpp mpv/mpvhelpers.h + cpp/main.cpp resources.qrc + cpp/songsqlmodel.cpp cpp/songsqlmodel.h + cpp/serviceitemmodel.cpp cpp/serviceitemmodel.h + cpp/serviceitem.cpp cpp/serviceitem.h + cpp/slide.cpp cpp/slide.h + cpp/videosqlmodel.cpp cpp/videosqlmodel.h + cpp/imagesqlmodel.cpp cpp/imagesqlmodel.h + cpp/filemanager.cpp cpp/filemanager.h + cpp/presentationsqlmodel.cpp cpp/presentationsqlmodel.h + cpp/mpv/mpvobject.h cpp/mpv/mpvobject.cpp + cpp/mpv/qthelper.hpp cpp/mpv/mpvhelpers.h ) target_compile_options (presenter PUBLIC -fexceptions) diff --git a/src/filemanager.cpp b/src/cpp/filemanager.cpp similarity index 100% rename from src/filemanager.cpp rename to src/cpp/filemanager.cpp diff --git a/src/filemanager.h b/src/cpp/filemanager.h similarity index 100% rename from src/filemanager.h rename to src/cpp/filemanager.h diff --git a/src/imagesqlmodel.cpp b/src/cpp/imagesqlmodel.cpp similarity index 100% rename from src/imagesqlmodel.cpp rename to src/cpp/imagesqlmodel.cpp diff --git a/src/imagesqlmodel.h b/src/cpp/imagesqlmodel.h similarity index 100% rename from src/imagesqlmodel.h rename to src/cpp/imagesqlmodel.h diff --git a/src/main.cpp b/src/cpp/main.cpp similarity index 100% rename from src/main.cpp rename to src/cpp/main.cpp diff --git a/src/mpv/mpvhelpers.h b/src/cpp/mpv/mpvhelpers.h similarity index 100% rename from src/mpv/mpvhelpers.h rename to src/cpp/mpv/mpvhelpers.h diff --git a/src/mpv/mpvobject.cpp b/src/cpp/mpv/mpvobject.cpp similarity index 100% rename from src/mpv/mpvobject.cpp rename to src/cpp/mpv/mpvobject.cpp diff --git a/src/mpv/mpvobject.h b/src/cpp/mpv/mpvobject.h similarity index 100% rename from src/mpv/mpvobject.h rename to src/cpp/mpv/mpvobject.h diff --git a/src/mpv/qthelper.hpp b/src/cpp/mpv/qthelper.hpp similarity index 100% rename from src/mpv/qthelper.hpp rename to src/cpp/mpv/qthelper.hpp diff --git a/src/presentationsqlmodel.cpp b/src/cpp/presentationsqlmodel.cpp similarity index 100% rename from src/presentationsqlmodel.cpp rename to src/cpp/presentationsqlmodel.cpp diff --git a/src/presentationsqlmodel.h b/src/cpp/presentationsqlmodel.h similarity index 100% rename from src/presentationsqlmodel.h rename to src/cpp/presentationsqlmodel.h diff --git a/src/serviceitem.cpp b/src/cpp/serviceitem.cpp similarity index 100% rename from src/serviceitem.cpp rename to src/cpp/serviceitem.cpp diff --git a/src/serviceitem.h b/src/cpp/serviceitem.h similarity index 100% rename from src/serviceitem.h rename to src/cpp/serviceitem.h diff --git a/src/serviceitemmodel.cpp b/src/cpp/serviceitemmodel.cpp similarity index 100% rename from src/serviceitemmodel.cpp rename to src/cpp/serviceitemmodel.cpp diff --git a/src/serviceitemmodel.h b/src/cpp/serviceitemmodel.h similarity index 100% rename from src/serviceitemmodel.h rename to src/cpp/serviceitemmodel.h diff --git a/src/slide.cpp b/src/cpp/slide.cpp similarity index 100% rename from src/slide.cpp rename to src/cpp/slide.cpp diff --git a/src/slide.h b/src/cpp/slide.h similarity index 100% rename from src/slide.h rename to src/cpp/slide.h diff --git a/src/songsqlmodel.cpp b/src/cpp/songsqlmodel.cpp similarity index 100% rename from src/songsqlmodel.cpp rename to src/cpp/songsqlmodel.cpp diff --git a/src/songsqlmodel.h b/src/cpp/songsqlmodel.h similarity index 100% rename from src/songsqlmodel.h rename to src/cpp/songsqlmodel.h diff --git a/src/thumbnail.cpp b/src/cpp/thumbnail.cpp similarity index 100% rename from src/thumbnail.cpp rename to src/cpp/thumbnail.cpp diff --git a/src/thumbnail.h b/src/cpp/thumbnail.h similarity index 100% rename from src/thumbnail.h rename to src/cpp/thumbnail.h diff --git a/src/videosqlmodel.cpp b/src/cpp/videosqlmodel.cpp similarity index 100% rename from src/videosqlmodel.cpp rename to src/cpp/videosqlmodel.cpp diff --git a/src/videosqlmodel.h b/src/cpp/videosqlmodel.h similarity index 100% rename from src/videosqlmodel.h rename to src/cpp/videosqlmodel.h diff --git a/src/present.desktop b/src/present.desktop deleted file mode 100644 index 0076611..0000000 --- a/src/present.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Name=present -GenericName=Church Presentation -Comment=A Kirigami based church presenter -Exec=present %U -TryExec=present -Icon=present -StartupNotify=true -Terminal=false -Categories=presentation