Ver0.19

diff --git a/README.md b/README.md
index 216e2ac..813cf0b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -12,8 +12,12 @@ Gefu is an Experimental File Utility.
   * SNS連携(タイムライン表示とか) ← ファイラーの機能か？
 
 #### Ver0.19
+  * 「アーカイバで開く」を追加。
+  * パス設定のiniファイルキーを変更(設定が初期化されます)。
   * 非アクティブパネルの色を暗くするオプションを追加。
-  * 設定ダイアログのレイアウト変更。
+  * 「パネル」メニューを追加。
+  * 設定ダイアログのレイアウト変更、項目追加削除。
+  * コンテキストメニューにあるコマンドをツールバーから削除。
   * 不具合修正
     * 一部のショートカットキーが効いていなかったのを修正。
 

diff --git a/ReadMe.txt b/ReadMe.txt
index 3b152fd..a876257 100644 (file)
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -97,8 +97,12 @@
 \r
 ◇ 履歴 ◇\r
 #### Ver0.19\r
+  * 「アーカイバで開く」を追加。\r
+  * パス設定のiniファイルキーを変更(設定が初期化されます)。\r
   * 非アクティブパネルの色を暗くするオプションを追加。\r
-  * 設定ダイアログのレイアウト変更。\r
+  * 「パネル」メニューを追加。\r
+  * 設定ダイアログのレイアウト変更、項目追加削除。\r
+  * コンテキストメニューにあるコマンドをツールバーから削除。\r
   * 不具合修正\r
     * 一部のショートカットキーが効いていなかったのを修正。\r
 \r

diff --git a/common.h b/common.h
index 80e4b47..54a47a0 100644 (file)
--- a/common.h
+++ b/common.h
@@ -52,10 +52,9 @@ extern void Sleep(int msec);
 #define IniKey_AutoCloseMove            "AutoClose/Move"\r
 #define IniKey_AutoCloseDelete          "AutoClose/Delete"\r
 #define IniKey_AutoCloseRename          "AutoClose/Rename"\r
-#define IniKey_EditorPath               "Editor/Path"\r
-#define IniKey_EditorOption             "Editor/Option"\r
-#define IniKey_TerminalPath             "Terminal/Path"\r
-#define IniKey_TerminalOption           "Terminal/Option"\r
+#define IniKey_PathEditor               "Path/Editor"\r
+#define IniKey_PathTerminal             "Path/Terminal"\r
+#define IniKey_PathArchiver             "Path/Archiver"\r
 #define IniKey_ViewerFont               "Viewer/Font"\r
 #define IniKey_ViewerColorBg            "Viewer/ColorBg"\r
 #define IniKey_ViewerColorFg            "Viewer/ColorFg"\r

diff --git a/images/16 colors.png b/images/16 colors.png
deleted file mode 100644 (file)
index 734447c..0000000
Binary files a/images/16 colors.png and /dev/null differ

diff --git a/images/256 colors.png b/images/256 colors.png
deleted file mode 100644 (file)
index e303bf0..0000000
Binary files a/images/256 colors.png and /dev/null differ

diff --git a/images/3d bar chart.png b/images/3d bar chart.png
deleted file mode 100644 (file)
index 96a477e..0000000
Binary files a/images/3d bar chart.png and /dev/null differ

diff --git a/images/3d chart.png b/images/3d chart.png
deleted file mode 100644 (file)
index f207815..0000000
Binary files a/images/3d chart.png and /dev/null differ

diff --git a/images/3d graph.png b/images/3d graph.png
deleted file mode 100644 (file)
index a401360..0000000
Binary files a/images/3d graph.png and /dev/null differ

diff --git a/images/About.png b/images/About.png
deleted file mode 100644 (file)
index aeb673e..0000000
Binary files a/images/About.png and /dev/null differ

diff --git a/images/Add.png b/images/Add.png
deleted file mode 100644 (file)
index 070e4aa..0000000
Binary files a/images/Add.png and /dev/null differ

diff --git a/images/Angle.png b/images/Angle.png
deleted file mode 100644 (file)
index cab2242..0000000
Binary files a/images/Angle.png and /dev/null differ

diff --git a/images/Apply.png b/images/Apply.png
deleted file mode 100644 (file)
index d54358e..0000000
Binary files a/images/Apply.png and /dev/null differ

diff --git a/images/Arc.png b/images/Arc.png
deleted file mode 100644 (file)
index cd45e02..0000000
Binary files a/images/Arc.png and /dev/null differ

diff --git a/images/Arrow.png b/images/Arrow.png
deleted file mode 100644 (file)
index fb54b8a..0000000
Binary files a/images/Arrow.png and /dev/null differ

diff --git a/images/Attach.png b/images/Attach.png
deleted file mode 100644 (file)
index ac84564..0000000
Binary files a/images/Attach.png and /dev/null differ

diff --git a/images/Bitmap editor.png b/images/Bitmap editor.png
deleted file mode 100644 (file)
index c11c5c7..0000000
Binary files a/images/Bitmap editor.png and /dev/null differ

diff --git a/images/Brightness.png b/images/Brightness.png
deleted file mode 100644 (file)
index 9280943..0000000
Binary files a/images/Brightness.png and /dev/null differ

diff --git a/images/Brush.png b/images/Brush.png
deleted file mode 100644 (file)
index a847d8f..0000000
Binary files a/images/Brush.png and /dev/null differ

diff --git a/images/CMYK.png b/images/CMYK.png
deleted file mode 100644 (file)
index 72cf9d5..0000000
Binary files a/images/CMYK.png and /dev/null differ

diff --git a/images/Camera.png b/images/Camera.png
deleted file mode 100644 (file)
index 6b9b5ca..0000000
Binary files a/images/Camera.png and /dev/null differ

diff --git a/images/Chart xy.png b/images/Chart xy.png
deleted file mode 100644 (file)
index c355cf9..0000000
Binary files a/images/Chart xy.png and /dev/null differ

diff --git a/images/Circle.png b/images/Circle.png
deleted file mode 100644 (file)
index 3d16b43..0000000
Binary files a/images/Circle.png and /dev/null differ

diff --git a/images/Clear.png b/images/Clear.png
deleted file mode 100644 (file)
index e0008fd..0000000
Binary files a/images/Clear.png and /dev/null differ

diff --git a/images/Clipboard.png b/images/Clipboard.png
deleted file mode 100644 (file)
index 0584ed6..0000000
Binary files a/images/Clipboard.png and /dev/null differ

diff --git a/images/Close folder.png b/images/Close folder.png
deleted file mode 100644 (file)
index 6a58a53..0000000
Binary files a/images/Close folder.png and /dev/null differ

diff --git a/images/Close.png b/images/Close.png
deleted file mode 100644 (file)
index 3916656..0000000
Binary files a/images/Close.png and /dev/null differ

diff --git a/images/Coffe.png b/images/Coffe.png
deleted file mode 100644 (file)
index 76ecf09..0000000
Binary files a/images/Coffe.png and /dev/null differ

diff --git a/images/Coffee.png b/images/Coffee.png
deleted file mode 100644 (file)
index 76ecf09..0000000
Binary files a/images/Coffee.png and /dev/null differ

diff --git a/images/Color balance.png b/images/Color balance.png
deleted file mode 100644 (file)
index 765114c..0000000
Binary files a/images/Color balance.png and /dev/null differ

diff --git a/images/Color filter.png b/images/Color filter.png
deleted file mode 100644 (file)
index 691a341..0000000
Binary files a/images/Color filter.png and /dev/null differ

diff --git a/images/Color layers.png b/images/Color layers.png
deleted file mode 100644 (file)
index 529bab3..0000000
Binary files a/images/Color layers.png and /dev/null differ

diff --git a/images/Color palette.png b/images/Color palette.png
deleted file mode 100644 (file)
index 4d702dd..0000000
Binary files a/images/Color palette.png and /dev/null differ

diff --git a/images/Color profile.png b/images/Color profile.png
deleted file mode 100644 (file)
index 36da96f..0000000
Binary files a/images/Color profile.png and /dev/null differ

diff --git a/images/Color test.png b/images/Color test.png
deleted file mode 100644 (file)
index 563aa5d..0000000
Binary files a/images/Color test.png and /dev/null differ

diff --git a/images/Color.png b/images/Color.png
deleted file mode 100644 (file)
index 18a5884..0000000
Binary files a/images/Color.png and /dev/null differ

diff --git a/images/Comment.png b/images/Comment.png
deleted file mode 100644 (file)
index ae6e46e..0000000
Binary files a/images/Comment.png and /dev/null differ

diff --git a/images/Contrast.png b/images/Contrast.png
deleted file mode 100644 (file)
index 50d91d0..0000000
Binary files a/images/Contrast.png and /dev/null differ

diff --git a/images/Create.png b/images/Create.png
deleted file mode 100644 (file)
index 3c78c2e..0000000
Binary files a/images/Create.png and /dev/null differ

diff --git a/images/Critical details.png b/images/Critical details.png
deleted file mode 100644 (file)
index eeedb3b..0000000
Binary files a/images/Critical details.png and /dev/null differ

diff --git a/images/Curve points.png b/images/Curve points.png
deleted file mode 100644 (file)
index 0b054e0..0000000
Binary files a/images/Curve points.png and /dev/null differ

diff --git a/images/Curve.png b/images/Curve.png
deleted file mode 100644 (file)
index 745cc10..0000000
Binary files a/images/Curve.png and /dev/null differ

diff --git a/images/Cut.png b/images/Cut.png
deleted file mode 100644 (file)
index 7e3550d..0000000
Binary files a/images/Cut.png and /dev/null differ

diff --git a/images/Danger.png b/images/Danger.png
deleted file mode 100644 (file)
index 0788bec..0000000
Binary files a/images/Danger.png and /dev/null differ

diff --git a/images/Decrease time.png b/images/Decrease time.png
deleted file mode 100644 (file)
index 861639c..0000000
Binary files a/images/Decrease time.png and /dev/null differ

diff --git a/images/Delete frame.png b/images/Delete frame.png
deleted file mode 100644 (file)
index b0c3f30..0000000
Binary files a/images/Delete frame.png and /dev/null differ

diff --git a/images/Delete frames.png b/images/Delete frames.png
deleted file mode 100644 (file)
index a2931f1..0000000
Binary files a/images/Delete frames.png and /dev/null differ

diff --git a/images/Delete.png b/images/Delete.png
deleted file mode 100644 (file)
index ce4eb18..0000000
Binary files a/images/Delete.png and /dev/null differ

diff --git a/images/Designer.png b/images/Designer.png
deleted file mode 100644 (file)
index 3b70e95..0000000
Binary files a/images/Designer.png and /dev/null differ

diff --git a/images/Diagram.png b/images/Diagram.png
deleted file mode 100644 (file)
index fa6b1b6..0000000
Binary files a/images/Diagram.png and /dev/null differ

diff --git a/images/Down.png b/images/Down.png
deleted file mode 100644 (file)
index 111ff8d..0000000
Binary files a/images/Down.png and /dev/null differ

diff --git a/images/Download image.png b/images/Download image.png
deleted file mode 100644 (file)
index 0bbd117..0000000
Binary files a/images/Download image.png and /dev/null differ

diff --git a/images/Download.png b/images/Download.png
deleted file mode 100644 (file)
index 53de7e0..0000000
Binary files a/images/Download.png and /dev/null differ

diff --git a/images/Dropper.png b/images/Dropper.png
deleted file mode 100644 (file)
index e3d084a..0000000
Binary files a/images/Dropper.png and /dev/null differ

diff --git a/images/E-mail.png b/images/E-mail.png
deleted file mode 100644 (file)
index 5768db6..0000000
Binary files a/images/E-mail.png and /dev/null differ

diff --git a/images/Edit text.png b/images/Edit text.png
deleted file mode 100644 (file)
index 1ff0c6a..0000000
Binary files a/images/Edit text.png and /dev/null differ

diff --git a/images/Edit.png b/images/Edit.png
deleted file mode 100644 (file)
index 09222cf..0000000
Binary files a/images/Edit.png and /dev/null differ

diff --git a/images/Ellipse.png b/images/Ellipse.png
deleted file mode 100644 (file)
index 01324c2..0000000
Binary files a/images/Ellipse.png and /dev/null differ

diff --git a/images/Equipment.png b/images/Equipment.png
deleted file mode 100644 (file)
index 3c27071..0000000
Binary files a/images/Equipment.png and /dev/null differ

diff --git a/images/Erase.png b/images/Erase.png
deleted file mode 100644 (file)
index 60d06f6..0000000
Binary files a/images/Erase.png and /dev/null differ

diff --git a/images/Eraser.png b/images/Eraser.png
deleted file mode 100644 (file)
index cc6e160..0000000
Binary files a/images/Eraser.png and /dev/null differ

diff --git a/images/Error.png b/images/Error.png
deleted file mode 100644 (file)
index 530243a..0000000
Binary files a/images/Error.png and /dev/null differ

diff --git a/images/Feather.png b/images/Feather.png
deleted file mode 100644 (file)
index d9c88a7..0000000
Binary files a/images/Feather.png and /dev/null differ

diff --git a/images/File exetension.png b/images/File exetension.png
deleted file mode 100644 (file)
index caa51e4..0000000
Binary files a/images/File exetension.png and /dev/null differ

diff --git a/images/Fill.png b/images/Fill.png
deleted file mode 100644 (file)
index 419484e..0000000
Binary files a/images/Fill.png and /dev/null differ

diff --git a/images/Find.png b/images/Find.png
deleted file mode 100644 (file)
index 8585bba..0000000
Binary files a/images/Find.png and /dev/null differ

diff --git a/images/Fine brush.png b/images/Fine brush.png
deleted file mode 100644 (file)
index d15ed20..0000000
Binary files a/images/Fine brush.png and /dev/null differ

diff --git a/images/Flip horizontally.png b/images/Flip horizontally.png
deleted file mode 100644 (file)
index d9947a6..0000000
Binary files a/images/Flip horizontally.png and /dev/null differ

diff --git a/images/Flip vertically.png b/images/Flip vertically.png
deleted file mode 100644 (file)
index fea6ed2..0000000
Binary files a/images/Flip vertically.png and /dev/null differ

diff --git a/images/Flow block.png b/images/Flow block.png
deleted file mode 100644 (file)
index 4fce4c4..0000000
Binary files a/images/Flow block.png and /dev/null differ

diff --git a/images/Flower.png b/images/Flower.png
deleted file mode 100644 (file)
index 264497f..0000000
Binary files a/images/Flower.png and /dev/null differ

diff --git a/images/Form.png b/images/Form.png
deleted file mode 100644 (file)
index 1207169..0000000
Binary files a/images/Form.png and /dev/null differ

diff --git a/images/Frames.png b/images/Frames.png
deleted file mode 100644 (file)
index da2d4cc..0000000
Binary files a/images/Frames.png and /dev/null differ

diff --git a/images/Gpadient.png b/images/Gpadient.png
deleted file mode 100644 (file)
index f9b0a56..0000000
Binary files a/images/Gpadient.png and /dev/null differ

diff --git a/images/Graphic designer.png b/images/Graphic designer.png
deleted file mode 100644 (file)
index 750c794..0000000
Binary files a/images/Graphic designer.png and /dev/null differ

diff --git a/images/Graphic file.png b/images/Graphic file.png
deleted file mode 100644 (file)
index be3c48c..0000000
Binary files a/images/Graphic file.png and /dev/null differ

diff --git a/images/Graphic tools.png b/images/Graphic tools.png
deleted file mode 100644 (file)
index 2b9a8bc..0000000
Binary files a/images/Graphic tools.png and /dev/null differ

diff --git a/images/Grid.png b/images/Grid.png
deleted file mode 100644 (file)
index cd3ed73..0000000
Binary files a/images/Grid.png and /dev/null differ

diff --git a/images/HSL.png b/images/HSL.png
deleted file mode 100644 (file)
index f2ac420..0000000
Binary files a/images/HSL.png and /dev/null differ

diff --git a/images/HSV.png b/images/HSV.png
deleted file mode 100644 (file)
index d5f493b..0000000
Binary files a/images/HSV.png and /dev/null differ

diff --git a/images/Help book.png b/images/Help book.png
deleted file mode 100644 (file)
index 382c111..0000000
Binary files a/images/Help book.png and /dev/null differ

diff --git a/images/Hexagon.png b/images/Hexagon.png
deleted file mode 100644 (file)
index 309ebbc..0000000
Binary files a/images/Hexagon.png and /dev/null differ

diff --git a/images/Hide.png b/images/Hide.png
deleted file mode 100644 (file)
index d096d5d..0000000
Binary files a/images/Hide.png and /dev/null differ

diff --git a/images/Hint.png b/images/Hint.png
deleted file mode 100644 (file)
index f9f6abe..0000000
Binary files a/images/Hint.png and /dev/null differ

diff --git a/images/Hints.png b/images/Hints.png
deleted file mode 100644 (file)
index 81bb80c..0000000
Binary files a/images/Hints.png and /dev/null differ

diff --git a/images/Homepage.png b/images/Homepage.png
deleted file mode 100644 (file)
index 74f550c..0000000
Binary files a/images/Homepage.png and /dev/null differ

diff --git a/images/Ico.png b/images/Ico.png
deleted file mode 100644 (file)
index 391266e..0000000
Binary files a/images/Ico.png and /dev/null differ

diff --git a/images/Icon wizard.png b/images/Icon wizard.png
deleted file mode 100644 (file)
index a911bd2..0000000
Binary files a/images/Icon wizard.png and /dev/null differ

diff --git a/images/Import.png b/images/Import.png
deleted file mode 100644 (file)
index 462ff36..0000000
Binary files a/images/Import.png and /dev/null differ

diff --git a/images/Increase time.png b/images/Increase time.png
deleted file mode 100644 (file)
index 6a5cb36..0000000
Binary files a/images/Increase time.png and /dev/null differ

diff --git a/images/Index.png b/images/Index.png
deleted file mode 100644 (file)
index fe5d19e..0000000
Binary files a/images/Index.png and /dev/null differ

diff --git a/images/Info.png b/images/Info.png
deleted file mode 100644 (file)
index 73b49b0..0000000
Binary files a/images/Info.png and /dev/null differ

diff --git a/images/Key.png b/images/Key.png
deleted file mode 100644 (file)
index 11b4288..0000000
Binary files a/images/Key.png and /dev/null differ

diff --git a/images/Knife.png b/images/Knife.png
deleted file mode 100644 (file)
index 4b2a065..0000000
Binary files a/images/Knife.png and /dev/null differ

diff --git a/images/LAB color model.png b/images/LAB color model.png
deleted file mode 100644 (file)
index 03d9662..0000000
Binary files a/images/LAB color model.png and /dev/null differ

diff --git a/images/Layers.png b/images/Layers.png
deleted file mode 100644 (file)
index 4f34ab3..0000000
Binary files a/images/Layers.png and /dev/null differ

diff --git a/images/Left-right.png b/images/Left-right.png
deleted file mode 100644 (file)
index d5eb683..0000000
Binary files a/images/Left-right.png and /dev/null differ

diff --git a/images/Left.png b/images/Left.png
deleted file mode 100644 (file)
index 9808eff..0000000
Binary files a/images/Left.png and /dev/null differ

diff --git a/images/Line.png b/images/Line.png
deleted file mode 100644 (file)
index 6af8635..0000000
Binary files a/images/Line.png and /dev/null differ

diff --git a/images/List.png b/images/List.png
deleted file mode 100644 (file)
index 8609a04..0000000
Binary files a/images/List.png and /dev/null differ

diff --git a/images/Lock color.png b/images/Lock color.png
deleted file mode 100644 (file)
index 98353a5..0000000
Binary files a/images/Lock color.png and /dev/null differ

diff --git a/images/Lock transparency.png b/images/Lock transparency.png
deleted file mode 100644 (file)
index 942515d..0000000
Binary files a/images/Lock transparency.png and /dev/null differ

diff --git a/images/Lock.png b/images/Lock.png
deleted file mode 100644 (file)
index 1685559..0000000
Binary files a/images/Lock.png and /dev/null differ

diff --git a/images/Magic hat.png b/images/Magic hat.png
deleted file mode 100644 (file)
index cc590e1..0000000
Binary files a/images/Magic hat.png and /dev/null differ

diff --git a/images/Measure.png b/images/Measure.png
deleted file mode 100644 (file)
index e95239d..0000000
Binary files a/images/Measure.png and /dev/null differ

diff --git a/images/Microsoft flag.png b/images/Microsoft flag.png
deleted file mode 100644 (file)
index 7698f60..0000000
Binary files a/images/Microsoft flag.png and /dev/null differ

diff --git a/images/Monitors.png b/images/Monitors.png
deleted file mode 100644 (file)
index 4471803..0000000
Binary files a/images/Monitors.png and /dev/null differ

diff --git a/images/Mouse pointer.png b/images/Mouse pointer.png
deleted file mode 100644 (file)
index 127b8b1..0000000
Binary files a/images/Mouse pointer.png and /dev/null differ

diff --git a/images/Mouse.png b/images/Mouse.png
deleted file mode 100644 (file)
index c70c132..0000000
Binary files a/images/Mouse.png and /dev/null differ

diff --git a/images/Move.png b/images/Move.png
deleted file mode 100644 (file)
index fefb654..0000000
Binary files a/images/Move.png and /dev/null differ

diff --git a/images/Movie.png b/images/Movie.png
deleted file mode 100644 (file)
index f1f8f22..0000000
Binary files a/images/Movie.png and /dev/null differ

diff --git a/images/New clip art.png b/images/New clip art.png
deleted file mode 100644 (file)
index 73bb015..0000000
Binary files a/images/New clip art.png and /dev/null differ

diff --git a/images/New frame.png b/images/New frame.png
deleted file mode 100644 (file)
index 7d1d11c..0000000
Binary files a/images/New frame.png and /dev/null differ

diff --git a/images/New frame1.png b/images/New frame1.png
deleted file mode 100644 (file)
index 2592cc3..0000000
Binary files a/images/New frame1.png and /dev/null differ

diff --git a/images/New image.png b/images/New image.png
deleted file mode 100644 (file)
index cd32a7b..0000000
Binary files a/images/New image.png and /dev/null differ

diff --git a/images/New imagelist.png b/images/New imagelist.png
deleted file mode 100644 (file)
index 68080e9..0000000
Binary files a/images/New imagelist.png and /dev/null differ

diff --git a/images/New video.png b/images/New video.png
deleted file mode 100644 (file)
index 416c249..0000000
Binary files a/images/New video.png and /dev/null differ

diff --git a/images/No.png b/images/No.png
deleted file mode 100644 (file)
index 658865b..0000000
Binary files a/images/No.png and /dev/null differ

diff --git a/images/Objects.png b/images/Objects.png
deleted file mode 100644 (file)
index 781298a..0000000
Binary files a/images/Objects.png and /dev/null differ

diff --git a/images/Open colors.png b/images/Open colors.png
deleted file mode 100644 (file)
index df4968b..0000000
Binary files a/images/Open colors.png and /dev/null differ

diff --git a/images/Open file.png b/images/Open file.png
deleted file mode 100644 (file)
index 55ee885..0000000
Binary files a/images/Open file.png and /dev/null differ

diff --git a/images/Open v2.png b/images/Open v2.png
deleted file mode 100644 (file)
index e77fc6e..0000000
Binary files a/images/Open v2.png and /dev/null differ

diff --git a/images/Paint over pixels.png b/images/Paint over pixels.png
deleted file mode 100644 (file)
index c3cf2a2..0000000
Binary files a/images/Paint over pixels.png and /dev/null differ

diff --git a/images/Painter.png b/images/Painter.png
deleted file mode 100644 (file)
index 401d094..0000000
Binary files a/images/Painter.png and /dev/null differ

diff --git a/images/Pantone.png b/images/Pantone.png
deleted file mode 100644 (file)
index 8a3cad1..0000000
Binary files a/images/Pantone.png and /dev/null differ

diff --git a/images/Pen.png b/images/Pen.png
deleted file mode 100644 (file)
index 86f9824..0000000
Binary files a/images/Pen.png and /dev/null differ

diff --git a/images/Pencil.png b/images/Pencil.png
deleted file mode 100644 (file)
index 82ed03a..0000000
Binary files a/images/Pencil.png and /dev/null differ

diff --git a/images/Pick color.png b/images/Pick color.png
deleted file mode 100644 (file)
index 3f262a7..0000000
Binary files a/images/Pick color.png and /dev/null differ

diff --git a/images/Picture.png b/images/Picture.png
deleted file mode 100644 (file)
index c992023..0000000
Binary files a/images/Picture.png and /dev/null differ

diff --git a/images/Pie chart.png b/images/Pie chart.png
deleted file mode 100644 (file)
index 313389a..0000000
Binary files a/images/Pie chart.png and /dev/null differ

diff --git a/images/Pin.png b/images/Pin.png
deleted file mode 100644 (file)
index 2d4e823..0000000
Binary files a/images/Pin.png and /dev/null differ

diff --git a/images/Pinion.png b/images/Pinion.png
deleted file mode 100644 (file)
index 1b1d5a3..0000000
Binary files a/images/Pinion.png and /dev/null differ

diff --git a/images/Pixel editor.png b/images/Pixel editor.png
deleted file mode 100644 (file)
index 1ff53e0..0000000
Binary files a/images/Pixel editor.png and /dev/null differ

diff --git a/images/Pixels.png b/images/Pixels.png
deleted file mode 100644 (file)
index 9d894b1..0000000
Binary files a/images/Pixels.png and /dev/null differ

diff --git a/images/Print.png b/images/Print.png
deleted file mode 100644 (file)
index d813288..0000000
Binary files a/images/Print.png and /dev/null differ

diff --git a/images/Problem.png b/images/Problem.png
deleted file mode 100644 (file)
index fc9304e..0000000
Binary files a/images/Problem.png and /dev/null differ

diff --git a/images/Properties.png b/images/Properties.png
deleted file mode 100644 (file)
index f5b4054..0000000
Binary files a/images/Properties.png and /dev/null differ

diff --git a/images/RGB.png b/images/RGB.png
deleted file mode 100644 (file)
index 2f2c88e..0000000
Binary files a/images/RGB.png and /dev/null differ

diff --git a/images/Red book.png b/images/Red book.png
deleted file mode 100644 (file)
index b4ffb42..0000000
Binary files a/images/Red book.png and /dev/null differ

diff --git a/images/Red eye removing.png b/images/Red eye removing.png
deleted file mode 100644 (file)
index c5b1432..0000000
Binary files a/images/Red eye removing.png and /dev/null differ

diff --git a/images/Redo.png b/images/Redo.png
deleted file mode 100644 (file)
index 52c35d1..0000000
Binary files a/images/Redo.png and /dev/null differ

diff --git a/images/Registration.png b/images/Registration.png
deleted file mode 100644 (file)
index f7200d9..0000000
Binary files a/images/Registration.png and /dev/null differ

diff --git a/images/Registry.png b/images/Registry.png
deleted file mode 100644 (file)
index 8bd36c9..0000000
Binary files a/images/Registry.png and /dev/null differ

diff --git a/images/Replace pixels.png b/images/Replace pixels.png
deleted file mode 100644 (file)
index 52d1472..0000000
Binary files a/images/Replace pixels.png and /dev/null differ

diff --git a/images/Resize image.png b/images/Resize image.png
deleted file mode 100644 (file)
index 724fdb0..0000000
Binary files a/images/Resize image.png and /dev/null differ

diff --git a/images/Restangle.png b/images/Restangle.png
deleted file mode 100644 (file)
index 6f8c57b..0000000
Binary files a/images/Restangle.png and /dev/null differ

diff --git a/images/Revert.png b/images/Revert.png
deleted file mode 100644 (file)
index 18daed4..0000000
Binary files a/images/Revert.png and /dev/null differ

diff --git a/images/Right.png b/images/Right.png
deleted file mode 100644 (file)
index a59d72b..0000000
Binary files a/images/Right.png and /dev/null differ

diff --git a/images/Rotate CCW.png b/images/Rotate CCW.png
deleted file mode 100644 (file)
index 7c85283..0000000
Binary files a/images/Rotate CCW.png and /dev/null differ

diff --git a/images/Rotate CW.png b/images/Rotate CW.png
deleted file mode 100644 (file)
index abd1bf5..0000000
Binary files a/images/Rotate CW.png and /dev/null differ

diff --git a/images/Rotate left.png b/images/Rotate left.png
deleted file mode 100644 (file)
index ec27287..0000000
Binary files a/images/Rotate left.png and /dev/null differ

diff --git a/images/Rotate right.png b/images/Rotate right.png
deleted file mode 100644 (file)
index f83ef25..0000000
Binary files a/images/Rotate right.png and /dev/null differ

diff --git a/images/Rotation.png b/images/Rotation.png
deleted file mode 100644 (file)
index 4c4c734..0000000
Binary files a/images/Rotation.png and /dev/null differ

diff --git a/images/Rounded rectangle.png b/images/Rounded rectangle.png
deleted file mode 100644 (file)
index 230397b..0000000
Binary files a/images/Rounded rectangle.png and /dev/null differ

diff --git a/images/Save as.png b/images/Save as.png
deleted file mode 100644 (file)
index 0a213db..0000000
Binary files a/images/Save as.png and /dev/null differ

diff --git a/images/Save color.png b/images/Save color.png
deleted file mode 100644 (file)
index 3473fce..0000000
Binary files a/images/Save color.png and /dev/null differ

diff --git a/images/Save data.png b/images/Save data.png
deleted file mode 100644 (file)
index 35e9fd3..0000000
Binary files a/images/Save data.png and /dev/null differ

diff --git a/images/Save image.png b/images/Save image.png
deleted file mode 100644 (file)
index 7b7db85..0000000
Binary files a/images/Save image.png and /dev/null differ

diff --git a/images/Save picture.png b/images/Save picture.png
deleted file mode 100644 (file)
index f9d0487..0000000
Binary files a/images/Save picture.png and /dev/null differ

diff --git a/images/Save.png b/images/Save.png
deleted file mode 100644 (file)
index 1732110..0000000
Binary files a/images/Save.png and /dev/null differ

diff --git a/images/Scan film.png b/images/Scan film.png
deleted file mode 100644 (file)
index 230dbac..0000000
Binary files a/images/Scan film.png and /dev/null differ

diff --git a/images/Scan image.png b/images/Scan image.png
deleted file mode 100644 (file)
index b2f8ac7..0000000
Binary files a/images/Scan image.png and /dev/null differ

diff --git a/images/Scanner.png b/images/Scanner.png
deleted file mode 100644 (file)
index 59c4bc0..0000000
Binary files a/images/Scanner.png and /dev/null differ

diff --git a/images/Scenario.png b/images/Scenario.png
deleted file mode 100644 (file)
index bf5fafd..0000000
Binary files a/images/Scenario.png and /dev/null differ

diff --git a/images/Script.png b/images/Script.png
deleted file mode 100644 (file)
index 9c79ece..0000000
Binary files a/images/Script.png and /dev/null differ

diff --git a/images/Search computer.png b/images/Search computer.png
deleted file mode 100644 (file)
index 3c2ffe7..0000000
Binary files a/images/Search computer.png and /dev/null differ

diff --git a/images/Search folder.png b/images/Search folder.png
deleted file mode 100644 (file)
index 81deb74..0000000
Binary files a/images/Search folder.png and /dev/null differ

diff --git a/images/Search online.png b/images/Search online.png
deleted file mode 100644 (file)
index 32f22c3..0000000
Binary files a/images/Search online.png and /dev/null differ

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

diff --git a/images/Select gpadient.png b/images/Select gpadient.png
deleted file mode 100644 (file)
index f07d3aa..0000000
Binary files a/images/Select gpadient.png and /dev/null differ

diff --git a/images/Selection.png b/images/Selection.png
deleted file mode 100644 (file)
index e0bd014..0000000
Binary files a/images/Selection.png and /dev/null differ

diff --git a/images/Sharpness.png b/images/Sharpness.png
deleted file mode 100644 (file)
index 4aaded6..0000000
Binary files a/images/Sharpness.png and /dev/null differ

diff --git a/images/Show.png b/images/Show.png
deleted file mode 100644 (file)
index ca3ff94..0000000
Binary files a/images/Show.png and /dev/null differ

diff --git a/images/Sizes.png b/images/Sizes.png
deleted file mode 100644 (file)
index 175ccca..0000000
Binary files a/images/Sizes.png and /dev/null differ

diff --git a/images/Smooth line.png b/images/Smooth line.png
deleted file mode 100644 (file)
index fb2346a..0000000
Binary files a/images/Smooth line.png and /dev/null differ

diff --git a/images/Smooth.png b/images/Smooth.png
deleted file mode 100644 (file)
index 06328d2..0000000
Binary files a/images/Smooth.png and /dev/null differ

diff --git a/images/Spell checking.png b/images/Spell checking.png
deleted file mode 100644 (file)
index 2744843..0000000
Binary files a/images/Spell checking.png and /dev/null differ

diff --git a/images/Spiral.png b/images/Spiral.png
deleted file mode 100644 (file)
index 2be3697..0000000
Binary files a/images/Spiral.png and /dev/null differ

diff --git a/images/Spray.png b/images/Spray.png
deleted file mode 100644 (file)
index 9a7a1a4..0000000
Binary files a/images/Spray.png and /dev/null differ

diff --git a/images/Square.png b/images/Square.png
deleted file mode 100644 (file)
index 93f29e9..0000000
Binary files a/images/Square.png and /dev/null differ

diff --git a/images/Stop playing.png b/images/Stop playing.png
deleted file mode 100644 (file)
index b1c50ee..0000000
Binary files a/images/Stop playing.png and /dev/null differ

diff --git a/images/Stop.png b/images/Stop.png
deleted file mode 100644 (file)
index 9da38fa..0000000
Binary files a/images/Stop.png and /dev/null differ

diff --git a/images/Synchronize.png b/images/Synchronize.png
deleted file mode 100644 (file)
index 6680a2d..0000000
Binary files a/images/Synchronize.png and /dev/null differ

diff --git a/images/Tag.png b/images/Tag.png
deleted file mode 100644 (file)
index 89515d0..0000000
Binary files a/images/Tag.png and /dev/null differ

diff --git a/images/Target.png b/images/Target.png
deleted file mode 100644 (file)
index bd88930..0000000
Binary files a/images/Target.png and /dev/null differ

diff --git a/images/Target1.png b/images/Target1.png
deleted file mode 100644 (file)
index 48d0669..0000000
Binary files a/images/Target1.png and /dev/null differ

diff --git a/images/Test line.png b/images/Test line.png
deleted file mode 100644 (file)
index 78183a5..0000000
Binary files a/images/Test line.png and /dev/null differ

diff --git a/images/Text color.png b/images/Text color.png
deleted file mode 100644 (file)
index c790fc4..0000000
Binary files a/images/Text color.png and /dev/null differ

diff --git a/images/Text replace.png b/images/Text replace.png
deleted file mode 100644 (file)
index e27155c..0000000
Binary files a/images/Text replace.png and /dev/null differ

diff --git a/images/Text tool.png b/images/Text tool.png
deleted file mode 100644 (file)
index 25d5b32..0000000
Binary files a/images/Text tool.png and /dev/null differ

diff --git a/images/Time.png b/images/Time.png
deleted file mode 100644 (file)
index ec380e7..0000000
Binary files a/images/Time.png and /dev/null differ

diff --git a/images/Tip of the day.png b/images/Tip of the day.png
deleted file mode 100644 (file)
index a412a26..0000000
Binary files a/images/Tip of the day.png and /dev/null differ

diff --git a/images/To do list.png b/images/To do list.png
deleted file mode 100644 (file)
index bda151a..0000000
Binary files a/images/To do list.png and /dev/null differ

diff --git a/images/Tools.png b/images/Tools.png
deleted file mode 100644 (file)
index 8472939..0000000
Binary files a/images/Tools.png and /dev/null differ

diff --git a/images/Touch.png b/images/Touch.png
deleted file mode 100644 (file)
index eb7696e..0000000
Binary files a/images/Touch.png and /dev/null differ

diff --git a/images/Transparency.png b/images/Transparency.png
deleted file mode 100644 (file)
index d693efe..0000000
Binary files a/images/Transparency.png and /dev/null differ

diff --git a/images/Transparent background.png b/images/Transparent background.png
deleted file mode 100644 (file)
index 4a00df3..0000000
Binary files a/images/Transparent background.png and /dev/null differ

diff --git a/images/Transparent color.png b/images/Transparent color.png
deleted file mode 100644 (file)
index 7a8dd19..0000000
Binary files a/images/Transparent color.png and /dev/null differ

diff --git a/images/Triangle.png b/images/Triangle.png
deleted file mode 100644 (file)
index 3e2128b..0000000
Binary files a/images/Triangle.png and /dev/null differ

diff --git a/images/True color.png b/images/True color.png
deleted file mode 100644 (file)
index e0adec8..0000000
Binary files a/images/True color.png and /dev/null differ

diff --git a/images/Undo.png b/images/Undo.png
deleted file mode 100644 (file)
index 9cd4066..0000000
Binary files a/images/Undo.png and /dev/null differ

diff --git a/images/Units.png b/images/Units.png
deleted file mode 100644 (file)
index 693846e..0000000
Binary files a/images/Units.png and /dev/null differ

diff --git a/images/Unlock.png b/images/Unlock.png
deleted file mode 100644 (file)
index d5fae0b..0000000
Binary files a/images/Unlock.png and /dev/null differ

diff --git a/images/Up-down.png b/images/Up-down.png
deleted file mode 100644 (file)
index 2af6c88..0000000
Binary files a/images/Up-down.png and /dev/null differ

diff --git a/images/Upload image.png b/images/Upload image.png
deleted file mode 100644 (file)
index 24caeec..0000000
Binary files a/images/Upload image.png and /dev/null differ

diff --git a/images/Wait.png b/images/Wait.png
deleted file mode 100644 (file)
index b5ac083..0000000
Binary files a/images/Wait.png and /dev/null differ

diff --git a/images/Warning.png b/images/Warning.png
deleted file mode 100644 (file)
index da3f033..0000000
Binary files a/images/Warning.png and /dev/null differ

diff --git a/images/Web designer.png b/images/Web designer.png
deleted file mode 100644 (file)
index 4b2c5b7..0000000
Binary files a/images/Web designer.png and /dev/null differ

diff --git a/images/Webcam.png b/images/Webcam.png
deleted file mode 100644 (file)
index 17a2b43..0000000
Binary files a/images/Webcam.png and /dev/null differ

diff --git a/images/Wide brush.png b/images/Wide brush.png
deleted file mode 100644 (file)
index 8542230..0000000
Binary files a/images/Wide brush.png and /dev/null differ

diff --git a/images/Wizard.png b/images/Wizard.png
deleted file mode 100644 (file)
index 2e0129c..0000000
Binary files a/images/Wizard.png and /dev/null differ

diff --git a/images/Work area.png b/images/Work area.png
deleted file mode 100644 (file)
index 319ee1c..0000000
Binary files a/images/Work area.png and /dev/null differ

diff --git a/images/Writing pencil.png b/images/Writing pencil.png
deleted file mode 100644 (file)
index f6357db..0000000
Binary files a/images/Writing pencil.png and /dev/null differ

diff --git a/images/Wrong.png b/images/Wrong.png
deleted file mode 100644 (file)
index 2d3cab9..0000000
Binary files a/images/Wrong.png and /dev/null differ

diff --git a/images/YUV color space.png b/images/YUV color space.png
deleted file mode 100644 (file)
index dcff1d5..0000000
Binary files a/images/YUV color space.png and /dev/null differ

diff --git a/images/Yes.png b/images/Yes.png
deleted file mode 100644 (file)
index 50577c9..0000000
Binary files a/images/Yes.png and /dev/null differ

diff --git a/images/Zoom auto.png b/images/Zoom auto.png
deleted file mode 100644 (file)
index 09422b6..0000000
Binary files a/images/Zoom auto.png and /dev/null differ

diff --git a/images/Zoom.png b/images/Zoom.png
deleted file mode 100644 (file)
index 36c0a98..0000000
Binary files a/images/Zoom.png and /dev/null differ

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

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

diff --git a/keybind.txt b/keybind.txt
index 3318a3c..d11274d 100644 (file)
--- a/keybind.txt
+++ b/keybind.txt
@@ -18,7 +18,7 @@
 ||Q         ||終了                               ||                                 ||                               ||                             ||Quit                           ||
 ||R         ||履歴を表示                         ||                                 ||                               ||名前の変更                   ||Rireki, Rename                 ||
 ||S         ||ソート方法を選択                   ||システムファイルを表示/非表示    ||                               ||                             ||Sort, System                   ||
-||U         ||すべてのマークを解除               ||                                 ||                               ||                             ||Unmark                         ||
+||U         ||すべてのマークを解除               ||アーカイバで開く                 ||                               ||                             ||Unmark, Unpack                 ||
 ||W         ||表示フォルダを交換                 ||                                 ||                               ||                             ||swapの「W」                    ||
 ||X         ||コマンドを実行                     ||                                 ||                               ||                             ||executeの「X」                 ||
 ||Z         ||環境設定                           ||アップデートを確認               ||                               ||                             ||                               ||

diff --git a/main.cpp b/main.cpp
index b2addf2..a1b276a 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -79,28 +79,47 @@ int main(int argc, char *argv[])
     if (settings.value(IniKey_OpenAfterCreateFile, "").toString().isEmpty())\r
         settings.setValue(IniKey_OpenAfterCreateFile, false);\r
     //>>>>> パス設定\r
-    if (settings.value(IniKey_EditorPath, "").toString().isEmpty()) {\r
+    // エディタ\r
+    if (settings.value(IniKey_PathEditor, "").toString().isEmpty()) {\r
 #if defined(Q_OS_WIN)\r
-        settings.setValue(IniKey_EditorPath, "notepad.exe");\r
+        settings.setValue(IniKey_PathEditor, "notepad.exe");\r
 #elif defined(Q_OS_MAC)\r
-        settings.setValue(IniKey_EditorPath, "/Applications/TextEdit.app");\r
+        settings.setValue(IniKey_PathEditor, "/Applications/TextEdit.app");\r
 #else\r
-        settings.setValue(IniKey_EditorPath, "gedit");\r
+        settings.setValue(IniKey_PathEditor, "gedit");\r
 #endif\r
-        settings.setValue(IniKey_EditorOption, QQ("$P"));\r
     }\r
-    if (settings.value(IniKey_TerminalPath, "").toString().isEmpty()) {\r
+    // ターミナル\r
+    if (settings.value(IniKey_PathTerminal, "").toString().isEmpty()) {\r
 #if defined(Q_OS_WIN)\r
-        settings.setValue(IniKey_TerminalPath, "cmd.exe");\r
-        settings.setValue(IniKey_TerminalOption, "/k cd " + QQ("$D"));\r
+        settings.setValue(IniKey_PathTerminal, "cmd.exe /k cd");\r
 #elif defined(Q_OS_MAC)\r
-        settings.setValue(IniKey_TerminalPath, "/Applications/Utilities/Terminal.app");\r
-        settings.setValue(IniKey_TerminalOption, "-c cd " + QQ("$D"));\r
+        settings.setValue(IniKey_PathTerminal, "/Applications/Utilities/Terminal.app --args -c cd");\r
 #else\r
         settings.setValue(IniKey_TerminalPath, "gnome-terminal");\r
-        settings.setValue(IniKey_TerminalOption, "-c cd " + QQ("$D"));\r
 #endif\r
     }\r
+    // アーカイバ\r
+    if (settings.value(IniKey_PathArchiver, "").toString().isEmpty()) {\r
+#if defined(Q_OS_WIN)\r
+        if (QFileInfo::exists("C:/Program Files/Lhaplus/Lhaplus.exe")) {\r
+            settings.setValue(IniKey_PathArchiver, QQ("C:/Program Files/Lhaplus/Lhaplus.exe"));\r
+        }\r
+        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
+        }\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
+#else\r
+#endif\r
+    }\r
+\r
     //>>>>> テキストビューア\r
     if (settings.value(IniKey_ViewerFont, "").toString().isEmpty()) {\r
         settings.setValue(IniKey_ViewerColorBg, QPalette().base().color());\r

diff --git a/mainwindow.cpp b/mainwindow.cpp
index fb0c6c8..b7160cc 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -88,8 +88,8 @@ MainWindow::MainWindow(QWidget *parent) :
     // メニュー項目の状態を初期化する\r
     ui->view_Hidden->setChecked(settings.value(IniKey_ShowHidden).toBool());\r
     ui->view_System->setChecked(settings.value(IniKey_ShowSystem).toBool());\r
-    ui->action_OpenEditor->setEnabled(!settings.value(IniKey_EditorPath).toString().isEmpty());\r
-    ui->action_OpenTerminal->setEnabled(!settings.value(IniKey_TerminalPath).toString().isEmpty());\r
+//    ui->action_OpenEditor->setEnabled(!settings.value(IniKey_PathEditor).toString().isEmpty());\r
+//    ui->action_OpenTerminal->setEnabled(!settings.value(IniKey_PathTerminal).toString().isEmpty());\r
 \r
     // 追加のショートカットキーを設定する\r
     QList<QKeySequence> shortcuts;\r
@@ -752,7 +752,7 @@ void MainWindow::openEditor(const QString &path)
     Q_CHECK_PTR(view);\r
 \r
     QSettings settings;\r
-    QString exe = settings.value(IniKey_EditorPath).toString();\r
+    QString exe = settings.value(IniKey_PathEditor).toString();\r
     if (exe.isEmpty()) {\r
         QMessageBox::critical(\r
                     this, tr("エラー"),\r
@@ -768,18 +768,17 @@ void MainWindow::openEditor(const QString &path)
         list << path;\r
     }\r
 \r
+    QString files;\r
     foreach (const QFileInfo &info, list) {\r
-        QString opt = settings.value(IniKey_EditorOption).toString();\r
-        replaceVars(opt, info);\r
-\r
+        files += " " + QQ(info.absoluteFilePath());\r
+    }\r
 #ifdef Q_OS_MAC\r
-        QString command = "open -a " + exe + " " + opt;\r
+    QString command = "open -a " + exe + files;\r
 #else\r
-        QString command = QQ(exe) + " " + opt;\r
+    QString command = exe + files;\r
 #endif\r
-        if (!startProcess(command, info.absolutePath(), tr("外部エディタの起動に失敗しました。"))) {\r
-            break;\r
-        }\r
+    if (!startProcess(command, view->dir(), tr("外部エディタの起動に失敗しました。"))) {\r
+        qDebug() << command;\r
     }\r
 }\r
 \r
@@ -791,7 +790,7 @@ void MainWindow::openTerminal()
     Q_CHECK_PTR(view);\r
 \r
     QSettings settings;\r
-    QString exe = settings.value(IniKey_TerminalPath).toString();\r
+    QString exe = settings.value(IniKey_PathTerminal).toString();\r
     if (exe.isEmpty()) {\r
         QMessageBox::critical(\r
                     this, tr("エラー"),\r
@@ -799,19 +798,56 @@ void MainWindow::openTerminal()
         return;\r
     }\r
 \r
+    QSet<QString> dirs;\r
     foreach (const QFileInfo &info, view->selectedItems()) {\r
-        QString opt = settings.value(IniKey_TerminalOption).toString();\r
-        replaceVars(opt, info);\r
+        if (info.isDir()) {\r
+            dirs.insert(info.absoluteFilePath());\r
+        }\r
+        else {\r
+            dirs.insert(info.absolutePath());\r
+        }\r
+    }\r
 \r
+    foreach (const QString &dir, dirs) {\r
 #ifdef Q_OS_MAC\r
-        QString command = "open -a " + QQ(exe) + " --args " + opt;\r
+        QString command = "open -n -a " + exe + " " + QQ(dir);\r
 #else\r
-        QString command = QQ(exe) + " " + opt;\r
+        QString command = exe + " " + QQ(dir);\r
 #endif\r
-        if (!startProcess(command, info.absolutePath(), tr("ターミナルの起動に失敗しました。"))) {\r
+        if (!startProcess(command, view->dir(), tr("ターミナルの起動に失敗しました。"))) {\r
+            qDebug() << command;\r
             break;\r
         }\r
-        Sleep(1000);\r
+    }\r
+}\r
+\r
+void MainWindow::openArchiver()\r
+{\r
+    qDebug() << "MainWindow::openArchiver";\r
+\r
+    FolderView *view = static_cast<FolderView*>(qApp->focusWidget());\r
+    Q_CHECK_PTR(view);\r
+\r
+    QSettings settings;\r
+    QString exe = settings.value(IniKey_PathArchiver).toString();\r
+    if (exe.isEmpty()) {\r
+        QMessageBox::critical(\r
+                    this, tr("エラー"),\r
+                    tr("アーカイバのパスが未定義です。"));\r
+        return;\r
+    }\r
+\r
+    QString files;\r
+    foreach (const QFileInfo &info, view->selectedItems()) {\r
+        files += " " + QQ(info.absoluteFilePath());\r
+    }\r
+#ifdef Q_OS_MAC\r
+    QString command = "open -a " + exe + files;\r
+#else\r
+    QString command = exe + files;\r
+#endif\r
+    if (!startProcess(command, view->dir(), tr("アーカイバの起動に失敗しました。"))) {\r
+        qDebug() << command;\r
     }\r
 }\r
 \r
@@ -1447,6 +1483,7 @@ void MainWindow::showContextMenu(QContextMenuEvent *event)
         menu.addAction(ui->action_Exec);\r
         menu.addAction(ui->action_OpenEditor);\r
         menu.addAction(ui->action_OpenTerminal);\r
+        menu.addAction(ui->action_OpenArchiver);\r
         menu.addSeparator();\r
         menu.addAction(ui->cmd_Copy);\r
         menu.addAction(ui->cmd_Move);\r
@@ -1552,6 +1589,7 @@ void MainWindow::initActionConnections()
     connect(ui->action_Open, SIGNAL(triggered()), this, SLOT(open()));\r
     connect(ui->action_OpenEditor, SIGNAL(triggered()), this, SLOT(openEditor()));\r
     connect(ui->action_OpenTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));\r
+    connect(ui->action_OpenArchiver, SIGNAL(triggered()), this, SLOT(openArchiver()));\r
     connect(ui->action_Quit, SIGNAL(triggered()), this, SLOT(close()));\r
     connect(ui->action_Search, SIGNAL(toggled(bool)), this, SLOT(toggleSearchBox(bool)));\r
     connect(ui->action_SearchNext, SIGNAL(triggered()), this, SLOT(searchNext()));\r
@@ -1706,8 +1744,8 @@ void MainWindow::updateActions()
             ui->move_Forward->setEnabled(!view->history()->isEnd());\r
 \r
             QSettings settings;\r
-            ui->action_OpenEditor->setEnabled(!settings.value(IniKey_EditorPath).toString().isEmpty());\r
-            ui->action_OpenTerminal->setEnabled(!settings.value(IniKey_TerminalPath).toString().isEmpty());\r
+            ui->action_OpenEditor->setEnabled(!settings.value(IniKey_PathEditor).toString().isEmpty());\r
+            ui->action_OpenTerminal->setEnabled(!settings.value(IniKey_PathTerminal).toString().isEmpty());\r
 \r
         }\r
         else if (!otherSideFolderView(view)->isVisible()) {\r

diff --git a/mainwindow.h b/mainwindow.h
index e4bac9f..88ae44e 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -71,6 +71,7 @@ public slots:
     void open(const QModelIndex &index = QModelIndex());\r
     void openEditor(const QString &path = QString());\r
     void openTerminal();\r
+    void openArchiver();\r
     void openBookmark();\r
     void refresh();\r
     void renameItems();\r

diff --git a/mainwindow.ui b/mainwindow.ui
index 5267f1f..77db39a 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -103,7 +103,6 @@
    <attribute name="toolBarBreak">\r
     <bool>false</bool>\r
    </attribute>\r
-   <addaction name="action_OpenEditor"/>\r
    <addaction name="action_Search"/>\r
    <addaction name="action_Setting"/>\r
    <addaction name="separator"/>\r
@@ -121,10 +120,6 @@
    <addaction name="move_Home"/>\r
    <addaction name="move_Jump"/>\r
    <addaction name="separator"/>\r
-   <addaction name="cmd_Copy"/>\r
-   <addaction name="cmd_Move"/>\r
-   <addaction name="cmd_Delete"/>\r
-   <addaction name="cmd_Rename"/>\r
    <addaction name="cmd_NewFile"/>\r
    <addaction name="cmd_NewFolder"/>\r
    <addaction name="separator"/>\r
@@ -148,6 +143,7 @@
     <addaction name="action_Exec"/>\r
     <addaction name="action_OpenEditor"/>\r
     <addaction name="action_OpenTerminal"/>\r
+    <addaction name="action_OpenArchiver"/>\r
     <addaction name="action_Command"/>\r
     <addaction name="separator"/>\r
     <addaction name="action_Search"/>\r
@@ -235,14 +231,14 @@
    </widget>\r
    <widget class="QMenu" name="menu_Bookmark">\r
     <property name="title">\r
-     <string>ブックマーク</string>\r
+     <string>ブックマーク(&amp;B)</string>\r
     </property>\r
     <addaction name="bookmark_Edit"/>\r
     <addaction name="separator"/>\r
    </widget>\r
    <widget class="QMenu" name="menu_Panel">\r
     <property name="title">\r
-     <string>パネル</string>\r
+     <string>パネル(&amp;P)</string>\r
     </property>\r
     <addaction name="split_Center"/>\r
     <addaction name="expand_Left"/>\r
@@ -307,8 +303,7 @@
   </action>\r
   <action name="view_FromOther">\r
    <property name="icon">\r
-    <iconset theme="隣のパネルと同じフォルダを表示" resource="resource.qrc">\r
-     <normaloff>:/images/Synchronize.png</normaloff>:/images/Synchronize.png</iconset>\r
+    <iconset theme="隣のパネルと同じフォルダを表示"/>\r
    </property>\r
    <property name="text">\r
     <string>隣のパネルと同じフォルダを表示</string>\r
@@ -398,7 +393,7 @@
   <action name="view_Swap">\r
    <property name="icon">\r
     <iconset resource="resource.qrc">\r
-     <normaloff>:/images/Text replace.png</normaloff>:/images/Text replace.png</iconset>\r
+     <normaloff>:/images/Flip.png</normaloff>:/images/Flip.png</iconset>\r
    </property>\r
    <property name="text">\r
     <string>表示フォルダを交換</string>\r
@@ -666,7 +661,7 @@
   <action name="cmd_Delete">\r
    <property name="icon">\r
     <iconset resource="resource.qrc">\r
-     <normaloff>:/images/Delete.png</normaloff>:/images/Delete.png</iconset>\r
+     <normaloff>:/images/Close file.png</normaloff>:/images/Close file.png</iconset>\r
    </property>\r
    <property name="text">\r
     <string>選択項目を削除</string>\r
@@ -771,6 +766,10 @@
    </property>\r
   </action>\r
   <action name="action_OpenTerminal">\r
+   <property name="icon">\r
+    <iconset resource="resource.qrc">\r
+     <normaloff>:/images/terminal.png</normaloff>:/images/terminal.png</iconset>\r
+   </property>\r
    <property name="text">\r
     <string>ターミナルで開く</string>\r
    </property>\r
@@ -1029,6 +1028,21 @@
     <string>Shift+Left</string>\r
    </property>\r
   </action>\r
+  <action name="action_OpenArchiver">\r
+   <property name="icon">\r
+    <iconset resource="resource.qrc">\r
+     <normaloff>:/images/utilities_file_archiver.png</normaloff>:/images/utilities_file_archiver.png</iconset>\r
+   </property>\r
+   <property name="text">\r
+    <string>アーカイバで開く</string>\r
+   </property>\r
+   <property name="toolTip">\r
+    <string>アーカイバで開く</string>\r
+   </property>\r
+   <property name="shortcut">\r
+    <string>Shift+U</string>\r
+   </property>\r
+  </action>\r
  </widget>\r
  <layoutdefault spacing="6" margin="11"/>\r
  <customwidgets>\r

diff --git a/preferencedialog.cpp b/preferencedialog.cpp
index 0220dab..5dcf769 100644 (file)
--- a/preferencedialog.cpp
+++ b/preferencedialog.cpp
@@ -61,6 +61,7 @@ PreferenceDialog::PreferenceDialog(QWidget *parent) :
 
     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->chooseViewerFont, SIGNAL(clicked()), this, SLOT(chooseFont()));
     connect(ui->viewerClrBg, SIGNAL(clicked()), this, SLOT(selectViewerColor()));
@@ -148,11 +149,11 @@ PreferenceDialog::PreferenceDialog(QWidget *parent) :
 
     //>>>>> パス設定
     // エディタ
-    ui->editorOpt->setText(settings.value(IniKey_EditorOption).toString());
-    ui->editorPath->setText(settings.value(IniKey_EditorPath).toString());
+    ui->editorPath->setText(settings.value(IniKey_PathEditor).toString());
     // ターミナル
-    ui->termOpt->setText(settings.value(IniKey_TerminalOption).toString());
-    ui->termPath->setText(settings.value(IniKey_TerminalPath).toString());
+    ui->termPath->setText(settings.value(IniKey_PathTerminal).toString());
+    // アーカイバ
+    ui->archiverPath->setText(settings.value(IniKey_PathArchiver).toString());
 
     //>>>>> テキストビューア
     ui->enableViewerIgnoreExt->setChecked(true);
@@ -449,12 +450,19 @@ void PreferenceDialog::browseApp()
                 tr("すべてのファイル (*)"));
 #endif
     if (!path.isEmpty()) {
+        if (path.indexOf(" ") != -1) {
+            path = QQ(path);
+        }
+
         if (sender() == ui->editorBrowse) {
             ui->editorPath->setText(path);
         }
         else if (sender() == ui->termBrowse) {
             ui->termPath->setText(path);
         }
+        else if (sender() == ui->archiverBrowse) {
+            ui->archiverPath->setText(path);
+        }
     }
 }
 
@@ -553,11 +561,9 @@ void PreferenceDialog::accept()
     settings.setValue(IniKey_OpenAfterCreateFile, ui->openAfterCreate->isChecked());
 
     //>>>>> パス設定
-    settings.setValue(IniKey_EditorOption, ui->editorOpt->text().trimmed());
-    settings.setValue(IniKey_EditorPath, ui->editorPath->text().trimmed());
-
-    settings.setValue(IniKey_TerminalOption, ui->termOpt->text().trimmed());
-    settings.setValue(IniKey_TerminalPath, ui->termPath->text().trimmed());
+    settings.setValue(IniKey_PathEditor, ui->editorPath->text().trimmed());
+    settings.setValue(IniKey_PathTerminal, ui->termPath->text().trimmed());
+    settings.setValue(IniKey_PathArchiver, ui->archiverPath->text().trimmed());
 
     //>>>>> テキストビューア
     settings.setValue(IniKey_ViewerFont, ui->viewerSample->font());

diff --git a/preferencedialog.ui b/preferencedialog.ui
index c2398d3..7a7389c 100644 (file)
--- a/preferencedialog.ui
+++ b/preferencedialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>693</width>
-    <height>530</height>
+    <width>665</width>
+    <height>535</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,14 +19,20 @@
   <property name="windowTitle">
    <string>環境設定</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_5">
+  <layout class="QVBoxLayout" name="verticalLayout_9">
    <item>
     <widget class="QTabWidget" name="tabWidget">
+     <property name="font">
+      <font>
+       <family>Lucida Grande</family>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
      <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
      <property name="currentIndex">
-      <number>4</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="tabBoot_Exit">
       <attribute name="title">
@@ -1301,231 +1307,110 @@
       <attribute name="title">
        <string>パス設定</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_20">
-       <property name="spacing">
-        <number>4</number>
-       </property>
-       <property name="leftMargin">
-        <number>4</number>
-       </property>
-       <property name="topMargin">
-        <number>4</number>
-       </property>
-       <property name="rightMargin">
-        <number>4</number>
-       </property>
-       <property name="bottomMargin">
-        <number>4</number>
-       </property>
+      <layout class="QVBoxLayout" name="verticalLayout_10">
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_9">
-         <property name="spacing">
-          <number>4</number>
-         </property>
-         <property name="leftMargin">
-          <number>4</number>
-         </property>
-         <property name="topMargin">
-          <number>4</number>
-         </property>
-         <property name="rightMargin">
-          <number>4</number>
-         </property>
-         <property name="bottomMargin">
-          <number>4</number>
+        <widget class="QGroupBox" name="groupBox_9">
+         <property name="title">
+          <string>外部エディタ</string>
          </property>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_27">
-           <property name="spacing">
-            <number>4</number>
-           </property>
-           <property name="leftMargin">
-            <number>4</number>
-           </property>
-           <property name="topMargin">
-            <number>4</number>
-           </property>
-           <property name="rightMargin">
-            <number>4</number>
-           </property>
-           <property name="bottomMargin">
-            <number>4</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="label_19">
-             <property name="text">
-              <string>外部エディタ：</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="editorPath"/>
-           </item>
-           <item>
-            <widget class="QPushButton" name="editorBrowse">
-             <property name="text">
-              <string>参照</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_26">
-           <property name="spacing">
-            <number>4</number>
-           </property>
-           <property name="leftMargin">
-            <number>4</number>
-           </property>
-           <property name="topMargin">
-            <number>4</number>
-           </property>
-           <property name="rightMargin">
-            <number>4</number>
-           </property>
-           <property name="bottomMargin">
-            <number>4</number>
-           </property>
-           <item>
-            <spacer name="horizontalSpacer_16">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_20">
-             <property name="text">
-              <string>オプション引数：</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="editorOpt"/>
-           </item>
-          </layout>
-         </item>
-        </layout>
+         <layout class="QHBoxLayout" name="horizontalLayout_19">
+          <item>
+           <widget class="QLineEdit" name="editorPath"/>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_24">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>13</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="editorBrowse">
+            <property name="text">
+             <string>参照</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
        </item>
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_10">
-         <property name="spacing">
-          <number>4</number>
-         </property>
-         <property name="leftMargin">
-          <number>4</number>
-         </property>
-         <property name="topMargin">
-          <number>4</number>
-         </property>
-         <property name="rightMargin">
-          <number>4</number>
-         </property>
-         <property name="bottomMargin">
-          <number>4</number>
+        <widget class="QGroupBox" name="groupBox_10">
+         <property name="title">
+          <string>ターミナル</string>
          </property>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_55">
-           <property name="spacing">
-            <number>4</number>
-           </property>
-           <property name="leftMargin">
-            <number>4</number>
-           </property>
-           <property name="topMargin">
-            <number>4</number>
-           </property>
-           <property name="rightMargin">
-            <number>4</number>
-           </property>
-           <property name="bottomMargin">
-            <number>4</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="label_45">
-             <property name="text">
-              <string>コマンドライン端末：</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="termPath"/>
-           </item>
-           <item>
-            <widget class="QPushButton" name="termBrowse">
-             <property name="text">
-              <string>参照</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_56">
-           <property name="spacing">
-            <number>4</number>
-           </property>
-           <property name="leftMargin">
-            <number>4</number>
-           </property>
-           <property name="topMargin">
-            <number>4</number>
-           </property>
-           <property name="rightMargin">
-            <number>4</number>
-           </property>
-           <property name="bottomMargin">
-            <number>4</number>
-           </property>
-           <item>
-            <spacer name="horizontalSpacer_33">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_46">
-             <property name="text">
-              <string>オプション引数：</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="termOpt"/>
-           </item>
-          </layout>
-         </item>
-        </layout>
+         <layout class="QHBoxLayout" name="horizontalLayout_22">
+          <item>
+           <widget class="QLineEdit" name="termPath"/>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_25">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>13</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="termBrowse">
+            <property name="text">
+             <string>参照</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
        </item>
        <item>
-        <widget class="QPlainTextEdit" name="optExplain">
-         <property name="font">
-          <font>
-           <family>Monaco</family>
-          </font>
-         </property>
-         <property name="plainText">
-          <string>オプション引数に使える文字
-$B ... ファイル名から拡張子を除いた部分
-$E ... 拡張子
-$F ... ファイル名($B.$Eと同じ)
-$D ... ファイルの場合は親フォルダ名、フォルダの場合は自身のファイル名($Fと同じ)
-$P ... フルパス</string>
+        <widget class="QGroupBox" name="groupBox_11">
+         <property name="title">
+          <string>アーカイバ</string>
          </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_27">
+          <item>
+           <widget class="QLineEdit" name="archiverPath"/>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_26">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>13</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="archiverBrowse">
+            <property name="text">
+             <string>参照</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
        <item>
@@ -1543,8 +1428,10 @@ $P ... フルパス</string>
        </item>
       </layout>
       <zorder></zorder>
-      <zorder>optExplain</zorder>
       <zorder>verticalSpacer_4</zorder>
+      <zorder>groupBox_9</zorder>
+      <zorder>groupBox_10</zorder>
+      <zorder>groupBox_11</zorder>
      </widget>
      <widget class="QWidget" name="tabTextViewer">
       <attribute name="title">
@@ -1961,11 +1848,8 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ
   <tabstop>openAfterCreate</tabstop>
   <tabstop>editorPath</tabstop>
   <tabstop>editorBrowse</tabstop>
-  <tabstop>editorOpt</tabstop>
   <tabstop>termPath</tabstop>
   <tabstop>termBrowse</tabstop>
-  <tabstop>termOpt</tabstop>
-  <tabstop>optExplain</tabstop>
   <tabstop>chooseViewerFont</tabstop>
   <tabstop>viewerClrFg</tabstop>
   <tabstop>viewerClrBg</tabstop>
@@ -1975,7 +1859,6 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ
   <tabstop>viewerIgnoreExt</tabstop>
   <tabstop>defaultIgnoreExt</tabstop>
   <tabstop>buttonBox</tabstop>
-  <tabstop>tabWidget</tabstop>
  </tabstops>
  <resources/>
  <connections>

diff --git a/resource.qrc b/resource.qrc
index 4349414..d970026 100644 (file)
--- a/resource.qrc
+++ b/resource.qrc
@@ -1,252 +1,39 @@
 <RCC>
     <qresource prefix="/">
-        <file>images/3d bar chart.png</file>
-        <file>images/3d chart.png</file>
-        <file>images/3d graph.png</file>
-        <file>images/16 colors.png</file>
-        <file>images/256 colors.png</file>
-        <file>images/About.png</file>
-        <file>images/Add.png</file>
         <file>images/Add folder.png</file>
-        <file>images/Angle.png</file>
-        <file>images/Apply.png</file>
-        <file>images/Arc.png</file>
-        <file>images/Arrow.png</file>
-        <file>images/Attach.png</file>
         <file>images/Back.png</file>
-        <file>images/Bitmap editor.png</file>
-        <file>images/Brightness.png</file>
-        <file>images/Brush.png</file>
-        <file>images/Camera.png</file>
         <file>images/Cancel.png</file>
-        <file>images/Chart xy.png</file>
         <file>images/Check boxes.png</file>
-        <file>images/Circle.png</file>
-        <file>images/Clear.png</file>
-        <file>images/Clipboard.png</file>
-        <file>images/Close.png</file>
         <file>images/Close file.png</file>
-        <file>images/Close folder.png</file>
-        <file>images/CMYK.png</file>
-        <file>images/Coffe.png</file>
-        <file>images/Coffee.png</file>
-        <file>images/Color.png</file>
-        <file>images/Color balance.png</file>
-        <file>images/Color filter.png</file>
-        <file>images/Color layers.png</file>
-        <file>images/Color palette.png</file>
-        <file>images/Color profile.png</file>
-        <file>images/Color test.png</file>
-        <file>images/Comment.png</file>
-        <file>images/Contrast.png</file>
         <file>images/Copy.png</file>
-        <file>images/Create.png</file>
-        <file>images/Critical details.png</file>
-        <file>images/Curve.png</file>
-        <file>images/Curve points.png</file>
-        <file>images/Cut.png</file>
-        <file>images/Danger.png</file>
-        <file>images/Decrease time.png</file>
-        <file>images/Delete.png</file>
-        <file>images/Delete frame.png</file>
-        <file>images/Delete frames.png</file>
-        <file>images/Designer.png</file>
-        <file>images/Diagram.png</file>
-        <file>images/Down.png</file>
-        <file>images/Download.png</file>
-        <file>images/Download image.png</file>
-        <file>images/Dropper.png</file>
-        <file>images/Edit.png</file>
         <file>images/Edit page.png</file>
-        <file>images/Edit text.png</file>
-        <file>images/Ellipse.png</file>
-        <file>images/E-mail.png</file>
-        <file>images/Equipment.png</file>
-        <file>images/Erase.png</file>
-        <file>images/Eraser.png</file>
-        <file>images/Error.png</file>
         <file>images/Exit.png</file>
         <file>images/Export.png</file>
         <file>images/Favourites.png</file>
-        <file>images/Feather.png</file>
-        <file>images/File exetension.png</file>
-        <file>images/Fill.png</file>
-        <file>images/Find.png</file>
-        <file>images/Fine brush.png</file>
         <file>images/Flip.png</file>
-        <file>images/Flip horizontally.png</file>
-        <file>images/Flip vertically.png</file>
-        <file>images/Flow block.png</file>
-        <file>images/Flower.png</file>
         <file>images/Folder.png</file>
-        <file>images/Form.png</file>
         <file>images/Forward.png</file>
-        <file>images/Frames.png</file>
         <file>images/Funnel.png</file>
+        <file>images/Gefu.png</file>
         <file>images/Go down.png</file>
         <file>images/Go up.png</file>
-        <file>images/Gpadient.png</file>
-        <file>images/Graphic designer.png</file>
-        <file>images/Graphic file.png</file>
-        <file>images/Graphic tools.png</file>
-        <file>images/Grid.png</file>
         <file>images/Help.png</file>
-        <file>images/Help book.png</file>
-        <file>images/Hexagon.png</file>
-        <file>images/Hide.png</file>
-        <file>images/Hint.png</file>
-        <file>images/Hints.png</file>
         <file>images/Home.png</file>
-        <file>images/Homepage.png</file>
-        <file>images/HSL.png</file>
-        <file>images/HSV.png</file>
-        <file>images/Ico.png</file>
-        <file>images/Icon wizard.png</file>
-        <file>images/Import.png</file>
-        <file>images/Increase time.png</file>
-        <file>images/Index.png</file>
-        <file>images/Info.png</file>
-        <file>images/Key.png</file>
-        <file>images/Knife.png</file>
-        <file>images/LAB color model.png</file>
-        <file>images/Layers.png</file>
-        <file>images/Left.png</file>
-        <file>images/Left-right.png</file>
-        <file>images/Line.png</file>
-        <file>images/List.png</file>
-        <file>images/Lock.png</file>
-        <file>images/Lock color.png</file>
-        <file>images/Lock transparency.png</file>
-        <file>images/Magic hat.png</file>
-        <file>images/Measure.png</file>
-        <file>images/Microsoft flag.png</file>
         <file>images/Monitor.png</file>
-        <file>images/Monitors.png</file>
-        <file>images/Mouse.png</file>
-        <file>images/Mouse pointer.png</file>
-        <file>images/Move.png</file>
-        <file>images/Movie.png</file>
-        <file>images/New clip art.png</file>
         <file>images/New file.png</file>
-        <file>images/New frame.png</file>
-        <file>images/New frame1.png</file>
-        <file>images/New image.png</file>
-        <file>images/New imagelist.png</file>
-        <file>images/New video.png</file>
-        <file>images/No.png</file>
-        <file>images/Objects.png</file>
         <file>images/Ok.png</file>
         <file>images/Open.png</file>
-        <file>images/Open colors.png</file>
-        <file>images/Open file.png</file>
-        <file>images/Open v2.png</file>
-        <file>images/Paint over pixels.png</file>
-        <file>images/Painter.png</file>
-        <file>images/Pantone.png</file>
         <file>images/Paste.png</file>
-        <file>images/Pen.png</file>
-        <file>images/Pencil.png</file>
-        <file>images/Pick color.png</file>
-        <file>images/Picture.png</file>
-        <file>images/Pie chart.png</file>
-        <file>images/Pin.png</file>
-        <file>images/Pinion.png</file>
-        <file>images/Pixel editor.png</file>
-        <file>images/Pixels.png</file>
         <file>images/Play.png</file>
         <file>images/Preview.png</file>
-        <file>images/Print.png</file>
-        <file>images/Problem.png</file>
-        <file>images/Properties.png</file>
-        <file>images/Red book.png</file>
-        <file>images/Red eye removing.png</file>
-        <file>images/Redo.png</file>
         <file>images/Refresh.png</file>
-        <file>images/Registration.png</file>
-        <file>images/Registry.png</file>
         <file>images/Rename.png</file>
-        <file>images/Replace pixels.png</file>
-        <file>images/Resize image.png</file>
-        <file>images/Restangle.png</file>
-        <file>images/Revert.png</file>
-        <file>images/RGB.png</file>
-        <file>images/Right.png</file>
-        <file>images/Rotate CCW.png</file>
-        <file>images/Rotate CW.png</file>
-        <file>images/Rotate left.png</file>
-        <file>images/Rotate right.png</file>
-        <file>images/Rotation.png</file>
-        <file>images/Rounded rectangle.png</file>
-        <file>images/Save.png</file>
-        <file>images/Save as.png</file>
-        <file>images/Save color.png</file>
-        <file>images/Save data.png</file>
-        <file>images/Save image.png</file>
-        <file>images/Save picture.png</file>
-        <file>images/Scan film.png</file>
-        <file>images/Scan image.png</file>
-        <file>images/Scanner.png</file>
-        <file>images/Scenario.png</file>
-        <file>images/Script.png</file>
         <file>images/Search.png</file>
-        <file>images/Search computer.png</file>
-        <file>images/Search folder.png</file>
-        <file>images/Search online.png</file>
-        <file>images/Search text.png</file>
-        <file>images/Select gpadient.png</file>
-        <file>images/Selection.png</file>
         <file>images/Settings.png</file>
-        <file>images/Sharpness.png</file>
-        <file>images/Show.png</file>
-        <file>images/Sizes.png</file>
-        <file>images/Smooth.png</file>
-        <file>images/Smooth line.png</file>
-        <file>images/Spell checking.png</file>
-        <file>images/Spiral.png</file>
-        <file>images/Spray.png</file>
-        <file>images/Square.png</file>
-        <file>images/Stop.png</file>
-        <file>images/Stop playing.png</file>
-        <file>images/Synchronize.png</file>
-        <file>images/Tag.png</file>
-        <file>images/Target.png</file>
-        <file>images/Target1.png</file>
-        <file>images/Test line.png</file>
-        <file>images/Text color.png</file>
-        <file>images/Text replace.png</file>
-        <file>images/Text tool.png</file>
-        <file>images/Time.png</file>
-        <file>images/Tip of the day.png</file>
-        <file>images/To do list.png</file>
-        <file>images/Tools.png</file>
-        <file>images/Touch.png</file>
-        <file>images/Transparency.png</file>
-        <file>images/Transparent background.png</file>
-        <file>images/Transparent color.png</file>
-        <file>images/Triangle.png</file>
-        <file>images/True color.png</file>
-        <file>images/Undo.png</file>
-        <file>images/Units.png</file>
-        <file>images/Unlock.png</file>
+        <file>images/terminal.png</file>
         <file>images/Up.png</file>
-        <file>images/Up-down.png</file>
-        <file>images/Upload image.png</file>
-        <file>images/Wait.png</file>
-        <file>images/Warning.png</file>
-        <file>images/Web designer.png</file>
-        <file>images/Webcam.png</file>
-        <file>images/Wide brush.png</file>
-        <file>images/Wizard.png</file>
-        <file>images/Work area.png</file>
-        <file>images/Writing pencil.png</file>
-        <file>images/Wrong.png</file>
-        <file>images/Yes.png</file>
-        <file>images/YUV color space.png</file>
-        <file>images/Zoom.png</file>
-        <file>images/Zoom auto.png</file>
+        <file>images/utilities_file_archiver.png</file>
         <file>images/Zoom in.png</file>
         <file>images/Zoom out.png</file>
-        <file>images/Gefu.png</file>
-        <file>images/Gefu.icns</file>
     </qresource>
 </RCC>