diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2019-03-23 12:45:00 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-03-23 12:56:49 -0400 |
commit | 2166b3dee1528ca76cf8c24b13e2e8aba165b6c2 (patch) | |
tree | 64139db36a8a4074aefd2e422e062177086a4393 | |
parent | d73c1894051d00f1947e16e737bee1231a4fc326 (diff) |
logging tweaks
-rw-r--r-- | src/libcalamares/JobQueue.cpp | 4 | ||||
-rw-r--r-- | src/libcalamares/PacstrapCppJob.cpp | 6 | ||||
-rw-r--r-- | src/libcalamares/PacstrapCppJob.h | 34 | ||||
-rw-r--r-- | src/libcalamaresui/utils/CalamaresUtilsGui.h | 6 | ||||
-rw-r--r-- | src/modules/netinstall/NetInstallPage.cpp | 8 |
5 files changed, 31 insertions, 27 deletions
diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp index 4aa08ac1c..0af03c102 100644 --- a/src/libcalamares/JobQueue.cpp +++ b/src/libcalamares/JobQueue.cpp @@ -123,8 +123,8 @@ private: if (m_jobIndex < jobCount) { - cDebug(LOGVERBOSE) << "[JOBQUEUE]: Progress for Job[" << m_jobIndex << "]: " << ( jobPercent * 100 ) << "% completed"; - cDebug(LOGVERBOSE) << "[JOBQUEUE]: Progress Overall: " << ( cumulativeProgress * 100 ) << "% (accumulated) + " + cDebug(Logger::LOGVERBOSE) << "[JOBQUEUE]: Progress for Job[" << m_jobIndex << "]: " << ( jobPercent * 100 ) << "% completed"; + cDebug(Logger::LOGVERBOSE) << "[JOBQUEUE]: Progress Overall: " << ( cumulativeProgress * 100 ) << "% (accumulated) + " << ( ( ( m_jobWeights.at( m_jobIndex ) ) * jobPercent ) * 100 ) << "% (this job) = " << ( percent * 100 ) << "% (total)"; } diff --git a/src/libcalamares/PacstrapCppJob.cpp b/src/libcalamares/PacstrapCppJob.cpp index cc5b62824..6a8a0c2a8 100644 --- a/src/libcalamares/PacstrapCppJob.cpp +++ b/src/libcalamares/PacstrapCppJob.cpp @@ -253,8 +253,8 @@ QVariantMap PacstrapCppJob::execWithProgress(QString command_line , qreal task_p QString stderr = QString("") ; QVariantMap retval ; - cLog() << "[PACSTRAP]: executing shell command: " << command_line ; - cLog() << "=================== [SHELL OUTPUT BEGIN] ===================" ; + cDebug() << "[PACSTRAP]: executing shell command: " << command_line ; + cDebug() << "=================== [SHELL OUTPUT BEGIN] ===================" ; proc.start(QString(SYSTEM_EXEC_FMT).arg(command_line)) ; proc.waitForStarted(-1) ; while (proc.waitForFinished(250) || proc.state() != QProcess::NotRunning) { @@ -268,7 +268,7 @@ QVariantMap PacstrapCppJob::execWithProgress(QString command_line , qreal task_p } this->progressPercent = emitProgress(task_proportion) ; - cLog() << "==================== [SHELL OUTPUT END] ====================" ; + cDebug() << "==================== [SHELL OUTPUT END] ====================" ; status = (proc.exitStatus() == QProcess::NormalExit) ? proc.exitCode() : 255 ; diff --git a/src/libcalamares/PacstrapCppJob.h b/src/libcalamares/PacstrapCppJob.h index 61eb9edc8..faee85056 100644 --- a/src/libcalamares/PacstrapCppJob.h +++ b/src/libcalamares/PacstrapCppJob.h @@ -167,27 +167,27 @@ private: << " confFile=" << this->confFile \ << " n_packages=" << this->packages.count() ; -#define DEBUG_TRACE_EXECWITHPROGRESS \ - cDebug() << "[PACSTRAP]: shell command exited=" << command_line ; \ - cDebug() << "[PACSTRAP]: status=" << status ; \ - cDebug(LOGVERBOSE) << "[PACSTRAP]: stdout='" << stdout << "'" ; \ - cDebug(LOGVERBOSE) << "[PACSTRAP]: stderr='" << stderr << "'" ; +#define DEBUG_TRACE_EXECWITHPROGRESS \ + cDebug() << "[PACSTRAP]: shell command exited=" << command_line ; \ + cDebug() << "[PACSTRAP]: status=" << status ; \ + cDebug(Logger::LOGVERBOSE) << "[PACSTRAP]: stdout='" << stdout << "'" ; \ + cDebug(Logger::LOGVERBOSE) << "[PACSTRAP]: stderr='" << stderr << "'" ; #define DEBUG_TRACE_FINDTARGETDEVICE if (!target_device.isEmpty()) \ cDebug() << "[PACSTRAP]: mounting target_device: " << target_device ; -#define DEBUG_TRACE_EMITPROGRESS cDebug(LOGVERBOSE) << "[PACSTRAP]: " << \ - "this->progressPercent=" << this->progressPercent << \ - " transient_percent=" << transient_percent << \ - " emmitting=" << progress_percent ; - -#define DEBUG_TRACE_GETTASKCOMPLETION cDebug(LOGVERBOSE) << "[PACSTRAP]: " << \ - "this->nPreviousPackages=" << this->nPreviousPackages << \ - " nPackagesInstalled()=" << nPackagesInstalled() << \ - "\n " << \ - "n_new_packages=" << (int)n_new_packages << \ - " this->nPendingPackages=" << this->nPendingPackages << \ - " completion_percent=" << completion_percent ; +#define DEBUG_TRACE_EMITPROGRESS cDebug(Logger::LOGVERBOSE) << "[PACSTRAP]: " << \ + "this->progressPercent=" << this->progressPercent << \ + " transient_percent=" << transient_percent << \ + " emmitting=" << progress_percent ; + +#define DEBUG_TRACE_GETTASKCOMPLETION cDebug(Logger::LOGVERBOSE) << "[PACSTRAP]: " << \ + "this->nPreviousPackages=" << this->nPreviousPackages << \ + " nPackagesInstalled()=" << nPackagesInstalled() << \ + "\n " << \ + "n_new_packages=" << (int)n_new_packages << \ + " this->nPendingPackages=" << this->nPendingPackages << \ + " completion_percent=" << completion_percent ; #ifndef QT_NO_DEBUG # define DEBUG_TRACE_BASEPACKAGES \ diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h index f7696d147..99916b82d 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.h +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h @@ -125,7 +125,11 @@ UIDLLEXPORT QSize defaultIconSize(); constexpr int windowMinimumWidth = 792; constexpr int windowMinimumHeight = 580; constexpr int windowPreferredWidth = 1016; -constexpr int windowPreferredHeight = 580; +constexpr int windowPreferredHeight = 640; +constexpr int sidebarMinimumW = 100; +constexpr int sidebarPreferredW = 190; +constexpr int logoLabelW = 136; +constexpr int logoLabelH = 187; /** * @brief Consistent locale (language + country) naming. diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index 77cc2d830..684d16287 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -192,7 +192,7 @@ NetInstallPage::populateComboboxes(QVariantMap local_storage) for ( ; initsystems_iter != initsystems_data.end(); ++initsystems_iter ) { -cLog() << "NetInstallPage::populateComboboxes() initsystems_iter.key()=" << initsystems_iter.key(); +cDebug() << "NetInstallPage::populateComboboxes() initsystems_iter.key()=" << initsystems_iter.key(); QVariantMap initsystems_data = initsystems_iter.value().toMap(); QVariant init_key = QVariant(initsystems_iter.key()); @@ -200,12 +200,12 @@ cLog() << "NetInstallPage::populateComboboxes() initsystems_iter.key()=" << init ui->initCombobox->addItem(init_name, init_key); -cLog() << "NetInstallPage::populateComboboxes() added init_key=" << init_key << " init_name" << init_name; +cDebug() << "NetInstallPage::populateComboboxes() added init_key=" << init_key << " init_name" << init_name; } for ( ; desktops_iter != desktops_data.end(); ++desktops_iter ) { -cLog() << "NetInstallPage::populateComboboxes() desktops_iter.key()=" << desktops_iter.key(); +cDebug() << "NetInstallPage::populateComboboxes() desktops_iter.key()=" << desktops_iter.key(); QVariantMap desktops_data = desktops_iter.value().toMap(); QVariant de_key = QVariant(desktops_iter.key()); @@ -214,7 +214,7 @@ cLog() << "NetInstallPage::populateComboboxes() desktops_iter.key()=" << desktop ui->wmDeCombobox->addItem(de_icon, de_name, de_key); -cLog() << "NetInstallPage::populateComboboxes() added de_icon=" << desktops_data.value( GS::DE_ICON_KEY ).toString() << " de_key=" << de_key << " de_name" << de_name; +cDebug() << "NetInstallPage::populateComboboxes() added de_icon=" << desktops_data.value( GS::DE_ICON_KEY ).toString() << " de_key=" << de_key << " de_name" << de_name; } ui->initCombobox->setCurrentIndex( 1 ); |