Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Adapt for latest changes in MUtilities library.

Browse Source
This commit is contained in:
LoRd_MuldeR 2019-05-18 21:41:18 +02:00
parent e355a9c210
commit c1582f8e04
3 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 8 #define VER_LAMEXP_MINOR_LO 8
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 1 #define VER_LAMEXP_PATCH 1
#define VER_LAMEXP_BUILD 2216 #define VER_LAMEXP_BUILD 2219
#define VER_LAMEXP_CONFG 2188 #define VER_LAMEXP_CONFG 2188
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

25
src/Dialog_MainWindow.cpp
View File

@ -1759,7 +1759,7 @@ void MainWindow::encodeButtonClicked(void)
switch(QMessageBox::warning(this, tr("Low Diskspace Warning"), NOBREAK(lowDiskspaceMsg), tr("Abort Encoding Process"), tr("Clean Disk Now"), tr("Ignore"))) switch(QMessageBox::warning(this, tr("Low Diskspace Warning"), NOBREAK(lowDiskspaceMsg), tr("Abort Encoding Process"), tr("Clean Disk Now"), tr("Ignore")))
{ {
case 1: case 1:
QProcess::startDetached(QString("%1/cleanmgr.exe").arg(MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSTEMFOLDER)), QStringList() << "/D" << tempFolderParts.first()); QProcess::startDetached(QString("%1/cleanmgr.exe").arg(MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSTEM_DEF)), QStringList() << "/D" << tempFolderParts.first());
case 0: case 0:
return; return;
break; break;
@ -2642,17 +2642,10 @@ void MainWindow::findFileContextActionTriggered(void)
QModelIndex index = ui->sourceFileView->currentIndex(); QModelIndex index = ui->sourceFileView->currentIndex();
if(index.isValid()) if(index.isValid())
{ {
QString systemRootPath; const QString systemToolsPath = MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSROOT);
if(!systemToolsPath.isEmpty())
QDir systemRoot(MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSTEMFOLDER));
if(systemRoot.exists() && systemRoot.cdUp())
{ {
systemRootPath = systemRoot.canonicalPath(); QFileInfo explorer(QString("%1/explorer.exe").arg(systemToolsPath));
}
if(!systemRootPath.isEmpty())
{
QFileInfo explorer(QString("%1/explorer.exe").arg(systemRootPath));
if(explorer.exists() && explorer.isFile()) if(explorer.exists() && explorer.isFile())
{ {
QProcess::execute(explorer.canonicalFilePath(), QStringList() << "/select," << QDir::toNativeSeparators(m_fileListModel->getFile(index).filePath())); QProcess::execute(explorer.canonicalFilePath(), QStringList() << "/select," << QDir::toNativeSeparators(m_fileListModel->getFile(index).filePath()));
@ -2661,7 +2654,7 @@ void MainWindow::findFileContextActionTriggered(void)
} }
else else
{ {
qWarning("SystemRoot directory could not be detected!"); qWarning("System tools directory could not be detected!");
} }
} }
} }
@ -2922,7 +2915,7 @@ void MainWindow::gotoDesktopButtonClicked(void)
return; return;
} }
QString desktopPath = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation); const QString desktopPath = MUtils::OS::known_folder(MUtils::OS::FOLDER_DESKTOP_USER);
if(!desktopPath.isEmpty() && QDir(desktopPath).exists()) if(!desktopPath.isEmpty() && QDir(desktopPath).exists())
{ {
@ -2947,8 +2940,8 @@ void MainWindow::gotoHomeFolderButtonClicked(void)
return; return;
} }
QString homePath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); const QString homePath = MUtils::OS::known_folder(MUtils::OS::FOLDER_PROFILE_USER);
if(!homePath.isEmpty() && QDir(homePath).exists()) if(!homePath.isEmpty() && QDir(homePath).exists())
{ {
ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(homePath)); ui->outputFolderView->setCurrentIndex(m_fileSystemModel->index(homePath));
@ -2972,7 +2965,7 @@ void MainWindow::gotoMusicFolderButtonClicked(void)
return; return;
} }
QString musicPath = QDesktopServices::storageLocation(QDesktopServices::MusicLocation); const QString musicPath = MUtils::OS::known_folder(MUtils::OS::FOLDER_MUSIC_USER);
if(!musicPath.isEmpty() && QDir(musicPath).exists()) if(!musicPath.isEmpty() && QDir(musicPath).exists())
{ {

9
src/Dialog_Processing.cpp
View File

@ -871,14 +871,7 @@ void ProcessingDialog::contextMenuShowFileActionTriggered(void)
if(QFileInfo(filePath).exists()) if(QFileInfo(filePath).exists())
{ {
QString systemRootPath; const QString systemRootPath = MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSROOT);
QDir systemRoot(MUtils::OS::known_folder(MUtils::OS::FOLDER_SYSTEMFOLDER));
if(systemRoot.exists() && systemRoot.cdUp())
{
systemRootPath = systemRoot.canonicalPath();
}
if(!systemRootPath.isEmpty()) if(!systemRootPath.isEmpty())
{ {
QFileInfo explorer(QString("%1/explorer.exe").arg(systemRootPath)); QFileInfo explorer(QString("%1/explorer.exe").arg(systemRootPath));