mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-23 04:54:18 +00:00
Better fix for save path editing issues in torrent addition dialog
This commit is contained in:
parent
b98d0282ce
commit
328e4fd860
@ -30,7 +30,8 @@
|
||||
|
||||
#include "torrentadditiondlg.h"
|
||||
|
||||
torrentAdditionDialog::torrentAdditionDialog(GUI *parent, QBtSession* _BTSession) : QDialog((QWidget*)parent), old_label(""), hidden_height(0), cursor_pos(-1) {
|
||||
torrentAdditionDialog::torrentAdditionDialog(GUI *parent, QBtSession* _BTSession) :
|
||||
QDialog((QWidget*)parent), old_label(""), hidden_height(0) {
|
||||
setupUi(this);
|
||||
setAttribute(Qt::WA_DeleteOnClose);
|
||||
connect(this, SIGNAL(torrentPaused(QTorrentHandle&)), parent->getTransferList(), SLOT(pauseTorrent(QTorrentHandle&)));
|
||||
@ -250,8 +251,8 @@ void torrentAdditionDialog::showLoad(QString filePath, QString from_url) {
|
||||
loadSavePathHistory();
|
||||
|
||||
// Connect slots
|
||||
connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(updateDiskSpaceLabels()));
|
||||
connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(updateSavePathCurrentText(QString)));
|
||||
connect(savePathTxt->lineEdit(), SIGNAL(editingFinished()), this, SLOT(updateDiskSpaceLabels()));
|
||||
connect(savePathTxt->lineEdit(), SIGNAL(editingFinished()), this, SLOT(updateSavePathCurrentText()));
|
||||
if(nbFiles == 1) {
|
||||
// Update properties model whenever the file path is edited
|
||||
connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(renameTorrentNameInModel(QString)));
|
||||
@ -643,18 +644,9 @@ void torrentAdditionDialog::renameSelectedFile() {
|
||||
}
|
||||
}
|
||||
|
||||
void torrentAdditionDialog::restoreCursorPosition() {
|
||||
savePathTxt->lineEdit()->setCursorPosition(cursor_pos);
|
||||
cursor_pos = -1;
|
||||
}
|
||||
|
||||
void torrentAdditionDialog::updateSavePathCurrentText(QString path) {
|
||||
if(cursor_pos >= 0)
|
||||
return;
|
||||
Q_UNUSED(path);
|
||||
cursor_pos = savePathTxt->lineEdit()->cursorPosition();
|
||||
savePathTxt->setItemText(savePathTxt->currentIndex(), path);
|
||||
QTimer::singleShot(0, this, SLOT(restoreCursorPosition()));
|
||||
void torrentAdditionDialog::updateSavePathCurrentText() {
|
||||
qDebug("updateSavePathCurrentText() - ENTER");
|
||||
savePathTxt->setItemText(savePathTxt->currentIndex(), savePathTxt->currentText());
|
||||
path_history.replace(savePathTxt->currentIndex(), getCurrentTruncatedSavePath());
|
||||
QString root_folder_or_file_name = "";
|
||||
getCurrentTruncatedSavePath(&root_folder_or_file_name);
|
||||
|
@ -86,12 +86,9 @@ public slots:
|
||||
void saveTruncatedPathHistory();
|
||||
void loadSavePathHistory();
|
||||
void updateLabelInSavePath(QString label);
|
||||
void updateSavePathCurrentText(QString path);
|
||||
void updateSavePathCurrentText();
|
||||
void resetComboLabelIndex(QString text);
|
||||
|
||||
protected slots:
|
||||
void restoreCursorPosition();
|
||||
|
||||
signals:
|
||||
void torrentPaused(QTorrentHandle &h);
|
||||
|
||||
@ -112,7 +109,6 @@ private:
|
||||
bool is_magnet;
|
||||
int hidden_height;
|
||||
QStringList path_history;
|
||||
int cursor_pos;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user