diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..35ea498 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +# Build directories +build/ +dist/ + +# CMake generated files +CMakeFiles/ +CMakeCache.txt +cmake_install.cmake +Makefile + +# Qt generated files +*.moc +moc_*.cpp +ui_*.h +*.qrc.cpp + +# Object files +*.o +*.obj + +# Executables +*.exe +DLauncher + +# IDE files +.vscode/ +.idea/ +*.user +*.pro.user + +# Temporary files +*.tmp +*.temp + +# OS generated files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db \ No newline at end of file diff --git a/README.md b/README.md index 0654776..b7e716b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ DLauncher is a lightweight C++ application designed to serve as a launcher. It p - Make or Ninja (depending on your platform) ## Dependencies -- Qt 5 or higher (for GUI components) +- Qt 6 or higher (for GUI components) ### Building diff --git a/main.cpp b/main.cpp index 8bdd890..befae4e 100644 --- a/main.cpp +++ b/main.cpp @@ -1,21 +1,20 @@ #include "LockedLineEdit.h" -#include "list/list.h" +#include "components/list/list.h" #include "listeners/kb.h" -#include "src/components/appRow/appRow.h" -#include "src/utils/readApps.h" -#include "utils.h" +#include "components/appRow/appRow.h" +#include "utils/readApps.h" +#include "utils/utils.h" #include #include #include #include #include #include +#include #include #include #include -#include -#include Qt::WindowFlags devFlags() { return Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint; @@ -25,7 +24,6 @@ int main(int argc, char *argv[]) { AppReader appReader; QApplication app(argc, argv); GlobalEventListener globalKbListener(app); - QProcess *process = new QProcess(); appReader.LoadApps(); @@ -104,9 +102,7 @@ int main(int argc, char *argv[]) { } std::cout << "Launching: " << cmd << std::endl; - // std::system(cmd.c_str()); - process->startDetached(QString::fromStdString(cmd)); - // QProcess::startDetached(QString::fromStdString(cmd)); + QProcess::startDetached(QString::fromStdString(cmd)); app.quit(); } } diff --git a/src/search/search.cpp b/src/search/search.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/src/search/search.h b/src/search/search.h deleted file mode 100644 index 3016212..0000000 --- a/src/search/search.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef SEARCH_H -#define SEARCH_H - -class Search { -public: -}; - -#endif diff --git a/src/utils/readApps.cpp b/src/utils/readApps.cpp index e79bdcc..b053354 100644 --- a/src/utils/readApps.cpp +++ b/src/utils/readApps.cpp @@ -27,7 +27,7 @@ void AppReader::LoadApps() { std::filesystem::directory_iterator(expandedPath)) { if (entry.path().extension() != ".desktop") continue; - allAps.push_back(parseDesktopApp(entry.path())); + allApps.push_back(parseDesktopApp(entry.path())); } } catch (const std::filesystem::filesystem_error &e) { std::cerr << "Filesystem error: " << e.what() << std::endl; @@ -41,7 +41,7 @@ AppReader::ReadDesktopApps(int limit, const std::string &searchTerm) { std::vector filtered; std::string searchLower = toLower(searchTerm); - for (const auto &app : allAps) { + for (const auto &app : allApps) { if (searchTerm.empty() || toLower(app.name).find(searchLower) != std::string::npos) { filtered.push_back(app); @@ -55,7 +55,7 @@ AppReader::ReadDesktopApps(int limit, const std::string &searchTerm) { return filtered; } -std::vector AppReader::GetAllApps() { return allAps; } +std::vector AppReader::GetAllApps() { return allApps; } std::vector AppReader::SearchApps(std::string searchTerm, int limit, bool isFuzzy) { @@ -63,7 +63,7 @@ std::vector AppReader::SearchApps(std::string searchTerm, int limit, std::string searchLower = toLower(searchTerm); if (isFuzzy) { - for (const auto &app : allAps) { + for (const auto &app : allApps) { std::string appNameLower = toLower(app.name); std::string exec = toLower(app.exec); if (similarity(appNameLower, searchLower) > 0.4) { diff --git a/src/utils/readApps.h b/src/utils/readApps.h index 80d7024..e9dafe3 100644 --- a/src/utils/readApps.h +++ b/src/utils/readApps.h @@ -39,5 +39,5 @@ class AppReader { "/var/lib/flatpak/applications", "/var/lib/flatpak/exports/share/applications"}; - std::vector allAps; + std::vector allApps; }; diff --git a/src/utils/utils.h b/src/utils/utils.h index a430c1a..05b5bae 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -7,10 +7,9 @@ std::vector toStringArray(const std::string &content, const std::string &delimiter = "\n"); size_t contains(const std::string &str, const std::string &search, - const bool caseSensetive = true); + const bool caseSensitive = true); std::string toLower(const std::string &str); -std::string toLower(const std::string &s); std::string ltrim(const std::string &s); std::string rtrim(const std::string &s); std::string trim(const std::string &s);