Author: cazfi Date: Thu Nov 17 05:48:50 2016 New Revision: 34529 URL: http://svn.gna.org/viewcvs/freeciv?rev=34529&view=rev Log: Renamed SC_LOCK as SC_IFACE_LOCK to avoid namespace conflict.
See bug #25302 Modified: branches/S2_6/client/gui-qt/menu.cpp branches/S2_6/client/gui-qt/shortcuts.cpp branches/S2_6/client/gui-qt/shortcuts.h Modified: branches/S2_6/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.cpp?rev=34529&r1=34528&r2=34529&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/menu.cpp (original) +++ branches/S2_6/client/gui-qt/menu.cpp Thu Nov 17 05:48:50 2016 @@ -848,7 +848,7 @@ minimap_status = menu->addAction(_("Lock interface")); minimap_status->setCheckable(true); minimap_status->setShortcut(QKeySequence(shortcut_to_string( - fc_shortcuts::sc()->get_shortcut(SC_LOCK)))); + fc_shortcuts::sc()->get_shortcut(SC_IFACE_LOCK)))); minimap_status->setChecked(false); connect(minimap_status, SIGNAL(triggered()), this, SLOT(slot_lock())); menu->addSeparator(); Modified: branches/S2_6/client/gui-qt/shortcuts.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/shortcuts.cpp?rev=34529&r1=34528&r2=34529&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/shortcuts.cpp (original) +++ branches/S2_6/client/gui-qt/shortcuts.cpp Thu Nov 17 05:48:50 2016 @@ -136,7 +136,7 @@ _("Unload") }, {SC_BUY_MAP, 0, Qt::BackButton, Qt::NoModifier, _("Quick buy current production from map") }, - {SC_LOCK, Qt::Key_L, Qt::AllButtons, Qt::ControlModifier + {SC_IFACE_LOCK, Qt::Key_L, Qt::AllButtons, Qt::ControlModifier | Qt::ShiftModifier, _("Lock/unlock interface") }, }; Modified: branches/S2_6/client/gui-qt/shortcuts.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/shortcuts.h?rev=34529&r1=34528&r2=34529&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/shortcuts.h (original) +++ branches/S2_6/client/gui-qt/shortcuts.h Thu Nov 17 05:48:50 2016 @@ -1,4 +1,4 @@ -/********************************************************************** +/*********************************************************************** Freeciv - Copyright (C) 2003 - The Freeciv Project This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -74,7 +74,7 @@ SC_LOAD = 41, SC_UNLOAD = 42, SC_BUY_MAP = 43, - SC_LOCK = 44 + SC_IFACE_LOCK = 44 }; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits