mirror of
https://github.com/KDE/konsole.git
synced 2026-06-12 07:55:07 -04:00
Port to KF5/Qt5
TerminalDisplayAccessible is disabled for Qt5 currently since I don't have any experience with accessible stuff and it is more complicated than just changing a few includes REVIEW: 111937
This commit is contained in:
15
src/main.cpp
15
src/main.cpp
@@ -25,16 +25,18 @@
|
||||
#include <kde_file.h>
|
||||
|
||||
// KDE
|
||||
#include <KAboutData>
|
||||
#include <k4aboutdata.h>
|
||||
#include <KCmdLineArgs>
|
||||
#include <KLocale>
|
||||
|
||||
|
||||
|
||||
#define KONSOLE_VERSION "2.11.999"
|
||||
|
||||
using Konsole::Application;
|
||||
|
||||
// fill the KAboutData structure with information about contributors to Konsole.
|
||||
void fillAboutData(KAboutData& aboutData);
|
||||
void fillAboutData(K4AboutData& aboutData);
|
||||
|
||||
// fill the KCmdLineOptions object with konsole specific options.
|
||||
void fillCommandLineOptions(KCmdLineOptions& options);
|
||||
@@ -51,12 +53,12 @@ void restoreSession(Application& app);
|
||||
// ***
|
||||
extern "C" int KDE_EXPORT kdemain(int argc, char** argv)
|
||||
{
|
||||
KAboutData about("konsole",
|
||||
K4AboutData about("konsole",
|
||||
0,
|
||||
ki18nc("@title", "<application>Konsole</application>"),
|
||||
KONSOLE_VERSION,
|
||||
ki18nc("@title", "Terminal emulator"),
|
||||
KAboutData::License_GPL_V2
|
||||
K4AboutData::License_GPL_V2
|
||||
);
|
||||
fillAboutData(about);
|
||||
|
||||
@@ -79,8 +81,11 @@ extern "C" int KDE_EXPORT kdemain(int argc, char** argv)
|
||||
|
||||
Application app;
|
||||
|
||||
#if 0
|
||||
// make sure the d&d popup menu provided by libkonq get translated.
|
||||
KGlobal::locale()->insertCatalog("libkonq");
|
||||
#endif
|
||||
#pragma message("TODO: Port this to the right insertCatalog() replacement.")
|
||||
|
||||
restoreSession(app);
|
||||
return app.exec();
|
||||
@@ -192,7 +197,7 @@ void fillCommandLineOptions(KCmdLineOptions& options)
|
||||
" with the -e option)."));
|
||||
}
|
||||
|
||||
void fillAboutData(KAboutData& aboutData)
|
||||
void fillAboutData(K4AboutData& aboutData)
|
||||
{
|
||||
aboutData.setProgramIconName("utilities-terminal");
|
||||
aboutData.setHomepage("http://konsole.kde.org");
|
||||
|
||||
Reference in New Issue
Block a user