Ignore:
Timestamp:
02/12/14 02:28:55 (7 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
1c61936
Parents:
dec6f67
Message:

Reworked pc controlpanel for using libpcbsd-utils for DE detection

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-controlpanel/mainwnd.cpp

    re845994 rffbf59c  
    6363    { 
    6464        mCurrentDE = *InstalledDEList.active(); 
    65         mvEnabledDE.push_back(mCurrentDE.mName); 
    66         qDebug() << "Current DE: " << mCurrentDE.mName; 
     65        mvEnabledDE.push_back(mCurrentDE.Name); 
    6766    }     
    6867 
     
    238237{ 
    239238        fillGroups(); 
     239    //InstalledDEList.active()-> 
    240240        on_lineEdit_textChanged(ui->lineEdit->text()); 
    241241} 
     
    263263    {\ 
    264264        ui->action_name->setVisible(true);\ 
    265         if (InstalledDEList.byName(DEName)->misActive){\ 
     265        if (InstalledDEList.byName(DEName)->isActive){\ 
    266266            ui->action_name->setText(QString(DEName) + Current);\ 
    267267            ui->DEChooserButton->setIcon(ui->action_name->icon());}\ 
     
    270270        }else{ui->action_name->setVisible(false);} 
    271271 
    272 SETUP_ACTION( actionKDE, "KDE" ); 
    273 SETUP_ACTION( actionGnome, "Gnome" ); 
    274 SETUP_ACTION( actionXFCE, "XFCE" ); 
    275 SETUP_ACTION( actionLXDE, "LXDE" ); 
    276 SETUP_ACTION( actionEnlightenment, "Enlightenment" ); 
    277 SETUP_ACTION( actionMate, "Mate" ); 
    278 SETUP_ACTION( actionCinnamon, "Cinnamon" ); 
     272    SETUP_ACTION( actionKDE, "KDE" ); 
     273    SETUP_ACTION( actionGnome, "Gnome" ); 
     274    SETUP_ACTION( actionXFCE, "XFCE" ); 
     275    SETUP_ACTION( actionLXDE, "LXDE" ); 
     276    SETUP_ACTION( actionEnlightenment, "Enlightenment" ); 
     277    SETUP_ACTION( actionMate, "Mate" ); 
     278    SETUP_ACTION( actionCinnamon, "Cinnamon" ); 
    279279 
    280280#undef SETUP_ACTION 
     
    303303    for (int i=0; i<InstalledDEList.size(); i++) 
    304304    { 
    305         mvEnabledDE.push_back(InstalledDEList[i].mName); 
     305        mvEnabledDE.push_back(InstalledDEList[i].Name); 
    306306    } 
    307307 
     
    318318{ 
    319319    ui->DEChooserButton->setIcon(ui->actionKDE->icon()); 
    320     if (mCurrentDE.mName.trimmed().compare("KDE", Qt::CaseInsensitive)) 
     320    if (mCurrentDE.Name.trimmed().compare("KDE", Qt::CaseInsensitive)) 
    321321        ui->DEGBox->setTitle(DETEXT + " " + tr ("(KDE)")); 
    322322    else 
     
    336336{ 
    337337    ui->DEChooserButton->setIcon(ui->actionLXDE->icon()); 
    338     if (mCurrentDE.mName.trimmed().compare("LXDE", Qt::CaseInsensitive)) 
     338    if (mCurrentDE.Name.trimmed().compare("LXDE", Qt::CaseInsensitive)) 
    339339        ui->DEGBox->setTitle(DETEXT + " " + tr ("(LXDE)")); 
    340340    else 
     
    354354{ 
    355355    ui->DEChooserButton->setIcon(ui->actionGnome->icon()); 
    356     if (mCurrentDE.mName.trimmed().compare("gnome", Qt::CaseInsensitive)) 
     356    if (mCurrentDE.Name.trimmed().compare("gnome", Qt::CaseInsensitive)) 
    357357        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Gnome)")); 
    358358    else 
     
    372372{ 
    373373    ui->DEChooserButton->setIcon(ui->actionEnlightenment->icon()); 
    374     if (mCurrentDE.mName.trimmed().compare("Enlightenment", Qt::CaseInsensitive)) 
     374    if (mCurrentDE.Name.trimmed().compare("Enlightenment", Qt::CaseInsensitive)) 
    375375        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Enlightenment)")); 
    376376    else 
     
    391391{ 
    392392    ui->DEChooserButton->setIcon(ui->actionMate->icon()); 
    393     if (mCurrentDE.mName.trimmed().compare("Mate", Qt::CaseInsensitive)) 
     393    if (mCurrentDE.Name.trimmed().compare("Mate", Qt::CaseInsensitive)) 
    394394        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Mate)")); 
    395395    else 
     
    409409{ 
    410410    ui->DEChooserButton->setIcon(ui->actionCinnamon->icon()); 
    411     if (mCurrentDE.mName.trimmed().compare("Cinnamon", Qt::CaseInsensitive)) 
     411    if (mCurrentDE.Name.trimmed().compare("Cinnamon", Qt::CaseInsensitive)) 
    412412        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Cinnamon)")); 
    413413    else 
     
    427427{ 
    428428    ui->DEChooserButton->setIcon(ui->actionXFCE->icon()); 
    429     if (mCurrentDE.mName.trimmed().compare("XFCE", Qt::CaseInsensitive)) 
     429    if (mCurrentDE.Name.trimmed().compare("XFCE", Qt::CaseInsensitive)) 
    430430        ui->DEGBox->setTitle(DETEXT + " " + tr ("(XFCE)")); 
    431431    else 
Note: See TracChangeset for help on using the changeset viewer.