Added "Folder Up" button to the "Output Folder" tab. Also some code refactoring.

doc/Changelog.html

@@ -21,6 +21,7 @@ a:visited { color: #0000EE; }
 <li>Upgraded build environment to Microsoft Visual Studio 2012 with Update-1
 <li>Added option to select the "overwrite mode" to advanced options tab
 <li>Added option to filter the log entries on the "processing" dialog (see context menu)
+<li>Added "Up One Level" button to the output folder tab
 <li>Updated Qt runtime libraries to v4.8.4 (2012-11-29), compiled with MSVC 11.0
 <li>Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.6 (2012-12-07)
 <li>Fixed handling of certain characters when passing meta tags on the command-line

etc/Translation/LameXP_DE.ts

@@ -1978,6 +1978,10 @@
         <source>Revert</source>
         <translation>Zurück</translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation>Aufwärts</translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

etc/Translation/LameXP_ES.ts

@@ -1977,6 +1977,10 @@
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

etc/Translation/LameXP_FR.ts

@@ -1987,6 +1987,10 @@ Ouvrir le dossier récursivement...</translation>
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

etc/Translation/LameXP_IT.ts

@@ -1978,6 +1978,10 @@
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

etc/Translation/LameXP_KR.ts

@@ -1977,6 +1977,10 @@
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

etc/Translation/LameXP_RU.ts

@@ -1983,6 +1983,10 @@
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

etc/Translation/LameXP_TW.ts

@@ -1977,6 +1977,10 @@
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

etc/Translation/LameXP_UK.ts

@@ -1978,6 +1978,10 @@
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

etc/Translation/LameXP_ZH.ts

@@ -1977,6 +1977,10 @@
         <source>Revert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Up One Level</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MetaInfo</name>

gui/MainWindow.ui

@@ -353,6 +353,28 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QLabel" name="outputFoldersGoUpLabel">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="toolTip">
+                 <string>Up One Level</string>
+                </property>
+                <property name="frameShape">
+                 <enum>QFrame::StyledPanel</enum>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="pixmap">
+                 <pixmap resource="../res/Icons.qrc">:/icons/folder_up.png</pixmap>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QLabel" name="outputFoldersEditorLabel">
                 <property name="sizePolicy">

res/Icons.qrc

@@ -62,6 +62,7 @@
 		<file>icons/folder_explore.png</file>
 		<file>icons/folder_page.png</file>
 		<file>icons/folder_table.png</file>
+		<file>icons/folder_up.png</file>
 		<file>icons/font.png</file>
 		<file>icons/group.png</file>
 		<file>icons/heart.png</file>

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					1214
+#define VER_LAMEXP_BUILD					1216
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)

src/Dialog_MainWindow.cpp

@@ -242,6 +242,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
 	ui->outputFolderView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 
 	m_evenFilterOutputFolderMouse = new CustomEventFilter;
+	ui->outputFoldersGoUpLabel->installEventFilter(m_evenFilterOutputFolderMouse);
 	ui->outputFoldersEditorLabel->installEventFilter(m_evenFilterOutputFolderMouse);
 	ui->outputFoldersFovoritesLabel->installEventFilter(m_evenFilterOutputFolderMouse);
 	ui->outputFolderLabel->installEventFilter(m_evenFilterOutputFolderMouse);
@@ -3089,65 +3090,62 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
 			break;
 		}
 	}
-	else if(sender == ui->outputFoldersFovoritesLabel)
+
+	if((sender == ui->outputFoldersFovoritesLabel) || (sender == ui->outputFoldersEditorLabel) || (sender == ui->outputFoldersGoUpLabel))
 	{
 		switch(event->type())
 		{
 		case QEvent::Enter:
-			ui->outputFoldersFovoritesLabel->setFrameShadow(QFrame::Raised);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Raised);
 			break;
 		case QEvent::MouseButtonPress:
-			ui->outputFoldersFovoritesLabel->setFrameShadow(QFrame::Sunken);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Sunken);
 			break;
 		case QEvent::MouseButtonRelease:
-			ui->outputFoldersFovoritesLabel->setFrameShadow(QFrame::Raised);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Raised);
-			if(mouseEvent)
-			{
-				if(pos.x() <= sender->width() && pos.y() <= sender->height() && pos.x() >= 0 && pos.y() >= 0 && mouseEvent->button() != Qt::MidButton)
-				{
-					if(ui->outputFolderView->isEnabled())
-					{
-						m_outputFolderFavoritesMenu->popup(sender->mapToGlobal(pos));
-					}
-				}
-			}
 			break;
 		case QEvent::Leave:
-			ui->outputFoldersFovoritesLabel->setFrameShadow(QFrame::Plain);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Plain);
 			break;
 		}
-	}
+
-	else if(sender == ui->outputFoldersEditorLabel)
+		if((event->type() == QEvent::MouseButtonRelease) && ui->outputFolderView->isEnabled() && (mouseEvent))
-	{
-		switch(event->type())
 		{
-		case QEvent::Enter:
+			if(pos.x() <= sender->width() && pos.y() <= sender->height() && pos.x() >= 0 && pos.y() >= 0 && mouseEvent->button() != Qt::MidButton)
-			ui->outputFoldersEditorLabel->setFrameShadow(QFrame::Raised);
-			break;
-		case QEvent::MouseButtonPress:
-			ui->outputFoldersEditorLabel->setFrameShadow(QFrame::Sunken);
-			break;
-		case QEvent::MouseButtonRelease:
-			ui->outputFoldersEditorLabel->setFrameShadow(QFrame::Raised);
-			if(mouseEvent)
 			{
-				if(pos.x() <= sender->width() && pos.y() <= sender->height() && pos.x() >= 0 && pos.y() >= 0 && mouseEvent->button() != Qt::MidButton)
+				if(sender == ui->outputFoldersFovoritesLabel)
 				{
-					if(ui->outputFolderView->isEnabled())
+					m_outputFolderFavoritesMenu->popup(sender->mapToGlobal(pos));
+				}
+				else if(sender == ui->outputFoldersEditorLabel)
+				{
+					ui->outputFolderView->setEnabled(false);
+					ui->outputFolderLabel->setVisible(false);
+					ui->outputFolderEdit->setVisible(true);
+					ui->outputFolderEdit->setText(ui->outputFolderLabel->text());
+					ui->outputFolderEdit->selectAll();
+					ui->outputFolderEdit->setFocus();
+				}
+				else if(sender == ui->outputFoldersGoUpLabel)
+				{
+					QModelIndex current = ui->outputFolderView->currentIndex();
+					if(current.isValid() && current.parent().isValid())
 					{
-						ui->outputFolderView->setEnabled(false);
+						QModelIndex parent = current.parent();
-						ui->outputFolderLabel->setVisible(false);
+						ui->outputFolderView->setCurrentIndex(parent);
-						ui->outputFolderEdit->setVisible(true);
+						outputFolderViewClicked(parent);
-						ui->outputFolderEdit->setText(ui->outputFolderLabel->text());
-						ui->outputFolderEdit->selectAll();
-						ui->outputFolderEdit->setFocus();
 					}
+					else
+					{
+						MessageBeep(MB_ICONWARNING);
+					}
+					CENTER_CURRENT_OUTPUT_FOLDER_DELAYED;
+				}
+				else
+				{
+					throw "Oups, this is not supposed to happen!";
 				}
 			}
-			break;
-		case QEvent::Leave:
-			ui->outputFoldersEditorLabel->setFrameShadow(QFrame::Plain);
-			break;
 		}
 	}
 }