quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust preferences dialog.spinners decimals

Browse Source 
closes #152
This commit is contained in:
Garux 2023-10-05 20:16:38 +06:00
parent 25e1ad50d9
commit dee00be204
7 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
radiant/brushmodule.cpp
View File

@ -91,10 +91,11 @@ void Brush_constructPreferences( PreferencesPage& page ){
FaceExportSnapPlanesCaller() FaceExportSnapPlanesCaller()
); );
page.appendSpinner( page.appendSpinner(
"Default texture scale", "Default texture scale",
g_texdef_default_scale, g_texdef_default_scale,
0.0625, 0.0625,
64 64,
4
); );
if ( g_multipleBrushTypes ) { if ( g_multipleBrushTypes ) {
const char* names[] = { BrushType_getName( g_brushTypes[0] ), BrushType_getName( g_brushTypes[1] ), BrushType_getName( g_brushTypes[2] ) }; const char* names[] = { BrushType_getName( g_brushTypes[0] ), BrushType_getName( g_brushTypes[1] ), BrushType_getName( g_brushTypes[2] ) };

5
radiant/camwindow.cpp
View File

@ -2455,9 +2455,10 @@ void Camera_constructPreferences( PreferencesPage& page ){
StringArrayRange( strafe_mode ) StringArrayRange( strafe_mode )
); );
page.appendSpinner( "Field Of View", 1.0, 175.0, page.appendSpinner( "Field Of View", 1.0, 175.0,
FloatImportCallback( fieldOfViewImportCaller() ), FloatImportCallback( fieldOfViewImportCaller() ),
FloatExportCallback( FloatExportCaller( camera_t::fieldOfView ) ) FloatExportCallback( FloatExportCaller( camera_t::fieldOfView ) ),
0
); );
} }
void Camera_constructPage( PreferenceGroup& group ){ void Camera_constructPage( PreferenceGroup& group ){

8
radiant/dialog.cpp
View File

@ -515,14 +515,14 @@ QWidget* Dialog::addSpinner( QGridLayout* grid, const char* name, int& data, int
return addSpinner( grid, name, lower, upper, IntImportCallback( IntImportCaller( data ) ), IntExportCallback( IntExportCaller( data ) ) ); return addSpinner( grid, name, lower, upper, IntImportCallback( IntImportCaller( data ) ), IntExportCallback( IntExportCaller( data ) ) );
} }
QWidget* Dialog::addSpinner( QGridLayout* grid, const char* name, double lower, double upper, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){ QWidget* Dialog::addSpinner( QGridLayout* grid, const char* name, double lower, double upper, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer, int decimals ){
auto spin = new DoubleSpinBox( lower, upper ); auto spin = new DoubleSpinBox( lower, upper, 0, decimals );
spin->setStepType( QAbstractSpinBox::StepType::AdaptiveDecimalStepType ); spin->setStepType( QAbstractSpinBox::StepType::AdaptiveDecimalStepType );
AddFloatSpinnerData( *spin, importViewer, exportViewer ); AddFloatSpinnerData( *spin, importViewer, exportViewer );
DialogGrid_packRow( grid, spin, new SpinBoxLabel( name, spin ) ); DialogGrid_packRow( grid, spin, new SpinBoxLabel( name, spin ) );
return spin; return spin;
} }
QWidget* Dialog::addSpinner( QGridLayout* grid, const char* name, float& data, double lower, double upper ){ QWidget* Dialog::addSpinner( QGridLayout* grid, const char* name, float& data, double lower, double upper, int decimals ){
return addSpinner( grid, name, lower, upper, FloatImportCallback( FloatImportCaller( data ) ), FloatExportCallback( FloatExportCaller( data ) ) ); return addSpinner( grid, name, lower, upper, FloatImportCallback( FloatImportCaller( data ) ), FloatExportCallback( FloatExportCaller( data ) ), decimals );
} }

4
radiant/dialog.h
View File

@ -153,8 +153,8 @@ public:
void addPathEntry( QGridLayout *grid, const char* name, CopiedString& data, bool directory ); void addPathEntry( QGridLayout *grid, const char* name, CopiedString& data, bool directory );
QWidget* addSpinner( QGridLayout *grid, const char* name, int& data, int lower, int upper ); QWidget* addSpinner( QGridLayout *grid, const char* name, int& data, int lower, int upper );
QWidget* addSpinner( QGridLayout *grid, const char* name, int lower, int upper, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ); QWidget* addSpinner( QGridLayout *grid, const char* name, int lower, int upper, const IntImportCallback& importCallback, const IntExportCallback& exportCallback );
QWidget* addSpinner( QGridLayout *grid, const char* name, double lower, double upper, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback ); QWidget* addSpinner( QGridLayout *grid, const char* name, double lower, double upper, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback, int decimals );
QWidget* addSpinner( QGridLayout* grid, const char* name, float& data, double lower, double upper ); QWidget* addSpinner( QGridLayout* grid, const char* name, float& data, double lower, double upper, int decimals );
protected: protected:

4
radiant/entity.cpp
View File

@ -666,11 +666,11 @@ typedef ReferenceCaller1<EntityCreator, const BoolImportCallback&, ShowTargetNam
void Entity_constructPreferences( PreferencesPage& page ){ void Entity_constructPreferences( PreferencesPage& page ){
page.appendSpinner( "Names Display Distance (3D)", 0.0, 200500.0, page.appendSpinner( "Names Display Distance (3D)", 0, 200500,
IntImportCallback( ShowNamesDistImportCaller( GlobalEntityCreator() ) ), IntImportCallback( ShowNamesDistImportCaller( GlobalEntityCreator() ) ),
IntExportCallback( ShowNamesDistExportCaller( GlobalEntityCreator() ) ) IntExportCallback( ShowNamesDistExportCaller( GlobalEntityCreator() ) )
); );
page.appendSpinner( "Names Display Ratio (2D)", 0.0, 100500.0, page.appendSpinner( "Names Display Ratio (2D)", 0, 100500,
IntImportCallback( ShowNamesRatioImportCaller( GlobalEntityCreator() ) ), IntImportCallback( ShowNamesRatioImportCaller( GlobalEntityCreator() ) ),
IntExportCallback( ShowNamesRatioExportCaller( GlobalEntityCreator() ) ) IntExportCallback( ShowNamesRatioExportCaller( GlobalEntityCreator() ) )
); );

2
radiant/modelwindow.cpp
View File

@ -1343,7 +1343,7 @@ typedef ReferenceCaller1<CopiedString, const char*, FoldersToLoadImport> Folders
void ModelBrowser_constructPage( PreferenceGroup& group ){ void ModelBrowser_constructPage( PreferenceGroup& group ){
PreferencesPage page( group.createPage( "Model Browser", "Model Browser Preferences" ) ); PreferencesPage page( group.createPage( "Model Browser", "Model Browser Preferences" ) );
page.appendSpinner( "Model View Size", 16.0, 8192.0, page.appendSpinner( "Model View Size", 16, 8192,
IntImportCallback( CellSizeImportCaller( g_ModelBrowser.m_cellSize ) ), IntImportCallback( CellSizeImportCaller( g_ModelBrowser.m_cellSize ) ),
IntExportCallback( IntExportCaller( g_ModelBrowser.m_cellSize ) ) ); IntExportCallback( IntExportCaller( g_ModelBrowser.m_cellSize ) ) );
page.appendEntry( "List of *folderToLoad/depth*", page.appendEntry( "List of *folderToLoad/depth*",

8
radiant/preferences.h
View File

@ -93,11 +93,11 @@ public:
QWidget* appendSpinner( const char* name, int lower, int upper, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ){ QWidget* appendSpinner( const char* name, int lower, int upper, const IntImportCallback& importCallback, const IntExportCallback& exportCallback ){
return m_dialog.addSpinner( m_grid, name, lower, upper, importCallback, exportCallback ); return m_dialog.addSpinner( m_grid, name, lower, upper, importCallback, exportCallback );
} }
QWidget* appendSpinner( const char* name, double lower, double upper, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback ){ QWidget* appendSpinner( const char* name, double lower, double upper, const FloatImportCallback& importCallback, const FloatExportCallback& exportCallback, int decimals = 2 ){
return m_dialog.addSpinner( m_grid, name, lower, upper, importCallback, exportCallback ); return m_dialog.addSpinner( m_grid, name, lower, upper, importCallback, exportCallback, decimals );
} }
QWidget* appendSpinner( const char* name, float& data, double lower, double upper ){ QWidget* appendSpinner( const char* name, float& data, double lower, double upper, int decimals = 2 ){
return m_dialog.addSpinner( m_grid, name, data, lower, upper ); return m_dialog.addSpinner( m_grid, name, data, lower, upper, decimals );
} }
}; };