Mercurial > ldforge / changeset

--- a/changelog.txt	Sun Jul 07 03:25:28 2013 +0300
+++ b/changelog.txt	Sun Jul 07 03:36:30 2013 +0300
@@ -17,6 +17,8 @@
 - When drawing, drawn vertices now display coordinate labels.
 - Added an action to quickly toggle BFC red/green view.
 - Changed default keys for Y-axis moving from PgUp/PgDown to Home and End ala MLCAD.
+- Cleaned up the toolbars, removed clutter by removing most of the not-so-often-used items, though of course
+	the functionality is still available through menus and keyboard shortcuts.
 - [Linux] External programs can now be launched with Wine.
 - Improved external program fault handling: don't try to replace/append the output in case of failure, catch non-zero exit codes.
 - Added a progress box for file loading to respond to desktops while loading files. With large files

--- a/src/gui.cpp	Sun Jul 07 03:25:28 2013 +0300
+++ b/src/gui.cpp	Sun Jul 07 03:36:30 2013 +0300
@@ -245,26 +245,6 @@
 	menu->addSeparator ();
 	addMenuAction ("setDrawDepth");
 	
-	initMenu ("&Tools");
-	addMenuAction ("setColor");
-	addMenuAction ("autoColor");
-	addMenuAction ("uncolorize");
-	menu->addSeparator ();
-	addMenuAction ("invert");
-	addMenuAction ("inlineContents");
-	addMenuAction ("deepInline");
-	addMenuAction ("makePrimitive");
-	menu->addSeparator ();
-	addMenuAction ("splitQuads");
-	addMenuAction ("setContents");
-	addMenuAction ("makeBorders");
-	addMenuAction ("makeCornerVerts");
-	addMenuAction ("roundCoords");
-	addMenuAction ("visibility");
-	addMenuAction ("replaceCoords");
-	addMenuAction ("flip");
-	addMenuAction ("demote");
-	
 	// Move menu
 	initMenu ("&Move");
 	addMenuAction ("moveUp");
@@ -289,6 +269,26 @@
 	addMenuAction ("rotateZNeg");
 	addMenuAction ("rotpoint");
 	
+	initMenu ("&Tools");
+	addMenuAction ("setColor");
+	addMenuAction ("autoColor");
+	addMenuAction ("uncolorize");
+	menu->addSeparator ();
+	addMenuAction ("invert");
+	addMenuAction ("inlineContents");
+	addMenuAction ("deepInline");
+	addMenuAction ("makePrimitive");
+	menu->addSeparator ();
+	addMenuAction ("splitQuads");
+	addMenuAction ("setContents");
+	addMenuAction ("makeBorders");
+	addMenuAction ("makeCornerVerts");
+	addMenuAction ("roundCoords");
+	addMenuAction ("visibility");
+	addMenuAction ("replaceCoords");
+	addMenuAction ("flip");
+	addMenuAction ("demote");
+	
 	initMenu ("E&xternal Programs");
 	addMenuAction ("ytruder");
 	addMenuAction ("rectifier");
@@ -370,6 +370,7 @@
 	addToolBarAction ("copy");
 	addToolBarAction ("paste");
 	addToolBarAction ("del");
+	addToolBarBreak (Qt::TopToolBarArea);
 	
 	// ==========================================
 	initSingleToolBar ("Select");
@@ -377,34 +378,11 @@
 	addToolBarAction ("selectByColor");
 	addToolBarAction ("selectByType");
 	
-	addToolBarBreak (Qt::TopToolBarArea);
-	
-	// ==========================================
-	initSingleToolBar ("Move");
-	addToolBarAction ("moveUp");
-	addToolBarAction ("moveDown");
-	addToolBarAction ("moveXPos");
-	addToolBarAction ("moveXNeg");
-	addToolBarAction ("moveYPos");
-	addToolBarAction ("moveYNeg");
-	addToolBarAction ("moveZPos");
-	addToolBarAction ("moveZNeg");
-	
-	// ==========================================
-	initSingleToolBar ("Rotate");
-	addToolBarAction ("rotateXPos");
-	addToolBarAction ("rotateXNeg");
-	addToolBarAction ("rotateYPos");
-	addToolBarAction ("rotateYNeg");
-	addToolBarAction ("rotateZPos");
-	addToolBarAction ("rotateZNeg");
-	
 	// ==========================================
 	initSingleToolBar ("Grids");
 	addToolBarAction ("gridCoarse");
 	addToolBarAction ("gridMedium");
 	addToolBarAction ("gridFine");
-	addToolBarBreak (Qt::TopToolBarArea);
 	
 	// ==========================================
 	initSingleToolBar ("View");
@@ -421,27 +399,12 @@
 	initSingleToolBar ("Tools");
 	addToolBarAction ("setColor");
 	addToolBarAction ("autoColor");
-	addToolBarAction ("uncolorize");
-	addToolBarAction ("invert");
-	addToolBarAction ("inlineContents");
-	addToolBarAction ("deepInline");
-	addToolBarAction ("makePrimitive");
 	addToolBarAction ("splitQuads");
 	addToolBarAction ("setContents");
 	addToolBarAction ("makeBorders");
-	addToolBarAction ("makeCornerVerts");
+	addToolBarAction ("replaceCoords");
 	addToolBarAction ("roundCoords");
-	addToolBarAction ("screencap");
 	addToolBarAction ("visibility");
-	addToolBarAction ("replaceCoords");
-	addToolBarAction ("flip");
-	
-	initSingleToolBar ("External Programs");
-	addToolBarAction ("ytruder");
-	addToolBarAction ("rectifier");
-	addToolBarAction ("intersector");
-	addToolBarAction ("isecalc");
-	addToolBarAction ("coverer");
 	
 	// ==========================================
 	g_ToolBarArea = Qt::LeftToolBarArea;