# HG changeset patch
# User Torsten <ttl@justmail.de>
# Date 1445578222 -7200
# Node ID 98a730e0dd5135acbf668d9bf44c4d4eca86cbc5
# Parent  fb0f233d7780c83553b14708357e33d7be9fc1ba
remove column visibility of file browser from settings dialog

* settings-dialog.cc (settings_dialog): remove initializations of obsolete
  dialog items;
  (write_changed_settings): remove writing settings from obsolete dialog items

* settings-dialog.ui: Remove items related to the display of the file browser

diff -r fb0f233d7780 -r 98a730e0dd51 libgui/src/settings-dialog.cc
--- a/libgui/src/settings-dialog.cc	Fri Oct 23 06:53:42 2015 +0200
+++ b/libgui/src/settings-dialog.cc	Fri Oct 23 07:30:22 2015 +0200
@@ -496,16 +496,6 @@
     ui->terminal_cursorType->setCurrentIndex (2);
 
   // file browser
-  ui->showFileSize->setChecked (
-    settings->value ("filesdockwidget/showFileSize", false).toBool ());
-  ui->showFileType->setChecked (
-    settings->value ("filesdockwidget/showFileType", false).toBool ());
-  ui->showLastModified->setChecked (
-    settings->value ("filesdockwidget/showLastModified",false).toBool ());
-  ui->showHiddenFiles->setChecked (
-    settings->value ("filesdockwidget/showHiddenFiles",false).toBool ());
-  ui->useAlternatingRowColors->setChecked (
-    settings->value ("filesdockwidget/useAlternatingRowColors",true).toBool ());
   connect (ui->sync_octave_directory, SIGNAL (toggled (bool)),
            this, SLOT (set_disabled_pref_file_browser_dir (bool)));
   ui->sync_octave_directory->setChecked (
@@ -840,16 +830,7 @@
   settings->setValue ("terminal/fontName",
                       ui->terminal_fontName->currentFont ().family ());
 
-  settings->setValue ("filesdockwidget/showFileSize",
-                      ui->showFileSize->isChecked ());
-  settings->setValue ("filesdockwidget/showFileType",
-                      ui->showFileType->isChecked ());
-  settings->setValue ("filesdockwidget/showLastModified",
-                      ui->showLastModified->isChecked ());
-  settings->setValue ("filesdockwidget/showHiddenFiles",
-                      ui->showHiddenFiles->isChecked ());
-  settings->setValue ("filesdockwidget/useAlternatingRowColors",
-                      ui->useAlternatingRowColors->isChecked ());
+  // file browser
   settings->setValue ("filesdockwidget/sync_octave_directory",
                       ui->sync_octave_directory->isChecked ());
   settings->setValue ("filesdockwidget/restore_last_dir",
diff -r fb0f233d7780 -r 98a730e0dd51 libgui/src/settings-dialog.ui
--- a/libgui/src/settings-dialog.ui	Fri Oct 23 06:53:42 2015 +0200
+++ b/libgui/src/settings-dialog.ui	Fri Oct 23 07:30:22 2015 +0200
@@ -32,7 +32,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="tab_general">
       <property name="enabled">
@@ -51,8 +51,8 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-4</y>
-            <width>662</width>
+            <y>0</y>
+            <width>570</width>
             <height>382</height>
            </rect>
           </property>
@@ -1461,8 +1461,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>488</width>
+            <height>236</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -1755,57 +1755,6 @@
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_18">
            <item>
-            <widget class="QGroupBox" name="groupBox_3">
-             <property name="title">
-              <string>Display</string>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_23">
-              <item>
-               <layout class="QGridLayout" name="gridLayout_11">
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <item row="1" column="0">
-                 <widget class="QCheckBox" name="showFileType">
-                  <property name="text">
-                   <string>Show file type</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QCheckBox" name="showHiddenFiles">
-                  <property name="text">
-                   <string>Show hidden files</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="0">
-                 <widget class="QCheckBox" name="showFileSize">
-                  <property name="text">
-                   <string>Show file size</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QCheckBox" name="showLastModified">
-                  <property name="text">
-                   <string>Show date of last modification</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="4" column="0">
-                 <widget class="QCheckBox" name="useAlternatingRowColors">
-                  <property name="text">
-                   <string>Alternating row colors</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
             <widget class="QGroupBox" name="groupBox_4">
              <property name="title">
               <string>Behavior</string>
@@ -1926,8 +1875,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>203</width>
+            <height>79</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_19">
@@ -1995,8 +1944,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>368</width>
+            <height>244</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_25">
@@ -2258,8 +2207,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>678</width>
-            <height>378</height>
+            <width>529</width>
+            <height>204</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_20">