Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed updating save filename, removal of files/dirs, and cleaning before save

Browse Source
This commit is contained in:
csoler 2024-03-20 21:00:42 +01:00
parent 2ebd7617fc
commit a02d2e63e2
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/common/RsCollection.cpp
View File

@ -681,5 +681,9 @@ bool RsCollection::removeDirectory(RsFileTree::DirIndex index_to_remove,RsFileTr
void RsCollection::cleanup()
{
RsDbg() << "Cleaning up RsCollection with " << mFileTree->numDirs() << " dirs and " << mFileTree->numFiles() << " files." ;
mFileTree = RsFileTree::fromTreeCleaned(*mFileTree);
RsDbg() << "Simplified to " << mFileTree->numDirs() << " dirs and " << mFileTree->numFiles() << " files.";
}

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

@ -125,7 +125,7 @@ protected:
* @param readOnly: Open dialog for RsColl as ReadOnly
*/
RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsCollectionDialogMode mode)
: _fileName(collectionFileName), _mode(mode)
: _mode(mode)
{
RsCollection::RsCollectionErrorCode err_code;
mCollection = new RsCollection(collectionFileName,err_code);
@ -137,6 +137,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
}
ui.setupUi(this) ;
ui._filename_TL->setText(collectionFileName);
// uint32_t size = colFileInfos.size();
// for(uint32_t i=0;i<size;++i)
@ -148,7 +149,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
setWindowFlags(Qt::Window); // for maximize button
setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint);
setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName()));
setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(collectionFileName).completeBaseName()));
ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/collections.png"));
@ -719,7 +720,7 @@ void RsCollectionDialog::changeFileName()
file.remove();
}
_fileName = fileName;
ui._filename_TL->setText(fileName);
updateList();
}
@ -1559,9 +1560,14 @@ void RsCollectionDialog::download()
*/
void RsCollectionDialog::save()
{
if(ui._filename_TL->text().isNull())
changeFileName();
if(ui._filename_TL->text().isNull())
return;
mCollectionModel->preMods();
mCollection->cleanup();
mCollection->save(_fileName);
mCollection->save(ui._filename_TL->text());
close();
#ifdef TO_REMOVE
std::cerr << "Saving!" << std::endl;

7
retroshare-gui/src/gui/common/RsCollectionDialog.ui
View File

@ -157,7 +157,7 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="_changeFile">
<widget class="QToolButton" name="_changeFile">
<property name="maximumSize">
<size>
<width>21</width>
@ -170,6 +170,10 @@
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/browsable_blue_128.png</normaloff>:/icons/browsable_blue_128.png</iconset>
</property>
</widget>
</item>
</layout>
@ -512,6 +516,7 @@
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../icons.qrc"/>
</resources>
<connections/>
</ui>