spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-09-21 18:42:20 +08:00
Code Issues1 Packages Projects Releases Wiki Activity

实现分类加载失败可重新加载的UI

Browse Source
This commit is contained in:
RigoLigoRLC 2022-02-13 23:13:41 +08:00
parent f655d0d94d
commit ae987f9542
4 changed files with 82 additions and 3 deletions

7
gui/page/spkpagehome.cpp

@ -27,6 +27,12 @@ void SpkUi::SpkPageHome::SetupUi()
ui->lblVersion->setText(ui->lblVersion->text().arg(GitVer::DescribeTags())); ui->lblVersion->setText(ui->lblVersion->text().arg(GitVer::DescribeTags()));
ui->lblNewAnnouncement->setVisible(false);
ui->widReloadCategory->setVisible(false);
ui->widReloadCategory->setAttribute(Qt::WA_StyledBackground);
ui->lblCategoryErrIcon->setPixmap(QIcon::fromTheme("dialog-error").pixmap(QSize(32, 32)));
connect(ui->lblAuthor, &QLabel::linkActivated, connect(ui->lblAuthor, &QLabel::linkActivated,
this, &SpkPageHome::LinkActivated); this, &SpkPageHome::LinkActivated);
connect(ui->btnFeedback, &QPushButton::clicked, connect(ui->btnFeedback, &QPushButton::clicked,
@ -35,5 +41,4 @@ void SpkUi::SpkPageHome::SetupUi()
[&](){ LinkActivated("https://spark.deepinos.org.cn/"); }); [&](){ LinkActivated("https://spark.deepinos.org.cn/"); });
connect(ui->btnAbout, &QPushButton::clicked, connect(ui->btnAbout, &QPushButton::clicked,
[&](){ SpkAbout::Show(); }); [&](){ SpkAbout::Show(); });
ui->lblNewAnnouncement->setVisible(false);
} }

67
gui/page/ui/homepage.ui

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>648</width> <width>648</width>
<height>468</height> <height>554</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -220,6 +220,71 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QWidget" name="widReloadCategory" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="lblCategoryErrIcon">
<property name="text">
<string>{error-icon}</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lblCategoryErr">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Category loading failed. Click the button to retry.</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnReloadCategory">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Reload</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>

5
gui/spkmainwindow.cpp

@ -99,9 +99,10 @@ void SpkMainWindow::CategoryDataReceived()
{ {
sErr(tr("Failed to load categories! Type=%1 Code=%2").arg(retval.type()).arg(verify)); sErr(tr("Failed to load categories! Type=%1 Code=%2").arg(retval.type()).arg(verify));
sNotify(tr("Cannot load categories! Type: %1 Code: %2").arg(retval.type()).arg(verify)); sNotify(tr("Cannot load categories! Type: %1 Code: %2").arg(retval.type()).arg(verify));
// TODO: Switch to an error page ui->PageHome->ui->widReloadCategory->setVisible(true);
return; return;
} }
ui->PageHome->ui->widReloadCategory->setVisible(false);
PopulateCategories(retval.toArray()); PopulateCategories(retval.toArray());
} }
@ -364,6 +365,8 @@ void SpkMainWindow::Initialize()
} }
connect(ui->PageAppDetails, &SpkUi::SpkPageAppDetails::RequestDownload, connect(ui->PageAppDetails, &SpkUi::SpkPageAppDetails::RequestDownload,
ui->PageDownloads, &SpkUi::SpkPageDownloads::AddDownloadTask); ui->PageDownloads, &SpkUi::SpkPageDownloads::AddDownloadTask);
connect(ui->PageHome->ui->btnReloadCategory, &QPushButton::clicked,
this, &SpkMainWindow::RefreshCategoryData);
// Register themed button icons // Register themed button icons
// mThemedUiIconReferences.append({ ui->BtnSettings, "settings" }); // mThemedUiIconReferences.append({ ui->BtnSettings, "settings" });

6
resource/stylesheets/default.css

@ -237,6 +237,12 @@ SpkAppItem::hover
{ {
} }
#widReloadCategory
{
background-color: #FFA329;
border-radius: 6px;
}
#styAppItmTitle #styAppItmTitle
{ {
font-weight: 500; font-weight: 500;