[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kplato
From:       Dag Andersen <danders () get2net ! dk>
Date:       2006-03-03 10:40:59
Message-ID: 1141382459.133699.4351.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 515284 by danders:

Put back project name in printout.

 M  +12 -10    kptganttview.cc  


--- trunk/koffice/kplato/kptganttview.cc #515283:515284
@@ -1034,19 +1034,21 @@
     p.drawRect(0,0,metrics.width(),metrics.height());
     QString text;
     int hei = 0;
-    QRect r = p.boundingRect(1,0,0,0, Qt::AlignLeft, text );
-    if (m_mainview)
+    text = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime());
+    QRect r = p.boundingRect(metrics.width()-1,0,0,0, Qt::AlignRight, text );
+    p.drawText( r, Qt::AlignRight, text );
+    hei = r.height();
+    //kdDebug()<<"Date r="<<r.left()<<","<<r.top()<<" "<<r.width()<<"x"<<r.height()<<endl;
+    if (m_project)
     {
-      text = m_mainview->getPart()->getProject().name();
-      p.drawText( r, Qt::AlignLeft, text );
+      QRect re = p.boundingRect(1,0,0,0, Qt::AlignLeft, text );
+      re.setWidth(metrics.width()-r.width()-5); // don't print on top of date
+      p.drawText( re, Qt::AlignLeft, m_project->name() );
       hei = r.height();
-      //kdDebug()<<"Project r="<<r.left()<<","<<r.top()<<" "<<r.width()<<"x"<<r.height()<<endl;
+      //kdDebug()<<"Project r="<<re.left()<<","<<re.top()<<" "<<re.width()<<"x"<<re.height()<<": "<<endl;
+      hei = QMAX(hei, re.height());
     }
-    text = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime());
-    r = p.boundingRect(metrics.width()-1,0,0,0, Qt::AlignRight, text );
-    p.drawText( r, Qt::AlignRight, text );
-    hei = QMAX(hei, r.height());
-    //kdDebug()<<"Date r="<<r.left()<<","<<r.top()<<" "<<r.width()<<"x"<<r.height()<<endl;
+    
     hei++;
     p.drawLine(0,hei,metrics.width(),hei);
     hei += 3;
[prev in list] [next in list] [prev in thread] [next in thread]