Changeset 9dc3bba


Ignore:
Timestamp:
05/16/14 08:28:03 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
754bfae6, bb41d1d
Parents:
53c9649
Message:

Another couple minor fixes to lumina-open
Make sure the default applications settings file is located in the ~/.lumina directory, and also skip auto-running a *.desktop file if the "-select" flag is passed (in case the user wants to edit that shortcut file instead of run it).

Location:
lumina/lumina-open
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lumina/lumina-open/LFileDialog.cpp

    r53c9649 r9dc3bba  
    1616  appPath.clear(); 
    1717  appFile.clear(); 
    18   settings = new QSettings("Lumina-Desktop", "lumina-open",this); 
     18  QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homePath()+"/.lumina"); 
     19  settings = new QSettings("LuminaDE", "lumina-open",this); 
    1920  //Connect the signals/slots 
    2021  connect(ui->tree_apps, SIGNAL(itemSelectionChanged()), this, SLOT(updateUI()) ); 
     
    3940//static functions 
    4041QString LFileDialog::getDefaultApp(QString extension){ 
    41   return QSettings("Lumina-Desktop", "lumina-open").value("default/"+extension,"").toString(); 
     42  QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homePath()+"/.lumina"); 
     43  return QSettings("LuminaDE", "lumina-open").value("default/"+extension,"").toString(); 
    4244} 
    4345 
    4446void LFileDialog::setDefaultApp(QString extension, QString appFile){ 
     47  QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homePath()+"/.lumina"); 
    4548  if(appFile.isEmpty()){ 
    46     QSettings("Lumina-Desktop", "lumina-open").remove("default/"+extension); 
     49    QSettings("LuminaDE", "lumina-open").remove("default/"+extension); 
    4750  }else{ 
    48     QSettings("Lumina-Desktop", "lumina-open").setValue("default/"+extension,appFile); 
     51    QSettings("LuminaDE", "lumina-open").setValue("default/"+extension,appFile); 
    4952  } 
    5053} 
  • lumina/lumina-open/main.cpp

    r53c9649 r9dc3bba  
    118118  QString cmd; 
    119119  bool useInputFile = false; 
    120   if(extension=="desktop"){  
     120  if(extension=="desktop" && !showDLG){  
    121121    bool ok = false; 
    122122    XDGDesktop DF = LXDG::loadDesktopFile(inFile, ok); 
Note: See TracChangeset for help on using the changeset viewer.