Ver0.04

diff --git a/Gefu.pro b/Gefu.pro
index 047c213..d4149be 100644 (file)
--- a/Gefu.pro
+++ b/Gefu.pro
@@ -72,7 +72,7 @@ OTHER_FILES += \
     Gefu.rc \
     README.md
 
-mac {
+macx {
     ICON = ./images/Gefu.icns
 }
 

diff --git a/README.md b/README.md
index 4d677d7..9ef225a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,14 +4,26 @@ Gefu
 Gefu is Experimental File Utility.
 
 ### TODO
+- 初期表示時にカーソルがハイライトされないorz
 - オプション
     - ファンクションキー
 - ドラッグ＆ドロップ
+- ファイル検索
 - 簡易テキストビューア
 - 簡易画像ビューア
 - 簡易アーカイバ
 - SNS連携(タイムライン表示とか)
 
+#### 2014/08/22 Ver0.04
+-不具合修正
+    - ソート順でフォルダ位置が先頭以外の場合、".."もソートされていたのを修正。
+    　(ソート方法によらず、".."は必ず先頭にした)
+    - 各ダイアログのフォーカス周りを修正。
+    - is "an" Experimental ... とか、バージョン情報ダイアログの修正。
+    - MacのDockにアイコンが正しく表示されていなかったのを修正。
+    - フォルダ内容変更による再読込時、カーソル位置が初期化されていたのを修正。
+- 「最新の情報に更新」を追加。
+
 #### 2014/08/21 Ver0.03 公開
 - 環境設定ダイアログおよびオプションを実装。
     - 終了時の確認ダイアログ。

diff --git a/common.h b/common.h
index 06847a7..9022a37 100644 (file)
--- a/common.h
+++ b/common.h
@@ -8,7 +8,7 @@ class MainWindow;
 extern MainWindow* getMainWnd();\r
 extern QString FilesizeToString(quint64 size);\r
 \r
-#define VERSION_VALUE   0.03\r
+#define VERSION_VALUE   0.04\r
 \r
 #define slash   QString("/")\r
 #define QQ(x)   ("\"" + (x) + "\"")\r

diff --git a/filetablemodel.cpp b/filetablemodel.cpp
index 9ff54ad..4dadfed 100644 (file)
--- a/filetablemodel.cpp
+++ b/filetablemodel.cpp
@@ -53,11 +53,17 @@ bool FileTableModel::setPath(const QString &path)
         qDebug() << path;\r
     }\r
     else {\r
-        QFileInfoList::iterator it;\r
+        QFileInfoList::iterator it, itRoot = m_fileInfoList.end();\r
         for (it = m_fileInfoList.begin(); it != m_fileInfoList.end(); ) {\r
-            if (it->fileName() == ".." && m_dir.isRoot()) {\r
-                it = m_fileInfoList.erase(it);\r
-                continue;\r
+            if (it->fileName() == "..") {\r
+                if (m_dir.isRoot()) {\r
+                   it = m_fileInfoList.erase(it);\r
+                    itRoot = m_fileInfoList.end();\r
+                    continue;\r
+                }\r
+                else {\r
+                    itRoot = it;\r
+                }\r
             }\r
 #ifdef Q_OS_WIN32\r
             if (!(filter() & QDir::System)){\r
@@ -74,7 +80,14 @@ bool FileTableModel::setPath(const QString &path)
 #endif\r
             it++;\r
         }\r
+        // ソート方法によらず、".."は必ず先頭にする\r
+        if (itRoot != m_fileInfoList.begin() && itRoot != m_fileInfoList.end()) {\r
+            QFileInfo info(*itRoot);\r
+            m_fileInfoList.erase(itRoot);\r
+            m_fileInfoList.push_front(info);\r
+        }\r
     }\r
+\r
     m_checkStates.resize(m_fileInfoList.size());\r
     m_checkStates.fill(Qt::Unchecked);\r
 \r
@@ -84,7 +97,8 @@ bool FileTableModel::setPath(const QString &path)
     m_fsWatcher = new QFileSystemWatcher(this);\r
     m_fsWatcher->addPath(path);\r
     connect(m_fsWatcher, SIGNAL(directoryChanged(QString)),\r
-            this, SLOT(refresh()));\r
+//            this, SLOT(refresh()));\r
+            this, SIGNAL(listUpdated()));\r
 \r
     endResetModel();\r
 \r
@@ -165,6 +179,12 @@ void FileTableModel::updateAppearance()
     endResetModel();\r
 }\r
 \r
+//void FileTableModel::refresh()\r
+//{\r
+//    setPath(m_dir.absolutePath());\r
+\r
+//}\r
+\r
 void FileTableModel::stateChanged()\r
 {\r
     int numFolder = 0;\r

diff --git a/filetablemodel.h b/filetablemodel.h
index 39f4ee4..3eb04a5 100644 (file)
--- a/filetablemodel.h
+++ b/filetablemodel.h
@@ -37,9 +37,10 @@ public:
 signals:\r
     void rootChanged(const QString &root);\r
     void stateChanged(int checkedFoldrs, int checkedFiles, quint64 totalSize);\r
+    void listUpdated();\r
 \r
 public slots:\r
-    void refresh() { setPath(m_dir.absolutePath()); }\r
+//    void refresh();\r
 \r
 private:\r
     QDir m_dir;\r

diff --git a/filetableview.cpp b/filetableview.cpp
index 1fa93fc..d8ac8de 100644 (file)
--- a/filetableview.cpp
+++ b/filetableview.cpp
@@ -54,6 +54,7 @@ FileTableView::FileTableView(QWidget *parent) :
     connect(MENU_TRRIGGERED(view_ToOther), this, SLOT(setPathToOther()));\r
     connect(MENU_TRRIGGERED(view_Swap), this, SLOT(swapPath()));\r
     connect(MENU_TRRIGGERED(view_Sort), this, SLOT(setSort()));\r
+    connect(MENU_TRRIGGERED(view_Refresh), this, SLOT(refresh()));\r
 \r
     connect(MENU_TRRIGGERED(move_Back), this, SLOT(back()));\r
     connect(MENU_TRRIGGERED(move_Forward), this, SLOT(forward()));\r
@@ -109,8 +110,15 @@ void FileTableView::setSide(const QString &side)
 void FileTableView::setRootPath(const QString &path, bool addHistory)\r
 {\r
     FileTableModel *m = static_cast<FileTableModel*>(model());\r
+    int curRow = currentIndex().row();\r
     QFileInfo info(path);\r
+    bool isReload = false;\r
+\r
     if (info.isDir()) {\r
+        getMainWnd()->statusBar()->showMessage(tr("ファイルリストの取得中..."));\r
+        if (info.absoluteFilePath() == m->absolutePath()) {\r
+            isReload = true;\r
+        }\r
         setUpdatesEnabled(false);\r
         m->setPath(info.absoluteFilePath());\r
         setUpdatesEnabled(true);\r
@@ -120,7 +128,21 @@ void FileTableView::setRootPath(const QString &path, bool addHistory)
         }\r
         updateMenu();\r
 \r
-        setCurrentIndex(m->index(0, 0));\r
+        if (isReload) {\r
+            if (curRow < 0) {\r
+                curRow = 0;\r
+            }\r
+            else if (curRow >= m->rowCount()) {\r
+                curRow = m->rowCount() - 1;\r
+            }\r
+        }\r
+        else {\r
+            curRow = 0;\r
+        }\r
+        qDebug() << curRow;\r
+        setCurrentIndex(m->index(curRow, 0));\r
+        selectRow(curRow);\r
+        getMainWnd()->statusBar()->showMessage(tr("レディ"), 5000);\r
     }\r
 }\r
 \r
@@ -363,7 +385,7 @@ void FileTableView::showHiddenFiles(bool show)
     }\r
 \r
     setUpdatesEnabled(false);\r
-    m->refresh();\r
+    refresh();\r
     setUpdatesEnabled(true);\r
 }\r
 \r
@@ -378,7 +400,7 @@ void FileTableView::showSystemFiles(bool show)
     }\r
 \r
     setUpdatesEnabled(false);\r
-    m->refresh();\r
+    refresh();\r
     setUpdatesEnabled(true);\r
 }\r
 \r
@@ -419,11 +441,23 @@ void FileTableView::setSort()
         }\r
 \r
         setUpdatesEnabled(false);\r
-        m->refresh();\r
+        refresh();\r
         setUpdatesEnabled(true);\r
     }\r
 }\r
 \r
+void FileTableView::refresh()\r
+{\r
+    FileTableModel *m = static_cast<FileTableModel*>(model());\r
+    int row = currentIndex().row();\r
+    setRootPath(m->absolutePath(), false);\r
+    if (row >= m->rowCount()) {\r
+        row = m->rowCount() - 1;\r
+    }\r
+    setCurrentIndex(m->index(row, 0));\r
+    selectRow(row);\r
+}\r
+\r
 void FileTableView::back()\r
 {\r
     CHECK_FOCUS;\r
@@ -777,7 +811,7 @@ void FileTableView::keyPressEvent(QKeyEvent *event)
         }\r
     }\r
 \r
-    if (!ksq.isEmpty()) {\r
+    if (!ksq.isEmpty() && ksq != "Down" && ksq != "Up") {\r
         qDebug() << ksq;\r
     }\r
     QTableView::keyPressEvent(event);\r
@@ -793,11 +827,8 @@ void FileTableView::focusInEvent(QFocusEvent *event)
 void FileTableView::currentChanged(const QModelIndex &current, const QModelIndex &previous)\r
 {\r
     Q_UNUSED(previous);\r
-//    qDebug() << "CurrentChanged";\r
-//    qDebug() << " row = " << current.row();\r
 \r
     FileTableModel *m = static_cast<FileTableModel*>(model());\r
-//    qDebug() << m->absoluteFilePath(current);\r
     emit indexChanged(m->absoluteFilePath(current));\r
 \r
     QTableView::currentChanged(current, previous);\r

diff --git a/filetableview.h b/filetableview.h
index e9aad03..0068e4f 100644 (file)
--- a/filetableview.h
+++ b/filetableview.h
@@ -47,6 +47,7 @@ public slots:
     void showHiddenFiles(bool show);\r
     void showSystemFiles(bool show);\r
     void setSort();\r
+    void refresh();\r
 \r
     void back();\r
     void forward();\r

diff --git a/folderpanel.cpp b/folderpanel.cpp
index 470b20c..f9c3e7b 100644 (file)
--- a/folderpanel.cpp
+++ b/folderpanel.cpp
@@ -77,6 +77,8 @@ void FolderPanel::setSide(const QString &side)
             ui->locationField, SLOT(setText(QString)));\r
     connect(model, SIGNAL(stateChanged(int,int,quint64)),\r
             this, SLOT(onStateChanged(int,int,quint64)));\r
+    connect(model, SIGNAL(listUpdated()),\r
+            ui->fileTable, SLOT(refresh()));\r
 \r
     //>>>>> フィルタ初期化\r
     model->setFilter(QDir::NoDot | QDir::AllDirs | QDir::Files);\r
@@ -96,7 +98,7 @@ void FolderPanel::setSide(const QString &side)
     default:            model->setSorting(model->sorting() | QDir::Name); break;\r
     }\r
     // デフォルトだと文字列は昇順で、数値は降順…orz\r
-    int orderBy = settings.value(side + slash + IniKey_OrderBy, OrderByDesc).toInt();\r
+    int orderBy = settings.value(side + slash + IniKey_OrderBy, OrderByAsc).toInt();\r
     if (((sortBy == SortByName || sortBy == SortByType) && orderBy == OrderByDesc) ||\r
         ((sortBy == SortByDate || sortBy == SortBySize) && orderBy == OrderByAsc))\r
     {\r
@@ -118,7 +120,6 @@ void FolderPanel::setSide(const QString &side)
     model->updateAppearance();\r
     ui->fileTable->setModel(model);\r
     ui->fileTable->setRootPath(path, true);\r
-    ui->fileTable->selectRow(0);\r
 }\r
 \r
 void FolderPanel::updateAppearance()\r
@@ -178,3 +179,4 @@ void FolderPanel::on_locationField_editingFinished()
 \r
     ui->locationField->blockSignals(false);\r
 }\r
+\r

diff --git a/historydialog.ui b/historydialog.ui
index 668ade0..311e85f 100644 (file)
--- a/historydialog.ui
+++ b/historydialog.ui
@@ -19,7 +19,7 @@
      <item>
       <widget class="QRadioButton" name="leftPane">
        <property name="focusPolicy">
-        <enum>Qt::TabFocus</enum>
+        <enum>Qt::StrongFocus</enum>
        </property>
        <property name="text">
         <string>左ペイン</string>
@@ -32,7 +32,7 @@
      <item>
       <widget class="QRadioButton" name="rightPane">
        <property name="focusPolicy">
-        <enum>Qt::TabFocus</enum>
+        <enum>Qt::StrongFocus</enum>
        </property>
        <property name="text">
         <string>右ペイン</string>
@@ -47,14 +47,14 @@
    <item>
     <widget class="QListWidget" name="listWidget">
      <property name="focusPolicy">
-      <enum>Qt::TabFocus</enum>
+      <enum>Qt::StrongFocus</enum>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="focusPolicy">
-      <enum>Qt::TabFocus</enum>
+      <enum>Qt::StrongFocus</enum>
      </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>

diff --git a/main.cpp b/main.cpp
index b2e731f..c2049bb 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -9,8 +9,11 @@ int main(int argc, char *argv[])
     a.setOrganizationName("miyabi");\r
     a.setOrganizationDomain("rakusaba.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
-\r
+#endif\r
     QSettings::setDefaultFormat(QSettings::IniFormat);\r
     QSettings settings;\r
     if (settings.value(IniKey_ResetOnBoot, false).toBool()) {\r

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 80a23a4..ac7ee57 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -51,6 +51,10 @@ MainWindow::MainWindow(QWidget *parent) :
     shortcuts.append(QKeySequence("Shift+M"));\r
     ui->action_Exec->setShortcuts(shortcuts);\r
 \r
+    shortcuts = ui->help_About->shortcuts();\r
+    shortcuts.append(QKeySequence("Shift+?"));  // マヂで！？\r
+    ui->help_About->setShortcuts(shortcuts);\r
+\r
     // シグナル/スロットを設定する\r
     connect(ui->action_Setting, SIGNAL(triggered()), this, SLOT(onActionSetting()));\r
     connect(ui->action_Quit, SIGNAL(triggered()), this, SLOT(close()));\r
@@ -61,7 +65,11 @@ MainWindow::MainWindow(QWidget *parent) :
     // ウィンドウタイトルを設定する\r
     setWindowTitle(tr("げふぅ v%1").arg(VERSION_VALUE));\r
     // ウィンドウアイコンを設定する\r
+#if defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACX)\r
+    setWindowIcon(QIcon(":/images/Gefu.icns"));\r
+#else\r
     setWindowIcon(QIcon(":/images/Gefu.png"));\r
+#endif\r
     //>>>>> ウィンドウサイズと位置を設定する\r
     QString strValue;\r
     QPoint point = this->geometry().topLeft();\r
@@ -164,9 +172,10 @@ void MainWindow::onHelpAbout()
                 this,\r
                 tr("げふぅ について"),\r
                 tr("<h3>Gefu Ver%1</h3>").arg(VERSION_VALUE) +\r
-                tr("<center>Gefu is Experimental File Utility.<br/>"\r
-                   "（げふぅは実験的なファイルユーティリティです）</center>"\r
-                   "<p>Copyright 2014 @miyabi_satoh All rights reserved.</p>"));\r
+                tr("<center>Gefu is an Experimental File Utility.<br/>"\r
+                   "<small>（げふぅは実験的なファイルユーティリティです）</small></center>"\r
+                   "<p>最新版の情報は<a href='http://miyabi.rakusaba.jp'>喫茶・雅</a>で公開しています。</p>"\r
+                   "<p><small>Copyright 2014 @miyabi_satoh All rights reserved.</small></p>"));\r
 }\r
 \r
 MainWindow* getMainWnd()\r

diff --git a/mainwindow.ui b/mainwindow.ui
index a97d5f8..5975556 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -218,6 +218,8 @@
    <addaction name="mark_AllFiles"/>\r
    <addaction name="mark_AllOff"/>\r
    <addaction name="separator"/>\r
+   <addaction name="view_Refresh"/>\r
+   <addaction name="separator"/>\r
    <addaction name="move_Back"/>\r
    <addaction name="move_Forward"/>\r
    <addaction name="move_Root"/>\r
@@ -240,7 +242,7 @@
      <x>0</x>\r
      <y>0</y>\r
      <width>662</width>\r
-     <height>24</height>\r
+     <height>22</height>\r
     </rect>\r
    </property>\r
    <widget class="QMenu" name="menu_File">\r
@@ -273,6 +275,7 @@
     <addaction name="view_FromOther"/>\r
     <addaction name="view_ToOther"/>\r
     <addaction name="view_Swap"/>\r
+    <addaction name="view_Refresh"/>\r
     <addaction name="separator"/>\r
     <addaction name="view_Hidden"/>\r
     <addaction name="view_System"/>\r
@@ -821,6 +824,21 @@
     <string>Shift+S</string>\r
    </property>\r
   </action>\r
+  <action name="view_Refresh">\r
+   <property name="icon">\r
+    <iconset resource="resource.qrc">\r
+     <normaloff>:/images/Refresh.png</normaloff>:/images/Refresh.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>L</string>\r
+   </property>\r
+  </action>\r
  </widget>\r
  <layoutdefault spacing="6" margin="11"/>\r
  <customwidgets>\r

diff --git a/operationdialog.ui b/operationdialog.ui
index f22c380..5dea9c8 100644 (file)
--- a/operationdialog.ui
+++ b/operationdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>\r
     <y>0</y>\r
     <width>400</width>\r
-    <height>300</height>\r
+    <height>349</height>\r
    </rect>\r
   </property>\r
   <property name="windowTitle">\r
@@ -49,6 +49,9 @@
     <layout class="QHBoxLayout" name="horizontalLayout">\r
      <item>\r
       <widget class="QCheckBox" name="chkAutoClose">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>成功時、自動的に閉じる</string>\r
        </property>\r
@@ -69,6 +72,9 @@
      </item>\r
      <item>\r
       <widget class="QPushButton" name="btnCloseCancel">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>キャンセル</string>\r
        </property>\r
@@ -124,6 +130,9 @@
          <verstretch>0</verstretch>\r
         </sizepolicy>\r
        </property>\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>詳細を表示</string>\r
        </property>\r

diff --git a/overwritedialog.ui b/overwritedialog.ui
index dfa23c3..1c72be7 100644 (file)
--- a/overwritedialog.ui
+++ b/overwritedialog.ui
@@ -6,8 +6,8 @@
    <rect>\r
     <x>0</x>\r
     <y>0</y>\r
-    <width>384</width>\r
-    <height>286</height>\r
+    <width>462</width>\r
+    <height>319</height>\r
    </rect>\r
   </property>\r
   <property name="windowTitle">\r
@@ -93,6 +93,9 @@
        <layout class="QVBoxLayout" name="verticalLayout">\r
         <item>\r
          <widget class="QRadioButton" name="rbOverWrite">\r
+          <property name="focusPolicy">\r
+           <enum>Qt::StrongFocus</enum>\r
+          </property>\r
           <property name="text">\r
            <string>上書き</string>\r
           </property>\r
@@ -100,6 +103,9 @@
         </item>\r
         <item>\r
          <widget class="QRadioButton" name="rbOverWriteIfNew">\r
+          <property name="focusPolicy">\r
+           <enum>Qt::StrongFocus</enum>\r
+          </property>\r
           <property name="text">\r
            <string>新しければ上書き</string>\r
           </property>\r
@@ -107,6 +113,9 @@
         </item>\r
         <item>\r
          <widget class="QRadioButton" name="rbAppendNumber">\r
+          <property name="focusPolicy">\r
+           <enum>Qt::StrongFocus</enum>\r
+          </property>\r
           <property name="text">\r
            <string>ファイル名末尾に数字を付与</string>\r
           </property>\r
@@ -114,6 +123,9 @@
         </item>\r
         <item>\r
          <widget class="QRadioButton" name="rbSkip">\r
+          <property name="focusPolicy">\r
+           <enum>Qt::StrongFocus</enum>\r
+          </property>\r
           <property name="text">\r
            <string>スキップ</string>\r
           </property>\r
@@ -123,6 +135,9 @@
          <layout class="QHBoxLayout" name="horizontalLayout">\r
           <item>\r
            <widget class="QRadioButton" name="rbRename">\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>名前を変更</string>\r
             </property>\r
@@ -142,6 +157,9 @@
     <layout class="QHBoxLayout" name="horizontalLayout_2">\r
      <item>\r
       <widget class="QCheckBox" name="checkBox">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>同じ処理を以降の競合にも適用する</string>\r
        </property>\r
@@ -162,6 +180,9 @@
      </item>\r
      <item>\r
       <widget class="QDialogButtonBox" name="buttonBox">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="orientation">\r
         <enum>Qt::Horizontal</enum>\r
        </property>\r

diff --git a/preferencedialog.ui b/preferencedialog.ui
index 568e494..d6f515e 100644 (file)
--- a/preferencedialog.ui
+++ b/preferencedialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>589</width>
-    <height>443</height>
+    <height>527</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -22,6 +22,9 @@
   <layout class="QVBoxLayout" name="verticalLayout_7">
    <item>
     <widget class="QTabWidget" name="tabWidget">
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
      <property name="currentIndex">
       <number>1</number>
      </property>
@@ -32,6 +35,9 @@
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QCheckBox" name="confirmExit">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="text">
           <string>終了時に確認ダイアログを表示する</string>
          </property>
@@ -39,6 +45,9 @@
        </item>
        <item>
         <widget class="QCheckBox" name="bootSize">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="text">
           <string>起動時のウィンドウサイズを指定する</string>
          </property>
@@ -70,6 +79,9 @@
          </item>
          <item>
           <widget class="QRadioButton" name="sizeAbsolute">
+           <property name="focusPolicy">
+            <enum>Qt::StrongFocus</enum>
+           </property>
            <property name="text">
             <string>絶対指定</string>
            </property>
@@ -166,6 +178,9 @@
          </item>
          <item>
           <widget class="QRadioButton" name="sizeRelative">
+           <property name="focusPolicy">
+            <enum>Qt::StrongFocus</enum>
+           </property>
            <property name="text">
             <string>相対指定</string>
            </property>
@@ -262,6 +277,9 @@
          </item>
          <item>
           <widget class="QRadioButton" name="sizeLast">
+           <property name="focusPolicy">
+            <enum>Qt::StrongFocus</enum>
+           </property>
            <property name="text">
             <string>前回終了時のサイズ</string>
            </property>
@@ -274,6 +292,9 @@
        </item>
        <item>
         <widget class="QCheckBox" name="bootPos">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="text">
           <string>起動時のウィンドウ位置を指定する</string>
          </property>
@@ -305,6 +326,9 @@
          </item>
          <item>
           <widget class="QRadioButton" name="posAbsolute">
+           <property name="focusPolicy">
+            <enum>Qt::StrongFocus</enum>
+           </property>
            <property name="text">
             <string>絶対指定</string>
            </property>
@@ -401,6 +425,9 @@
          </item>
          <item>
           <widget class="QRadioButton" name="posRelative">
+           <property name="focusPolicy">
+            <enum>Qt::StrongFocus</enum>
+           </property>
            <property name="text">
             <string>相対指定</string>
            </property>
@@ -497,6 +524,9 @@
          </item>
          <item>
           <widget class="QRadioButton" name="posCenter">
+           <property name="focusPolicy">
+            <enum>Qt::StrongFocus</enum>
+           </property>
            <property name="text">
             <string>画面中央</string>
            </property>
@@ -530,6 +560,9 @@
          </item>
          <item>
           <widget class="QRadioButton" name="posLast">
+           <property name="focusPolicy">
+            <enum>Qt::StrongFocus</enum>
+           </property>
            <property name="text">
             <string>前回終了時の位置</string>
            </property>
@@ -542,6 +575,9 @@
        </item>
        <item>
         <widget class="QCheckBox" name="resetOnBoot">
+         <property name="focusPolicy">
+          <enum>Qt::StrongFocus</enum>
+         </property>
          <property name="text">
           <string>次回起動時に設定ファイルをクリアする</string>
          </property>
@@ -605,6 +641,9 @@
             </item>
             <item>
              <widget class="QCheckBox" name="boxFontBold">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
               <property name="text">
                <string>太字</string>
               </property>
@@ -635,6 +674,9 @@
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
               <property name="text">
                <string>文字色</string>
               </property>
@@ -642,6 +684,9 @@
             </item>
             <item>
              <widget class="QPushButton" name="boxClrBg">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
               <property name="text">
                <string>背景色</string>
               </property>
@@ -693,6 +738,9 @@
             </item>
             <item>
              <widget class="QCheckBox" name="viewFontBold">
+              <property name="focusPolicy">
+               <enum>Qt::StrongFocus</enum>
+              </property>
               <property name="text">
                <string>太字</string>
               </property>
@@ -729,6 +777,9 @@
                     <layout class="QHBoxLayout" name="horizontalLayout_19">
                      <item>
                       <widget class="QPushButton" name="clrFgNormal">
+                       <property name="focusPolicy">
+                        <enum>Qt::StrongFocus</enum>
+                       </property>
                        <property name="text">
                         <string>通常</string>
                        </property>
@@ -736,6 +787,9 @@
                      </item>
                      <item>
                       <widget class="QPushButton" name="clrFgMark">
+                       <property name="focusPolicy">
+                        <enum>Qt::StrongFocus</enum>
+                       </property>
                        <property name="text">
                         <string>マーク</string>
                        </property>
@@ -747,6 +801,9 @@
                     <layout class="QHBoxLayout" name="horizontalLayout_20">
                      <item>
                       <widget class="QPushButton" name="clrFgSystem">
+                       <property name="focusPolicy">
+                        <enum>Qt::StrongFocus</enum>
+                       </property>
                        <property name="text">
                         <string>システム</string>
                        </property>
@@ -754,6 +811,9 @@
                      </item>
                      <item>
                       <widget class="QPushButton" name="clrFgHidden">
+                       <property name="focusPolicy">
+                        <enum>Qt::StrongFocus</enum>
+                       </property>
                        <property name="text">
                         <string>隠し属性</string>
                        </property>
@@ -761,6 +821,9 @@
                      </item>
                      <item>
                       <widget class="QPushButton" name="clrFgReadonly">
+                       <property name="focusPolicy">
+                        <enum>Qt::StrongFocus</enum>
+                       </property>
                        <property name="text">
                         <string>読取専用</string>
                        </property>
@@ -779,6 +842,9 @@
                   <layout class="QHBoxLayout" name="horizontalLayout_18">
                    <item>
                     <widget class="QPushButton" name="clrBgNormal">
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
                      <property name="text">
                       <string>通常</string>
                      </property>
@@ -786,6 +852,9 @@
                    </item>
                    <item>
                     <widget class="QPushButton" name="clrBgMark">
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
                      <property name="text">
                       <string>マーク</string>
                      </property>
@@ -812,6 +881,9 @@
                 <height>0</height>
                </size>
               </property>
+              <property name="focusPolicy">
+               <enum>Qt::NoFocus</enum>
+              </property>
               <attribute name="horizontalHeaderVisible">
                <bool>false</bool>
               </attribute>
@@ -844,6 +916,9 @@
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
@@ -874,12 +949,23 @@
   <tabstop>relativeTop</tabstop>
   <tabstop>posCenter</tabstop>
   <tabstop>posLast</tabstop>
+  <tabstop>resetOnBoot</tabstop>
   <tabstop>boxFont</tabstop>
   <tabstop>boxFontSize</tabstop>
   <tabstop>boxFontBold</tabstop>
+  <tabstop>boxClrFg</tabstop>
+  <tabstop>boxClrBg</tabstop>
+  <tabstop>sampleEdit</tabstop>
   <tabstop>viewFont</tabstop>
   <tabstop>viewFontSize</tabstop>
   <tabstop>viewFontBold</tabstop>
+  <tabstop>clrFgNormal</tabstop>
+  <tabstop>clrFgMark</tabstop>
+  <tabstop>clrFgSystem</tabstop>
+  <tabstop>clrFgHidden</tabstop>
+  <tabstop>clrFgReadonly</tabstop>
+  <tabstop>clrBgNormal</tabstop>
+  <tabstop>clrBgMark</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -917,7 +1003,7 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="sizeOptions"/>
   <buttongroup name="posOptions"/>
+  <buttongroup name="sizeOptions"/>
  </buttongroups>
 </ui>

diff --git a/renamemultidialog.ui b/renamemultidialog.ui
index cbf086a..1e6537a 100644 (file)
--- a/renamemultidialog.ui
+++ b/renamemultidialog.ui
@@ -77,6 +77,9 @@
               <verstretch>0</verstretch>\r
              </sizepolicy>\r
             </property>\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>大文字にする</string>\r
             </property>\r
@@ -90,6 +93,9 @@
               <verstretch>0</verstretch>\r
              </sizepolicy>\r
             </property>\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>小文字にする</string>\r
             </property>\r
@@ -114,6 +120,9 @@
               <verstretch>0</verstretch>\r
              </sizepolicy>\r
             </property>\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>大文字にする</string>\r
             </property>\r
@@ -127,6 +136,9 @@
               <verstretch>0</verstretch>\r
              </sizepolicy>\r
             </property>\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>小文字にする</string>\r
             </property>\r
@@ -235,6 +247,9 @@
             <verstretch>0</verstretch>\r
            </sizepolicy>\r
           </property>\r
+          <property name="focusPolicy">\r
+           <enum>Qt::StrongFocus</enum>\r
+          </property>\r
           <property name="text">\r
            <string>設定</string>\r
           </property>\r
@@ -391,6 +406,9 @@
             <verstretch>0</verstretch>\r
            </sizepolicy>\r
           </property>\r
+          <property name="focusPolicy">\r
+           <enum>Qt::StrongFocus</enum>\r
+          </property>\r
           <property name="text">\r
            <string>設定</string>\r
           </property>\r
@@ -403,6 +421,9 @@
    </item>\r
    <item>\r
     <widget class="QDialogButtonBox" name="buttonBox">\r
+     <property name="focusPolicy">\r
+      <enum>Qt::StrongFocus</enum>\r
+     </property>\r
      <property name="orientation">\r
       <enum>Qt::Horizontal</enum>\r
      </property>\r

diff --git a/renamesingledialog.ui b/renamesingledialog.ui
index 95fe82c..64e2b13 100644 (file)
--- a/renamesingledialog.ui
+++ b/renamesingledialog.ui
@@ -109,6 +109,9 @@
          <layout class="QHBoxLayout" name="horizontalLayout_3">\r
           <item>\r
            <widget class="QPushButton" name="btn_UpperAll">\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>大文字にする</string>\r
             </property>\r
@@ -116,6 +119,9 @@
           </item>\r
           <item>\r
            <widget class="QPushButton" name="btn_LowerAll">\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>小文字にする</string>\r
             </property>\r
@@ -134,6 +140,9 @@
          <layout class="QHBoxLayout" name="horizontalLayout_4">\r
           <item>\r
            <widget class="QPushButton" name="btn_UpperExt">\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>大文字にする</string>\r
             </property>\r
@@ -141,6 +150,9 @@
           </item>\r
           <item>\r
            <widget class="QPushButton" name="btn_LowerExt">\r
+            <property name="focusPolicy">\r
+             <enum>Qt::StrongFocus</enum>\r
+            </property>\r
             <property name="text">\r
              <string>小文字にする</string>\r
             </property>\r
@@ -155,6 +167,9 @@
    </item>\r
    <item>\r
     <widget class="QDialogButtonBox" name="buttonBox">\r
+     <property name="focusPolicy">\r
+      <enum>Qt::StrongFocus</enum>\r
+     </property>\r
      <property name="orientation">\r
       <enum>Qt::Horizontal</enum>\r
      </property>\r

diff --git a/resource.qrc b/resource.qrc
index 15229c8..4349414 100644 (file)
--- a/resource.qrc
+++ b/resource.qrc
@@ -247,5 +247,6 @@
         <file>images/Zoom in.png</file>
         <file>images/Zoom out.png</file>
         <file>images/Gefu.png</file>
+        <file>images/Gefu.icns</file>
     </qresource>
 </RCC>

diff --git a/sortdialog.ui b/sortdialog.ui
index c1841a0..426958d 100644 (file)
--- a/sortdialog.ui
+++ b/sortdialog.ui
@@ -6,8 +6,8 @@
    <rect>\r
     <x>0</x>\r
     <y>0</y>\r
-    <width>273</width>\r
-    <height>185</height>\r
+    <width>335</width>\r
+    <height>210</height>\r
    </rect>\r
   </property>\r
   <property name="windowTitle">\r
@@ -18,6 +18,9 @@
     <layout class="QVBoxLayout" name="verticalLayout">\r
      <item>\r
       <widget class="QRadioButton" name="sortByName">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>名前順</string>\r
        </property>\r
@@ -28,6 +31,9 @@
      </item>\r
      <item>\r
       <widget class="QRadioButton" name="sortByDate">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>更新日時順</string>\r
        </property>\r
@@ -38,6 +44,9 @@
      </item>\r
      <item>\r
       <widget class="QRadioButton" name="sortBySize">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>サイズ順</string>\r
        </property>\r
@@ -48,6 +57,9 @@
      </item>\r
      <item>\r
       <widget class="QRadioButton" name="sortByType">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>拡張子順</string>\r
        </property>\r
@@ -62,6 +74,9 @@
     <layout class="QVBoxLayout" name="verticalLayout_2">\r
      <item>\r
       <widget class="QRadioButton" name="orderAsc">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>昇順</string>\r
        </property>\r
@@ -72,6 +87,9 @@
      </item>\r
      <item>\r
       <widget class="QRadioButton" name="orderDesc">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>降順</string>\r
        </property>\r
@@ -106,6 +124,9 @@
      </item>\r
      <item>\r
       <widget class="QRadioButton" name="dirsFirst">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>先頭</string>\r
        </property>\r
@@ -116,6 +137,9 @@
      </item>\r
      <item>\r
       <widget class="QRadioButton" name="dirsLast">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>最後</string>\r
        </property>\r
@@ -126,6 +150,9 @@
      </item>\r
      <item>\r
       <widget class="QRadioButton" name="dirsDefault">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>優先なし</string>\r
        </property>\r
@@ -147,6 +174,9 @@
      </item>\r
      <item>\r
       <widget class="QCheckBox" name="ignoreCase">\r
+       <property name="focusPolicy">\r
+        <enum>Qt::StrongFocus</enum>\r
+       </property>\r
        <property name="text">\r
         <string>区別しない</string>\r
        </property>\r
@@ -169,6 +199,9 @@
    </item>\r
    <item row="3" column="0" colspan="2">\r
     <widget class="QDialogButtonBox" name="buttonBox">\r
+     <property name="focusPolicy">\r
+      <enum>Qt::StrongFocus</enum>\r
+     </property>\r
      <property name="orientation">\r
       <enum>Qt::Horizontal</enum>\r
      </property>\r
@@ -228,7 +261,7 @@
  </connections>\r
  <buttongroups>\r
   <buttongroup name="buttonGroup_2"/>\r
-  <buttongroup name="buttonGroup_3"/>\r
   <buttongroup name="buttonGroup"/>\r
+  <buttongroup name="buttonGroup_3"/>\r
  </buttongroups>\r
 </ui>\r