napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: add tooltip to Cancel / Quit button

Browse Source 
Change 'Quit' at the end to 'Done', because we're done -- and Quit
is sometimes interpreted as cancelling. Tooltip for additional
explanation.
This commit is contained in:
Adriaan de Groot 2017-06-28 07:48:51 -04:00
parent d669df625a
commit 4561849c39
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libcalamaresui/ViewManager.cpp
View File

@ -52,8 +52,8 @@ ViewManager::instance( QObject* parent )
ViewManager::ViewManager( QObject* parent ) ViewManager::ViewManager( QObject* parent )
: QObject( parent ) : QObject( parent )
, m_widget( new QWidget() )
, m_currentStep( 0 ) , m_currentStep( 0 )
, m_widget( new QWidget() )
{ {
Q_ASSERT( !s_instance ); Q_ASSERT( !s_instance );
@ -72,6 +72,7 @@ ViewManager::ViewManager( QObject* parent )
m_back->setText( tr( "&Back" ) ); m_back->setText( tr( "&Back" ) );
m_next->setText( tr( "&Next" ) ); m_next->setText( tr( "&Next" ) );
m_quit->setText( tr( "&Cancel" ) ); m_quit->setText( tr( "&Cancel" ) );
m_quit->setToolTip( tr( "Cancel installation without changing the system." ) );
) )
QBoxLayout* bottomLayout = new QHBoxLayout; QBoxLayout* bottomLayout = new QHBoxLayout;
@ -268,7 +269,8 @@ ViewManager::next()
if ( m_currentStep == m_steps.count() -1 && if ( m_currentStep == m_steps.count() -1 &&
m_steps.last()->isAtEnd() ) m_steps.last()->isAtEnd() )
{ {
m_quit->setText( tr( "&Quit" ) ); m_quit->setText( tr( "&Done" ) );
m_quit->setToolTip( tr( "The installation is complete. Close the installer." ) );
} }
} }
@ -299,7 +301,10 @@ ViewManager::back()
if ( !( m_currentStep == m_steps.count() -1 && if ( !( m_currentStep == m_steps.count() -1 &&
m_steps.last()->isAtEnd() ) ) m_steps.last()->isAtEnd() ) )
{
m_quit->setText( tr( "&Cancel" ) ); m_quit->setText( tr( "&Cancel" ) );
m_quit->setToolTip( tr( "Cancel installation without changing the system." ) );
}
} }
} }