Skip to content

Commit

Permalink
Merge pull request #40682 from tomtor/FixRecentProjectsGui
Browse files Browse the repository at this point in the history
Remove updateRecentProjectsVisibility()
  • Loading branch information
nyalldawson committed Jan 27, 2021
2 parents 84e2aeb + 9e05efa commit f3632e8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
15 changes: 2 additions & 13 deletions src/app/qgswelcomepage.cpp
Expand Up @@ -75,11 +75,6 @@ QgsWelcomePage::QgsWelcomePage( bool skipVersionCheck, QWidget *parent )
mRecentProjectsListView->setModel( mRecentProjectsModel );
QgsProjectListItemDelegate *recentProjectsDelegate = new QgsProjectListItemDelegate( mRecentProjectsListView );
mRecentProjectsListView->setItemDelegate( recentProjectsDelegate );
connect( mRecentProjectsModel, &QAbstractItemModel::rowsRemoved, this, [this]
{
updateRecentProjectsVisibility();
}
);

leftLayout->addWidget( mRecentProjectsListView, 1 );
leftContainer->setLayout( leftLayout );
Expand Down Expand Up @@ -150,6 +145,8 @@ QgsWelcomePage::QgsWelcomePage( bool skipVersionCheck, QWidget *parent )

rightContainer->setLayout( rightLayout );
mSplitter->addWidget( rightContainer );
mSplitter->setStretchFactor( 0, 4 );
mSplitter->setStretchFactor( 1, 6 );

mVersionInformation = new QTextBrowser;
mVersionInformation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Maximum );
Expand Down Expand Up @@ -194,7 +191,6 @@ QgsWelcomePage::~QgsWelcomePage()
void QgsWelcomePage::setRecentProjects( const QList<QgsRecentProjectItemsModel::RecentProjectData> &recentProjects )
{
mRecentProjectsModel->setRecentProjects( recentProjects );
updateRecentProjectsVisibility();
}

QString QgsWelcomePage::newsFeedUrl()
Expand Down Expand Up @@ -411,13 +407,6 @@ void QgsWelcomePage::showContextMenuForNews( QPoint point )
menu->popup( mNewsFeedListView->mapToGlobal( point ) );
}

void QgsWelcomePage::updateRecentProjectsVisibility()
{
const bool visible = mRecentProjectsModel->rowCount() > 0;
mRecentProjectsListView->setVisible( visible );
mRecentProjectsTitle->setVisible( visible );
}

void QgsWelcomePage::updateNewsFeedVisibility()
{
if ( !mNewsFeedModel || !mNewsFeedListView || !mSplitter2 )
Expand Down
2 changes: 0 additions & 2 deletions src/app/qgswelcomepage.h
Expand Up @@ -68,8 +68,6 @@ class QgsWelcomePage : public QWidget
void updateNewsFeedVisibility();

private:
void updateRecentProjectsVisibility();

QgsRecentProjectItemsModel *mRecentProjectsModel = nullptr;
QTextBrowser *mVersionInformation = nullptr;
QgsVersionInfo *mVersionInfo = nullptr;
Expand Down

0 comments on commit f3632e8

Please sign in to comment.