diff --git a/src/blackgui/qss/stdwidget.qss b/src/blackgui/qss/stdwidget.qss
index 1775badfc..39e45c316 100644
--- a/src/blackgui/qss/stdwidget.qss
+++ b/src/blackgui/qss/stdwidget.qss
@@ -29,7 +29,7 @@ QMainWindow::separator:hover {
background: transparent;
}
-/** Main window **/
+/** Dialog, sometime main window **/
QDialog {
background-image: url(:/textures/icons/textures/texture-outer.jpg);
background-color: darkslategray;
@@ -113,27 +113,23 @@ BlackGui--Editors--CValidationIndicator {
/** default for buttons **/
QPushButton {
- /** background-image: url(:/textures/icons/textures/texture-inner.jpg); **/
- /** need to fix pressed button first **/
- background: black;
- border-style: solid;
- border-width: 1px;
- border-radius:6px;
- border-color: green;
- max-height:20px;
+ background-color: rgba(0, 0, 255, 128);
+ border-style: 1px solid yellow;
+ border-radius:3px;
+ color: yellow;
+ padding: 0px;
+ margin-right: 5px;
min-width:60px;
min-height:20px;
}
QPushButton::disabled {
background-color: grey;
- border-style: solid;
- border-width: 1px;
- border-radius:6px;
- border-color: green;
- max-height:20px;
- min-width:60px;
- min-height:20px;
+ border-style: none;
+ border-radius:3px;
+ color: white;
+ padding: 0px;
+ margin-right: 5px;
}
QProgressBar {
@@ -215,6 +211,7 @@ QLabel {
QToolButton {
background-color: transparent; /* transparent tool buttons */
+ border: 0px;
}
QLineEdit {
@@ -269,6 +266,10 @@ QToolBox::tab::selected {
background-color: rgba(0, 0, 255, 128);
}
+QToolBox::tab::!selected {
+ background-color: rgba(0, 0, 255, 48);
+}
+
/** no border on page */
QToolBox > QWidget {
border: 0px;
diff --git a/src/blackgui/qss/stylesheetinfo.qss b/src/blackgui/qss/stylesheetinfo.qss
deleted file mode 100644
index b8b3be331..000000000
--- a/src/blackgui/qss/stylesheetinfo.qss
+++ /dev/null
@@ -1,32 +0,0 @@
-QFrame#fr_InfoWindow {
- border-style: solid;
- border-width: 2px;
- border-radius: 10px;
- border-color: white;
- background-color: rgba(0,0,0,200);
-}
-
-QStackedWidget {
- font-family: arial-rounded;
- font: bold 10px;
- color: white; /** font not in text edit **/
-}
-
-QPushButton {
- background-color: transparent;
- border-style: solid;
- border-width: 0px;
- border-radius:3px;
- border-color: green;
- max-height:20px;
-}
-
-QTextEdit {
- background-color: rgba(255, 255, 0, 240); /* transparent yellow */
- border-style: solid;
- border-width:1px;
- border-radius:6px;
- border-color: green;
- opacity: 0.5;
- color: black; /** font **/
-}
diff --git a/src/blackgui/qss/swiftdata.qss b/src/blackgui/qss/swiftdata.qss
index 865786669..23d83035a 100644
--- a/src/blackgui/qss/swiftdata.qss
+++ b/src/blackgui/qss/swiftdata.qss
@@ -1,10 +1,3 @@
-#le_CommandLineInput {
- background-image: url(:/textures/icons/textures/texture-inner.jpg);
- margin-bottom: 5px;
- padding: 3px;
- border-radius: 5px;
-}
-
#comp_Log {
background: transparent; /** background is background color here **/
}
diff --git a/src/blackgui/qss/swiftlauncher.qss b/src/blackgui/qss/swiftlauncher.qss
new file mode 100644
index 000000000..f4b749b60
--- /dev/null
+++ b/src/blackgui/qss/swiftlauncher.qss
@@ -0,0 +1,18 @@
+/** special effects for start buttons **/
+#pg_Start QToolButton {
+ border: 1px solid green;
+ border-radius: 5px;
+}
+
+#pg_Start QToolButton:hover {
+ border: 5px solid green;
+ border-radius: 5px;
+ min-width: 30px;
+ min-height: 30px;
+}
+
+#pg_start QToolTip {
+ color: #ffffff;
+ background-color: #2a82da;
+ border: 1px solid white;
+}
diff --git a/src/blackgui/qss/swiftstdgui.qss b/src/blackgui/qss/swiftstdgui.qss
index d0a23fb17..df7afca78 100644
--- a/src/blackgui/qss/swiftstdgui.qss
+++ b/src/blackgui/qss/swiftstdgui.qss
@@ -52,15 +52,6 @@ QAbstractScrollArea #pg_StatusPageCons ole { background-color: black; }
background-image: url(:/textures/icons/textures/texture-inner.jpg);
}
-#sw_MainMiddle QPushButton {
- background-color: rgba(0, 0, 255, 128);
- border-style: none;
- border-radius:3px;
- color: yellow;
- padding: 0px;
- margin-right: 5px;
-}
-
/** close button with frameless windows **/
#pb_FramelessCloseButton {
background: transparent;
@@ -79,23 +70,20 @@ QAbstractScrollArea #pg_StatusPageCons ole { background-color: black; }
}
#wi_MainKeypadArea QPushButton {
- /** background-image: url(:/textures/icons/textures/texture-inner.jpg); **/
- /** need to fix pressed button first **/
- background: black;
+ background-color: black;
+ color: white;
border-style: solid;
border-width: 1px;
border-radius:6px;
border-color: green;
max-height:20px;
- min-width:60px;
+ min-width: 60px;
min-height:20px;
}
#wi_MainKeypadArea QPushButton::checked {
- /** background-image: url(:/textures/icons/textures/texture-inner.jpg); **/
- /** need to fix pressed button first **/
border-style: solid;
- border-color: yellow;
+ border-color: green;
font: bold;
color: yellow;
}
diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp
index 0521d5d48..8e0ac1d22 100644
--- a/src/blackgui/stylesheetutility.cpp
+++ b/src/blackgui/stylesheetutility.cpp
@@ -263,12 +263,6 @@ namespace BlackGui
return f;
}
- const QString &CStyleSheetUtility::fileNameInfoWindow()
- {
- static const QString f("stylesheetinfo.qss");
- return f;
- }
-
const QString &CStyleSheetUtility::fileNameTextMessage()
{
static const QString f("textmessage.css");
@@ -293,6 +287,12 @@ namespace BlackGui
return f;
}
+ const QString &CStyleSheetUtility::fileNameSwiftLauncher()
+ {
+ static const QString f("swiftlauncher.qss");
+ return f;
+ }
+
const QString &CStyleSheetUtility::fileNameIniFile()
{
static const QString f("gui.ini");
diff --git a/src/blackgui/stylesheetutility.h b/src/blackgui/stylesheetutility.h
index 668bd0216..3d2861eb2 100644
--- a/src/blackgui/stylesheetutility.h
+++ b/src/blackgui/stylesheetutility.h
@@ -78,9 +78,6 @@ namespace BlackGui
//! File name for standard widgets
static const QString &fileNameStandardWidget();
- //! File name maininfoarea.qss
- static const QString &fileNameInfoWindow();
-
//! File name textmessage.qss
static const QString &fileNameTextMessage();
@@ -96,6 +93,9 @@ namespace BlackGui
//! File name swiftcore.qss
static const QString &fileNameSwiftData();
+ //! File name swiftlauncher.qss
+ static const QString &fileNameSwiftLauncher();
+
//! File name ini file
static const QString &fileNameIniFile();
diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc
index 5fd2542a3..d55f06f92 100644
--- a/src/blackmisc/blackmisc.qrc
+++ b/src/blackmisc/blackmisc.qrc
@@ -386,6 +386,8 @@
icons/own/swift/swift128Database.png
icons/own/swift/swift24Database.png
icons/own/swift/swift16Database.png
+ icons/own/swift/swiftNova64.png
+ icons/own/swift/swift64.png
icons/qled/circle_black.svg
diff --git a/src/blackmisc/icons/own/swift/swift256.png b/src/blackmisc/icons/own/swift/swift256.png
new file mode 100644
index 000000000..159bd5d1f
Binary files /dev/null and b/src/blackmisc/icons/own/swift/swift256.png differ
diff --git a/src/blackmisc/icons/own/swift/swift256.xcf b/src/blackmisc/icons/own/swift/swift256.xcf
new file mode 100644
index 000000000..b2794ebdb
Binary files /dev/null and b/src/blackmisc/icons/own/swift/swift256.xcf differ
diff --git a/src/blackmisc/icons/own/swift/swift256Launcher.png b/src/blackmisc/icons/own/swift/swift256Launcher.png
new file mode 100644
index 000000000..015771070
Binary files /dev/null and b/src/blackmisc/icons/own/swift/swift256Launcher.png differ
diff --git a/src/blackmisc/icons/own/swift/swift256Launcher.xcf b/src/blackmisc/icons/own/swift/swift256Launcher.xcf
new file mode 100644
index 000000000..9d5379b85
Binary files /dev/null and b/src/blackmisc/icons/own/swift/swift256Launcher.xcf differ
diff --git a/src/blackmisc/icons/own/swift/swift64.png b/src/blackmisc/icons/own/swift/swift64.png
new file mode 100644
index 000000000..37171d09c
Binary files /dev/null and b/src/blackmisc/icons/own/swift/swift64.png differ
diff --git a/src/blackmisc/icons/own/swift/swiftNova.xcf b/src/blackmisc/icons/own/swift/swiftNova.xcf
index df575b4b5..df709c04f 100644
Binary files a/src/blackmisc/icons/own/swift/swiftNova.xcf and b/src/blackmisc/icons/own/swift/swiftNova.xcf differ
diff --git a/src/blackmisc/icons/own/swift/swiftNova64.png b/src/blackmisc/icons/own/swift/swiftNova64.png
new file mode 100644
index 000000000..6a353cdd1
Binary files /dev/null and b/src/blackmisc/icons/own/swift/swiftNova64.png differ
diff --git a/src/swiftlauncher/icons/swift256Launcher.png b/src/swiftlauncher/icons/swift256Launcher.png
new file mode 100644
index 000000000..015771070
Binary files /dev/null and b/src/swiftlauncher/icons/swift256Launcher.png differ
diff --git a/src/swiftlauncher/icons/swift256Launcher.xcf b/src/swiftlauncher/icons/swift256Launcher.xcf
new file mode 100644
index 000000000..9d5379b85
Binary files /dev/null and b/src/swiftlauncher/icons/swift256Launcher.xcf differ
diff --git a/src/swiftlauncher/icons/swiftCore.xcf b/src/swiftlauncher/icons/swiftCore.xcf
new file mode 100644
index 000000000..23798142a
Binary files /dev/null and b/src/swiftlauncher/icons/swiftCore.xcf differ
diff --git a/src/swiftlauncher/icons/swiftCore110x100.png b/src/swiftlauncher/icons/swiftCore110x100.png
new file mode 100644
index 000000000..61d701f0c
Binary files /dev/null and b/src/swiftlauncher/icons/swiftCore110x100.png differ
diff --git a/src/swiftlauncher/icons/swiftFrameless.png b/src/swiftlauncher/icons/swiftFrameless.png
new file mode 100644
index 000000000..e157bd495
Binary files /dev/null and b/src/swiftlauncher/icons/swiftFrameless.png differ
diff --git a/src/swiftlauncher/icons/swiftFrameless.xcf b/src/swiftlauncher/icons/swiftFrameless.xcf
new file mode 100644
index 000000000..8fea52f3b
Binary files /dev/null and b/src/swiftlauncher/icons/swiftFrameless.xcf differ
diff --git a/src/swiftlauncher/icons/swiftFrameless100x162.png b/src/swiftlauncher/icons/swiftFrameless100x162.png
new file mode 100644
index 000000000..12b614436
Binary files /dev/null and b/src/swiftlauncher/icons/swiftFrameless100x162.png differ
diff --git a/src/swiftlauncher/icons/swiftFrameless125x203.png b/src/swiftlauncher/icons/swiftFrameless125x203.png
new file mode 100644
index 000000000..05971a38b
Binary files /dev/null and b/src/swiftlauncher/icons/swiftFrameless125x203.png differ
diff --git a/src/swiftlauncher/icons/swiftFrameless200x325.png b/src/swiftlauncher/icons/swiftFrameless200x325.png
new file mode 100644
index 000000000..9a9f669cd
Binary files /dev/null and b/src/swiftlauncher/icons/swiftFrameless200x325.png differ
diff --git a/src/swiftlauncher/icons/swiftGUIandCore.xcf b/src/swiftlauncher/icons/swiftGUIandCore.xcf
new file mode 100644
index 000000000..0e906fd59
Binary files /dev/null and b/src/swiftlauncher/icons/swiftGUIandCore.xcf differ
diff --git a/src/swiftlauncher/icons/swiftGUIandCore115x85.png b/src/swiftlauncher/icons/swiftGUIandCore115x85.png
new file mode 100644
index 000000000..bb65b3e8f
Binary files /dev/null and b/src/swiftlauncher/icons/swiftGUIandCore115x85.png differ
diff --git a/src/swiftlauncher/icons/swiftGUIandCore130x100.png b/src/swiftlauncher/icons/swiftGUIandCore130x100.png
new file mode 100644
index 000000000..9c00a6070
Binary files /dev/null and b/src/swiftlauncher/icons/swiftGUIandCore130x100.png differ
diff --git a/src/swiftlauncher/icons/swiftGUIandCore215x165.png b/src/swiftlauncher/icons/swiftGUIandCore215x165.png
new file mode 100644
index 000000000..a1fe5cfb8
Binary files /dev/null and b/src/swiftlauncher/icons/swiftGUIandCore215x165.png differ
diff --git a/src/swiftlauncher/icons/swiftHeader.xcf b/src/swiftlauncher/icons/swiftHeader.xcf
new file mode 100644
index 000000000..518d29b3c
Binary files /dev/null and b/src/swiftlauncher/icons/swiftHeader.xcf differ
diff --git a/src/swiftlauncher/icons/swiftHeader325x65.png b/src/swiftlauncher/icons/swiftHeader325x65.png
new file mode 100644
index 000000000..a1763ca3f
Binary files /dev/null and b/src/swiftlauncher/icons/swiftHeader325x65.png differ
diff --git a/src/swiftlauncher/icons/swiftNormal.png b/src/swiftlauncher/icons/swiftNormal.png
new file mode 100644
index 000000000..b8a87e886
Binary files /dev/null and b/src/swiftlauncher/icons/swiftNormal.png differ
diff --git a/src/swiftlauncher/icons/swiftNormal.xcf b/src/swiftlauncher/icons/swiftNormal.xcf
new file mode 100644
index 000000000..6a83ecebc
Binary files /dev/null and b/src/swiftlauncher/icons/swiftNormal.xcf differ
diff --git a/src/swiftlauncher/icons/swiftNormal100x165.png b/src/swiftlauncher/icons/swiftNormal100x165.png
new file mode 100644
index 000000000..f6291b421
Binary files /dev/null and b/src/swiftlauncher/icons/swiftNormal100x165.png differ
diff --git a/src/swiftlauncher/icons/swiftNormal115x189.png b/src/swiftlauncher/icons/swiftNormal115x189.png
new file mode 100644
index 000000000..8a257521d
Binary files /dev/null and b/src/swiftlauncher/icons/swiftNormal115x189.png differ
diff --git a/src/swiftlauncher/icons/swiftNormal125x206.png b/src/swiftlauncher/icons/swiftNormal125x206.png
new file mode 100644
index 000000000..e671d672a
Binary files /dev/null and b/src/swiftlauncher/icons/swiftNormal125x206.png differ
diff --git a/src/swiftlauncher/icons/swiftNormal200x329.png b/src/swiftlauncher/icons/swiftNormal200x329.png
new file mode 100644
index 000000000..50edde50c
Binary files /dev/null and b/src/swiftlauncher/icons/swiftNormal200x329.png differ
diff --git a/src/swiftlauncher/icons/swiftNormal61x100.png b/src/swiftlauncher/icons/swiftNormal61x100.png
new file mode 100644
index 000000000..edde2f34b
Binary files /dev/null and b/src/swiftlauncher/icons/swiftNormal61x100.png differ