diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp index dcbe2508f..432525ad6 100644 --- a/src/gui/Application.cpp +++ b/src/gui/Application.cpp @@ -153,8 +153,6 @@ void Application::bootstrap(const QString& uiLanguage) { Bootstrap::bootstrap(uiLanguage); - applyFontSize(); - osUtils->registerNativeEventFilter(); MessageBox::initializeButtonDefs(); @@ -200,6 +198,7 @@ void Application::applyTheme() stylesheetFile.close(); } } + applyFontSize(); } void Application::applyFontSize() diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp index 02ab3622f..ad29bed0c 100644 --- a/src/gui/EntryPreviewWidget.cpp +++ b/src/gui/EntryPreviewWidget.cpp @@ -390,6 +390,9 @@ void EntryPreviewWidget::updateEntryGeneralTab() m_ui->entryNotesTextEdit->setFont(Font::defaultFont()); } + m_ui->entryNotesTextEdit->setTabStopDistance( + QFontMetrics(m_ui->entryNotesTextEdit->font()).horizontalAdvance(QString(4, ' '))); + m_ui->entryUrlLabel->setRawText(m_currentEntry->displayUrl().toHtmlEscaped()); const QString url = m_currentEntry->url(); if (!url.isEmpty()) { diff --git a/src/gui/EntryPreviewWidget.ui b/src/gui/EntryPreviewWidget.ui index e44218b3e..b6d4cadcb 100644 --- a/src/gui/EntryPreviewWidget.ui +++ b/src/gui/EntryPreviewWidget.ui @@ -137,7 +137,6 @@ - 10 true @@ -434,9 +433,6 @@ true - - 10.000000000000000 - true diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index d51588ac5..25b96c5ae 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -2031,7 +2031,6 @@ void MainWindow::initViewMenu() restartApp(tr("You must restart the application to apply this setting. Would you like to restart now?")); } else { kpxcApp->applyTheme(); - kpxcApp->applyFontSize(); } }); diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 387be45e2..816899374 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -982,6 +982,9 @@ void EditEntryWidget::setForms(Entry* entry, bool restore) m_mainUi->notesEdit->setFont(Font::defaultFont()); } + m_mainUi->notesEdit->setTabStopDistance( + QFontMetrics(m_mainUi->notesEdit->font()).horizontalAdvance(QString(4, ' '))); + m_advancedUi->attachmentsWidget->setReadOnly(m_history); m_advancedUi->addAttributeButton->setEnabled(!m_history); m_advancedUi->editAttributeButton->setEnabled(false); diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index d5b002ec2..2f785f035 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -1,386 +1,383 @@ - - - EditEntryWidgetMain - - - - 0 - 0 - 400 - 523 - - - - Edit Entry - - - QFrame::NoFrame - - - QFrame::Plain - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustToContents - - - true - - - - - 0 - 0 - 400 - 523 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 10 - - - 8 - - - - - Title field - - - - - - - &Username: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - usernameComboBox - - - - - - - Qt::StrongFocus - - - Password field - - - - - - - - - - 0 - 1 - - - - - 0 - 100 - - - - Notes field - - - 10.000000000000000 - - - - - - - - - &Title: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - titleEdit - - - - - - - &Password: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - passwordEdit - - - - - - - Qt::StrongFocus - - - Username field - - - - - - - Qt::StrongFocus - - - Tags list - - - - - - - 8 - - - - - Toggle expiration - - - Toggle expiration - - - - - - - - - - false - - - Expiration field - - - true - - - - - - - - 0 - 0 - - - - Expiration Presets - - - Expiration presets - - - Presets - - - - - - - - - UR&L: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - urlEdit - - - - - - - 8 - - - - - Url field - - - https://example.com - - - - - - - Download favicon for URL - - - Download favicon for URL - - - - - - - - - - - &Notes: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - notesEdit - - - - - - - 6 - - - - - Qt::Horizontal - - - - 5 - 20 - - - - - - - - Toggle notes visibility - - - Toggle notes visibility - - - - 14 - 14 - - - - true - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - T&ags: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - tagsList - - - - - - - &Expires: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - expireCheck - - - - - - - - - TagsEdit - QWidget -
gui/tag/TagsEdit.h
- 1 - - - URLEdit - QLineEdit -
gui/URLEdit.h
- 1 - - - PasswordWidget - QWidget -
gui/PasswordWidget.h
- 1 - - - - titleEdit - usernameComboBox - passwordEdit - urlEdit - fetchFaviconButton - tagsList - expireCheck - expireDatePicker - expirePresets - revealNotesButton - notesEdit - - - - + + + EditEntryWidgetMain + + + + 0 + 0 + 400 + 523 + + + + Edit Entry + + + QFrame::NoFrame + + + QFrame::Plain + + + Qt::ScrollBarAlwaysOff + + + QAbstractScrollArea::AdjustToContents + + + true + + + + + 0 + 0 + 400 + 523 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 10 + + + 8 + + + + + Title field + + + + + + + &Username: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + usernameComboBox + + + + + + + Qt::StrongFocus + + + Password field + + + + + + + + + + 0 + 1 + + + + + 0 + 100 + + + + Notes field + + + + + + + + + &Title: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + titleEdit + + + + + + + &Password: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + passwordEdit + + + + + + + Qt::StrongFocus + + + Username field + + + + + + + Qt::StrongFocus + + + Tags list + + + + + + + 8 + + + + + Toggle expiration + + + Toggle expiration + + + + + + + + + + false + + + Expiration field + + + true + + + + + + + + 0 + 0 + + + + Expiration Presets + + + Expiration presets + + + Presets + + + + + + + + + UR&L: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + urlEdit + + + + + + + 8 + + + + + Url field + + + https://example.com + + + + + + + Download favicon for URL + + + Download favicon for URL + + + + + + + + + + + &Notes: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + notesEdit + + + + + + + 6 + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + Toggle notes visibility + + + Toggle notes visibility + + + + 14 + 14 + + + + true + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + T&ags: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + tagsList + + + + + + + &Expires: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + expireCheck + + + + + + + + + TagsEdit + QWidget +
gui/tag/TagsEdit.h
+ 1 + + + URLEdit + QLineEdit +
gui/URLEdit.h
+ 1 + + + PasswordWidget + QWidget +
gui/PasswordWidget.h
+ 1 + + + + titleEdit + usernameComboBox + passwordEdit + urlEdit + fetchFaviconButton + tagsList + expireCheck + expireDatePicker + expirePresets + revealNotesButton + notesEdit + + + + diff --git a/src/gui/entry/attachments/TextAttachmentsEditWidget.cpp b/src/gui/entry/attachments/TextAttachmentsEditWidget.cpp index c67404a6f..f87f4510f 100644 --- a/src/gui/entry/attachments/TextAttachmentsEditWidget.cpp +++ b/src/gui/entry/attachments/TextAttachmentsEditWidget.cpp @@ -56,4 +56,7 @@ void TextAttachmentsEditWidget::updateUi() { m_ui->attachmentsTextEdit->setPlainText(m_attachment.data); m_ui->attachmentsTextEdit->setReadOnly(m_mode == attachments::OpenMode::ReadOnly); + + m_ui->attachmentsTextEdit->setTabStopDistance( + QFontMetrics(m_ui->attachmentsTextEdit->font()).horizontalAdvance(QString(4, ' '))); } diff --git a/src/gui/entry/attachments/TextAttachmentsEditWidget.ui b/src/gui/entry/attachments/TextAttachmentsEditWidget.ui index fe1fd50ba..e73894d15 100644 --- a/src/gui/entry/attachments/TextAttachmentsEditWidget.ui +++ b/src/gui/entry/attachments/TextAttachmentsEditWidget.ui @@ -57,11 +57,7 @@ - - - 10.000000000000000 - - + diff --git a/src/gui/entry/attachments/TextAttachmentsPreviewWidget.cpp b/src/gui/entry/attachments/TextAttachmentsPreviewWidget.cpp index 99c03ffe7..9ec105ea2 100644 --- a/src/gui/entry/attachments/TextAttachmentsPreviewWidget.cpp +++ b/src/gui/entry/attachments/TextAttachmentsPreviewWidget.cpp @@ -99,6 +99,9 @@ void TextAttachmentsPreviewWidget::initTypeCombobox() // Configure text browser to open external links m_ui->previewTextBrowser->setOpenExternalLinks(true); + m_ui->previewTextBrowser->setTabStopDistance( + QFontMetrics(m_ui->previewTextBrowser->font()).horizontalAdvance(QString(4, ' '))); + m_ui->typeComboBox->setCurrentIndex(m_ui->typeComboBox->findData(PlainText)); onTypeChanged(m_ui->typeComboBox->currentIndex()); diff --git a/src/gui/entry/attachments/TextAttachmentsPreviewWidget.ui b/src/gui/entry/attachments/TextAttachmentsPreviewWidget.ui index 2f2ea14a1..2ee97aa22 100644 --- a/src/gui/entry/attachments/TextAttachmentsPreviewWidget.ui +++ b/src/gui/entry/attachments/TextAttachmentsPreviewWidget.ui @@ -61,11 +61,7 @@ - - - 10.000000000000000 - - + diff --git a/src/gui/styles/dark/DarkStyle.cpp b/src/gui/styles/dark/DarkStyle.cpp index daf16aaac..3b86cfce7 100644 --- a/src/gui/styles/dark/DarkStyle.cpp +++ b/src/gui/styles/dark/DarkStyle.cpp @@ -121,8 +121,6 @@ void DarkStyle::polish(QWidget* widget) palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0x2D2D2D)); palette.setColor(QPalette::Disabled, QPalette::Window, QRgb(0x2D2D2D)); } -#elif defined(Q_OS_WIN) - palette.setColor(QPalette::All, QPalette::Window, QRgb(0x2F2F30)); #else palette.setColor(QPalette::Active, QPalette::Window, QRgb(0x2F2F30)); palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0x313133)); diff --git a/src/gui/styles/light/LightStyle.cpp b/src/gui/styles/light/LightStyle.cpp index f73995412..8ef39868a 100644 --- a/src/gui/styles/light/LightStyle.cpp +++ b/src/gui/styles/light/LightStyle.cpp @@ -121,8 +121,6 @@ void LightStyle::polish(QWidget* widget) palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0xF5F5F5)); palette.setColor(QPalette::Disabled, QPalette::Window, QRgb(0xF5F5F5)); } -#elif defined(Q_OS_WIN) - palette.setColor(QPalette::All, QPalette::Window, QRgb(0xFFFFFF)); #else palette.setColor(QPalette::Active, QPalette::Window, QRgb(0xEFF0F1)); palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0xEFF0F1));