mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-02-26 09:21:21 -05:00
Refactor fixed font selection into Font class
This commit is contained in:
parent
9b632eaaca
commit
d2a59c556e
@ -105,6 +105,7 @@ set(keepassx_SOURCES
|
|||||||
gui/EditWidgetIcons.cpp
|
gui/EditWidgetIcons.cpp
|
||||||
gui/EditWidgetProperties.cpp
|
gui/EditWidgetProperties.cpp
|
||||||
gui/FileDialog.cpp
|
gui/FileDialog.cpp
|
||||||
|
gui/Font.cpp
|
||||||
gui/IconModels.cpp
|
gui/IconModels.cpp
|
||||||
gui/KeePass1OpenWidget.cpp
|
gui/KeePass1OpenWidget.cpp
|
||||||
gui/KMessageWidget.cpp
|
gui/KMessageWidget.cpp
|
||||||
|
36
src/gui/Font.cpp
Normal file
36
src/gui/Font.cpp
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "Font.h"
|
||||||
|
|
||||||
|
#include <QFontDatabase>
|
||||||
|
|
||||||
|
QFont Font::fixedFont()
|
||||||
|
{
|
||||||
|
QFont fixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
|
||||||
|
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
// try to use Consolas on Windows, because the default Courier New has too many similar characters
|
||||||
|
QFont consolasFont = QFontDatabase().font("Consolas", fixedFont.styleName(), fixedFont.pointSize());
|
||||||
|
const QFont defaultFont;
|
||||||
|
if (fixedFont != defaultFont) {
|
||||||
|
fixedFont = consolasFont;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return fixedFont;
|
||||||
|
}
|
31
src/gui/Font.h
Normal file
31
src/gui/Font.h
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef KEEPASSX_FONT_H
|
||||||
|
#define KEEPASSX_FONT_H
|
||||||
|
|
||||||
|
#include <QFont>
|
||||||
|
|
||||||
|
class Font
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
static QFont fixedFont();
|
||||||
|
private:
|
||||||
|
Font() {}
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // KEEPASSX_FONT_H
|
@ -19,8 +19,7 @@
|
|||||||
#include "PasswordEdit.h"
|
#include "PasswordEdit.h"
|
||||||
|
|
||||||
#include "core/Config.h"
|
#include "core/Config.h"
|
||||||
|
#include "gui/Font.h"
|
||||||
#include <QFontDatabase>
|
|
||||||
|
|
||||||
const QColor PasswordEdit::CorrectSoFarColor = QColor(255, 205, 15);
|
const QColor PasswordEdit::CorrectSoFarColor = QColor(255, 205, 15);
|
||||||
const QColor PasswordEdit::ErrorColor = QColor(255, 125, 125);
|
const QColor PasswordEdit::ErrorColor = QColor(255, 125, 125);
|
||||||
@ -33,16 +32,7 @@ PasswordEdit::PasswordEdit(QWidget* parent)
|
|||||||
updateStylesheet();
|
updateStylesheet();
|
||||||
|
|
||||||
// use a monospace font for the password field
|
// use a monospace font for the password field
|
||||||
QFont passwordFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
|
QFont passwordFont = Font::fixedFont();
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
// try to use Consolas on Windows, because the default Courier New has too many similar characters
|
|
||||||
QFont consolasFont = QFontDatabase().font("Consolas", passwordFont.styleName(), passwordFont.pointSize());
|
|
||||||
const QFont defaultFont;
|
|
||||||
if (passwordFont != defaultFont) {
|
|
||||||
passwordFont = consolasFont;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
passwordFont.setLetterSpacing(QFont::PercentageSpacing, 110);
|
passwordFont.setLetterSpacing(QFont::PercentageSpacing, 110);
|
||||||
setFont(passwordFont);
|
setFont(passwordFont);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user