prehistoric-systems/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-03-11 08:54:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix minor font and theme issues (#12814)

Browse source 
* Fix font size for all platforms

* Fix font size for TOTP in preview panel

* Styles: drop Windows-specific palette overrides

* Fix encoding of EditEntryWidgetMain.ui

* Fix tab width
This commit is contained in:
xboxones1 2026-01-17 16:39:02 +00:00 committed by GitHub
parent b370aed3e7
commit e591e93d42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 398 additions and 407 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/Application.cpp
View file

@ -153,8 +153,6 @@ void Application::bootstrap(const QString& uiLanguage)
{ {
Bootstrap::bootstrap(uiLanguage); Bootstrap::bootstrap(uiLanguage);
applyFontSize();
osUtils->registerNativeEventFilter(); osUtils->registerNativeEventFilter();
MessageBox::initializeButtonDefs(); MessageBox::initializeButtonDefs();
@ -200,6 +198,7 @@ void Application::applyTheme()
stylesheetFile.close(); stylesheetFile.close();
} }
} }
applyFontSize();
} }
void Application::applyFontSize() void Application::applyFontSize()

3
src/gui/EntryPreviewWidget.cpp
View file

@ -390,6 +390,9 @@ void EntryPreviewWidget::updateEntryGeneralTab()
m_ui->entryNotesTextEdit->setFont(Font::defaultFont()); 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()); m_ui->entryUrlLabel->setRawText(m_currentEntry->displayUrl().toHtmlEscaped());
const QString url = m_currentEntry->url(); const QString url = m_currentEntry->url();
if (!url.isEmpty()) { if (!url.isEmpty()) {

4
src/gui/EntryPreviewWidget.ui
View file

@ -137,7 +137,6 @@
<widget class="QLabel" name="entryTotpLabel"> <widget class="QLabel" name="entryTotpLabel">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -434,9 +433,6 @@
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tabStopDistance">
<double>10.000000000000000</double>
</property>
<property name="blendIn" stdset="0"> <property name="blendIn" stdset="0">
<bool>true</bool> <bool>true</bool>
</property> </property>

1
src/gui/MainWindow.cpp
View file

@ -2031,7 +2031,6 @@ void MainWindow::initViewMenu()
restartApp(tr("You must restart the application to apply this setting. Would you like to restart now?")); restartApp(tr("You must restart the application to apply this setting. Would you like to restart now?"));
} else { } else {
kpxcApp->applyTheme(); kpxcApp->applyTheme();
kpxcApp->applyFontSize();
} }
}); });

3
src/gui/entry/EditEntryWidget.cpp
View file

@ -982,6 +982,9 @@ void EditEntryWidget::setForms(Entry* entry, bool restore)
m_mainUi->notesEdit->setFont(Font::defaultFont()); 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->attachmentsWidget->setReadOnly(m_history);
m_advancedUi->addAttributeButton->setEnabled(!m_history); m_advancedUi->addAttributeButton->setEnabled(!m_history);
m_advancedUi->editAttributeButton->setEnabled(false); m_advancedUi->editAttributeButton->setEnabled(false);

769
src/gui/entry/EditEntryWidgetMain.ui
View file

@ -1,386 +1,383 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>EditEntryWidgetMain</class> <class>EditEntryWidgetMain</class>
<widget class="QScrollArea" name="EditEntryWidgetMain"> <widget class="QScrollArea" name="EditEntryWidgetMain">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>523</height> <height>523</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Edit Entry</string> <string>Edit Entry</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum> <enum>QAbstractScrollArea::AdjustToContents</enum>
</property> </property>
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="container"> <widget class="QWidget" name="container">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>523</height> <height>523</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1"> <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>10</number> <number>10</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>8</number> <number>8</number>
</property> </property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="titleEdit"> <widget class="QLineEdit" name="titleEdit">
<property name="accessibleName"> <property name="accessibleName">
<string>Title field</string> <string>Title field</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="usernameLabel"> <widget class="QLabel" name="usernameLabel">
<property name="text"> <property name="text">
<string>&amp;Username:</string> <string>&amp;Username:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>usernameComboBox</cstring> <cstring>usernameComboBox</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="PasswordWidget" name="passwordEdit" native="true"> <widget class="PasswordWidget" name="passwordEdit" native="true">
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>
<property name="accessibleName"> <property name="accessibleName">
<string>Password field</string> <string>Password field</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="8" column="1">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QPlainTextEdit" name="notesEdit"> <widget class="QPlainTextEdit" name="notesEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>1</verstretch> <verstretch>1</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>100</height> <height>100</height>
</size> </size>
</property> </property>
<property name="accessibleName"> <property name="accessibleName">
<string>Notes field</string> <string>Notes field</string>
</property> </property>
<property name="tabStopDistance"> </widget>
<double>10.000000000000000</double> </item>
</property> </layout>
</widget> </item>
</item> <item row="0" column="0">
</layout> <widget class="QLabel" name="titleLabel">
</item> <property name="text">
<item row="0" column="0"> <string>&amp;Title:</string>
<widget class="QLabel" name="titleLabel"> </property>
<property name="text"> <property name="alignment">
<string>&amp;Title:</string> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="alignment"> <property name="buddy">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <cstring>titleEdit</cstring>
</property> </property>
<property name="buddy"> </widget>
<cstring>titleEdit</cstring> </item>
</property> <item row="2" column="0">
</widget> <widget class="QLabel" name="passwordLabel">
</item> <property name="text">
<item row="2" column="0"> <string>&amp;Password:</string>
<widget class="QLabel" name="passwordLabel"> </property>
<property name="text"> <property name="alignment">
<string>&amp;Password:</string> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="alignment"> <property name="buddy">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <cstring>passwordEdit</cstring>
</property> </property>
<property name="buddy"> </widget>
<cstring>passwordEdit</cstring> </item>
</property> <item row="1" column="1">
</widget> <widget class="QComboBox" name="usernameComboBox">
</item> <property name="focusPolicy">
<item row="1" column="1"> <enum>Qt::StrongFocus</enum>
<widget class="QComboBox" name="usernameComboBox"> </property>
<property name="focusPolicy"> <property name="accessibleName">
<enum>Qt::StrongFocus</enum> <string>Username field</string>
</property> </property>
<property name="accessibleName"> </widget>
<string>Username field</string> </item>
</property> <item row="5" column="1">
</widget> <widget class="TagsEdit" name="tagsList" native="true">
</item> <property name="focusPolicy">
<item row="5" column="1"> <enum>Qt::StrongFocus</enum>
<widget class="TagsEdit" name="tagsList" native="true"> </property>
<property name="focusPolicy"> <property name="accessibleName">
<enum>Qt::StrongFocus</enum> <string>Tags list</string>
</property> </property>
<property name="accessibleName"> </widget>
<string>Tags list</string> </item>
</property> <item row="7" column="1">
</widget> <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1,0">
</item> <property name="spacing">
<item row="7" column="1"> <number>8</number>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1,0"> </property>
<property name="spacing"> <item>
<number>8</number> <widget class="QCheckBox" name="expireCheck">
</property> <property name="toolTip">
<item> <string>Toggle expiration</string>
<widget class="QCheckBox" name="expireCheck"> </property>
<property name="toolTip"> <property name="accessibleName">
<string>Toggle expiration</string> <string>Toggle expiration</string>
</property> </property>
<property name="accessibleName"> <property name="text">
<string>Toggle expiration</string> <string/>
</property> </property>
<property name="text"> </widget>
<string/> </item>
</property> <item>
</widget> <widget class="QDateTimeEdit" name="expireDatePicker">
</item> <property name="enabled">
<item> <bool>false</bool>
<widget class="QDateTimeEdit" name="expireDatePicker"> </property>
<property name="enabled"> <property name="accessibleName">
<bool>false</bool> <string>Expiration field</string>
</property> </property>
<property name="accessibleName"> <property name="calendarPopup">
<string>Expiration field</string> <bool>true</bool>
</property> </property>
<property name="calendarPopup"> </widget>
<bool>true</bool> </item>
</property> <item>
</widget> <widget class="QPushButton" name="expirePresets">
</item> <property name="sizePolicy">
<item> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<widget class="QPushButton" name="expirePresets"> <horstretch>0</horstretch>
<property name="sizePolicy"> <verstretch>0</verstretch>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> </sizepolicy>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="toolTip">
</sizepolicy> <string>Expiration Presets</string>
</property> </property>
<property name="toolTip"> <property name="accessibleName">
<string>Expiration Presets</string> <string>Expiration presets</string>
</property> </property>
<property name="accessibleName"> <property name="text">
<string>Expiration presets</string> <string>Presets</string>
</property> </property>
<property name="text"> </widget>
<string>Presets</string> </item>
</property> </layout>
</widget> </item>
</item> <item row="3" column="0">
</layout> <widget class="QLabel" name="urlLabel">
</item> <property name="text">
<item row="3" column="0"> <string>UR&amp;L:</string>
<widget class="QLabel" name="urlLabel"> </property>
<property name="text"> <property name="alignment">
<string>UR&amp;L:</string> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="alignment"> <property name="buddy">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <cstring>urlEdit</cstring>
</property> </property>
<property name="buddy"> </widget>
<cstring>urlEdit</cstring> </item>
</property> <item row="3" column="1">
</widget> <layout class="QHBoxLayout" name="horizontalLayout_6">
</item> <property name="spacing">
<item row="3" column="1"> <number>8</number>
<layout class="QHBoxLayout" name="horizontalLayout_6"> </property>
<property name="spacing"> <item>
<number>8</number> <widget class="URLEdit" name="urlEdit">
</property> <property name="accessibleName">
<item> <string>Url field</string>
<widget class="URLEdit" name="urlEdit"> </property>
<property name="accessibleName"> <property name="placeholderText">
<string>Url field</string> <string notr="true">https://example.com</string>
</property> </property>
<property name="placeholderText"> </widget>
<string notr="true">https://example.com</string> </item>
</property> <item>
</widget> <widget class="QToolButton" name="fetchFaviconButton">
</item> <property name="toolTip">
<item> <string>Download favicon for URL</string>
<widget class="QToolButton" name="fetchFaviconButton"> </property>
<property name="toolTip"> <property name="accessibleName">
<string>Download favicon for URL</string> <string>Download favicon for URL</string>
</property> </property>
<property name="accessibleName"> </widget>
<string>Download favicon for URL</string> </item>
</property> </layout>
</widget> </item>
</item> <item row="8" column="0">
</layout> <layout class="QVBoxLayout" name="verticalLayout">
</item> <item>
<item row="8" column="0"> <widget class="QLabel" name="notesLabel">
<layout class="QVBoxLayout" name="verticalLayout"> <property name="text">
<item> <string>&amp;Notes:</string>
<widget class="QLabel" name="notesLabel"> </property>
<property name="text"> <property name="alignment">
<string>&amp;Notes:</string> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="alignment"> <property name="buddy">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <cstring>notesEdit</cstring>
</property> </property>
<property name="buddy"> </widget>
<cstring>notesEdit</cstring> </item>
</property> <item>
</widget> <layout class="QHBoxLayout" name="horizontalLayout_3">
</item> <property name="topMargin">
<item> <number>6</number>
<layout class="QHBoxLayout" name="horizontalLayout_3"> </property>
<property name="topMargin"> <item>
<number>6</number> <spacer name="horizontalSpacer">
</property> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<spacer name="horizontalSpacer"> </property>
<property name="orientation"> <property name="sizeHint" stdset="0">
<enum>Qt::Horizontal</enum> <size>
</property> <width>5</width>
<property name="sizeHint" stdset="0"> <height>20</height>
<size> </size>
<width>5</width> </property>
<height>20</height> </spacer>
</size> </item>
</property> <item>
</spacer> <widget class="QToolButton" name="revealNotesButton">
</item> <property name="toolTip">
<item> <string>Toggle notes visibility</string>
<widget class="QToolButton" name="revealNotesButton"> </property>
<property name="toolTip"> <property name="accessibleName">
<string>Toggle notes visibility</string> <string>Toggle notes visibility</string>
</property> </property>
<property name="accessibleName"> <property name="iconSize">
<string>Toggle notes visibility</string> <size>
</property> <width>14</width>
<property name="iconSize"> <height>14</height>
<size> </size>
<width>14</width> </property>
<height>14</height> <property name="checkable">
</size> <bool>true</bool>
</property> </property>
<property name="checkable"> </widget>
<bool>true</bool> </item>
</property> </layout>
</widget> </item>
</item> <item>
</layout> <spacer name="verticalSpacer">
</item> <property name="orientation">
<item> <enum>Qt::Vertical</enum>
<spacer name="verticalSpacer"> </property>
<property name="orientation"> <property name="sizeHint" stdset="0">
<enum>Qt::Vertical</enum> <size>
</property> <width>20</width>
<property name="sizeHint" stdset="0"> <height>40</height>
<size> </size>
<width>20</width> </property>
<height>40</height> </spacer>
</size> </item>
</property> </layout>
</spacer> </item>
</item> <item row="5" column="0">
</layout> <widget class="QLabel" name="tagsLabel">
</item> <property name="text">
<item row="5" column="0"> <string>T&amp;ags:</string>
<widget class="QLabel" name="tagsLabel"> </property>
<property name="text"> <property name="alignment">
<string>T&amp;ags:</string> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="alignment"> <property name="buddy">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <cstring>tagsList</cstring>
</property> </property>
<property name="buddy"> </widget>
<cstring>tagsList</cstring> </item>
</property> <item row="7" column="0">
</widget> <widget class="QLabel" name="expireLabel">
</item> <property name="text">
<item row="7" column="0"> <string>&amp;Expires:</string>
<widget class="QLabel" name="expireLabel"> </property>
<property name="text"> <property name="alignment">
<string>&amp;Expires:</string> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="alignment"> <property name="buddy">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <cstring>expireCheck</cstring>
</property> </property>
<property name="buddy"> </widget>
<cstring>expireCheck</cstring> </item>
</property> </layout>
</widget> </widget>
</item> </widget>
</layout> <customwidgets>
</widget> <customwidget>
</widget> <class>TagsEdit</class>
<customwidgets> <extends>QWidget</extends>
<customwidget> <header>gui/tag/TagsEdit.h</header>
<class>TagsEdit</class> <container>1</container>
<extends>QWidget</extends> </customwidget>
<header>gui/tag/TagsEdit.h</header> <customwidget>
<container>1</container> <class>URLEdit</class>
</customwidget> <extends>QLineEdit</extends>
<customwidget> <header>gui/URLEdit.h</header>
<class>URLEdit</class> <container>1</container>
<extends>QLineEdit</extends> </customwidget>
<header>gui/URLEdit.h</header> <customwidget>
<container>1</container> <class>PasswordWidget</class>
</customwidget> <extends>QWidget</extends>
<customwidget> <header>gui/PasswordWidget.h</header>
<class>PasswordWidget</class> <container>1</container>
<extends>QWidget</extends> </customwidget>
<header>gui/PasswordWidget.h</header> </customwidgets>
<container>1</container> <tabstops>
</customwidget> <tabstop>titleEdit</tabstop>
</customwidgets> <tabstop>usernameComboBox</tabstop>
<tabstops> <tabstop>passwordEdit</tabstop>
<tabstop>titleEdit</tabstop> <tabstop>urlEdit</tabstop>
<tabstop>usernameComboBox</tabstop> <tabstop>fetchFaviconButton</tabstop>
<tabstop>passwordEdit</tabstop> <tabstop>tagsList</tabstop>
<tabstop>urlEdit</tabstop> <tabstop>expireCheck</tabstop>
<tabstop>fetchFaviconButton</tabstop> <tabstop>expireDatePicker</tabstop>
<tabstop>tagsList</tabstop> <tabstop>expirePresets</tabstop>
<tabstop>expireCheck</tabstop> <tabstop>revealNotesButton</tabstop>
<tabstop>expireDatePicker</tabstop> <tabstop>notesEdit</tabstop>
<tabstop>expirePresets</tabstop> </tabstops>
<tabstop>revealNotesButton</tabstop> <resources/>
<tabstop>notesEdit</tabstop> <connections/>
</tabstops> </ui>
<resources/>
<connections/>
</ui>

3
src/gui/entry/attachments/TextAttachmentsEditWidget.cpp
View file

@ -56,4 +56,7 @@ void TextAttachmentsEditWidget::updateUi()
{ {
m_ui->attachmentsTextEdit->setPlainText(m_attachment.data); m_ui->attachmentsTextEdit->setPlainText(m_attachment.data);
m_ui->attachmentsTextEdit->setReadOnly(m_mode == attachments::OpenMode::ReadOnly); m_ui->attachmentsTextEdit->setReadOnly(m_mode == attachments::OpenMode::ReadOnly);
m_ui->attachmentsTextEdit->setTabStopDistance(
QFontMetrics(m_ui->attachmentsTextEdit->font()).horizontalAdvance(QString(4, ' ')));
} }

6
src/gui/entry/attachments/TextAttachmentsEditWidget.ui
View file

@ -57,11 +57,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="attachmentsTextEdit"> <widget class="QTextEdit" name="attachmentsTextEdit"/>
<property name="tabStopDistance">
<double>10.000000000000000</double>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

3
src/gui/entry/attachments/TextAttachmentsPreviewWidget.cpp
View file

@ -99,6 +99,9 @@ void TextAttachmentsPreviewWidget::initTypeCombobox()
// Configure text browser to open external links // Configure text browser to open external links
m_ui->previewTextBrowser->setOpenExternalLinks(true); 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)); m_ui->typeComboBox->setCurrentIndex(m_ui->typeComboBox->findData(PlainText));
onTypeChanged(m_ui->typeComboBox->currentIndex()); onTypeChanged(m_ui->typeComboBox->currentIndex());

6
src/gui/entry/attachments/TextAttachmentsPreviewWidget.ui
View file

@ -61,11 +61,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QTextBrowser" name="previewTextBrowser"> <widget class="QTextBrowser" name="previewTextBrowser"/>
<property name="tabStopDistance">
<double>10.000000000000000</double>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

2
src/gui/styles/dark/DarkStyle.cpp
View file

@ -121,8 +121,6 @@ void DarkStyle::polish(QWidget* widget)
palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0x2D2D2D)); palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0x2D2D2D));
palette.setColor(QPalette::Disabled, 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 #else
palette.setColor(QPalette::Active, QPalette::Window, QRgb(0x2F2F30)); palette.setColor(QPalette::Active, QPalette::Window, QRgb(0x2F2F30));
palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0x313133)); palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0x313133));

2
src/gui/styles/light/LightStyle.cpp
View file

@ -121,8 +121,6 @@ void LightStyle::polish(QWidget* widget)
palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0xF5F5F5)); palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0xF5F5F5));
palette.setColor(QPalette::Disabled, 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 #else
palette.setColor(QPalette::Active, QPalette::Window, QRgb(0xEFF0F1)); palette.setColor(QPalette::Active, QPalette::Window, QRgb(0xEFF0F1));
palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0xEFF0F1)); palette.setColor(QPalette::Inactive, QPalette::Window, QRgb(0xEFF0F1));