@@ -1004,6 +1004,9 @@ void BrowserMainWindow::retranslate() // Toolbar m_navigationBar->setWindowTitle(tr("Navigation")); m_bookmarksToolbar->setWindowTitle(tr("&Bookmarks")); + + m_stopReloadAction->setText(tr("Reload / Stop")); + updateStopReloadActionText(false); } void BrowserMainWindow::setupToolBar() @@ -1456,18 +1459,29 @@ ToolbarSearch *BrowserMainWindow::toolbarSearch() const return m_toolbarSearch; } +void BrowserMainWindow::updateStopReloadActionText(bool loading) +{ + if (loading) { + m_stopReloadAction->setToolTip(tr("Stop loading the current page")); + m_stopReloadAction->setIconText(tr("Stop")); + } else { + m_stopReloadAction->setToolTip(tr("Reload the current page")); + m_stopReloadAction->setIconText(tr("Reload")); + } +} + void BrowserMainWindow::loadProgress(int progress) { if (progress < 100 && progress > 0) { disconnect(m_stopReloadAction, SIGNAL(triggered()), m_viewReloadAction, SLOT(trigger())); m_stopReloadAction->setIcon(m_stopIcon); connect(m_stopReloadAction, SIGNAL(triggered()), m_viewStopAction, SLOT(trigger())); - m_stopReloadAction->setToolTip(tr("Stop loading the current page")); + updateStopReloadActionText(true); } else { disconnect(m_stopReloadAction, SIGNAL(triggered()), m_viewStopAction, SLOT(trigger())); m_stopReloadAction->setIcon(m_reloadIcon); connect(m_stopReloadAction, SIGNAL(triggered()), m_viewReloadAction, SLOT(trigger())); - m_stopReloadAction->setToolTip(tr("Reload the current page")); + updateStopReloadActionText(false); } } src/browsermainwindow.cpp @@ -171,6 +171,7 @@ private: void loadDefaultState(); void setupMenu(); void setupToolBar(); + void updateStopReloadActionText(bool loading); private: QMenu *m_fileMenu; src/browsermainwindow.h 0032e7fc9acfba437739e41fca1a29702777c853 Christopher Eby kreed@kreed.org http://github.com/faw/arora/commit/ae6d4794f5f6c6cfbed07a65f7098ec250b0caf1 ae6d4794f5f6c6cfbed07a65f7098ec250b0caf1 2009-10-05T23:08:37-07:00 2009-08-17T11:02:10-07:00 Set text and iconText on the stop/reload action 34223a6bee7a1acc52241fcdb76f87b41beab911 Benjamin C Meyer ben@meyerhome.net