From e21c61788ee34d34da87afe36f6d532171132c04 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Fri, 14 Dec 2012 01:20:23 +0100
Subject: [PATCH] Don't update buttons when output folder view is disabled.
 Also slightly changed "folder up" icon.

---
 res/icons/folder_up.png   | Bin 1166 -> 3354 bytes
 src/Config.h              |   2 +-
 src/Dialog_MainWindow.cpp |  10 ++++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/icons/folder_up.png b/res/icons/folder_up.png
index 2499745c739d4ba782327b5fdf8c2c62d0d78dee..38276450110176394731c6c5a63fa3a301d6c057 100644
GIT binary patch
delta 3352
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

literal 1166
zcmcgqO-NKx6#nj;_cK3^jVLnyXCatrlvsvMSTUkQC>3pLRUy<eupc4_szqqaT9~v*
zB8q|*B5kZFaMi{N6S9)TEE9hk9qrBgyPf-<CC$Q3(0!bH-Z}St-}&z0b{=SJ4hIW^
z0K$ou_#yHUVSbhNvPFKJoO)t^a~xcJcb?t9L7BkmmLnZNC|4Lm&+RBBwKIv<CT%2;
zAK6%O>uBRLAQvU#dk^o-VG()Wq>6uAEE8UHl`-Ao`m%w@<Td=vJkN}!%tT1moci*Z
z8dc=Uf(y_x&og6LB;NPez4m8URh=Aqs;tke#@3SE2r5}Q!SR<1H}4f}*c=X~{sMZs
zmnvI_Eti0Csq);&E2X+{J8Ft|VSMfrwv{x%avZh$%g{tmtl5wyPpnVP=G-=?Q{SGS
zCDMm3!Sxwat17C+rf5CBCMV!H2If*zs4H!N?bxjGNsspV@*Kb&!f-GtEBc`?cIgj6
zP9TKY<S5=+CaOunlCgk-b)|SQ+J}$RZ;<QPkR0v==N4fsge%XhL{>%tTm|jEv{~NP
zubg_&f-S`{$dUpdlQ1?jg29d{D&u6-oeNJ2WO`J#<YL_orUW^V4^@`olYCI<OeXJ_
zRT$H~;C2$+61G79Dfo*o0%<|Eq5vkR!RSy4C_0zrR=~0?iWN8pDX@NcB(@+}A`xj|
z<qdiY(j?BI`!NLr?|PwI2AK}ON>??%uXGk*kHDP;ajYsZIA^fY6>q0v>h`;%D|?>e
z#Z|DQ6OQH~=1I#{zzt{KTAmG>DK!iyEOD+-O_-$S5m2-;z$MQ!$%d`#oG`8ik3dg%
ujddT~K?9D1fskt~F*`PBz~Oh-sQQmbdwA&4KzD7SXqjkgi$C6X?8+};#wqgv

diff --git a/src/Config.h b/src/Config.h
index f53f0237..5f549296 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					7
 #define VER_LAMEXP_TYPE						Alpha
 #define VER_LAMEXP_PATCH					6
-#define VER_LAMEXP_BUILD					1216
+#define VER_LAMEXP_BUILD					1217
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 7e5a0e38..8ff42a1c 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -2566,11 +2566,13 @@ void MainWindow::outputFolderViewClicked(const QModelIndex &index)
 		QString selectedDir = m_fileSystemModel->filePath(index);
 		if(selectedDir.length() < 3) selectedDir.append(QDir::separator());
 		ui->outputFolderLabel->setText(QDir::toNativeSeparators(selectedDir));
+		ui->outputFolderLabel->setToolTip(ui->outputFolderLabel->text());
 		m_settings->outputDir(selectedDir);
 	}
 	else
 	{
 		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())
 		{
 		case QEvent::Enter:
-			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Raised);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
 			break;
 		case QEvent::MouseButtonPress:
-			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Sunken);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Sunken : QFrame::Plain);
 			break;
 		case QEvent::MouseButtonRelease:
-			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Raised);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
 			break;
 		case QEvent::Leave:
-			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Plain);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Plain : QFrame::Plain);
 			break;
 		}