diff --git a/DSView/DSView.qrc b/DSView/DSView.qrc
index d3012dbb..692ac4e3 100755
--- a/DSView/DSView.qrc
+++ b/DSView/DSView.qrc
@@ -7,91 +7,6 @@
icons/Hann.png
icons/logo.png
icons/Rectangle.png
- icons/search.png
- icons/dark/about.png
- icons/dark/add.png
- icons/dark/bug.png
- icons/dark/capture.png
- icons/dark/close.png
- icons/dark/dark.png
- icons/dark/del.png
- icons/dark/display.png
- icons/dark/down-arrow.png
- icons/dark/export.png
- icons/dark/fft.png
- icons/dark/file.png
- icons/dark/gear.png
- icons/dark/hidden.png
- icons/dark/instant.png
- icons/dark/light.png
- icons/dark/logo_color.png
- icons/dark/logo_noColor.png
- icons/dark/manual.png
- icons/dark/maximize.png
- icons/dark/measure.png
- icons/dark/minimize.png
- icons/dark/moder.png
- icons/dark/modes.png
- icons/dark/nav.png
- icons/dark/next.png
- icons/dark/oneloop.png
- icons/dark/open.png
- icons/dark/params.png
- icons/dark/pre.png
- icons/dark/protocol.png
- icons/dark/repeat.png
- icons/dark/restore.png
- icons/dark/save.png
- icons/dark/search.png
- icons/dark/search-bar.png
- icons/dark/shown.png
- icons/dark/single.png
- icons/dark/start.png
- icons/dark/stop.png
- icons/dark/support.png
- icons/dark/trigger.png
- icons/light/about.png
- icons/light/add.png
- icons/light/bug.png
- icons/light/capture.png
- icons/light/close.png
- icons/light/dark.png
- icons/light/del.png
- icons/light/display.png
- icons/light/down-arrow.png
- icons/light/export.png
- icons/light/fft.png
- icons/light/file.png
- icons/light/gear.png
- icons/light/hidden.png
- icons/light/instant.png
- icons/light/light.png
- icons/light/logo_color.png
- icons/light/logo_noColor.png
- icons/light/manual.png
- icons/light/maximize.png
- icons/light/measure.png
- icons/light/minimize.png
- icons/light/moder.png
- icons/light/modes.png
- icons/light/nav.png
- icons/light/next.png
- icons/light/oneloop.png
- icons/light/open.png
- icons/light/params.png
- icons/light/pre.png
- icons/light/protocol.png
- icons/light/repeat.png
- icons/light/restore.png
- icons/light/save.png
- icons/light/search.png
- icons/light/search-bar.png
- icons/light/shown.png
- icons/light/single.png
- icons/light/start.png
- icons/light/stop.png
- icons/light/support.png
- icons/light/trigger.png
icons/mAmplitude.png
icons/mBurst.png
icons/mDelay.png
@@ -113,29 +28,116 @@
icons/mRise.png
icons/mRms.png
icons/mVpp.png
- icons/light/lissajous.png
- icons/dark/lissajous.png
- icons/light/function.png
- icons/dark/function.png
- icons/light/math.png
- icons/dark/math.png
- icons/math.png
- icons/Chinese.png
- icons/English.png
- icons/lissajous.png
icons/light/wait.gif
icons/dark/wait.gif
- icons/light/daq.png
- icons/light/la.png
- icons/light/osc.png
- icons/dark/daq.png
- icons/dark/la.png
- icons/dark/osc.png
icons/showDoc25.png
icons/showDoc31.png
- icons/usb2.png
- icons/usb3.png
- icons/data.png
- icons/demo.png
+ icons/dark/start.svg
+ icons/dark/stop.svg
+ icons/demo.svg
+ icons/dark/moder.svg
+ icons/dark/modes.svg
+ icons/dark/trigger.svg
+ icons/light/about.svg
+ icons/light/add.svg
+ icons/light/bug.svg
+ icons/light/capture.svg
+ icons/light/close.svg
+ icons/light/dark.svg
+ icons/light/del.svg
+ icons/light/display.svg
+ icons/light/export.svg
+ icons/light/fft.svg
+ icons/light/file.svg
+ icons/light/gear.svg
+ icons/light/hidden.svg
+ icons/light/light.svg
+ icons/light/lissajous.svg
+ icons/light/manual.svg
+ icons/light/math.svg
+ icons/light/maximize.svg
+ icons/light/nav.svg
+ icons/light/next.svg
+ icons/light/oneloop.svg
+ icons/light/open.svg
+ icons/light/params.svg
+ icons/light/pre.svg
+ icons/light/protocol.svg
+ icons/light/repeat.svg
+ icons/light/save.svg
+ icons/light/search-bar.svg
+ icons/light/shown.svg
+ icons/light/single.svg
+ icons/light/start.svg
+ icons/light/stop.svg
+ icons/light/trigger.svg
+ icons/dark/about.svg
+ icons/dark/add.svg
+ icons/dark/bug.svg
+ icons/dark/capture.svg
+ icons/dark/close.svg
+ icons/dark/dark.svg
+ icons/dark/del.svg
+ icons/dark/display.svg
+ icons/dark/export.svg
+ icons/dark/fft.svg
+ icons/dark/file.svg
+ icons/dark/gear.svg
+ icons/dark/hidden.svg
+ icons/dark/light.svg
+ icons/dark/lissajous.svg
+ icons/dark/manual.svg
+ icons/dark/math.svg
+ icons/dark/maximize.svg
+ icons/dark/nav.svg
+ icons/dark/next.svg
+ icons/dark/oneloop.svg
+ icons/dark/open.svg
+ icons/dark/params.svg
+ icons/dark/pre.svg
+ icons/dark/protocol.svg
+ icons/dark/repeat.svg
+ icons/dark/save.svg
+ icons/dark/search-bar.svg
+ icons/dark/shown.svg
+ icons/dark/settings.svg
+ icons/light/settings.svg
+ icons/Chinese.svg
+ icons/data.svg
+ icons/English.svg
+ icons/usb2.svg
+ icons/usb3.svg
+ icons/light/moder.svg
+ icons/light/modes.svg
+ icons/math.svg
+ icons/lissajous.svg
+ icons/dark/single.svg
+ icons/dark/measure.svg
+ icons/light/measure.svg
+ icons/dark/daq.svg
+ icons/dark/la.svg
+ icons/dark/osc.svg
+ icons/light/daq.svg
+ icons/light/la.svg
+ icons/light/osc.svg
+ icons/light/square-daq.svg
+ icons/light/square-la.svg
+ icons/light/square-osc.svg
+ icons/dark/square-daq.svg
+ icons/dark/square-la.svg
+ icons/dark/square-osc.svg
+ icons/light/search.svg
+ icons/dark/search.svg
+ icons/dark/function.svg
+ icons/light/function.svg
+ icons/light/logo_color.svg
+ icons/light/logo_noColor.svg
+ icons/dark/logo_color.svg
+ icons/dark/logo_noColor.svg
+ icons/light/minimize.svg
+ icons/dark/restore.svg
+ icons/light/restore.svg
+ icons/dsl_logo.svg
+ icons/dark/minimize.svg
diff --git a/DSView/icons/Chinese.png b/DSView/icons/Chinese.png
deleted file mode 100755
index f1387113..00000000
Binary files a/DSView/icons/Chinese.png and /dev/null differ
diff --git a/DSView/icons/Chinese.svg b/DSView/icons/Chinese.svg
new file mode 100644
index 00000000..a322756d
--- /dev/null
+++ b/DSView/icons/Chinese.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/DSView/icons/English.png b/DSView/icons/English.png
deleted file mode 100755
index deee73f0..00000000
Binary files a/DSView/icons/English.png and /dev/null differ
diff --git a/DSView/icons/English.svg b/DSView/icons/English.svg
new file mode 100644
index 00000000..5014543f
--- /dev/null
+++ b/DSView/icons/English.svg
@@ -0,0 +1,182 @@
+
+
+
diff --git a/DSView/icons/dark/about.png b/DSView/icons/dark/about.png
deleted file mode 100755
index 94bac48d..00000000
Binary files a/DSView/icons/dark/about.png and /dev/null differ
diff --git a/DSView/icons/dark/about.svg b/DSView/icons/dark/about.svg
new file mode 100644
index 00000000..dd637d7f
--- /dev/null
+++ b/DSView/icons/dark/about.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/DSView/icons/dark/add.png b/DSView/icons/dark/add.png
deleted file mode 100755
index 24c81886..00000000
Binary files a/DSView/icons/dark/add.png and /dev/null differ
diff --git a/DSView/icons/dark/add.svg b/DSView/icons/dark/add.svg
new file mode 100644
index 00000000..52ddd196
--- /dev/null
+++ b/DSView/icons/dark/add.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/dark/bug.png b/DSView/icons/dark/bug.png
deleted file mode 100755
index 3fc8004e..00000000
Binary files a/DSView/icons/dark/bug.png and /dev/null differ
diff --git a/DSView/icons/dark/bug.svg b/DSView/icons/dark/bug.svg
new file mode 100644
index 00000000..f1491e2b
--- /dev/null
+++ b/DSView/icons/dark/bug.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/dark/capture.png b/DSView/icons/dark/capture.png
deleted file mode 100755
index 6c12ad27..00000000
Binary files a/DSView/icons/dark/capture.png and /dev/null differ
diff --git a/DSView/icons/dark/capture.svg b/DSView/icons/dark/capture.svg
new file mode 100644
index 00000000..b20a5ae9
--- /dev/null
+++ b/DSView/icons/dark/capture.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/dark/close.png b/DSView/icons/dark/close.png
deleted file mode 100755
index 8eb85178..00000000
Binary files a/DSView/icons/dark/close.png and /dev/null differ
diff --git a/DSView/icons/dark/close.svg b/DSView/icons/dark/close.svg
new file mode 100644
index 00000000..62958aec
--- /dev/null
+++ b/DSView/icons/dark/close.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/dark/daq.png b/DSView/icons/dark/daq.png
deleted file mode 100755
index 69be862f..00000000
Binary files a/DSView/icons/dark/daq.png and /dev/null differ
diff --git a/DSView/icons/dark/daq.svg b/DSView/icons/dark/daq.svg
new file mode 100644
index 00000000..e54a5a40
--- /dev/null
+++ b/DSView/icons/dark/daq.svg
@@ -0,0 +1,46 @@
+
+
+
+
diff --git a/DSView/icons/dark/dark.png b/DSView/icons/dark/dark.png
deleted file mode 100755
index 8f822aa8..00000000
Binary files a/DSView/icons/dark/dark.png and /dev/null differ
diff --git a/DSView/icons/dark/dark.svg b/DSView/icons/dark/dark.svg
new file mode 100644
index 00000000..3a351410
--- /dev/null
+++ b/DSView/icons/dark/dark.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/DSView/icons/dark/del.png b/DSView/icons/dark/del.png
deleted file mode 100755
index 527534b4..00000000
Binary files a/DSView/icons/dark/del.png and /dev/null differ
diff --git a/DSView/icons/dark/del.svg b/DSView/icons/dark/del.svg
new file mode 100644
index 00000000..d216d38d
--- /dev/null
+++ b/DSView/icons/dark/del.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/dark/display.png b/DSView/icons/dark/display.png
deleted file mode 100755
index 6ca6c96e..00000000
Binary files a/DSView/icons/dark/display.png and /dev/null differ
diff --git a/DSView/icons/dark/display.svg b/DSView/icons/dark/display.svg
new file mode 100644
index 00000000..d7809e4f
--- /dev/null
+++ b/DSView/icons/dark/display.svg
@@ -0,0 +1,43 @@
+
+
+
+
diff --git a/DSView/icons/dark/down-arrow.png b/DSView/icons/dark/down-arrow.png
deleted file mode 100755
index 09e14ad2..00000000
Binary files a/DSView/icons/dark/down-arrow.png and /dev/null differ
diff --git a/DSView/icons/dark/export.png b/DSView/icons/dark/export.png
deleted file mode 100755
index 57ee72ff..00000000
Binary files a/DSView/icons/dark/export.png and /dev/null differ
diff --git a/DSView/icons/dark/export.svg b/DSView/icons/dark/export.svg
new file mode 100644
index 00000000..7e7bfd3a
--- /dev/null
+++ b/DSView/icons/dark/export.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/DSView/icons/dark/fft.png b/DSView/icons/dark/fft.png
deleted file mode 100755
index f2e0db4a..00000000
Binary files a/DSView/icons/dark/fft.png and /dev/null differ
diff --git a/DSView/icons/dark/fft.svg b/DSView/icons/dark/fft.svg
new file mode 100644
index 00000000..385d5909
--- /dev/null
+++ b/DSView/icons/dark/fft.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/DSView/icons/dark/file.png b/DSView/icons/dark/file.png
deleted file mode 100755
index 926ac246..00000000
Binary files a/DSView/icons/dark/file.png and /dev/null differ
diff --git a/DSView/icons/dark/file.svg b/DSView/icons/dark/file.svg
new file mode 100644
index 00000000..656a332f
--- /dev/null
+++ b/DSView/icons/dark/file.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/DSView/icons/dark/function.png b/DSView/icons/dark/function.png
deleted file mode 100755
index 718edebb..00000000
Binary files a/DSView/icons/dark/function.png and /dev/null differ
diff --git a/DSView/icons/dark/function.svg b/DSView/icons/dark/function.svg
new file mode 100644
index 00000000..c567553e
--- /dev/null
+++ b/DSView/icons/dark/function.svg
@@ -0,0 +1,57 @@
+
+
+
+
diff --git a/DSView/icons/dark/gear.png b/DSView/icons/dark/gear.png
deleted file mode 100755
index 4a1883e2..00000000
Binary files a/DSView/icons/dark/gear.png and /dev/null differ
diff --git a/DSView/icons/dark/gear.svg b/DSView/icons/dark/gear.svg
new file mode 100644
index 00000000..1a824b6c
--- /dev/null
+++ b/DSView/icons/dark/gear.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/dark/hidden.png b/DSView/icons/dark/hidden.png
deleted file mode 100755
index 8d098807..00000000
Binary files a/DSView/icons/dark/hidden.png and /dev/null differ
diff --git a/DSView/icons/dark/hidden.svg b/DSView/icons/dark/hidden.svg
new file mode 100644
index 00000000..a6e85dfc
--- /dev/null
+++ b/DSView/icons/dark/hidden.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/DSView/icons/dark/instant.png b/DSView/icons/dark/instant.png
deleted file mode 100755
index c74c674c..00000000
Binary files a/DSView/icons/dark/instant.png and /dev/null differ
diff --git a/DSView/icons/dark/la.png b/DSView/icons/dark/la.png
deleted file mode 100755
index d77009bb..00000000
Binary files a/DSView/icons/dark/la.png and /dev/null differ
diff --git a/DSView/icons/dark/la.svg b/DSView/icons/dark/la.svg
new file mode 100644
index 00000000..b0048399
--- /dev/null
+++ b/DSView/icons/dark/la.svg
@@ -0,0 +1,101 @@
+
+
+
+
diff --git a/DSView/icons/dark/light.png b/DSView/icons/dark/light.png
deleted file mode 100755
index 23882479..00000000
Binary files a/DSView/icons/dark/light.png and /dev/null differ
diff --git a/DSView/icons/dark/light.svg b/DSView/icons/dark/light.svg
new file mode 100644
index 00000000..d8c7e7a5
--- /dev/null
+++ b/DSView/icons/dark/light.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/dark/lissajous.png b/DSView/icons/dark/lissajous.png
deleted file mode 100755
index 632a722d..00000000
Binary files a/DSView/icons/dark/lissajous.png and /dev/null differ
diff --git a/DSView/icons/dark/lissajous.svg b/DSView/icons/dark/lissajous.svg
new file mode 100644
index 00000000..0537d7f9
--- /dev/null
+++ b/DSView/icons/dark/lissajous.svg
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/DSView/icons/dark/logo_color.png b/DSView/icons/dark/logo_color.png
deleted file mode 100755
index 65ae5c6d..00000000
Binary files a/DSView/icons/dark/logo_color.png and /dev/null differ
diff --git a/DSView/icons/dark/logo_color.svg b/DSView/icons/dark/logo_color.svg
new file mode 100644
index 00000000..ce452598
--- /dev/null
+++ b/DSView/icons/dark/logo_color.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/DSView/icons/dark/logo_noColor.png b/DSView/icons/dark/logo_noColor.png
deleted file mode 100755
index 9ee4aad6..00000000
Binary files a/DSView/icons/dark/logo_noColor.png and /dev/null differ
diff --git a/DSView/icons/dark/logo_noColor.svg b/DSView/icons/dark/logo_noColor.svg
new file mode 100644
index 00000000..c41b8e01
--- /dev/null
+++ b/DSView/icons/dark/logo_noColor.svg
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/DSView/icons/dark/manual.png b/DSView/icons/dark/manual.png
deleted file mode 100755
index 2927f4b6..00000000
Binary files a/DSView/icons/dark/manual.png and /dev/null differ
diff --git a/DSView/icons/dark/manual.svg b/DSView/icons/dark/manual.svg
new file mode 100644
index 00000000..c2f2845d
--- /dev/null
+++ b/DSView/icons/dark/manual.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/dark/math.png b/DSView/icons/dark/math.png
deleted file mode 100755
index f84625f7..00000000
Binary files a/DSView/icons/dark/math.png and /dev/null differ
diff --git a/DSView/icons/dark/math.svg b/DSView/icons/dark/math.svg
new file mode 100644
index 00000000..96bed44b
--- /dev/null
+++ b/DSView/icons/dark/math.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/DSView/icons/dark/maximize.png b/DSView/icons/dark/maximize.png
deleted file mode 100755
index 51d6577a..00000000
Binary files a/DSView/icons/dark/maximize.png and /dev/null differ
diff --git a/DSView/icons/dark/maximize.svg b/DSView/icons/dark/maximize.svg
new file mode 100644
index 00000000..20bf230a
--- /dev/null
+++ b/DSView/icons/dark/maximize.svg
@@ -0,0 +1,30 @@
+
+
+
+
diff --git a/DSView/icons/dark/measure.png b/DSView/icons/dark/measure.png
deleted file mode 100755
index d0ce0421..00000000
Binary files a/DSView/icons/dark/measure.png and /dev/null differ
diff --git a/DSView/icons/dark/measure.svg b/DSView/icons/dark/measure.svg
new file mode 100644
index 00000000..88de304f
--- /dev/null
+++ b/DSView/icons/dark/measure.svg
@@ -0,0 +1,102 @@
+
+
+
+
diff --git a/DSView/icons/dark/minimize.png b/DSView/icons/dark/minimize.png
deleted file mode 100755
index 132ef21c..00000000
Binary files a/DSView/icons/dark/minimize.png and /dev/null differ
diff --git a/DSView/icons/dark/minimize.svg b/DSView/icons/dark/minimize.svg
new file mode 100644
index 00000000..2a4fa490
--- /dev/null
+++ b/DSView/icons/dark/minimize.svg
@@ -0,0 +1,28 @@
+
+
+
+
diff --git a/DSView/icons/dark/moder.png b/DSView/icons/dark/moder.png
deleted file mode 100755
index 0f13a3fc..00000000
Binary files a/DSView/icons/dark/moder.png and /dev/null differ
diff --git a/DSView/icons/dark/moder.svg b/DSView/icons/dark/moder.svg
new file mode 100644
index 00000000..55f888d9
--- /dev/null
+++ b/DSView/icons/dark/moder.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/DSView/icons/dark/modes.png b/DSView/icons/dark/modes.png
deleted file mode 100755
index fca07844..00000000
Binary files a/DSView/icons/dark/modes.png and /dev/null differ
diff --git a/DSView/icons/dark/modes.svg b/DSView/icons/dark/modes.svg
new file mode 100644
index 00000000..28072589
--- /dev/null
+++ b/DSView/icons/dark/modes.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/DSView/icons/dark/nav.png b/DSView/icons/dark/nav.png
deleted file mode 100755
index 03f1f605..00000000
Binary files a/DSView/icons/dark/nav.png and /dev/null differ
diff --git a/DSView/icons/dark/nav.svg b/DSView/icons/dark/nav.svg
new file mode 100644
index 00000000..632db17e
--- /dev/null
+++ b/DSView/icons/dark/nav.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/dark/next.png b/DSView/icons/dark/next.png
deleted file mode 100755
index d3efe6f2..00000000
Binary files a/DSView/icons/dark/next.png and /dev/null differ
diff --git a/DSView/icons/dark/next.svg b/DSView/icons/dark/next.svg
new file mode 100644
index 00000000..5b83ae36
--- /dev/null
+++ b/DSView/icons/dark/next.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/dark/oneloop.png b/DSView/icons/dark/oneloop.png
deleted file mode 100755
index 9a03ebb3..00000000
Binary files a/DSView/icons/dark/oneloop.png and /dev/null differ
diff --git a/DSView/icons/dark/oneloop.svg b/DSView/icons/dark/oneloop.svg
new file mode 100644
index 00000000..0852dd23
--- /dev/null
+++ b/DSView/icons/dark/oneloop.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/DSView/icons/dark/open.png b/DSView/icons/dark/open.png
deleted file mode 100755
index 5fde3ba2..00000000
Binary files a/DSView/icons/dark/open.png and /dev/null differ
diff --git a/DSView/icons/dark/open.svg b/DSView/icons/dark/open.svg
new file mode 100644
index 00000000..c91423c6
--- /dev/null
+++ b/DSView/icons/dark/open.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/dark/osc.png b/DSView/icons/dark/osc.png
deleted file mode 100755
index 233027f6..00000000
Binary files a/DSView/icons/dark/osc.png and /dev/null differ
diff --git a/DSView/icons/dark/osc.svg b/DSView/icons/dark/osc.svg
new file mode 100644
index 00000000..19e0aeec
--- /dev/null
+++ b/DSView/icons/dark/osc.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/DSView/icons/dark/params.png b/DSView/icons/dark/params.png
deleted file mode 100755
index e64cd54b..00000000
Binary files a/DSView/icons/dark/params.png and /dev/null differ
diff --git a/DSView/icons/dark/params.svg b/DSView/icons/dark/params.svg
new file mode 100644
index 00000000..cda624f9
--- /dev/null
+++ b/DSView/icons/dark/params.svg
@@ -0,0 +1,54 @@
+
+
+
+
diff --git a/DSView/icons/dark/pre.png b/DSView/icons/dark/pre.png
deleted file mode 100755
index ee773259..00000000
Binary files a/DSView/icons/dark/pre.png and /dev/null differ
diff --git a/DSView/icons/dark/pre.svg b/DSView/icons/dark/pre.svg
new file mode 100644
index 00000000..c3da86bd
--- /dev/null
+++ b/DSView/icons/dark/pre.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/dark/protocol.png b/DSView/icons/dark/protocol.png
deleted file mode 100755
index 75378de6..00000000
Binary files a/DSView/icons/dark/protocol.png and /dev/null differ
diff --git a/DSView/icons/dark/protocol.svg b/DSView/icons/dark/protocol.svg
new file mode 100644
index 00000000..86bb9254
--- /dev/null
+++ b/DSView/icons/dark/protocol.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/DSView/icons/dark/repeat.png b/DSView/icons/dark/repeat.png
deleted file mode 100755
index d68d4edb..00000000
Binary files a/DSView/icons/dark/repeat.png and /dev/null differ
diff --git a/DSView/icons/dark/repeat.svg b/DSView/icons/dark/repeat.svg
new file mode 100644
index 00000000..4b9d3822
--- /dev/null
+++ b/DSView/icons/dark/repeat.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/DSView/icons/dark/restore.png b/DSView/icons/dark/restore.png
deleted file mode 100755
index 2079882a..00000000
Binary files a/DSView/icons/dark/restore.png and /dev/null differ
diff --git a/DSView/icons/dark/restore.svg b/DSView/icons/dark/restore.svg
new file mode 100644
index 00000000..81dcd1e8
--- /dev/null
+++ b/DSView/icons/dark/restore.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/DSView/icons/dark/save.png b/DSView/icons/dark/save.png
deleted file mode 100755
index 2baec172..00000000
Binary files a/DSView/icons/dark/save.png and /dev/null differ
diff --git a/DSView/icons/dark/save.svg b/DSView/icons/dark/save.svg
new file mode 100644
index 00000000..1ce87eed
--- /dev/null
+++ b/DSView/icons/dark/save.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/dark/search-bar.png b/DSView/icons/dark/search-bar.png
deleted file mode 100755
index e3a3298f..00000000
Binary files a/DSView/icons/dark/search-bar.png and /dev/null differ
diff --git a/DSView/icons/dark/search-bar.svg b/DSView/icons/dark/search-bar.svg
new file mode 100644
index 00000000..8720572a
--- /dev/null
+++ b/DSView/icons/dark/search-bar.svg
@@ -0,0 +1,434 @@
+
+
+
+
diff --git a/DSView/icons/dark/search.png b/DSView/icons/dark/search.png
deleted file mode 100755
index 5a67758e..00000000
Binary files a/DSView/icons/dark/search.png and /dev/null differ
diff --git a/DSView/icons/dark/search.svg b/DSView/icons/dark/search.svg
new file mode 100644
index 00000000..c28629d4
--- /dev/null
+++ b/DSView/icons/dark/search.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/DSView/icons/dark/settings.svg b/DSView/icons/dark/settings.svg
new file mode 100644
index 00000000..aba28d06
--- /dev/null
+++ b/DSView/icons/dark/settings.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/dark/shown.png b/DSView/icons/dark/shown.png
deleted file mode 100755
index 25262044..00000000
Binary files a/DSView/icons/dark/shown.png and /dev/null differ
diff --git a/DSView/icons/dark/shown.svg b/DSView/icons/dark/shown.svg
new file mode 100644
index 00000000..3af567d1
--- /dev/null
+++ b/DSView/icons/dark/shown.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/DSView/icons/dark/single.png b/DSView/icons/dark/single.png
deleted file mode 100755
index 4c445698..00000000
Binary files a/DSView/icons/dark/single.png and /dev/null differ
diff --git a/DSView/icons/dark/single.svg b/DSView/icons/dark/single.svg
new file mode 100644
index 00000000..13de7771
--- /dev/null
+++ b/DSView/icons/dark/single.svg
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/DSView/icons/dark/square-daq.svg b/DSView/icons/dark/square-daq.svg
new file mode 100644
index 00000000..8c17d728
--- /dev/null
+++ b/DSView/icons/dark/square-daq.svg
@@ -0,0 +1,46 @@
+
+
+
+
diff --git a/DSView/icons/dark/square-la.svg b/DSView/icons/dark/square-la.svg
new file mode 100644
index 00000000..5e1f25b8
--- /dev/null
+++ b/DSView/icons/dark/square-la.svg
@@ -0,0 +1,104 @@
+
+
+
+
diff --git a/DSView/icons/dark/square-osc.svg b/DSView/icons/dark/square-osc.svg
new file mode 100644
index 00000000..977a267b
--- /dev/null
+++ b/DSView/icons/dark/square-osc.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/DSView/icons/dark/start.png b/DSView/icons/dark/start.png
deleted file mode 100755
index 47ccc895..00000000
Binary files a/DSView/icons/dark/start.png and /dev/null differ
diff --git a/DSView/icons/dark/start.svg b/DSView/icons/dark/start.svg
new file mode 100644
index 00000000..06314a5d
--- /dev/null
+++ b/DSView/icons/dark/start.svg
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/DSView/icons/dark/stop.png b/DSView/icons/dark/stop.png
deleted file mode 100755
index 1cc742ce..00000000
Binary files a/DSView/icons/dark/stop.png and /dev/null differ
diff --git a/DSView/icons/dark/stop.svg b/DSView/icons/dark/stop.svg
new file mode 100644
index 00000000..c080a42e
--- /dev/null
+++ b/DSView/icons/dark/stop.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/DSView/icons/dark/support.png b/DSView/icons/dark/support.png
deleted file mode 100755
index 2903d702..00000000
Binary files a/DSView/icons/dark/support.png and /dev/null differ
diff --git a/DSView/icons/dark/trigger.png b/DSView/icons/dark/trigger.png
deleted file mode 100755
index 9ccd6c0c..00000000
Binary files a/DSView/icons/dark/trigger.png and /dev/null differ
diff --git a/DSView/icons/dark/trigger.svg b/DSView/icons/dark/trigger.svg
new file mode 100644
index 00000000..bff422b2
--- /dev/null
+++ b/DSView/icons/dark/trigger.svg
@@ -0,0 +1,49 @@
+
+
+
+
diff --git a/DSView/icons/data.png b/DSView/icons/data.png
deleted file mode 100644
index 532fb4eb..00000000
Binary files a/DSView/icons/data.png and /dev/null differ
diff --git a/DSView/icons/data.svg b/DSView/icons/data.svg
new file mode 100644
index 00000000..d6fe2b31
--- /dev/null
+++ b/DSView/icons/data.svg
@@ -0,0 +1,38 @@
+
+
+
+
diff --git a/DSView/icons/demo.png b/DSView/icons/demo.png
deleted file mode 100644
index 76e49311..00000000
Binary files a/DSView/icons/demo.png and /dev/null differ
diff --git a/DSView/icons/demo.svg b/DSView/icons/demo.svg
new file mode 100644
index 00000000..5bbb39da
--- /dev/null
+++ b/DSView/icons/demo.svg
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/DSView/icons/dsl_logo.png b/DSView/icons/dsl_logo.png
deleted file mode 100755
index de041211..00000000
Binary files a/DSView/icons/dsl_logo.png and /dev/null differ
diff --git a/DSView/icons/dsl_logo.svg b/DSView/icons/dsl_logo.svg
new file mode 100644
index 00000000..fe5e1d63
--- /dev/null
+++ b/DSView/icons/dsl_logo.svg
@@ -0,0 +1,908 @@
+
+
+
+
diff --git a/DSView/icons/light/about.png b/DSView/icons/light/about.png
deleted file mode 100755
index e1810a34..00000000
Binary files a/DSView/icons/light/about.png and /dev/null differ
diff --git a/DSView/icons/light/about.svg b/DSView/icons/light/about.svg
new file mode 100644
index 00000000..1d1e11aa
--- /dev/null
+++ b/DSView/icons/light/about.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/DSView/icons/light/add.png b/DSView/icons/light/add.png
deleted file mode 100755
index fdb05911..00000000
Binary files a/DSView/icons/light/add.png and /dev/null differ
diff --git a/DSView/icons/light/add.svg b/DSView/icons/light/add.svg
new file mode 100644
index 00000000..3600d0f2
--- /dev/null
+++ b/DSView/icons/light/add.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/light/bug.png b/DSView/icons/light/bug.png
deleted file mode 100755
index 56b70a64..00000000
Binary files a/DSView/icons/light/bug.png and /dev/null differ
diff --git a/DSView/icons/light/bug.svg b/DSView/icons/light/bug.svg
new file mode 100644
index 00000000..c3f8510a
--- /dev/null
+++ b/DSView/icons/light/bug.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/light/capture.png b/DSView/icons/light/capture.png
deleted file mode 100755
index f581e561..00000000
Binary files a/DSView/icons/light/capture.png and /dev/null differ
diff --git a/DSView/icons/light/capture.svg b/DSView/icons/light/capture.svg
new file mode 100644
index 00000000..36788d6f
--- /dev/null
+++ b/DSView/icons/light/capture.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/light/close.png b/DSView/icons/light/close.png
deleted file mode 100755
index a3de9ec9..00000000
Binary files a/DSView/icons/light/close.png and /dev/null differ
diff --git a/DSView/icons/light/close.svg b/DSView/icons/light/close.svg
new file mode 100644
index 00000000..b56d298f
--- /dev/null
+++ b/DSView/icons/light/close.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/light/daq.png b/DSView/icons/light/daq.png
deleted file mode 100755
index ac80361f..00000000
Binary files a/DSView/icons/light/daq.png and /dev/null differ
diff --git a/DSView/icons/light/daq.svg b/DSView/icons/light/daq.svg
new file mode 100644
index 00000000..c65f8e44
--- /dev/null
+++ b/DSView/icons/light/daq.svg
@@ -0,0 +1,46 @@
+
+
+
+
diff --git a/DSView/icons/light/dark.png b/DSView/icons/light/dark.png
deleted file mode 100755
index 889cac2b..00000000
Binary files a/DSView/icons/light/dark.png and /dev/null differ
diff --git a/DSView/icons/light/dark.svg b/DSView/icons/light/dark.svg
new file mode 100644
index 00000000..23618c8e
--- /dev/null
+++ b/DSView/icons/light/dark.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/DSView/icons/light/del.png b/DSView/icons/light/del.png
deleted file mode 100755
index d361cfe3..00000000
Binary files a/DSView/icons/light/del.png and /dev/null differ
diff --git a/DSView/icons/light/del.svg b/DSView/icons/light/del.svg
new file mode 100644
index 00000000..09bd4b20
--- /dev/null
+++ b/DSView/icons/light/del.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/light/display.png b/DSView/icons/light/display.png
deleted file mode 100755
index 966d0e5a..00000000
Binary files a/DSView/icons/light/display.png and /dev/null differ
diff --git a/DSView/icons/light/display.svg b/DSView/icons/light/display.svg
new file mode 100644
index 00000000..d57793d4
--- /dev/null
+++ b/DSView/icons/light/display.svg
@@ -0,0 +1,43 @@
+
+
+
+
diff --git a/DSView/icons/light/down-arrow.png b/DSView/icons/light/down-arrow.png
deleted file mode 100755
index d1b987ef..00000000
Binary files a/DSView/icons/light/down-arrow.png and /dev/null differ
diff --git a/DSView/icons/light/export.png b/DSView/icons/light/export.png
deleted file mode 100755
index 02b23760..00000000
Binary files a/DSView/icons/light/export.png and /dev/null differ
diff --git a/DSView/icons/light/export.svg b/DSView/icons/light/export.svg
new file mode 100644
index 00000000..980c9c8c
--- /dev/null
+++ b/DSView/icons/light/export.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/DSView/icons/light/fft.png b/DSView/icons/light/fft.png
deleted file mode 100755
index cc26ab49..00000000
Binary files a/DSView/icons/light/fft.png and /dev/null differ
diff --git a/DSView/icons/light/fft.svg b/DSView/icons/light/fft.svg
new file mode 100644
index 00000000..1886eba7
--- /dev/null
+++ b/DSView/icons/light/fft.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/DSView/icons/light/file.png b/DSView/icons/light/file.png
deleted file mode 100755
index 4dfc6ae9..00000000
Binary files a/DSView/icons/light/file.png and /dev/null differ
diff --git a/DSView/icons/light/file.svg b/DSView/icons/light/file.svg
new file mode 100644
index 00000000..f7dbec7d
--- /dev/null
+++ b/DSView/icons/light/file.svg
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/DSView/icons/light/function.png b/DSView/icons/light/function.png
deleted file mode 100755
index 90921019..00000000
Binary files a/DSView/icons/light/function.png and /dev/null differ
diff --git a/DSView/icons/light/function.svg b/DSView/icons/light/function.svg
new file mode 100644
index 00000000..69573488
--- /dev/null
+++ b/DSView/icons/light/function.svg
@@ -0,0 +1,57 @@
+
+
+
+
diff --git a/DSView/icons/light/gear.png b/DSView/icons/light/gear.png
deleted file mode 100755
index 794195c6..00000000
Binary files a/DSView/icons/light/gear.png and /dev/null differ
diff --git a/DSView/icons/light/gear.svg b/DSView/icons/light/gear.svg
new file mode 100644
index 00000000..66adff70
--- /dev/null
+++ b/DSView/icons/light/gear.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/light/hidden.png b/DSView/icons/light/hidden.png
deleted file mode 100755
index 427eaa41..00000000
Binary files a/DSView/icons/light/hidden.png and /dev/null differ
diff --git a/DSView/icons/light/hidden.svg b/DSView/icons/light/hidden.svg
new file mode 100644
index 00000000..a08f66ac
--- /dev/null
+++ b/DSView/icons/light/hidden.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/DSView/icons/light/instant.png b/DSView/icons/light/instant.png
deleted file mode 100755
index 8acd5871..00000000
Binary files a/DSView/icons/light/instant.png and /dev/null differ
diff --git a/DSView/icons/light/la.png b/DSView/icons/light/la.png
deleted file mode 100755
index 25a361aa..00000000
Binary files a/DSView/icons/light/la.png and /dev/null differ
diff --git a/DSView/icons/light/la.svg b/DSView/icons/light/la.svg
new file mode 100644
index 00000000..3c7ce32e
--- /dev/null
+++ b/DSView/icons/light/la.svg
@@ -0,0 +1,101 @@
+
+
+
+
diff --git a/DSView/icons/light/light.png b/DSView/icons/light/light.png
deleted file mode 100755
index ab90576c..00000000
Binary files a/DSView/icons/light/light.png and /dev/null differ
diff --git a/DSView/icons/light/light.svg b/DSView/icons/light/light.svg
new file mode 100644
index 00000000..6c24ca46
--- /dev/null
+++ b/DSView/icons/light/light.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/light/lissajous.png b/DSView/icons/light/lissajous.png
deleted file mode 100755
index 868be40a..00000000
Binary files a/DSView/icons/light/lissajous.png and /dev/null differ
diff --git a/DSView/icons/light/lissajous.svg b/DSView/icons/light/lissajous.svg
new file mode 100644
index 00000000..36726a6a
--- /dev/null
+++ b/DSView/icons/light/lissajous.svg
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/DSView/icons/light/logo_color.png b/DSView/icons/light/logo_color.png
deleted file mode 100755
index 65ae5c6d..00000000
Binary files a/DSView/icons/light/logo_color.png and /dev/null differ
diff --git a/DSView/icons/light/logo_color.svg b/DSView/icons/light/logo_color.svg
new file mode 100644
index 00000000..ce452598
--- /dev/null
+++ b/DSView/icons/light/logo_color.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/DSView/icons/light/logo_noColor.png b/DSView/icons/light/logo_noColor.png
deleted file mode 100755
index 3a39b2e8..00000000
Binary files a/DSView/icons/light/logo_noColor.png and /dev/null differ
diff --git a/DSView/icons/light/logo_noColor.svg b/DSView/icons/light/logo_noColor.svg
new file mode 100644
index 00000000..10541b6f
--- /dev/null
+++ b/DSView/icons/light/logo_noColor.svg
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/DSView/icons/light/manual.png b/DSView/icons/light/manual.png
deleted file mode 100755
index b0b6a71f..00000000
Binary files a/DSView/icons/light/manual.png and /dev/null differ
diff --git a/DSView/icons/light/manual.svg b/DSView/icons/light/manual.svg
new file mode 100644
index 00000000..6dbffa7a
--- /dev/null
+++ b/DSView/icons/light/manual.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/light/math.png b/DSView/icons/light/math.png
deleted file mode 100755
index 39168f0d..00000000
Binary files a/DSView/icons/light/math.png and /dev/null differ
diff --git a/DSView/icons/light/math.svg b/DSView/icons/light/math.svg
new file mode 100644
index 00000000..7186b127
--- /dev/null
+++ b/DSView/icons/light/math.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/DSView/icons/light/maximize.png b/DSView/icons/light/maximize.png
deleted file mode 100755
index 08d93853..00000000
Binary files a/DSView/icons/light/maximize.png and /dev/null differ
diff --git a/DSView/icons/light/maximize.svg b/DSView/icons/light/maximize.svg
new file mode 100644
index 00000000..1be7114e
--- /dev/null
+++ b/DSView/icons/light/maximize.svg
@@ -0,0 +1,30 @@
+
+
+
+
diff --git a/DSView/icons/light/measure.png b/DSView/icons/light/measure.png
deleted file mode 100755
index 41c711e7..00000000
Binary files a/DSView/icons/light/measure.png and /dev/null differ
diff --git a/DSView/icons/light/measure.svg b/DSView/icons/light/measure.svg
new file mode 100644
index 00000000..4e20f222
--- /dev/null
+++ b/DSView/icons/light/measure.svg
@@ -0,0 +1,102 @@
+
+
+
+
diff --git a/DSView/icons/light/minimize.png b/DSView/icons/light/minimize.png
deleted file mode 100755
index e4be4c91..00000000
Binary files a/DSView/icons/light/minimize.png and /dev/null differ
diff --git a/DSView/icons/light/minimize.svg b/DSView/icons/light/minimize.svg
new file mode 100644
index 00000000..0cd8ebde
--- /dev/null
+++ b/DSView/icons/light/minimize.svg
@@ -0,0 +1,28 @@
+
+
+
+
diff --git a/DSView/icons/light/moder.png b/DSView/icons/light/moder.png
deleted file mode 100755
index 09e01af2..00000000
Binary files a/DSView/icons/light/moder.png and /dev/null differ
diff --git a/DSView/icons/light/moder.svg b/DSView/icons/light/moder.svg
new file mode 100644
index 00000000..f0b51f9f
--- /dev/null
+++ b/DSView/icons/light/moder.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/DSView/icons/light/modes.png b/DSView/icons/light/modes.png
deleted file mode 100755
index 62a348b0..00000000
Binary files a/DSView/icons/light/modes.png and /dev/null differ
diff --git a/DSView/icons/light/modes.svg b/DSView/icons/light/modes.svg
new file mode 100644
index 00000000..fcf3d137
--- /dev/null
+++ b/DSView/icons/light/modes.svg
@@ -0,0 +1,53 @@
+
+
+
+
diff --git a/DSView/icons/light/nav.png b/DSView/icons/light/nav.png
deleted file mode 100755
index 1f573672..00000000
Binary files a/DSView/icons/light/nav.png and /dev/null differ
diff --git a/DSView/icons/light/nav.svg b/DSView/icons/light/nav.svg
new file mode 100644
index 00000000..e7889bbc
--- /dev/null
+++ b/DSView/icons/light/nav.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/light/next.png b/DSView/icons/light/next.png
deleted file mode 100755
index ebec6e15..00000000
Binary files a/DSView/icons/light/next.png and /dev/null differ
diff --git a/DSView/icons/light/next.svg b/DSView/icons/light/next.svg
new file mode 100644
index 00000000..2626cefc
--- /dev/null
+++ b/DSView/icons/light/next.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/light/oneloop.png b/DSView/icons/light/oneloop.png
deleted file mode 100755
index 4eee0d71..00000000
Binary files a/DSView/icons/light/oneloop.png and /dev/null differ
diff --git a/DSView/icons/light/oneloop.svg b/DSView/icons/light/oneloop.svg
new file mode 100644
index 00000000..35fd0a67
--- /dev/null
+++ b/DSView/icons/light/oneloop.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/DSView/icons/light/open.png b/DSView/icons/light/open.png
deleted file mode 100755
index 38cd27cb..00000000
Binary files a/DSView/icons/light/open.png and /dev/null differ
diff --git a/DSView/icons/light/open.svg b/DSView/icons/light/open.svg
new file mode 100644
index 00000000..29d55da9
--- /dev/null
+++ b/DSView/icons/light/open.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/light/osc.png b/DSView/icons/light/osc.png
deleted file mode 100755
index 2811d95d..00000000
Binary files a/DSView/icons/light/osc.png and /dev/null differ
diff --git a/DSView/icons/light/osc.svg b/DSView/icons/light/osc.svg
new file mode 100644
index 00000000..7268ff56
--- /dev/null
+++ b/DSView/icons/light/osc.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/DSView/icons/light/params.png b/DSView/icons/light/params.png
deleted file mode 100755
index 6531faa9..00000000
Binary files a/DSView/icons/light/params.png and /dev/null differ
diff --git a/DSView/icons/light/params.svg b/DSView/icons/light/params.svg
new file mode 100644
index 00000000..e16b4b00
--- /dev/null
+++ b/DSView/icons/light/params.svg
@@ -0,0 +1,54 @@
+
+
+
+
diff --git a/DSView/icons/light/pre.png b/DSView/icons/light/pre.png
deleted file mode 100755
index 600842db..00000000
Binary files a/DSView/icons/light/pre.png and /dev/null differ
diff --git a/DSView/icons/light/pre.svg b/DSView/icons/light/pre.svg
new file mode 100644
index 00000000..d789b481
--- /dev/null
+++ b/DSView/icons/light/pre.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/light/protocol.png b/DSView/icons/light/protocol.png
deleted file mode 100755
index a726aab6..00000000
Binary files a/DSView/icons/light/protocol.png and /dev/null differ
diff --git a/DSView/icons/light/protocol.svg b/DSView/icons/light/protocol.svg
new file mode 100644
index 00000000..fdfeae43
--- /dev/null
+++ b/DSView/icons/light/protocol.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/DSView/icons/light/repeat.png b/DSView/icons/light/repeat.png
deleted file mode 100755
index 2a582656..00000000
Binary files a/DSView/icons/light/repeat.png and /dev/null differ
diff --git a/DSView/icons/light/repeat.svg b/DSView/icons/light/repeat.svg
new file mode 100644
index 00000000..a29f1b02
--- /dev/null
+++ b/DSView/icons/light/repeat.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/DSView/icons/light/restore.png b/DSView/icons/light/restore.png
deleted file mode 100755
index adc7957a..00000000
Binary files a/DSView/icons/light/restore.png and /dev/null differ
diff --git a/DSView/icons/light/restore.svg b/DSView/icons/light/restore.svg
new file mode 100644
index 00000000..f74366a5
--- /dev/null
+++ b/DSView/icons/light/restore.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/DSView/icons/light/save.png b/DSView/icons/light/save.png
deleted file mode 100755
index 60804f4c..00000000
Binary files a/DSView/icons/light/save.png and /dev/null differ
diff --git a/DSView/icons/light/save.svg b/DSView/icons/light/save.svg
new file mode 100644
index 00000000..71090157
--- /dev/null
+++ b/DSView/icons/light/save.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/DSView/icons/light/search-bar.png b/DSView/icons/light/search-bar.png
deleted file mode 100755
index 5f85363c..00000000
Binary files a/DSView/icons/light/search-bar.png and /dev/null differ
diff --git a/DSView/icons/light/search-bar.svg b/DSView/icons/light/search-bar.svg
new file mode 100644
index 00000000..7cb95171
--- /dev/null
+++ b/DSView/icons/light/search-bar.svg
@@ -0,0 +1,434 @@
+
+
+
+
diff --git a/DSView/icons/light/search.png b/DSView/icons/light/search.png
deleted file mode 100755
index 5a67758e..00000000
Binary files a/DSView/icons/light/search.png and /dev/null differ
diff --git a/DSView/icons/light/search.svg b/DSView/icons/light/search.svg
new file mode 100644
index 00000000..79126ce1
--- /dev/null
+++ b/DSView/icons/light/search.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/DSView/icons/light/settings.svg b/DSView/icons/light/settings.svg
new file mode 100644
index 00000000..9f880ed6
--- /dev/null
+++ b/DSView/icons/light/settings.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/DSView/icons/light/shown.png b/DSView/icons/light/shown.png
deleted file mode 100755
index cab7c021..00000000
Binary files a/DSView/icons/light/shown.png and /dev/null differ
diff --git a/DSView/icons/light/shown.svg b/DSView/icons/light/shown.svg
new file mode 100644
index 00000000..27fa4f68
--- /dev/null
+++ b/DSView/icons/light/shown.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/DSView/icons/light/single.png b/DSView/icons/light/single.png
deleted file mode 100755
index 48862af4..00000000
Binary files a/DSView/icons/light/single.png and /dev/null differ
diff --git a/DSView/icons/light/single.svg b/DSView/icons/light/single.svg
new file mode 100644
index 00000000..a67c9f27
--- /dev/null
+++ b/DSView/icons/light/single.svg
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/DSView/icons/light/square-daq.svg b/DSView/icons/light/square-daq.svg
new file mode 100644
index 00000000..9509ea9f
--- /dev/null
+++ b/DSView/icons/light/square-daq.svg
@@ -0,0 +1,46 @@
+
+
+
+
diff --git a/DSView/icons/light/square-la.svg b/DSView/icons/light/square-la.svg
new file mode 100644
index 00000000..5376bd20
--- /dev/null
+++ b/DSView/icons/light/square-la.svg
@@ -0,0 +1,104 @@
+
+
+
+
diff --git a/DSView/icons/light/square-osc.svg b/DSView/icons/light/square-osc.svg
new file mode 100644
index 00000000..d23ab0ff
--- /dev/null
+++ b/DSView/icons/light/square-osc.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/DSView/icons/light/start.png b/DSView/icons/light/start.png
deleted file mode 100755
index 47ccc895..00000000
Binary files a/DSView/icons/light/start.png and /dev/null differ
diff --git a/DSView/icons/light/start.svg b/DSView/icons/light/start.svg
new file mode 100644
index 00000000..06314a5d
--- /dev/null
+++ b/DSView/icons/light/start.svg
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/DSView/icons/light/stop.png b/DSView/icons/light/stop.png
deleted file mode 100755
index 1cc742ce..00000000
Binary files a/DSView/icons/light/stop.png and /dev/null differ
diff --git a/DSView/icons/light/stop.svg b/DSView/icons/light/stop.svg
new file mode 100644
index 00000000..c080a42e
--- /dev/null
+++ b/DSView/icons/light/stop.svg
@@ -0,0 +1,36 @@
+
+
+
+
diff --git a/DSView/icons/light/support.png b/DSView/icons/light/support.png
deleted file mode 100755
index 0c8abcb5..00000000
Binary files a/DSView/icons/light/support.png and /dev/null differ
diff --git a/DSView/icons/light/trigger.png b/DSView/icons/light/trigger.png
deleted file mode 100755
index 83c1d187..00000000
Binary files a/DSView/icons/light/trigger.png and /dev/null differ
diff --git a/DSView/icons/light/trigger.svg b/DSView/icons/light/trigger.svg
new file mode 100644
index 00000000..e1d5aee0
--- /dev/null
+++ b/DSView/icons/light/trigger.svg
@@ -0,0 +1,49 @@
+
+
+
+
diff --git a/DSView/icons/lissajous.png b/DSView/icons/lissajous.png
deleted file mode 100755
index f767b6b6..00000000
Binary files a/DSView/icons/lissajous.png and /dev/null differ
diff --git a/DSView/icons/lissajous.svg b/DSView/icons/lissajous.svg
new file mode 100644
index 00000000..cbef53d7
--- /dev/null
+++ b/DSView/icons/lissajous.svg
@@ -0,0 +1,46 @@
+
+
+
+
diff --git a/DSView/icons/logo.png b/DSView/icons/logo.png
deleted file mode 100755
index ca65932d..00000000
Binary files a/DSView/icons/logo.png and /dev/null differ
diff --git a/DSView/icons/logo.svg b/DSView/icons/logo.svg
new file mode 100644
index 00000000..91e81c92
--- /dev/null
+++ b/DSView/icons/logo.svg
@@ -0,0 +1,357 @@
+
+
+
+
diff --git a/DSView/icons/math.png b/DSView/icons/math.png
deleted file mode 100755
index a468dc6a..00000000
Binary files a/DSView/icons/math.png and /dev/null differ
diff --git a/DSView/icons/math.svg b/DSView/icons/math.svg
new file mode 100644
index 00000000..daa7e7b4
--- /dev/null
+++ b/DSView/icons/math.svg
@@ -0,0 +1,66 @@
+
+
+
+
diff --git a/DSView/icons/search.png b/DSView/icons/search.png
deleted file mode 100755
index 5a67758e..00000000
Binary files a/DSView/icons/search.png and /dev/null differ
diff --git a/DSView/icons/usb2.png b/DSView/icons/usb2.png
deleted file mode 100644
index d0b70598..00000000
Binary files a/DSView/icons/usb2.png and /dev/null differ
diff --git a/DSView/icons/usb2.svg b/DSView/icons/usb2.svg
new file mode 100644
index 00000000..f893cd37
--- /dev/null
+++ b/DSView/icons/usb2.svg
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/DSView/icons/usb3.png b/DSView/icons/usb3.png
deleted file mode 100644
index 3a2b1d1a..00000000
Binary files a/DSView/icons/usb3.png and /dev/null differ
diff --git a/DSView/icons/usb3.svg b/DSView/icons/usb3.svg
new file mode 100644
index 00000000..8b9d43ad
--- /dev/null
+++ b/DSView/icons/usb3.svg
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/DSView/main.cpp b/DSView/main.cpp
index 7350d34f..8487f1e6 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -35,8 +35,10 @@
#include
#include
#include
+#include
#include "dsapplication.h"
+#include "mystyle.h"
#include "pv/devicemanager.h"
#include "pv/mainframe.h"
@@ -63,9 +65,13 @@ int main(int argc, char *argv[])
struct sr_context *sr_ctx = NULL;
const char *open_file = NULL;
- QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
- QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ #if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ #endif // QT_VERSION
+
QApplication a(argc, argv);
+ a.setStyle(new MyStyle);
// Set some application metadata
QApplication::setApplicationVersion(DS_VERSION_STRING);
diff --git a/DSView/mystyle.h b/DSView/mystyle.h
new file mode 100644
index 00000000..c53bda52
--- /dev/null
+++ b/DSView/mystyle.h
@@ -0,0 +1,19 @@
+#ifndef MYSTYLE_H
+#define MYSTYLE_H
+
+#include
+
+class MyStyle : public QProxyStyle
+{
+ Q_OBJECT
+ public:
+ int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, const QWidget * widget = 0 ) const {
+ int s = QProxyStyle::pixelMetric(metric, option, widget);
+ if (metric == QStyle::PM_SmallIconSize) {
+ s = 24;
+ }
+ return s;
+ }
+};
+
+#endif // MYSTYLE_H
diff --git a/DSView/pv/dialogs/about.cpp b/DSView/pv/dialogs/about.cpp
index 836de5aa..ef9079b5 100755
--- a/DSView/pv/dialogs/about.cpp
+++ b/DSView/pv/dialogs/about.cpp
@@ -93,7 +93,7 @@ About::About(QWidget *parent) :
}
}
- QPixmap pix(":/icons/dsl_logo.png");
+ QPixmap pix(":/icons/dsl_logo.svg");
QImage logo = pix.toImage();
QTextBrowser *about = new QTextBrowser(this);
diff --git a/DSView/pv/dialogs/calibration.cpp b/DSView/pv/dialogs/calibration.cpp
index 36298622..37f25ab6 100755
--- a/DSView/pv/dialogs/calibration.cpp
+++ b/DSView/pv/dialogs/calibration.cpp
@@ -270,7 +270,7 @@ void Calibration::on_save()
tr("Cancel"),0,0,this,flags);
dlg.setWindowModality(Qt::WindowModal);
dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
dlg.setCancelButton(NULL);
QFutureWatcher watcher;
@@ -297,7 +297,7 @@ void Calibration::on_abort()
tr("Cancel"),0,0,this,flags);
dlg.setWindowModality(Qt::WindowModal);
dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
dlg.setCancelButton(NULL);
QFutureWatcher watcher;
diff --git a/DSView/pv/dialogs/dsdialog.cpp b/DSView/pv/dialogs/dsdialog.cpp
index 359a4971..a387979e 100755
--- a/DSView/pv/dialogs/dsdialog.cpp
+++ b/DSView/pv/dialogs/dsdialog.cpp
@@ -36,7 +36,7 @@ DSDialog::DSDialog(QWidget *parent, bool hasClose) :
QDialog(parent),
_moving(false)
{
- setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
+ setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
setAttribute(Qt::WA_TranslucentBackground);
build_main(hasClose);
diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp
index 70445d7e..793c2b00 100755
--- a/DSView/pv/dialogs/dsmessagebox.cpp
+++ b/DSView/pv/dialogs/dsmessagebox.cpp
@@ -50,7 +50,7 @@ DSMessageBox::DSMessageBox(QWidget *parent) :
_main->setGraphicsEffect(bodyShadow);
_msg = new QMessageBox(this);
- _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
+ _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
_titlebar = new toolbars::TitleBar(false, this);
_titlebar->setTitle(tr("Message"));
diff --git a/DSView/pv/dialogs/lissajousoptions.cpp b/DSView/pv/dialogs/lissajousoptions.cpp
index 96dc4567..5f502f81 100755
--- a/DSView/pv/dialogs/lissajousoptions.cpp
+++ b/DSView/pv/dialogs/lissajousoptions.cpp
@@ -51,7 +51,7 @@ LissajousOptions::LissajousOptions(SigSession &session, QWidget *parent) :
_enable = new QCheckBox(this);
QLabel *lisa_label = new QLabel(this);
- lisa_label->setPixmap(QPixmap(":/icons/lissajous.png"));
+ lisa_label->setPixmap(QPixmap(":/icons/lissajous.svg"));
_percent = new QSlider(Qt::Horizontal, this);
_percent->setRange(100, 100);
diff --git a/DSView/pv/dialogs/mathoptions.cpp b/DSView/pv/dialogs/mathoptions.cpp
index f41b9e26..99169c7a 100755
--- a/DSView/pv/dialogs/mathoptions.cpp
+++ b/DSView/pv/dialogs/mathoptions.cpp
@@ -52,7 +52,7 @@ MathOptions::MathOptions(SigSession &session, QWidget *parent) :
_enable = new QCheckBox(this);
QLabel *lisa_label = new QLabel(this);
- lisa_label->setPixmap(QPixmap(":/icons/math.png"));
+ lisa_label->setPixmap(QPixmap(":/icons/math.svg"));
_math_group = new QGroupBox(this);
QHBoxLayout *type_layout = new QHBoxLayout();
diff --git a/DSView/pv/dialogs/protocolexp.cpp b/DSView/pv/dialogs/protocolexp.cpp
index 8c42a24e..da5f222d 100755
--- a/DSView/pv/dialogs/protocolexp.cpp
+++ b/DSView/pv/dialogs/protocolexp.cpp
@@ -200,7 +200,7 @@ void ProtocolExp::accept()
tr("Cancel"),0,100,this,flags);
dlg.setWindowModality(Qt::WindowModal);
dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
QFutureWatcher watcher;
connect(&watcher,SIGNAL(finished()),&dlg,SLOT(cancel()));
diff --git a/DSView/pv/dialogs/waitingdialog.cpp b/DSView/pv/dialogs/waitingdialog.cpp
index f4144ec5..cdceef07 100755
--- a/DSView/pv/dialogs/waitingdialog.cpp
+++ b/DSView/pv/dialogs/waitingdialog.cpp
@@ -108,7 +108,7 @@ void WaitingDialog::accept()
tr("Cancel"),0,0,this,flags);
dlg.setWindowModality(Qt::WindowModal);
dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
dlg.setCancelButton(NULL);
QFutureWatcher watcher;
@@ -137,7 +137,7 @@ void WaitingDialog::reject()
tr("Cancel"),0,0,this,flags);
dlg.setWindowModality(Qt::WindowModal);
dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
dlg.setCancelButton(NULL);
QFutureWatcher watcher;
diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp
index 53284d74..f8c8acfe 100755
--- a/DSView/pv/dock/measuredock.cpp
+++ b/DSView/pv/dock/measuredock.cpp
@@ -61,10 +61,10 @@ MeasureDock::MeasureDock(QWidget *parent, View &view, SigSession &session) :
_mouse_groupBox = new QGroupBox(_widget);
_fen_checkBox = new QCheckBox(_widget);
_fen_checkBox->setChecked(true);
- _width_label = new QLabel("#####", _widget);
- _period_label = new QLabel("#####", _widget);
- _freq_label = new QLabel("#####", _widget);
- _duty_label = new QLabel("#####", _widget);
+ _width_label = new QLabel(_widget);
+ _period_label = new QLabel(_widget);
+ _freq_label = new QLabel(_widget);
+ _duty_label = new QLabel(_widget);
_w_label = new QLabel(_widget);
_p_label = new QLabel(_widget);
@@ -185,15 +185,15 @@ void MeasureDock::reStyle()
{
QString iconPath = ":/icons/" + qApp->property("Style").toString();
- _dist_add_btn->setIcon(QIcon(iconPath+"/add.png"));
- _edge_add_btn->setIcon(QIcon(iconPath+"/add.png"));
+ _dist_add_btn->setIcon(QIcon(iconPath+"/add.svg"));
+ _edge_add_btn->setIcon(QIcon(iconPath+"/add.svg"));
for (QVector ::const_iterator i = _dist_del_btn_vec.begin();
i != _dist_del_btn_vec.end(); i++)
- (*i)->setIcon(QIcon(iconPath+"/del.png"));
+ (*i)->setIcon(QIcon(iconPath+"/del.svg"));
for (QVector ::const_iterator i = _edge_del_btn_vec.begin();
i != _edge_del_btn_vec.end(); i++)
- (*i)->setIcon(QIcon(iconPath+"/del.png"));
+ (*i)->setIcon(QIcon(iconPath+"/del.svg"));
}
void MeasureDock::paintEvent(QPaintEvent *)
@@ -253,7 +253,7 @@ void MeasureDock::cursor_update()
QString curCursor = QString::number(index);
QToolButton *del_btn = new QToolButton(_widget);
- del_btn->setIcon(QIcon(iconPath+"/del.png"));
+ del_btn->setIcon(QIcon(iconPath+"/del.svg"));
del_btn->setCheckable(true);
QPushButton *_cursor_pushButton = new QPushButton(curCursor, _widget);
set_cursor_btn_color(_cursor_pushButton);
@@ -338,7 +338,7 @@ void MeasureDock::add_dist_measure()
QString iconPath = ":/icons/" + qApp->property("Style").toString();
QToolButton *del_btn = new QToolButton(row_widget);
- del_btn->setIcon(QIcon(iconPath+"/del.png"));
+ del_btn->setIcon(QIcon(iconPath+"/del.svg"));
del_btn->setCheckable(true);
QPushButton *s_btn = new QPushButton(tr(" "), row_widget);
s_btn->setObjectName("dist");
@@ -404,7 +404,7 @@ void MeasureDock::add_edge_measure()
QString iconPath = ":/icons/" + qApp->property("Style").toString();
QToolButton *del_btn = new QToolButton(row_widget);
- del_btn->setIcon(QIcon(iconPath+"/del.png"));
+ del_btn->setIcon(QIcon(iconPath+"/del.svg"));
del_btn->setCheckable(true);
QPushButton *s_btn = new QPushButton(tr(" "), row_widget);
s_btn->setObjectName("edge");
@@ -480,7 +480,7 @@ void MeasureDock::show_all_coursor()
QDialog cursor_dlg(_widget);
cursor_dlg.setWindowFlags(Qt::FramelessWindowHint | Qt::Popup | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
int index = 0;
QGridLayout *glayout = new QGridLayout(&cursor_dlg);
diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp
index 93ed2add..2559aeec 100755
--- a/DSView/pv/dock/protocoldock.cpp
+++ b/DSView/pv/dock/protocoldock.cpp
@@ -228,22 +228,22 @@ void ProtocolDock::reStyle()
{
QString iconPath = ":/icons/" + qApp->property("Style").toString();
- _add_button->setIcon(QIcon(iconPath+"/add.png"));
- _del_all_button->setIcon(QIcon(iconPath+"/del.png"));
- _dn_set_button->setIcon(QIcon(iconPath+"/gear.png"));
- _dn_save_button->setIcon(QIcon(iconPath+"/save.png"));
- _dn_nav_button->setIcon(QIcon(iconPath+"/nav.png"));
- _pre_button->setIcon(QIcon(iconPath+"/pre.png"));
- _nxt_button->setIcon(QIcon(iconPath+"/next.png"));
- _search_button->setIcon(QIcon(iconPath+"/search.png"));
+ _add_button->setIcon(QIcon(iconPath+"/add.svg"));
+ _del_all_button->setIcon(QIcon(iconPath+"/del.svg"));
+ _dn_set_button->setIcon(QIcon(iconPath+"/gear.svg"));
+ _dn_save_button->setIcon(QIcon(iconPath+"/save.svg"));
+ _dn_nav_button->setIcon(QIcon(iconPath+"/nav.svg"));
+ _pre_button->setIcon(QIcon(iconPath+"/pre.svg"));
+ _nxt_button->setIcon(QIcon(iconPath+"/next.svg"));
+ _search_button->setIcon(QIcon(iconPath+"/search.svg"));
for (QVector ::const_iterator i = _del_button_list.begin();
i != _del_button_list.end(); i++)
- (*i)->setIcon(QIcon(iconPath+"/del.png"));
+ (*i)->setIcon(QIcon(iconPath+"/del.svg"));
for (QVector ::const_iterator i = _set_button_list.begin();
i != _set_button_list.end(); i++)
- (*i)->setIcon(QIcon(iconPath+"/gear.png"));
+ (*i)->setIcon(QIcon(iconPath+"/gear.svg"));
}
void ProtocolDock::paintEvent(QPaintEvent *)
@@ -324,9 +324,9 @@ void ProtocolDock::add_protocol(bool silent)
QPushButton *_del_button = new QPushButton(_up_widget);
QPushButton *_set_button = new QPushButton(_up_widget);
_del_button->setFlat(true);
- _del_button->setIcon(QIcon(iconPath+"/del.png"));
+ _del_button->setIcon(QIcon(iconPath+"/del.svg"));
_set_button->setFlat(true);
- _set_button->setIcon(QIcon(iconPath+"/gear.png"));
+ _set_button->setIcon(QIcon(iconPath+"/gear.svg"));
QLabel *_protocol_label = new QLabel(_up_widget);
QLabel *_progress_label = new QLabel(_up_widget);
@@ -821,7 +821,7 @@ void ProtocolDock::search_update()
tr("Cancel"),0,0,this,flags);
dlg.setWindowModality(Qt::WindowModal);
dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
dlg.setCancelButton(NULL);
QFutureWatcher watcher;
diff --git a/DSView/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp
index 60c0f594..bf2159f9 100755
--- a/DSView/pv/dock/searchdock.cpp
+++ b/DSView/pv/dock/searchdock.cpp
@@ -111,9 +111,9 @@ void SearchDock::reStyle()
{
QString iconPath = ":/icons/" + qApp->property("Style").toString();
- _pre_button.setIcon(QIcon(iconPath+"/pre.png"));
- _nxt_button.setIcon(QIcon(iconPath+"/next.png"));
- _search_button->setIcon(QIcon(iconPath+"/search.png"));
+ _pre_button.setIcon(QIcon(iconPath+"/pre.svg"));
+ _nxt_button.setIcon(QIcon(iconPath+"/next.svg"));
+ _search_button->setIcon(QIcon(iconPath+"/search.svg"));
}
void SearchDock::paintEvent(QPaintEvent *)
@@ -165,7 +165,7 @@ void SearchDock::on_previous()
tr("Cancel"),0,0,this,flags);
dlg.setWindowModality(Qt::WindowModal);
dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
dlg.setCancelButton(NULL);
QFutureWatcher watcher;
@@ -225,7 +225,7 @@ void SearchDock::on_next()
tr("Cancel"),0,0,this,flags);
dlg.setWindowModality(Qt::WindowModal);
dlg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
- Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
+ Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowMinMaxButtonsHint);
dlg.setCancelButton(NULL);
QFutureWatcher watcher;
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 804b751d..69b2af03 100755
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -52,7 +52,7 @@ MainFrame::MainFrame(DeviceManager &device_manager,
setAttribute(Qt::WA_TranslucentBackground);
// Make this a borderless window which can't
// be resized or moved via the window system
- setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
+ setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
setMinimumHeight(minHeight);
setMinimumWidth(minWidth);
//resize(1024, 768);
@@ -422,7 +422,7 @@ void MainFrame::show_doc()
QLabel tipsLabel;
tipsLabel.setPixmap(QPixmap(":/icons/showDoc"+QString::number(_mainWindow->language())+".png"));
QMessageBox msg;
- msg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
+ msg.setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
msg.setContentsMargins(0, 0, 0, 0);
connect(&msg, SIGNAL(buttonClicked(QAbstractButton*)), &dlg, SLOT(accept()));
QPushButton *noMoreButton = msg.addButton(tr("Not Show Again"), QMessageBox::ActionRole);
diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp
index 8da52bcb..a61939e6 100755
--- a/DSView/pv/toolbars/filebar.cpp
+++ b/DSView/pv/toolbars/filebar.cpp
@@ -44,7 +44,6 @@ FileBar::FileBar(SigSession &session, QWidget *parent) :
{
setMovable(false);
setContentsMargins(0,0,0,0);
- setIconSize(QSize(40, 28));
_action_load = new QAction(this);
_action_load->setObjectName(QString::fromUtf8("actionLoad"));
@@ -122,15 +121,15 @@ void FileBar::reStyle()
{
QString iconPath = ":/icons/" + qApp->property("Style").toString();
- _action_load->setIcon(QIcon(iconPath+"/open.png"));
- _action_store->setIcon(QIcon(iconPath+"/save.png"));
- _action_default->setIcon(QIcon(iconPath+"/gear.png"));
- _menu_session->setIcon(QIcon(iconPath+"/gear.png"));
- _action_open->setIcon(QIcon(iconPath+"/open.png"));
- _action_save->setIcon(QIcon(iconPath+"/save.png"));
- _action_export->setIcon(QIcon(iconPath+"/export.png"));
- _action_capture->setIcon(QIcon(iconPath+"/capture.png"));
- _file_button.setIcon(QIcon(iconPath+"/file.png"));
+ _action_load->setIcon(QIcon(iconPath+"/open.svg"));
+ _action_store->setIcon(QIcon(iconPath+"/save.svg"));
+ _action_default->setIcon(QIcon(iconPath+"/settings.svg"));
+ _menu_session->setIcon(QIcon(iconPath+"/settings.svg"));
+ _action_open->setIcon(QIcon(iconPath+"/open.svg"));
+ _action_save->setIcon(QIcon(iconPath+"/save.svg"));
+ _action_export->setIcon(QIcon(iconPath+"/export.svg"));
+ _action_capture->setIcon(QIcon(iconPath+"/capture.svg"));
+ _file_button.setIcon(QIcon(iconPath+"/file.svg"));
}
void FileBar::on_actionOpen_triggered()
diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp
index 45575ca5..0904c12b 100755
--- a/DSView/pv/toolbars/logobar.cpp
+++ b/DSView/pv/toolbars/logobar.cpp
@@ -44,7 +44,6 @@ LogoBar::LogoBar(SigSession &session, QWidget *parent) :
{
setMovable(false);
setContentsMargins(0,0,0,0);
- setIconSize(QSize(40, 28));
_action_en = new QAction(this);
_action_en->setObjectName(QString::fromUtf8("actionEn"));
@@ -59,8 +58,8 @@ LogoBar::LogoBar(SigSession &session, QWidget *parent) :
_language->addAction(_action_cn);
_language->addAction(_action_en);
- _action_en->setIcon(QIcon(":/icons/English.png"));
- _action_cn->setIcon(QIcon(":/icons/Chinese.png"));
+ _action_en->setIcon(QIcon(":/icons/English.svg"));
+ _action_cn->setIcon(QIcon(":/icons/Chinese.svg"));
_about = new QAction(this);
_about->setObjectName(QString::fromUtf8("actionAbout"));
@@ -118,22 +117,22 @@ void LogoBar::retranslateUi()
_issue->setText(tr("&Bug Report"));
if (qApp->property("Language") == QLocale::Chinese)
- _language->setIcon(QIcon(":/icons/Chinese.png"));
+ _language->setIcon(QIcon(":/icons/Chinese.svg"));
else
- _language->setIcon(QIcon(":/icons/English.png"));
+ _language->setIcon(QIcon(":/icons/English.svg"));
}
void LogoBar::reStyle()
{
QString iconPath = ":/icons/" + qApp->property("Style").toString();
- _about->setIcon(QIcon(iconPath+"/about.png"));
- _manual->setIcon(QIcon(iconPath+"/manual.png"));
- _issue->setIcon(QIcon(iconPath+"/bug.png"));
+ _about->setIcon(QIcon(iconPath+"/about.svg"));
+ _manual->setIcon(QIcon(iconPath+"/manual.svg"));
+ _issue->setIcon(QIcon(iconPath+"/bug.svg"));
if (_connected)
- _logo_button.setIcon(QIcon(iconPath+"/logo_color.png"));
+ _logo_button.setIcon(QIcon(iconPath+"/logo_color.svg"));
else
- _logo_button.setIcon(QIcon(iconPath+"/logo_noColor.png"));
+ _logo_button.setIcon(QIcon(iconPath+"/logo_noColor.svg"));
}
void LogoBar::dsl_connected(bool conn)
@@ -141,9 +140,9 @@ void LogoBar::dsl_connected(bool conn)
_connected = conn;
QString iconPath = ":/icons/" + qApp->property("Style").toString();
if (_connected)
- _logo_button.setIcon(QIcon(iconPath+"/logo_color.png"));
+ _logo_button.setIcon(QIcon(iconPath+"/logo_color.svg"));
else
- _logo_button.setIcon(QIcon(iconPath+"/logo_noColor.png"));
+ _logo_button.setIcon(QIcon(iconPath+"/logo_noColor.svg"));
}
void LogoBar::session_error(
@@ -168,14 +167,14 @@ void LogoBar::show_session_error(
void LogoBar::on_actionEn_triggered()
{
_language->setIcon(QIcon::fromTheme("file",
- QIcon(":/icons/English.png")));
+ QIcon(":/icons/English.svg")));
setLanguage(QLocale::English);
}
void LogoBar::on_actionCn_triggered()
{
_language->setIcon(QIcon::fromTheme("file",
- QIcon(":/icons/Chinese.png")));
+ QIcon(":/icons/Chinese.svg")));
setLanguage(QLocale::Chinese);
}
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 13505a07..5e67846a 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -73,7 +73,6 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
{
setMovable(false);
setContentsMargins(0,0,0,0);
- setIconSize(QSize(40, 28));
layout()->setMargin(0);
layout()->setSpacing(0);
@@ -195,14 +194,12 @@ void SamplingBar::retranslateUi()
void SamplingBar::reStyle()
{
- QString iconPath = ":/icons/" + qApp->property("Style").toString();
-
shared_ptr dev_inst = get_selected_device();
if (dev_inst && dev_inst->dev_inst()) {
if (dev_inst->name().contains("virtual-demo"))
- _device_type.setIcon(QIcon(":/icons/demo.png"));
+ _device_type.setIcon(QIcon(":/icons/demo.svg"));
else if (dev_inst->name().contains("virtual"))
- _device_type.setIcon(QIcon(":/icons/data.png"));
+ _device_type.setIcon(QIcon(":/icons/data.svg"));
else {
int usb_speed = LIBUSB_SPEED_HIGH;
GVariant *gvar = dev_inst->get_config(NULL, NULL, SR_CONF_USB_SPEED);
@@ -211,20 +208,24 @@ void SamplingBar::reStyle()
g_variant_unref(gvar);
}
if (usb_speed == LIBUSB_SPEED_SUPER)
- _device_type.setIcon(QIcon(":/icons/usb3.png"));
+ _device_type.setIcon(QIcon(":/icons/usb3.svg"));
else
- _device_type.setIcon(QIcon(":/icons/usb2.png"));
+ _device_type.setIcon(QIcon(":/icons/usb2.svg"));
}
}
- _configure_button.setIcon(QIcon(iconPath+"/params.png"));
- _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.png") :
- QIcon(iconPath+"/moder.png"));
- _run_stop_button.setIcon(_sampling ? QIcon(iconPath+"/stop.png") :
- QIcon(iconPath+"/start.png"));
- _instant_button.setIcon(QIcon(iconPath+"/instant.png"));
- _action_single->setIcon(QIcon(iconPath+"/oneloop.png"));
- _action_repeat->setIcon(QIcon(iconPath+"/repeat.png"));
+
+ if (!qApp->property("Style").isNull()) {
+ QString iconPath = ":/icons/" + qApp->property("Style").toString();
+ _configure_button.setIcon(QIcon(iconPath+"/params.svg"));
+ _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
+ QIcon(iconPath+"/moder.svg"));
+ _run_stop_button.setIcon(_sampling ? QIcon(iconPath+"/stop.svg") :
+ QIcon(iconPath+"/start.svg"));
+ _instant_button.setIcon(QIcon(iconPath+"/single.svg"));
+ _action_single->setIcon(QIcon(iconPath+"/oneloop.svg"));
+ _action_repeat->setIcon(QIcon(iconPath+"/repeat.svg"));
+ }
}
void SamplingBar::set_device_list(
@@ -385,13 +386,6 @@ void SamplingBar::set_sampling(bool sampling)
{
lock_guard lock(_sampling_mutex);
_sampling = sampling;
- QString iconPath = ":/icons/" + qApp->property("Style").toString();
-
- if (_instant) {
- _instant_button.setIcon(sampling ? QIcon(iconPath+"/stop.png") : QIcon(iconPath+"/instant.png"));
- } else {
- _run_stop_button.setIcon(sampling ? QIcon(iconPath+"/stop.png") : QIcon(iconPath+"/start.png"));
- }
if (!sampling) {
enable_run_stop(true);
@@ -404,11 +398,20 @@ void SamplingBar::set_sampling(bool sampling)
}
_mode_button.setEnabled(!sampling);
- _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.png") :
- QIcon(iconPath+"/moder.png"));
_configure_button.setEnabled(!sampling);
_device_selector.setEnabled(!sampling);
+ if (!qApp->property("Style").isNull()) {
+ QString iconPath = ":/icons/" + qApp->property("Style").toString();
+ if (_instant) {
+ _instant_button.setIcon(sampling ? QIcon(iconPath+"/stop.svg") : QIcon(iconPath+"/single.svg"));
+ } else {
+ _run_stop_button.setIcon(sampling ? QIcon(iconPath+"/stop.svg") : QIcon(iconPath+"/start.svg"));
+ }
+ _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
+ QIcon(iconPath+"/moder.svg"));
+ }
+
retranslateUi();
}
@@ -987,8 +990,8 @@ void SamplingBar::reload()
if (_session.get_device()->name() == "virtual-session") {
_mode_action->setVisible(false);
} else {
- _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.png") :
- QIcon(iconPath+"/moder.png"));
+ _mode_button.setIcon(_session.get_run_mode() == pv::SigSession::Single ? QIcon(iconPath+"/modes.svg") :
+ QIcon(iconPath+"/moder.svg"));
_mode_action->setVisible(true);
}
_run_stop_action->setVisible(true);
@@ -1016,10 +1019,10 @@ void SamplingBar::on_mode()
QString iconPath = ":/icons/" + qApp->property("Style").toString();
QAction *act = qobject_cast(sender());
if (act == _action_single) {
- _mode_button.setIcon(QIcon(iconPath+"/modes.png"));
+ _mode_button.setIcon(QIcon(iconPath+"/modes.svg"));
_session.set_run_mode(pv::SigSession::Single);
} else if (act == _action_repeat) {
- _mode_button.setIcon(QIcon(iconPath+"/moder.png"));
+ _mode_button.setIcon(QIcon(iconPath+"/moder.svg"));
pv::dialogs::Interval interval_dlg(_session, this);
interval_dlg.exec();
_session.set_run_mode(pv::SigSession::Repetitive);
diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp
index 121f7cb9..ed595925 100755
--- a/DSView/pv/toolbars/titlebar.cpp
+++ b/DSView/pv/toolbars/titlebar.cpp
@@ -90,11 +90,14 @@ void TitleBar::reStyle()
QString iconPath = ":/icons/" + qApp->property("Style").toString();
if (_isTop) {
- _minimizeButton->setIcon(QIcon(iconPath+"/minimize.png"));
- _maximizeButton->setIcon(QIcon(iconPath+"/maximize.png"));
+ _minimizeButton->setIcon(QIcon(iconPath+"/minimize.svg"));
+ if (parentWidget()->isMaximized())
+ _maximizeButton->setIcon(QIcon(iconPath+"/restore.svg"));
+ else
+ _maximizeButton->setIcon(QIcon(iconPath+"/maximize.svg"));
}
if (_isTop || _hasClose)
- _closeButton->setIcon(QIcon(iconPath+"/close.png"));
+ _closeButton->setIcon(QIcon(iconPath+"/close.svg"));
}
void TitleBar::paintEvent(QPaintEvent *event)
@@ -150,10 +153,10 @@ void TitleBar::showMaxRestore()
{
QString iconPath = ":/icons/" + qApp->property("Style").toString();
if (parentWidget()->isMaximized()) {
- _maximizeButton->setIcon(QIcon(iconPath+"/maximize.png"));
+ _maximizeButton->setIcon(QIcon(iconPath+"/maximize.svg"));
normalShow();
} else {
- _maximizeButton->setIcon(QIcon(iconPath+"/restore.png"));
+ _maximizeButton->setIcon(QIcon(iconPath+"/restore.svg"));
maximizedShow();
}
}
@@ -162,9 +165,9 @@ void TitleBar::setRestoreButton(bool max)
{
QString iconPath = ":/icons/" + qApp->property("Style").toString();
if (!max) {
- _maximizeButton->setIcon(QIcon(iconPath+"/maximize.png"));
+ _maximizeButton->setIcon(QIcon(iconPath+"/maximize.svg"));
} else {
- _maximizeButton->setIcon(QIcon(iconPath+"/restore.png"));
+ _maximizeButton->setIcon(QIcon(iconPath+"/restore.svg"));
}
}
diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp
index 6e40ba38..c4344027 100755
--- a/DSView/pv/toolbars/trigbar.cpp
+++ b/DSView/pv/toolbars/trigbar.cpp
@@ -50,7 +50,6 @@ TrigBar::TrigBar(SigSession &session, QWidget *parent) :
{
setMovable(false);
setContentsMargins(0,0,0,0);
- setIconSize(QSize(40, 28));
connect(&_trig_button, SIGNAL(clicked()),
this, SLOT(trigger_clicked()));
@@ -156,19 +155,19 @@ void TrigBar::reStyle()
{
QString iconPath = ":/icons/" + qApp->property("Style").toString();
- _trig_button.setIcon(QIcon(iconPath+"/trigger.png"));
- _protocol_button.setIcon(QIcon(iconPath+"/protocol.png"));
- _measure_button.setIcon(QIcon(iconPath+"/measure.png"));
- _search_button.setIcon(QIcon(iconPath+"/search-bar.png"));
- _function_button.setIcon(QIcon(iconPath+"/function.png"));
- _display_button.setIcon(QIcon(iconPath+"/display.png"));
+ _trig_button.setIcon(QIcon(iconPath+"/trigger.svg"));
+ _protocol_button.setIcon(QIcon(iconPath+"/protocol.svg"));
+ _measure_button.setIcon(QIcon(iconPath+"/measure.svg"));
+ _search_button.setIcon(QIcon(iconPath+"/search-bar.svg"));
+ _function_button.setIcon(QIcon(iconPath+"/function.svg"));
+ _display_button.setIcon(QIcon(iconPath+"/display.svg"));
- _action_fft->setIcon(QIcon(iconPath+"/fft.png"));
- _action_math->setIcon(QIcon(iconPath+"/math.png"));
- _action_lissajous->setIcon(QIcon(iconPath+"/lissajous.png"));
- _dark_style->setIcon(QIcon(iconPath+"/dark.png"));
- _light_style->setIcon(QIcon(iconPath+"/light.png"));
- _themes->setIcon(QIcon(iconPath+"/"+qApp->property("Style").toString()+".png"));
+ _action_fft->setIcon(QIcon(iconPath+"/fft.svg"));
+ _action_math->setIcon(QIcon(iconPath+"/math.svg"));
+ _action_lissajous->setIcon(QIcon(iconPath+"/lissajous.svg"));
+ _dark_style->setIcon(QIcon(iconPath+"/dark.svg"));
+ _light_style->setIcon(QIcon(iconPath+"/light.svg"));
+ _themes->setIcon(QIcon(iconPath+"/"+qApp->property("Style").toString()+".svg"));
}
void TrigBar::protocol_clicked()
@@ -290,13 +289,13 @@ void TrigBar::on_actionMath_triggered()
void TrigBar::on_actionDark_triggered()
{
setTheme(DARK_STYLE);
- _themes->setIcon(QIcon(":/icons/"+DARK_STYLE+"/"+DARK_STYLE+".png"));
+ _themes->setIcon(QIcon(":/icons/"+DARK_STYLE+"/"+DARK_STYLE+".svg"));
}
void TrigBar::on_actionLight_triggered()
{
setTheme(LIGHT_STYLE);
- _themes->setIcon(QIcon(":/icons/"+LIGHT_STYLE+"/"+LIGHT_STYLE+".png"));
+ _themes->setIcon(QIcon(":/icons/"+LIGHT_STYLE+"/"+LIGHT_STYLE+".svg"));
}
void TrigBar::on_actionLissajous_triggered()
diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp
index 8b18d147..82331f15 100755
--- a/DSView/pv/view/devmode.cpp
+++ b/DSView/pv/view/devmode.cpp
@@ -65,7 +65,7 @@ DevMode::DevMode(QWidget *parent, SigSession &session) :
_mode_btn = new QToolButton(this);
_mode_btn->setObjectName("ModeButton");
- _mode_btn->setIconSize(QSize(48, 48));
+ _mode_btn->setIconSize(QSize(height()*1.8, height()));
_mode_btn->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
_mode_btn->setContentsMargins(0, 0, 1000, 0);
_mode_btn->setMenu(_pop_menu);
@@ -105,36 +105,38 @@ void DevMode::set_device()
_close_button->setDisabled(true);
disconnect(_close_button, SIGNAL(clicked()), this, SLOT(on_close()));
- QString iconPath = ":/icons/" + qApp->property("Style").toString();
- for (const GSList *l = dev_inst->get_dev_mode_list();
- l; l = l->next) {
- const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
- QString icon_name = "/" + QString::fromLocal8Bit(mode->icon);
+ if (!qApp->property("Style").isNull()) {
+ QString iconPath = ":/icons/" + qApp->property("Style").toString() + "/";
+ for (const GSList *l = dev_inst->get_dev_mode_list();
+ l; l = l->next) {
+ const sr_dev_mode *mode = (const sr_dev_mode *)l->data;
+ QString icon_name = QString::fromLocal8Bit(mode->icon);
- QAction *action = new QAction(this);
- action->setIcon(QIcon(iconPath+icon_name));
- if (qApp->property("Language") == QLocale::Chinese)
- action->setText(mode->name_cn);
- else
- action->setText(mode->name);
- connect(action, SIGNAL(triggered()), this, SLOT(on_mode_change()));
-
- _mode_list[action] = mode;
- if (dev_inst->dev_inst()->mode == _mode_list[action]->mode) {
- _mode_btn->setIcon(QIcon(iconPath+icon_name));
+ QAction *action = new QAction(this);
+ action->setIcon(QIcon(iconPath+"square-"+icon_name));
if (qApp->property("Language") == QLocale::Chinese)
- _mode_btn->setText(mode->name_cn);
+ action->setText(mode->name_cn);
else
- _mode_btn->setText(mode->name);
- }
- _pop_menu->addAction(action);
- }
+ action->setText(mode->name);
+ connect(action, SIGNAL(triggered()), this, SLOT(on_mode_change()));
- boost::shared_ptr file_dev;
- if((file_dev = dynamic_pointer_cast(dev_inst))) {
- _close_button->setDisabled(false);
- _close_button->setIcon(QIcon(iconPath+"/close.png"));
- connect(_close_button, SIGNAL(clicked()), this, SLOT(on_close()));
+ _mode_list[action] = mode;
+ if (dev_inst->dev_inst()->mode == _mode_list[action]->mode) {
+ _mode_btn->setIcon(QIcon(iconPath+icon_name));
+ if (qApp->property("Language") == QLocale::Chinese)
+ _mode_btn->setText(mode->name_cn);
+ else
+ _mode_btn->setText(mode->name);
+ }
+ _pop_menu->addAction(action);
+ }
+
+ boost::shared_ptr file_dev;
+ if((file_dev = dynamic_pointer_cast(dev_inst))) {
+ _close_button->setDisabled(false);
+ _close_button->setIcon(QIcon(iconPath+"/close.svg"));
+ connect(_close_button, SIGNAL(clicked()), this, SLOT(on_close()));
+ }
}
update();
}
diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp
index 3e38bac3..86448b42 100755
--- a/DSView/pv/view/ruler.cpp
+++ b/DSView/pv/view/ruler.cpp
@@ -91,7 +91,7 @@ Ruler::Ruler(View &parent) :
QString Ruler::format_freq(double period, unsigned precision)
{
if (period <= 0) {
- return "#####";
+ return View::Unknown_Str;
} else {
const int order = ceil(log10f(period));
assert(order >= FirstSIPrefixPower);
diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 0631df0b..d7593ebe 100755
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -68,8 +68,8 @@ const int View::SignalMargin = 7;
const int View::SignalSnapGridSize = 10;
const QColor View::CursorAreaColour(220, 231, 243);
-
const QSizeF View::LabelPadding(4, 4);
+const QString View::Unknown_Str = "########";
const QColor View::Red = QColor(213, 15, 37, 255);
const QColor View::Orange = QColor(238, 178, 17, 255);
@@ -1016,7 +1016,7 @@ QString View::get_measure(QString option)
if (_active_viewport) {
return _active_viewport->get_measure(option);
}
- return "#####";
+ return Unknown_Str;
}
QString View::get_cm_time(int index)
diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h
index 1d4ab633..c9654e25 100755
--- a/DSView/pv/view/view.h
+++ b/DSView/pv/view/view.h
@@ -83,8 +83,8 @@ public:
static const int SignalSnapGridSize;
static const QColor CursorAreaColour;
-
static const QSizeF LabelPadding;
+ static const QString Unknown_Str;
static const int WellSamplesPerPixel = 2048;
static constexpr double MaxViewRate = 1.0;
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index b83d9610..4d63486f 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -79,10 +79,10 @@ Viewport::Viewport(View &parent, View_type type) :
setBackgroundRole(QPalette::Base);
//setFixedSize(QSize(600, 400));
- _mm_width = "#####";
- _mm_period = "#####";
- _mm_freq = "#####";
- _mm_duty = "#####";
+ _mm_width = View::Unknown_Str;
+ _mm_period = View::Unknown_Str;
+ _mm_freq = View::Unknown_Str;
+ _mm_duty = View::Unknown_Str;
_measure_en = true;
_edge_hit = false;
transfer_started = false;
@@ -1137,10 +1137,10 @@ void Viewport::clear_measure()
void Viewport::clear_dso_xm()
{
_dso_xm_valid = false;
- _mm_width = "#####";
- _mm_period = "#####";
- _mm_freq = "#####";
- _mm_duty = "#####";
+ _mm_width = View::Unknown_Str;
+ _mm_period = View::Unknown_Str;
+ _mm_freq = View::Unknown_Str;
+ _mm_duty = View::Unknown_Str;
_action_type = NO_ACTION;
}
@@ -1163,8 +1163,8 @@ void Viewport::measure()
_measure_type = LOGIC_FREQ;
_mm_width = _view.get_ruler()->format_real_time(_nxt_sample - _cur_sample, sample_rate);
- _mm_period = _thd_sample != 0 ? _view.get_ruler()->format_real_time(_thd_sample - _cur_sample, sample_rate) : "#####";
- _mm_freq = _thd_sample != 0 ? _view.get_ruler()->format_real_freq(_thd_sample - _cur_sample, sample_rate) : "#####";
+ _mm_period = _thd_sample != 0 ? _view.get_ruler()->format_real_time(_thd_sample - _cur_sample, sample_rate) : View::Unknown_Str;
+ _mm_freq = _thd_sample != 0 ? _view.get_ruler()->format_real_freq(_thd_sample - _cur_sample, sample_rate) : View::Unknown_Str;
_cur_preX = _view.index2pixel(_cur_sample);
_cur_aftX = _view.index2pixel(_nxt_sample);
@@ -1172,14 +1172,14 @@ void Viewport::measure()
_cur_midY = logicSig->get_y();
_mm_duty = _thd_sample != 0 ? QString::number((_nxt_sample - _cur_sample) * 100.0 / (_thd_sample - _cur_sample), 'f', 2)+"%" :
- "#####";
+ View::Unknown_Str;
break;
} else {
_measure_type = NO_MEASURE;
- _mm_width = "#####";
- _mm_period = "#####";
- _mm_freq = "#####";
- _mm_duty = "#####";
+ _mm_width = View::Unknown_Str;
+ _mm_period = View::Unknown_Str;
+ _mm_freq = View::Unknown_Str;
+ _mm_duty = View::Unknown_Str;
}
} else if (_action_type == LOGIC_EDGE) {
if (logicSig->edges(_view.hover_point(), _edge_start, _edge_rising, _edge_falling)) {
@@ -1572,7 +1572,7 @@ QString Viewport::get_measure(QString option)
else if (option.compare("duty") == 0)
return _mm_duty;
else
- return "#####";
+ return View::Unknown_Str;
}
void Viewport::set_measure_en(int enable)
diff --git a/DSView/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
index 379b42c8..79d3cd89 100755
--- a/DSView/pv/widgets/decodergroupbox.cpp
+++ b/DSView/pv/widgets/decodergroupbox.cpp
@@ -66,7 +66,7 @@ DecoderGroupBox::DecoderGroupBox(boost::shared_ptr &decoder_
assert(d);
const bool have_probes = (d->channels || d->opt_channels) != 0;
if (!have_probes) {
- _del_button = new QPushButton(QIcon(iconPath+"/del.png"), QString(), _widget);
+ _del_button = new QPushButton(QIcon(iconPath+"/del.svg"), QString(), _widget);
_layout->addWidget(_del_button, 0, 1);
connect(_del_button, SIGNAL(clicked()), this, SLOT(on_del_stack()));
}
@@ -79,8 +79,8 @@ DecoderGroupBox::DecoderGroupBox(boost::shared_ptr &decoder_
_index++;
}
_show_button = new QPushButton(QIcon(_dec->shown() ?
- iconPath+"/shown.png" :
- iconPath+"/hidden.png"), QString(), _widget);
+ iconPath+"/shown.svg" :
+ iconPath+"/hidden.svg"), QString(), _widget);
_show_button->setProperty("index", -1);
connect(_show_button, SIGNAL(clicked()),
this, SLOT(tog_icon()));
@@ -94,8 +94,8 @@ DecoderGroupBox::DecoderGroupBox(boost::shared_ptr &decoder_
i != rows.end(); i++) {
if ((*i).first.decoder() == _dec->decoder()) {
QPushButton *show_button = new QPushButton(QIcon((*i).second ?
- iconPath+"/shown.png" :
- iconPath+"/hidden.png"), QString(), _widget);
+ iconPath+"/shown.svg" :
+ iconPath+"/hidden.svg"), QString(), _widget);
show_button->setProperty("index", index);
connect(show_button, SIGNAL(clicked()), this, SLOT(tog_icon()));
_row_show_button.push_back(show_button);
@@ -141,8 +141,8 @@ void DecoderGroupBox::tog_icon()
_decoder_stack->stack()) {
if (i-- == 0) {
dec->show(!dec->shown());
- sc->setIcon(QIcon(dec->shown() ? iconPath+"/shown.png" :
- iconPath+"/hidden.png"));
+ sc->setIcon(QIcon(dec->shown() ? iconPath+"/shown.svg" :
+ iconPath+"/hidden.svg"));
break;
}
}
@@ -153,8 +153,8 @@ void DecoderGroupBox::tog_icon()
if (index-- == 0) {
_decoder_stack->set_rows_gshow((*i).first, !(*i).second);
//rows[(*i).first] = !(*i).second;
- sc->setIcon(QIcon(rows[(*i).first] ? iconPath+"/hidden.png" :
- iconPath+"/shown.png"));
+ sc->setIcon(QIcon(rows[(*i).first] ? iconPath+"/hidden.svg" :
+ iconPath+"/shown.svg"));
break;
}
}
diff --git a/DSView/themes/dark.qss b/DSView/themes/dark.qss
index 9c4e9d88..4ff510ba 100755
--- a/DSView/themes/dark.qss
+++ b/DSView/themes/dark.qss
@@ -238,7 +238,6 @@ QMenu
margin: 0px;
}
-
QMenu::item
{
padding: 5px 30px 5px 30px;
diff --git a/DSView/themes/light.qss b/DSView/themes/light.qss
index 6fdc62b8..06f704e6 100755
--- a/DSView/themes/light.qss
+++ b/DSView/themes/light.qss
@@ -233,7 +233,6 @@ QMenu
margin: 0px;
}
-
QMenu::item
{
padding: 5px 30px 5px 30px;
diff --git a/libsigrok4DSL/hardware/DSL/dsl.c b/libsigrok4DSL/hardware/DSL/dsl.c
index 1c83b2a2..a08452b1 100755
--- a/libsigrok4DSL/hardware/DSL/dsl.c
+++ b/libsigrok4DSL/hardware/DSL/dsl.c
@@ -70,9 +70,9 @@ static const char *probe_names[] = {
};
static struct sr_dev_mode mode_list[] = {
- {LOGIC, "Logic Analyzer", "逻辑分析仪", "la", "la.png"},
- {ANALOG, "Data Acquisition", "数据记录仪", "daq", "daq.png"},
- {DSO, "Oscilloscope", "示波器", "osc", "osc.png"},
+ {LOGIC, "Logic Analyzer", "逻辑分析仪", "la", "la.svg"},
+ {ANALOG, "Data Acquisition", "数据记录仪", "daq", "daq.svg"},
+ {DSO, "Oscilloscope", "示波器", "osc", "osc.svg"},
};
SR_PRIV void dsl_probe_init(struct sr_dev_inst *sdi)
diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h
index 0da7f732..08a6f421 100755
--- a/libsigrok4DSL/hardware/demo/demo.h
+++ b/libsigrok4DSL/hardware/demo/demo.h
@@ -67,9 +67,9 @@
/* end */
static struct sr_dev_mode mode_list[] = {
- {LOGIC, "Logic Analyzer", "逻辑分析仪", "la", "la.png"},
- {ANALOG, "Data Acquisition", "数据记录仪", "daq", "daq.png"},
- {DSO, "Oscilloscope", "示波器", "osc", "osc.png"},
+ {LOGIC, "Logic Analyzer", "逻辑分析仪", "la", "la.svg"},
+ {ANALOG, "Data Acquisition", "数据记录仪", "daq", "daq.svg"},
+ {DSO, "Oscilloscope", "示波器", "osc", "osc.svg"},
};
/* Supported patterns which we can generate */
diff --git a/libsigrok4DSL/session_driver.c b/libsigrok4DSL/session_driver.c
index aca809be..c2339a26 100755
--- a/libsigrok4DSL/session_driver.c
+++ b/libsigrok4DSL/session_driver.c
@@ -121,9 +121,9 @@ static const char *probeMapUnits[] = {
};
static struct sr_dev_mode mode_list[] = {
- {LOGIC, "Logic Analyzer", "逻辑分析仪", "la", "la.png"},
- {ANALOG, "Data Acquisition", "数据记录仪", "daq", "daq.png"},
- {DSO, "Oscilloscope", "示波器", "osc", "osc.png"},
+ {LOGIC, "Logic Analyzer", "逻辑分析仪", "la", "la.svg"},
+ {ANALOG, "Data Acquisition", "数据记录仪", "daq", "daq.svg"},
+ {DSO, "Oscilloscope", "示波器", "osc", "osc.svg"},
};
static int trans_data(struct sr_dev_inst *sdi)