Changeset 15416f9


Ignore:
Timestamp:
09/18/14 07:43:25 (2 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.1
Children:
31494b6
Parents:
56bc0ca (diff), c5730b9 (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:
3 added
7 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/libpcbsd/ui/ui.pro

    r1d1ab2e r60e31d2  
    1717        dialogwpaenterprise.h \ 
    1818        dialogInfoBox.h \ 
     19        pcbsd-dialogAPsetup.h \ 
    1920    pcbsd-ui.h 
    2021 
     
    2324        dialogwpaenterprise.cpp \ 
    2425        metaWidget.cpp \ 
     26        dialogAPsetup.cpp \ 
    2527    ui.cpp 
    2628 
    2729RESOURCES += libpcbsd-ui.qrc 
    2830 
    29 FORMS += dialogInfoBox.ui dialogMetaProgress.ui dialogwpaenterprise.ui 
     31FORMS += dialogInfoBox.ui \ 
     32        dialogMetaProgress.ui \ 
     33        dialogwpaenterprise.ui \ 
     34        dialogAPsetup.ui 
    3035 
    3136TRANSLATIONS =  i18n/libpcbsd_af.ts \ 
  • src-qt4/libpcbsd/utils/netif.cpp

    re5bac4a r00fafb1  
    690690      Utils::setConfFileValue("/etc/rc.conf", "hostapd_enable", "hostapd_enable=\"YES\"", -1); 
    691691    } 
     692  }else{ 
     693    Utils::setConfFileValue("/etc/rc.conf","wlans_"+wdev, ""); 
     694    Utils::setConfFileValue("/etc/rc.conf","create_args_wlan0", ""); 
     695    Utils::setConfFileValue("/etc/rc.conf","ifconfig_wlan0", ""); 
    692696  } 
    693697  return 0; 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp

    ra184339 rc5730b9  
    707707          popup->addAction( tr("Device Information"), this, SLOT(slotShowInfoConfig())); 
    708708          // If we are running as root 
    709           if ( getuid() == 0 ) 
    710           { 
    711           popup->addSeparator(); 
    712           if ( DevsUp[currentItem] == "DOWN" ) { 
    713             popup->addAction( tr("Enable device"), this, SLOT(slotEnableDevice())); 
    714                 } else { 
    715             popup->addAction( tr("Disable device"), this, SLOT(slotDisableDevice())); 
    716                 } 
    717                 popup->addSeparator(); 
    718                 popup->addAction( tr("Restart the Network"), this, SLOT(restartNetwork())); 
     709          if ( getuid() == 0 ){ 
     710            popup->addSeparator(); 
     711            if ( DevsUp[currentItem] == "DOWN" ) { 
     712              popup->addAction( tr("Enable device"), this, SLOT(slotEnableDevice())); 
     713            } else { 
     714              popup->addAction( tr("Disable device"), this, SLOT(slotDisableDevice())); 
     715            } 
     716            if(!Devs[currentItem].startsWith("wlan") && (DevsType[currentItem]== "Wireless") ){ 
     717              popup->addAction( tr("Setup Access Point"), this, SLOT(slotSetupAP()) ); 
     718            } 
     719            popup->addSeparator(); 
     720            popup->addAction( tr("Restart the Network"), this, SLOT(restartNetwork())); 
    719721          } 
    720722          popup->exec( QCursor::pos() ); 
     
    733735} 
    734736 
    735  
    736  
     737void NetworkMan::slotSetupAP(){ 
     738  int currentItem = listNetDev->currentRow(); 
     739  if(currentItem != -1){ 
     740    APSetupDialog dlg(Devs[currentItem], this); 
     741    dlg.exec(); 
     742    if(!dlg.cancelled){ 
     743      //ensure the wlan0 device is enabled 
     744      runCommand(IFCONFIG + " wlan0 up"); 
     745       
     746    } 
     747  }        
     748} 
    737749 
    738750void NetworkMan::slotEnableDevice() 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.h

    rc9d1400 rd0efb53  
    1010#include <pcbsd-netif.h> 
    1111#include <pcbsd-utils.h> 
     12#include <pcbsd-dialogAPsetup.h> 
    1213 
    1314class NetworkMan : public QDialog, private Ui::NetworkMan 
     
    3738    void slotListRightClick( const QPoint &pos ); 
    3839    void slotDisableDevice(); 
     40    void slotSetupAP(); 
    3941    void slotEnableDevice(); 
    4042    void slotShowInfoConfig(); 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.ui

    rbe08b76 rc5730b9  
    2525    <widget class="QTabWidget" name="tabNetMan"> 
    2626     <property name="currentIndex"> 
    27       <number>1</number> 
     27      <number>0</number> 
    2828     </property> 
    2929     <widget class="QWidget" name="Widget8"> 
  • src-qt4/port-files/pkg-plist

    r1590e16 rcc605c3  
    28722872include/pcbsd-utils.h 
    28732873include/pcbsd-ui.h 
     2874include/pcbsd-dialogAPsetup.h 
    28742875@dirrm share/apps/ksplash/Themes/pcbsd10/600x400 
    28752876@dirrm share/apps/ksplash/Themes/pcbsd10/800x600 
  • build-files/conf/installcd-packages

    r7527ea8 r56bc0ca  
    4141qt4-imageformats-\*.txz 
    4242qt4-inputmethods-\*.txz 
    43 nvidia-driver-\*.txz 
     43nvidia-driver-3[0-9][0-9].*.txz 
    4444nvidia-settings-\*.txz 
    4545nvidia-xconfig-\*.txz 
Note: See TracChangeset for help on using the changeset viewer.