diff --git a/libs/taxidermy/QWidgetBuilder.cpp b/libs/taxidermy/QWidgetBuilder.cpp index b91588b248907d614ef8d8c2a899d7d8061a1933..b2cef6c08fe78468b5b115de18532620ab03989b 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 68b9d7d0908fb42c9e456616c78b7e6340a7be46..9f33f6674fdd36eadf464c89223cab3516ac273e 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 6d5c4f4a47121efbc5dd916a732fa2b43bbfbe0a..9fac243bc0494c418a831542da60491af7bd83ed 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 33bc6b86bee5fa2572dd52f071ac5a1c764b31cb..d35e090084721bc7f06bf38e9582b620b1e3bbe5 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 ea15fd6195767255577e33e76cf8edd99bd4eba9..0d1efa4996a2e0641d54d5657dbd39b61634ed4d 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 b44bc8311a51604961e8831c8c42d477319515bc..5b83b5e6573f5889af14d39c90e785bc094f5708 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()));