Changeset d27a0c6


Ignore:
Timestamp:
08/27/13 12:16:42 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
4f9718b
Parents:
358972f (diff), e36bf91 (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:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/mainUI.cpp

    rbfe4e62 raac7789e  
    197197  if(RLIST.contains(ds) && !ds.isEmpty()){ 
    198198    ui->tool_keys->setVisible(true); 
     199    ui->tool_keys->setEnabled(true); 
    199200  }else{ 
    200201    ui->tool_keys->setVisible(false); 
  • src-qt4/pc-pkgmanager/mainWin.cpp

    r426313b r358972f  
    3939  connect(pushPkgApply, SIGNAL( clicked() ), this, SLOT( slotApplyClicked() ) ); 
    4040  connect(action_Quit, SIGNAL( triggered(bool) ), this, SLOT( slotCloseClicked() ) ); 
    41   connect(action_Basic, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) ); 
    42   connect(action_Advanced, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) ); 
    4341  connect(tool_search, SIGNAL( clicked() ), this, SLOT( slotSearchPackages() ) ); 
    4442 
     
    6462  { 
    6563     stackedPkgView->setCurrentIndex(1); 
     64     action_Basic->setChecked(false); 
     65     action_Basic->setEnabled(false); 
    6666     action_Advanced->setChecked(true); 
    67      menu_View->setEnabled(false); 
    68      menu_View->setVisible(false); 
     67     action_Advanced->setEnabled(false); 
     68  } else { 
     69    // Connect our view modes only when not running via in a chroot 
     70    connect(action_Basic, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) ); 
     71    connect(action_Advanced, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) ); 
    6972  } 
    7073 
Note: See TracChangeset for help on using the changeset viewer.