Ignore:
Timestamp:
07/11/13 12:12:29 (18 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
758e0db
Parents:
f9350275
Message:

When user selects a non-english language, we can go ahead and include KDE-L10N in the default
package set

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/installer.cpp

    ra298a29 r023bab4  
    486486     desks->programInit(listServerPkgs,selectedPkgs); 
    487487  desks->setWindowModality(Qt::ApplicationModal); 
     488  customPkgsSet = true; 
    488489  connect(desks, SIGNAL(saved(QStringList)), this, SLOT(slotSaveMetaChanges(QStringList))); 
    489490  desks->show(); 
     
    528529  if ( radioDesktop->isChecked() ) 
    529530  { 
    530       selectedPkgs << "KDE" << "KDE-Accessibility" << "KDE-Artwork" << "KDE-Education" << "KDE-Games" << "KDE-Graphics" << "KDE-Multimedia" << "KDE-Network" << "KDE-PIM"; 
     531      selectedPkgs << "KDE" << "KDE-Accessibility" << "KDE-Artwork" << "KDE-Graphics" << "KDE-Multimedia" << "KDE-Network" << "KDE-PIM"; 
    531532 
    532533      // Include i18n stuff? 
     
    576577void Installer::initDesktopSelector() 
    577578{ 
     579    // Using default pkg sets for now 
     580    customPkgsSet = false; 
    578581    connect(pushDeskCustomize,SIGNAL(clicked()), this, SLOT(slotDesktopCustomizeClicked())); 
    579582    connect(radioDesktop,SIGNAL(clicked()), this, SLOT(slotChangedMetaPkgSelection())); 
     
    626629{ 
    627630   QString tmp; 
     631 
     632   // Update package selection in case user changed language, etc 
     633   if ( installStackWidget->currentIndex() == 0 && hasPkgsOnMedia && !customPkgsSet) { 
     634     slotChangedMetaPkgSelection(); 
     635   } 
    628636 
    629637   // If no pkgs on media 
Note: See TracChangeset for help on using the changeset viewer.