Changeset 5592dc3


Ignore:
Timestamp:
02/23/15 10:58:54 (3 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.1.2
Children:
9a66c62, 40f05b3
Parents:
ef7d3efc (diff), 0456df4 (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

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/port-make.conf

    rac0f039 r85bc29f  
    1212WITH_GALLIUM=YES 
    1313 
    14 # Build ports against the ported openssl version 
     14# Build ports against security/libressl 
    1515WITH_OPENSSL_PORT=      yes 
    16 # For now don't try libressl, still way too many broken things 
    17 #OPENSSL_PORT=          security/libressl 
     16OPENSSL_PORT=           security/libressl 
    1817 
    1918#Openoffice Language Options 
  • src-sh/pcbsd-utils/pc-sysinstall/backend/functions-installpackages.sh

    rea12c5c r89a97f9  
    104104    then 
    105105      echo_log "Installing package: ${PKGNAME}" 
    106       run_chroot_cmd "$PKGADD" | tee -a ${LOGOUT} 
     106      run_chroot_cmd "$PKGADD" 2>&1 | tee -a ${LOGOUT} 
     107      if [ $? -ne 0 ] ; then 
     108        exit_err "Failed installing: $PKGADD" 
     109      fi 
    107110      run_chroot_cmd "rm -rf /usr/local/tmp/All" 
     111      if ! run_chroot_cmd "${PKGINFO} -e ${PKGNAME}" >/dev/null 2>/dev/null 
     112      then 
     113        echo_log "WARNING: PKGNG reported 0, but pkg: ${PKGNAME} does not appear to be installed!" 
     114      fi 
    108115    fi 
    109116  done 
  • src-sh/pcbsd-utils/pc-sysinstall/backend/functions-unmount.sh

    red0d172 r0456df4  
    140140  then 
    141141    rc_halt "zfs set mountpoint=legacy ${FOUNDZFSROOT}" 
     142    rc_halt "zfs set mountpoint=/ ${FOUNDZFSROOT}/ROOT/default" 
    142143  fi 
    143144 
  • src-sh/pcbsd-utils/pc-updatemanager/pc-updatemanager

    ra1eac71 r6adf3a66  
    931931  # Set the new ABI 
    932932  ABIVER="`echo $NEWFREEBSDVERSION | cut -d '-' -f 1 | cut -d '.' -f 1`" 
    933   pV="`${PKG_CMD} ${PKG_FLAG} query '%v' ports-mgmt/pkg`" 
    934   echo $pV | grep -q '^1.3' 
    935   if [ $? -eq 0 ] ; then 
    936     PKG_FLAG="$PKG_FLAG -o ABI=freebsd:$ABIVER:x86:64" 
    937   else 
    938     PKG_FLAG="$PKG_FLAG -o ABI=freebsd:$ABIVER:`uname -m`" 
    939   fi 
     933  #PKG_FLAG="$PKG_FLAG -o ABI=freebsd:$ABIVER:`uname -m`" 
     934  PKG_FLAG="$PKG_FLAG -o ABI=freebsd:$ABIVER:x86:64" 
    940935  #echo "Setting ABI with: ${PKG_FLAG}" 
    941936 
  • src-qt5/pc-softweb/MainUI.cpp

    r291696ec ref7d3efc  
    11#include "MainUI.h" 
     2 
     3#include <QKeySequence> 
    24 
    35MainUI::MainUI(bool debugmode) : QMainWindow(){ 
     
    3941    listMenu = new QMenu(); 
    4042      listMenu->addAction(QIcon(":icons/configure.png"), tr("Configure"), this, SLOT(GoConfigure() ) ); 
     43      listMenu->addAction(QIcon(":icons/search.png"), tr("Search For Text"), this, SLOT(openSearch() ) ); 
    4144      listMenu->addSeparator(); 
    4245      listMenu->addAction(QIcon(":icons/close.png"), tr("Close AppCafe"), this, SLOT(GoClose() ) ); 
    4346    listB->setMenu(listMenu); 
    44      
     47    //Setup the search options 
     48    group_search = new QFrame(this); 
     49      group_search->setLayout( new QHBoxLayout() ); 
     50      group_search->layout()->setContentsMargins(2,2,2,2); 
     51    line_search = new QLineEdit(this); 
     52      group_search->layout()->addWidget(line_search); 
     53    tool_search = new QToolButton(this); 
     54      group_search->layout()->addWidget(tool_search); 
     55      tool_search->setIcon( QIcon(":icons/search.png") ); 
     56      group_search->layout()->addItem(new QSpacerItem(0,0,QSizePolicy::Expanding, QSizePolicy::Minimum) ); 
    4557  //Setup the Main Interface 
    4658    webview = new QWebView(this); 
     
    4860    if(webview->page()==0){ webview->setPage(new QWebPage(webview)); } 
    4961    webview->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); 
    50  
     62    this->centralWidget()->layout()->addWidget(group_search); 
     63   
     64  //Make sure the search bar is hidden to start with     
     65  group_search->setVisible(false); 
     66     
     67  //Create the special keyboard shortcuts 
     68  QKeySequence key(QKeySequence::Find); 
     69  ctrlF = new QShortcut( key, this ); 
     70  key = QKeySequence(Qt::Key_Escape); 
     71  esc = new QShortcut( key, this ); 
    5172     
    5273  //Connect signals/slots 
     
    5677  connect(webview, SIGNAL(loadFinished(bool)), this, SLOT(PageDoneLoading(bool)) ); 
    5778  connect(webview->page()->networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)), this, SLOT( authenticate(QNetworkReply*) ) ); 
     79  connect(tool_search, SIGNAL(clicked()), this, SLOT(GoSearch()) ); 
     80  connect(line_search, SIGNAL(returnPressed()), this, SLOT(GoSearch()) ); 
     81  connect(ctrlF, SIGNAL(activated()), this, SLOT(openSearch()) ); 
     82  connect(esc, SIGNAL(activated()), this, SLOT(closeSearch()) ); 
    5883  if(DEBUG){ 
    5984    //connect(webview, SIGNAL(statusBarMessage(const QString&)), this, SLOT(StatusTextChanged(const QString&)) ); 
     
    199224  if(dlg.savedChanges){ loadHomePage(); } 
    200225} 
     226 
     227void MainUI::GoSearch(){ 
     228  //Search through the current page for the search term 
     229  QString term = line_search->text(); 
     230  //qDebug() << "Searching:"; 
     231  if(term!=lastsearch){ webview->findText(""); } //start over 
     232  if( !webview->findText(term) ){ 
     233    //qDebug() << "Search term not found:" << term; 
     234    webview->findText(""); //go back to the top 
     235    webview->findText(term); 
     236  } 
     237  lastsearch = term; 
     238} 
     239 
     240void MainUI::openSearch(){ 
     241  group_search->setVisible(true); 
     242  line_search->setFocus(); 
     243} 
     244 
     245void MainUI::closeSearch(){ 
     246  group_search->setVisible(false);       
     247} 
  • src-qt5/pc-softweb/MainUI.h

    r3667cdb ref7d3efc  
    1818#include <QMenu> 
    1919#include <QToolButton> 
     20#include <QFrame> 
     21#include <QLineEdit> 
     22#include <QToolButton> 
     23#include <QShortcut> 
    2024 
    2125#include "configDlg.h" 
     
    3943        QToolButton *listB; 
    4044        QAction *backA, *forA, *refA, *stopA, *progA; 
     45        QFrame *group_search; 
     46        QLineEdit *line_search; 
     47        QToolButton *tool_search; 
     48        QString lastsearch; 
     49        QShortcut *ctrlF, *esc; 
    4150         
    4251private slots: 
     
    5766        void GoClose(); 
    5867        void GoConfigure(); 
     68        void GoSearch(); 
     69        void openSearch(); 
     70        void closeSearch(); 
    5971}; 
    6072 
  • src-qt5/pc-softweb/SoftwareWeb.qrc

    r3667cdb ref7d3efc  
    1111    <file>icons/add.png</file> 
    1212    <file>icons/remove.png</file> 
     13    <file>icons/search.png</file> 
    1314  </qresource> 
    1415</RCC> 
Note: See TracChangeset for help on using the changeset viewer.