レイアウト修正。

diff --git a/filetablemodel.cpp b/filetablemodel.cpp
index aa41e46..9ff54ad 100644 (file)
--- a/filetablemodel.cpp
+++ b/filetablemodel.cpp
@@ -279,7 +279,7 @@ QVariant FileTableModel::data(const QModelIndex &index, int role) const
         {\r
             DWORD dwFlags = ::GetFileAttributes(\r
                         info.absoluteFilePath().toStdWString().c_str());\r
-            if (dwFlags != DWORD(-1) && (dwFlags & FILE_ATTRIBUTE_SYSTEM) == FILE_ATTRIBUTE_SYSTEM))\r
+            if (dwFlags != DWORD(-1) && (dwFlags & FILE_ATTRIBUTE_SYSTEM) == FILE_ATTRIBUTE_SYSTEM)\r
             {\r
                 return m_SystemBrush;\r
             }\r

diff --git a/mainwindow.ui b/mainwindow.ui
index 7db02ee..a97d5f8 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -19,6 +19,21 @@
   </property>\r
   <widget class="QWidget" name="centralWidget">\r
    <layout class="QVBoxLayout" name="verticalLayout">\r
+    <property name="spacing">\r
+     <number>0</number>\r
+    </property>\r
+    <property name="leftMargin">\r
+     <number>0</number>\r
+    </property>\r
+    <property name="topMargin">\r
+     <number>0</number>\r
+    </property>\r
+    <property name="rightMargin">\r
+     <number>0</number>\r
+    </property>\r
+    <property name="bottomMargin">\r
+     <number>0</number>\r
+    </property>\r
     <item>\r
      <widget class="QSplitter" name="splitter">\r
       <property name="orientation">\r
@@ -44,6 +59,9 @@
     </item>\r
     <item>\r
      <layout class="QHBoxLayout" name="horizontalLayout">\r
+      <property name="spacing">\r
+       <number>0</number>\r
+      </property>\r
       <item>\r
        <widget class="QPushButton" name="pushButton_4">\r
         <property name="minimumSize">\r
@@ -222,7 +240,7 @@
      <x>0</x>\r
      <y>0</y>\r
      <width>662</width>\r
-     <height>22</height>\r
+     <height>24</height>\r
     </rect>\r
    </property>\r
    <widget class="QMenu" name="menu_File">\r

diff --git a/preferencedialog.cpp b/preferencedialog.cpp
index 7cfb1f6..6eba542 100644 (file)
--- a/preferencedialog.cpp
+++ b/preferencedialog.cpp
@@ -112,7 +112,7 @@ PreferenceDialog::PreferenceDialog(QWidget *parent) :
     palette = QPalette();
     // 背景色
     color = settings.value(IniKey_BoxColorBg, QPalette().base().color()).value<QColor>();
-    palette.setColor(QPalette::Background, color);
+    palette.setColor(QPalette::Base, color);
     // 文字色
     color = settings.value(IniKey_BoxColorFg, QPalette().text().color()).value<QColor>();
     palette.setColor(QPalette::Text, color);

diff --git a/preferencedialog.ui b/preferencedialog.ui
index 070dc1e..568e494 100644 (file)
--- a/preferencedialog.ui
+++ b/preferencedialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>687</width>
-    <height>531</height>
+    <width>589</width>
+    <height>443</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -23,7 +23,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tabBoot_Exit">
       <attribute name="title">
@@ -47,7 +47,7 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <property name="spacing">
-          <number>-1</number>
+          <number>6</number>
          </property>
          <property name="sizeConstraint">
           <enum>QLayout::SetFixedSize</enum>
@@ -282,7 +282,7 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_12">
          <property name="spacing">
-          <number>-1</number>
+          <number>6</number>
          </property>
          <property name="sizeConstraint">
           <enum>QLayout::SetFixedSize</enum>
@@ -555,7 +555,7 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>40</height>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -799,7 +799,26 @@
              </layout>
             </item>
             <item>
-             <widget class="QTableView" name="sampleTable"/>
+             <widget class="QTableView" name="sampleTable">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>100</width>
+                <height>0</height>
+               </size>
+              </property>
+              <attribute name="horizontalHeaderVisible">
+               <bool>false</bool>
+              </attribute>
+              <attribute name="verticalHeaderVisible">
+               <bool>false</bool>
+              </attribute>
+             </widget>
             </item>
            </layout>
           </item>
@@ -814,7 +833,7 @@
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>3</height>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -898,7 +917,7 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="posOptions"/>
   <buttongroup name="sizeOptions"/>
+  <buttongroup name="posOptions"/>
  </buttongroups>
 </ui>