Changeset a819105


Ignore:
Timestamp:
11/15/13 09:27:58 (13 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
4f9718b
Parents:
89cdf9c7 (diff), 9fabf4e (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:
6 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-firstbootgui/backend.cpp

    r5a1d1a0 r9fabf4e  
    487487} 
    488488 
     489 
     490QString Backend::detectCountryCode() 
     491{ 
     492    QString code; 
     493                   
     494    Process p(QStringList() << "detect-country"); 
     495                 
     496    if (p.waitForFinished()) { 
     497       code = p.readLine().simplified(); 
     498    } 
     499    code = code.section(" ", 0, 0); 
     500    qDebug() << "Found Country Code:" << code; 
     501    return code; 
     502} 
     503 
  • src-qt4/pc-firstbootgui/backend.h

    r5a1d1a0 r9fabf4e  
    5252    static QStringList timezones(); 
    5353    static QString guessTimezone(); 
     54    static QString detectCountryCode(); 
    5455    static void changeKbMap(QString model, QString layout, QString variant); 
    5556    static QList<QStringList> hardDrives(); 
  • src-qt4/pc-firstbootgui/firstboot.cpp

    r57e8c23 r9fabf4e  
    107107{ 
    108108    // load languages 
     109    QString langCode; 
     110    QString curLang; 
     111    curLang = "en_US"; 
     112    bool foundLang = false; 
    109113    comboLanguage->clear(); 
    110114    languages = Scripts::Backend::languages(); 
     115    if ( QFile::exists("/var/.wizardlang") ) { 
     116      QFile lFile("/var/.wizardlang"); 
     117      if ( lFile.open(QIODevice::ReadOnly | QIODevice::Text) ) { 
     118         curLang = lFile.readLine().simplified(); 
     119         lFile.close(); 
     120      }  
     121    }  
     122 
     123    qDebug() << curLang; 
     124 
     125    // Now set languages 
    111126    for (int i=0; i < languages.count(); ++i) { 
    112127        QString languageStr = languages.at(i); 
    113128        QString language = languageStr.split("-").at(0); 
    114129        comboLanguage->addItem(language.trimmed()); 
     130     
     131        // Grab the language code 
     132        langCode = languageStr; 
     133        langCode.truncate(langCode.lastIndexOf(")")); 
     134        langCode.remove(0, langCode.lastIndexOf("(") + 1); 
     135        if ( curLang == langCode ) { 
     136          comboLanguage->setCurrentIndex(i); 
     137          foundLang = true; 
     138        } 
    115139    } 
     140 
     141    // If we found a language to default to 
     142    if ( foundLang ) 
     143      slotChangeLanguage(); 
     144 
    116145    connect(comboLanguage, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotChangeLanguage())); 
    117146} 
  • src-qt4/pc-installgui/installer.cpp

    r029a2ba r9fabf4e  
    10091009      cfgList << "runCommand=touch /var/.pcbsd-firstgui"; 
    10101010 
     1011      if ( comboLanguage->currentIndex() != 0 ) { 
     1012        QString lang = languages.at(comboLanguage->currentIndex()); 
     1013        // Grab the language code 
     1014        lang.truncate(lang.lastIndexOf(")")); 
     1015        lang.remove(0, lang.lastIndexOf("(") + 1); 
     1016        cfgList << "runCommand=echo " + lang + " >/var/.wizardlang"; 
     1017      } 
     1018 
    10111019    } else { 
    10121020      // Doing TrueOS Install 
  • src-qt4/pc-sysmanager/portsnapprogress.cpp

    r56d05c5 r4ff8888  
    6262    // Figure out which to download 
    6363    if ( pcVer.indexOf("STABLE") ) 
    64        branch = "/stable/" + pcVer.section(".", 0, 0);  
     64       branch = "stable/" + pcVer.section("-", 0, 0).section(".", 0, 0);  
    6565    else if ( pcVer.indexOf(".") != -1 ) 
    66        branch = "/releng/" + pcVer.section("-", 0, 0);  
     66       branch = "releng/" + pcVer.section("-", 0, 0);  
    6767    else 
    68        branch = "/head"; 
     68       branch = "master"; 
    6969 
    7070    QStringList args; 
    7171    QString prog; 
    72     prog = "svn"; 
    73     args << "co" << "svn://svn.freebsd.org/base" + branch << "/usr/src"; 
     72    prog = "git"; 
     73    args << "clone" << "https://github.com/pcbsd/freebsd.git" << "-b" << branch << "/usr/src"; 
     74    qDebug() << args; 
    7475    portsnap = new QProcess(this); 
    7576    portsnap->setProcessChannelMode(QProcess::MergedChannels); 
     
    146147  { 
    147148    QString output = portsnap->readLine().simplified(); 
     149    output.truncate(100); 
    148150    qDebug() << "Portsnap Update: " + output; 
    149151    taskProgressLbl->setText(output); 
  • src-qt4/PCDM/PCDMd

    ref7d8db r89cdf9c7  
    55 
    66PCDMCONF="/usr/local/etc/pcdm.conf" 
    7 PCDMAUTHFILE="/tmp/.PCDMAuth" 
     7BASEPCDMAUTHFILE="/tmp/.PCDMAuth" 
    88 
    99XOPTS="" 
     
    3939while [ ! -e /var/run/nologin ]; do 
    4040  /usr/local/bin/pc-checkxdisplay 
     41  # Randomize the authorization file location 
     42  PCDMAUTHFILE=${BASEPCDMAUTHFILE}-`openssl rand -hex 10` 
    4143  # Make sure the authorization file does not exist 
    4244  if [ -f ${PCDMAUTHFILE} ]; then 
     
    5153  fi 
    5254  xinit /usr/local/bin/PCDM-session -once -- :0 -auth ${PCDMAUTHFILE} $XOPTS 
     55  #Now remove the authorization file 
     56  rm ${PCDMAUTHFILE} 
    5357done 
Note: See TracChangeset for help on using the changeset viewer.