summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/drawpad/drawpad.cpp53
-rw-r--r--noncore/graphics/drawpad/pageinformationdialog.cpp10
-rw-r--r--noncore/graphics/drawpad/thumbnailview.cpp29
3 files changed, 59 insertions, 33 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index b0a414e..53db993 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -48,7 +48,8 @@
#include <qtoolbutton.h>
#include <qtooltip.h>
+#include <qwhatsthis.h>
DrawPad::DrawPad(QWidget* parent, const char* name)
- : QMainWindow(parent, name)
+ : QMainWindow(parent, name, WStyle_ContextHelp)
{
// init members
@@ -105,15 +106,18 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
QPEToolBar* pageToolBar = new QPEToolBar(this);
- QAction* newPageAction = new QAction(tr("New Page"), Resource::loadIconSet("new"), QString::null, 0, this);
+ QAction* newPageAction = new QAction(tr("New Page"), Resource::loadPixmap("new"), QString::null, 0, this);
connect(newPageAction, SIGNAL(activated()), this, SLOT(newPage()));
newPageAction->addTo(pageToolBar);
+ newPageAction->setWhatsThis( tr( "Click here to add a new sheet." ) );
- QAction* clearPageAction = new QAction(tr("Clear Page"), Resource::loadIconSet("drawpad/clear"), QString::null, 0, this);
+ QAction* clearPageAction = new QAction(tr("Clear Page"), Resource::loadPixmap("drawpad/clear"), QString::null, 0, this);
connect(clearPageAction, SIGNAL(activated()), this, SLOT(clearPage()));
clearPageAction->addTo(pageToolBar);
+ clearPageAction->setWhatsThis( tr( "Click here to erase the current sheet." ) );
- QAction* deletePageAction = new QAction(tr("Delete Page"), Resource::loadIconSet("trash"), QString::null, 0, this);
+ QAction* deletePageAction = new QAction(tr("Delete Page"), Resource::loadPixmap("trash"), QString::null, 0, this);
connect(deletePageAction, SIGNAL(activated()), this, SLOT(deletePage()));
deletePageAction->addTo(pageToolBar);
+ deletePageAction->setWhatsThis( tr( "Click here to remove the current sheet." ) );
QPEToolBar* emptyToolBar = new QPEToolBar(this);
@@ -127,24 +131,30 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
connect(m_pUndoAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(undo()));
m_pUndoAction->addTo(navigationToolBar);
+ m_pUndoAction->setWhatsThis( tr( "Click here to undo the last action." ) );
m_pRedoAction = new QAction(tr("Redo"), Resource::loadIconSet("drawpad/redo"), QString::null, 0, this);
connect(m_pRedoAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(redo()));
m_pRedoAction->addTo(navigationToolBar);
+ m_pRedoAction->setWhatsThis( tr( "Click here to re-perform the last action." ) );
m_pFirstPageAction = new QAction(tr("First Page"), Resource::loadIconSet("fastback"), QString::null, 0, this);
connect(m_pFirstPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goFirstPage()));
m_pFirstPageAction->addTo(navigationToolBar);
+ m_pFirstPageAction->setWhatsThis( tr( "Click here to view the first page." ) );
m_pPreviousPageAction = new QAction(tr("Previous Page"), Resource::loadIconSet("back"), QString::null, 0, this);
connect(m_pPreviousPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goPreviousPage()));
m_pPreviousPageAction->addTo(navigationToolBar);
+ m_pPreviousPageAction->setWhatsThis( tr( "Click here to view the previous page." ) );
m_pNextPageAction = new QAction(tr("Next Page"), Resource::loadIconSet("forward"), QString::null, 0, this);
connect(m_pNextPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goNextPage()));
m_pNextPageAction->addTo(navigationToolBar);
+ m_pNextPageAction->setWhatsThis( tr( "Click here to view the next page." ) );
m_pLastPageAction = new QAction(tr("Last Page"), Resource::loadIconSet("fastforward"), QString::null, 0, this);
connect(m_pLastPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goLastPage()));
m_pLastPageAction->addTo(navigationToolBar);
+ m_pLastPageAction->setWhatsThis( tr( "Click here to view the last page." ) );
// init draw mode toolbar
@@ -154,12 +164,14 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
m_pLineToolButton = new QToolButton(drawModeToolBar);
m_pLineToolButton->setToggleButton(true);
+ QWhatsThis::add( m_pLineToolButton, tr( "Click here to select one of the available tools to draw lines." ) );
+
QPopupMenu* linePopupMenu = new QPopupMenu(m_pLineToolButton);
- m_pPointToolAction = new QAction(tr("Draw Point"), Resource::loadIconSet("drawpad/point.png"), "", 0, this);
+ m_pPointToolAction = new QAction(tr("Draw Point"), Resource::loadPixmap("drawpad/point"), "", 0, this);
connect(m_pPointToolAction, SIGNAL(activated()), this, SLOT(setPointTool()));
m_pPointToolAction->addTo(linePopupMenu);
- m_pLineToolAction = new QAction(tr("Draw Line"), Resource::loadIconSet("drawpad/line.png"), "", 0, this);
+ m_pLineToolAction = new QAction(tr("Draw Line"), Resource::loadPixmap("drawpad/line"), "", 0, this);
connect(m_pLineToolAction, SIGNAL(activated()), this, SLOT(setLineTool()));
m_pLineToolAction->addTo(linePopupMenu);
@@ -170,12 +182,13 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
m_pRectangleToolButton = new QToolButton(drawModeToolBar);
m_pRectangleToolButton->setToggleButton(true);
+ QWhatsThis::add( m_pRectangleToolButton, tr( "Click here to select one of the available tools to draw rectangles." ) );
QPopupMenu* rectanglePopupMenu = new QPopupMenu(m_pRectangleToolButton);
- m_pRectangleToolAction = new QAction(tr("Draw Rectangle"), Resource::loadIconSet("drawpad/rectangle.png"), "", 0, this);
+ m_pRectangleToolAction = new QAction(tr("Draw Rectangle"), Resource::loadPixmap("drawpad/rectangle"), "", 0, this);
connect(m_pRectangleToolAction, SIGNAL(activated()), this, SLOT(setRectangleTool()));
m_pRectangleToolAction->addTo(rectanglePopupMenu);
- m_pFilledRectangleToolAction = new QAction(tr("Draw Filled Rectangle"), Resource::loadIconSet("drawpad/filledrectangle.png"), "", 0, this);
+ m_pFilledRectangleToolAction = new QAction(tr("Draw Filled Rectangle"), Resource::loadPixmap("drawpad/filledrectangle"), "", 0, this);
connect(m_pFilledRectangleToolAction, SIGNAL(activated()), this, SLOT(setFilledRectangleTool()));
m_pFilledRectangleToolAction->addTo(rectanglePopupMenu);
@@ -186,12 +199,13 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
m_pEllipseToolButton = new QToolButton(drawModeToolBar);
m_pEllipseToolButton->setToggleButton(true);
+ QWhatsThis::add( m_pEllipseToolButton, tr( "Click here to select one of the available tools to draw ellipses." ) );
QPopupMenu* ellipsePopupMenu = new QPopupMenu(m_pEllipseToolButton);
- m_pEllipseToolAction = new QAction(tr("Draw Ellipse"), Resource::loadIconSet("drawpad/ellipse.png"), "", 0, this);
+ m_pEllipseToolAction = new QAction(tr("Draw Ellipse"), Resource::loadPixmap("drawpad/ellipse"), "", 0, this);
connect(m_pEllipseToolAction, SIGNAL(activated()), this, SLOT(setEllipseTool()));
m_pEllipseToolAction->addTo(ellipsePopupMenu);
- m_pFilledEllipseToolAction = new QAction(tr("Draw Filled Ellipse"), Resource::loadIconSet("drawpad/filledellipse.png"), "", 0, this);
+ m_pFilledEllipseToolAction = new QAction(tr("Draw Filled Ellipse"), Resource::loadPixmap("drawpad/filledellipse"), "", 0, this);
connect(m_pFilledEllipseToolAction, SIGNAL(activated()), this, SLOT(setFilledEllipseTool()));
m_pFilledEllipseToolAction->addTo(ellipsePopupMenu);
@@ -200,18 +214,21 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
m_pEllipseToolButton->setPopupDelay(0);
- m_pTextToolAction = new QAction(tr("Insert Text"), Resource::loadIconSet("drawpad/text.png"), QString::null, 0, this);
+ m_pTextToolAction = new QAction(tr("Insert Text"), Resource::loadPixmap("drawpad/text"), QString::null, 0, this);
m_pTextToolAction->setToggleAction(true);
connect(m_pTextToolAction, SIGNAL(activated()), this, SLOT(setTextTool()));
m_pTextToolAction->addTo(drawModeToolBar);
+ m_pTextToolAction->setWhatsThis( tr( "Click here to select the text drawing tool." ) );
- m_pFillToolAction = new QAction(tr("Fill Region"), Resource::loadIconSet("drawpad/fill.png"), QString::null, 0, this);
+ m_pFillToolAction = new QAction(tr("Fill Region"), Resource::loadPixmap("drawpad/fill"), QString::null, 0, this);
m_pFillToolAction->setToggleAction(true);
connect(m_pFillToolAction, SIGNAL(activated()), this, SLOT(setFillTool()));
m_pFillToolAction->addTo(drawModeToolBar);
+ m_pFillToolAction->setWhatsThis( tr( "Click here to select the fill tool." ) );
- m_pEraseToolAction = new QAction(tr("Erase Point"), Resource::loadIconSet("drawpad/erase.png"), QString::null, 0, this);
+ m_pEraseToolAction = new QAction(tr("Erase Point"), Resource::loadPixmap("drawpad/erase"), QString::null, 0, this);
m_pEraseToolAction->setToggleAction(true);
connect(m_pEraseToolAction, SIGNAL(activated()), this, SLOT(setEraseTool()));
m_pEraseToolAction->addTo(drawModeToolBar);
+ m_pEraseToolAction->setWhatsThis( tr( "Click here to select the eraser tool." ) );
m_pTool = 0;
@@ -234,7 +251,9 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
m_pPenWidthSpinBox->setValue(1);
m_pPenWidthSpinBox->setFocusPolicy(QWidget::NoFocus);
+ QWhatsThis::add( m_pPenWidthSpinBox, tr( "Click here to select the width of the drawing pen." ) );
m_pPenColorToolButton = new QToolButton(drawParametersToolBar);
- m_pPenColorToolButton->setPixmap(Resource::loadPixmap("drawpad/pencolor.png"));
+ m_pPenColorToolButton->setPixmap(Resource::loadPixmap("drawpad/pencolor"));
+ QWhatsThis::add( m_pPenColorToolButton, tr( "Click here to select the color used when drawing." ) );
ColorPopupMenu* penColorPopupMenu = new ColorPopupMenu(Qt::black, m_pPenColorToolButton);
@@ -248,5 +267,6 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
m_pBrushColorToolButton = new QToolButton(drawParametersToolBar);
- m_pBrushColorToolButton->setPixmap(Resource::loadPixmap("drawpad/brushcolor.png"));
+ m_pBrushColorToolButton->setPixmap(Resource::loadPixmap("drawpad/brushcolor"));
+ QWhatsThis::add( m_pBrushColorToolButton, tr( "Click here to select the color used when filling in areas." ) );
ColorPopupMenu* brushColorPopupMenu = new ColorPopupMenu(Qt::white, m_pBrushColorToolButton);
@@ -546,6 +566,5 @@ void DrawPad::updateView()
uint pageCount = m_pDrawPadCanvas->pageCount();
- setCaption(tr("DrawPad") + " - " + tr("Page") + " "
- + QString::number(pagePosition) + "/" + QString::number(pageCount));
+ setCaption( tr( "DrawPad - Page %1/%2" ).arg( pagePosition ).arg( pageCount ) );
m_pUndoAction->setEnabled(m_pDrawPadCanvas->currentPage()->undoEnabled());
diff --git a/noncore/graphics/drawpad/pageinformationdialog.cpp b/noncore/graphics/drawpad/pageinformationdialog.cpp
index cb14d73..d769668 100644
--- a/noncore/graphics/drawpad/pageinformationdialog.cpp
+++ b/noncore/graphics/drawpad/pageinformationdialog.cpp
@@ -95,11 +95,11 @@ QString PageInformationDialog::dateTimeString(QDateTime dateTime)
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:
@@ -108,9 +108,9 @@ QString PageInformationDialog::dateTimeString(QDateTime dateTime)
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;
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
@@ -28,4 +28,5 @@
#include <qmessagebox.h>
#include <qtoolbutton.h>
+#include <qwhatsthis.h>
#define THUMBNAIL_SIZE 48
@@ -57,8 +58,9 @@ PageListBoxItem::PageListBoxItem(Page* page, QListBox* parent)
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();
@@ -145,11 +147,11 @@ QString PageListBoxItem::dateTimeString(QDateTime dateTime)
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:
@@ -158,9 +160,9 @@ QString PageListBoxItem::dateTimeString(QDateTime dateTime)
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;
@@ -230,5 +232,5 @@ Page* PageListBox::selected() const
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;
@@ -243,4 +245,5 @@ ThumbnailView::ThumbnailView(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas, QWi
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);
@@ -248,4 +251,5 @@ ThumbnailView::ThumbnailView(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas, QWi
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);
@@ -253,4 +257,5 @@ ThumbnailView::ThumbnailView(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas, QWi
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);
@@ -258,9 +263,11 @@ ThumbnailView::ThumbnailView(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas, QWi
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);