Skip to content

Commit

Permalink
v2.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
tb69wn6127 committed Jan 21, 2015
1 parent 8d10b51 commit 3f1a0d6
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 6 deletions.
18 changes: 15 additions & 3 deletions arkzip/arkgui/reportgui.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <QUrl>
#include "pause.hpp"
#include "decompress.hpp"
#include "reportgui.hpp"
Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down Expand Up @@ -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);
}
10 changes: 8 additions & 2 deletions arkzip/arkgui/ui/DecompressProgressWidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
19 changes: 19 additions & 0 deletions arkzip/arkgui/ui/decompressprogresswidget.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include <QDesktopServices>
#include <QFileInfo>
#include <QTimer>
#include <QCloseEvent>
#include <QInputDialog>
Expand Down Expand Up @@ -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("일시정지");
Expand Down Expand Up @@ -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
)
Expand Down
2 changes: 2 additions & 0 deletions arkzip/arkgui/ui/decompressprogresswidget.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -468,3 +468,9 @@

+ 재부팅 후, 공유 라이브러리를 불러오지 못하던 문제 수정.
+ 버전 옵션(--version)을 추가.

#### v2.4.3

+ gui 진행표시창에서 작업 내역을 보여주는 부분에서 외부 링크를 열 수 있도록 수정.
+ gui 분할 저장 폴더 생성 실패시, 기본 위치에 대한 바로가기 링크를 추가함.
+ gui 진행표시창에서 링크를 클릭 할 시, 작업 내역이 사라지던 점 수정.
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.2
2.4.3

0 comments on commit 3f1a0d6

Please sign in to comment.