File color.diff of Package qvkbd
diff --git a/icons/grid-world.svg b/icons/grid-world.svg
index 983122f..ef80891 100644
--- a/icons/grid-world.svg
+++ b/icons/grid-world.svg
@@ -44,7 +44,7 @@
inkscape:current-layer="Capa_1" /><g
id="g3"
transform="matrix(3.1992219,0,0,3.1992219,0,0.01167094)"><path
- style="fill:#030104"
+ style="fill:#868482"
d="M 14.982,7 C 14.736,3.256 11.744,0.263 8,0.017 L 8,0 7.5,0 7,0 7,0.017 C 3.256,0.263 0.263,3.256 0.017,7 L 0,7 0,7.5 0,8 0.017,8 C 0.263,11.744 3.256,14.736 7,14.982 L 7,15 7.5,15 8,15 8,14.982 C 11.744,14.736 14.736,11.744 14.982,8 L 15,8 15,7.5 15,7 14.982,7 Z M 4.695,1.635 C 4.212,2.277 3.811,3.082 3.519,4 L 2.021,4 C 2.673,2.983 3.599,2.16 4.695,1.635 Z M 1.498,5 3.256,5 C 3.122,5.632 3.037,6.303 3.01,7 L 1.019,7 C 1.072,6.296 1.238,5.623 1.498,5 Z M 1.019,8 3.01,8 c 0.027,0.697 0.112,1.368 0.246,2 L 1.498,10 C 1.238,9.377 1.072,8.704 1.019,8 Z m 1.002,3 1.497,0 C 3.81,11.918 4.211,12.723 4.695,13.365 3.599,12.84 2.673,12.018 2.021,11 Z M 7,13.936 C 5.972,13.661 5.087,12.557 4.55,11 L 7,11 7,13.936 Z M 7,10 4.269,10 C 4.128,9.377 4.039,8.704 4.01,8 L 7,8 7,10 Z M 7,7 4.01,7 C 4.039,6.296 4.128,5.623 4.269,5 L 7,5 7,7 Z M 7,4 4.55,4 C 5.087,2.443 5.972,1.339 7,1.065 L 7,4 Z m 5.979,0 -1.496,0 C 11.19,3.082 10.79,2.277 10.305,1.635 11.4,2.16 12.327,2.983 12.979,4 Z M 8,1.065 C 9.027,1.339 9.913,2.443 10.45,4 L 8,4 8,1.065 Z M 8,5 10.73,5 c 0.142,0.623 0.229,1.296 0.26,2 L 8,7 8,5 Z m 0,3 2.99,0 c -0.029,0.704 -0.118,1.377 -0.26,2 L 8,10 8,8 Z M 8,13.936 8,11 10.45,11 C 9.913,12.557 9.027,13.661 8,13.936 Z m 2.305,-0.571 C 10.788,12.722 11.19,11.918 11.483,11 l 1.496,0 c -0.652,1.018 -1.579,1.84 -2.674,2.365 z M 13.502,10 11.744,10 C 11.878,9.368 11.963,8.697 11.99,8 l 1.99,0 c -0.052,0.704 -0.218,1.377 -0.478,2 z M 11.99,7 C 11.963,6.303 11.878,5.632 11.744,5 l 1.758,0 c 0.26,0.623 0.426,1.296 0.479,2 L 11.99,7 Z"
id="path5"
inkscape:connector-curvature="0" /></g><g
@@ -77,4 +77,4 @@
id="g33"
transform="translate(0,33)" /><g
id="g35"
- transform="translate(0,33)" /></svg>
\ No newline at end of file
+ transform="translate(0,33)" /></svg>
diff --git a/layouts/keys/KeyItem.qml b/layouts/keys/KeyItem.qml
index 5b7f6ac..c43413a 100644
--- a/layouts/keys/KeyItem.qml
+++ b/layouts/keys/KeyItem.qml
@@ -32,13 +32,15 @@ Rectangle {
width: 50
height: 50
- border.width: 1
- border.color: "darkgray"
- color: checked ? "red" : "white"
+ border.width: 2
+ border.color: checked ? "#5a892e" : "#5d5b59"
+ radius: 5
+ color: checked ? "#5a892e" : "#383533"
Text {
anchors.fill: parent
text: label
+ color: checked ? "#c5d6b6" : "#ffffff"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
diff --git a/layouts/standard.qml b/layouts/standard.qml
index c3a0868..cb87e5a 100644
--- a/layouts/standard.qml
+++ b/layouts/standard.qml
@@ -26,7 +26,9 @@ Rectangle {
width: childrenRect.width + 20
height: childrenRect.height + 20
color: "#00000000"
- border.width: 2
+ border.width: 1
+ border.color: "#5d5b59"
+ radius: 5
Row {
x: 10
@@ -50,7 +52,6 @@ Rectangle {
id: keyItem
width: 40
height: 30
- color: "#ffffff"
scanCode: 9
label: "Esc"
}
@@ -180,7 +181,7 @@ Rectangle {
width: 46
height: 30
scanCode: 107
- label: "PrnScr"
+ label: "PrtSc"
}
}
@@ -210,7 +211,6 @@ Rectangle {
x: 0
width: 40
height: 40
- color: "#ffffff"
scanCode: 10
}
@@ -308,7 +308,7 @@ Rectangle {
width: 100
height: 40
scanCode: 22
- label: "⤌"
+ label: "⤌ Backspace"
}
}
@@ -444,8 +444,9 @@ Rectangle {
x: 0
width: 80
height: 40
+ color: checked ? "#73ba25" : "#1e1b18"
scanCode: 66
- label: "Caps"
+ label: "Caps Lock"
}
KeyItem {
@@ -541,8 +542,9 @@ Rectangle {
x: 0
width: 104
height: 40
+ color: checked ? "#73ba25" : "#1e1b18"
scanCode: 36
- label: "Enter"
+ label: "⤶ Enter"
}
}
@@ -557,9 +559,10 @@ Rectangle {
x: 0
width: 90
height: 40
+ color: checked ? "#5a892e" : "#1e1b18"
modifier: true
scanCode: 50
- label: "⤊"
+ label: "⤊ Shift"
}
KeyItem {
@@ -647,9 +650,10 @@ Rectangle {
x: 0
width: 138
height: 40
+ color: checked ? "#5a892e" : "#1e1b18"
modifier: true
scanCode: 62
- label: "⤊"
+ label: "⤊ Shift"
}
}
@@ -664,19 +668,22 @@ Rectangle {
x: 0
width: 70
height: 40
+ color: checked ? "#5a892e" : "#1e1b18"
modifier: true
scanCode: 37
label: "Ctrl"
}
- KeyItem {
+ IconKeyItem {
id: keyItem68
x: 0
width: 40
height: 40
+ color: checked ? "#5a892e" : "#1e1b18"
+ icon: "qrc:///icons/superkey-opensuse.svg"
modifier: true
scanCode: 133
- label: "Win"
+ label: " "
}
KeyItem {
@@ -684,6 +691,7 @@ Rectangle {
x: 0
width: 60
height: 40
+ color: checked ? "#5a892e" : "#1e1b18"
modifier: true
scanCode: 64
label: "Alt"
@@ -703,6 +711,7 @@ Rectangle {
x: 0
width: 60
height: 40
+ color: checked ? "#5a892e" : "#1e1b18"
modifier: true
scanCode: 108
label: "Alt Gr"
@@ -713,6 +722,7 @@ Rectangle {
x: 0
width: 40
height: 40
+ color: checked ? "#73ba25" : "#1e1b18"
icon: "qrc:///icons/grid-world.svg"
label: " "
scanCode: -3
@@ -724,6 +734,7 @@ Rectangle {
x: 0
width: 40
height: 40
+ color: checked ? "#5a892e" : "#1e1b18"
modifier: true
scanCode: 134
label: "Win"
@@ -734,6 +745,7 @@ Rectangle {
x: 0
width: 70
height: 40
+ color: checked ? "#5a892e" : "#1e1b18"
modifier: true
scanCode: 105
label: "Ctrl"
@@ -762,6 +774,8 @@ Rectangle {
id: keyItem27
width: 40
height: 30
+ color: checked ? "#ff0000" : "#383533"
+ border.color: checked ? "#c01717" : "#5d5b59"
scanCode: -2
label: "×"
}
@@ -780,6 +794,7 @@ Rectangle {
x: 0
width: 40
height: 40
+ color: checked ? "#73ba25" : "#383533"
label: "Num"
scanCode: 77
}
diff --git a/resources.qrc b/resources.qrc
index e90bba0..07ddf04 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -6,6 +6,7 @@
</qresource>
<qresource prefix="/icons">
<file alias="keyboard.svg">icons/keyboard.svg</file>
+ <file alias="superkey-opensuse.svg">icons/superkey-opensuse.svg</file>
<file alias="grid-world.svg">icons/grid-world.svg</file>
<file alias="keyboard.svg.png">icons/keyboard.svg.png</file>
</qresource>
diff --git a/src/keyboardwidget.cpp b/src/keyboardwidget.cpp
index 39fdea1..a8f98a3 100644
--- a/src/keyboardwidget.cpp
+++ b/src/keyboardwidget.cpp
@@ -271,7 +271,7 @@ void KeyboardWidget::setTransparentBackground(bool transparent, bool blur) {
m_transparentBackground = transparent;
m_blurBackground = blur;
m_x11Support.enableBlurForWidgetBackground(this, transparent && blur);
- m_quickWidget.setClearColor(transparent ? Qt::transparent : Qt::white);
+ m_quickWidget.setClearColor(transparent ? Qt::transparent : Qt::darkGray);
repaint();
}
diff --git a/src/vkbdapp.cpp b/src/vkbdapp.cpp
index 984c516..ceeeaf7 100644
--- a/src/vkbdapp.cpp
+++ b/src/vkbdapp.cpp
@@ -26,7 +26,7 @@
VKbdApp* VKbdApp::m_instance = nullptr;
VKbdApp::VKbdApp(int &argc, char *argv[]): QApplication(argc, argv),
- m_settings(QLatin1String("Eternal Search"), QLatin1String("QVKbd")),
+ m_settings(QLatin1String("qvkbd"), QLatin1String("QVKbd")),
m_singletonSemaphore("QVKbd_sem", 1), m_singletonMemory("QVKbd_mem"),
m_DBusAdaptor(this) {
m_instance = this;
