added a preference in the display tab to show/hide the date column on alphabetical sort

resources/etc/OpenBoard.config

@@ -92,6 +92,7 @@ SortKind=0
 SortOrder=0
 SplitterLeftSize=200
 SplitterRightSize=800
+ShowDateColumnOnAlphabeticalSort=false
 
 [IntranetPodcast]
 Author=

src/core/UBPreferencesController.cpp

@@ -39,6 +39,7 @@
 #include "core/UBDisplayManager.h"
 
 #include "board/UBBoardController.h"
+#include "document/UBDocumentController.h"
 #include "domain/UBGraphicsScene.h"
 #include "board/UBDrawingController.h"
 #include "podcast/UBPodcastController.h"
@@ -137,6 +138,9 @@ void UBPreferencesController::wire()
     connect(mPreferencesUI->useSystemOSKCheckBox, SIGNAL(clicked(bool)), settings->useSystemOnScreenKeyboard, SLOT(setBool(bool)));
     connect(mPreferencesUI->useSystemOSKCheckBox, SIGNAL(clicked(bool)), this, SLOT(systemOSKCheckBoxToggled(bool)));
 
+    connect(mPreferencesUI->showDateColumnOnAlphabeticalSort, SIGNAL(clicked(bool)), settings->showDateColumnOnAlphabeticalSort, SLOT(setBool(bool)));
+    connect(mPreferencesUI->showDateColumnOnAlphabeticalSort, SIGNAL(clicked(bool)), UBApplication::documentController, SLOT(refreshDateColumns()));
+
     connect(mPreferencesUI->keyboardPaletteKeyButtonSize, SIGNAL(currentIndexChanged(const QString &)), settings->boardKeyboardPaletteKeyBtnSize, SLOT(setString(const QString &)));
     connect(mPreferencesUI->startModeComboBox, SIGNAL(currentIndexChanged(int)), settings->appStartMode, SLOT(setInt(int)));
 
@@ -274,6 +278,8 @@ void UBPreferencesController::init()
     mPreferencesUI->useSystemOSKCheckBox->setChecked(settings->useSystemOnScreenKeyboard->get().toBool());
     this->systemOSKCheckBoxToggled(mPreferencesUI->useSystemOSKCheckBox->isChecked());
 
+    mPreferencesUI->showDateColumnOnAlphabeticalSort->setChecked(settings->showDateColumnOnAlphabeticalSort->get().toBool());
+
     mPreferencesUI->startModeComboBox->setCurrentIndex(settings->appStartMode->get().toInt());
 
     mPreferencesUI->useExternalBrowserCheckBox->setChecked(settings->webUseExternalBrowser->get().toBool());
@@ -338,6 +344,8 @@ void UBPreferencesController::defaultSettings()
         mPreferencesUI->startModeComboBox->setCurrentIndex(0);
 
         mPreferencesUI->useSystemOSKCheckBox->setChecked(settings->useSystemOnScreenKeyboard->reset().toBool());
+        mPreferencesUI->showDateColumnOnAlphabeticalSort->setChecked(settings->showDateColumnOnAlphabeticalSort->reset().toBool());
+        UBApplication::documentController->refreshDateColumns();
     }
     else if (mPreferencesUI->mainTabWidget->currentWidget() == mPreferencesUI->penTab)
     {

src/core/UBSettings.cpp

@@ -458,6 +458,8 @@ void UBSettings::init()
 
     useSystemOnScreenKeyboard = new UBSetting(this, "App", "UseSystemOnScreenKeyboard", true);
 
+    showDateColumnOnAlphabeticalSort = new UBSetting(this, "Document", "ShowDateColumnOnAlphabeticalSort", false);
+
     cleanNonPersistentSettings();
     checkNewSettings();
 }

src/core/UBSettings.h

@@ -413,6 +413,8 @@ class UBSettings : public QObject
 
         UBSetting* useSystemOnScreenKeyboard;
 
+        UBSetting* showDateColumnOnAlphabeticalSort;
+
         UBSetting* magnifierDrawingMode;
         UBSetting* autoSaveInterval;
 

src/document/UBDocumentController.cpp

@@ -1991,8 +1991,6 @@ void UBDocumentController::setupViews()
         int sortKind  = UBSettings::settings()->documentSortKind->get().toInt();
         int sortOrder = UBSettings::settings()->documentSortOrder->get().toInt();
 
-        sortDocuments(sortKind, sortOrder);
-
         // update icon and button
         mDocumentUI->sortKind->setCurrentIndex(sortKind);
         if (sortOrder == UBDocumentController::DESC)
@@ -2020,6 +2018,8 @@ void UBDocumentController::setupViews()
         //mDocumentUI->documentTreeView->hideColumn(1);
         mDocumentUI->documentTreeView->hideColumn(2);
 
+        sortDocuments(sortKind, sortOrder);
+
         connect(mDocumentUI->sortKind, SIGNAL(activated(int)), this, SLOT(onSortKindChanged(int)));
         connect(mDocumentUI->sortOrder, SIGNAL(toggled(bool)), this, SLOT(onSortOrderChanged(bool)));
 
@@ -2055,6 +2055,24 @@ void UBDocumentController::setupViews()
 }
 
 //N/C - NNE - 20140403
+void UBDocumentController::refreshDateColumns()
+{
+    if (UBSettings::settings()->documentSortKind->get().toInt() == UBDocumentController::Alphabetical)
+    {
+        if (!UBSettings::settings()->showDateColumnOnAlphabeticalSort->get().toBool())
+        {
+            mDocumentUI->documentTreeView->hideColumn(1);
+            mDocumentUI->documentTreeView->hideColumn(2);
+        }
+        else
+        {
+            mDocumentUI->documentTreeView->showColumn(1);
+            mDocumentUI->documentTreeView->hideColumn(2);
+        }
+    }
+}
+
+
 void UBDocumentController::sortDocuments(int kind, int order)
 {
     Qt::SortOrder sortOrder = Qt::AscendingOrder;
@@ -2074,6 +2092,11 @@ void UBDocumentController::sortDocuments(int kind, int order)
     }else{
         mSortFilterProxyModel->setSortRole(Qt::DisplayRole);
         mSortFilterProxyModel->sort(0, sortOrder);
+        if (!UBSettings::settings()->showDateColumnOnAlphabeticalSort->get().toBool())
+        {
+            mDocumentUI->documentTreeView->hideColumn(1);
+            mDocumentUI->documentTreeView->hideColumn(2);
+        }
     }
 }
 

src/document/UBDocumentController.h

@@ -429,6 +429,7 @@ class UBDocumentController : public UBDocumentContainer
 
     public slots:
         void createNewDocument();
+        void refreshDateColumns();
         //issue 1629 - NNE - 20131105
         void createNewDocumentInUntitledFolder();