summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-25 22:29:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-03-25 22:29:05 +0000
commit8ef1b3d8bd0a0cc19444032afecfd6c8658788a5 (patch)
tree6d76a3f449dc6ed9378a0c56e885605943d89c79
parent5e4e2d5036727d5c3087b269716d2240bdb86a9c (diff)
downloadtdelibs-8ef1b3d8.tar.gz
tdelibs-8ef1b3d8.zip
Allow deletion of connection to remote printer
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1107534 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kdeprint/management/kmmainview.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp
index a1ecd6bbc..3bb20a99e 100644
--- a/kdeprint/management/kmmainview.cpp
+++ b/kdeprint/management/kmmainview.cpp
@@ -385,7 +385,8 @@ void KMMainView::slotPrinterSelected(const QString& prname)
//{
int mask = (m_manager->hasManagement() ? m_manager->printerOperationMask() : 0);
bool sp = !(p && p->isSpecial());
- m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit()));
+// m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit()));
+ m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && !p->isImplicit()));
m_actions->action("printer_configure")->setEnabled(!sp || ((mask & KMManager::PrinterConfigure) && p && !p->isClass(true) /*&& p->isLocal()*/));
m_actions->action("printer_hard_default")->setEnabled((sp && (mask & KMManager::PrinterDefault) && p && !p->isClass(true) && !p->isHardDefault() && p->isLocal()));
m_actions->action("printer_soft_default")->setEnabled((p && !p->isSoftDefault()));
@@ -455,6 +456,8 @@ void KMMainView::slotRightButtonClicked(const QString& prname, const QPoint& p)
}
else
{
+ m_actions->action("printer_remove")->plug(m_pop);
+ m_pop->insertSeparator();
if (!printer->isClass(true))
{
m_actions->action("printer_configure")->plug(m_pop);