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

diff --git a/src/mwin/overview.cpp b/src/mwin/overview.cpp
index bf49c12..19224cf 100644 (file)
--- 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 (file)
--- 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<<nm;
        }else rl<<name();
-       if(!addr1().isNull())rl<<addr1();
-       if(!addr2().isNull())rl<<addr2();
-       if(!city().isNull())rl<<city();
-       if(!state().isNull())rl<<state();
-       if(!zipcode().isNull())rl<<zipcode();
+       if(!addr1().isNull() && addr1()!="")rl<<addr1();
+       if(!addr2().isNull() && addr2()!="")rl<<addr2();
+       if(!city().isNull() && city()!="")rl<<city();
+       if(!state().isNull() && state()!="")rl<<state();
+       if(!zipcode().isNull() && zipcode()!="")rl<<zipcode();
        if(!country().isNull())rl<<country().value().name();
        //assemble
        QString r;

diff --git a/wob/magicsmoke.wolf b/wob/magicsmoke.wolf
index e31d287..41b9d41 100644 (file)
--- a/wob/magicsmoke.wolf
+++ b/wob/magicsmoke.wolf
@@ -8,7 +8,9 @@
   -->
 <Wolf>
        <Doc>These files describe the database schema and communication protocol of MagicSmoke.</Doc>
-       <Doc>(c) Konrad Rosenbaum, 2009-2010&lt;br/>these files are protected under the GNU AGPLv3 or at your option any newer</Doc>
+       <Doc>&amp;copy; Konrad Rosenbaum, 2009-2011
+       &lt;br/>these files are protected under the GNU AGPLv3 or at your option any newer
+       </Doc>
        <!-- generic settings -->
        <Project baseDir=".." wobDir="wob" name="MagicSmoke" xml-namespace="http://silmor.de/MagicSmoke" auth="session" encoding="wob"/>
        <Version comm="0100" needcomm="0100" humanReadable="1.91 alpha" svnTarget="."/>