SVN commit 794943 by lauranger:

enable mid-button spanning while placing division

 M  +52 -35    mapsdatatranslation.cpp  
 M  +19 -8     placemapwidget.cpp  
 M  +2 -2      placemapwidget.h  


--- trunk/KDE/kdeedu/kgeography/src/mapsdatatranslation.cpp #794942:794943
@@ -3406,100 +3406,99 @@
 i18nc("japan.kgm", "Japan");
 i18nc("japan.kgm", "Prefectures");
 i18nc("japan.kgm", "Out of Bounds");
-i18nc("japan.kgm", "Frontier");
-i18nc("japan.kgm", "Frontier");
+i18nc("japan.kgm", "Border");
 i18nc("japan.kgm", "Hokkaido");
 i18nc("japan.kgm", "Sapporo");
-i18nc("japan.kgm", "Aomori (Prefecture)");
 i18nc("japan.kgm", "Aomori");
+i18nc("japan.kgm", "Aomori");
 i18nc("japan.kgm", "Iwate");
 i18nc("japan.kgm", "Morioka");
-i18nc("japan.kgm", "Akita (Prefecture)");
 i18nc("japan.kgm", "Akita");
-i18nc("japan.kgm", "Yamagata (Prefecture)");
+i18nc("japan.kgm", "Akita");
 i18nc("japan.kgm", "Yamagata");
+i18nc("japan.kgm", "Yamagata");
 i18nc("japan.kgm", "Miyagi");
 i18nc("japan.kgm", "Sendai");
-i18nc("japan.kgm", "Niigata (Prefecture)");
 i18nc("japan.kgm", "Niigata");
-i18nc("japan.kgm", "Fukushima (Prefecture)");
+i18nc("japan.kgm", "Niigata");
 i18nc("japan.kgm", "Fukushima");
-i18nc("japan.kgm", "Nagano (Prefecture)");
+i18nc("japan.kgm", "Fukushima");
 i18nc("japan.kgm", "Nagano");
+i18nc("japan.kgm", "Nagano");
 i18nc("japan.kgm", "Gunma");
 i18nc("japan.kgm", "Maebashi");
 i18nc("japan.kgm", "Tochigi");
 i18nc("japan.kgm", "Utsunomiya");
 i18nc("japan.kgm", "Ibaraki");
 i18nc("japan.kgm", "Mito");
-i18nc("japan.kgm", "Chiba (Prefecture)");
 i18nc("japan.kgm", "Chiba");
-i18nc("japan.kgm", "Gifu (Prefecture)");
+i18nc("japan.kgm", "Chiba");
 i18nc("japan.kgm", "Gifu");
-i18nc("japan.kgm", "Shizuoka (Prefecture)");
+i18nc("japan.kgm", "Gifu");
 i18nc("japan.kgm", "Shizuoka");
-i18nc("japan.kgm", "Saitama (Prefecture)");
+i18nc("japan.kgm", "Shizuoka");
 i18nc("japan.kgm", "Saitama");
+i18nc("japan.kgm", "Urawa");
 i18nc("japan.kgm", "Yamanashi");
 i18nc("japan.kgm", "Koufu");
-i18nc("japan.kgm", "Toyama (Prefecture)");
 i18nc("japan.kgm", "Toyama");
+i18nc("japan.kgm", "Toyama");
 i18nc("japan.kgm", "Ishikawa");
 i18nc("japan.kgm", "Kanazawa");
 i18nc("japan.kgm", "Aichi");
 i18nc("japan.kgm", "Nagoya");
-i18nc("japan.kgm", "Fukui (Prefecture)");
 i18nc("japan.kgm", "Fukui");
+i18nc("japan.kgm", "Fukui");
 i18nc("japan.kgm", "Shiga");
-i18nc("japan.kgm", "Ōtsu");
+i18nc("japan.kgm", "Outsu");
 i18nc("japan.kgm", "Mie");
 i18nc("japan.kgm", "Tsu");
-i18nc("japan.kgm", "Kyoto (Prefecture)");
 i18nc("japan.kgm", "Kyoto");
+i18nc("japan.kgm", "Kyoto");
 i18nc("japan.kgm", "Hyogo");
 i18nc("japan.kgm", "Kobe");
-i18nc("japan.kgm", "Nara (Prefecture)");
 i18nc("japan.kgm", "Nara");
-i18nc("japan.kgm", "Osaka (Prefecture)");
+i18nc("japan.kgm", "Nara");
 i18nc("japan.kgm", "Osaka");
-i18nc("japan.kgm", "Wakayama (Prefecture)");
+i18nc("japan.kgm", "Osaka");
 i18nc("japan.kgm", "Wakayama");
-i18nc("japan.kgm", "Okayama (Prefecture)");
+i18nc("japan.kgm", "Wakayama");
 i18nc("japan.kgm", "Okayama");
-i18nc("japan.kgm", "Tottori (Prefecture)");
+i18nc("japan.kgm", "Okayama");
 i18nc("japan.kgm", "Tottori");
+i18nc("japan.kgm", "Tottori");
 i18nc("japan.kgm", "Shimane");
 i18nc("japan.kgm", "Matsue");
-i18nc("japan.kgm", "Hiroshima (Prefecture)");
 i18nc("japan.kgm", "Hiroshima");
-i18nc("japan.kgm", "Yamaguchi (Prefecture)");
+i18nc("japan.kgm", "Hiroshima");
 i18nc("japan.kgm", "Yamaguchi");
-i18nc("japan.kgm", "Fukuoka (Prefecture)");
+i18nc("japan.kgm", "Yamaguchi");
 i18nc("japan.kgm", "Fukuoka");
-i18nc("japan.kgm", "Ōita (Prefecture)");
-i18nc("japan.kgm", "Ōita");
-i18nc("japan.kgm", "Miyazaki (Prefecture)");
+i18nc("japan.kgm", "Fukuoka");
+i18nc("japan.kgm", "Oita");
+i18nc("japan.kgm", "Oita");
 i18nc("japan.kgm", "Miyazaki");
-i18nc("japan.kgm", "Kagoshima (Prefecture)");
+i18nc("japan.kgm", "Miyazaki");
 i18nc("japan.kgm", "Kagoshima");
-i18nc("japan.kgm", "Kumamoto (Prefecture)");
+i18nc("japan.kgm", "Kagoshima");
 i18nc("japan.kgm", "Kumamoto");
-i18nc("japan.kgm", "Saga (Prefecture)");
+i18nc("japan.kgm", "Kumamoto");
 i18nc("japan.kgm", "Saga");
-i18nc("japan.kgm", "Nagasaki (Prefecture)");
+i18nc("japan.kgm", "Saga");
 i18nc("japan.kgm", "Nagasaki");
+i18nc("japan.kgm", "Nagasaki");
 i18nc("japan.kgm", "Ehime");
 i18nc("japan.kgm", "Matsuyama");
-i18nc("japan.kgm", "Kōchi (Prefecture)");
-i18nc("japan.kgm", "Kōchi");
-i18nc("japan.kgm", "Tokushima (Prefecture)");
+i18nc("japan.kgm", "Kochi");
+i18nc("japan.kgm", "Kochi");
 i18nc("japan.kgm", "Tokushima");
+i18nc("japan.kgm", "Tokushima");
 i18nc("japan.kgm", "Kagawa");
 i18nc("japan.kgm", "Takamatsu");
 i18nc("japan.kgm", "Kanagawa");
 i18nc("japan.kgm", "Yokohama");
-i18nc("japan.kgm", "Tokyo (Prefecture)");
 i18nc("japan.kgm", "Tokyo");
+i18nc("japan.kgm", "Tokyo");
 i18nc("japan.kgm", "Okinawa");
 i18nc("japan.kgm", "Naha");
 i18nc("kazakhstan.kgm", "Kazakhstan");
@@ -6557,6 +6556,24 @@
 i18nc("world.kgm", "Port Moresby");
 i18nc("world.kgm", "Greenland (Denmark)");
 i18nc("world.kgm", "Nuuk");
+i18nc("world_continents.kgm", "World continents (from North Pole)");
+i18nc("world_continents.kgm", "Continents");
+i18nc("world_continents.kgm", "Frontier");
+i18nc("world_continents.kgm", "Water");
+i18nc("world_continents.kgm", "Africa");
+i18nc("world_continents.kgm", "Kilimanjaro");
+i18nc("world_continents.kgm", "North America");
+i18nc("world_continents.kgm", "Mac Kinley");
+i18nc("world_continents.kgm", "South America");
+i18nc("world_continents.kgm", "Anconcagua");
+i18nc("world_continents.kgm", "Antartica");
+i18nc("world_continents.kgm", "Vinson");
+i18nc("world_continents.kgm", "Asia");
+i18nc("world_continents.kgm", "Everest");
+i18nc("world_continents.kgm", "Europe");
+i18nc("world_continents.kgm", "Elbrouz");
+i18nc("world_continents.kgm", "Oceania");
+i18nc("world_continents.kgm", "Carstenz");
 i18nc("zaire2006.kgm", "Zaire");
 i18nc("zaire2006.kgm", "Provinces");
 i18nc("zaire2006.kgm", "Frontier");
--- trunk/KDE/kdeedu/kgeography/src/placemapwidget.cpp #794942:794943
@@ -17,7 +17,6 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 #include <QTimer>
-#include <QTime>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -46,9 +45,9 @@
 
 void placeMapWidget::init(KGmap *map, QImage *mapImage)
 {
-        p_map = map;
+	p_map = map;
 	p_mapImage = mapImage;
-        createGameMapImage();
+	createGameMapImage();
 	p_scene->setSceneRect( p_gameImage->rect() );
 	resetCachedContent();
 	
@@ -62,7 +61,7 @@
 	QVector<QRgb> colormap = p_mapImage->colorTable();
 	p_gameImage = new QImage(p_mapImage->size(), QImage::Format_RGB32);
 	// So far, nobody has dedicated this color to a division :)
-	// I, for one, reserve grays for non-division pixels
+	// I, for one, reserve grays for non-division pixels.
 	p_gameImage->fill(QColor(224,224,224).rgb());
 
 	QList<division*> ignoredDivisions = p_map->getIgnoredDivisions(division::eClick);
@@ -148,7 +147,8 @@
 	}
 	else
 	{
-		QImage scaledDivisionImage = p_currentDivisionImage->scaled(static_cast<int>(p_currentDivisionImage->width() * matrix().m11()),static_cast<int>(p_currentDivisionImage->height() * matrix().m22()));
+		QImage scaledDivisionImage = p_currentDivisionImage->scaled(static_cast<int>(p_currentDivisionImage->width() * matrix().m11()),
+																	static_cast<int>(p_currentDivisionImage->height() * matrix().m22()));
 		p_currentCursor = new QCursor(QPixmap::fromImage(scaledDivisionImage));
 	}
 	setCursor(*p_currentCursor);
@@ -198,6 +198,16 @@
 			}
 		}
 	}
+	else if (e -> button() == Qt::MidButton)
+	{
+		p_modeBeforeMidClick = p_mode;
+		p_mode = WantMove;
+		updateActions();
+		p_prev = e->pos();
+		//setCursor(Qt::SizeAllCursor);
+		p_mode = Moving;
+		updateActions();
+	}
 	else if ( p_mode == WantZoom )
 	{
 		setGameImage();
@@ -228,7 +238,7 @@
 	}
 }
 
-void placeMapWidget::mouseReleaseEvent(QMouseEvent *)
+void placeMapWidget::mouseReleaseEvent(QMouseEvent *e)
 {
 	if ( p_mode == Zooming )
 	{
@@ -242,8 +252,9 @@
 	}
 	else if ( p_mode == Moving )
 	{
-		unsetCursor();
-		p_mode = WantMove;
+		if ( e->button() != Qt::MidButton)
+			unsetCursor();
+		p_mode = p_modeBeforeMidClick;
 	}
 }
 
--- trunk/KDE/kdeedu/kgeography/src/placemapwidget.h #794942:794943
@@ -63,8 +63,8 @@
 		void updateZoom();
 		
 		enum Mode { Zooming, WantZoom, Moving, WantMove, None };
-		Mode p_mode;
-                KGmap *p_map;
+		Mode p_mode, p_modeBeforeMidClick;
+		KGmap *p_map;
 		QImage *p_mapImage;
 		QImage *p_gameImage;
 		QImage *p_currentDivisionImage;