From 4828bd2229135494960afff32d7d7310f4b66715 Mon Sep 17 00:00:00 2001 From: thomas_lucky13 Date: Thu, 21 Jul 2022 17:47:06 +0400 Subject: [PATCH] virtual keyboard --- resources/OpenBoard.qrc | 20 ++ .../images/virtual.keyboard/29/backspace.svg | 129 +++++++++++++ .../images/virtual.keyboard/29/capslock.svg | 134 ++++++++++++++ .../virtual.keyboard/29/centre-active.svg | 101 +++++++++++ .../virtual.keyboard/29/centre-passive.svg | 171 ++++++++++++++++++ .../virtual.keyboard/29/left-active.svg | 160 ++++++++++++++++ .../virtual.keyboard/29/left-passive.svg | 171 ++++++++++++++++++ .../virtual.keyboard/29/right-active.svg | 160 ++++++++++++++++ .../virtual.keyboard/29/right-passive.svg | 171 ++++++++++++++++++ .../images/virtual.keyboard/29/shift.svg | 122 +++++++++++++ resources/images/virtual.keyboard/29/tab.svg | 163 +++++++++++++++++ .../images/virtual.keyboard/41/backspace.svg | 129 +++++++++++++ .../images/virtual.keyboard/41/capslock.svg | 134 ++++++++++++++ .../virtual.keyboard/41/centre-active.svg | 101 +++++++++++ .../virtual.keyboard/41/centre-passive.svg | 171 ++++++++++++++++++ .../virtual.keyboard/41/left-active.svg | 160 ++++++++++++++++ .../virtual.keyboard/41/left-passive.svg | 171 ++++++++++++++++++ .../virtual.keyboard/41/right-active.svg | 160 ++++++++++++++++ .../virtual.keyboard/41/right-passive.svg | 171 ++++++++++++++++++ .../images/virtual.keyboard/41/shift.svg | 122 +++++++++++++ resources/images/virtual.keyboard/41/tab.svg | 163 +++++++++++++++++ src/gui/UBKeyboardPalette.cpp | 12 +- 22 files changed, 2990 insertions(+), 6 deletions(-) create mode 100644 resources/images/virtual.keyboard/29/backspace.svg create mode 100644 resources/images/virtual.keyboard/29/capslock.svg create mode 100644 resources/images/virtual.keyboard/29/centre-active.svg create mode 100644 resources/images/virtual.keyboard/29/centre-passive.svg create mode 100644 resources/images/virtual.keyboard/29/left-active.svg create mode 100644 resources/images/virtual.keyboard/29/left-passive.svg create mode 100644 resources/images/virtual.keyboard/29/right-active.svg create mode 100644 resources/images/virtual.keyboard/29/right-passive.svg create mode 100644 resources/images/virtual.keyboard/29/shift.svg create mode 100644 resources/images/virtual.keyboard/29/tab.svg create mode 100644 resources/images/virtual.keyboard/41/backspace.svg create mode 100644 resources/images/virtual.keyboard/41/capslock.svg create mode 100644 resources/images/virtual.keyboard/41/centre-active.svg create mode 100644 resources/images/virtual.keyboard/41/centre-passive.svg create mode 100644 resources/images/virtual.keyboard/41/left-active.svg create mode 100644 resources/images/virtual.keyboard/41/left-passive.svg create mode 100644 resources/images/virtual.keyboard/41/right-active.svg create mode 100644 resources/images/virtual.keyboard/41/right-passive.svg create mode 100644 resources/images/virtual.keyboard/41/shift.svg create mode 100644 resources/images/virtual.keyboard/41/tab.svg diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index faafe96b..6f3624f7 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -413,6 +413,26 @@ images/virtual.keyboard/29/capslock.png images/virtual.keyboard/29/shift.png images/virtual.keyboard/29/tab.png + images/virtual.keyboard/29/backspace.svg + images/virtual.keyboard/29/capslock.svg + images/virtual.keyboard/29/shift.svg + images/virtual.keyboard/29/tab.svg + images/virtual.keyboard/29/centre-active.svg + images/virtual.keyboard/29/left-active.svg + images/virtual.keyboard/29/right-active.svg + images/virtual.keyboard/29/centre-passive.svg + images/virtual.keyboard/29/left-passive.svg + images/virtual.keyboard/29/right-passive.svg + images/virtual.keyboard/41/backspace.svg + images/virtual.keyboard/41/capslock.svg + images/virtual.keyboard/41/shift.svg + images/virtual.keyboard/41/tab.svg + images/virtual.keyboard/41/centre-active.svg + images/virtual.keyboard/41/left-active.svg + images/virtual.keyboard/41/right-active.svg + images/virtual.keyboard/41/centre-passive.svg + images/virtual.keyboard/41/left-passive.svg + images/virtual.keyboard/41/right-passive.svg images/toolPalette/cacheTool.png images/libpalette/FlashCategory.svg images/libpalette/FlashIcon.svg diff --git a/resources/images/virtual.keyboard/29/backspace.svg b/resources/images/virtual.keyboard/29/backspace.svg new file mode 100644 index 00000000..f082dd3a --- /dev/null +++ b/resources/images/virtual.keyboard/29/backspace.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/capslock.svg b/resources/images/virtual.keyboard/29/capslock.svg new file mode 100644 index 00000000..c611aa2a --- /dev/null +++ b/resources/images/virtual.keyboard/29/capslock.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + A + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/centre-active.svg b/resources/images/virtual.keyboard/29/centre-active.svg new file mode 100644 index 00000000..2c865884 --- /dev/null +++ b/resources/images/virtual.keyboard/29/centre-active.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/centre-passive.svg b/resources/images/virtual.keyboard/29/centre-passive.svg new file mode 100644 index 00000000..155edaea --- /dev/null +++ b/resources/images/virtual.keyboard/29/centre-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/left-active.svg b/resources/images/virtual.keyboard/29/left-active.svg new file mode 100644 index 00000000..6b2e87c4 --- /dev/null +++ b/resources/images/virtual.keyboard/29/left-active.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/left-passive.svg b/resources/images/virtual.keyboard/29/left-passive.svg new file mode 100644 index 00000000..71148950 --- /dev/null +++ b/resources/images/virtual.keyboard/29/left-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/right-active.svg b/resources/images/virtual.keyboard/29/right-active.svg new file mode 100644 index 00000000..76b59c35 --- /dev/null +++ b/resources/images/virtual.keyboard/29/right-active.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/right-passive.svg b/resources/images/virtual.keyboard/29/right-passive.svg new file mode 100644 index 00000000..f9506252 --- /dev/null +++ b/resources/images/virtual.keyboard/29/right-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/shift.svg b/resources/images/virtual.keyboard/29/shift.svg new file mode 100644 index 00000000..fa6cb6d7 --- /dev/null +++ b/resources/images/virtual.keyboard/29/shift.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/29/tab.svg b/resources/images/virtual.keyboard/29/tab.svg new file mode 100644 index 00000000..b070f3fd --- /dev/null +++ b/resources/images/virtual.keyboard/29/tab.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/backspace.svg b/resources/images/virtual.keyboard/41/backspace.svg new file mode 100644 index 00000000..f082dd3a --- /dev/null +++ b/resources/images/virtual.keyboard/41/backspace.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/capslock.svg b/resources/images/virtual.keyboard/41/capslock.svg new file mode 100644 index 00000000..c611aa2a --- /dev/null +++ b/resources/images/virtual.keyboard/41/capslock.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + A + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/centre-active.svg b/resources/images/virtual.keyboard/41/centre-active.svg new file mode 100644 index 00000000..2c865884 --- /dev/null +++ b/resources/images/virtual.keyboard/41/centre-active.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/centre-passive.svg b/resources/images/virtual.keyboard/41/centre-passive.svg new file mode 100644 index 00000000..155edaea --- /dev/null +++ b/resources/images/virtual.keyboard/41/centre-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/left-active.svg b/resources/images/virtual.keyboard/41/left-active.svg new file mode 100644 index 00000000..6b2e87c4 --- /dev/null +++ b/resources/images/virtual.keyboard/41/left-active.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/left-passive.svg b/resources/images/virtual.keyboard/41/left-passive.svg new file mode 100644 index 00000000..71148950 --- /dev/null +++ b/resources/images/virtual.keyboard/41/left-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/right-active.svg b/resources/images/virtual.keyboard/41/right-active.svg new file mode 100644 index 00000000..76b59c35 --- /dev/null +++ b/resources/images/virtual.keyboard/41/right-active.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/right-passive.svg b/resources/images/virtual.keyboard/41/right-passive.svg new file mode 100644 index 00000000..f9506252 --- /dev/null +++ b/resources/images/virtual.keyboard/41/right-passive.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/shift.svg b/resources/images/virtual.keyboard/41/shift.svg new file mode 100644 index 00000000..fa6cb6d7 --- /dev/null +++ b/resources/images/virtual.keyboard/41/shift.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/virtual.keyboard/41/tab.svg b/resources/images/virtual.keyboard/41/tab.svg new file mode 100644 index 00000000..b070f3fd --- /dev/null +++ b/resources/images/virtual.keyboard/41/tab.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/gui/UBKeyboardPalette.cpp b/src/gui/UBKeyboardPalette.cpp index 3f21909f..25b525de 100644 --- a/src/gui/UBKeyboardPalette.cpp +++ b/src/gui/UBKeyboardPalette.cpp @@ -405,12 +405,12 @@ BTNImages::BTNImages(QString strHeight, int width, int height) m_width = width; m_height = height; - m_strLeftPassive = ":/images/virtual.keyboard/" + strHeight + "/left-passive.png"; - m_strCenterPassive = ":/images/virtual.keyboard/" + strHeight + "/centre-passive.png"; - m_strRightPassive = ":/images/virtual.keyboard/" + strHeight + "/right-passive.png"; - m_strLeftActive = ":/images/virtual.keyboard/" + strHeight + "/left-active.png"; - m_strCenterActive = ":/images/virtual.keyboard/" + strHeight + "/centre-active.png"; - m_strRightActive = ":/images/virtual.keyboard/" + strHeight + "/right-active.png"; + m_strLeftPassive = ":/images/virtual.keyboard/" + strHeight + "/left-passive.svg"; + m_strCenterPassive = ":/images/virtual.keyboard/" + strHeight + "/centre-passive.svg"; + m_strRightPassive = ":/images/virtual.keyboard/" + strHeight + "/right-passive.svg"; + m_strLeftActive = ":/images/virtual.keyboard/" + strHeight + "/left-active.svg"; + m_strCenterActive = ":/images/virtual.keyboard/" + strHeight + "/centre-active.svg"; + m_strRightActive = ":/images/virtual.keyboard/" + strHeight + "/right-active.svg"; m_btnLeftPassive = QImage(m_strLeftPassive); m_btnCenterPassive = QImage(m_strCenterPassive);