[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeaccessibility/kmouth
From:       Jeremy Paul Whiting <jeremy () scitools ! com>
Date:       2009-05-06 23:10:24
Message-ID: 1241651424.231429.9990.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 964600 by whiting:

fix bug where triggering a phrasebook action does nothing (slotActivated is old...)

 M  +0 -1      kmouth.cpp  
 M  +4 -4      main.cpp  
 M  +2 -1      phrasebook/phrasebook.h  
 M  +5 -6      wordcompletion/wordcompletionwidget.cpp  


--- trunk/KDE/kdeaccessibility/kmouth/kmouth.cpp #964599:964600
@@ -306,7 +306,6 @@
   viewStatusBar->setChecked(bViewStatusbar);
   slotViewStatusBar();
 
-
   // bar position settings
   // FIXME:
   // KToolBar::BarPosition toolBarPos;
--- trunk/KDE/kdeaccessibility/kmouth/main.cpp #964599:964600
@@ -59,11 +59,11 @@
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
-		if (args->count())
-		{
+    if (args->count())
+    {
         kmouth->openDocumentFile(args->url(0));
-		}
-		args->clear();
+    }
+    args->clear();
   }
   return app.exec();
 }
--- trunk/KDE/kdeaccessibility/kmouth/phrasebook/phrasebook.h #964599:964600
@@ -180,6 +180,7 @@
    : KAction (KIcon("phrase"), phrase, parent) {
       this->setShortcut(cut);
       this->phrase = phrase;
+      connect (this, SIGNAL(triggered()), this, SLOT(slotTriggered()));
       connect (this, SIGNAL(slotActivated (const QString &)), receiver, slot);
       parent->addAction(phrase, this);
    }
@@ -188,7 +189,7 @@
 
 public slots:
    void slotTriggered () {
-      trigger();
+//      trigger();
       emit slotActivated (phrase);
    }
 
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/wordcompletionwidget.cpp #964599:964600
@@ -69,12 +69,11 @@
    }
 
    void setLanguage (QString languageCode) {
-      QString filename = KGlobal::dirs()->findResource("locale",
-			languageCode + QString::fromLatin1("/entry.desktop"));
-
-      KConfig entry(filename, KConfig::SimpleConfig);
-	  KConfigGroup cg (&entry, "KCM Locale");
-      QString name = cg.readEntry(QString::fromLatin1("Name"), i18n("without name"));
+      QString name = KGlobal::locale()->languageCodeToName(languageCode);
+      if (name.isEmpty())
+      {
+          name = i18n("without name");
+      }
       setLanguage (name + " (" + languageCode + ')', languageCode);
    }
 
[prev in list] [next in list] [prev in thread] [next in thread]