diff --git a/AuthDialog.h b/AuthDialog.h --- a/AuthDialog.h +++ b/AuthDialog.h @@ -69,7 +69,6 @@ void on_userCB_currentIndexChanged(int index); private: - QString m_appname; QString m_message; void createUserCB(const PolkitQt1::Identity::List &identities); @@ -81,7 +80,6 @@ public: AuthDetails(const PolkitQt1::Details &details, const PolkitQt1::ActionDescription &actionDescription, - const QString &appname, QWidget *parent); private slots: diff --git a/AuthDialog.cpp b/AuthDialog.cpp --- a/AuthDialog.cpp +++ b/AuthDialog.cpp @@ -137,7 +137,7 @@ } } - AuthDetails *detailsDialog = new AuthDetails(details, m_actionDescription, m_appname, this); + AuthDetails *detailsDialog = new AuthDetails(details, m_actionDescription, this); detailsWidgetContainer->layout()->addWidget(detailsDialog); userCB->hide(); @@ -317,22 +317,11 @@ AuthDetails::AuthDetails(const PolkitQt1::Details &details, const PolkitQt1::ActionDescription &actionDescription, - const QString &appname, QWidget *parent) : QWidget(parent) { setupUi(this); - // better N/A than a blank space - if (appname.isEmpty()) { - QFont nameFont = app_label->font(); - nameFont.setItalic(true); - app_label->setFont(nameFont); - app_label->setText(i18n("Not Applicable")); - } else { - app_label->setText(appname); - } - foreach(const QString &key, details.keys()) { //krazy:exclude=foreach (Details is not a map/hash, but rather a method) int row = gridLayout->rowCount() + 1; @@ -351,13 +340,11 @@ gridLayout->addWidget(valueLabel, row, 1); } - // replace blank description - // neither isEmpty() or isNull() worked (?) - if (actionDescription.description() == "") { + if (actionDescription.description().isEmpty()) { QFont descrFont(action_label->font()); descrFont.setItalic(true); action_label->setFont(descrFont); - action_label->setText(i18n("Not Applicable")); + action_label->setText(i18n("Not Available")); } else { action_label->setText(actionDescription.description()); } diff --git a/authdetails.ui b/authdetails.ui --- a/authdetails.ui +++ b/authdetails.ui @@ -17,40 +17,39 @@ - - - - - 75 - true - + + + + IBeamCursor - Action: + Action ID: - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + Qt::TextSelectableByMouse - - + + + + + 75 + true + + - <null> + Vendor: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Qt::Horizontal + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + Vendor: @@ -66,74 +65,52 @@ - - - - - 75 - true - - + + - Vendor: + <null> - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 75 true - Application: + ID: - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - - Application: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - IBeamCursor - - - Action ID: - - - Qt::TextSelectableByMouse - - - - - + + 75 true - Action ID: + Action: - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + + + + + Qt::Horizontal