From 3f1a0d6951dbb37fa48539f71769dc852381be2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B3=84=EB=8B=98?= <w7dn1ng75r@gmail.com>
Date: Thu, 22 Jan 2015 02:13:57 +0900
Subject: [PATCH] v2.4.3

---
 arkzip/arkgui/reportgui.cpp                   | 18 +++++++++++++++---
 arkzip/arkgui/ui/DecompressProgressWidget.ui  | 10 ++++++++--
 arkzip/arkgui/ui/decompressprogresswidget.cpp | 19 +++++++++++++++++++
 arkzip/arkgui/ui/decompressprogresswidget.hpp |  2 ++
 changelog.md                                  |  6 ++++++
 version                                       |  2 +-
 6 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/arkzip/arkgui/reportgui.cpp b/arkzip/arkgui/reportgui.cpp
index 04bfbad..53f3fac 100755
--- a/arkzip/arkgui/reportgui.cpp
+++ b/arkzip/arkgui/reportgui.cpp
@@ -1,3 +1,4 @@
+#include <QUrl>
 #include "pause.hpp"
 #include "decompress.hpp"
 #include "reportgui.hpp"
@@ -142,7 +143,10 @@ void ReportGui::setExtractPath(
         QString path ///< 경로
         )
 {
-    QString s = trUtf8("전체 저장 경로는 <b><a href=\"%1\">%1</a></b>입니다.").arg(path);
+    QString s = trUtf8("전체 저장 경로는 <b><a href=\"file://%1\">%2</a></b>입니다.").arg(
+                QUrl::toPercentEncoding(path, "/"),
+                path
+                );
     emit appendMessage(s);
 }
 
@@ -152,7 +156,11 @@ void ReportGui::setSeperatedExtractPath(
         QString path ///< 경로
         )
 {
-    QString s = trUtf8("<b>%1</b>의 저장 경로는 <b><a href=\"%2\">%2</a></b>입니다.").arg(currentFileName, path);
+    QString s = trUtf8("<b>%1</b>의 저장 경로는 <b><a href=\"file://%2\">%3</a></b>입니다.").arg(
+                currentFileName,
+                QUrl::toPercentEncoding(path, "/"),
+                path
+                );
     emit appendMessage(s);
 }
 
@@ -184,6 +192,10 @@ void ReportGui::setMakeFailSeperatedFolder(
         const QString &defaultSavePath  ///< 기본 저장 위치
         )
 {
-    QString errorMesg = trUtf8("압축 파일 %1에 대한 분할된 폴더를 생성하는데 실패했습니다. 기본 위치(%2)에 저장합니다.").arg(archiveFilePath, defaultSavePath);
+    QString errorMesg = trUtf8("압축 파일 %1에 대한 분할된 폴더를 생성하는데 실패했습니다. 기본 위치(<a href=\"file://%2\">%3</a>)에 저장합니다.").arg(
+                archiveFilePath,
+                QUrl::toPercentEncoding(defaultSavePath, "/"),
+                defaultSavePath
+                );
     setWarning(errorMesg);
 }
diff --git a/arkzip/arkgui/ui/DecompressProgressWidget.ui b/arkzip/arkgui/ui/DecompressProgressWidget.ui
index 6695e51..f6bd35b 100755
--- a/arkzip/arkgui/ui/DecompressProgressWidget.ui
+++ b/arkzip/arkgui/ui/DecompressProgressWidget.ui
@@ -26,7 +26,7 @@
    <item>
     <widget class="QWrapLabel" name="archaiveFileName">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -52,7 +52,7 @@
    <item>
     <widget class="QWrapLabel" name="extractFileName">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -115,6 +115,12 @@
      <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAlwaysOff</enum>
      </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="openLinks">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
    <item>
diff --git a/arkzip/arkgui/ui/decompressprogresswidget.cpp b/arkzip/arkgui/ui/decompressprogresswidget.cpp
index 87d5bb6..ce16750 100755
--- a/arkzip/arkgui/ui/decompressprogresswidget.cpp
+++ b/arkzip/arkgui/ui/decompressprogresswidget.cpp
@@ -1,3 +1,5 @@
+#include <QDesktopServices>
+#include <QFileInfo>
 #include <QTimer>
 #include <QCloseEvent>
 #include <QInputDialog>
@@ -27,6 +29,9 @@ DecompressProgressWidget::DecompressProgressWidget(
     //infoBrowser에 출력되는 메시지가 박스 경계에서 줄바꿈 되도록 함.
     ui->infoBrowser->setWordWrapMode(QTextOption::WrapAnywhere);
 
+    //infoBrowser에서 링크를 클릭시 열리도록 설정
+    connect(ui->infoBrowser, SIGNAL(anchorClicked(QUrl)), this, SLOT(openExternalDir(QUrl)));
+
     // < -- 버튼 설정 -- >
     pauseIcon = QIcon::fromTheme(QString::fromUtf8("media-playback-pause"));
     pauseText = trUtf8("일시정지");
@@ -64,6 +69,20 @@ DecompressProgressWidget::DecompressProgressWidget(
     tray->show();
 }
 
+/** 로컬 폴더를 외부 어플리케이션을 사용하여 엽니다.\n
+디렉토리가 아니라면 열지 않습니다.
+  */
+void DecompressProgressWidget::openExternalDir(
+        QUrl dirUrl
+        )
+{
+    if ( ! QFileInfo(dirUrl.toLocalFile()).isDir() )
+    {
+        return;
+    }
+    QDesktopServices::openUrl(dirUrl);
+}
+
 void DecompressProgressWidget::setArchaiveFileName(
         const QString &archiveFileName
         )
diff --git a/arkzip/arkgui/ui/decompressprogresswidget.hpp b/arkzip/arkgui/ui/decompressprogresswidget.hpp
index d5b8680..f266808 100755
--- a/arkzip/arkgui/ui/decompressprogresswidget.hpp
+++ b/arkzip/arkgui/ui/decompressprogresswidget.hpp
@@ -16,6 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #pragma once
 
 #include <QIcon>
+#include <QUrl>
 #include <QWidget>
 
 class TrayIcon;
@@ -49,6 +50,7 @@ class DecompressProgressWidget :
     QIcon arrowDown;   ///< 아래 화살표
 
 public slots:
+    void openExternalDir(QUrl dirUrl);
     void setArchaiveFileName(const QString &archiveFileName);
     void setExtractFileName(const QString &extractFileName);
     void togglePause();
diff --git a/changelog.md b/changelog.md
index 890eeac..cf00677 100644
--- a/changelog.md
+++ b/changelog.md
@@ -468,3 +468,9 @@
 
 + 재부팅 후, 공유 라이브러리를 불러오지 못하던 문제 수정.
 + 버전 옵션(--version)을 추가.
+
+#### v2.4.3
+
++ gui 진행표시창에서 작업 내역을 보여주는 부분에서 외부 링크를 열 수 있도록 수정.
++ gui 분할 저장 폴더 생성 실패시, 기본 위치에 대한 바로가기 링크를 추가함.
++ gui 진행표시창에서 링크를 클릭 할 시, 작업 내역이 사라지던 점 수정.
diff --git a/version b/version
index 8e8299d..35cee72 100755
--- a/version
+++ b/version
@@ -1 +1 @@
-2.4.2
+2.4.3