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

Skylark: minor fix, CtrlLib: ErrorOK

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6244 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-08-17 15:57:39 +00:00
parent 09b96f92a2
commit a2ca885eb3
8 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/BuildAll/BuildAll.cpp
View file

@ -16,7 +16,7 @@ bool failed;
const char *exclude[] = {
"SDLEXAMPLE", "OLECALC", // REACTIVATE LATER
"LOG:R",
"WINFB", "LINUXFB", "FRAMEBUFFER", "COUNTER",
"WINFB", "LINUXFB", "FRAMEBUFFER", "COUNTER", "REGEXPEXT",
#ifdef PLATFORM_WIN32
"SQL_MYSQL",
#endif

9
uppsrc/Core/Util.cpp
View file

@ -874,6 +874,15 @@ void BeepExclamation()
#endif
}
void BeepError()
{
#ifdef PLATFORM_WIN32
MessageBeep(MB_ICONERROR);
#else
LinuxBeep("error.wav");
#endif
}
void BeepQuestion()
{
#ifdef PLATFORM_WIN32

1
uppsrc/Core/Util.h
View file

@ -213,6 +213,7 @@ String GetLastErrorMessage();
void BeepInformation();
void BeepExclamation();
void BeepQuestion();
void BeepError();
inline
void memsetw(void *t, word value, int count)

1
uppsrc/CtrlLib/ChGtk.cpp
View file

@ -649,6 +649,7 @@ void ChHostSkin()
ChCtrlImg(CtrlImg::I_information, "gtk-dialog-info", 6);
ChCtrlImg(CtrlImg::I_question, "gtk-dialog-question", 6);
ChCtrlImg(CtrlImg::I_exclamation, "gtk-dialog-warning", 6);
ChCtrlImg(CtrlImg::I_error, "gtk-dialog-error", 6);
static struct {
void (*set)(Image);

1
uppsrc/CtrlLib/ChWin32.cpp
View file

@ -610,6 +610,7 @@ void ChSysInit()
CtrlImg::Set(CtrlImg::I_information, Win32Icon(IDI_INFORMATION));
CtrlImg::Set(CtrlImg::I_question, Win32Icon(IDI_QUESTION));
CtrlImg::Set(CtrlImg::I_exclamation, Win32Icon(IDI_EXCLAMATION));
CtrlImg::Set(CtrlImg::I_error, Win32Icon(IDI_ERROR));
FrameButtonWidth_Write(GetSystemMetrics(SM_CYHSCROLL));
ScrollBarArrowSize_Write(GetSystemMetrics(SM_CXHSCROLL));

5
uppsrc/CtrlLib/Prompt.cpp
View file

@ -164,6 +164,11 @@ void ShowExc(const Exc& exc) {
Prompt(Ctrl::GetAppName(), CtrlImg::exclamation(), DeQtf(exc), t_("OK"));
}
void ErrorOK(const char *qtf) {
BeepError();
Prompt(Ctrl::GetAppName(), CtrlImg::error(), qtf, t_("OK"));
}
int PromptOKCancel(const char *qtf) {
BeepQuestion();
return Prompt(Ctrl::GetAppName(), CtrlImg::question(), qtf, t_("OK"), t_("Cancel"));

1
uppsrc/CtrlLib/RichText.h
View file

@ -138,6 +138,7 @@ int PromptAbortRetry(const char *qtf);
int PromptAbortRetryIgnore(const char *qtf);
void Exclamation(const char *qtf);
void ErrorOK(const char *qtf);
Image YesButtonImage();
Image NoButtonImage();

4
uppsrc/Skylark/App.cpp
View file

@ -252,10 +252,6 @@ void SkylarkApp::Run()
#endif
Main();
#if defined(_DEBUG) && defined(PLATFORM_POSIX)
FileDelete(pidf);
#endif
SKYLARKLOG("ExitSkylark");
}