Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-03 02:50:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1178 from PhenomRetroShare/Fix_BugsInRsCollectionDialog

Browse Source 
Fix bugs in rs collection dialog
This commit is contained in:
csoler 2018-02-18 17:59:00 +01:00 committed by GitHub
commit 2bc0629cc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
retroshare-gui/src/gui/common/RsCollectionDialog.cpp
View File

@ -21,17 +21,23 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "RsCollectionDialog.h"
#include "RsCollection.h"
#include "util/misc.h"
#include <QCheckBox> #include <QCheckBox>
#include <QDateTime>
#include <QDir>
#include <QFileSystemModel>
#include <QHeaderView>
#include <QInputDialog>
#include <QKeyEvent>
#include <QMessageBox> #include <QMessageBox>
#include <QMenu> #include <QMenu>
#include <QTextEdit> #include <QTextEdit>
#include <QDir> #include <QTreeView>
#include <QKeyEvent>
#include <QDateTime>
#include <QInputDialog>
#include "RsCollectionDialog.h"
#include "RsCollection.h"
#include "util/misc.h"
#define COLUMN_FILE 0 #define COLUMN_FILE 0
#define COLUMN_FILEPATH 1 #define COLUMN_FILEPATH 1
#define COLUMN_SIZE 2 #define COLUMN_SIZE 2
@ -366,6 +372,8 @@ void RsCollectionDialog::processSettings(bool bLoad)
ui._listSplitter->restoreState(Settings->value("ListSplitterState_CM").toByteArray()); ui._listSplitter->restoreState(Settings->value("ListSplitterState_CM").toByteArray());
// Load system file header configuration // Load system file header configuration
ui._systemFileTW->header()->restoreState(Settings->value("SystemFileHeader_CM").toByteArray()); ui._systemFileTW->header()->restoreState(Settings->value("SystemFileHeader_CM").toByteArray());
// Load file entries header configuration
ui._fileEntriesTW->header()->restoreState(Settings->value("FileEntriesHeader_CM").toByteArray());
} else { } else {
// Load windows geometrie // Load windows geometrie
restoreGeometry(Settings->value("WindowGeometrie").toByteArray()); restoreGeometry(Settings->value("WindowGeometrie").toByteArray());
@ -374,22 +382,30 @@ void RsCollectionDialog::processSettings(bool bLoad)
ui._listSplitter->restoreState(Settings->value("ListSplitterState").toByteArray()); ui._listSplitter->restoreState(Settings->value("ListSplitterState").toByteArray());
// Load system file header configuration // Load system file header configuration
ui._systemFileTW->header()->restoreState(Settings->value("SystemFileHeader").toByteArray()); ui._systemFileTW->header()->restoreState(Settings->value("SystemFileHeader").toByteArray());
// Load file entries header configuration
ui._fileEntriesTW->header()->restoreState(Settings->value("FileEntriesHeader").toByteArray());
} }
} else { } else {
if(_creationMode && !_readOnly){ if(_creationMode && !_readOnly){
// Save windows geometrie // Save windows geometrie
Settings->setValue("WindowGeometrie_CM",saveGeometry()); Settings->setValue("WindowGeometrie_CM",saveGeometry());
// Save splitter state // Save splitters state
Settings->setValue("SplitterState_CM", ui._listSplitter->saveState()); Settings->setValue("MainSplitterState_CM", ui._mainSplitter->saveState());
// Save treeView header configuration Settings->setValue("ListSplitterState_CM", ui._listSplitter->saveState());
// Save system file header configuration
Settings->setValue("SystemFileHeader_CM", ui._systemFileTW->header()->saveState()); Settings->setValue("SystemFileHeader_CM", ui._systemFileTW->header()->saveState());
// Save file entries header configuration
Settings->setValue("FileEntriesHeader_CM", ui._fileEntriesTW->header()->saveState());
} else { } else {
// Save windows geometrie // Save windows geometrie
Settings->setValue("WindowGeometrie",saveGeometry()); Settings->setValue("WindowGeometrie",saveGeometry());
// Save splitter state // Save splitter state
Settings->setValue("SplitterState", ui._listSplitter->saveState()); Settings->setValue("MainSplitterState", ui._mainSplitter->saveState());
// Save treeView header configuration Settings->setValue("ListSplitterState", ui._listSplitter->saveState());
// Save system file header configuration
Settings->setValue("SystemFileHeader", ui._systemFileTW->header()->saveState()); Settings->setValue("SystemFileHeader", ui._systemFileTW->header()->saveState());
// Save file entries header configuration
Settings->setValue("FileEntriesHeader", ui._fileEntriesTW->header()->saveState());
} }
} }
@ -797,7 +813,7 @@ void RsCollectionDialog::addRecursive(bool recursive)
for (QHash<QString,QString>::Iterator it = _listOfFilesAddedInDir.begin(); it != _listOfFilesAddedInDir.end() ; ++it) for (QHash<QString,QString>::Iterator it = _listOfFilesAddedInDir.begin(); it != _listOfFilesAddedInDir.end() ; ++it)
{ {
QString path = it.value(); QString path = it.value();
it.value() = ""; //it.value() = "";//Don't reset value, could be an older attachment not terminated.
if (dirToAdd.contains(path)){ if (dirToAdd.contains(path)){
it.value() = dirToAdd.value(path); it.value() = dirToAdd.value(path);
} else if(item) { } else if(item) {
@ -980,7 +996,11 @@ bool RsCollectionDialog::removeItem(QTreeWidgetItem *item, bool &removeOnlyFile)
//First uncheck item to update parent informations //First uncheck item to update parent informations
item->setCheckState(COLUMN_FILE,Qt::Unchecked); item->setCheckState(COLUMN_FILE,Qt::Unchecked);
QTreeWidgetItem *parent = item->parent(); QTreeWidgetItem *parent = item->parent();
if (parent) {
parent->removeChild(item); parent->removeChild(item);
} else {
getRootItem()->removeChild(item);
}
return true; return true;
} else { } else {
if (!removeOnlyFile) { if (!removeOnlyFile) {