# HG changeset patch # User Santeri Piippo # Date 1400330300 -10800 # Node ID 6eb3c88982accc76e649e9daf591dc3e7d5a9234 # Parent e117509e1b51a4166992530226535ec33dc615d3 - bfc red/green view and random colors are now mutually exclusive, enabling one disables the other. diff -r e117509e1b51 -r 6eb3c88982ac src/actions.cc --- a/src/actions.cc Sat May 17 02:00:02 2014 +0300 +++ b/src/actions.cc Sat May 17 15:38:20 2014 +0300 @@ -681,6 +681,10 @@ DEFINE_ACTION (BFCView, SHIFT (B)) { cfg::bfcRedGreenView = not cfg::bfcRedGreenView; + + if (cfg::bfcRedGreenView) + cfg::randomColors = false; + updateActions(); R()->refresh(); } @@ -882,5 +886,10 @@ DEFINE_ACTION (RandomColors, CTRL_SHIFT (R)) { cfg::randomColors = not cfg::randomColors; + + if (cfg::randomColors) + cfg::bfcRedGreenView = false; + + updateActions(); R()->refresh(); } \ No newline at end of file diff -r e117509e1b51 -r 6eb3c88982ac src/ldObject.cc --- a/src/ldObject.cc Sat May 17 02:00:02 2014 +0300 +++ b/src/ldObject.cc Sat May 17 15:38:20 2014 +0300 @@ -80,8 +80,8 @@ void LDObject::chooseID() { // If this is the first pass we can just use a global ID counter for each - // unique object. Let's nobody goes to create 17 million objects anytime - // soon. + // unique object. Let's hope that nobody goes to create 17 million objects + // anytime soon. if (g_idcursor < g_maxID) { setID (g_idcursor++); diff -r e117509e1b51 -r 6eb3c88982ac src/mainWindow.cc --- a/src/mainWindow.cc Sat May 17 02:00:02 2014 +0300 +++ b/src/mainWindow.cc Sat May 17 15:38:20 2014 +0300 @@ -984,6 +984,7 @@ ui->actionRedo->setEnabled (pos < (long) his->getSize() - 1); ui->actionAxes->setChecked (cfg::drawAxes); ui->actionBFCView->setChecked (cfg::bfcRedGreenView); + ui->actionRandomColors->setChecked (cfg::randomColors); ui->actionDrawAngles->setChecked (cfg::drawAngles); }