Receive the onlineId earlier so it can be shown in the connection popup.

USB: save the device name after exchanging capability info.
WiFi: save the device name used in the device pairing phrase.
This commit is contained in:
codestation
2013-12-25 21:46:42 -04:30
parent 12b0ad997e
commit e9d46005dc
6 changed files with 32 additions and 15 deletions

View File

@@ -51,8 +51,6 @@ void BackupManagerForm::setupForm()
connect(ui->backupComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(loadBackupListing(int)));
ui->tableWidget->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
ui->tableWidget->horizontalHeader()->hide();
// the the account name when vitamtp returns this value
ui->accountBox->addItem(QSettings().value("lastOnlineId", tr("Default account")).toString());
}
void BackupManagerForm::removeEntry(BackupItem *item)
@@ -99,6 +97,10 @@ void BackupManagerForm::loadBackupListing(int index)
bool sys_dir;
int img_width;
//TODO: load all the accounts in the combobox
ui->accountBox->clear();
ui->accountBox->addItem(QSettings().value("lastOnlineId", tr("Default account")).toString());
if(index < 0) {
index = ui->backupComboBox->currentIndex();
}