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

Added 'no wait' option (-w) for command line (Windows only), Issue 2314

Browse Source
This commit is contained in:
Ingo
2014-04-02 19:12:42 +02:00
parent 18a349636f
commit d79d3c3f7a
1 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/main.cc
View File

@@ -159,6 +159,15 @@ int main(int argc, char **argv)
bool stderrRedirectedtoFile = (GetFileType(GetStdHandle(STD_ERROR_HANDLE)) == 0x0001); bool stderrRedirectedtoFile = (GetFileType(GetStdHandle(STD_ERROR_HANDLE)) == 0x0001);
// no console, if stdout and stderr both are redirected to file // no console, if stdout and stderr both are redirected to file
if( !(stdoutRedirectedtoFile && stderrRedirectedtoFile)) { if( !(stdoutRedirectedtoFile && stderrRedirectedtoFile)) {
// check if parameter -w was passed.
// We have to do that in this step, because it controls whether to open a console to show the output of following steps
bool Console = true;
for(int i=1;i<argc;i++)
if(!strcmp(argv[i],"-w")) {
Console = false;
break;
}
if(Console) {
AllocConsole(); 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
@@ -185,11 +194,12 @@ int main(int argc, char **argv)
consoleOpened = true; consoleOpened = true;
// printing RT's version in all case, particularly useful for the 'verbose' mode, but also for the batch processing // printing RT's version in every case, particularly useful for the 'verbose' mode, but also for the batch processing
std::cout << "RawTherapee, version " << VERSION << std::endl; std::cout << "RawTherapee, version " << VERSION << std::endl;
std::cout << "WARNING: closing this window will close RawTherapee!" << std::endl << std::endl; std::cout << "WARNING: closing this window will close RawTherapee!" << std::endl << std::endl;
} }
} }
}
int ret = processLineParams( argc, argv); int ret = processLineParams( argc, argv);
if( ret <= 0 ) { if( ret <= 0 ) {
@@ -424,6 +434,10 @@ int processLineParams( int argc, char **argv )
} }
} }
break; break;
#ifdef WIN32
case 'w': // This case is handled outside this function
break;
#endif
case 'h': case 'h':
case '?': case '?':
default: default:
@@ -433,6 +447,9 @@ int processLineParams( int argc, char **argv )
std::cout << " " << Glib::path_get_basename(argv[0]) << " [<selected dir>] Start File Browser inside directory." << std::endl; std::cout << " " << Glib::path_get_basename(argv[0]) << " [<selected dir>] Start File Browser inside directory." << 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 << " " << Glib::path_get_basename(argv[0]) << " -c <dir>|<files> Convert files in batch with default parameters." << std::endl << std::endl; std::cout << " " << Glib::path_get_basename(argv[0]) << " -c <dir>|<files> Convert files in batch with default parameters." << std::endl << std::endl;
#ifdef WIN32
std::cout << " -w Do not open the Windows console" << std::endl;
#endif
std::cout << "Other options used with -c (-c must be the last option):" << std::endl; std::cout << "Other options used with -c (-c must be the last option):" << std::endl;
std::cout << Glib::path_get_basename(argv[0]) << " [-o <output>|-O <output>] [-s|-S] [-p <files>] [-d] [-j[1-100]|-t|-t1|-n] -Y -c <input>" << std::endl; std::cout << Glib::path_get_basename(argv[0]) << " [-o <output>|-O <output>] [-s|-S] [-p <files>] [-d] [-j[1-100]|-t|-t1|-n] -Y -c <input>" << std::endl;
std::cout << " -o <file>|<dir> Select output file or directory." << std::endl; std::cout << " -o <file>|<dir> Select output file or directory." << std::endl;