Merge branch 'next-gen' of github.com:mcv-software/twblue into next-gen

src/wxUI/dialogs/mastodon/postDialogs.py

@@ -51,7 +51,7 @@ class Post(wx.Dialog):
         visibility_sizer.Add(self.visibility, 0, 0, 0)
         language_sizer = wx.BoxSizer(wx.HORIZONTAL)
         post_actions_sizer.Add(language_sizer, 0, wx.RIGHT, 20)
-        lang_label = wx.StaticText(self, wx.ID_ANY, _("Language"))
+        lang_label = wx.StaticText(self, wx.ID_ANY, _("&Language"))
         language_sizer.Add(lang_label, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT, 5)
         self.language = wx.ComboBox(self, wx.ID_ANY, choices=languages, style=wx.CB_DROPDOWN | wx.CB_READONLY)
         language_sizer.Add(self.language, 0, wx.ALIGN_CENTER_VERTICAL, 0)
@@ -234,9 +234,9 @@ class viewPost(wx.Dialog):
 
     def create_buttons_section(self, panel):
         sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.mute = wx.Button(panel, wx.ID_ANY, _("Mute conversation"))
+        self.mute = wx.Button(panel, wx.ID_ANY, _("&Mute conversation"))
         self.mute.Enable(False)
-        self.share = wx.Button(panel, wx.ID_ANY, _("Copy link to clipboard"))
+        self.share = wx.Button(panel, wx.ID_ANY, _("&Copy link to clipboard"))
         self.share.Enable(False)
         self.spellcheck = wx.Button(panel, wx.ID_ANY, _("Check &spelling..."))
         self.translateButton = wx.Button(panel, wx.ID_ANY, _("&Translate..."))
@@ -295,7 +295,7 @@ class poll(wx.Dialog):
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
         period_sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer_1.Add(period_sizer, 1, wx.EXPAND, 0)
-        label_period = wx.StaticText(self, wx.ID_ANY, _("Participation time"))
+        label_period = wx.StaticText(self, wx.ID_ANY, _("&Participation time"))
         period_sizer.Add(label_period, 0, 0, 0)
         self.period = wx.ComboBox(self, wx.ID_ANY, choices=[_("5 minutes"), _("30 minutes"), _("1 hour"), _("6 hours"), _("1 day"), _("2 days"), _("3 days"), _("4 days"), _("5 days"), _("6 days"), _("7 days")], style=wx.CB_DROPDOWN | wx.CB_READONLY | wx.CB_SIMPLE)
         self.period.SetFocus()
@@ -305,36 +305,36 @@ class poll(wx.Dialog):
         sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
         option1_sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer_2.Add(option1_sizer, 1, wx.EXPAND, 0)
-        label_2 = wx.StaticText(self, wx.ID_ANY, _("Option 1"))
+        label_2 = wx.StaticText(self, wx.ID_ANY, _("Option &1"))
         option1_sizer.Add(label_2, 0, 0, 0)
         self.option1 = wx.TextCtrl(self, wx.ID_ANY, "")
         self.option1.SetMaxLength(25)
         option1_sizer.Add(self.option1, 0, 0, 0)
         option2_sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer_2.Add(option2_sizer, 1, wx.EXPAND, 0)
-        label_3 = wx.StaticText(self, wx.ID_ANY, _("Option 2"))
+        label_3 = wx.StaticText(self, wx.ID_ANY, _("Option &2"))
         option2_sizer.Add(label_3, 0, 0, 0)
         self.option2 = wx.TextCtrl(self, wx.ID_ANY, "")
         self.option2.SetMaxLength(25)
         option2_sizer.Add(self.option2, 0, 0, 0)
         option3_sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer_2.Add(option3_sizer, 1, wx.EXPAND, 0)
-        label_4 = wx.StaticText(self, wx.ID_ANY, _("Option 3"))
+        label_4 = wx.StaticText(self, wx.ID_ANY, _("Option &3"))
         option3_sizer.Add(label_4, 0, 0, 0)
         self.option3 = wx.TextCtrl(self, wx.ID_ANY, "")
         self.option3.SetMaxLength(25)
         option3_sizer.Add(self.option3, 0, 0, 0)
         option4_sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer_2.Add(option4_sizer, 1, wx.EXPAND, 0)
-        label_5 = wx.StaticText(self, wx.ID_ANY, _("Option 4"))
+        label_5 = wx.StaticText(self, wx.ID_ANY, _("Option &4"))
         option4_sizer.Add(label_5, 0, 0, 0)
         self.option4 = wx.TextCtrl(self, wx.ID_ANY, "")
         self.option4.SetMaxLength(25)
         option4_sizer.Add(self.option4, 0, 0, 0)
-        self.multiple = wx.CheckBox(self, wx.ID_ANY, _("Allow multiple choices per user"))
+        self.multiple = wx.CheckBox(self, wx.ID_ANY, _("&Allow multiple choices per user"))
         self.multiple.SetValue(False)
         sizer_1.Add(self.multiple, 0, wx.ALL, 5)
-        self.hide_votes = wx.CheckBox(self, wx.ID_ANY, _("Hide votes count until the poll expires"))
+        self.hide_votes = wx.CheckBox(self, wx.ID_ANY, _("&Hide votes count until the poll expires"))
         self.hide_votes.SetValue(False)
         sizer_1.Add(self.hide_votes, 0, wx.ALL, 5)
         btn_sizer = wx.StdDialogButtonSizer()

src/wxUI/dialogs/templateDialogs.py

@@ -26,7 +26,7 @@ class EditTemplateDialog(wx.Dialog):
         sizer_3.AddButton(self.button_SAVE)
         self.button_CANCEL = wx.Button(self, wx.ID_CANCEL)
         sizer_3.AddButton(self.button_CANCEL)
-        self.button_RESTORE = wx.Button(self, wx.ID_ANY, _("Restore template"))
+        self.button_RESTORE = wx.Button(self, wx.ID_ANY, _("&Restore template"))
         self.button_RESTORE.Bind(wx.EVT_BUTTON, self.on_restore)
         sizer_3.AddButton(self.button_CANCEL)
         sizer_3.Realize()

src/wxUI/dialogs/userList.py

@@ -22,11 +22,11 @@ class UserListDialog(wx.Dialog):
         user_list_sizer.Add(self.user_list, 1, wx.EXPAND | wx.ALL, 10)
         main_sizer.Add(user_list_sizer, 1, wx.EXPAND | wx.ALL, 15)
         buttons_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.actions_button = wx.Button(panel, wx.ID_ANY, "Actions")
+        self.actions_button = wx.Button(panel, wx.ID_ANY, "&Actions")
         buttons_sizer.Add(self.actions_button, 0, wx.RIGHT, 10)
-        self.details_button = wx.Button(panel, wx.ID_ANY, _("View profile"))
+        self.details_button = wx.Button(panel, wx.ID_ANY, _("&View profile"))
         buttons_sizer.Add(self.details_button, 0, wx.RIGHT, 10)
-        close_button = wx.Button(panel, wx.ID_CANCEL, "Close")
+        close_button = wx.Button(panel, wx.ID_CANCEL, "&Close")
         buttons_sizer.Add(close_button, 0)
         main_sizer.Add(buttons_sizer, 0, wx.ALIGN_CENTER | wx.BOTTOM, 15)
         panel.SetSizer(main_sizer)