Ver0.19

diff --git a/README.md b/README.md
index 813cf0b..846bb74 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,15 +3,7 @@ Gefu
 
 Gefu is an Experimental File Utility.
 
-### TODO
-  * オプション
-    * ファンクションキー
-    * キーバインドカスタマイズ
-  * 簡易アーカイバ ← 厳しい
-  * 簡易FTPクライアント ← 厳しい
-  * SNS連携(タイムライン表示とか) ← ファイラーの機能か？
-
-#### Ver0.19
+#### 2014/08/31 Ver0.19
   * 「アーカイバで開く」を追加。
   * パス設定のiniファイルキーを変更(設定が初期化されます)。
   * 非アクティブパネルの色を暗くするオプションを追加。

diff --git a/ReadMe.txt b/ReadMe.txt
index a876257..835bcd7 100644 (file)
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -96,7 +96,7 @@
  Twitter: https://twitter.com/miyabi_satoh\r
 \r
 ◇ 履歴 ◇\r
-#### Ver0.19\r
+#### 2014/08/31 Ver0.19\r
   * 「アーカイバで開く」を追加。\r
   * パス設定のiniファイルキーを変更(設定が初期化されます)。\r
   * 非アクティブパネルの色を暗くするオプションを追加。\r

diff --git a/common.h b/common.h
index 54a47a0..05f7162 100644 (file)
--- a/common.h
+++ b/common.h
@@ -55,6 +55,8 @@ extern void Sleep(int msec);
 #define IniKey_PathEditor               "Path/Editor"\r
 #define IniKey_PathTerminal             "Path/Terminal"\r
 #define IniKey_PathArchiver             "Path/Archiver"\r
+#define IniKey_InflateOptions           "Path/InflateOptions"\r
+#define IniKey_DeflateOptions           "Path/DeflateOptions"\r
 #define IniKey_ViewerFont               "Viewer/Font"\r
 #define IniKey_ViewerColorBg            "Viewer/ColorBg"\r
 #define IniKey_ViewerColorFg            "Viewer/ColorFg"\r

diff --git a/images/Search text.png b/images/Search text.png
new file mode 100644 (file)
index 0000000..f03b299
Binary files /dev/null and b/images/Search text.png differ

diff --git a/main.cpp b/main.cpp
index 2ea99a0..e77fe7e 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -108,14 +108,12 @@ int main(int argc, char *argv[])
         else if (QFileInfo::exists("C:/Program Files/Lhaca/Lhaca.exe")) {\r
             settings.setValue(IniKey_PathArchiver, QQ("C:/Program Files/Lhaca/Lhaca.exe"));\r
         }\r
-        else if (QFileInfo::exists("C:/Program Files/7-zip/7zG.exe")) {\r
-            settings.setValue(IniKey_PathArchiver, QQ("C:/Program Files/7-zip/7zG.exe"));\r
+        else if (QFileInfo::exists("C:/Program Files/7-zip/7zFM.exe")) {\r
+            settings.setValue(IniKey_PathArchiver, QQ("C:/Program Files/7-zip/7zFM.exe"));\r
         }\r
 \r
 #elif defined(Q_OS_MAC)\r
-        if (QFileInfo::exists("/Applications/The Unarchiver.app")) {\r
-            settings.setValue(IniKey_PathArchiver, QQ("/Applications/The Unarchiver.app"));\r
-        }\r
+        settings.setValue(IniKey_PathArchiver, QQ("/System/Library/CoreServices/Archive Utility.app"));\r
 #else\r
 #endif\r
     }\r

diff --git a/preferencedialog.cpp b/preferencedialog.cpp
index 5dcf769..52aefe8 100644 (file)
--- a/preferencedialog.cpp
+++ b/preferencedialog.cpp
@@ -59,9 +59,9 @@ PreferenceDialog::PreferenceDialog(QWidget *parent) :
     connect(ui->importAppearance, SIGNAL(clicked()), this, SLOT(importAppearance()));
     connect(ui->exportAppearance, SIGNAL(clicked()), this, SLOT(exportAppearance()));
 
-    connect(ui->termBrowse, SIGNAL(clicked()), this, SLOT(browseApp()));
-    connect(ui->editorBrowse, SIGNAL(clicked()), this, SLOT(browseApp()));
-    connect(ui->archiverBrowse, SIGNAL(clicked()), this, SLOT(browseApp()));
+    connect(ui->browseArchiver, SIGNAL(clicked()), this, SLOT(browseApp()));
+    connect(ui->browseEditor, SIGNAL(clicked()), this, SLOT(browseApp()));
+    connect(ui->browseTerminal, SIGNAL(clicked()), this, SLOT(browseApp()));
 
     connect(ui->chooseViewerFont, SIGNAL(clicked()), this, SLOT(chooseFont()));
     connect(ui->viewerClrBg, SIGNAL(clicked()), this, SLOT(selectViewerColor()));
@@ -151,7 +151,7 @@ PreferenceDialog::PreferenceDialog(QWidget *parent) :
     // エディタ
     ui->editorPath->setText(settings.value(IniKey_PathEditor).toString());
     // ターミナル
-    ui->termPath->setText(settings.value(IniKey_PathTerminal).toString());
+    ui->terminalPath->setText(settings.value(IniKey_PathTerminal).toString());
     // アーカイバ
     ui->archiverPath->setText(settings.value(IniKey_PathArchiver).toString());
 
@@ -454,13 +454,13 @@ void PreferenceDialog::browseApp()
             path = QQ(path);
         }
 
-        if (sender() == ui->editorBrowse) {
+        if (sender() == ui->browseEditor) {
             ui->editorPath->setText(path);
         }
-        else if (sender() == ui->termBrowse) {
-            ui->termPath->setText(path);
+        else if (sender() == ui->browseTerminal) {
+            ui->terminalPath->setText(path);
         }
-        else if (sender() == ui->archiverBrowse) {
+        else if (sender() == ui->browseArchiver) {
             ui->archiverPath->setText(path);
         }
     }
@@ -562,7 +562,7 @@ void PreferenceDialog::accept()
 
     //>>>>> パス設定
     settings.setValue(IniKey_PathEditor, ui->editorPath->text().trimmed());
-    settings.setValue(IniKey_PathTerminal, ui->termPath->text().trimmed());
+    settings.setValue(IniKey_PathTerminal, ui->terminalPath->text().trimmed());
     settings.setValue(IniKey_PathArchiver, ui->archiverPath->text().trimmed());
 
     //>>>>> テキストビューア

diff --git a/preferencedialog.ui b/preferencedialog.ui
index 7a7389c..3740d85 100644 (file)
--- a/preferencedialog.ui
+++ b/preferencedialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>665</width>
+    <width>671</width>
     <height>535</height>
    </rect>
   </property>
@@ -1307,7 +1307,7 @@
       <attribute name="title">
        <string>パス設定</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_10">
+      <layout class="QVBoxLayout" name="verticalLayout_7">
        <item>
         <widget class="QGroupBox" name="groupBox_9">
          <property name="title">
@@ -1334,7 +1334,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="QPushButton" name="editorBrowse">
+           <widget class="QPushButton" name="browseEditor">
             <property name="text">
              <string>参照</string>
             </property>
@@ -1350,7 +1350,7 @@
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_22">
           <item>
-           <widget class="QLineEdit" name="termPath"/>
+           <widget class="QLineEdit" name="terminalPath"/>
           </item>
           <item>
            <spacer name="horizontalSpacer_25">
@@ -1369,7 +1369,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="QPushButton" name="termBrowse">
+           <widget class="QPushButton" name="browseTerminal">
             <property name="text">
              <string>参照</string>
             </property>
@@ -1383,7 +1383,7 @@
          <property name="title">
           <string>アーカイバ</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_27">
+         <layout class="QHBoxLayout" name="horizontalLayout_23">
           <item>
            <widget class="QLineEdit" name="archiverPath"/>
           </item>
@@ -1404,7 +1404,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="QPushButton" name="archiverBrowse">
+           <widget class="QPushButton" name="browseArchiver">
             <property name="text">
              <string>参照</string>
             </property>
@@ -1427,7 +1427,6 @@
         </spacer>
        </item>
       </layout>
-      <zorder></zorder>
       <zorder>verticalSpacer_4</zorder>
       <zorder>groupBox_9</zorder>
       <zorder>groupBox_10</zorder>
@@ -1847,9 +1846,9 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ
   <tabstop>moveAfterCreate</tabstop>
   <tabstop>openAfterCreate</tabstop>
   <tabstop>editorPath</tabstop>
-  <tabstop>editorBrowse</tabstop>
-  <tabstop>termPath</tabstop>
-  <tabstop>termBrowse</tabstop>
+  <tabstop>browseEditor</tabstop>
+  <tabstop>terminalPath</tabstop>
+  <tabstop>browseTerminal</tabstop>
   <tabstop>chooseViewerFont</tabstop>
   <tabstop>viewerClrFg</tabstop>
   <tabstop>viewerClrBg</tabstop>

diff --git a/resource.qrc b/resource.qrc
index d970026..3ce7581 100644 (file)
--- a/resource.qrc
+++ b/resource.qrc
@@ -35,5 +35,6 @@
         <file>images/utilities_file_archiver.png</file>
         <file>images/Zoom in.png</file>
         <file>images/Zoom out.png</file>
+        <file>images/Search text.png</file>
     </qresource>
 </RCC>