Changeset bac293d


Ignore:
Timestamp:
12/05/13 11:28:26 (21 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2
Children:
4f9718b, 0165a31
Parents:
bdb9007
Message:

Fix a bug in PCDM where the newly sorted desktop sessions had their icons scrambled.

Location:
src-qt4/PCDM/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/loginWidget.cpp

    r72c9698 rbac293d  
    266266  if((text.length() != icon.length()) && (text.length() != info.length()) ){ qDebug() << "LoginWidget: Unequal text/icon desktop lists"; return; } 
    267267  listDE->clear(); 
     268  desktopIcons.clear(); desktopInfo.clear(); 
    268269  desktopIcons = icon; //save for later 
    269270  desktopInfo = info; //save for later 
  • src-qt4/PCDM/src/pcdm-gui.cpp

    r8877013 rbac293d  
    501501        if( deIcon.isEmpty() ){ deIcon = currentTheme->itemIcon("desktop"); } //set the default icon if none given 
    502502        if( !QFile::exists(deIcon) ){ deIcon = ":/images/desktop.png"; } 
    503       QString entry = deList[i] +";;;"+deIcon+";;;"+Backend::getDesktopComment(deList[i]); 
     503      QString entry = deList[i] +":::"+deIcon+":::"+Backend::getDesktopComment(deList[i]); 
    504504      DEL << entry; 
    505505      if(lastDE.isEmpty()){ lastDE = deList[i]; } //grab the highest-priority DE if empty 
     
    511511      for(int i=0; i<DEL.length(); i++){ 
    512512        //Now add the item 
    513         deSwitcher->addItem( DEL[i].section(";;;",0,0), DEL[i].section(";;;",1,1), DEL[i].section(";;;",2,2) ); 
     513        deSwitcher->addItem( DEL[i].section(":::",0,0), DEL[i].section(":::",1,1), DEL[i].section(":::",2,2) ); 
    514514      } 
    515515      //Set the switcher to the last used desktop environment 
     
    520520      QStringList deNames, deIcons, deInfo; 
    521521      for(int i=0; i<DEL.length(); i++){ 
    522         deNames << DEL[i].section(";;;",0,0); 
    523         deIcons << DEL[i].section(";;;",1,1); 
    524         deInfo << DEL[i].section(";;;",2,2); 
     522        deNames << DEL[i].section(":::",0,0); 
     523        deIcons << DEL[i].section(":::",1,1); 
     524        deInfo << DEL[i].section(":::",2,2); 
    525525      } 
    526       loginW->setDesktops(deList, deIcons, deInfo); 
     526      loginW->setDesktops(deNames, deIcons, deInfo); 
    527527      //Set the switcher to the last used desktop environment 
    528528      loginW->setCurrentDE(lastDE); 
Note: See TracChangeset for help on using the changeset viewer.