diff options
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | lumina-fm/MainUI.cpp | 11 | ||||
| -rw-r--r-- | lumina-open/main.cpp | 2 |
3 files changed, 24 insertions, 3 deletions
@@ -1,2 +1,16 @@ global.h *.qm +Makefile +*.o +moc_*.cpp +ui_*.h +qrc_*.cpp +lumina-config/lumina-config +lumina-desktop/Lumina-DE +lumina-fm/lumina-fm +lumina-info/lumina-info +lumina-open/lumina-open +lumina-screenshot/lumina-screenshot +lumina-search/lumina-search +libLumina/libLuminaUtils.so.1.0 + diff --git a/lumina-fm/MainUI.cpp b/lumina-fm/MainUI.cpp index fe3240dc..9b7ebcc6 100644 --- a/lumina-fm/MainUI.cpp +++ b/lumina-fm/MainUI.cpp @@ -445,8 +445,15 @@ void MainUI::setCurrentDir(QString dir){ //if(olddir!=rawdir){ emit DirChanged(rawdir); //This will be automatically run when a new dir is loaded //} - if(isUserWritable){ ui->label_dir_stats->setText(""); } - else{ ui->label_dir_stats->setText(tr("Limited Access Directory")); } + if(isUserWritable){ + if (DEBUG) {qDebug() << "# Items:" << fsmod->rootDirectory().entryInfoList().size();} + QString strSize = QString(tr("Items:")) + QString::number(fsmod->rootDirectory().entryInfoList().size()); + ui->label_dir_stats->setText(strSize); + } + else{ + QString strSize = QString(tr("Limited Access Directory. Items:")) + QString::number(fsmod->rootDirectory().entryInfoList().size()); + ui->label_dir_stats->setText(strSize); + } ui->tool_addToDir->setVisible(isUserWritable); ui->tool_addNewFile->setVisible(isUserWritable); ui->actionUpDir->setEnabled(dir!="/"); diff --git a/lumina-open/main.cpp b/lumina-open/main.cpp index 4dab7ed0..4a9f7639 100644 --- a/lumina-open/main.cpp +++ b/lumina-open/main.cpp @@ -322,7 +322,7 @@ int main(int argc, char **argv){ //qDebug() << "[lumina-open] Finished Cmd:" << cmd << retcode << p->exitStatus(); //if(retcode!=0 ){ - if(p->exitStatus() == QProcess::CrashExit){ + if(p->exitStatus() == QProcess::CrashExit or retcode > 0){ qDebug() << "[lumina-open] Application Error:" << retcode; QString err = QString(p->readAllStandardError()); if(err.isEmpty()){ err = QString(p->readAllStandardOutput()); } |