Skip to content

Addint Font Weight option #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Addint Font Weight option #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions openhantek/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,13 @@ int main( int argc, char *argv[] ) {
bool useLocale = true; // the command line option
bool doNotTranslate = false; // the persistent option
bool resetSettings = false;
QString font = defaultFont; // defined in viewsettings.h
int fontSize = defaultFontSize; // defined in viewsettings.h
int condensed = defaultCondensed; // defined in viewsettings.h
int theme = 0; // set to "auto"
int toolTipVisible = 1; // start with tooltips
bool styleFusion = false; // use system style
QString font = defaultFont; // defined in viewsettings.h
int fontSize = defaultFontSize; // defined in viewsettings.h
int fontWeight = defaultFontWeight; // defined in viewsettings.h
int condensed = defaultCondensed; // defined in viewsettings.h
int theme = 0; // set to "auto"
int toolTipVisible = 1; // start with tooltips
bool styleFusion = false; // use system style
QString configFileName = QString();

{ // do this early at program start ...
Expand All @@ -110,6 +111,7 @@ int main( int argc, char *argv[] ) {
QSettings storeSettings;
storeSettings.beginGroup( "view" );
fontSize = storeSettings.value( "fontSize", defaultFontSize ).toInt();
fontWeight = storeSettings.value( "fontWeight", defaultFontWeight ).toInt();
styleFusion = storeSettings.value( "styleFusion", false ).toBool();
theme = storeSettings.value( "theme", 0 ).toInt();
toolTipVisible = storeSettings.value( "toolTipVisible", 1 ).toInt();
Expand Down Expand Up @@ -172,6 +174,12 @@ int main( int argc, char *argv[] ) {
.arg( fontSize ),
QCoreApplication::translate( "main", "Size" ) );
p.addOption( sizeOption );
QCommandLineOption weightOption(
{ "w", "weight" },
QString( QCoreApplication::translate( "main", "Set the font weight (default = %1)" ) )
.arg( fontWeight ),
QCoreApplication::translate( "main", "Weight" ) );
p.addOption( weightOption );
QCommandLineOption condensedOption(
"condensed", QCoreApplication::translate( "main", "Set the font condensed value (default = %1)" ).arg( condensed ),
QCoreApplication::translate( "main", "Condensed" ) );
Expand All @@ -192,6 +200,8 @@ int main( int argc, char *argv[] ) {
font = p.value( "font" );
if ( p.isSet( sizeOption ) )
fontSize = p.value( "size" ).toInt();
if ( p.isSet( weightOption ) )
fontWeight = p.value( "weight" ).toInt();
if ( p.isSet( condensedOption ) ) // allow range from UltraCondensed (50) to UltraExpanded (200)
condensed = qBound( 50, p.value( "condensed" ).toInt(), 200 );
useGLES = p.isSet( useGlesOption );
Expand Down Expand Up @@ -483,6 +493,7 @@ int main( int argc, char *argv[] ) {
appFont.setFamily( font ); // Fusion (or Windows) style + Arial (default) -> fit on small screen (Y >= 720)
appFont.setStretch( condensed );
appFont.setPointSize( fontSize ); // scales the widgets accordingly
appFont.setWeight( (QFont::Weight)fontWeight );
// apply new font settings for the scope application
if ( verboseLevel )
qDebug() << startupTime.elapsed() << "ms:"
Expand Down
1 change: 1 addition & 0 deletions openhantek/src/viewsettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// These values allow a quite narrow but readable display
const QString defaultFont = "Arial";
const int defaultFontSize = 10;
const int defaultFontWeight = 800; // ExtraBold
const int defaultCondensed = 87; // SemiCondensed = 87%

////////////////////////////////////////////////////////////////////////////////
Expand Down