From: konrad Date: Tue, 18 Nov 2008 09:42:37 +0000 (+0000) Subject: *fix: recheck only possible when order not placed yet X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7e9e1ff9594217b22460017d1425291d21666ab2;p=konrad%2Fsmoke.git *fix: recheck only possible when order not placed yet *fix: "Uhr" in German translation needs quotes git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@195 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- diff --git a/src/orderwin.cpp b/src/orderwin.cpp index 7a96b7a..565b990 100644 --- a/src/orderwin.cpp +++ b/src/orderwin.cpp @@ -51,7 +51,8 @@ MOrderWindow::MOrderWindow(QWidget*par,MWebRequest*r,const MOrder&o) ->setEnabled(req->hasRole("createorder")&&o.canOrder()); m->addAction(tr("&Sell..."),this,SLOT(createSale())) ->setEnabled(req->hasRole("createsale")&&o.canSell()); - m->addAction(tr("&Prune and recheck..."),this,SLOT(recheckOrder())); + m->addAction(tr("&Prune and recheck..."),this,SLOT(recheckOrder())) + ->setEnabled(o.orderID()<0); m->addSeparator(); m->addAction(tr("C&ancel Order..."),this,SLOT(cancelOrder())) ->setEnabled(req->hasRole("cancelorder")&&o.isStored()); diff --git a/src/smoke_de.ts b/src/smoke_de.ts index 1642353..b2802a9 100644 --- a/src/smoke_de.ts +++ b/src/smoke_de.ts @@ -1,5 +1,6 @@ + MCheckDialog @@ -773,7 +774,7 @@ At least %1 Bits of random are required. yyyy-MM-dd hh:mm ap date/time format - ddd, dd.MM.yyyy hh:mm Uhr + ddd, dd.MM.yyyy hh:mm 'Uhr'