Enable hiding and re-adding columns

Includes all settings, saving and restoring, and translation.

Missing optimization for not updating hidden columns.

For #129

Author: svetter

src/main/item_types_handler.h

@@ -102,6 +102,8 @@ class ItemTypeMapper {
 	ProjectMultiSetting<int>* const			columnWidthsSetting;
 	/** The setting storing the column order for the UI table of this item type. */
 	ProjectMultiSetting<int>* const			columnOrderSetting;
+	/** The setting storing the column hidden states for the UI table of this item type. */
+	ProjectMultiSetting<bool>* const		hiddenColumnsSetting;
 	/** The setting storing the sorting of the UI table of this item type. */
 	const ProjectSetting<QString>* const	sortingSetting;
 
@@ -154,6 +156,7 @@ class ItemTypeMapper {
 			QPushButton* const	newItemButton,
 			ProjectMultiSetting<int>*		columnWidthsSetting,
 			ProjectMultiSetting<int>*		columnOrderSetting,
+			ProjectMultiSetting<bool>*		hiddenColumnsSetting,
 			const ProjectSetting<QString>*	sortingSetting,
 			const Setting<QRect>*			dialogGeometrySetting,
 			BufferRowIndex	(* const openNewItemDialogAndStoreMethod)		(QWidget*, Database*),
@@ -173,6 +176,7 @@ class ItemTypeMapper {
 			dialogGeometrySetting					(dialogGeometrySetting),
 			columnWidthsSetting						(columnWidthsSetting),
 			columnOrderSetting						(columnOrderSetting),
+			hiddenColumnsSetting					(hiddenColumnsSetting),
 			sortingSetting							(sortingSetting),
 			openNewItemDialogAndStoreMethod			(openNewItemDialogAndStoreMethod),
 			openDuplicateItemDialogAndStoreMethod	(openDuplicateItemDialogAndStoreMethod),
@@ -225,6 +229,7 @@ class ItemTypeMapper {
 	QPushButton* const				newItemButton, \
 	ProjectMultiSetting<int>*		columnWidthsSetting, \
 	ProjectMultiSetting<int>*		columnOrderSetting, \
+	ProjectMultiSetting<bool>*		hiddenColumnsSetting, \
 	const ProjectSetting<QString>*	sortingSetting
 
 /**
@@ -239,6 +244,7 @@ class ItemTypeMapper {
 	newItemButton, \
 	columnWidthsSetting, \
 	columnOrderSetting, \
+	hiddenColumnsSetting, \
 	sortingSetting
 
 

src/main/main_window.cpp

@@ -53,7 +53,15 @@ class MainWindow : public QMainWindow, public Ui_MainWindow
 	Database db;
 	/** The list of menu items for opening the most recently opened database files. */
 	QList<QAction*> openRecentActions;
-	/** The context menu for the UI tables. */
+	
+	/** The context menu for the column header area of all UI tables. */
+	QMenu columnContextMenu;
+	/** The column context menu entry for hiding the selected column. */
+	QAction* columnContextMenuHideColumnAction;
+	/** The column context submenu for unhiding any previously hidden column. */
+	QMenu* columnContextMenuRestoreColumnMenu;
+	
+	/** The context menu for the cell are of all UI tables. */
 	QMenu tableContextMenu;
 	/** The context menu entry for opening the selected item. */
 	QAction* tableContextMenuOpenAction;
@@ -63,8 +71,10 @@ class MainWindow : public QMainWindow, public Ui_MainWindow
 	QAction* tableContextMenuDuplicateAction;
 	/** The context menu entry for deleting the selected items. */
 	QAction* tableContextMenuDeleteAction;
+	
 	/** List of keyboard shortcuts. */
 	QList<QShortcut*> shortcuts;
+	
 	/** The status bar label for the current table size. */
 	QLabel* statusBarTableSizeLabel;
 	/** The status bar label for the current filter settings. */
@@ -94,9 +104,11 @@ class MainWindow : public QMainWindow, public Ui_MainWindow
 	void setupDebugTableViews();
 	void restoreColumnWidths(const ItemTypeMapper* const mapper);
 	void restoreColumnOrder(const ItemTypeMapper* const mapper);
+	void restoreColumnHiddenStatus(const ItemTypeMapper* const mapper);
 	void setSorting(const ItemTypeMapper* const mapper);
+	void initColumnContextMenu();
 	void initTableContextMenuAndShortcuts();
-	void updateContextMenuEditIcon();
+	void updateTableContextMenuIcons();
 
 	// Project setup (on load)
 	void attemptToOpenFile(const QString& filepath);
@@ -124,9 +136,13 @@ class MainWindow : public QMainWindow, public Ui_MainWindow
 private slots:
 	// UI event handlers
 	void handle_tabChanged();
-	void handle_rightClick(QPoint pos);
+	void handle_rightClickOnColumnHeader(QPoint pos);
+	void handle_rightClickInTable(QPoint pos);
 
-	// Context menu action handlers
+	// Column context menu action handlers
+	void handle_hideColumn();
+	void handle_unhideColumn();
+	// Table context menu action handlers
 	void handle_viewSelectedItem();
 	void handle_editSelectedItem();
 	void handle_duplicateAndEditSelectedItem();
@@ -145,6 +161,7 @@ private slots:
 	void handle_showFiltersChanged();
 	void handle_autoResizeColumns();
 	void handle_resetColumnOrder();
+	void handle_restoreHiddenColumns();
 	// Tools menu action handlers
 	void handle_relocatePhotos();
 	void handle_exportData();
@@ -156,8 +173,7 @@ private slots:
 	void closeEvent(QCloseEvent* event) override;
 	void saveProjectImplicitSettings();
 	void saveGlobalImplicitSettings();
-	void saveColumnWidths(const ItemTypeMapper* const mapper);
-	void saveColumnOrder(const ItemTypeMapper* const mapper);
+	void saveImplicitColumnSettings(const ItemTypeMapper* const mapper);
 	void saveSorting(const ItemTypeMapper* const mapper);
 	// Layout changes
 	virtual void resizeEvent(QResizeEvent* event) override;

src/main/main_window.h

@@ -113,6 +113,7 @@ class ProjectMultiSetting
 
 // List used types as compiler hints
 template class ProjectMultiSetting<int>;
+template class ProjectMultiSetting<bool>;
 
 
 
@@ -170,6 +171,22 @@ class ProjectSettings {
 	/** Remembered column order of the countries table in the main window. */
 	ProjectMultiSetting<int>	columnOrder_countriesTable;
 
+	// Hidden columns
+	/** Remembered column hidden states of the ascents table in the main window. */
+	ProjectMultiSetting<bool>	hiddenColumns_ascentsTable;
+	/** Remembered column hidden states of the peaks table in the main window. */
+	ProjectMultiSetting<bool>	hiddenColumns_peaksTable;
+	/** Remembered column hidden states of the trips table in the main window. */
+	ProjectMultiSetting<bool>	hiddenColumns_tripsTable;
+	/** Remembered column hidden states of the hikers table in the main window. */
+	ProjectMultiSetting<bool>	hiddenColumns_hikersTable;
+	/** Remembered column hidden states of the regions table in the main window. */
+	ProjectMultiSetting<bool>	hiddenColumns_regionsTable;
+	/** Remembered column hidden states of the ranges table in the main window. */
+	ProjectMultiSetting<bool>	hiddenColumns_rangesTable;
+	/** Remembered column hidden states of the countries table in the main window. */
+	ProjectMultiSetting<bool>	hiddenColumns_countriesTable;
+	
 	// Sorting
 	/** Remembered sorting of the ascents table in the main window. */
 	ProjectSetting<QString>		sorting_ascentsTable;
@@ -250,6 +267,15 @@ class ProjectSettings {
 			columnOrder_rangesTable			(ProjectMultiSetting<int>	(table,	"implicit/mainWindow/columnOrder/rangesTable",					-1)),
 			columnOrder_countriesTable		(ProjectMultiSetting<int>	(table,	"implicit/mainWindow/columnOrder/countriesTable",				-1)),
 
+			// Column widths
+			hiddenColumns_ascentsTable		(ProjectMultiSetting<bool>	(table,	"implicit/mainWindow/hiddenColumns/ascentsTable",				false)),
+			hiddenColumns_peaksTable		(ProjectMultiSetting<bool>	(table,	"implicit/mainWindow/hiddenColumns/peaksTable",					false)),
+			hiddenColumns_tripsTable		(ProjectMultiSetting<bool>	(table,	"implicit/mainWindow/hiddenColumns/tripsTable",					false)),
+			hiddenColumns_hikersTable		(ProjectMultiSetting<bool>	(table,	"implicit/mainWindow/hiddenColumns/hikersTable",				false)),
+			hiddenColumns_regionsTable		(ProjectMultiSetting<bool>	(table,	"implicit/mainWindow/hiddenColumns/regionsTable",				false)),
+			hiddenColumns_rangesTable		(ProjectMultiSetting<bool>	(table,	"implicit/mainWindow/hiddenColumns/rangesTable",				false)),
+			hiddenColumns_countriesTable	(ProjectMultiSetting<bool>	(table,	"implicit/mainWindow/hiddenColumns/countriesTable",				false)),
+			
 			// Sorting
 			sorting_ascentsTable			(ProjectSetting<QString>	(table,	"implicit/mainWindow/sorting/ascentsTable")),
 			sorting_peaksTable				(ProjectSetting<QString>	(table,	"implicit/mainWindow/sorting/peaksTable")),

src/settings/project_settings.h

@@ -331,6 +331,8 @@ class Settings {
 	inline static const Setting<bool>	rememberColumnWidths						= Setting<bool>		("rememberColumnWidths",						true);
 	/** Remember the column order of all tables in the main window. */
 	inline static const Setting<bool>	rememberColumnOrder							= Setting<bool>		("rememberColumnOrder",							true);
+	/** Remember which columns are hidden in all tables in the main window. */
+	inline static const Setting<bool>	rememberHiddenColumns						= Setting<bool>		("rememberHiddenColumns",						true);
 	/** Remember the sorting of all tables in the main window. */
 	inline static const Setting<bool>	rememberSorting								= Setting<bool>		("rememberSorting",								true);
 	/** Remember the active filters of all tables in the main window. */

src/settings/settings.h

@@ -92,6 +92,7 @@ void SettingsWindow::loadSettings()
 	rememberTableCheckbox						->setChecked	(rememberTab								.get());
 	rememberColumnWidthsCheckbox				->setChecked	(rememberColumnWidths						.get());
 	rememberColumnOrderCheckbox					->setChecked	(rememberColumnOrder						.get());
+	rememberHiddenColumnsCheckbox				->setChecked	(rememberHiddenColumns						.get());
 	rememberSortingCheckbox						->setChecked	(rememberSorting							.get());
 	rememberFiltersCheckbox						->setChecked	(rememberFilters							.get());
 
@@ -129,6 +130,7 @@ void SettingsWindow::loadDefaults()
 	rememberTableCheckbox						->setChecked	(rememberTab								.getDefault());
 	rememberColumnWidthsCheckbox				->setChecked	(rememberColumnWidths						.getDefault());
 	rememberColumnOrderCheckbox					->setChecked	(rememberColumnOrder						.getDefault());
+	rememberHiddenColumnsCheckbox				->setChecked	(rememberHiddenColumns						.getDefault());
 	rememberSortingCheckbox						->setChecked	(rememberSorting							.getDefault());
 	rememberFiltersCheckbox						->setChecked	(rememberFilters							.getDefault());
 
@@ -171,6 +173,7 @@ void SettingsWindow::saveSettings()
 	rememberTab									.set(rememberTableCheckbox						->isChecked());
 	rememberColumnWidths						.set(rememberColumnWidthsCheckbox				->isChecked());
 	rememberColumnOrder							.set(rememberColumnOrderCheckbox				->isChecked());
+	rememberHiddenColumns						.set(rememberHiddenColumnsCheckbox				->isChecked());
 	rememberSorting								.set(rememberSortingCheckbox					->isChecked());
 	rememberFilters								.set(rememberFiltersCheckbox					->isChecked());
 

src/settings/settings_window.cpp

@@ -786,6 +786,7 @@
     <addaction name="separator"/>
     <addaction name="autoResizeColumnsAction"/>
     <addaction name="resetColumnOrderAction"/>
+    <addaction name="restoreHiddenColumnsAction"/>
    </widget>
    <widget class="QMenu" name="newMenu">
     <property name="title">
@@ -981,6 +982,11 @@
     <string>Reset column order</string>
    </property>
   </action>
+  <action name="restoreHiddenColumnsAction">
+   <property name="text">
+    <string>Restore hidden columns</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

src/ui/main_window.ui

@@ -251,24 +251,31 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="rememberSortingCheckbox">
+           <property name="text">
+            <string>Sorting</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
           <widget class="QCheckBox" name="rememberColumnWidthsCheckbox">
            <property name="text">
             <string>Column widths</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="rememberSortingCheckbox">
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="rememberColumnOrderCheckbox">
            <property name="text">
-            <string>Sorting</string>
+            <string>Column order</string>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
-          <widget class="QCheckBox" name="rememberColumnOrderCheckbox">
+          <widget class="QCheckBox" name="rememberHiddenColumnsCheckbox">
            <property name="text">
-            <string>Column order</string>
+            <string>Hidden columns</string>
            </property>
           </widget>
          </item>