feat: improve UI library's encapsulation

1 files changed, 5 insertions, 57 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 6a03f5ea..24f2b7fa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -57,12 +57,6 @@ jmp_buf recover_env;
 /**
  * @brief
  *
- */
-extern void init_locale();
-
-/**
- * @brief
- *
  * @param sig
  */
 extern void handle_signal(int sig);
@@ -125,9 +119,6 @@ int main(int argc, char* argv[]) {
   file.close();
 #endif
 
-  // init ui library
-  GpgFrontend::UI::InitGpgFrontendUI();
-
   /**
    * internationalisation. loop to restart main window
    * with changed translation when settings change.
@@ -144,56 +135,13 @@ int main(int argc, char* argv[]) {
 #ifdef RELEASE
       try {
 #endif
-        // init the i18n support
-        init_locale();
-
-        // create the thread to load the gpg context
-        auto* init_ctx_thread = new GpgFrontend::CtxCheckThread();
-        QApplication::connect(init_ctx_thread, &QThread::finished, init_ctx_thread,
-                              &QThread::deleteLater);
-
-        // create and show loading window before starting the main window
-        auto* waiting_dialog = new QProgressDialog();
-        waiting_dialog->setMaximum(0);
-        waiting_dialog->setMinimum(0);
-        auto waiting_dialog_label =
-            new QLabel(QString(_("Loading Gnupg Info...")) + "<br /><br />" +
-                       _("If this process is too slow, please set the key "
-                         "server address appropriately in the gnupg configuration "
-                         "file (depending "
-                         "on the network situation in your country or region)."));
-        waiting_dialog_label->setWordWrap(true);
-        waiting_dialog->setLabel(waiting_dialog_label);
-        waiting_dialog->resize(420, 120);
-        QApplication::connect(init_ctx_thread, &QThread::finished, [=]() {
-          waiting_dialog->finished(0);
-          waiting_dialog->deleteLater();
-        });
-        QApplication::connect(waiting_dialog, &QProgressDialog::canceled, [=]() {
-          LOG(INFO) << "cancel clicked";
-          if (init_ctx_thread->isRunning()) init_ctx_thread->terminate();
-          QCoreApplication::quit();
-          exit(0);
-        });
-
-        // show the loading window
-        waiting_dialog->show();
-        waiting_dialog->setFocus();
-
-        // start the thread to load the gpg context
-        init_ctx_thread->start();
-        QEventLoop loop;
-        QApplication::connect(init_ctx_thread, &QThread::finished, &loop,
-                              &QEventLoop::quit);
-        loop.exec();
-
         QApplication::setQuitOnLastWindowClosed(true);
 
-        // create main window and show it
-        auto main_window = std::make_unique<GpgFrontend::UI::MainWindow>();
-        main_window->Init();
-        main_window->show();
-        return_from_event_loop_code = QApplication::exec();
+        // init ui library
+        GpgFrontend::UI::InitGpgFrontendUI();
+
+        // create main window
+        return_from_event_loop_code = GpgFrontend::UI::RunGpgFrontendUI();
 #ifdef RELEASE
       } catch (...) {
         // catch all unhandled exceptions and notify the user