summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2022-02-17 18:03:32 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2022-02-17 18:03:32 +0200
commit5f1b30cafcf251d52550915e3880609c099095ed (patch)
treee596a1216bb4f6eab29706e7d3455d843f6e1aa5
parent3b553dd49d8f9adeda125ee6cc13f923611d308b (diff)
Don't suggest fonts any more
Now you can just do searches in the font library.
-rw-r--r--po/en.po9
-rw-r--r--src/app.c4
2 files changed, 4 insertions, 9 deletions
diff --git a/po/en.po b/po/en.po
index 22c10e44..bff4c495 100644
--- a/po/en.po
+++ b/po/en.po
@@ -2144,12 +2144,3 @@ msgstr "Permanently dismiss warning about terminal emulation on %s?"
2144 2144
2145msgid "dlg.dismiss.warning" 2145msgid "dlg.dismiss.warning"
2146msgstr "Dismiss Warning" 2146msgstr "Dismiss Warning"
2147
2148msgid "heading.fontpack.classic"
2149msgstr "Download Fontpack"
2150
2151msgid "dlg.fontpack.classic.msg"
2152msgstr "The fonts previously bundled with the app are now available as a separate download. Would you like to download the \"Classic set\" fontpack now?"
2153
2154msgid "dlg.fontpack.classic"
2155msgstr "Download Fontpack (25 MB)"
diff --git a/src/app.c b/src/app.c
index d1e3870a..d47c6ef1 100644
--- a/src/app.c
+++ b/src/app.c
@@ -441,6 +441,7 @@ static void loadPrefs_App_(iApp *d) {
441 } 441 }
442 iRelease(f); 442 iRelease(f);
443 /* Upgrade checks. */ 443 /* Upgrade checks. */
444#if 0 /* disabled in v1.11 (font library search) */
444 if (cmp_Version(&upgradedFromAppVersion, &(iVersion){ 1, 8, 0 }) < 0) { 445 if (cmp_Version(&upgradedFromAppVersion, &(iVersion){ 1, 8, 0 }) < 0) {
445#if !defined (iPlatformAppleMobile) && !defined (iPlatformAndroidMobile) 446#if !defined (iPlatformAppleMobile) && !defined (iPlatformAndroidMobile)
446 /* When upgrading to v1.8.0, the old hardcoded font library is gone and that means 447 /* When upgrading to v1.8.0, the old hardcoded font library is gone and that means
@@ -450,6 +451,7 @@ static void loadPrefs_App_(iApp *d) {
450 postCommand_App("~fontpack.suggest.classic"); 451 postCommand_App("~fontpack.suggest.classic");
451#endif 452#endif
452 } 453 }
454#endif
453#if !defined (LAGRANGE_ENABLE_CUSTOM_FRAME) 455#if !defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
454 d->prefs.customFrame = iFalse; 456 d->prefs.customFrame = iFalse;
455#endif 457#endif
@@ -2289,6 +2291,7 @@ iBool handleCommand_App(const char *cmd) {
2289 suffixPtr_Command(cmd, "where"))); 2291 suffixPtr_Command(cmd, "where")));
2290 return iTrue; 2292 return iTrue;
2291 } 2293 }
2294#if 0 /* disabled in v1.11 */
2292 else if (equal_Command(cmd, "fontpack.suggest.classic")) { 2295 else if (equal_Command(cmd, "fontpack.suggest.classic")) {
2293 /* TODO: Don't use this when system fonts are accessible. */ 2296 /* TODO: Don't use this when system fonts are accessible. */
2294 if (!isInstalled_Fonts("classic-set") && !isInstalled_Fonts("cjk")) { 2297 if (!isInstalled_Fonts("classic-set") && !isInstalled_Fonts("cjk")) {
@@ -2305,6 +2308,7 @@ iBool handleCommand_App(const char *cmd) {
2305 } 2308 }
2306 return iTrue; 2309 return iTrue;
2307 } 2310 }
2311#endif
2308 else if (equal_Command(cmd, "prefs.changed")) { 2312 else if (equal_Command(cmd, "prefs.changed")) {
2309 savePrefs_App_(d); 2313 savePrefs_App_(d);
2310 return iTrue; 2314 return iTrue;