extragear/multimedia/amarok/src

[Jeff Mitchell]

Mark, instead of "Amarok 2" should it be "Amarok 2 Alpha"?

That way people who aren't paying attention won't think Amarok 2 was 
released instead of an alpha version.

--Jeff

Mark Kretschmann wrote:
> SVN commit 782564 by markey:
>
> Get rid of the "pre-alpha software" warning, as we're shaping up for the alpha release. Also, I actually want to get (useful) bug reports and backtraces at this point.
>
>
>  M  +4 -4      app.cpp  
>
>
> --- trunk/extragear/multimedia/amarok/src/app.cpp #782563:782564
> @@ -758,7 +758,7 @@
>      switch( state )
>      {
>      case Engine::Empty:
> -        mainWindow()->setCaption( "Amarok - Pre-Alpha Software. Do NOT File Bugs." );
> +        mainWindow()->setPlainCaption( i18n( "Amarok 2" ) );
>  //         TrackToolTip::instance()->clear();
>          Amarok::OSD::instance()->setImage( QImage( KIconLoader().iconPath( "amarok", -KIconLoader::SizeHuge ) ) );
>          break;
> @@ -768,7 +768,7 @@
>              Amarok::OSD::instance()->OSDWidget::show( i18nc( "state, as in playing", "Play" ) );
>          if ( !track->prettyName().isEmpty() )
>              //TODO: write a utility function somewhere
> -            mainWindow()->setCaption( i18n("Amarok - Pre-Alpha Software. Do NOT File Bugs. - %1", track->prettyName() ) );
> +            mainWindow()->setPlainCaption( i18n( "%1  -  Amarok 2", track->prettyName() ) );
>          break;
>  
>      case Engine::Paused:
> @@ -776,7 +776,7 @@
>          break;
>  
>      case Engine::Idle:
> -        mainWindow()->setCaption( "Amarok - Pre-Alpha Software. Do NOT File Bugs." );
> +        mainWindow()->setPlainCaption( "Amarok 2" );
>          break;
>  
>      default:
> @@ -790,7 +790,7 @@
>      Meta::TrackPtr currentTrack = EngineController::instance()->currentTrack();
>      Amarok::OSD::instance()->show( currentTrack );
>      if ( !currentTrack->prettyName().isEmpty() )
> -        mainWindow()->setCaption( i18n("Amarok - %1", currentTrack->prettyName() ) + " - Pre-alpha software, do _not_ file bugs" );
> +        mainWindow()->setPlainCaption( i18n( "%1  -  Amarok 2", currentTrack->prettyName() ) );
>  
>  //     TrackToolTip::instance()->setTrack( currentTrack );
>  }
>