Skip to content

Commit 72845e0

Browse files
committed
correct sizepolicy
1 parent be80dd6 commit 72845e0

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

src/librmessentials/src/rmedownloader.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,7 @@ void RmeDownloaderPrivate::singleFileFinished()
352352
QUrl u = m_currentDownloadingReply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
353353
if (u.isRelative())
354354
u = u.resolved(QUrl(m_currentDownloadingFile));
355-
qDebug() << "redirect!!";
356-
qDebug() << u;
355+
qDebug() << "redirect!!" << u;
357356
m_currentDownloadingFile = u.toString();
358357
m_currentDownloadingReply = m_networkAccessManager->get(QNetworkRequest(u));
359358
connect(m_currentDownloadingReply, ((void (QNetworkReply::*)(QNetworkReply::NetworkError))(&QNetworkReply::error)), this, &RmeDownloaderPrivate::singleFileError);

src/rmessentials/src/download.cpp

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,27 @@ DownloadDialog::DownloadDialog(QWidget *parent)
3131
{
3232
setWindowTitle(tr("Rhythm Master Downloader"));
3333

34+
QTabWidget *tabWidget = new QTabWidget;
35+
tabWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
36+
tabWidget->addTab(createDownloadSongTab(), tr("Song && IMDs"));
37+
m_list = new QListWidget;
38+
m_list->setSortingEnabled(false);
39+
40+
m_progressBar = new QProgressBar;
41+
m_progressBar->setMinimum(0);
42+
43+
QVBoxLayout *alllayout = new QVBoxLayout;
44+
alllayout->addWidget(tabWidget);
45+
alllayout->addWidget(m_list);
46+
alllayout->addWidget(m_progressBar);
47+
48+
setLayout(alllayout);
49+
50+
connect(this, &DownloadDialog::busy, this, &DownloadDialog::setBusy);
51+
}
52+
53+
QWidget *DownloadDialog::createDownloadSongTab()
54+
{
3455
QVBoxLayout *downloadSongLayout = new QVBoxLayout;
3556

3657
QFormLayout *flayout = new QFormLayout;
@@ -62,26 +83,10 @@ DownloadDialog::DownloadDialog(QWidget *parent)
6283
downloadSongLayout->addLayout(flayout);
6384
downloadSongLayout->addLayout(layout2);
6485

65-
QWidget *downloadSongWidget = new QWidget;
66-
downloadSongWidget->setLayout(downloadSongLayout);
67-
downloadSongWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
68-
69-
QTabWidget *tabWidget = new QTabWidget;
70-
tabWidget->addTab(downloadSongWidget, tr("Song && IMDs"));
71-
m_list = new QListWidget;
72-
m_list->setSortingEnabled(false);
73-
74-
m_progressBar = new QProgressBar;
75-
m_progressBar->setMinimum(0);
76-
77-
QVBoxLayout *alllayout = new QVBoxLayout;
78-
alllayout->addWidget(tabWidget);
79-
alllayout->addWidget(m_list);
80-
alllayout->addWidget(m_progressBar);
81-
82-
setLayout(alllayout);
86+
QWidget *downloadSongTab = new QWidget;
87+
downloadSongTab->setLayout(downloadSongLayout);
8388

84-
connect(this, &DownloadDialog::busy, this, &DownloadDialog::setBusy);
89+
return downloadSongTab;
8590
}
8691

8792
void DownloadDialog::showEvent(QShowEvent *e)

src/rmessentials/src/download.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ class DownloadDialog : public QDialog
3333
private:
3434
void appendLog(const QString &log);
3535

36+
QWidget *createDownloadSongTab();
37+
3638
signals:
3739
void busy(bool);
3840
void cancelDownload();

0 commit comments

Comments
 (0)