Changeset 9ad5c1d


Ignore:
Timestamp:
01/13/14 04:32:52 (7 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
e349ee8
Parents:
6f64bff5
Message:

Little styling fixes to control panel

Location:
src-qt4/pc-controlpanel
Files:
2 edited

Legend:

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

    rd2b761b r9ad5c1d  
    113113        Parrent->setLayout(layout);  
    114114        //qDebug() << "SetupGroup"; 
    115         QObject::connect(*List, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(on_itemActivated(QListWidgetItem*))); 
     115    QObject::connect(*List, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(on_itemActivated(QListWidgetItem*))); 
    116116} 
    117117 
     
    120120{ 
    121121        //qDebug() << "Running fillGroups"; 
    122         mRefreshMutex.lock(); 
    123  
    124         bool isVisible; 
    125  
    126         ui->centralWidget->setEnabled(false); 
    127         ui->statusBar->showMessage(tr("Reading items...")); 
    128         QApplication::processEvents(); 
    129  
    130         bool isSu = misWheelGroup || misOperatorGroup; 
    131         bool isSudo = misWheelGroup || misOperatorGroup; 
    132  
    133         InstalledPBIs.refresh();         
    134  
    135         isVisible = (bool)SoftwareList->read(SOFTWARE_DIR, mvEnabledDE, isSudo, isSu); 
     122    mRefreshMutex.lock(); 
     123 
     124    bool isVisible; 
     125 
     126    ui->centralWidget->setEnabled(false); 
     127    ui->statusBar->showMessage(tr("Reading items...")); 
     128    QApplication::processEvents(); 
     129 
     130    bool isSu = misWheelGroup || misOperatorGroup; 
     131    bool isSudo = misWheelGroup || misOperatorGroup; 
     132 
     133    InstalledPBIs.refresh(); 
     134 
     135    isVisible = (bool)SoftwareList->read(SOFTWARE_DIR, mvEnabledDE, isSudo, isSu); 
    136136        ui->SoftwareGBox->setVisible(isVisible); 
    137137        ui->SoftwareLine->setVisible(isVisible); 
    138138 
    139         isVisible = (bool)SystemList->read(SYSTEM_DIR, mvEnabledDE, isSudo, isSu); 
     139    isVisible = (bool)SystemList->read(SYSTEM_DIR, mvEnabledDE, isSudo, isSu); 
    140140        ui->SystemGBox->setVisible(isVisible); 
    141141        ui->SystemLine->setVisible(isVisible); 
    142142 
    143         isVisible = (bool)HardwareList->read(HARDWARE_DIR, mvEnabledDE, isSudo, isSu); 
     143    isVisible = (bool)HardwareList->read(HARDWARE_DIR, mvEnabledDE, isSudo, isSu); 
    144144        ui->HardwareGBox->setVisible(isVisible); 
    145145        ui->HardwareLine->setVisible(isVisible); 
    146146 
    147         isVisible = (bool)NetworkingList->read(NETWORKING_DIR, mvEnabledDE, isSudo, isSu); 
     147    isVisible = (bool)NetworkingList->read(NETWORKING_DIR, mvEnabledDE, isSudo, isSu); 
    148148        ui->NetworkingGBox->setVisible(isVisible); 
    149149        ui->NetworkingLine->setVisible(isVisible); 
    150150 
    151         isVisible = (bool)ToolsList->read(TOOLS_DIR, mvEnabledDE, isSudo, isSu); 
     151    isVisible = (bool)ToolsList->read(TOOLS_DIR, mvEnabledDE, isSudo, isSu); 
    152152        ui->ToolsGBox->setVisible(isVisible); 
    153153        ui->ToolsLine->setVisible(isVisible); 
    154154 
    155         isVisible = (bool)DEList->read(DE_DIR, mvEnabledDE, isSudo, isSu); 
    156         ui->DEGBox->setVisible(isVisible); 
    157         ui->DELine->setVisible(isVisible); 
    158  
    159         ui->statusBar->clearMessage(); 
    160         ui->centralWidget->setEnabled(true); 
    161  
    162         if( NetworkingList->sizeHintForRow(0) > 0 ) { 
     155    isVisible = (bool)DEList->read(DE_DIR, mvEnabledDE, isSudo, isSu); 
     156    ui->DEGBox->setVisible(isVisible); 
     157    ui->DELine->setVisible(isVisible); 
     158 
     159    ui->statusBar->clearMessage(); 
     160    ui->centralWidget->setEnabled(true); 
     161 
     162    if( NetworkingList->sizeHintForRow(0) > 0 ) { 
    163163          SystemList->setGridSize(QSize(NetworkingList->sizeHintForColumn(0), NetworkingList->sizeHintForRow(0))); 
    164164          SoftwareList->setGridSize(QSize(NetworkingList->sizeHintForColumn(0), NetworkingList->sizeHintForRow(0))); 
     
    175175          //qDebug() << NetworkingList->sizeHintForRow(0); 
    176176          //qDebug() << NetworkingList->sizeHintForColumn(0); 
    177         }  
    178  
    179         mRefreshMutex.unlock(); 
     177    } 
     178 
     179    mRefreshMutex.unlock(); 
    180180} 
    181181 
     
    199199        ui->SoftwareGBox->setVisible(isVisible); 
    200200        ui->SoftwareLine->setVisible(isVisible); 
    201                 SoftwareList->setDisplayDEName(misDisplayDEName); 
     201    SoftwareList->setDisplayDEName(misDisplayDEName); 
    202202 
    203203        isVisible = SystemList->setFilter(Text); 
    204204        ui->SystemGBox->setVisible(isVisible); 
    205205        ui->SystemLine->setVisible(isVisible); 
    206         SystemList->setDisplayDEName(misDisplayDEName); 
     206    SystemList->setDisplayDEName(misDisplayDEName); 
    207207 
    208208        isVisible = NetworkingList->setFilter(Text); 
    209209        ui->NetworkingGBox->setVisible(isVisible); 
    210210        ui->NetworkingLine->setVisible(isVisible); 
    211         NetworkingList->setDisplayDEName(misDisplayDEName); 
     211    NetworkingList->setDisplayDEName(misDisplayDEName); 
    212212 
    213213        isVisible = ToolsList->setFilter(Text); 
    214214        ui->ToolsGBox->setVisible(isVisible); 
    215215        ui->ToolsLine->setVisible(isVisible); 
    216         ToolsList->setDisplayDEName(misDisplayDEName); 
     216    ToolsList->setDisplayDEName(misDisplayDEName); 
    217217 
    218218        isVisible = HardwareList->setFilter(Text); 
    219219        ui->HardwareGBox->setVisible(isVisible); 
    220220        ui->HardwareLine->setVisible(isVisible); 
    221         HardwareList->setDisplayDEName(misDisplayDEName); 
    222  
    223         isVisible = DEList->setFilter(Text); 
    224         ui->DEGBox->setVisible(isVisible); 
    225         ui->DELine->setVisible(isVisible); 
    226         DEList->setDisplayDEName(misDisplayDEName); 
     221    HardwareList->setDisplayDEName(misDisplayDEName); 
     222 
     223    isVisible = DEList->setFilter(Text); 
     224    ui->DEGBox->setVisible(isVisible); 
     225    ui->DELine->setVisible(isVisible); 
     226    DEList->setDisplayDEName(misDisplayDEName); 
    227227 
    228228} 
  • src-qt4/pc-controlpanel/mainwnd.h

    rd2b761b r9ad5c1d  
    5858        QGroupList* ToolsList; 
    5959        QGroupList* HardwareList; 
    60         QGroupList* DEList; 
     60    QGroupList* DEList; 
    6161 
    62         QFileSystemWatcher mDirWatcher; 
     62    QFileSystemWatcher mDirWatcher; 
    6363 
    6464        void setupGroups(); 
Note: See TracChangeset for help on using the changeset viewer.