Make kde stuff speak in localized manner, also remove about dialogs from systray...

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 444d16e..e62c24d 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
 #ifdef HAVE_KDE
   // We need to init KCmdLineArgs first
   // TODO: build an AboutData compat class to replace our aboutDlg strings
 #ifdef HAVE_KDE
   // We need to init KCmdLineArgs first
   // TODO: build an AboutData compat class to replace our aboutDlg strings

-  KAboutData aboutData("quassel", 0, ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(),
+  KAboutData aboutData("quassel", "kdelibs4", ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(),

                         ki18n("A modern, distributed IRC client"));
   aboutData.addLicense(KAboutData::License_GPL_V2);
   aboutData.addLicense(KAboutData::License_GPL_V3);
                         ki18n("A modern, distributed IRC client"));
   aboutData.addLicense(KAboutData::License_GPL_V2);
   aboutData.addLicense(KAboutData::License_GPL_V3);

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 7aa3055..034991b 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -91,7 +91,7 @@
 MainWin::MainWin(QWidget *parent)
 #ifdef HAVE_KDE
   : KMainWindow(parent),
 MainWin::MainWin(QWidget *parent)
 #ifdef HAVE_KDE
   : KMainWindow(parent),

-  _kHelpMenu(new KHelpMenu(this)),
+  _kHelpMenu(new KHelpMenu(this, KGlobal::mainComponent().aboutData())),

 #else
   : QMainWindow(parent),
 #endif
 #else
   : QMainWindow(parent),
 #endif


@@ -486,10 +486,9 @@ void MainWin::setupSystray() {
 
   ActionCollection *coll = QtUi::actionCollection("General");
   systrayMenu = new QMenu(this);
 
   ActionCollection *coll = QtUi::actionCollection("General");
   systrayMenu = new QMenu(this);

-  systrayMenu->addAction(coll->action("AboutQuassel"));
-  systrayMenu->addSeparator();

   systrayMenu->addAction(coll->action("ConnectCore"));
   systrayMenu->addAction(coll->action("DisconnectCore"));
   systrayMenu->addAction(coll->action("ConnectCore"));
   systrayMenu->addAction(coll->action("DisconnectCore"));

+  systrayMenu->addAction(coll->action("CoreInfo"));

   systrayMenu->addSeparator();
   systrayMenu->addAction(coll->action("Quit"));
 
   systrayMenu->addSeparator();
   systrayMenu->addAction(coll->action("Quit"));