# HG changeset patch
# User Santeri Piippo <crimsondusk64@gmail.com>
# Date 1398195634 -10800
# Node ID b6601bfbe732bd1d56565622c38258631ed7e422
# Parent  2f1bd9112408e3fe6dfde6f437a7ed12d1ca8b50
- moved the uncolorize action to the color toolbar, renamed to uncolor

diff -r 2f1bd9112408 -r b6601bfbe732 src/actionsEdit.cc
--- a/src/actionsEdit.cc	Mon Apr 14 16:00:36 2014 +0300
+++ b/src/actionsEdit.cc	Tue Apr 22 22:40:34 2014 +0300
@@ -606,7 +606,7 @@
 
 // =============================================================================
 //
-DEFINE_ACTION (Uncolorize, 0)
+DEFINE_ACTION (Uncolor, 0)
 {
 	int num = 0;
 
diff -r 2f1bd9112408 -r b6601bfbe732 src/mainWindow.cc
--- a/src/mainWindow.cc	Mon Apr 14 16:00:36 2014 +0300
+++ b/src/mainWindow.cc	Tue Apr 22 22:40:34 2014 +0300
@@ -52,7 +52,7 @@
 static bool g_isSelectionLocked = false;
 
 cfg (Bool, lv_colorize, true);
-cfg (String, gui_colortoolbar, "16:24:|:4:25:14:27:2:3:11:1:22:|:0:72:71:15");
+cfg (String, gui_colortoolbar, "4:25:14:27:2:3:11:1:22:|:0:72:71:15");
 cfg (Bool, gui_implicitfiles, false);
 extern_cfg (List,		io_recentfiles);
 extern_cfg (Bool,		gl_axes);
@@ -216,6 +216,8 @@
 {
 	m_colorButtons.clear();
 	ui->colorToolbar->clear();
+	ui->colorToolbar->addAction (ui->actionUncolor);
+	ui->colorToolbar->addSeparator();
 
 	for (LDQuickColor& entry : m_quickColors)
 	{
diff -r 2f1bd9112408 -r b6601bfbe732 src/mainWindow.h
--- a/src/mainWindow.h	Mon Apr 14 16:00:36 2014 +0300
+++ b/src/mainWindow.h	Tue Apr 22 22:40:34 2014 +0300
@@ -242,7 +242,7 @@
 		void slot_actionSetDrawDepth();
 		void slot_actionSetColor();
 		void slot_actionAutocolor();
-		void slot_actionUncolorize();
+		void slot_actionUncolor();
 		void slot_actionInline();
 		void slot_actionInlineDeep();
 		void slot_actionInvert();
diff -r 2f1bd9112408 -r b6601bfbe732 ui/ldforge.ui
--- a/ui/ldforge.ui	Mon Apr 14 16:00:36 2014 +0300
+++ b/ui/ldforge.ui	Tue Apr 22 22:40:34 2014 +0300
@@ -60,7 +60,7 @@
      <x>0</x>
      <y>0</y>
      <width>1010</width>
-     <height>26</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -159,7 +159,7 @@
     </property>
     <addaction name="actionSetColor"/>
     <addaction name="actionAutocolor"/>
-    <addaction name="actionUncolorize"/>
+    <addaction name="actionUncolor"/>
     <addaction name="separator"/>
     <addaction name="actionInvert"/>
     <addaction name="actionInline"/>
@@ -366,7 +366,6 @@
    </attribute>
    <addaction name="actionSetColor"/>
    <addaction name="actionAutocolor"/>
-   <addaction name="actionUncolorize"/>
    <addaction name="actionInvert"/>
    <addaction name="actionSplitQuads"/>
    <addaction name="actionInline"/>
@@ -853,13 +852,16 @@
     <string>Set the color of the given object to the first found unused color.</string>
    </property>
   </action>
-  <action name="actionUncolorize">
+  <action name="actionUncolor">
    <property name="icon">
     <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/uncolorize.png</normaloff>:/icons/uncolorize.png</iconset>
    </property>
    <property name="text">
-    <string>Uncolorize</string>
+    <string>Uncolor</string>
+   </property>
+   <property name="toolTip">
+    <string>Uncolor</string>
    </property>
    <property name="statusTip">
     <string>Reduce colors of everything selected to main and edge colors</string>