Skip to content

Commit c0f42c7

Browse files
committed
change font to Noto Sans Devnagari for full opentype support.
1 parent 2536f0b commit c0f42c7

10 files changed

+19
-50
lines changed

DayTithiWidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ class DayTithiWidget : public QWidget {
125125
int dayFontSize = std::max(12, static_cast<int>(minDim * 0.14));
126126
int tithiFontSize = std::max(8, static_cast<int>(minDim * 0.05));
127127
int englishDayFontSize = std::max(8, static_cast<int>(minDim * 0.05));
128-
int fontId = QFontDatabase::addApplicationFont(":/resources/Martel-Bold.ttf");
128+
int fontId = QFontDatabase::addApplicationFont(":/resources/NotoSansDevanagari-VariableFont_wdth,wght.ttf");
129129
QString fontFamily = QFontDatabase::applicationFontFamilies(fontId).at(0);
130130
QFont dayFont = dayLabel->font();
131131
dayFont.setPointSize(dayFontSize);
132132
dayFont.setFamily(fontFamily);
133-
dayFont.setBold(true);
133+
dayFont.setBold(false);
134134
dayLabel->setFont(dayFont);
135135
QFont tithiFont = tithiLabel->font();
136136
tithiFont.setPointSize(tithiFontSize);

calendarwindow.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ CalendarWindow::CalendarWindow(QWidget *parent) :
2828

2929

3030
// Apply the custom font
31-
int fontId = QFontDatabase::addApplicationFont(":/resources/Laila-Medium.ttf");
31+
int fontId = QFontDatabase::addApplicationFont(":/resources/NotoSansDevanagari-VariableFont_wdth,wght.ttf");
32+
QString fontFamily = "Noto Sans Devnagari";
3233
if (fontId != -1) {
33-
QString fontFamily = QFontDatabase::applicationFontFamilies(fontId).at(0);
34-
QFont appFont(fontFamily);
35-
qApp->setFont(appFont);
34+
fontFamily = QFontDatabase::applicationFontFamilies(fontId).at(0);
3635
}
36+
qApp->setFont(fontFamily);
37+
3738

3839
this->setWindowTitle("नेपाली पात्रो तथा मिति परिवर्तक");
3940
connect(ui->aboutbutton, &QPushButton::clicked, this, &CalendarWindow::showMenu);

mainwindow.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@ MainWindow::MainWindow(QWidget *parent) :
7171
)";
7272
setStyleSheet(tooltipstyle);
7373

74-
int fontId = QFontDatabase::addApplicationFont(":/resources/Laila-Medium.ttf");
75-
QString fontFamily = QFontDatabase::applicationFontFamilies(fontId).at(0);
76-
QFont appFont(fontFamily);
74+
//int fontId = QFontDatabase::addApplicationFont(":/resources/NotoSansDevanagari-VariableFont_wdth,wght.ttf");
75+
QString fontFamily = "Noto Sans Devanagari";
76+
//if (fontId != -1) {
77+
// fontFamily = QFontDatabase::applicationFontFamilies(fontId).at(0);
78+
//}
7779
QFont dateButtonFont(fontFamily, 12); // To Do: set text size from setting menu */
7880
ui->dateButton->setFont(dateButtonFont);
7981

@@ -210,7 +212,7 @@ int MainWindow::cnvToNepali(int mm, int dd, int yy) {
210212
// Set the Nepali formatted date to the button text and tooltip
211213
ui->dateButton->setText(nepaliFormat);
212214
ui->dateButton->setToolTipDuration(3000);
213-
QFont tooltipFont("Laila", 9); // Replace "Noto Sans Devnagari" with the name of your desired font
215+
QFont tooltipFont("fontFamily", 9);
214216
QToolTip::setFont(tooltipFont);
215217
ui->dateButton->setToolTip(nepalitooltip);
216218
adjustTextColorBasedOnBackground();

nepdate-widget.pro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ FORMS += mainwindow.ui \
2222
calendarwindow.ui
2323
RESOURCES += \
2424
resources.qrc
25+
26+
DISTFILES += \
27+
resources/Laila-Regular.ttf

resources.qrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
<file>resources/purnima.png</file>
99
<file>resources/style.qss</file>
1010
<file>resources/VERSION.txt</file>
11-
<file>resources/Laila-Medium.ttf</file>
1211
<file>resources/flag.png</file>
13-
<file>resources/Laila-Font-LICENSE</file>
14-
<file>resources/Martel-Bold.ttf</file>
15-
<file>resources/Martel-Font-LICENCE</file>
12+
<file>resources/NotoSans-font-LICENCE</file>
13+
<file>resources/NotoSansDevanagari-VariableFont_wdth,wght.ttf</file>
1614
</qresource>
1715
</RCC>

resources/Laila-Font-LICENSE

Lines changed: 0 additions & 35 deletions
This file was deleted.

resources/Laila-Medium.ttf

-326 KB
Binary file not shown.

resources/Martel-Bold.ttf

-164 KB
Binary file not shown.

resources/Martel-Font-LICENCE renamed to resources/NotoSans-font-LICENCE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015 Dan Reynolds. Copyright (c) 2010-2015, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name 'Merriweather'
1+
Copyright 2022 The Noto Project Authors (https://github.com/notofonts/devanagari)
22

33
This Font Software is licensed under the SIL Open Font License, Version 1.1.
44
This license is copied below, and is also available with a FAQ at:
627 KB
Binary file not shown.

0 commit comments

Comments
 (0)