diff --git a/DSView/icons/dark/start.png b/DSView/icons/dark/start.png index 40e181d0..47ccc895 100755 Binary files a/DSView/icons/dark/start.png and b/DSView/icons/dark/start.png differ diff --git a/DSView/icons/dark/stop.png b/DSView/icons/dark/stop.png index 7017ec46..1cc742ce 100755 Binary files a/DSView/icons/dark/stop.png and b/DSView/icons/dark/stop.png differ diff --git a/DSView/icons/light/start.png b/DSView/icons/light/start.png index 8f1b0053..47ccc895 100755 Binary files a/DSView/icons/light/start.png and b/DSView/icons/light/start.png differ diff --git a/DSView/icons/light/stop.png b/DSView/icons/light/stop.png index 7f2b01e5..1cc742ce 100755 Binary files a/DSView/icons/light/stop.png and b/DSView/icons/light/stop.png differ diff --git a/DSView/languages/my_25.qm b/DSView/languages/my_25.qm index 2430370f..35bbd2f6 100755 Binary files a/DSView/languages/my_25.qm and b/DSView/languages/my_25.qm differ diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp index 8c99c094..0631df0b 100755 --- a/DSView/pv/view/view.cpp +++ b/DSView/pv/view/view.cpp @@ -77,6 +77,7 @@ const QColor View::Blue = QColor(17, 133, 209, 255); const QColor View::Green = QColor(0, 153, 37, 255); const QColor View::Purple = QColor(109, 50, 156, 255); const QColor View::LightBlue = QColor(17, 133, 209, 200); +const QColor View::LightRed = QColor(213, 15, 37, 200); View::View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent) : @@ -206,7 +207,7 @@ View::View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget fore.setAlpha(View::BackAlpha); _show_trig_cursor = false; - _trig_cursor = new Cursor(*this, View::Red, 0); + _trig_cursor = new Cursor(*this, View::LightRed, 0); _show_search_cursor = false; _search_pos = 0; _search_cursor = new Cursor(*this, fore, _search_pos); diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h index 73a65d01..1d4ab633 100755 --- a/DSView/pv/view/view.h +++ b/DSView/pv/view/view.h @@ -101,6 +101,7 @@ public: static const QColor Green; static const QColor Purple; static const QColor LightBlue; + static const QColor LightRed; public: explicit View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent = 0); diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp index 56b0748e..a1d405c2 100755 --- a/DSView/pv/view/viewport.cpp +++ b/DSView/pv/view/viewport.cpp @@ -329,16 +329,16 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back) type = g_variant_get_byte(gvar); g_variant_unref(gvar); if (type == DSO_TRIGGER_AUTO && roll) { - type_str = "Auto(Roll)"; + type_str = tr("Auto(Roll)"); } else if (type == DSO_TRIGGER_AUTO && !_view.session().trigd()) { - type_str = "Auto"; + type_str = tr("Auto"); } else if (_waiting_trig > 0) { - type_str = "Waiting Trig"; + type_str = tr("Waiting Trig"); for (int i = 1; i < _waiting_trig; i++) if (i % (WaitLoopTime / SigSession::FeedInterval) == 0) type_str += "."; } else { - type_str = "Trig'd"; + type_str = tr("Trig'd"); } } p.setPen(fore);