Changeset 1d87ed6


Ignore:
Timestamp:
Jul 9, 2013 10:35:41 AM (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
5c0de09
Parents:
7431d6d (diff), a5bc020 (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:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/dialogLocale.cpp

    r1620346 ra5bc020  
    7171QStringList widgetLocale::getLanguages(){ 
    7272  //Detect all the available localizations 
    73   QString str = QCoreApplication::applicationDirPath(); 
    74   QDir dir(str+"/i18n"); 
     73  QString str = "/usr/local/share/PCDM/i18n"; 
     74  QDir dir(str); 
    7575  QStringList stL = dir.entryList(QDir::Files); 
    7676  stL = stL.filter(".qm");   
  • src-qt4/PCDM/src/pcdm-gui.cpp

    r6bd7798 ra5bc020  
    7979  //get the default translation directory 
    8080  if(DEBUG_MODE){ qDebug() << "Load Translations"; } 
    81   translationDir = QApplication::applicationDirPath() + "/i18n/"; 
     81  translationDir = "/usr/local/share/PCDM/i18n/"; 
    8282  //Fill the translator 
    8383  m_translator = new QTranslator(); 
     
    415415 
    416416  if(m_translator->load(translationFile)){ 
    417     Backend::log("Install the new translator"); 
     417    Backend::log("Install the new translator: "+translationFile); 
    418418    QCoreApplication::installTranslator(m_translator);     
    419419  } 
  • src-qt4/pc-installgui/wizardDisk.cpp

    r0f9dbbc r7431d6d  
    595595  popupCH->addAction( "off", this, SLOT(slotZChkOFF())); 
    596596 
    597   // Create compression sub-menu 
    598   popupCmp = popup->addMenu("compression"); 
    599   popupCmp->addAction( "off", this, SLOT(slotZCmpOFF())); 
    600   popupCmp->addAction( "lzjb", this, SLOT(slotZCmpLZJB())); 
    601   popupCmp->addAction( "gzip", this, SLOT(slotZCmpGZIP())); 
    602   popupCmp->addAction( "zle", this, SLOT(slotZCmpZLE())); 
     597  // Create compression sub-menu for non '/' devices 
     598  if ( treeMounts->currentItem()->text(1) != "/" ) { 
     599    popupCmp = popup->addMenu("compression"); 
     600    popupCmp->addAction( "off", this, SLOT(slotZCmpOFF())); 
     601    popupCmp->addAction( "lzjb", this, SLOT(slotZCmpLZJB())); 
     602    popupCmp->addAction( "gzip", this, SLOT(slotZCmpGZIP())); 
     603    popupCmp->addAction( "zle", this, SLOT(slotZCmpZLE())); 
     604  } 
    603605 
    604606  // Create dedup sub-menu 
Note: See TracChangeset for help on using the changeset viewer.