From 7ccb665e69735589c67ee283625a1e2c06da8d54 Mon Sep 17 00:00:00 2001 From: konrad Date: Sat, 1 Jan 2011 15:55:03 +0000 Subject: [PATCH] set copyright for 2011 in wolfs, minor fixes in overview menu, address assembly git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@701 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- src/mwin/overview.cpp | 7 +++---- src/wext/address.cpp | 12 ++++++------ wob/magicsmoke.wolf | 4 +++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/mwin/overview.cpp b/src/mwin/overview.cpp index bf49c12..19224cf 100644 --- a/src/mwin/overview.cpp +++ b/src/mwin/overview.cpp @@ -84,10 +84,9 @@ MOverview::MOverview(QString pk) m->addAction(tr("&Close Session"),this,SLOT(close())); //menus not connected to any specific tab... m=mb->addMenu(tr("&Actions")); - QMenu*m2=m->addMenu(tr("&Customer")); - m2->addAction(tr("&Show all customers"),this,SLOT(customerMgmt())); + m->addAction(tr("&Show all customers"),this,SLOT(customerMgmt())); - m2=m->addMenu(tr("Tickets and &Vouchers")); + QMenu*m2=m->addMenu(tr("Tickets and &Vouchers")); m2->addAction(tr("Return &ticket or voucher..."),this,SLOT(ticketReturn())) ->setEnabled(req->RReturnTicketVoucher); m2->addSeparator(); @@ -99,7 +98,7 @@ MOverview::MOverview(QString pk) m2->addAction(tr("&Edit Templates..."),this,SLOT(editTemplates())); m2->addAction(tr("&Update Templates Now"),req,SLOT(updateTemplates())); - m2=m->addMenu(tr("C&onfiguration")); + m2=m->addMenu(tr("&Configuration")); m2->addAction(tr("&Auto-Refresh settings..."),this,SLOT(setRefresh())); m2->addAction(tr("&Server Access settings..."),this,SLOT(webSettings())); m2->addAction(tr("&Display settings..."),this,SLOT(displaySettings())); diff --git a/src/wext/address.cpp b/src/wext/address.cpp index fb50fed..b707748 100644 --- a/src/wext/address.cpp +++ b/src/wext/address.cpp @@ -26,14 +26,14 @@ QString MOAddress::fullAddress(QString nm)const { //collect lines QStringList rl; - if(name().isNull()){ + if(name().isNull() || name()==""){ if(nm!="")rl< These files describe the database schema and communication protocol of MagicSmoke. - (c) Konrad Rosenbaum, 2009-2010<br/>these files are protected under the GNU AGPLv3 or at your option any newer + &copy; Konrad Rosenbaum, 2009-2011 + <br/>these files are protected under the GNU AGPLv3 or at your option any newer + -- 1.7.2.5