From 426aa964bb2bd94c4ddc36f903524a0a4e33ed74 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Sun, 1 Feb 2009 15:57:45 +0000 Subject: [PATCH] setTooltip -> setHelpText This makes the status tips actually appear in the status bar. However, this doesn't work in KMail standalone (or in KOrganizer standalone), anybody got an idea why? You'll need an up-to-date kdelibs for this. svn path=/trunk/KDE/kdepim/; revision=919756 --- kmmainwidget.cpp | 34 ++++++++++++++--------------- kmmainwin.cpp | 7 +++--- kmreadermainwin.cpp | 2 +- kmreaderwin.cpp | 24 ++++++++++---------- messageactions.cpp | 8 +++---- messagelistview/core/widgetbase.cpp | 2 -- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index d2b7c52d0..ea50a9fdf 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -3692,7 +3692,7 @@ void KMMainWidget::setupActions() mTrashAction->setIcon(KIcon("user-trash")); mTrashAction->setIconText( i18nc( "@action:intoolbar Move to Trash", "Trash" ) ); mTrashAction->setShortcut(QKeySequence(Qt::Key_Delete)); - mTrashAction->setToolTip(i18n("Move message to trashcan")); + mTrashAction->setHelpText(i18n("Move message to trashcan")); connect(mTrashAction, SIGNAL(triggered(bool)), SLOT(slotTrashMsg())); /* The delete action is nowhere in the gui, by default, so we need to make @@ -3708,7 +3708,7 @@ void KMMainWidget::setupActions() actionCollection()->addAction("move_thread_to_trash", mTrashThreadAction ); mTrashThreadAction->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_Delete)); mTrashThreadAction->setIcon(KIcon("user-trash")); - mTrashThreadAction->setToolTip(i18n("Move thread to trashcan") ); + mTrashThreadAction->setHelpText(i18n("Move thread to trashcan") ); connect(mTrashThreadAction, SIGNAL(triggered(bool)), SLOT(slotTrashThread())); mDeleteThreadAction = new KAction(KIcon("edit-delete"), i18n("Delete T&hread"), this); @@ -3931,19 +3931,19 @@ void KMMainWidget::setupActions() mMarkThreadAsReadAction = new KAction(KIcon("mail-mark-read"), i18n("Mark Thread as &Read"), this); actionCollection()->addAction("thread_read", mMarkThreadAsReadAction ); connect(mMarkThreadAsReadAction, SIGNAL(triggered(bool) ), SLOT(slotSetThreadStatusRead())); - mMarkThreadAsReadAction->setToolTip(i18n("Mark all messages in the selected thread as read")); + mMarkThreadAsReadAction->setHelpText(i18n("Mark all messages in the selected thread as read")); mThreadStatusMenu->addAction( mMarkThreadAsReadAction ); mMarkThreadAsNewAction = new KAction(KIcon("mail-mark-unread-new"), i18n("Mark Thread as &New"), this); actionCollection()->addAction("thread_new", mMarkThreadAsNewAction ); connect(mMarkThreadAsNewAction, SIGNAL(triggered(bool) ), SLOT(slotSetThreadStatusNew())); - mMarkThreadAsNewAction->setToolTip( i18n("Mark all messages in the selected thread as new")); + mMarkThreadAsNewAction->setHelpText( i18n("Mark all messages in the selected thread as new")); mThreadStatusMenu->addAction( mMarkThreadAsNewAction ); mMarkThreadAsUnreadAction = new KAction(KIcon("mail-mark-unread"), i18n("Mark Thread as &Unread"), this); actionCollection()->addAction("thread_unread", mMarkThreadAsUnreadAction ); connect(mMarkThreadAsUnreadAction, SIGNAL(triggered(bool) ), SLOT(slotSetThreadStatusUnread())); - mMarkThreadAsUnreadAction->setToolTip(i18n("Mark all messages in the selected thread as unread")); + mMarkThreadAsUnreadAction->setHelpText(i18n("Mark all messages in the selected thread as unread")); mThreadStatusMenu->addAction( mMarkThreadAsUnreadAction ); mThreadStatusMenu->addSeparator(); @@ -4000,28 +4000,28 @@ void KMMainWidget::setupActions() KAction *action = new KAction(i18nc("View->","&Expand Thread"), this); actionCollection()->addAction("expand_thread", action ); action->setShortcut(QKeySequence(Qt::Key_Period)); - action->setToolTip(i18n("Expand the current thread")); + action->setHelpText(i18n("Expand the current thread")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotExpandThread())); } { KAction *action = new KAction(i18nc("View->","&Collapse Thread"), this); actionCollection()->addAction("collapse_thread", action ); action->setShortcut(QKeySequence(Qt::Key_Comma)); - action->setToolTip( i18n("Collapse the current thread")); + action->setHelpText( i18n("Collapse the current thread")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotCollapseThread())); } { KAction *action = new KAction(i18nc("View->","Ex&pand All Threads"), this); actionCollection()->addAction("expand_all_threads", action ); action->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_Period)); - action->setToolTip( i18n("Expand all threads in the current folder")); + action->setHelpText( i18n("Expand all threads in the current folder")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotExpandAllThreads())); } { KAction *action = new KAction(i18nc("View->","C&ollapse All Threads"), this); actionCollection()->addAction("collapse_all_threads", action ); action->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_Comma)); - action->setToolTip( i18n("Collapse all threads in the current folder")); + action->setHelpText( i18n("Collapse all threads in the current folder")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotCollapseAllThreads())); } @@ -4040,7 +4040,7 @@ void KMMainWidget::setupActions() KAction *action = new KAction(i18n("&Next Message"), this); actionCollection()->addAction("go_next_message", action ); action->setShortcuts(KShortcut( "N; Right" )); - action->setToolTip(i18n("Go to the next message")); + action->setHelpText(i18n("Go to the next message")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotSelectNextMessage())); } { @@ -4053,13 +4053,13 @@ void KMMainWidget::setupActions() action->setIcon( KIcon( "go-next" ) ); } action->setIconText( i18nc( "@action:inmenu Goto next unread message", "Next" ) ); - action->setToolTip(i18n("Go to the next unread message")); + action->setHelpText(i18n("Go to the next unread message")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotSelectNextUnreadMessage())); } { KAction *action = new KAction(i18n("&Previous Message"), this); actionCollection()->addAction("go_prev_message", action ); - action->setToolTip(i18n("Go to the previous message")); + action->setHelpText(i18n("Go to the previous message")); action->setShortcuts(KShortcut( "P; Left" )); connect(action, SIGNAL(triggered(bool) ), SLOT(slotSelectPreviousMessage())); } @@ -4073,7 +4073,7 @@ void KMMainWidget::setupActions() action->setIcon( KIcon( "go-previous" ) ); } action->setIconText( i18nc( "@action:inmenu Goto previous unread message.","Previous" ) ); - action->setToolTip(i18n("Go to the previous unread message")); + action->setHelpText(i18n("Go to the previous unread message")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotSelectPreviousUnreadMessage())); } { @@ -4081,7 +4081,7 @@ void KMMainWidget::setupActions() actionCollection()->addAction("go_next_unread_folder", action ); connect(action, SIGNAL(triggered(bool) ), SLOT(slotNextUnreadFolder())); action->setShortcut(QKeySequence(Qt::ALT+Qt::Key_Plus)); - action->setToolTip(i18n("Go to the next folder with unread messages")); + action->setHelpText(i18n("Go to the next folder with unread messages")); KShortcut shortcut = KShortcut(action->shortcuts()); shortcut.setAlternate( QKeySequence( Qt::CTRL+Qt::Key_Plus ) ); action->setShortcuts( shortcut ); @@ -4090,7 +4090,7 @@ void KMMainWidget::setupActions() KAction *action = new KAction(i18n("Previous Unread F&older"), this); actionCollection()->addAction("go_prev_unread_folder", action ); action->setShortcut(QKeySequence(Qt::ALT+Qt::Key_Minus)); - action->setToolTip(i18n("Go to the previous folder with unread messages")); + action->setHelpText(i18n("Go to the previous folder with unread messages")); connect(action, SIGNAL(triggered(bool) ), SLOT(slotPrevUnreadFolder())); KShortcut shortcut = KShortcut(action->shortcuts()); shortcut.setAlternate( QKeySequence( Qt::CTRL+Qt::Key_Minus ) ); @@ -4100,7 +4100,7 @@ void KMMainWidget::setupActions() KAction *action = new KAction(i18nc("Go->","Next Unread &Text"), this); actionCollection()->addAction("go_next_unread_text", action ); action->setShortcut(QKeySequence(Qt::Key_Space)); - action->setToolTip(i18n("Go to the next unread text")); + action->setHelpText(i18n("Go to the next unread text")); action->setWhatsThis( i18n("Scroll down current message. " "If at end of current message, " "go to next unread message.")); @@ -4128,7 +4128,7 @@ void KMMainWidget::setupActions() { KAction *action = new KAction(KIcon("kmail"), i18n("KMail &Introduction"), this); actionCollection()->addAction("help_kmail_welcomepage", action ); - action->setToolTip( i18n("Display KMail's Welcome Page") ); + action->setHelpText( i18n("Display KMail's Welcome Page") ); connect(action, SIGNAL(triggered(bool) ), SLOT(slotIntro())); } diff --git a/kmmainwin.cpp b/kmmainwin.cpp index 8e444095c..60aff9cbb 100644 --- a/kmmainwin.cpp +++ b/kmmainwin.cpp @@ -105,9 +105,10 @@ KMMainWin::~KMMainWin() } } -void KMMainWin::displayStatusMsg(const QString& aText) +void KMMainWin::displayStatusMsg( const QString& aText ) { - if ( !statusBar() || !mLittleProgress) return; + if ( !statusBar() || !mLittleProgress ) + return; int statusWidth = statusBar()->width() - mLittleProgress->width() - fontMetrics().maxWidth(); @@ -121,7 +122,7 @@ void KMMainWin::displayStatusMsg(const QString& aText) // text.replace("<", "<"); // text.replace(">", ">"); - statusBar()->changeItem(text, mMessageStatusId); + statusBar()->changeItem( text, mMessageStatusId ); } //----------------------------------------------------------------------------- diff --git a/kmreadermainwin.cpp b/kmreadermainwin.cpp index 4a6efa89d..f18393d42 100644 --- a/kmreadermainwin.cpp +++ b/kmreadermainwin.cpp @@ -278,7 +278,7 @@ void KMReaderMainWin::setupAccel() mTrashAction = new KAction( KIcon( "user-trash" ), i18n("&Move to Trash"), this ); mTrashAction->setIconText( i18nc( "@action:intoolbar Move to Trash", "Trash" ) ); - mTrashAction->setToolTip( i18n( "Move message to trashcan" ) ); + mTrashAction->setHelpText( i18n( "Move message to trashcan" ) ); mTrashAction->setShortcut( QKeySequence( Qt::Key_Delete ) ); actionCollection()->addAction( "move_to_trash", mTrashAction ); connect( mTrashAction, SIGNAL(triggered()), this, SLOT(slotTrashMsg()) ); diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp index ff15c1b2f..b9c513904 100644 --- a/kmreaderwin.cpp +++ b/kmreaderwin.cpp @@ -548,7 +548,7 @@ void KMReaderWin::createActions() // header style KActionMenu *headerMenu = new KActionMenu(i18nc("View->", "&Headers"), this); ac->addAction("view_headers", headerMenu ); - headerMenu->setToolTip( i18n("Choose display style of message headers") ); + headerMenu->setHelpText( i18n("Choose display style of message headers") ); connect( headerMenu, SIGNAL(activated()), this, SLOT(slotCycleHeaderStyles()) ); @@ -557,49 +557,49 @@ void KMReaderWin::createActions() raction = new KToggleAction( i18nc("View->headers->", "&Enterprise Headers"), this); ac->addAction( "view_headers_enterprise", raction ); connect( raction, SIGNAL(triggered(bool)), SLOT(slotEnterpriseHeaders()) ); - raction->setToolTip( i18n("Show the list of headers in Enterprise style") ); + raction->setHelpText( i18n("Show the list of headers in Enterprise style") ); group->addAction( raction ); headerMenu->addAction( raction ); raction = new KToggleAction(i18nc("View->headers->", "&Fancy Headers"), this); ac->addAction("view_headers_fancy", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotFancyHeaders())); - raction->setToolTip( i18n("Show the list of headers in a fancy format") ); + raction->setHelpText( i18n("Show the list of headers in a fancy format") ); group->addAction( raction ); headerMenu->addAction( raction ); raction = new KToggleAction(i18nc("View->headers->", "&Brief Headers"), this); ac->addAction("view_headers_brief", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotBriefHeaders())); - raction->setToolTip( i18n("Show brief list of message headers") ); + raction->setHelpText( i18n("Show brief list of message headers") ); group->addAction( raction ); headerMenu->addAction( raction ); raction = new KToggleAction(i18nc("View->headers->", "&Standard Headers"), this); ac->addAction("view_headers_standard", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotStandardHeaders())); - raction->setToolTip( i18n("Show standard list of message headers") ); + raction->setHelpText( i18n("Show standard list of message headers") ); group->addAction( raction ); headerMenu->addAction( raction ); raction = new KToggleAction(i18nc("View->headers->", "&Long Headers"), this); ac->addAction("view_headers_long", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotLongHeaders())); - raction->setToolTip( i18n("Show long list of message headers") ); + raction->setHelpText( i18n("Show long list of message headers") ); group->addAction( raction ); headerMenu->addAction( raction ); raction = new KToggleAction(i18nc("View->headers->", "&All Headers"), this); ac->addAction("view_headers_all", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotAllHeaders())); - raction->setToolTip( i18n("Show all message headers") ); + raction->setHelpText( i18n("Show all message headers") ); group->addAction( raction ); headerMenu->addAction( raction ); // attachment style KActionMenu *attachmentMenu = new KActionMenu(i18nc("View->", "&Attachments"), this); ac->addAction("view_attachments", attachmentMenu ); - attachmentMenu->setToolTip( i18n("Choose display style of attachments") ); + attachmentMenu->setHelpText( i18n("Choose display style of attachments") ); connect( attachmentMenu, SIGNAL(activated()), this, SLOT(slotCycleAttachmentStrategy()) ); @@ -607,28 +607,28 @@ void KMReaderWin::createActions() raction = new KToggleAction(i18nc("View->attachments->", "&As Icons"), this); ac->addAction("view_attachments_as_icons", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotIconicAttachments())); - raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") ); + raction->setHelpText( i18n("Show all attachments as icons. Click to see them.") ); group->addAction( raction ); attachmentMenu->addAction( raction ); raction = new KToggleAction(i18nc("View->attachments->", "&Smart"), this); ac->addAction("view_attachments_smart", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotSmartAttachments())); - raction->setToolTip( i18n("Show attachments as suggested by sender.") ); + raction->setHelpText( i18n("Show attachments as suggested by sender.") ); group->addAction( raction ); attachmentMenu->addAction( raction ); raction = new KToggleAction(i18nc("View->attachments->", "&Inline"), this); ac->addAction("view_attachments_inline", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotInlineAttachments())); - raction->setToolTip( i18n("Show all attachments inline (if possible)") ); + raction->setHelpText( i18n("Show all attachments inline (if possible)") ); group->addAction( raction ); attachmentMenu->addAction( raction ); raction = new KToggleAction(i18nc("View->attachments->", "&Hide"), this); ac->addAction("view_attachments_hide", raction ); connect(raction, SIGNAL(triggered(bool) ), SLOT(slotHideAttachments())); - raction->setToolTip( i18n("Do not show attachments in the message viewer") ); + raction->setHelpText( i18n("Do not show attachments in the message viewer") ); group->addAction( raction ); attachmentMenu->addAction( raction ); diff --git a/messageactions.cpp b/messageactions.cpp index a6fcde43a..58e61ad21 100644 --- a/messageactions.cpp +++ b/messageactions.cpp @@ -83,7 +83,7 @@ MessageActions::MessageActions( KActionCollection *ac, QWidget * parent ) : mCreateTodoAction = new KAction( KIcon( "task-new" ), i18n( "Create To-do/Reminder..." ), this ); mCreateTodoAction->setIconText( i18n( "Create To-do" ) ); - mCreateTodoAction->setToolTip( i18n( "Allows you to create a calendar to-do or reminder from this message" ) ); + mCreateTodoAction->setHelpText( i18n( "Allows you to create a calendar to-do or reminder from this message" ) ); mCreateTodoAction->setWhatsThis( i18n( "This option starts the KOrganizer to-do editor with initial values taken from the currently selected message. Then you can edit the to-do to your liking before saving it to your calendar." ) ); mActionCollection->addAction( "create_todo", mCreateTodoAction ); connect( mCreateTodoAction, SIGNAL(activated()), @@ -96,21 +96,21 @@ MessageActions::MessageActions( KActionCollection *ac, QWidget * parent ) : KAction *action; action = new KAction( KIcon("mail-mark-read"), i18n("Mark Message as &Read"), this ); - action->setToolTip( i18n("Mark selected messages as read") ); + action->setHelpText( i18n("Mark selected messages as read") ); connect( action, SIGNAL(activated()), this, SLOT(slotSetMsgStatusRead()) ); mActionCollection->addAction( "status_read", action ); mStatusMenu->addAction( action ); action = new KAction( KIcon("mail-mark-unread-new"), i18n("Mark Message as &New"), this ); - action->setToolTip( i18n("Mark selected messages as new") ); + action->setHelpText( i18n("Mark selected messages as new") ); connect( action, SIGNAL(activated()), this, SLOT(slotSetMsgStatusNew()) ); mActionCollection->addAction( "status_new", action ); mStatusMenu->addAction( action ); action = new KAction( KIcon("mail-mark-unread"), i18n("Mark Message as &Unread"), this ); - action->setToolTip( i18n("Mark selected messages as unread") ); + action->setHelpText( i18n("Mark selected messages as unread") ); connect( action, SIGNAL(activated()), this, SLOT(slotSetMsgStatusUnread()) ); mActionCollection->addAction( "status_unread", action ); diff --git a/messagelistview/core/widgetbase.cpp b/messagelistview/core/widgetbase.cpp index e69afa18c..b70c59183 100644 --- a/messagelistview/core/widgetbase.cpp +++ b/messagelistview/core/widgetbase.cpp @@ -382,8 +382,6 @@ void Widget::themeMenuAboutToShow() menu->addSeparator(); act = menu->addAction( i18n( "Configure..." ) ); - //act->setStatusTip( i18n( "Add, Remove or Modify the Available Themes" ) ); <-- doesn't seem to work - //act->setToolTip( i18n( "Add, Remove or Modify the Available Themes" ) ); <-- doesn't seem to work connect( act, SIGNAL( triggered( bool ) ), SLOT( configureThemes() ) ); }