github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Report: QtfReport page numbering option, MacOS X11 patches (thanks fudadmin)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3949 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-10-03 18:42:34 +00:00
parent 23b7526987
commit bc43e9edf8
4 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Report/Report.h
View file

@ -146,7 +146,7 @@ void Print(Report& r, PrinterJob& pd, bool center = true);
bool DefaultPrint(Report& r, int i, const char *_name = t_("Report"));
bool Print(Report& r, int i, const char *name = t_("Report"));
bool Perform(Report& r, const char *name = t_("Report"));
bool QtfReport(const String& qtf, const char *name = t_("Report"));
bool QtfReport(const String& qtf, const char *name = "", bool pagenumbers = false);
END_UPP_NAMESPACE

8
uppsrc/Report/ReportDlg.cpp
View file

@ -283,9 +283,15 @@ bool Perform(Report& r, const char *caption)
return ReportWindow().Perform(r, 100, caption);
}
bool QtfReport(const String& qtf, const char *name)
bool QtfReport(const String& qtf, const char *name, bool pagenumbers)
{
Report r;
if(pagenumbers) {
Report rr;
rr.Footer("[1> $$P]");
rr << qtf;
r.Footer("[1> $$P/" + AsString(rr.GetCount()) + "]");
}
r << qtf;
return Perform(r, name);
}

2
uppsrc/ide/Common/ComDlg.cpp
View file

@ -152,6 +152,8 @@ void ShellOpenFolder(const String& dir)
{
#if defined(PLATFORM_WIN32)
LaunchWebBrowser(dir);
#elif __APPLE__
system("open " + dir + " &");
#else
system("xdg-open " + dir + " &");
#endif

4
uppsrc/plugin/ndisasm/lib/compiler.h
View file

@ -43,6 +43,10 @@
#ifndef NASM_COMPILER_H
#define NASM_COMPILER_H 1
#ifdef __APPLE__
#define _FORTIFY_SOURCE 0 //aris002 - in the future evaluate how unsafe are the safe funtions and vice versa
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
/* autoconf doesn't define these if they are redundant, but we want to