|
Lines 67-90
int main(int argc, char *argv[])
Link Here
|
| 67 |
parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("b")<<QStringLiteral("base"),i18n("Explicit base file. For compatibility with certain tools."),QStringLiteral("file"))); |
67 |
parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("b")<<QStringLiteral("base"),i18n("Explicit base file. For compatibility with certain tools."),QStringLiteral("file"))); |
| 68 |
parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("o")<<QStringLiteral("out")<<QStringLiteral("output"),i18n("Output file. Implies -m."),QStringLiteral("file"))); |
68 |
parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("o")<<QStringLiteral("out")<<QStringLiteral("output"),i18n("Output file. Implies -m."),QStringLiteral("file"))); |
| 69 |
parser.addOption(QCommandLineOption(QStringLiteral("auto"),i18n("No GUI if all conflicts are auto-solvable. Needs -o file."))); |
69 |
parser.addOption(QCommandLineOption(QStringLiteral("auto"),i18n("No GUI if all conflicts are auto-solvable. Needs -o file."))); |
|
|
70 |
parser.addOption(QCommandLineOption(QStringLiteral("qall"),i18n("Don't solve conflicts automatically."))); |
| 71 |
parser.addOption(QCommandLineOption(QStringLiteral("L1"),i18n("Visible name replacement for input file 1 (base)."),QStringLiteral("alias1"))); |
| 72 |
parser.addOption(QCommandLineOption(QStringLiteral("L2"),i18n("Visible name replacement for input file 2."),QStringLiteral("alias2"))); |
| 73 |
parser.addOption(QCommandLineOption(QStringLiteral("L3"),i18n("Visible name replacement for input file 3."),QStringLiteral("alias3"))); |
| 74 |
parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("L")<<QStringLiteral("fname"),i18n("Alternative visible name replacement. Supply this once for every input."),QStringLiteral("alias"))); |
| 75 |
parser.addOption(QCommandLineOption(QStringLiteral("cs"),i18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""),QStringLiteral("string"))); |
| 76 |
parser.addOption(QCommandLineOption(QStringLiteral("confighelp"),i18n("Show list of config settings and current values."))); |
| 70 |
parser.addPositionalArgument(QStringLiteral("file1"), i18n("File1 to open (base, if not specified via --base).")); |
77 |
parser.addPositionalArgument(QStringLiteral("file1"), i18n("File1 to open (base, if not specified via --base).")); |
| 71 |
parser.addPositionalArgument(QStringLiteral("file2"), i18n("File2 to open.")); |
78 |
parser.addPositionalArgument(QStringLiteral("file2"), i18n("File2 to open.")); |
| 72 |
parser.addPositionalArgument(QStringLiteral("file3"), i18n("File3 to open (optional).")); |
79 |
parser.addPositionalArgument(QStringLiteral("file3"), i18n("File3 to open (optional).")); |
| 73 |
|
80 |
|
| 74 |
aboutData.setupCommandLine(&parser); |
|
|
| 75 |
parser.process(app); |
| 76 |
aboutData.processCommandLine(&parser); |
| 77 |
|
| 78 |
// TODO KF5 |
81 |
// TODO KF5 |
| 79 |
// options.add( "qall", ki18n("Don't solve conflicts automatically.") ); |
|
|
| 80 |
// options.add( "L1 alias1", ki18n("Visible name replacement for input file 1 (base).") ); |
| 81 |
// options.add( "L2 alias2", ki18n("Visible name replacement for input file 2.") ); |
| 82 |
// options.add( "L3 alias3", ki18n("Visible name replacement for input file 3.") ); |
| 83 |
// options.add( "L" ).add( "fname alias", ki18n("Alternative visible name replacement. Supply this once for every input.") ); |
| 84 |
// options.add( "cs string", ki18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"") ); |
| 85 |
// options.add( "confighelp", ki18n("Show list of config settings and current values.") ); |
| 86 |
// options.add( "config file", ki18n("Use a different config file.") ); |
82 |
// options.add( "config file", ki18n("Use a different config file.") ); |
| 87 |
|
83 |
|
|
|
84 |
aboutData.setupCommandLine(&parser); |
| 85 |
parser.process(app); |
| 86 |
aboutData.processCommandLine(&parser); |
| 88 |
|
87 |
|
| 89 |
KDiff3Shell *p = new KDiff3Shell(&parser); |
88 |
KDiff3Shell *p = new KDiff3Shell(&parser); |
| 90 |
p->show(); |
89 |
p->show(); |
