From 91444a2bd631f94abdc8fad95429443c07a7bda3 Mon Sep 17 00:00:00 2001 From: kibergus Date: Thu, 9 Dec 2010 20:30:36 +0000 Subject: [PATCH] Making text in label always the same as button text. Not launching qussd when message is emptyw git-svn-id: file:///svnroot/ussd-widget/trunk@44 d197f4d6-dc93-42ad-8354-0da1f58e353f --- ussd4all/src/qussd.cpp | 5 ++--- ussd4all/src/ussdd | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ussd4all/src/qussd.cpp b/ussd4all/src/qussd.cpp index 8c39434..2da8ebe 100644 --- a/ussd4all/src/qussd.cpp +++ b/ussd4all/src/qussd.cpp @@ -34,14 +34,13 @@ class QUssd : public QMainWindow { replyLabel->setMinimumWidth(400); replyLabel->setMinimumHeight(200); replyLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); -// replyLabel->setWordWrap(true); -// replyLabel->setReadOnly(true); replyLabel->setFrameStyle(QFrame::NoFrame); QPalette pal = palette(); pal.setColor(QPalette::Base, Qt::transparent); + pal.setColor(QPalette::Text, pal.color(QPalette::ButtonText)); replyLabel->setPalette(pal); // replyLabel->setTextBackgroundColor(Qt::black); - replyLabel->setTextColor(Qt::white); +// replyLabel->setTextColor(Qt::white); replyLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); numberLabel = new QLabel(""); diff --git a/ussd4all/src/ussdd b/ussd4all/src/ussdd index c74223c..aea4720 100755 --- a/ussd4all/src/ussdd +++ b/ussd4all/src/ussdd @@ -12,7 +12,7 @@ skip = False; def ussd_released (message, str): global skip - if not skip: + if not skip and not message.empty(): subprocess.Popen(["qussd", message]) skip = False return True -- 1.7.9.5