现在可以调整启动横幅的持续时间了

tacmon · Mar 3, 2020 · 0c3e750 · 0c3e750
1 parent 8a9dc11
commit 0c3e750
Show file tree

Hide file tree

Showing 11 changed files with 365 additions and 287 deletions.
diff --git a/forms/visualsettings.ui b/forms/visualsettings.ui
diff --git a/lemon.cpp b/lemon.cpp
@@ -220,6 +220,11 @@ void Lemon::closeEvent(QCloseEvent */*event*/)
  settings.setValue("WindowSize", size());
 }
 
+int Lemon::getSplashTime()
+{
+ return settings->getSplashTime();
+}
+
 void Lemon::welcome()
 {
  if (settings->getCompilerList().size() == 0)

diff --git a/lemon.h b/lemon.h
@@ -45,6 +45,7 @@ class Lemon : public QMainWindow
  ~Lemon();
  void changeEvent(QEvent *);
  void closeEvent(QCloseEvent *);
+ int getSplashTime();
  void welcome();
 
 private:

diff --git a/lemon_zh_CN.qm b/lemon_zh_CN.qm
diff --git a/lemon_zh_CN.ts b/lemon_zh_CN.ts
diff --git a/main.cpp b/main.cpp
@@ -61,20 +61,25 @@ int main(int argc, char *argv[])
 
  QPixmap pixmap(":/logo/splash.png");
  QSplashScreen screen(pixmap);
- screen.show();
+
+ Lemon w;
 
  qint64 startTime = QDateTime::currentMSecsSinceEpoch();
+ int splashTime = w.getSplashTime();
 
- do
+ if (splashTime > 0)
  {
- a.processEvents();
- } while (QDateTime::currentMSecsSinceEpoch() - startTime <= 500);
+ screen.show();
+ do
+ {
+ a.processEvents();
+ } while (QDateTime::currentMSecsSinceEpoch() - startTime <= splashTime);
+ screen.finish(&w);
+ }
 
- Lemon w;
  a.setActivationWindow(&w);
 
  w.show();
- screen.finish(&w);
  w.welcome();
 
  return a.exec();

diff --git a/resultviewer.cpp b/resultviewer.cpp
@@ -192,7 +192,7 @@ void ResultViewer::refreshViewer()
  // bg = QColor::fromHslF(cmeBaseColorHF, cmeBaseColorSF, cmeBaseColorLF);
  }
  else bg = setting.getColorPer(score, fullScore[j]);
-  //bg = QColor::fromHslF(oriBaseColorHF, oriBaseColorSF, oriBaseColorLF(score, fullScore[j], 0.3));
+ //bg = QColor::fromHslF(oriBaseColorHF, oriBaseColorSF, oriBaseColorLF(score, fullScore[j], 0.3));
 
  item(i, j + 3)->setBackground(bg);
  }

diff --git a/settings.cpp b/settings.cpp
@@ -197,6 +197,11 @@ double Settings::getGrandRateL()
  return grandRateL;
 }
 
+int Settings::getSplashTime()
+{
+ return splashTime;
+}
+
 QColor Settings::getColorMx()
 {
  return QColor::fromHslF(colorMxH / 360.00, colorMxS / 100.00, colorMxL / 100.00);
@@ -481,6 +486,11 @@ void Settings::setGrandRateL(double x)
  grandRateL = x;
 }
 
+void Settings::setSplashTime(int x)
+{
+ splashTime = x;
+}
+
 void Settings::copyFrom(Settings *other)
 {
  setDefaultFullScore(other->getDefaultFullScore());
@@ -512,6 +522,7 @@ void Settings::copyFrom(Settings *other)
  setGrandRateH(other->getGrandRateH());
  setGrandRateS(other->getGrandRateS());
  setGrandRateL(other->getGrandRateL());
+ setSplashTime(other->getSplashTime());
 
  for (int i = 0; i < compilerList.size(); i ++)
  {
@@ -568,6 +579,7 @@ void Settings::saveSettings()
  settings.setValue("GrandRateH", grandRateH);
  settings.setValue("GrandRateS", grandRateS);
  settings.setValue("GrandRateL", grandRateL);
+ settings.setValue("SplashTime", splashTime);
  settings.endGroup();
 
  settings.beginWriteArray("v1.2/CompilerSettings");
@@ -659,6 +671,7 @@ void Settings::loadSettings()
  grandRateH = settings.value("GrandRateH", 1).toDouble();
  grandRateS = settings.value("GrandRateS", 1).toDouble();
  grandRateL = settings.value("GrandRateL", 1.33).toDouble();
+ splashTime = settings.value("SplashTime", 500).toInt();
  settings.endGroup();
 
  int compilerCount = settings.beginReadArray("v1.2/CompilerSettings");

diff --git a/settings.h b/settings.h
@@ -68,6 +68,7 @@ class Settings : public QObject
  double getGrandRateH();
  double getGrandRateS();
  double getGrandRateL();
+ int getSplashTime();
 
  QColor getColorMx();
  QColor getColorMi();
@@ -110,6 +111,7 @@ class Settings : public QObject
  void setGrandRateH(double);
  void setGrandRateS(double);
  void setGrandRateL(double);
+ void setSplashTime(int);
 
  void addCompiler(Compiler *);
  void deleteCompiler(int);
@@ -166,6 +168,8 @@ class Settings : public QObject
  double grandRateH;
  double grandRateS;
  double grandRateL;
+
+ int splashTime;
 };
 
 #endif // SETTINGS_H
diff --git a/visualsettings.cpp b/visualsettings.cpp
@@ -21,8 +21,8 @@
 #include "settings.h"
 
 VisualSettings::VisualSettings(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::VisualSettings)
+ QWidget(parent),
+ ui(new Ui::VisualSettings)
 {
  ui->setupUi(this);
 
@@ -64,6 +64,9 @@ VisualSettings::VisualSettings(QWidget *parent) :
  connect(ui->grandRateL, SIGNAL(valueChanged(double)),
  this, SLOT(grandRateLChanged(double)));
 
+ connect(ui->splashTime, SIGNAL(valueChanged(int)),
+ this, SLOT(splashTimeChanged(int)));
+
  connect(ui->resetToDefaultButton, SIGNAL(clicked()),
  this, SLOT(resetToDefault()));
 }
@@ -88,6 +91,7 @@ void VisualSettings::resetToDefault()
  ui->grandRateH->setValue(1);
  ui->grandRateS->setValue(1);
  ui->grandRateL->setValue(1.33);
+ ui->splashTime->setValue(500);
  editSettings->setColorMxH(ui->spinBoxMxH->value());
  editSettings->setColorMxS(ui->doubleSpinBoxMxS->value());
  editSettings->setColorMxL(ui->doubleSpinBoxMxL->value());
@@ -106,6 +110,7 @@ void VisualSettings::resetToDefault()
  editSettings->setGrandRateH(ui->grandRateH->value());
  editSettings->setGrandRateS(ui->grandRateS->value());
  editSettings->setGrandRateL(ui->grandRateL->value());
+ editSettings->setSplashTime(ui->splashTime->value());
 }
 
 void VisualSettings::resetEditSettings(Settings *settings)
@@ -130,6 +135,7 @@ void VisualSettings::resetEditSettings(Settings *settings)
  ui->grandRateH->setValue(editSettings->getGrandRateH());
  ui->grandRateS->setValue(editSettings->getGrandRateS());
  ui->grandRateL->setValue(editSettings->getGrandRateL());
+ ui->splashTime->setValue(editSettings->getSplashTime());
 }
 
 void VisualSettings::colorMxHChanged(const int &x)
@@ -222,6 +228,11 @@ void VisualSettings::grandRateLChanged(const double &x)
  editSettings->setGrandRateL(x);
 }
 
+void VisualSettings::splashTimeChanged(const int &x)
+{
+ editSettings->setSplashTime(x);
+}
+
 VisualSettings::~VisualSettings()
 {
  delete ui;

diff --git a/visualsettings.h b/visualsettings.h
@@ -30,38 +30,39 @@ class Settings;
 
 class VisualSettings : public QWidget
 {
-  Q_OBJECT
+ Q_OBJECT
 
- public:
-  explicit VisualSettings(QWidget *parent = nullptr);
-  void resetEditSettings(Settings *);
-  ~VisualSettings();
+public:
+ explicit VisualSettings(QWidget *parent = nullptr);
+ void resetEditSettings(Settings *);
+ ~VisualSettings();
 
- private:
-  Ui::VisualSettings *ui;
-  Settings *editSettings;
+private:
+ Ui::VisualSettings *ui;
+ Settings *editSettings;
 
- private slots:
- void colorMxHChanged(const int &);
- void colorMxSChanged(const double &);
- void colorMxLChanged(const double &);
- void colorMiHChanged(const int &);
- void colorMiSChanged(const double &);
- void colorMiLChanged(const double &);
- void colorNfHChanged(const int &);
- void colorNfSChanged(const double &);
- void colorNfLChanged(const double &);
- void colorCeHChanged(const int &);
- void colorCeSChanged(const double &);
- void colorCeLChanged(const double &);
- void grandCompHChanged(const double &);
- void grandCompSChanged(const double &);
- void grandCompLChanged(const double &);
- void grandRateHChanged(const double &);
- void grandRateSChanged(const double &);
- void grandRateLChanged(const double &);
+private slots:
+ void colorMxHChanged(const int &);
+ void colorMxSChanged(const double &);
+ void colorMxLChanged(const double &);
+ void colorMiHChanged(const int &);
+ void colorMiSChanged(const double &);
+ void colorMiLChanged(const double &);
+ void colorNfHChanged(const int &);
+ void colorNfSChanged(const double &);
+ void colorNfLChanged(const double &);
+ void colorCeHChanged(const int &);
+ void colorCeSChanged(const double &);
+ void colorCeLChanged(const double &);
+ void grandCompHChanged(const double &);
+ void grandCompSChanged(const double &);
+ void grandCompLChanged(const double &);
+ void grandRateHChanged(const double &);
+ void grandRateSChanged(const double &);
+ void grandRateLChanged(const double &);
+ void splashTimeChanged(const int &);
 
-  void resetToDefault();
+ void resetToDefault();
 };
 
 #endif // VISUALSETTINGS_H