Merge pull request #1389 from myk002/myk_hotkey_conflict

change hotkeys that conflict with EditField's Ctrl-a

Author: myk002

gui/civ-alert.lua

@@ -218,7 +218,7 @@ function Civalert:init()
                 },
                 widgets.HotkeyLabel{
                     frame={t=3, l=0},
-                    key='CUSTOM_CTRL_W',
+                    key='CUSTOM_CTRL_N',
                     label='Sound alarm! Citizens run to safety!',
                     on_activate=sound_alarm,
                     enabled=can_sound_alarm,

gui/launcher.lua

@@ -261,7 +261,7 @@ function TagFilterPanel:init()
         widgets.HotkeyLabel{
             frame={b=0, r=0},
             label='Cycle all',
-            key='CUSTOM_CTRL_A',
+            key='CUSTOM_CTRL_N',
             auto_width=true,
             on_activate=self:callback('toggle_all')
         },
@@ -388,7 +388,7 @@ function AutocompletePanel:init()
         widgets.Label{
             frame={l=0, t=3},
             text={
-                {key='CUSTOM_CTRL_W', key_sep=': ', on_activate=open_filter_panel, text='Tags:'},
+                {key='CUSTOM_CTRL_F', key_sep=': ', on_activate=open_filter_panel, text='Tags:'},
                 {gap=1, pen=get_filter_pen, text=get_filter_text},
             },
             on_click=open_filter_panel,

gui/manipulator.lua

@@ -1057,7 +1057,7 @@ function QuickMenu:init()
         },
         widgets.HotkeyLabel{
             frame={b=0, l=0},
-            key='CUSTOM_CTRL_A',
+            key='CUSTOM_CTRL_N',
             label='Select all',
             visible=self.multiselect,
             on_activate=function()

gui/quickfort.lua

@@ -38,7 +38,7 @@ transformations = transformations or {}
 
 -- blueprint selection dialog, shown when the script starts or when a user wants
 -- to load a new blueprint into the ui
-BlueprintDialog = defclass(SelectDialog, gui.ZScreenModal)
+BlueprintDialog = defclass(BlueprintDialog, gui.ZScreenModal)
 BlueprintDialog.ATTRS{
     focus_path='quickfort/dialog',
     on_select=DEFAULT_NIL,

internal/caravan/movegoods.lua

@@ -286,7 +286,7 @@ function MoveGoods:init()
                 widgets.HotkeyLabel{
                     frame={l=0, b=0},
                     label='Select all/none',
-                    key='CUSTOM_CTRL_A',
+                    key='CUSTOM_CTRL_N',
                     on_activate=self:callback('toggle_visible'),
                     auto_width=true,
                 },

internal/caravan/pedestal.lua

@@ -388,7 +388,7 @@ function AssignItems:init()
         widgets.HotkeyLabel{
             frame={l=0, b=2},
             label='Select all/none',
-            key='CUSTOM_CTRL_A',
+            key='CUSTOM_CTRL_N',
             on_activate=self:callback('toggle_visible'),
             auto_width=true,
         },

internal/caravan/trade.lua

@@ -309,7 +309,7 @@ function Trade:init()
         widgets.HotkeyLabel{
             frame={l=0, b=0},
             label='Select all/none',
-            key='CUSTOM_CTRL_A',
+            key='CUSTOM_CTRL_N',
             on_activate=self:callback('toggle_visible'),
             auto_width=true,
         },
@@ -891,7 +891,7 @@ function Ethics:init()
         },
         widgets.HotkeyLabel{
             frame={l=0, b=0},
-            key='CUSTOM_CTRL_A',
+            key='CUSTOM_CTRL_N',
             label='Deselect items in trade list',
             auto_width=true,
             on_activate=self:callback('deselect_transgressions'),

internal/gm-unit/editor_civilization.lua

@@ -107,7 +107,7 @@ function CivBox:choose_race()
 end
 function CivBox:init(info)
     self.subviews.list.frame={t=3,r=0,l=0}
-    self.subviews.list.edit.ignore_keys={"STRING_A047"},
+    self.subviews.list.edit.text_area.text_area.ignore_keys={"STRING_A047"}
     self:addviews{
         widgets.Label{frame={t=1,l=0},text={
         {text="Filter race ",key="STRING_A047",key_sep="()",on_activate=self:callback("choose_race")},