This commit is contained in:
DavidXanatos 2023-05-21 13:54:05 +02:00
parent 8bca9c7a41
commit 673196376e
2 changed files with 9 additions and 6 deletions

View File

@ -33,7 +33,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- fixed Firewall Rules - Colors make testing difficult in dark mode [#2900](https://github.com/sandboxie-plus/Sandboxie/issues/2900) - fixed Firewall Rules - Colors make testing difficult in dark mode [#2900](https://github.com/sandboxie-plus/Sandboxie/issues/2900)
- fixed RecoverFolder shows GUID instead of folder name [#2918](https://github.com/sandboxie-plus/Sandboxie/issues/2918) - fixed RecoverFolder shows GUID instead of folder name [#2918](https://github.com/sandboxie-plus/Sandboxie/issues/2918)
- fixed System tray icon hourglass overlay gets stuck when operation is stopped [#2869](https://github.com/sandboxie-plus/Sandboxie/issues/2869) - fixed System tray icon hourglass overlay gets stuck when operation is stopped [#2869](https://github.com/sandboxie-plus/Sandboxie/issues/2869)
- fixed File Panel doesn't allow to adjust columns size in a permanent way [#2930](https://github.com/sandboxie-plus/Sandboxie/issues/2930)

View File

@ -31,10 +31,6 @@ CFileView::CFileView(QWidget *parent)
m_pTreeView->setContextMenuPolicy(Qt::CustomContextMenu); m_pTreeView->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_pTreeView, SIGNAL(customContextMenuRequested( const QPoint& )), this, SLOT(OnFileMenu(const QPoint &))); connect(m_pTreeView, SIGNAL(customContextMenuRequested( const QPoint& )), this, SLOT(OnFileMenu(const QPoint &)));
connect(m_pTreeView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(OnFileDblClick(const QModelIndex &))); connect(m_pTreeView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(OnFileDblClick(const QModelIndex &)));
QByteArray Columns = theConf->GetBlob("MainWindow/FileTree_Columns");
if (!Columns.isEmpty())
m_pTreeView->header()->restoreState(Columns);
} }
CFileView::~CFileView() CFileView::~CFileView()
@ -44,7 +40,8 @@ CFileView::~CFileView()
void CFileView::SaveState() void CFileView::SaveState()
{ {
theConf->SetBlob("MainWindow/FileTree_Columns", m_pTreeView->header()->saveState()); if(m_pFileModel)
theConf->SetBlob("MainWindow/FileTree_Columns", m_pTreeView->header()->saveState());
} }
void CFileView::SetBox(const CSandBoxPtr& pBox) void CFileView::SetBox(const CSandBoxPtr& pBox)
@ -66,12 +63,18 @@ void CFileView::SetBox(const CSandBoxPtr& pBox)
// m_pTreeView->setEnabled(true); // m_pTreeView->setEnabled(true);
if (m_pFileModel) { if (m_pFileModel) {
SaveState();
delete m_pFileModel; delete m_pFileModel;
m_pFileModel = NULL; m_pFileModel = NULL;
} }
if (!Root.isEmpty()) { if (!Root.isEmpty()) {
m_pFileModel = new QFileSystemModel(this); m_pFileModel = new QFileSystemModel(this);
m_pFileModel->setFilter(QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Files | QDir::Hidden | QDir::System); m_pFileModel->setFilter(QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Files | QDir::Hidden | QDir::System);
QByteArray Columns = theConf->GetBlob("MainWindow/FileTree_Columns");
if (!Columns.isEmpty())
m_pTreeView->header()->restoreState(Columns);
} }
m_pTreeView->setModel(m_pFileModel); m_pTreeView->setModel(m_pFileModel);