Don't update buttons when output folder view is disabled. Also slightly changed "folder up" icon.

This commit is contained in:
LoRd_MuldeR 2012-12-14 01:20:23 +01:00
parent 12db5d2c81
commit e21c61788e
3 changed files with 7 additions and 5 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 7 #define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 6 #define VER_LAMEXP_PATCH 6
#define VER_LAMEXP_BUILD 1216 #define VER_LAMEXP_BUILD 1217
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

View File

@ -2566,11 +2566,13 @@ void MainWindow::outputFolderViewClicked(const QModelIndex &index)
QString selectedDir = m_fileSystemModel->filePath(index); QString selectedDir = m_fileSystemModel->filePath(index);
if(selectedDir.length() < 3) selectedDir.append(QDir::separator()); if(selectedDir.length() < 3) selectedDir.append(QDir::separator());
ui->outputFolderLabel->setText(QDir::toNativeSeparators(selectedDir)); ui->outputFolderLabel->setText(QDir::toNativeSeparators(selectedDir));
ui->outputFolderLabel->setToolTip(ui->outputFolderLabel->text());
m_settings->outputDir(selectedDir); m_settings->outputDir(selectedDir);
} }
else else
{ {
ui->outputFolderLabel->setText(QDir::toNativeSeparators(m_settings->outputDir())); ui->outputFolderLabel->setText(QDir::toNativeSeparators(m_settings->outputDir()));
ui->outputFolderLabel->setToolTip(ui->outputFolderLabel->text());
} }
} }
@ -3096,16 +3098,16 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
switch(event->type()) switch(event->type())
{ {
case QEvent::Enter: case QEvent::Enter:
dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Raised); dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
break; break;
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Sunken); dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Sunken : QFrame::Plain);
break; break;
case QEvent::MouseButtonRelease: case QEvent::MouseButtonRelease:
dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Raised); dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
break; break;
case QEvent::Leave: case QEvent::Leave:
dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Plain); dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Plain : QFrame::Plain);
break; break;
} }