Skip to content

Commit

Permalink
New settings -- lots of changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@bdubbs
bdubbs committed Nov 12, 2024
1 parent 0038952 commit 0292b76
Show file tree
Hide file tree
Showing 15 changed files with 310 additions and 386 deletions.
6 changes: 1 addition & 5 deletions setup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <QPushButton>
#include <QMessageBox>

//#include "sysmon3.h"
#include "setup.h"
#include "udp.h"

Expand All @@ -26,6 +25,7 @@ setup::setup()
// ListWidget
listBox = new QListWidget();

// Populate the listBox with known servers
int size = settings.beginReadArray( "hosts" );
if ( size == 0 )
new QListWidgetItem( tr( "localhost" ), listBox );
Expand Down Expand Up @@ -83,10 +83,6 @@ setup::setup()
this->setLayout( layout );
}

setup::~setup()
{
}

void setup::test( void )
{
QMessageBox msgBox;
Expand Down
2 changes: 1 addition & 1 deletion setup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class setup : public QFrame

public:
setup();
~setup();
~setup(){};

private:
QVBoxLayout* layout; // Top level layout
Expand Down
150 changes: 74 additions & 76 deletions sm3_color.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,18 @@
#include "sysmon3.h"
#include "sm3_font.h"

//SM_Color::SM_Color( QString system, QSettings* baseSettings )
SM_Color::SM_Color( sysmon3* parent )
SM_Color::SM_Color( SM_Settings* setngs )
{
// server = system;
// settings = baseSettings;

// Set up widgets
// setWidgetData( server, settings );

mainWindow = parent;
server = parent->server;
settings = &parent->settings;

QString familyKey = server + "-fontFamily";
QString family = settings->value( familyKey, "DejaVu Sans" ).toString();

QString sizeKey = server + "-fontSize";
int fontSize = settings->value( sizeKey, 12 ).toInt();

QFont oldfont = QFont( family, fontSize );

widgets = new SM_Widgets( oldfont );
settingsPtr = setngs;

QString family = settingsPtr->value( "fontFamily" );
int fontSize = settingsPtr->value( "fontSize" ).toInt();

QFont oldfont = QFont( family, fontSize );
widgetsPtr = new SM_Widgets( oldfont );

// Get current font; second parameter is default
//QString family = settings->value( server + "-fontFamily", "DejaVu Sans" ).toString();
//int size = settings->value( server + "-fontSize" , 12 ).toInt();
bool checked = settings->value( server + "-fontBold" , false ).toBool();
bool checked = settingsPtr->value( "fontBold" ) == "true";
int weight = checked ? QFont::Bold : QFont::Normal;

// Frame layout
Expand All @@ -42,39 +25,37 @@ SM_Color::SM_Color( sysmon3* parent )
// Label color
QGridLayout* labelLayout = new QGridLayout();

pb_label_color = widgets->sm_pushbutton( tr( "Change\nLabel Color" ) );
pb_label_color = widgetsPtr->sm_pushbutton( tr( "Change\nLabel Color" ) );
labelLayout->addWidget( pb_label_color, 0, 0 );
connect( pb_label_color, SIGNAL( clicked() ), SLOT( label_color() ) );

pb_label_background = widgets->sm_pushbutton( tr( "Change\nLabel Background" ) );
pb_label_background = widgetsPtr->sm_pushbutton( tr( "Change\nLabel Background" ) );
labelLayout->addWidget( pb_label_background, 0 , 1 );
connect( pb_label_background, SIGNAL( clicked() ), SLOT( label_background() ) );

sample_label = widgets->sm_label( "Sample Label" );
sample_label = widgetsPtr->sm_label( "Sample Label" );
sample_label->setFont( QFont( family, fontSize, weight ) );
labelLayout->addWidget( sample_label, 0, 2 );

// Data color
pb_data_color = widgets->sm_pushbutton( tr( "Change\nData Color" ) );
pb_data_color = widgetsPtr->sm_pushbutton( tr( "Change\nData Color" ) );
labelLayout->addWidget( pb_data_color, 1, 0 );
connect( pb_data_color, SIGNAL( clicked() ), SLOT( data_color() ) );

pb_data_background = widgets->sm_pushbutton( tr( "Change\nData Background" ) );
pb_data_background = widgetsPtr->sm_pushbutton( tr( "Change\nData Background" ) );
labelLayout->addWidget( pb_data_background, 1, 1 );
connect( pb_data_background, SIGNAL( clicked() ), SLOT( data_background() ) );

sample_data = widgets->sm_label( "Sample Data" );
sample_data = widgetsPtr->sm_label( "Sample Data" );
sample_data->setFont( QFont( family, fontSize, weight ) );
labelLayout->addWidget( sample_data, 1, 2 );

//topbox->addLayout( labelLayout );

// ProgressBar color
pb_progress_color = widgets->sm_pushbutton( tr( "Change\nProgress Color" ) );
pb_progress_color = widgetsPtr->sm_pushbutton( tr( "Change\nProgress Color" ) );
labelLayout->addWidget( pb_progress_color, 2, 0 );
connect( pb_progress_color, SIGNAL( clicked() ), SLOT( progress_color() ) );

pb_progress_background = widgets->sm_pushbutton( tr( "Change\nProgress Background" ) );
pb_progress_background = widgetsPtr->sm_pushbutton( tr( "Change\nProgress Background" ) );
labelLayout->addWidget( pb_progress_background, 2, 1 );
connect( pb_progress_background, SIGNAL( clicked() ), SLOT( progress_background() ) );

Expand All @@ -87,19 +68,18 @@ SM_Color::SM_Color( sysmon3* parent )
topbox->addLayout( labelLayout );

// Default

pb_default = widgets->sm_pushbutton( tr( "Set Default Colors" ) );
pb_default = widgetsPtr->sm_pushbutton( tr( "Set Default Colors" ) );
connect( pb_default, SIGNAL( clicked() ), SLOT( setDefault() ) );
topbox->addWidget( pb_default );

// Buttons
pb_apply = widgets->sm_pushbutton( tr( "Apply" ) );
pb_apply = widgetsPtr->sm_pushbutton( tr( "Apply" ) );
connect( pb_apply, SIGNAL( clicked() ), SLOT( apply() ) );

//pb_help = sm_pushbutton( tr( "Help" ) );
//connect( pb_help, SIGNAL( clicked() ), SLOT( help() ) );

pb_exit = widgets->sm_pushbutton( tr( "Exit" ) );
pb_exit = widgetsPtr->sm_pushbutton( tr( "Exit" ) );
connect( pb_exit, SIGNAL( clicked() ), SLOT( close() ) );

QBoxLayout* buttons = new QHBoxLayout();
Expand All @@ -117,27 +97,44 @@ void SM_Color::setDefault( void )
{
QPalette p = sample_label->palette();

p.setColor( QPalette::Active, QPalette::Window, QColor( "#efefef" ) );
p.setColor( QPalette::Active, QPalette::WindowText, QColor( "#000000" ) );
p.setColor( QPalette::Inactive, QPalette::Window, QColor( "#efefef" ) );
p.setColor( QPalette::Inactive, QPalette::WindowText, QColor( "#000000" ) );

p.setColor( QPalette::Active, QPalette::Highlight, QColor( "#308cc6" ) );
p.setColor( QPalette::Active, QPalette::Base, QColor( "#ffffff" ) );
p.setColor( QPalette::Inactive, QPalette::Highlight, QColor( "#308cc6" ) );
p.setColor( QPalette::Inactive, QPalette::Base, QColor( "#ffffff" ) );
// Get defaults from SM_Settings
QColor labelColor = QColor( settingsPtr->getDefault( "labelColor" ) );
QColor labelBg = QColor( settingsPtr->getDefault( "labelBg" ) );
QColor dataColor = QColor( settingsPtr->getDefault( "dataColor" ) );
QColor dataBg = QColor( settingsPtr->getDefault( "dataBg" ) );
QColor progressColor = QColor( settingsPtr->getDefault( "progressColor" ) );
QColor progressBg = QColor( settingsPtr->getDefault( "progressBg" ) );

// The Active group is used for the window that has keyboard focus.
p.setColor( QPalette::Active, QPalette::Window, dataBg );
p.setColor( QPalette::Active, QPalette::WindowText, dataColor );
p.setColor( QPalette::Active, QPalette::Highlight, progressColor );
p.setColor( QPalette::Active, QPalette::Base, progressBg );

//The Inactive group is used for other windows.
p.setColor( QPalette::Inactive, QPalette::Window, dataBg );
p.setColor( QPalette::Inactive, QPalette::WindowText, dataColor );
p.setColor( QPalette::Inactive, QPalette::Highlight, progressColor );
p.setColor( QPalette::Inactive, QPalette::Base, progressBg );

sample_label ->setPalette( p );
sample_data ->setPalette( p );
sample_progress->setPalette( p );

p.setColor( QPalette::Active, QPalette::Window, labelBg );
p.setColor( QPalette::Active, QPalette::WindowText, labelColor );

p.setColor( QPalette::Inactive, QPalette::Window, labelBg );
p.setColor( QPalette::Inactive, QPalette::WindowText, labelColor );

sample_label ->setPalette( p );
}

void SM_Color::label_color( void )
{
QPalette p = sample_label->palette();
// Background is QPalette::Window
QColor oldColor = p.color( QPalette::Active, QPalette::WindowText);
QColor newColor = QColorDialog::getColor(oldColor, this );

QColor oldColor = p.color( QPalette::Active, QPalette::WindowText);
QColor newColor = QColorDialog::getColor(oldColor, this );

if ( ! newColor.isValid() ) return;

Expand All @@ -149,9 +146,10 @@ void SM_Color::label_color( void )
void SM_Color::label_background( void )
{
QPalette p = sample_label->palette();
// Background is QPalette::Window
QColor oldColor = p.color( QPalette::Active, QPalette::Window);
QColor newColor = QColorDialog::getColor(oldColor, this );

// Background is QPalette::Window
QColor oldColor = p.color( QPalette::Active, QPalette::Window);
QColor newColor = QColorDialog::getColor(oldColor, this );

if ( ! newColor.isValid() ) return;

Expand All @@ -163,7 +161,7 @@ void SM_Color::label_background( void )
void SM_Color::data_color( void )
{
QPalette p = sample_data->palette();
// Background is QPalette::Window

QColor oldColor = p.color( QPalette::Active, QPalette::WindowText);
QColor newColor = QColorDialog::getColor(oldColor, this );

Expand All @@ -177,7 +175,7 @@ void SM_Color::data_color( void )
void SM_Color::data_background( void )
{
QPalette p = sample_data->palette();
// Background is QPalette::Window

QColor oldColor = p.color( QPalette::Active, QPalette::Window);
QColor newColor = QColorDialog::getColor(oldColor, this );

Expand All @@ -191,27 +189,27 @@ void SM_Color::data_background( void )
void SM_Color::progress_color( void )
{
QPalette p = sample_progress->palette();
// Background is QPalette::Window

QColor oldColor = p.color( QPalette::Active, QPalette::WindowText);
QColor newColor = QColorDialog::getColor(oldColor, this );

if ( ! newColor.isValid() ) return;

p.setColor( QPalette::Active, QPalette::Highlight, newColor );//12
p.setColor( QPalette::Active, QPalette::Highlight, newColor );
p.setColor( QPalette::Inactive, QPalette::Highlight, newColor );
sample_progress->setPalette( p );
}

void SM_Color::progress_background( void )
{
QPalette p = sample_progress->palette();
// Background is QPalette::Window

QColor oldColor = p.color( QPalette::Active, QPalette::Window);
QColor newColor = QColorDialog::getColor(oldColor, this );

if ( ! newColor.isValid() ) return;

p.setColor( QPalette::Active, QPalette::Base, newColor ); //9
p.setColor( QPalette::Active, QPalette::Base, newColor );
p.setColor( QPalette::Inactive, QPalette::Base, newColor );
sample_progress->setPalette( p );
}
Expand All @@ -228,25 +226,25 @@ void SM_Color::apply()
QColor text = p.color( QPalette::Active, QPalette::WindowText );
QColor background = p.color( QPalette::Active, QPalette::Window );

// Set color values in settings
settings->setValue( server + "-labelColor", text .name() );
settings->setValue( server + "-labelBg" , background.name() );
// Set color values in settingsPtr
settingsPtr->setValue( "labelColor", text .name() );
settingsPtr->setValue( "labelBg" , background.name() );

p = sample_data->palette();
text = p.color( QPalette::Active, QPalette::WindowText );
background = p.color( QPalette::Active, QPalette::Window );

settings->setValue( server + "-dataColor", text.name() );
settings->setValue( server + "-dataBg" , background.name() );
settingsPtr->setValue( "dataColor", text.name() );
settingsPtr->setValue( "dataBg" , background.name() );

p = sample_progress->palette();
text = p.color( QPalette::Active, QPalette::Highlight );
background = p.color( QPalette::Active, QPalette::Base );

settings->setValue( server + "-progressColor", text.name() );
settings->setValue( server + "-progressBg" , background.name() );
settingsPtr->setValue( "progressColor", text.name() );
settingsPtr->setValue( "progressBg" , background.name() );

settings->sync();
settingsPtr->sync();
emit updateColors();
}

Expand All @@ -258,14 +256,14 @@ void SM_Color::apply()

void SM_Color::redraw( void )
{
QString lblFg = settings->value( server + "-labelColor", "#ffffff").toString();
QString lblBg = settings->value( server + "-labelBg", "#999999").toString();

QString dataFg = settings->value( server + "-dataColor", "#efefef").toString();
QString dataBg = settings->value( server + "-dataBg", "#000000").toString();

QString progressFg = settings->value( server + "-progressColor", "#efefef").toString();
QString progressBg = settings->value( server + "-progressBg", "#000000").toString();
QString lblFg = settingsPtr->value( "labelColor" );
QString lblBg = settingsPtr->value( "labelBg" );
QString dataFg = settingsPtr->value( "dataColor" );
QString dataBg = settingsPtr->value( "dataBg" );

QString progressFg = settingsPtr->value( "progressColor" );
QString progressBg = settingsPtr->value( "progressBg" );

QPalette p;
p.setColor( QPalette::Active, QPalette::WindowText, QColor( lblFg ) );
Expand Down
6 changes: 3 additions & 3 deletions sm3_color.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class SM_Color : public QFrame

public:
//*! \brief Construct the window for font selection
SM_Color( sysmon3* parent );
SM_Color( SM_Settings* );

//! \brief A null destructor.
~SM_Color() {};
Expand All @@ -25,8 +25,8 @@ class SM_Color : public QFrame
void updateColors( void );

private:
sysmon3* mainWindow;
SM_Widgets* widgets;
SM_Settings* settingsPtr;
SM_Widgets* widgetsPtr;

QSettings* settings;
QString server;
Expand Down
Loading

0 comments on commit 0292b76

Please sign in to comment.