liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'gtk3'

Browse Source
This commit is contained in:
Adam Reichold
2016-03-05 09:21:34 +01:00
parent 830c58877f 72283f867d
commit a04c7706db
119 changed files with 3006 additions and 3007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtgui/splash.cc
View File

@@ -17,9 +17,11 @@
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include "splash.h"
#include "multilangmgr.h"
#include <glib/gstdio.h>
#include "../rtengine/safegtk.h"
#include "multilangmgr.h"
#include "rtimage.h"
extern Glib::ustring creditsPath;
extern Glib::ustring licensePath;
@@ -28,8 +30,7 @@ extern Glib::ustring versionSuffixString;
SplashImage::SplashImage ()
{
pixbuf = safe_create_from_file ("splash.png");
pixbuf = RTImage::createFromFile ("splash.png");
set_size_request (pixbuf->get_width(), pixbuf->get_height());
}
@@ -100,8 +101,8 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
// Tab 2: the informations about the current version
std::string buildFileName = Glib::build_filename (creditsPath, "AboutThisBuild.txt");
if ( safe_file_test(buildFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (buildFileName, "rt");
if ( Glib::file_test(buildFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = g_fopen (buildFileName.c_str (), "rt");
if (f != NULL) {
char* buffer = new char[1024];
@@ -131,8 +132,8 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
// Tab 3: the credits
std::string creditsFileName = Glib::build_filename (creditsPath, "AUTHORS.txt");
if ( safe_file_test(creditsFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (creditsFileName, "rt");
if ( Glib::file_test(creditsFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = g_fopen (creditsFileName.c_str (), "rt");
if (f != NULL) {
char* buffer = new char[1024];
@@ -163,8 +164,8 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
// Tab 4: the license
std::string licenseFileName = Glib::build_filename (licensePath, "LICENSE.txt");
if ( safe_file_test(licenseFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (licenseFileName, "rt");
if ( Glib::file_test(licenseFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = g_fopen (licenseFileName.c_str (), "rt");
if (f != NULL) {
char* buffer = new char[1024];
@@ -196,8 +197,8 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
// Tab 5: the Release Notes
std::string releaseNotesFileName = Glib::build_filename (creditsPath, "RELEASE_NOTES.txt");
if ( safe_file_test(releaseNotesFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (releaseNotesFileName, "rt");
if ( Glib::file_test(releaseNotesFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = g_fopen (releaseNotesFileName.c_str (), "rt");
if (f != NULL) {
char* buffer = new char[1024];