アイコンを変更。

diff --git a/Gefu.pro b/Gefu.pro
index b88de8a..9dcbb1f 100644 (file)
--- a/Gefu.pro
+++ b/Gefu.pro
@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = Gefu
 TEMPLATE = app
-VERSION = 0.1.9
+VERSION = 0.2.1
 
 SOURCES += main.cpp\
     mainwindow.cpp \
@@ -88,7 +88,7 @@ OTHER_FILES += \
     installer.nsi
 
 macx {
-    ICON = ./images/Gefu.icns
+    ICON = ./images/file-manager.icns
 }
 
 win32 {

diff --git a/Gefu.rc b/Gefu.rc
index 9b031ec..a60528f 100644 (file)
--- a/Gefu.rc
+++ b/Gefu.rc
@@ -1 +1 @@
-IDI_ICON1   ICON    DISCARDABLE "./images/Gefu.ico"\r
+IDI_ICON1   ICON    DISCARDABLE "./images/file-manager.ico"\r

diff --git a/images/Gefu.icns b/images/Gefu.icns
deleted file mode 100644 (file)
index 32c7119..0000000
Binary files a/images/Gefu.icns and /dev/null differ

diff --git a/images/Gefu.ico b/images/Gefu.ico
deleted file mode 100644 (file)
index 6b17145..0000000
Binary files a/images/Gefu.ico and /dev/null differ

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

diff --git a/images/Gefu.xcf b/images/Gefu.xcf
deleted file mode 100644 (file)
index bf69b46..0000000
Binary files a/images/Gefu.xcf and /dev/null differ

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

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

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

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

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

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

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

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

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

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

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

diff --git a/main.cpp b/main.cpp
index e77fe7e..883cd03 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -14,11 +14,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("gefu");\r
     a.setOrganizationDomain("sourceforge.jp");\r
     a.setApplicationName("Gefu");\r
-#if defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACX)\r
-    a.setWindowIcon(QIcon(":/images/Gefu.icns"));\r
-#else\r
-    a.setWindowIcon(QIcon(":/images/Gefu.png"));\r
-#endif\r
+    a.setWindowIcon(QIcon("://images/file-manager.png"));\r
 \r
     QSettings::setDefaultFormat(QSettings::IniFormat);\r
     QSettings settings;\r

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 22091c0..b2f059a 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -120,11 +120,7 @@ MainWindow::MainWindow(QWidget *parent) :
     setWindowTitle(tr("げふぅ v%1").arg(VERSION_VALUE));\r
 \r
     // ウィンドウアイコンを設定する\r
-#if defined(Q_OS_MAC)\r
-    setWindowIcon(QIcon(":/images/Gefu.icns"));\r
-#else\r
-    setWindowIcon(QIcon(":/images/Gefu.png"));\r
-#endif\r
+    setWindowIcon(QIcon("://images/file-manager.png"));\r
 \r
     //>>>>> ウィンドウサイズと位置を設定する\r
     QString strValue;\r

diff --git a/mainwindow.ui b/mainwindow.ui
index 77db39a..f74a95a 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -14,7 +14,7 @@
    <string>MainWindow</string>\r
   </property>\r
   <property name="windowIcon">\r
-   <iconset resource="resource.qrc">\r
+   <iconset>\r
     <normaloff>:/images/Gefu.png</normaloff>:/images/Gefu.png</iconset>\r
   </property>\r
   <widget class="QWidget" name="centralWidget">\r
@@ -1031,7 +1031,7 @@
   <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
+     <normaloff>:/images/Lightbrown Zip.png</normaloff>:/images/Lightbrown Zip.png</iconset>\r
    </property>\r
    <property name="text">\r
     <string>アーカイバで開く</string>\r

diff --git a/preferencedialog.ui b/preferencedialog.ui
index 15d1dee..d9e4d19 100644 (file)
--- a/preferencedialog.ui
+++ b/preferencedialog.ui
@@ -1427,10 +1427,6 @@
         </spacer>
        </item>
       </layout>
-      <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">

diff --git a/resource.qrc b/resource.qrc
index 3ce7581..31540ba 100644 (file)
--- a/resource.qrc
+++ b/resource.qrc
@@ -14,7 +14,6 @@
         <file>images/Folder.png</file>
         <file>images/Forward.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/Help.png</file>
@@ -32,9 +31,11 @@
         <file>images/Settings.png</file>
         <file>images/terminal.png</file>
         <file>images/Up.png</file>
-        <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>
+        <file>images/Picture.png</file>
+        <file>images/Lightbrown Zip.png</file>
+        <file>images/file-manager.png</file>
     </qresource>
 </RCC>