Fix language and UI issue
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.9 KiB |
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||