mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
9aca309611
In order to get rid of the old default font on Windows (Calibri) we are going to near ridiculous length. The reason for this is that we in the past always saved the default font in the settings (how stupid was that!) and so now even with a new default font in place, since there is an explicit font in the settings we take that instead of the default. Instead of requiring our existing users to use a registry cleaner to get the correct default font on Windows 7 and later (the VAST majority of our Windows users at this stage), we simply explicitly ignore that old default font. There is one very nasty side effect. A user cannot set Calibri as their font of choice on Windows 7 or later (because we always force them back onto Segoe). Given how much nicer Segoe looks I think this is an acceptable flaw - let's hope this doesn't come back to bite me in the future. At the same time this changes the default font size handling. We try to get the default font size of the OS so the app looks "right". This seems to not give me the expected result on Linux with KDE, but maybe I'm doing it wrong? Looks good when testing on Windows. See #712 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
92 lines
2.2 KiB
C++
92 lines
2.2 KiB
C++
/* implements Android specific functions */
|
|
#include "dive.h"
|
|
#include "display.h"
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <dirent.h>
|
|
#include <fcntl.h>
|
|
|
|
#include <QtAndroidExtras/QtAndroidExtras>
|
|
#include <QtAndroidExtras/QAndroidJniObject>
|
|
|
|
extern "C" {
|
|
|
|
const char android_system_divelist_default_font[] = "Roboto";
|
|
const char *system_divelist_default_font = android_system_divelist_default_font;
|
|
double system_divelist_default_font_size = 8.0;
|
|
|
|
void subsurface_OS_pref_setup(void)
|
|
{
|
|
// nothing
|
|
}
|
|
|
|
bool subsurface_ignore_font(const char *font)
|
|
{
|
|
// there are no old default fonts that we would want to ignore
|
|
return false;
|
|
}
|
|
|
|
const char *system_default_filename(void)
|
|
{
|
|
/* Replace this when QtCore/QStandardPaths getExternalStorageDirectory landed */
|
|
QAndroidJniObject externalStorage = QAndroidJniObject::callStaticObjectMethod("android/os/Environment", "getExternalStorageDirectory", "()Ljava/io/File;");
|
|
QAndroidJniObject externalStorageAbsolute = externalStorage.callObjectMethod("getAbsolutePath", "()Ljava/lang/String;");
|
|
QString system_default_filename = externalStorageAbsolute.toString() + "/subsurface.xml";
|
|
QAndroidJniEnvironment env;
|
|
if (env->ExceptionCheck()) {
|
|
// FIXME: Handle exception here.
|
|
env->ExceptionClear();
|
|
return strdup("/sdcard/subsurface.xml");
|
|
}
|
|
return strdup(system_default_filename.toUtf8().data());
|
|
}
|
|
|
|
int enumerate_devices(device_callback_t callback, void *userdata, int dc_type)
|
|
{
|
|
/* FIXME: we need to enumerate in some other way on android */
|
|
/* qtserialport maybee? */
|
|
return -1;
|
|
}
|
|
|
|
/* NOP wrappers to comform with windows.c */
|
|
int subsurface_rename(const char *path, const char *newpath)
|
|
{
|
|
return rename(path, newpath);
|
|
}
|
|
|
|
int subsurface_open(const char *path, int oflags, mode_t mode)
|
|
{
|
|
return open(path, oflags, mode);
|
|
}
|
|
|
|
FILE *subsurface_fopen(const char *path, const char *mode)
|
|
{
|
|
return fopen(path, mode);
|
|
}
|
|
|
|
void *subsurface_opendir(const char *path)
|
|
{
|
|
return (void *)opendir(path);
|
|
}
|
|
|
|
struct zip *subsurface_zip_open_readonly(const char *path, int flags, int *errorp)
|
|
{
|
|
return zip_open(path, flags, errorp);
|
|
}
|
|
|
|
int subsurface_zip_close(struct zip *zip)
|
|
{
|
|
return zip_close(zip);
|
|
}
|
|
|
|
/* win32 console */
|
|
void subsurface_console_init(bool dedicated)
|
|
{
|
|
/* NOP */
|
|
}
|
|
|
|
void subsurface_console_exit(void)
|
|
{
|
|
/* NOP */
|
|
}
|
|
}
|