Changeset e845994


Ignore:
Timestamp:
02/03/14 12:50:58 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
987e030, 9adce5d
Parents:
11d9290 (diff), 15783fa (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:
6 edited

Legend:

Unmodified
Added
Removed
  • build-files/ports-overlay/misc/pcbsd-base/Makefile

    rd7945a0 rdc379b1  
    6666                numlockx:${PORTSDIR}/x11/numlockx \ 
    6767                swapexd:${PORTSDIR}/sysutils/swapexd \ 
    68                 epdfview:${PORTSDIR}/graphics/epdfview \ 
     68                mupdf:${PORTSDIR}/graphics/mupdf \ 
    6969                pciutils>=0:${PORTSDIR}/sysutils/pciutils \ 
    7070                gpg:${PORTSDIR}/security/gnupg \ 
  • src-qt4/pc-controlpanel/mainwnd.cpp

    r11d9290 re845994  
    2424 
    2525#include <QDebug> 
     26#include <QToolTip> 
    2627#include "mainwnd.h" 
    2728#include "ui_mainwnd.h" 
     
    7273    fillGroups(); 
    7374 
     75    QPalette tP; 
     76    tP.setColor(QPalette::Inactive, QPalette::ToolTipBase, QColor("white")); 
     77    tP.setColor(QPalette::Inactive, QPalette::ToolTipText, QColor("black")); 
     78    QToolTip::setPalette(tP); 
    7479} 
    7580 
  • src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp

    r1620346 r15783fa  
    167167             streamout << " wep_key" + tmp.setNum(WEPIndex[curItem]) + "=\"" + WEPKey[curItem] + "\"\n"; 
    168168           else 
    169              streamout << " wep_key" + tmp.setNum(WEPIndex[curItem]) + "=\"" + WEPKey[curItem] + "\"\n"; 
     169             streamout << " wep_key" + tmp.setNum(WEPIndex[curItem]) + "=" + WEPKey[curItem] + "\n"; 
    170170 
    171171         } else if (SSIDEncType[curItem] == WPA_ENCRYPTION ) { 
  • src-qt4/xtrafiles/local/share/pcbsd/scripts/openhandbook.sh

    r1620346 rc1fdbf6  
    44hFile="handbook" 
    55 
    6 apps="okular epdfview xpdf" 
     6apps="okular mupdf xpdf" 
    77 
    88# Find a valid PDF viewer 
  • src-qt4/pc-controlpanel/deinfo.cpp

    r1620346 r11d9290  
    6464    { 
    6565        Str = deinfo->readLine().simplified(); 
     66        //qDebug() << "de-info line:" << Str; 
    6667        if (Str.contains(DE_NAME)) 
    6768        { 
  • src-qt4/pc-controlpanel/deinfo.h

    r1620346 r11d9290  
    2828#include <QString> 
    2929#include <QVector> 
     30#include <QDebug> 
    3031 
    3132//! Class that holds info about DE 
Note: See TracChangeset for help on using the changeset viewer.