diff --git a/Resource.qrc b/Resource.qrc index 73babd9..3bbe664 100644 --- a/Resource.qrc +++ b/Resource.qrc @@ -1,7 +1,14 @@ - - kernel-installer-template.sh - kernel-installer-root-loader-template.sh + + shell/kernel-installer-root-loader-template.sh + shell/kernel-installer-template.sh + icon/dialog-apply.svg + icon/dialog-cancel.svg + icon/dialog-error.svg + icon/dialog-information.svg + icon/dialog-ok.svg + icon/dialog-question.svg + icon/dialog-warning.svg + icon/icon.svg - diff --git a/icon/dialog-apply.svg b/icon/dialog-apply.svg new file mode 100644 index 0000000..3a1ab0b --- /dev/null +++ b/icon/dialog-apply.svg @@ -0,0 +1,15 @@ + + + + dialog-apply + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/icon/dialog-cancel.svg b/icon/dialog-cancel.svg new file mode 100644 index 0000000..91bd21f --- /dev/null +++ b/icon/dialog-cancel.svg @@ -0,0 +1,15 @@ + + + + dialog-cancel + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/icon/dialog-error.svg b/icon/dialog-error.svg new file mode 100644 index 0000000..998f48a --- /dev/null +++ b/icon/dialog-error.svg @@ -0,0 +1,15 @@ + + + + dialog-error + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/icon/dialog-information.svg b/icon/dialog-information.svg new file mode 100644 index 0000000..0d5ad3f --- /dev/null +++ b/icon/dialog-information.svg @@ -0,0 +1,15 @@ + + + + dialog-information + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/icon/dialog-ok.svg b/icon/dialog-ok.svg new file mode 100644 index 0000000..970e68c --- /dev/null +++ b/icon/dialog-ok.svg @@ -0,0 +1,14 @@ + + + + dialog-ok + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/icon/dialog-question.svg b/icon/dialog-question.svg new file mode 100644 index 0000000..611355c --- /dev/null +++ b/icon/dialog-question.svg @@ -0,0 +1,15 @@ + + + + dialog-question + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/icon/dialog-warning.svg b/icon/dialog-warning.svg new file mode 100644 index 0000000..1bf157d --- /dev/null +++ b/icon/dialog-warning.svg @@ -0,0 +1,15 @@ + + + + dialog-warning + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/icon/icon.svg b/icon/icon.svg new file mode 100644 index 0000000..a4626dd --- /dev/null +++ b/icon/icon.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/kernelinstaller.cpp b/kernelinstaller.cpp index 9cf2746..db332ed 100644 --- a/kernelinstaller.cpp +++ b/kernelinstaller.cpp @@ -15,7 +15,13 @@ KernelInstaller::KernelInstaller(QStringList kernelList, QWidget *parent) : ui(new Ui::KernelInstaller) { ui->setupUi(this); - ui->m_installerStatus->setHidden(true); + // 修改提示文本 + QString kernel = ""; + foreach (QString name, kernelList) { + kernel += name + " "; + } + ui->m_status->setText(tr("Try to install ") + kernel); + this->kernelList = kernelList; terminal = new QTermWidget(0); terminal->setColorScheme("DarkPastels"); diff --git a/kernelinstaller.ui b/kernelinstaller.ui index d6d3def..2e1b00b 100644 --- a/kernelinstaller.ui +++ b/kernelinstaller.ui @@ -11,23 +11,10 @@ - MainWindow + Kernel Installer - - - - - 0 - 0 - - - - TextLabel - - - @@ -41,19 +28,6 @@ - - - - 0 - - - Qt::Horizontal - - - QProgressBar::TopToBottom - - - diff --git a/kernel-installer-root-loader-template.sh b/shell/kernel-installer-root-loader-template.sh similarity index 100% rename from kernel-installer-root-loader-template.sh rename to shell/kernel-installer-root-loader-template.sh diff --git a/kernel-installer-template.sh b/shell/kernel-installer-template.sh similarity index 100% rename from kernel-installer-template.sh rename to shell/kernel-installer-template.sh