Changeset d29f2cb


Ignore:
Timestamp:
Dec 3, 2013 11:05:08 AM (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1
Children:
daab719, 71c6ff1
Parents:
273a090 (diff), ef37894 (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:
12 edited

Legend:

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

    r31290f1 rdcfefbb  
    6868  QString model, layout, variant; 
    6969 
    70   if ( ! (comboBoxKeyboardModel->currentIndex() == -1) ) 
     70  if ( comboBoxKeyboardModel->currentIndex() == -1 ) 
    7171     return; 
    7272  if ( ! listKbLayouts->currentItem() ) 
  • src-qt4/pc-firstbootgui/firstboot.cpp

    r9fabf4e rdcfefbb  
    4646    keyModels = Scripts::Backend::keyModels(); 
    4747    keyLayouts = Scripts::Backend::keyLayouts(); 
     48 
     49    // If we have a saved keyboard layout from installation, use it first 
     50    QString kD; 
     51    if ( QFile::exists("/var/.wizardKeyboard") ) { 
     52      QFile kFile("/var/.wizardKeyboard"); 
     53      if ( kFile.open(QIODevice::ReadOnly | QIODevice::Text) ) { 
     54         kD = kFile.readLine().simplified(); 
     55         kFile.close(); 
     56          
     57         kbMod = kD.section(" ", 0, 0); 
     58         kbLay = kD.section(" ", 1, 1); 
     59         kbVar = kD.section(" ", 2, 2); 
     60         Scripts::Backend::changeKbMap(kbMod, kbLay, kbVar); 
     61      }  
     62    } 
    4863 
    4964    // Load the timezones 
     
    507522  } 
    508523 
     524 
     525  // Save the PCDM default lang / inputs 
     526  QString curLang; 
     527  if ( comboLanguage->currentIndex() != -1 ) { 
     528    // Figure out the language code 
     529    curLang = languages.at(comboLanguage->currentIndex()); 
     530           
     531    // Grab the language code 
     532    curLang.truncate(curLang.lastIndexOf(")")); 
     533    curLang.remove(0, curLang.lastIndexOf("(") + 1); 
     534  } 
     535 
     536  system("mkdir -p /var/db/pcdm 2>/dev/null"); 
     537  QFile pcdmfile("/var/db/pcdm/defaultInputs"); 
     538  if (pcdmfile.open(QIODevice::WriteOnly | QIODevice::Text)) { 
     539    QTextStream out(&pcdmfile); 
     540    out << "Lang=" << curLang << "\n"; 
     541 
     542    if ( kbMod.isEmpty() ) 
     543      out << "KeyModel=pc104\n"; 
     544    else 
     545      out << "KeyModel=" << kbMod << "\n"; 
     546 
     547    if ( kbLay.isEmpty() ) 
     548      out << "KeyLayout=us\n"; 
     549    else 
     550      out << "KeyLayout=" << kbLay << "\n"; 
     551 
     552    if ( kbVar.isEmpty() ) 
     553      out << "KeyVariant="; 
     554    else 
     555      out << "KeyVariant=" << kbVar; 
     556 
     557    pcdmfile.close(); 
     558  } else { 
     559    qDebug() << "Error opening /var/db/pcdm/defaultInputs"; 
     560  } 
    509561} 
    510562 
  • src-qt4/pc-installgui/dialogKeyboard.cpp

    rb7d9fad r618401b  
    6868  QString model, layout, variant; 
    6969 
    70   if ( ! (comboBoxKeyboardModel->currentIndex() == -1) ) 
     70  if ( comboBoxKeyboardModel->currentIndex() == -1 ) 
    7171     return; 
     72 
    7273  if ( ! listKbLayouts->currentItem() ) 
    7374     return; 
     75 
    7476  if ( ! listKbVariants->currentItem() ) 
    7577     return; 
     
    9294   
    9395  Scripts::Backend::changeKbMap(model, layout, variant); 
     96  emit saved(model, layout, variant); 
    9497} 
    9598 
  • src-qt4/pc-installgui/dialogKeyboard.h

    r1620346 r618401b  
    4040 
    4141signals: 
     42    void saved(QString, QString, QString); 
    4243 
    4344} ; 
  • src-qt4/pc-installgui/installer.cpp

    r9fabf4e r618401b  
    9494  wKey->programInit(keyModels, keyLayouts); 
    9595  wKey->setWindowModality(Qt::ApplicationModal); 
     96  connect(wKey, SIGNAL(saved(QString, QString, QString)), this, SLOT(slotSaveKeyLayout(QString, QString, QString))); 
    9697  wKey->show(); 
    9798  wKey->raise(); 
     99} 
     100 
     101void Installer::slotSaveKeyLayout(QString model, QString layout, QString variant) 
     102{ 
     103  curKeyModel = model; 
     104  curKeyLayout = layout; 
     105  curKeyVariant = variant; 
     106  qDebug() << "Changed keyboard layout:" << curKeyModel << curKeyLayout << curKeyVariant; 
    98107} 
    99108 
     
    797806    // Change the default keyboard layout 
    798807    if ( langCode == "en" ) { 
     808       curKeyModel="pc104"; 
     809       curKeyLayout="us"; 
     810       curKeyVariant=""; 
    799811       Scripts::Backend::changeKbMap("pc104", "us", ""); 
    800812    } else { 
    801813       // TODO - At some point, add additional tests here and set more specific layouts 
    802814       // based upon the language selected 
     815       curKeyModel="pc105"; 
     816       curKeyLayout=langCode; 
     817       curKeyVariant=""; 
    803818       Scripts::Backend::changeKbMap("pc105", langCode, "" ); 
    804819    } 
     
    10171032      } 
    10181033 
     1034      // If the user changed the keyboard layout, save it for first boot 
     1035      if ( ! curKeyModel.isEmpty() ) { 
     1036        cfgList << "runCommand=echo \"" + curKeyModel + " " + curKeyLayout + " " + curKeyVariant + "\" >/var/.wizardKeyboard"; 
     1037      } 
     1038 
    10191039    } else { 
    10201040      // Doing TrueOS Install 
  • src-qt4/pc-installgui/installer.h

    r07eb74c r618401b  
    7676    void slotSaveRestoreSettings(QStringList); 
    7777 
     78    // Slot to save keyboard layout 
     79    void slotSaveKeyLayout(QString, QString, QString); 
    7880 
    7981private: 
     
    177179    QStringList keyModels; 
    178180    QStringList keyLayouts; 
     181    QString curKeyLayout; 
     182    QString curKeyModel; 
     183    QString curKeyVariant; 
    179184 
    180185    // Disk setup wizard 
  • src-qt4/port-files/pkg-plist

    r42ea5b0 rba4d08f  
    3232bin/pc-systemupdatertray 
    3333bin/pc-updategui 
     34bin/pc-updatecenter 
    3435bin/pc-usermanager 
    3536bin/pc-welcome 
     
    7071share/pcbsd/scripts/sound-dev-changed.sh 
    7172share/pcbsd/scripts/portsnap-noterm.sh 
     73share/pcbsd/icons/update-center.pkg 
    7274share/pcbsd/icons/system-software-update.png 
    7375share/pcbsd/icons/hwinfo.png 
     
    496498share/pcbsd/pc-controlpanel/items/tools/lifepreserver.desktop 
    497499share/pcbsd/pc-controlpanel/items/tools/flash-player-properties.desktop 
     500share/pcbsd/pc-controlpanel/items/software/pc-updatecenter.desktop 
    498501share/pcbsd/pc-controlpanel/items/software/pc-updategui.desktop 
    499502share/pcbsd/pc-controlpanel/items/software/pbi-winecfg.desktop 
     
    26922695share/applications/pc-pkgmanager.desktop 
    26932696share/applications/pc-updategui.desktop 
     2697share/applications/pc-updatecenter.desktop 
    26942698share/applications/pc-welcome.desktop 
    26952699share/applications/warden.desktop 
  • src-qt4/src-qt4.pro

    re1feeb4 rba4d08f  
    2727         pc-systemupdatertray \ 
    2828         pc-updategui \ 
     29         pc-updatecenter \ 
    2930         pc-usermanager \ 
    3031         pc-welcome \ 
  • src-sh/Makefile

    rf545e97 ref37894  
    319319        sub-lpreserver-make_default \ 
    320320        sub-pbi-make_default \ 
    321         sub-pbi10-make_default \ 
    322321        sub-about-make_default \ 
    323322        sub-install-make_default \ 
     
    343342        sub-lpreserver-make_first \ 
    344343        sub-pbi-make_first \ 
    345         sub-pbi10-make_first \ 
    346344        sub-about-make_first \ 
    347345        sub-install-make_first \ 
     
    367365        sub-lpreserver-all \ 
    368366        sub-pbi-all \ 
    369         sub-pbi10-all \ 
    370367        sub-about-all \ 
    371368        sub-install-all \ 
     
    389386 
    390387clean: sub-pbi-clean \ 
    391         sub-pbi10-clean \ 
    392388        sub-libsh-clean \ 
    393389        sub-lpreserver-clean \ 
     
    414410install_subtargets: sub-libsh-install_subtargets \ 
    415411        sub-pbi-install_subtargets \ 
    416         sub-pbi10-install_subtargets \ 
    417412        sub-lpreserver-install_subtargets \ 
    418413        sub-about-install_subtargets \ 
  • src-qt4/pc-softwaremanager/pbiBackend.cpp

    rd9f2085 r273a090  
    133133  QDate date = QDate::currentDate(); 
    134134  date = date.addDays(-10); 
    135   QString chk = date.toString(Qt::ISODate); 
    136   chk.remove("-"); chk.append(" 000000"); //don't specify a particular time 
     135  QString chk = date.toString("yyyyMMdd"); 
    137136  //Now compare the latest apps to this date 
    138137  QStringList apps = APPHASH.keys(); 
  • src-qt4/pc-softwaremanager/pbiDBAccess.cpp

    r0ffa8c4 r273a090  
    189189 
    190190QStringList PBIDBAccess::parseIndexLine(QString line){ 
    191   //output[name, arch, version, datetime, sizeK, isLatest(bool), filename] 
    192   //line format 5/1/2013: [name,arch,version,checksum,datetime,mirrorPathToPBI,?,?,current/active,sizeInK,?] 
     191  //output[name, arch, version, date, sizeK, isLatest(bool), filename] 
     192  //line format 12/3/2013: [name,arch,version,checksum,datetimeBuilt,mirrorPathToPBI,datetimeApproved,?,current/active,sizeInK,?] 
    193193      // NOTE: last two entries missing quite often 
    194194  QStringList lineInfo = line.split(":"); 
     
    198198  output << lineInfo[1]; //architecture 
    199199  output << lineInfo[2]; //version 
    200   output << lineInfo[4]; //datetime 
     200  QDateTime DT; 
     201  DT.setTime_t(lineInfo[6].toInt()); 
     202  output << DT.toString("yyyyMMdd"); //date added to AppCafe 
    201203  if(lineInfo.length() >= 10){ output << lineInfo[9]; }//Size in KB 
    202204  else{ output << ""; } 
  • src-qt4/pc-softwaremanager/pbiDBAccess.h

    r78fa8b2 r273a090  
    1111#include <QProcess> 
    1212#include <QProcessEnvironment> 
     13#include <QDateTime> 
    1314 
    1415#include "extras.h" 
Note: See TracChangeset for help on using the changeset viewer.