Changeset ac5b620


Ignore:
Timestamp:
08/22/13 11:55:51 (14 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
4f9718b
Parents:
dee1bcb (diff), e55b4d0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Location:
src-qt4
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-pkgmanager/mainWin.cpp

    ra96d2c0 re55b4d0  
    3535  connect(pushUpdatePkgs, SIGNAL(clicked()), this, SLOT(slotUpdatePkgsClicked())); 
    3636  connect(pushClose, SIGNAL(clicked()), this, SLOT(slotCloseClicked())); 
     37  connect(pushCloseAdv, SIGNAL(clicked()), this, SLOT(slotCloseAdvClicked())); 
    3738  connect(buttonRescanPkgs, SIGNAL(clicked()), this, SLOT(slotRescanPkgsClicked())); 
    3839  connect(pushPkgApply, SIGNAL( clicked() ), this, SLOT( slotApplyClicked() ) ); 
     
    14221423        return line.simplified(); 
    14231424} 
     1425 
     1426void mainWin::slotCloseAdvClicked() 
     1427{ 
     1428   groupInfo->setVisible(false); 
     1429} 
  • src-qt4/pc-pkgmanager/mainWin.h

    rf3f036a re55b4d0  
    6464 
    6565    // NG Packages 
     66    void slotCloseAdvClicked(); 
    6667    void slotGetNGPackageDataOutput(); 
    6768    void slotFinishLoadingNGPkgs(); 
  • src-qt4/pc-pkgmanager/mainWin.ui

    r2e7bf77 re55b4d0  
    88    <y>0</y> 
    99    <width>800</width> 
    10     <height>641</height> 
     10    <height>644</height> 
    1111   </rect> 
    1212  </property> 
     
    9696                     </property> 
    9797                     <layout class="QGridLayout" name="gridLayout_6"> 
    98                       <item row="0" column="0" rowspan="3"> 
     98                      <item row="0" column="0"> 
     99                       <layout class="QHBoxLayout" name="horizontalLayout_2"> 
     100                        <item> 
     101                         <spacer name="horizontalSpacer"> 
     102                          <property name="orientation"> 
     103                           <enum>Qt::Horizontal</enum> 
     104                          </property> 
     105                          <property name="sizeHint" stdset="0"> 
     106                           <size> 
     107                            <width>40</width> 
     108                            <height>20</height> 
     109                           </size> 
     110                          </property> 
     111                         </spacer> 
     112                        </item> 
     113                        <item> 
     114                         <widget class="QPushButton" name="pushCloseAdv"> 
     115                          <property name="text"> 
     116                           <string/> 
     117                          </property> 
     118                          <property name="icon"> 
     119                           <iconset resource="pc-pkgmanager.qrc"> 
     120                            <normaloff>:/window-close.png</normaloff>:/window-close.png</iconset> 
     121                          </property> 
     122                          <property name="flat"> 
     123                           <bool>true</bool> 
     124                          </property> 
     125                         </widget> 
     126                        </item> 
     127                       </layout> 
     128                      </item> 
     129                      <item row="1" column="0"> 
    99130                       <widget class="QTabWidget" name="tabWidget"> 
    100131                        <property name="currentIndex"> 
     
    162193                        <widget class="QWidget" name="tab"> 
    163194                         <attribute name="title"> 
    164                           <string>Dependances</string> 
     195                          <string>Dependencies</string> 
    165196                         </attribute> 
    166197                         <layout class="QGridLayout" name="gridLayout_13"> 
     
    429460     <y>0</y> 
    430461     <width>800</width> 
    431      <height>20</height> 
     462     <height>22</height> 
    432463    </rect> 
    433464   </property> 
  • src-qt4/pc-softwaremanager/pbiBackend.h

    re46485b rdee1bcb  
    9999        ProcessManager *PMAN; 
    100100        QString cDownload, cInstall, cRemove, cUpdate, cDownloadFile, cOther; //currently running command/pbi 
    101         bool sDownload, sInstall, sRemove, sUpdate; //flag that these processes were Stopped 
     101        bool sDownload, sInstall, sRemove, sUpdate,; //flag that these processes were Stopped 
    102102        QStringList PENDINGDL, PENDINGINSTALL, PENDINGREMOVAL, PENDINGUPDATE, PENDINGOTHER; 
    103103        QString lDownload, lInstall, lRemove, lUpdate; //latest string output from process 
  • src-qt4/pc-softwaremanager/processManager.cpp

    r80faf74 rdee1bcb  
    233233 
    234234void ProcessManager::slotRemProcFinished(){ 
    235   if(remProc->exitStatus() != QProcess::NormalExit){ 
     235  if(remProc->exitStatus() != QProcess::NormalExit || remProc->exitCode() != 0){ 
    236236    qDebug() << "Removal Process Error Log:\n"<<remLog.join("\n"); 
    237237    emit ProcessError(REMOVE, remLog); 
     
    261261 
    262262void ProcessManager::slotDlProcFinished(){ 
    263   if(dlProc->exitStatus() != QProcess::NormalExit){ 
     263  if(dlProc->exitStatus() != QProcess::NormalExit || dlProc->exitCode() != 0){ 
    264264    qDebug() << "Download Process Error Log:\n"<<dlLog.join("\n"); 
    265265    emit ProcessError(DOWNLOAD, dlLog); 
     
    282282 
    283283void ProcessManager::slotInProcFinished(){ 
    284   if(inProc->exitStatus() != QProcess::NormalExit){ 
     284  if(inProc->exitStatus() != QProcess::NormalExit || inProc->exitCode() != 0){ 
    285285    qDebug() << "Install Process Error Log:\n"<<inLog.join("\n"); 
    286286    emit ProcessError(INSTALL, inLog); 
     
    298298 
    299299void ProcessManager::slotOtProcFinished(){ 
    300   if(otProc->exitStatus() != QProcess::NormalExit){ 
     300  if(otProc->exitStatus() != QProcess::NormalExit || otProc->exitCode() != 0){ 
    301301    QString msg = otProc->readAllStandardError(); 
    302302    if(msg.isEmpty()){ msg = otProc->readAllStandardOutput(); } 
Note: See TracChangeset for help on using the changeset viewer.