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

List:       kde-commits
Subject:    KDE/kdeaccessibility/kmouth
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2007-05-22 23:04:57
Message-ID: 1179875097.037077.3315.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 667491 by djarvie:

Use new kdelibs KLanguageButton class


 M  +0 -2      CMakeLists.txt  
 M  +4 -3      wordcompletion/creationsourcedetailsui.ui.h  
 M  +3 -3      wordcompletion/dictionarycreationwizard.cpp  
 M  +2 -1      wordcompletion/kdedocsourceui.ui.h  
 D             wordcompletion/klanguagebutton.cpp  
 D             wordcompletion/klanguagebutton.h  
 D             wordcompletion/klanguagebuttonhelper.cpp  
 D             wordcompletion/klanguagebuttonhelper.h  
 M  +4 -3      wordcompletion/wordcompletionui.ui.h  
 M  +4 -5      wordcompletion/wordcompletionwidget.cpp  


--- trunk/KDE/kdeaccessibility/kmouth/CMakeLists.txt #667490:667491
@@ -15,8 +15,6 @@
 	${CMAKE_SOURCE_DIR}/kmouth/wordcompletion/wordcompletion.cpp 
 	${CMAKE_SOURCE_DIR}/kmouth/wordcompletion/wordcompletionwidget.cpp 
 	${CMAKE_SOURCE_DIR}/kmouth/wordcompletion/dictionarycreationwizard.cpp 
-	${CMAKE_SOURCE_DIR}/kmouth/wordcompletion/klanguagebutton.cpp
-	${CMAKE_SOURCE_DIR}/kmouth/wordcompletion/klanguagebuttonhelper.cpp
 	)
         
 kde4_add_ui_files(libwordcompletion_SRCS 
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/creationsourcedetailsui.ui.h \
#667490:667491 @@ -13,8 +13,9 @@
     languageLabel->setBuddy (languageButton);
     languageButton->setWhatsThis( i18n("With this combo box you decide which \
language should be associated with the new dictionary."));  
-    loadLanguageList(languageButton);
-    languageButton->insertLanguage("??", i18n("Other"), \
QString::fromLatin1("l10n/"), QString()); +    \
languageButton->showLanguageCodes(true); +    languageButton->loadAllLanguages();
+    languageButton->insertLanguage("??", i18n("Other"));
     
    connect (languageButton, SIGNAL(activated(int)), this, \
SLOT(languageButton_activated(int)));  }
@@ -27,7 +28,7 @@
         languageButton->setCurrentItem(customLanguage);
      }
      else {
-        languageButton->insertLanguage(customLanguage, i18n("without name"), \
QString::fromLatin1("l10n/"), QString()); +        \
languageButton->insertLanguage(customLanguage, i18n("without name"));  \
languageButton->setCurrentItem(customLanguage);  }
    }
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/dictionarycreationwizard.cpp \
#667490:667491 @@ -36,9 +36,8 @@
 #include <kstandarddirs.h>
 #include <kconfig.h>
 #include <kprogressdialog.h>
+#include <klanguagebutton.h>
 #include "dictionarycreationwizard.h"
-#include "klanguagebutton.h"
-#include "klanguagebuttonhelper.h"
 #include "wordlist.h"
 
 DictionaryCreationWizard::DictionaryCreationWizard (QWidget *parent, const char \
*name, @@ -67,7 +66,8 @@
 
    kdeDocWidget= new KDEDocSourceWidget (this, "KDE documentation source page");
    addPage (kdeDocWidget, i18n("Source of New Dictionary (2)"));
-   loadLanguageList(kdeDocWidget->languageButton);
+   kdeDocWidget->languageButton->showLanguageCodes(true);
+   kdeDocWidget->languageButton->loadAllLanguages();
 
    mergeWidget = new MergeWidget (this, "merge source page", dictionaryNames, \
dictionaryFiles, dictionaryLanguages);  addPage (mergeWidget, i18n("Source of New \
                Dictionary (2)"));
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/kdedocsourceui.ui.h \
#667490:667491 @@ -12,7 +12,8 @@
     languageLabel->setBuddy (languageButton);
     languageButton->setWhatsThis( i18n("With this combo box you select which of the \
installed languages is used for creating the new dictionary. KMouth will only parse \
documentation files of this language."));  
-    loadLanguageList(languageButton);
+    languageButton->showLanguageCodes(true);
+    languageButton->loadAllLanguages();
     
     ooDictURL->setFilter ("*.dic");
 }
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/wordcompletionui.ui.h \
#667490:667491 @@ -13,8 +13,9 @@
     languageLabel->setBuddy (languageButton);
     languageButton->setWhatsThis( i18n("With this combo box you select the language \
associated with the selected dictionary."));  
-    loadLanguageList(languageButton);
-    languageButton->insertLanguage("??", i18n("Other"), \
QString::fromLatin1("l10n/"), QString()); +    \
languageButton->showLanguageCodes(true); +    languageButton->loadAllLanguages();
+    languageButton->insertLanguage("??", i18n("Other"));
     
    connect (languageButton, SIGNAL(activated(int)), this, \
SLOT(languageButton_activated(int)));  }
@@ -27,7 +28,7 @@
         languageButton->setCurrentItem(customLanguage);
      }
      else {
-        languageButton->insertLanguage(customLanguage, i18n("without name"), \
QString::fromLatin1("l10n/"), QString()); +        \
languageButton->insertLanguage(customLanguage, i18n("without name"));  \
languageButton->setCurrentItem(customLanguage);  }
    }
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/wordcompletionwidget.cpp \
#667490:667491 @@ -35,7 +35,6 @@
 #include <kio/netaccess.h>
 #include <kmessagebox.h>
 #include <klanguagebutton.h>
-#include <klanguagebuttonhelper.h>
 
 class DictionaryListItem : public K3ListViewItem {
 public:
@@ -98,7 +97,8 @@
     setObjectName(name);
     dictionaryList->setSorting (-1); // no sorted list
     
-    loadLanguageList(languageButton);
+    languageButton->showLanguageCodes(true);
+    languageButton->loadAllLanguages();
     
     // Connect the signals from hte KCMKTTSDWidget to this class
     connect (addButton, SIGNAL (clicked()), this, SLOT(addDictionary()) );
@@ -142,7 +142,7 @@
                                         config->readEntry("Name"),
                                         languageTag);
          if (!languageButton->contains(languageTag))
-            languageButton->insertLanguage(languageTag, i18n("without name"), \
QString::fromLatin1("l10n/"), QString()); +            \
languageButton->insertLanguage(languageTag, i18n("without name"));  }
 
    // Clean up disc space
@@ -206,7 +206,7 @@
       newDictionaryFiles += filename;
       QString languageTag = wizard->language();
       if (!languageButton->contains(languageTag)) {
-         languageButton->insertLanguage(languageTag, i18n("without name"), \
QString::fromLatin1("l10n/"), QString()); +         \
languageButton->insertLanguage(languageTag, i18n("without name"));  }
       K3ListViewItem *item = new DictionaryListItem (dictionaryList,
                       filename, wizard->name(), languageTag);
@@ -297,7 +297,6 @@
       languageButton->setEnabled(false);
 
       dictionaryName->setText("");
-      languageButton->setText("");
    }
 }
 


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