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

List:       kde-commits
Subject:    kdesupport/kdewin-installer/gui
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2010-04-02 16:51:40
Message-ID: 20100402165140.5D199AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1110273 by habacker:

Since kde 4.4 kde-l10n is renamed to kde4-l10n, fixed end user package selector page. 

 M  +19 -12    enduserpackageselectorpage.cpp  
 M  +2 -0      enduserpackageselectorpage.h  


--- trunk/kdesupport/kdewin-installer/gui/enduserpackageselectorpage.cpp #1110272:1110273
@@ -61,6 +61,24 @@
         setSubTitle(statusTip());
 }
 
+bool EndUserPackageSelectorPage::includePackage(const QString &name, PackageDisplayType displayType)
+{
+    if (displayType == Language && !name.contains("-l10n") )
+        return false;
+    else if (displayType == Spelling && !name.contains("aspell"))
+        return false;
+    else if (displayType == Application 
+            && ( name.contains("aspell") 
+                || name.contains("-l10n") 
+                || name.contains("lib") 
+                || name.contains("runtime")
+                ) 
+            )
+        return false;
+    else 
+        return true;
+}
+
 void EndUserPackageSelectorPage::setWidgetData()
 {
     QTreeWidget *tree = ui.packageList;
@@ -171,19 +189,8 @@
     
     Q_FOREACH(Package *availablePackage,packageList.values())
     {
-        QString name = availablePackage->name();
-        if (m_displayType == Language && !name.contains("kde-l10n"))
+        if (!includePackage(availablePackage->name(),m_displayType))
             continue;
-        else if (m_displayType == Spelling && !name.contains("aspell"))
-            continue;
-        else if (m_displayType == Application 
-                && ( name.contains("aspell") 
-                    || name.contains("kde-l10n") 
-                    || name.contains("lib") 
-                    || name.contains("runtime")
-                    ) 
-                )
-            continue;
         if(availablePackage->hasType(Package::BIN)) {
             QTreeWidgetItem *item = addPackageToTree(availablePackage, 0);
             if (item)
--- trunk/kdesupport/kdewin-installer/gui/enduserpackageselectorpage.h #1110272:1110273
@@ -47,7 +47,9 @@
     void setPackageDisplayType(PackageDisplayType type);
     void preSelectPackages(const QString &package);
     QTreeWidgetItem *addPackageToTree(Package *package, QTreeWidgetItem *parent);
+    bool includePackage(const QString &name, PackageDisplayType displayType);
 
+
 protected slots:
     void itemClicked(QTreeWidgetItem *item, int column);
     void selectAllClicked();
[prev in list] [next in list] [prev in thread] [next in thread]