sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #659 from jpcima/zenity-presence-check

Browse source 
Check zenity presence, and block editor with message if missing
This commit is contained in:
JP Cimalando 2021-02-23 21:58:29 +01:00 • committed by GitHub
commit 28d0a0fbca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
plugins/editor/src/editor/Editor.cpp
View file

@ -768,6 +768,31 @@ void Editor::Impl::createFrameContents()
mainView->setBackgroundColor(frameBackground);
#if LINUX
if (!isZenityAvailable()) {
CRect bounds = mainView->getViewSize();
CViewContainer* box = new CViewContainer(bounds);
mainView->addView(box);
box->setBackgroundColor(CColor(0x00, 0x00, 0x00, 0xc0));
CRect textSize = CRect(0, 0, 400, 80).centerInside(bounds);
CMultiLineTextLabel* textLabel = new CMultiLineTextLabel(textSize);
box->addView(textLabel);
textLabel->setTextInset(CPoint(10.0, 10.0));
textLabel->setStyle(CParamDisplay::kRoundRectStyle);
textLabel->setRoundRectRadius(10.0);
textLabel->setFrameColor(CColor(0xb2, 0xb2, 0xb2));
textLabel->setBackColor(CColor(0x2e, 0x34, 0x36));
auto font = makeOwned<CFontDesc>("Roboto", 16.0);
textLabel->setFont(font);
textLabel->setLineLayout(CMultiLineTextLabel::LineLayout::wrap);
textLabel->setText(
"The required program \"zenity\" is missing.\n"
"Install this software package first, and restart sfizz.");
}
#endif
mainView_ = owned(mainView);
}

9
plugins/editor/src/editor/NativeHelpers.cpp
View file

@ -112,10 +112,12 @@ static std::vector<char *> createForkEnviron()
return newEnv;
}
static constexpr char zenityPath[] = "/usr/bin/zenity";
bool askQuestion(const char *text)
{
char *argv[] = {
const_cast<char *>("/usr/bin/zenity"),
const_cast<char *>(zenityPath),
const_cast<char *>("--question"),
const_cast<char *>("--text"),
const_cast<char *>(text),
@ -145,4 +147,9 @@ bool askQuestion(const char *text)
return WEXITSTATUS(wstatus) == 0;
}
bool isZenityAvailable()
{
return access(zenityPath, X_OK) == 0;
}
#endif

4
plugins/editor/src/editor/NativeHelpers.h
View file

@ -9,3 +9,7 @@
bool openFileInExternalEditor(const char *filename);
bool openDirectoryInExplorer(const char *filename);
bool askQuestion(const char *text);
#if !defined(_WIN32) && !defined(__APPLE__)
bool isZenityAvailable();
#endif