Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Oscilloscope mode redesign #3

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

Oscilloscope mode redesign #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82e51bb
chore: move mode combo & change mode names
PROPHESSOR Dec 21, 2023
2a8484e
Use radio buttons instead of mode combo box
PROPHESSOR Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions res/main/i18n/default/lists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"dc": "DC"
},
"mode": {
"goniometer": "Goniometer",
"triggered": "Triggered",
"goniometer": "Stereo image",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a bad idea to make text associated with the key to differ the initial key sense.
If you want to change the label, please consider adding new key "stereo_image".

"triggered": "Wave form",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here and below

"xy": "XY"
},
"oversampler": {
Expand Down
4 changes: 2 additions & 2 deletions res/main/i18n/ru/lists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"dc": "Пост"
},
"mode": {
"goniometer": "Гониометр",
"triggered": "Триггер",
"goniometer": "Стерео-картина",
"triggered": "Волна",
"xy": "XY"
},
"oversampler": {
Expand Down
4 changes: 2 additions & 2 deletions res/main/i18n/us/lists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"dc": "DC"
},
"mode": {
"goniometer": "Goniometer",
"triggered": "Triggered",
"goniometer": "Stereo image",
"triggered": "Wave form",
"xy": "XY"
},
"oversampler": {
Expand Down
18 changes: 13 additions & 5 deletions res/main/ui/util/oscilloscope/x1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@
<hbox spacing="4">
<vbox spacing="4" expand="true">
<!-- Fast Control -->
<align halign="-1">
<button id="freeze" text="actions.freeze" ui:inject="Button_cyan" height="22" bg.color="bg_schema" pad.h="6" pad.v="4"/>
</align>
<hbox>
<label bg.color="bg_schema" text="labels.oscilloscope.mode" pad.h="6"/>
<ui:with ui:inject="Button_orange" height="22" bg.color="bg_schema" pad.h="6" pad.v="4">
<button id="scmo_1" value="1" text="Waveform" />
<button id="scmo_1" value="2" text="Stereo image" />
<button id="scmo_1" value="0" text="X/Y" />
</ui:with>
<!-- <combo id="scmo_1" bg.color="osc_bg_gray" pad.h="6" pad.b="1"/> -->
<void hexpand="true"/>
<button id="freeze" text="actions.freeze" ui:inject="Button_cyan" height="22" bg.color="bg_schema" pad.h="6" pad.v="4"/>
</hbox>

<group ui:inject="GraphGroup" ipadding="0" expand="true" fill="true" text="labels.graphs.oscilloscope">
<graph width.min="550" height.min="550" expand="true">
Expand Down Expand Up @@ -163,12 +171,12 @@
</cell>

<!-- Row 3 -->
<align halign="1">
<!-- <align halign="1">
<label bg.color="bg_schema" text="labels.oscilloscope.mode" pad.h="6"/>
</align>
<cell cols="2">
<combo id="scmo_1" bg.color="osc_bg_gray" pad.h="6" pad.b="1"/>
</cell>
</cell> -->

<!-- Row 4 -->
<void color="bg" height="4" vreduce="true"/>
Expand Down