Whats This and a couple fixes

1 files changed, 29 insertions, 30 deletions

diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index 9410536..ead17b4 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -41,9 +41,10 @@
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 #include <qstring.h>
+#include <qwhatsthis.h>
 
 MainWindow::MainWindow()
-	: QMainWindow()
+	: QMainWindow( 0x0, 0x0, WStyle_ContextHelp )
 {
 	setCaption( tr( "Checkbook" ) );
 
@@ -59,36 +60,34 @@ MainWindow::MainWindow()
 	QPopupMenu *popup = new QPopupMenu( this );
 
 	bar = new QPEToolBar( this );
-	actionOpen = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null,
-							  0, this, 0 );
-	connect( actionOpen, SIGNAL( activated() ), this, SLOT( slotOpen() ) );
-	actionOpen->addTo( popup );
-	actionOpen->addTo( bar );
-
 	QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
+	a->setWhatsThis( tr( "Click here to create a new checkbook.\n\nYou also can select New from the Checkbook menu." ) );
 	connect( a, SIGNAL( activated() ), this, SLOT( slotNew() ) );
 	a->addTo( popup );
 	a->addTo( bar );
 
-	actionDelete = new QAction( tr( "Delete" ), Resource::loadPixmap( "editdelete" ), QString::null,
+	actionOpen = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
+							  0, this, 0 );
+	actionOpen->setWhatsThis( tr( "Select a checkbook and then click here to edit it.\n\nYou also can select Edit from the Checkbook menu, or click and hold on a checkbook name." ) );
+	connect( actionOpen, SIGNAL( activated() ), this, SLOT( slotEdit() ) );
+	actionOpen->addTo( popup );
+	actionOpen->addTo( bar );
+
+	actionDelete = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
 								0, this, 0 );
+	actionDelete->setWhatsThis( tr( "Select a checkbook and then click here delete it.\n\nYou also can select Delete from the Checkbook menu." ) );
 	connect( actionDelete, SIGNAL( activated() ), this, SLOT( slotDelete() ) );
 	actionDelete->addTo( popup );
 	actionDelete->addTo( bar );
 
-	popup->insertSeparator();
-
-	a = new QAction( tr( "Exit" ), QString::null, 0, this, 0 );
-	connect( a, SIGNAL( activated() ), this, SLOT( close() ) );
-	a->addTo( popup );
-
 	mb->insertItem( tr( "Checkbook" ), popup );
 
 	// Build Checkbook selection list control
 	cbList = new QListBox( this );
+	QWhatsThis::add( cbList, tr( "This is a listing of all checkbooks currently available." ) );
 	QPEApplication::setStylusOperation( cbList->viewport(), QPEApplication::RightOnHold );
 	connect( cbList, SIGNAL( rightButtonPressed( QListBoxItem *, const QPoint & ) ),
-			 this, SLOT( slotOpen() ) );
+			 this, SLOT( slotEdit() ) );
 	setCentralWidget( cbList );
 
 	// Load Checkbook selection list
@@ -113,7 +112,19 @@ MainWindow::~MainWindow()
 {
 }
 
-void MainWindow::slotOpen()
+void MainWindow::slotNew()
+{
+	Checkbook *currcb = new Checkbook( this, "", cbDir, currencySymbol );
+	currcb->showMaximized();
+	if ( currcb->exec() == QDialog::Accepted )
+	{
+		cbList->insertItem( currcb->getName() );
+		cbList->sort();
+		delete currcb;
+	}
+}
+
+void MainWindow::slotEdit()
 {
 	QString currname = cbList->currentText();
 	Checkbook *currcb = new Checkbook( this, currname, cbDir, currencySymbol );
@@ -136,29 +147,17 @@ void MainWindow::slotOpen()
 	}
 }
 
-void MainWindow::slotNew()
-{
-	Checkbook *currcb = new Checkbook( this, "", cbDir, currencySymbol );
-	currcb->showMaximized();
-	if ( currcb->exec() == QDialog::Accepted )
-	{
-		cbList->insertItem( currcb->getName() );
-		cbList->sort();
-		delete currcb;
-	}
-}
-
 void MainWindow::slotDelete()
 {
 	if ( QPEMessageBox::confirmDelete ( this, tr( "Delete checkbook" ), cbList->currentText() ) )
 	{
-		cbList->removeItem( cbList->currentItem() );
-
 		QString name = cbDir + cbList->currentText() + ".qcb";
 		QFile f( name );
 		if ( f.exists() )
 		{
 			f.remove();
 		}
+
+		cbList->removeItem( cbList->currentItem() );
 	}
 }