From 8b3589a5d67194e9e8ad810a15ee0fcda363974f Mon Sep 17 00:00:00 2001
From: jpbl <jpbl>
Date: Wed, 28 Dec 2005 20:54:16 +0000
Subject: [PATCH] overscreen is working now
---
libs/taxidermy/QWidgetBuilder.cpp | 9 ++++++++-
libs/taxidermy/qtutils.cpp | 6 ++++++
libs/taxidermy/qtutils.hpp | 2 +-
skins/gmetal.ini | 1 +
skins/metal.ini | 1 +
src/gui/qt/SFLLcd.cpp | 5 ++---
6 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/libs/taxidermy/QWidgetBuilder.cpp b/libs/taxidermy/QWidgetBuilder.cpp
index b91588b248..b2cef6c08f 100644
--- a/libs/taxidermy/QWidgetBuilder.cpp
+++ b/libs/taxidermy/QWidgetBuilder.cpp
@@ -51,9 +51,16 @@ taxidermy::QWidgetBuilder::load(const QMap< QString, QString > &values)
mWidth = (*width).toInt();
}
+ QMap< QString, QString >::ConstIterator transparent = values.find("transparent");
QMap< QString, QString >::ConstIterator bimage = values.find("bImage");
if(bimage != values.end()) {
- mBackgroundImage = qtutils::transparize(*bimage);
+ if(transparent == values.end() || (*transparent).toInt()) {
+ mBackgroundImage = qtutils::transparize(*bimage);
+ }
+ else {
+ std::cout << *bimage << " is not trans\n";
+ qtutils::retreive(*bimage, mBackgroundImage);
+ }
}
QMap< QString, QString >::ConstIterator bcolor = values.find("bColor");
diff --git a/libs/taxidermy/qtutils.cpp b/libs/taxidermy/qtutils.cpp
index 68b9d7d090..9f33f6674f 100644
--- a/libs/taxidermy/qtutils.cpp
+++ b/libs/taxidermy/qtutils.cpp
@@ -32,6 +32,12 @@ taxidermy::qtutils::addFilePath(const QString &path)
factory->addFilePath(path);
}
+void
+taxidermy::qtutils::retreive(const QString &image, QPixmap &pixmap)
+{
+ pixmap = QPixmap::fromMimeSource(image);
+}
+
QPixmap
taxidermy::qtutils::transparize(const QString &image, bool hard)
{
diff --git a/libs/taxidermy/qtutils.hpp b/libs/taxidermy/qtutils.hpp
index 6d5c4f4a47..9fac243bc0 100644
--- a/libs/taxidermy/qtutils.hpp
+++ b/libs/taxidermy/qtutils.hpp
@@ -26,6 +26,6 @@ namespace taxidermy
{
QPixmap transparize(const QString &image, bool hard = false);
void addFilePath(const QString &path);
-
+ void retreive(const QString &image, QPixmap &pixmap);
};
};
diff --git a/skins/gmetal.ini b/skins/gmetal.ini
index 33bc6b86be..d35e090084 100644
--- a/skins/gmetal.ini
+++ b/skins/gmetal.ini
@@ -182,6 +182,7 @@ bColor=gray
[overscreen]
type=QWidget
bImage=overscreen.png
+transparent=0
# DTMF Keypad
diff --git a/skins/metal.ini b/skins/metal.ini
index ea15fd6195..0d1efa4996 100644
--- a/skins/metal.ini
+++ b/skins/metal.ini
@@ -183,6 +183,7 @@ bImage=screen_main.png
[overscreen]
type=QWidget
bImage=overscreen.png
+transparent=0
# DTMF Keypad
#dtmf_1=12,22
diff --git a/src/gui/qt/SFLLcd.cpp b/src/gui/qt/SFLLcd.cpp
index b44bc8311a..5b83b5e657 100644
--- a/src/gui/qt/SFLLcd.cpp
+++ b/src/gui/qt/SFLLcd.cpp
@@ -38,8 +38,6 @@
// Others fixed font support "Monospace", "Fixed", "MiscFixed"
#define FONT_SIZE 10
-#define SCREEN "screen_main.png"
-#define OVERSCREEN "overscreen.png"
SFLLcd::SFLLcd(QWidget *parent)
: QLabel(parent, "screen", Qt::WNoAutoErase)
@@ -54,7 +52,8 @@ SFLLcd::SFLLcd(QWidget *parent)
{
setPaletteBackgroundColor(QColor("gray"));
mOverscreen.setPaletteBackgroundColor(QColor("gray"));
- //mOverscreen.hide();
+ mOverscreen.show();
+ mOverscreen.setText("test");
mUnselectedLineTimer = new QTimer(this);
QObject::connect(mUnselectedLineTimer, SIGNAL(timeout()),
this, SLOT(updateGlobalText()));
--
GitLab