1 files changed, 18 insertions, 11 deletions

diff --git a/noncore/graphics/drawpad/thumbnailview.cpp b/noncore/graphics/drawpad/thumbnailview.cpp
index 9b08ca2..90ba39c 100644
--- a/noncore/graphics/drawpad/thumbnailview.cpp
+++ b/noncore/graphics/drawpad/thumbnailview.cpp
@@ -18,24 +18,25 @@
 #include "newpagedialog.h"
 #include "page.h"
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/timestring.h>
 
 #include <qapplication.h>
 #include <qimage.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
+#include <qwhatsthis.h>
 
 #define THUMBNAIL_SIZE 48
 
 PageListBoxItem::PageListBoxItem(Page* page, QListBox* parent)
     : QListBoxItem(parent)
 {
     m_pPage = page;
 
     QImage image = m_pPage->pixmap()->convertToImage();
 
     int previewWidth = THUMBNAIL_SIZE;
     int previewHeight = THUMBNAIL_SIZE;
@@ -47,28 +48,29 @@ PageListBoxItem::PageListBoxItem(Page* page, QListBox* parent)
         widthScale = (float)previewWidth / float(image.width());
     }
 
     if (previewHeight < image.height()) {
         heightScale = (float)previewHeight / float(image.height());
     }
 
     float scale = (widthScale < heightScale ? widthScale : heightScale);
     QImage thumbnailImage = image.smoothScale((int)(image.width() * scale) , (int)(image.height() * scale));
 
     m_thumbnail.convertFromImage(thumbnailImage);
 
-    m_titleText = QObject::tr("Title:") + " " + m_pPage->title();
-    m_dimensionText = QObject::tr("Dimension:") + " " + QString::number(m_pPage->pixmap()->width())
-                      + "x" + QString::number(m_pPage->pixmap()->height());
-    m_dateText = QObject::tr("Date:") + " " + dateTimeString(m_pPage->lastModified());
+    m_titleText = QObject::tr( "Title: %1" ).arg( m_pPage->title() );
+    m_dimensionText = QObject::tr( "Dimension: %1x%2" ).
+                        arg( m_pPage->pixmap()->width() ).
+                        arg( m_pPage->pixmap()->height() );
+    m_dateText = QObject::tr( "Date: %1" ).arg( dateTimeString(m_pPage->lastModified()) );
 
     QColor baseColor = parent->colorGroup().base();
     int h, s, v;
     baseColor.hsv(&h, &s, &v);
 
     if (v > 128) {
         m_alternateColor = baseColor.dark(115);
     } else if (baseColor != Qt::black) {
         m_alternateColor = baseColor.light(115);
     } else {
         m_alternateColor = QColor(32, 32, 32);
     }
@@ -135,42 +137,42 @@ QString PageListBoxItem::dateTimeString(QDateTime dateTime)
 {
     QString result;
 
     Config config("qpe");
     config.setGroup("Date");
 
     QChar separator = config.readEntry("Separator", "/")[0];
     DateFormat::Order shortOrder = (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear);
 
     for (int i = 0; i < 3; i++) {
         switch((shortOrder >> (i * 3)) & 0x0007) {
             case 0x0001:
-                result += QString().sprintf("%02d", dateTime.date().day());
+                result.append( QString().sprintf("%02d", dateTime.date().day()) );
                 break;
             case 0x0002:
-                result += QString().sprintf("%02d", dateTime.date().month());
+                result.append( QString().sprintf("%02d", dateTime.date().month()) );
                 break;
             case 0x0004:
-                result += QString().sprintf("%04d", dateTime.date().year());
+                result.append( QString().sprintf("%04d", dateTime.date().year()) );
                 break;
             default:
                 break;
         }
 
         if (i < 2) {
-            result += separator;
+            result.append( separator );
         }
     }
 
-    result += QString().sprintf(" %02d:%02d", dateTime.time().hour(), dateTime.time().minute());
+    result.append( QString().sprintf(" %02d:%02d", dateTime.time().hour(), dateTime.time().minute()) );
 
     return result;
 }
 
 PageListBox::PageListBox(DrawPadCanvas* drawPadCanvas, QWidget* parent, const char* name)
     : QListBox(parent, name)
 {
     m_pDrawPadCanvas = drawPadCanvas;
 
     setVScrollBarMode(QScrollView::AlwaysOn);
 
     updateView();
@@ -220,57 +222,62 @@ Page* PageListBox::selected() const
     PageListBoxItem* selectedItem = (PageListBoxItem*)item(currentItem());
 
     if (selectedItem) {
         page = selectedItem->page();
     } else {
         page = NULL;
     }
 
     return page;
 }
 
 ThumbnailView::ThumbnailView(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas, QWidget* parent, const char* name)
-    : QWidget(parent, name, Qt::WType_Modal | Qt::WType_TopLevel)
+    : QWidget(parent, name, Qt::WType_Modal | Qt::WType_TopLevel | Qt::WStyle_ContextHelp)
 {
     inLoop = false;
 
     m_pDrawPad = drawPad;
     m_pDrawPadCanvas = drawPadCanvas;
 
     setCaption(tr("DrawPad - Thumbnail View"));
 
     QToolButton* newPageButton = new QToolButton(this);
     newPageButton->setIconSet(Resource::loadIconSet("new"));
     newPageButton->setAutoRaise(true);
     connect(newPageButton, SIGNAL(clicked()), this, SLOT(newPage()));
+    QWhatsThis::add( newPageButton, tr( "Click here to add a new sheet." ) );
 
     QToolButton* clearPageButton = new QToolButton(this);
     clearPageButton->setIconSet(Resource::loadIconSet("drawpad/clear"));
     clearPageButton->setAutoRaise(true);
     connect(clearPageButton, SIGNAL(clicked()), this, SLOT(clearPage()));
+    QWhatsThis::add( clearPageButton, tr( "Click here to erase the current sheet." ) );
 
     QToolButton* deletePageButton = new QToolButton(this);
     deletePageButton->setIconSet(Resource::loadIconSet("trash"));
     deletePageButton->setAutoRaise(true);
     connect(deletePageButton, SIGNAL(clicked()), this, SLOT(deletePage()));
+    QWhatsThis::add( deletePageButton, tr( "Click here to remove the current sheet." ) );
 
     m_pMovePageUpButton = new QToolButton(this);
     m_pMovePageUpButton->setIconSet(Resource::loadIconSet("up"));
     m_pMovePageUpButton->setAutoRaise(true);
     connect(m_pMovePageUpButton, SIGNAL(clicked()), this, SLOT(movePageUp()));
-
+    QWhatsThis::add( m_pMovePageUpButton, tr( "Click here to move the current sheet up one position in the list." ) );
+    
     m_pMovePageDownButton = new QToolButton(this);
     m_pMovePageDownButton->setIconSet(Resource::loadIconSet("down"));
     m_pMovePageDownButton->setAutoRaise(true);
     connect(m_pMovePageDownButton, SIGNAL(clicked()), this, SLOT(movePageDown()));
+    QWhatsThis::add( m_pMovePageDownButton, tr( "Click here to move the current sheet down one position in the list." ) );
 
     m_pPageListBox = new PageListBox(m_pDrawPadCanvas, this);
     connect(m_pPageListBox, SIGNAL(selectionChanged()), this, SLOT(changePage()));
 
     QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4);
     QHBoxLayout* buttonLayout = new QHBoxLayout(0);
 
     buttonLayout->addWidget(newPageButton);
     buttonLayout->addWidget(clearPageButton);
     buttonLayout->addWidget(deletePageButton);
     buttonLayout->addStretch();
     buttonLayout->addWidget(m_pMovePageUpButton);