SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Fix language and UI issue

Browse Source
This commit is contained in:
DreamSourceLab
2020-02-21 20:15:34 +08:00
parent 9dfea2e314
commit dd4454e913
8 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
DSView/icons/dark/start.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
DSView/icons/dark/stop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
DSView/icons/light/start.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
DSView/icons/light/stop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
DSView/languages/my_25.qm
View File

Binary file not shown.

3
DSView/pv/view/view.cpp
View File

@@ -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::Green = QColor(0, 153, 37, 255);
const QColor View::Purple = QColor(109, 50, 156, 255); const QColor View::Purple = QColor(109, 50, 156, 255);
const QColor View::LightBlue = QColor(17, 133, 209, 200); 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) : 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); fore.setAlpha(View::BackAlpha);
_show_trig_cursor = false; _show_trig_cursor = false;
_trig_cursor = new Cursor(*this, View::Red, 0); _trig_cursor = new Cursor(*this, View::LightRed, 0);
_show_search_cursor = false; _show_search_cursor = false;
_search_pos = 0; _search_pos = 0;
_search_cursor = new Cursor(*this, fore, _search_pos); _search_cursor = new Cursor(*this, fore, _search_pos);

1
DSView/pv/view/view.h
View File

@@ -101,6 +101,7 @@ public:
static const QColor Green; static const QColor Green;
static const QColor Purple; static const QColor Purple;
static const QColor LightBlue; static const QColor LightBlue;
static const QColor LightRed;
public: public:
explicit View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent = 0); explicit View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent = 0);

8
DSView/pv/view/viewport.cpp
View File

@@ -329,16 +329,16 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back)
type = g_variant_get_byte(gvar); type = g_variant_get_byte(gvar);
g_variant_unref(gvar); g_variant_unref(gvar);
if (type == DSO_TRIGGER_AUTO && roll) { if (type == DSO_TRIGGER_AUTO && roll) {
type_str = "Auto(Roll)"; type_str = tr("Auto(Roll)");
} else if (type == DSO_TRIGGER_AUTO && !_view.session().trigd()) { } else if (type == DSO_TRIGGER_AUTO && !_view.session().trigd()) {
type_str = "Auto"; type_str = tr("Auto");
} else if (_waiting_trig > 0) { } else if (_waiting_trig > 0) {
type_str = "Waiting Trig"; type_str = tr("Waiting Trig");
for (int i = 1; i < _waiting_trig; i++) for (int i = 1; i < _waiting_trig; i++)
if (i % (WaitLoopTime / SigSession::FeedInterval) == 0) if (i % (WaitLoopTime / SigSession::FeedInterval) == 0)
type_str += "."; type_str += ".";
} else { } else {
type_str = "Trig'd"; type_str = tr("Trig'd");
} }
} }
p.setPen(fore); p.setPen(fore);