Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ jobs:
# Copy icon
cp ../RequestFlowApp/design/RequestFlowLogo-256.png RequestFlow/RequestFlow.png

# Copy samples folder
if [ -d "../RequestFlowApp/samples" ]; then
mkdir -p RequestFlow/samples
cp -R ../RequestFlowApp/samples/* RequestFlow/samples/
echo "Copied samples folder to distribution"
fi

- name: Download linuxdeployqt
run: |
cd build
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ jobs:
exit 1
fi

# Copy samples folder
if [ -d "${GITHUB_WORKSPACE}/RequestFlowApp/samples" ]; then
mkdir -p RequestFlow.app/Contents/Resources/samples
cp -R "${GITHUB_WORKSPACE}/RequestFlowApp/samples/"* RequestFlow.app/Contents/Resources/samples/
echo "Copied samples folder to app bundle"
fi

# Create and copy the application icon from design folder
ICON_DIR="${GITHUB_WORKSPACE}/RequestFlowApp/design/macos/AppIcons/Assets.xcassets/AppIcon.appiconset"

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ jobs:
Copy-Item CoreModel\release\CoreModel.dll dist\ -ErrorAction Stop
Copy-Item CoreView\release\CoreView.dll dist\ -ErrorAction Stop
Copy-Item ExecutionEngine\release\ExecutionEngine.dll dist\ -ErrorAction Stop
# Copy samples folder
Copy-Item ..\samples dist\samples -Recurse -Force
Write-Host "Copied samples folder to distribution"

- name: Deploy Qt and MinGW dependencies
working-directory: RequestFlowApp/build
Expand Down
14 changes: 6 additions & 8 deletions RequestFlowApp/RequestFlow/MenuBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

void MainWindow::setupMenuBar()
{
//menuBar()->set
// File menu
{
_fileMenu = menuBar()->addMenu("File");
Expand All @@ -31,23 +30,22 @@ void MainWindow::setupMenuBar()
_openProjectAction = _fileMenu->addAction(
QIcon(":/ui/open_file"), "Open...", [=]() { onOpenProject(); }, QKeySequence::Open);

//_fileMenu->addAction(QIcon(":/ui/open_file"), "**Open Sample Project", [=]() { openProject("./samples/sample-project.rqfl"); });
// list samples
{
QDir samplesDir("./samples");
const QDir samplesDir("./samples");
QStringList filters("*.rqfl");
auto entries = samplesDir.entryList(filters, QDir::Filter::Files, QDir::SortFlag::Name);
if(!entries.isEmpty()) {
auto samplesMenu = _fileMenu->addMenu("Sample projects");
std::for_each(entries.begin(), entries.end(), [this, samplesMenu](const QString& entry) {
samplesMenu->addAction(QIcon(), entry, [this, entry](){
openProject(entry);
std::for_each(entries.begin(), entries.end(), [this, samplesMenu, samplesDir](const QString& entry) {
QString fullPath = samplesDir.absoluteFilePath(entry);
samplesMenu->addAction(QIcon(), fullPath, [this, fullPath](){
openProject(fullPath);
});
});
}
}

//_openProjectAction->setMenu(new QMenu);

_recentProjectsMenu = _fileMenu->addMenu(QIcon(":/ui/history"), "Recent projects...");
updateRecentProjectsList();

Expand Down
Loading