diff --git a/DSView/pv/dialogs/applicationpardlg.cpp b/DSView/pv/dialogs/applicationpardlg.cpp index 7510bfa7..1aefb212 100644 --- a/DSView/pv/dialogs/applicationpardlg.cpp +++ b/DSView/pv/dialogs/applicationpardlg.cpp @@ -87,7 +87,7 @@ void ApplicationParamDlg::bind_font_size_list(QComboBox *box, float size) { int selDex = -1; - for(int i=9; i<=15; i++) + for(int i=7; i<=13; i++) { box->addItem(QString::number(i)); if (i == size){ @@ -95,7 +95,7 @@ void ApplicationParamDlg::bind_font_size_list(QComboBox *box, float size) } } if (selDex == -1) - selDex = 0; + selDex = 2; box->setCurrentIndex(selDex); } diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp index dd337d21..b341d010 100644 --- a/DSView/pv/dock/protocoldock.cpp +++ b/DSView/pv/dock/protocoldock.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include "../ui/msgbox.h" #include "../dsvdef.h" #include "../config/appconfig.h" @@ -1036,8 +1037,15 @@ bool ProtocolDock::protocol_sort_callback(const DecoderInfoItem *o1, const Decod QFont font = this->font(); font.setPointSizeF(AppConfig::Instance().appOptions.fontSize); ui::set_form_font(this, font); + _table_view->setFont(font); + + for(auto lay : _protocol_lay_items){ + lay->update_font(); + } + font.setPointSizeF(font.pointSizeF() + 1); this->parentWidget()->setFont(font); + _table_view->horizontalHeader()->setFont(font); } } // namespace dock diff --git a/DSView/pv/dock/protocolitemlayer.cpp b/DSView/pv/dock/protocolitemlayer.cpp index 64ed1c51..9f39b053 100644 --- a/DSView/pv/dock/protocolitemlayer.cpp +++ b/DSView/pv/dock/protocolitemlayer.cpp @@ -27,7 +27,8 @@ namespace pv { namespace dock { -ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IProtocolItemLayerCallback *callback){ +ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IProtocolItemLayerCallback *callback) +{ assert(parent); assert(callback); @@ -68,6 +69,8 @@ ProtocolItemLayer::ProtocolItemLayer(QWidget *parent, QString protocolName, IPro connect(_del_button, SIGNAL(clicked()),this, SLOT(on_del_protocol())); connect(_set_button, SIGNAL(clicked()),this, SLOT(on_set_protocol())); connect(_format_combox, SIGNAL(currentIndexChanged(int)),this, SLOT(on_format_select_changed(int))); + + update_font(); } ProtocolItemLayer::~ProtocolItemLayer(){ @@ -161,5 +164,12 @@ void ProtocolItemLayer::LoadFormatSelect(bool bSingle) _protocol_label->setText(name); } + void ProtocolItemLayer::update_font() + { + QFont font = _protocol_label->font(); + font.setPointSizeF(AppConfig::Instance().appOptions.fontSize); + _protocol_label->setFont(font); + } + } //dock } //pv diff --git a/DSView/pv/dock/protocolitemlayer.h b/DSView/pv/dock/protocolitemlayer.h index b4e93bca..38de97a6 100644 --- a/DSView/pv/dock/protocolitemlayer.h +++ b/DSView/pv/dock/protocolitemlayer.h @@ -66,6 +66,8 @@ public: void enable_format(bool flag); void set_label_name(QString name); + + void update_font(); private slots: void on_set_protocol(); diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp index 9f32ce5b..ae6b83a7 100644 --- a/DSView/pv/view/header.cpp +++ b/DSView/pv/view/header.cpp @@ -127,8 +127,11 @@ void Header::paintEvent(QPaintEvent*) QColor fore(QWidget::palette().color(QWidget::foregroundRole())); fore.setAlpha(View::ForeAlpha); - QFont font(painter.font()); - font.setPointSizeF(9); + QFont font(painter.font()); + float fSize = AppConfig::Instance().appOptions.fontSize; + if (fSize > 10) + fSize = 10; + font.setPointSizeF(fSize); painter.setFont(font); for(auto t : traces) diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp index 96fb9af8..3076275b 100644 --- a/DSView/pv/view/ruler.cpp +++ b/DSView/pv/view/ruler.cpp @@ -197,7 +197,10 @@ void Ruler::paintEvent(QPaintEvent*) style()->drawPrimitive(QStyle::PE_Widget, &o, &p, this); QFont font = p.font(); - font.setPointSizeF(9); + float fSize = AppConfig::Instance().appOptions.fontSize; + if (fSize > 10) + fSize = 10; + font.setPointSizeF(fSize); p.setFont(font); SigSession *session = AppControl::Instance()->GetSession(); diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp index 97793312..d8428b12 100644 --- a/DSView/pv/view/viewport.cpp +++ b/DSView/pv/view/viewport.cpp @@ -156,7 +156,10 @@ void Viewport::doPaint() style()->drawPrimitive(QStyle::PE_Widget, &o, &p, this); QFont font = p.font(); - font.setPointSizeF(9); + float fSize = AppConfig::Instance().appOptions.fontSize; + if (fSize > 10) + fSize = 10; + font.setPointSizeF(fSize); p.setFont(font); _view.session().check_update(); @@ -557,8 +560,10 @@ void Viewport::paintProgress(QPainter &p, QColor fore, QColor back) p.setPen(View::Blue); QFont font = p.font(); - font.setPointSizeF(9); - font.setBold(true); + float fSize = AppConfig::Instance().appOptions.fontSize; + if (fSize > 10) + fSize = 10; + font.setPointSizeF(fSize); p.setFont(font); QRect status_rect = QRect(cenPos.x() - radius, cenPos.y() + radius * 0.4, radius * 2, radius * 0.5); diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp index 8a1738b8..65aeb7db 100644 --- a/DSView/pv/view/viewstatus.cpp +++ b/DSView/pv/view/viewstatus.cpp @@ -69,7 +69,10 @@ void ViewStatus::paintEvent(QPaintEvent *) QColor fore(QWidget::palette().color(QWidget::foregroundRole())); QFont font = p.font(); - font.setPointSizeF(9); + float fSize = AppConfig::Instance().appOptions.fontSize; + if (fSize > 10) + fSize = 10; + font.setPointSizeF(fSize); p.setFont(font); int mode = _session->get_device()->get_work_mode();