github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Using beep parameter for regular prompts (fixes override problem)

Browse source
This commit is contained in:
Mirek Fidler 2023-05-06 20:38:45 +02:00
parent 0cea273540
commit ed95d1305c
5 changed files with 108 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

93
uppsrc/CtrlLib/Prompt.cpp
View file

@ -206,6 +206,39 @@ int Prompt(int dontshowagain, const char *dsa_id_, int beep,
return result;
}
int Prompt(Event<const String&> WhenLink, int beep,
const char *title, const Image& icon, const char *qtf, bool okcancel,
const char *button1, const char *button2, const char *button3,
int cx, Image im1, Image im2, Image im3)
{
return Prompt(false, NULL, beep, WhenLink, title, icon, qtf, okcancel, button1, button2, button3, cx, im1, im2, im3);
}
int Prompt(int beep, const char *title, const Image& icon, const char *qtf, bool okcancel,
const char *button1, const char *button2, const char *button3,
int cx)
{
return Prompt(callback(LaunchWebBrowser), beep, title,
icon, qtf, okcancel, button1, button2, button3, cx, Null, Null, Null);
}
int Prompt(Event<const String&> WhenLink, int beep,
const char *title, const Image& icon, const char *qtf, bool okcancel,
const char *button1, const char *button2, const char *button3, int cx)
{
return Prompt(false, NULL, beep, WhenLink, title, icon, qtf, okcancel,
button1, button2, button3, cx, Null, Null, Null);
}
int Prompt(int beep, const char *title, const Image& icon, const char *qtf,
const char *button1, const char *button2, const char *button3,
int cx)
{
return Prompt(beep, title, icon, qtf, true, button1, button2, button3, cx);
}
///
int Prompt(Event<const String&> WhenLink,
const char *title, const Image& icon, const char *qtf, bool okcancel,
const char *button1, const char *button2, const char *button3,
@ -238,38 +271,31 @@ int Prompt(const char *title, const Image& icon, const char *qtf,
}
void PromptOK(const char *qtf) {
BeepInformation();
Prompt(Ctrl::GetAppName(), CtrlImg::information(), qtf, t_("OK"));
Prompt(BEEP_INFORMATION, Ctrl::GetAppName(), CtrlImg::information(), qtf, t_("OK"));
}
void Exclamation(const char *qtf) {
BeepExclamation();
Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, t_("OK"));
Prompt(BEEP_EXCLAMATION, Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, t_("OK"));
}
void ShowExc(const Exc& exc) {
BeepExclamation();
Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(), DeQtf(exc), t_("OK"));
Prompt(BEEP_EXCLAMATION, Ctrl::GetAppName(), CtrlImg::exclamation(), DeQtf(exc), t_("OK"));
}
void ErrorOK(const char *qtf) {
BeepError();
Prompt(Ctrl::GetAppName(), CtrlImg::error(), qtf, t_("OK"));
Prompt(BEEP_ERROR, Ctrl::GetAppName(), CtrlImg::error(), qtf, t_("OK"));
}
int PromptOKCancel(const char *qtf) {
BeepQuestion();
return Prompt(Ctrl::GetAppName(), CtrlImg::question(), qtf, t_("OK"), t_("Cancel"));
return Prompt(BEEP_QUESTION, Ctrl::GetAppName(), CtrlImg::question(), qtf, t_("OK"), t_("Cancel"));
}
int PromptOKCancelAll(const char *qtf) {
BeepQuestion();
return Prompt(Ctrl::GetAppName(), CtrlImg::question(), qtf, t_("OK"), t_("Cancel"), t_("All"));
return Prompt(BEEP_QUESTION, Ctrl::GetAppName(), CtrlImg::question(), qtf, t_("OK"), t_("Cancel"), t_("All"));
}
int ErrorOKCancel(const char *qtf) {
BeepError();
return Prompt(Ctrl::GetAppName(), CtrlImg::error(), qtf, t_("OK"), t_("Cancel"));
return Prompt(BEEP_QUESTION, Ctrl::GetAppName(), CtrlImg::error(), qtf, t_("OK"), t_("Cancel"));
}
CH_IMAGE(YesButtonImage, Null);
@ -278,104 +304,91 @@ CH_IMAGE(AbortButtonImage, Null);
CH_IMAGE(RetryButtonImage, Null);
int PromptYesNo(const char *qtf) {
BeepQuestion();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_QUESTION,
Ctrl::GetAppName(), CtrlImg::question(), qtf, false,
t_("&Yes"), t_("&No"), NULL, 0,
YesButtonImage(), NoButtonImage(), Null);
}
int PromptYesNoAll(const char *qtf) {
BeepQuestion();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_QUESTION,
Ctrl::GetAppName(), CtrlImg::question(), qtf, false,
t_("&Yes"), t_("&No"), t_("All"), 0,
YesButtonImage(), NoButtonImage(), Null);
}
int ErrorYesNo(const char *qtf) {
BeepError();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_ERROR,
Ctrl::GetAppName(), CtrlImg::error(), qtf, false,
t_("&Yes"), t_("&No"), NULL, 0,
YesButtonImage(), NoButtonImage(), Null);
}
int PromptYesNoCancel(const char *qtf) {
BeepQuestion();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_QUESTION,
Ctrl::GetAppName(), CtrlImg::question(), qtf, true,
t_("&Yes"), t_("&No"), t_("Cancel"), 0,
YesButtonImage(), NoButtonImage(), Null);
}
int ErrorYesNoCancel(const char *qtf) {
BeepError();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_ERROR,
Ctrl::GetAppName(), CtrlImg::error(), qtf, true,
t_("&Yes"), t_("&No"), t_("Cancel"), 0,
YesButtonImage(), NoButtonImage(), Null);
}
int ErrorYesNoAll(const char *qtf) {
BeepError();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_ERROR,
Ctrl::GetAppName(), CtrlImg::error(), qtf, true,
t_("&Yes"), t_("&No"), t_("All"), 0,
YesButtonImage(), NoButtonImage(), Null);
}
int PromptAbortRetry(const char *qtf) {
BeepExclamation();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_EXCLAMATION,
Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, false,
t_("&Abort"), t_("&Retry"), NULL, 0,
AbortButtonImage(), RetryButtonImage(), Null);
}
int ErrorAbortRetry(const char *qtf) {
BeepError();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_ERROR,
Ctrl::GetAppName(), CtrlImg::error(), qtf, false,
t_("&Abort"), t_("&Retry"), NULL, 0,
AbortButtonImage(), RetryButtonImage(), Null);
}
int PromptRetryCancel(const char *qtf) {
BeepExclamation();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_EXCLAMATION,
Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, true,
t_("&Retry"), t_("Cancel"), NULL, 0,
RetryButtonImage(), Null, Null);
}
int ErrorRetryCancel(const char *qtf) {
BeepError();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_ERROR,
Ctrl::GetAppName(), CtrlImg::error(), qtf, true,
t_("&Retry"), t_("Cancel"), NULL, 0,
RetryButtonImage(), Null, Null);
}
int PromptAbortRetryIgnore(const char *qtf) {
BeepExclamation();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_EXCLAMATION,
Ctrl::GetAppName(), CtrlImg::exclamation(), qtf, false,
t_("&Abort"), t_("&Retry"), t_("&Ignore"), 0,
AbortButtonImage(), RetryButtonImage(), Null);
}
int ErrorAbortRetryIgnore(const char *qtf) {
BeepError();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_ERROR,
Ctrl::GetAppName(), CtrlImg::error(), qtf, false,
t_("&Abort"), t_("&Retry"), t_("&Ignore"), 0,
AbortButtonImage(), RetryButtonImage(), Null);
}
int PromptSaveDontSaveCancel(const char *qtf) {
BeepQuestion();
return Prompt(callback(LaunchWebBrowser),
return Prompt(callback(LaunchWebBrowser), BEEP_QUESTION,
Ctrl::GetAppName(), CtrlImg::question(), qtf, true,
t_("&Save"), t_("&Don't Save"), t_("Cancel"), 0,
CtrlImg::save(), NoButtonImage(), Null);

17
uppsrc/CtrlLib/RichText.h
View file

@ -165,6 +165,23 @@ int Prompt(const char *title, const Image& icon, const char *qtf,
enum { BEEP_NONE, BEEP_INFORMATION, BEEP_EXCLAMATION, BEEP_QUESTION, BEEP_ERROR };
int Prompt(Event<const String&> WhenLink, int beep,
const char *title, const Image& iconbmp, const char *qtf, bool okcancel,
const char *button1, const char *button2, const char *button3,
int cx,
Image im1, Image im2, Image im3);
int Prompt(Event<const String&> WhenLink, int beep,
const char *title, const Image& icon, const char *qtf, bool okcancel,
const char *button1, const char *button2 = NULL, const char *button3 = NULL,
int cx = 0);
int Prompt(int beep, const char *title, const Image& icon, const char *qtf, bool okcancel,
const char *button1, const char *button2 = NULL, const char *button3 = NULL,
int cx = 0);
int Prompt(int beep, const char *title, const Image& icon, const char *qtf,
const char *button1, const char *button2 = NULL, const char *button3 = NULL,
int cx = 0);
int PromptOpt(const char *opt_id, int beep, Event<const String&> WhenLink,
const char *title, const Image& icon, const char *qtf, bool okcancel,
const char *button1, const char *button2, const char *button3,

2
uppsrc/Painter/Painter.cpp
View file

@ -267,7 +267,7 @@ Painter& Painter::Text(double x, double y, const String& s, Font fnt, const doub
Painter& Painter::Text(const Pointf& p, const char *text, Font fnt, int n, const double *dx)
{
WString s = ToUtf32(text, n < 0 ? strlen(text) : n);
WString s = ToUtf32(text, n < 0 ? (int)strlen(text) : n);
return Text(p, s, fnt, s.GetCount(), dx);
}

9
upptst/Prompts/Prompts.upp Normal file
View file

@ -0,0 +1,9 @@
uses
CtrlLib;
file
main.cpp;
mainconfig
"" = "GUI";

28
upptst/Prompts/main.cpp Normal file
View file

@ -0,0 +1,28 @@
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
GUI_APP_MAIN
{
PromptOK("Test");
PromptOKCancel("Test");
PromptOKCancelAll("Test");
PromptYesNo("Test");
PromptYesNoCancel("Test");
PromptYesNoAll("Test");
PromptRetryCancel("Test");
PromptAbortRetry("Test");
PromptAbortRetryIgnore("Test");
PromptSaveDontSaveCancel("Test");
Exclamation("Test");
ErrorOK("Test");
ErrorOKCancel("Test");
ErrorYesNo("Test");
ErrorYesNoCancel("Test");
ErrorYesNoAll("Test");
ErrorRetryCancel("Test");
ErrorAbortRetry("Test");
ErrorAbortRetryIgnore("Test");
}