mirror of
https://github.com/KDE/konsole.git
synced 2026-05-09 07:03:56 -04:00
Apply astyle-kdelibs
Over the years, the coding style is all over the place. Use 'git diff -w --ignore-all-space' to see non-whitespace changes.
This commit is contained in:
Kurt Hindenburg
184
src/main.cpp
184
src/main.cpp
@@ -52,17 +52,17 @@ void restoreSession(Application& app);
|
||||
// ***
|
||||
// Entry point into the Konsole terminal application.
|
||||
// ***
|
||||
extern "C" int KDE_EXPORT kdemain(int argc,char** argv)
|
||||
extern "C" int KDE_EXPORT kdemain(int argc, char** argv)
|
||||
{
|
||||
KAboutData about( "konsole", 0,
|
||||
ki18n("Konsole"),
|
||||
KONSOLE_VERSION,
|
||||
ki18n("Terminal emulator"),
|
||||
KAboutData::License_GPL_V2
|
||||
KAboutData about("konsole", 0,
|
||||
ki18n("Konsole"),
|
||||
KONSOLE_VERSION,
|
||||
ki18n("Terminal emulator"),
|
||||
KAboutData::License_GPL_V2
|
||||
);
|
||||
fillAboutData(about);
|
||||
|
||||
KCmdLineArgs::init(argc,argv,&about);
|
||||
KCmdLineArgs::init(argc, argv, &about);
|
||||
KCmdLineOptions options;
|
||||
fillCommandLineOptions(options);
|
||||
KCmdLineArgs::addCmdLineOptions(options);
|
||||
@@ -74,8 +74,7 @@ extern "C" int KDE_EXPORT kdemain(int argc,char** argv)
|
||||
|
||||
// create a new application instance if there are no running Konsole instances,
|
||||
// otherwise inform the existing Konsole process and exit
|
||||
if ( !KUniqueApplication::start(startFlags) )
|
||||
{
|
||||
if (!KUniqueApplication::start(startFlags)) {
|
||||
exit(0);
|
||||
}
|
||||
|
||||
@@ -103,104 +102,103 @@ void fillCommandLineOptions(KCmdLineOptions& options)
|
||||
options.add("list-profiles", ki18n("List the available profiles"));
|
||||
// TODO - Update this when F12 is no longer hard coded
|
||||
options.add("background-mode", ki18n("Start Konsole in the background"
|
||||
" and bring to the front when the F12"
|
||||
" key is pressed"));
|
||||
options.add("new-tab",ki18n("Create a new tab in an existing window rather than creating a new window"));
|
||||
" and bring to the front when the F12"
|
||||
" key is pressed"));
|
||||
options.add("new-tab", ki18n("Create a new tab in an existing window rather than creating a new window"));
|
||||
options.add("tabs-from-file <file>", ki18n("Create tabs as specified in given tabs configuration file"));
|
||||
options.add("workdir <dir>", ki18n("Set the initial working directory of the new tab "
|
||||
"or window to 'dir'"));
|
||||
options.add("notransparency",ki18n("Disable transparent backgrounds, even if the system supports them."));
|
||||
options.add("force-transparency",ki18n("Try to enable transparency, even if the system does not appear to support it."));
|
||||
"or window to 'dir'"));
|
||||
options.add("notransparency", ki18n("Disable transparent backgrounds, even if the system supports them."));
|
||||
options.add("force-transparency", ki18n("Try to enable transparency, even if the system does not appear to support it."));
|
||||
options.add("hold");
|
||||
options.add("noclose",ki18n("Do not close the initial session automatically when it ends."));
|
||||
options.add("noclose", ki18n("Do not close the initial session automatically when it ends."));
|
||||
// TODO - Document this option more clearly
|
||||
options.add("p <property=value>",ki18n("Change the value of a profile property."));
|
||||
options.add("p <property=value>", ki18n("Change the value of a profile property."));
|
||||
options.add("list-profile-properties", ki18n("List all the profile properties names and their type (for use with -p)"));
|
||||
options.add("!e <cmd>",ki18n("Command to execute"));
|
||||
options.add("+[args]",ki18n("Arguments passed to command"));
|
||||
options.add("!e <cmd>", ki18n("Command to execute"));
|
||||
options.add("+[args]", ki18n("Arguments passed to command"));
|
||||
options.add("", ki18n("Use --nofork to run in the foreground (helpful with the -e option)."));
|
||||
}
|
||||
|
||||
void fillAboutData(KAboutData& aboutData)
|
||||
{
|
||||
aboutData.addAuthor(ki18n("Kurt Hindenburg"),
|
||||
ki18n("General maintainer, bug fixes and general improvements"),
|
||||
"kurt.hindenburg@gmail.com");
|
||||
aboutData.addAuthor(ki18n("Robert Knight"),
|
||||
ki18n("Previous maintainer, ported to KDE4"),
|
||||
"robertknight@gmail.com");
|
||||
aboutData.addAuthor(ki18n("Lars Doelle"),
|
||||
ki18n("Original author"),
|
||||
"lars.doelle@on-line.de");
|
||||
aboutData.addCredit(ki18n("Jekyll Wu"),
|
||||
ki18n("Bug fixes and general improvements"),
|
||||
"adaptee@gmail.com");
|
||||
aboutData.addCredit(ki18n("Waldo Bastian"),
|
||||
ki18n("Bug fixes and general improvements"),
|
||||
"bastian@kde.org");
|
||||
aboutData.addCredit(ki18n("Stephan Binner"),
|
||||
ki18n("Bug fixes and general improvements"),
|
||||
"binner@kde.org");
|
||||
aboutData.addCredit(ki18n("Thomas Dreibholz"),
|
||||
ki18n("General improvements"),
|
||||
"dreibh@iem.uni-due.de");
|
||||
aboutData.addCredit(ki18n("Chris Machemer"),
|
||||
ki18n("Bug fixes"),
|
||||
"machey@ceinetworks.com");
|
||||
aboutData.addCredit(ki18n("Stephan Kulow"),
|
||||
ki18n("Solaris support and history"),
|
||||
"coolo@kde.org");
|
||||
aboutData.addCredit(ki18n("Alexander Neundorf"),
|
||||
ki18n("Bug fixes and improved startup performance"),
|
||||
"neundorf@kde.org");
|
||||
aboutData.addCredit(ki18n("Peter Silva"),
|
||||
ki18n("Marking improvements"),
|
||||
"Peter.A.Silva@gmail.com");
|
||||
aboutData.addCredit(ki18n("Lotzi Boloni"),
|
||||
ki18n("Embedded Konsole\n"
|
||||
"Toolbar and session names"),
|
||||
"boloni@cs.purdue.edu");
|
||||
aboutData.addCredit(ki18n("David Faure"),
|
||||
ki18n("Embedded Konsole\n"
|
||||
"General improvements"),
|
||||
"faure@kde.org");
|
||||
aboutData.addCredit(ki18n("Antonio Larrosa"),
|
||||
ki18n("Visual effects"),
|
||||
"larrosa@kde.org");
|
||||
aboutData.addCredit(ki18n("Matthias Ettrich"),
|
||||
ki18n("Code from the kvt project\n"
|
||||
"General improvements"),
|
||||
"ettrich@kde.org");
|
||||
aboutData.addCredit(ki18n("Warwick Allison"),
|
||||
ki18n("Schema and text selection improvements"),
|
||||
"warwick@troll.no");
|
||||
aboutData.addCredit(ki18n("Dan Pilone"),
|
||||
ki18n("SGI port"),
|
||||
"pilone@slac.com");
|
||||
aboutData.addCredit(ki18n("Kevin Street"),
|
||||
ki18n("FreeBSD port"),
|
||||
"street@iname.com");
|
||||
aboutData.addCredit(ki18n("Sven Fischer"),
|
||||
ki18n("Bug fixes"),
|
||||
"herpes@kawo2.renditionwth-aachen.de");
|
||||
aboutData.addCredit(ki18n("Dale M. Flaven"),
|
||||
ki18n("Bug fixes"),
|
||||
"dflaven@netport.com");
|
||||
aboutData.addCredit(ki18n("Martin Jones"),
|
||||
ki18n("Bug fixes"),
|
||||
"mjones@powerup.com.au");
|
||||
aboutData.addCredit(ki18n("Lars Knoll"),
|
||||
ki18n("Bug fixes"),
|
||||
"knoll@mpi-hd.mpg.de");
|
||||
aboutData.addCredit(ki18n("Thanks to many others.\n"));
|
||||
aboutData.setProgramIconName("utilities-terminal");
|
||||
aboutData.setHomepage("http://konsole.kde.org");
|
||||
aboutData.addAuthor(ki18n("Kurt Hindenburg"),
|
||||
ki18n("General maintainer, bug fixes and general improvements"),
|
||||
"kurt.hindenburg@gmail.com");
|
||||
aboutData.addAuthor(ki18n("Robert Knight"),
|
||||
ki18n("Previous maintainer, ported to KDE4"),
|
||||
"robertknight@gmail.com");
|
||||
aboutData.addAuthor(ki18n("Lars Doelle"),
|
||||
ki18n("Original author"),
|
||||
"lars.doelle@on-line.de");
|
||||
aboutData.addCredit(ki18n("Jekyll Wu"),
|
||||
ki18n("Bug fixes and general improvements"),
|
||||
"adaptee@gmail.com");
|
||||
aboutData.addCredit(ki18n("Waldo Bastian"),
|
||||
ki18n("Bug fixes and general improvements"),
|
||||
"bastian@kde.org");
|
||||
aboutData.addCredit(ki18n("Stephan Binner"),
|
||||
ki18n("Bug fixes and general improvements"),
|
||||
"binner@kde.org");
|
||||
aboutData.addCredit(ki18n("Thomas Dreibholz"),
|
||||
ki18n("General improvements"),
|
||||
"dreibh@iem.uni-due.de");
|
||||
aboutData.addCredit(ki18n("Chris Machemer"),
|
||||
ki18n("Bug fixes"),
|
||||
"machey@ceinetworks.com");
|
||||
aboutData.addCredit(ki18n("Stephan Kulow"),
|
||||
ki18n("Solaris support and history"),
|
||||
"coolo@kde.org");
|
||||
aboutData.addCredit(ki18n("Alexander Neundorf"),
|
||||
ki18n("Bug fixes and improved startup performance"),
|
||||
"neundorf@kde.org");
|
||||
aboutData.addCredit(ki18n("Peter Silva"),
|
||||
ki18n("Marking improvements"),
|
||||
"Peter.A.Silva@gmail.com");
|
||||
aboutData.addCredit(ki18n("Lotzi Boloni"),
|
||||
ki18n("Embedded Konsole\n"
|
||||
"Toolbar and session names"),
|
||||
"boloni@cs.purdue.edu");
|
||||
aboutData.addCredit(ki18n("David Faure"),
|
||||
ki18n("Embedded Konsole\n"
|
||||
"General improvements"),
|
||||
"faure@kde.org");
|
||||
aboutData.addCredit(ki18n("Antonio Larrosa"),
|
||||
ki18n("Visual effects"),
|
||||
"larrosa@kde.org");
|
||||
aboutData.addCredit(ki18n("Matthias Ettrich"),
|
||||
ki18n("Code from the kvt project\n"
|
||||
"General improvements"),
|
||||
"ettrich@kde.org");
|
||||
aboutData.addCredit(ki18n("Warwick Allison"),
|
||||
ki18n("Schema and text selection improvements"),
|
||||
"warwick@troll.no");
|
||||
aboutData.addCredit(ki18n("Dan Pilone"),
|
||||
ki18n("SGI port"),
|
||||
"pilone@slac.com");
|
||||
aboutData.addCredit(ki18n("Kevin Street"),
|
||||
ki18n("FreeBSD port"),
|
||||
"street@iname.com");
|
||||
aboutData.addCredit(ki18n("Sven Fischer"),
|
||||
ki18n("Bug fixes"),
|
||||
"herpes@kawo2.renditionwth-aachen.de");
|
||||
aboutData.addCredit(ki18n("Dale M. Flaven"),
|
||||
ki18n("Bug fixes"),
|
||||
"dflaven@netport.com");
|
||||
aboutData.addCredit(ki18n("Martin Jones"),
|
||||
ki18n("Bug fixes"),
|
||||
"mjones@powerup.com.au");
|
||||
aboutData.addCredit(ki18n("Lars Knoll"),
|
||||
ki18n("Bug fixes"),
|
||||
"knoll@mpi-hd.mpg.de");
|
||||
aboutData.addCredit(ki18n("Thanks to many others.\n"));
|
||||
aboutData.setProgramIconName("utilities-terminal");
|
||||
aboutData.setHomepage("http://konsole.kde.org");
|
||||
}
|
||||
|
||||
void restoreSession(Application& app)
|
||||
{
|
||||
if (app.isSessionRestored())
|
||||
{
|
||||
if (app.isSessionRestored()) {
|
||||
int n = 1;
|
||||
while (KMainWindow::canBeRestored(n))
|
||||
app.newMainWindow()->restore(n++);
|
||||
|
||||
Reference in New Issue
Block a user