Merge lp:~qcumber-some/widelands/bug704637_2 into lp:widelands

[Jens Beyer]

Additional commit regarding bug704637 - show message in case this happens.

I hope I've done everything correct. Just nitpick in case I could do something in a better way :-)

[Nicolai Hähnle (nha)]

The overall design looks perfectly good to me, but let me pick some nits ;)

1. I think you forgot to set the messagetitle, or was that on purpose?
2. Please use either m_xxx or xxx_ for member variables.
3. I would usually prefer to initialize a member variable in the initializer list of the constructor.

review: Approve

[Jens Beyer (qcumber-some)]

Thanks for the quick review.

1. No, I forgot. The way it is now, it will lead to errors with subsequent messages. I will fix it. Thanks for spotting this.
2. I will use m_fallback_settings_in_effect.
3. I will move it to the constructor.

After fixing this, I will push it to trunk.

Thanks for the review, this is the way I am learning this ;-)

[SirVer (sirver)]

I picked another nit and fixed it in trunk: The ordering of the items in the constructor must be the same as the ordering of the items in the class in the header - otherwise an error will be thrown.

Good feature, thanks for adding this in!

=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc	2013-03-04 10:43:03 +0000
+++ src/graphic/graphic.cc	2013-03-06 17:57:24 +0000
@@ -73,7 +73,8 @@
 	m_update_fullscreen(true),
 	image_loader_(new ImageLoaderImpl()),
 	surface_cache_(create_surface_cache(SURFACE_CACHE_SIZE)),
-	image_cache_(create_image_cache(image_loader_.get(), surface_cache_.get()))
+	image_cache_(create_image_cache(image_loader_.get(), surface_cache_.get())),
+	m_fallback_settings_in_effect (false)
 {
 	ImageTransformations::initialize();
 
@@ -133,6 +134,7 @@
 		flags &= ~SDL_FULLSCREEN;
 		sdlsurface = SDL_SetVideoMode
 			(FALLBACK_GRAPHICS_WIDTH, FALLBACK_GRAPHICS_HEIGHT, FALLBACK_GRAPHICS_DEPTH, flags);
+		m_fallback_settings_in_effect = true;
 		if (!sdlsurface)
 			throw wexception
 				("Graphics: could not set video mode: %s", SDL_GetError());
@@ -303,6 +305,11 @@
 	m_rendertarget = new RenderTarget(screen_.get());
 }
 
+bool Graphic::check_fallback_settings_in_effect()
+{
+	return m_fallback_settings_in_effect;
+}
+
 /**
  * Free the surface
 */

=== modified file 'src/graphic/graphic.h'
--- src/graphic/graphic.h	2013-03-01 18:43:44 +0000
+++ src/graphic/graphic.h	2013-03-06 17:57:24 +0000
@@ -130,8 +130,11 @@
 
 	const GraphicCaps& caps() const throw () {return m_caps;}
 
+	bool check_fallback_settings_in_effect();
+
 private:
 	void save_png_(Surface & surf, StreamWrite*) const;
+	bool m_fallback_settings_in_effect;
 
 protected:
 	// Static helper function for png writing

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2013-02-16 01:05:43 +0000
+++ src/wlapplication.cc	2013-03-06 17:57:24 +0000
@@ -1534,6 +1534,14 @@
 	std::string messagetitle;
 	std::string message;
 
+	if (g_gr->check_fallback_settings_in_effect())
+	{
+		messagetitle = _("Fallback settings in effect");
+		message = _
+			("Your video settings could not be enabled, and fallback settings are in effect. "
+				"Please check the graphics options!");
+	}
+
 	for (;;) {
 		// Refresh graphics system in case we just changed resolution.
 		refresh_graphics();