mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix system default font handling

Browse source 
We didn't care about system default fonts and sizes, we just used the Qt
default font.

Due to how QFont is constructed, there was need to split font and font
size.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-03-21 18:56:10 +01:00 • committed by Dirk Hohndel
parent 41209005c9
commit 9cfc585563
6 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linux.c
View file

@ -9,7 +9,8 @@
#include <stdio.h>
#include <fcntl.h>
const char system_divelist_default_font[] = "Sans 8";
const char system_divelist_default_font[] = "Sans";
const int system_divelist_default_font_size = 8;
const char *system_default_filename(void)
{

3
macos.c
View file

@ -25,7 +25,8 @@
#define ICON_NAME "Subsurface.icns"
#define UI_FONT "Arial 12"
const char system_divelist_default_font[] = "Arial 10";
const char system_divelist_default_font[] = "Arial";
const int system_divelist_default_font_size = 10;
const char *system_default_filename(void)
{

1
pref.h
View file

@ -64,6 +64,7 @@ extern void subsurface_flush_conf(void);
extern void subsurface_close_conf(void);
extern const char system_divelist_default_font[];
extern const int system_divelist_default_font_size;
extern const char *system_default_filename();
extern void load_preferences(void);

5
qt-ui/mainwindow.cpp
View file

@ -645,8 +645,9 @@ void MainWindow::readSettings()
{
QSettings s;
s.beginGroup("Display");
QFont defaultFont = s.value("divelist_font", qApp->font()).value<QFont>();
defaultFont.setPointSizeF(s.value("font_size", qApp->font().pointSizeF()).toFloat());
QFont defaultFont = QFont(default_prefs.divelist_font);
defaultFont = s.value("divelist_font", defaultFont).value<QFont>();
defaultFont.setPointSizeF(s.value("font_size", default_prefs.font_size).toFloat());
qApp->setFont(defaultFont);
s.endGroup();

1
subsurfacestartup.c
View file

@ -170,6 +170,7 @@ void setup_system_prefs(void)
const char *env;
default_prefs.divelist_font = strdup(system_divelist_default_font);
default_prefs.font_size = system_divelist_default_font_size;
default_prefs.default_filename = system_default_filename();
env = getenv("LC_MEASUREMENT");

3
windows.c
View file

@ -10,7 +10,8 @@
#include <dirent.h>
#include <zip.h>
const char system_divelist_default_font[] = "Sans 8";
const char system_divelist_default_font[] = "Sans";
const int system_divelist_default_font_size = 8;
const char *system_default_filename(void)
{