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

Merge with dev

Browse Source
This commit is contained in:
Desmis
2017-04-09 11:51:58 +02:00
parent 6119c2afee 028edd5bd9
commit 5f1c5ea334
1 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rtgui/main.cc
View File

@@ -119,11 +119,11 @@ int main (int argc, char **argv)
{ {
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
setlocale (LC_NUMERIC, "C"); // to set decimal point to "." setlocale (LC_NUMERIC, "C"); // to set decimal point to "."
gtk_init (&argc, &argv); // use the "--g-fatal-warnings" command line flag to make warnings fatal
Glib::init(); // called by Gtk::Main, but this may be important for thread handling, so we call it ourselves now Glib::init(); // called by Gtk::Main, but this may be important for thread handling, so we call it ourselves now
gdk_threads_set_lock_functions (G_CALLBACK (myGdkLockEnter), (G_CALLBACK (myGdkLockLeave))); gdk_threads_set_lock_functions (G_CALLBACK (myGdkLockEnter), (G_CALLBACK (myGdkLockLeave)));
gdk_threads_init(); gdk_threads_init();
gtk_init (&argc, &argv); // use the "--g-fatal-warnings" command line flag to make warnings fatal
Gio::init (); Gio::init ();
//mainThread = Glib::Threads::Thread::self(); //mainThread = Glib::Threads::Thread::self();
@@ -204,8 +204,8 @@ int main (int argc, char **argv)
break; break;
} }
if(Console && AllocConsole()) { if (Console && AllocConsole()) {
AttachConsole( GetCurrentProcessId() ) ; AttachConsole ( GetCurrentProcessId() ) ;
// Don't allow CTRL-C in console to terminate RT // Don't allow CTRL-C in console to terminate RT
SetConsoleCtrlHandler ( NULL, true ); SetConsoleCtrlHandler ( NULL, true );
// Set title of console // Set title of console
@@ -242,13 +242,13 @@ int main (int argc, char **argv)
} }
} }
if(argc > 1) { if (argc > 1) {
int ret = processLineParams( argc, argv); int ret = processLineParams ( argc, argv);
if( ret <= 0 ) { if ( ret <= 0 ) {
if(consoleOpened) { if (consoleOpened) {
printf("Press any key to exit RawTherapee\n"); printf ("Press any key to exit RawTherapee\n");
FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE)); FlushConsoleInputBuffer (GetStdHandle (STD_INPUT_HANDLE));
getch(); getch();
} }
@@ -304,7 +304,7 @@ int main (int argc, char **argv)
Glib::RefPtr<Gtk::IconTheme> defaultIconTheme = Gtk::IconTheme::get_default(); Glib::RefPtr<Gtk::IconTheme> defaultIconTheme = Gtk::IconTheme::get_default();
defaultIconTheme->append_search_path (icon_path); defaultIconTheme->append_search_path (icon_path);
rtengine::setPaths(options); rtengine::setPaths (options);
MyExpander::init(); // has to stay AFTER rtengine::setPaths MyExpander::init(); // has to stay AFTER rtengine::setPaths
// ------- loading theme files // ------- loading theme files
@@ -420,9 +420,9 @@ int processLineParams ( int argc, char **argv )
{ {
unsigned errors = 0; unsigned errors = 0;
for( int iArg = 1; iArg < argc; iArg++) { for ( int iArg = 1; iArg < argc; iArg++) {
if( argv[iArg][0] == '-' ) { if ( argv[iArg][0] == '-' ) {
switch( argv[iArg][1] ) { switch ( argv[iArg][1] ) {
#ifdef WIN32 #ifdef WIN32
case 'w': // This case is handled outside this function case 'w': // This case is handled outside this function
@@ -432,7 +432,7 @@ int processLineParams ( int argc, char **argv )
case 'h': case 'h':
case '?': case '?':
default: { default: {
Glib::ustring pparamsExt = paramFileExtension.substr(1); Glib::ustring pparamsExt = paramFileExtension.substr (1);
std::cout << " An advanced, cross-platform program for developing raw photos." << std::endl; std::cout << " An advanced, cross-platform program for developing raw photos." << std::endl;
std::cout << std::endl; std::cout << std::endl;
std::cout << " Website: http://www.rawtherapee.com/" << std::endl; std::cout << " Website: http://www.rawtherapee.com/" << std::endl;
@@ -447,8 +447,8 @@ int processLineParams ( int argc, char **argv )
std::cout << " The dash symbol - denotes a range of possible values from one to the other." << std::endl; std::cout << " The dash symbol - denotes a range of possible values from one to the other." << std::endl;
std::cout << std::endl; std::cout << std::endl;
std::cout << "Usage:" << std::endl; std::cout << "Usage:" << std::endl;
std::cout << " " << Glib::path_get_basename(argv[0]) << " <folder> Start File Browser inside folder." << std::endl; std::cout << " " << Glib::path_get_basename (argv[0]) << " <folder> Start File Browser inside folder." << std::endl;
std::cout << " " << Glib::path_get_basename(argv[0]) << " <file> Start Image Editor with file." << std::endl; std::cout << " " << Glib::path_get_basename (argv[0]) << " <file> Start Image Editor with file." << std::endl;
std::cout << std::endl; std::cout << std::endl;
std::cout << "Options:" << std::endl; std::cout << "Options:" << std::endl;
#ifdef WIN32 #ifdef WIN32