Add CLAUDE.md documentation for AI-assisted development

This file provides guidance to Claude Code when working in this repository, including: - Development commands (run, build, test, translate) - High-level architecture overview (MVC pattern, sessions, buffers, controllers) - Key design patterns (compose functions, decorators, pub/sub events) - Important conventions and caveats for working with the codebase
Merge pull request #855 from MCV-Software/dependabot/pip/markdown-3.10
2025-11-06 14:37:05 +00:00 · 2025-11-06 14:25:58 +00:00 · 2025-11-04 07:25:47 +01:00 · 2025-11-04 07:25:32 +01:00 · 2025-11-04 07:25:12 +01:00 · 2025-11-03 23:07:55 +00:00
7 changed files with 394 additions and 56 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,342 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+TWBlue is an accessible desktop Mastodon client for Windows, built with Python 3.10 and wxPython. It provides two specialized interfaces optimized for screen reader users to interact with Mastodon instances. The application emphasizes accessibility-first design with keyboard navigation, audio feedback, and screen reader integration.
+
+## Development Commands
+
+### Running from Source
+```bash
+cd src
+python main.py
+```
+
+For development from source, VLC dependencies are loaded from `../windows-dependencies/{arch}/` where arch is x86 or x64.
+
+### Installing Dependencies
+```bash
+# Install all Python dependencies
+pip install -r requirements.txt
+
+# Initialize git submodules for Windows dependencies
+git submodule init
+git submodule update
+```
+
+### Building
+```bash
+# Build binary distribution (from src/ directory)
+python setup.py build
+
+# Output will be in src/dist/
+```
+
+### Testing
+```bash
+# Run tests using pytest
+pytest
+
+# Tests are located in src/test/
+```
+
+### Generating Documentation
+```bash
+cd doc
+python documentation_importer.py
+python generator.py
+# Copy generated language folders to src/documentation/
+# Copy license.txt to src/documentation/
+```
+
+### Translation Management
+```bash
+# Extract translation strings (from doc/ directory)
+pybabel extract -o twblue.pot --msgid-bugs-address "manuel@manuelcortez.net" --copyright-holder "MCV software" --input-dirs ../src
+
+# Note: Translations managed via Weblate at https://weblate.mcvsoftware.com
+```
+
+## Architecture Overview
+
+TWBlue follows an MVC architecture with distinct separation between data access (Sessions), business logic (Controllers), and presentation (wxUI).
+
+### Core Components
+
+#### 1. Session Layer (`src/sessions/`)
+Sessions represent authenticated connections to Mastodon instances. They manage API interactions, OAuth2 authentication, and persistent data storage.
+
+- **Base Session** (`sessions/base.py`): Abstract base class with configuration management, SQLiteDict persistence, and decorators for login/configuration checks
+- **Mastodon Session** (`sessions/mastodon/session.py`): Implements Mastodon.py API wrapper, OAuth2 flow, and account credential management
+- **Streaming** (`sessions/mastodon/streaming.py`): Real-time event listener that publishes to pub/sub system
+
+Key patterns:
+- Sessions use `@_require_login` and `@_require_configuration` decorators
+- Configuration files stored as INI format via configobj in `config/{session_id}/session.conf`
+- Persistent data (caches, user lists) stored in `config/{session_id}/cache.db` using SQLiteDict
+- Each session has its own sound system instance
+
+#### 2. Buffer System (`src/controller/buffers/`)
+Buffers are the primary data structures for displaying social media content (timelines, mentions, notifications, conversations, etc.).
+
+**Base Buffer** (`controller/buffers/base/base.py`):
+- Links buffer UI (wxPanel) with session (API access) and compose functions (data rendering)
+- Handles keyboard events (F5/F6 for volume, Delete for item removal, Return for URLs)
+- Manages periodic updates via `start_stream()` function
+- Each buffer has a `compose_function` that formats API data for display
+
+**Mastodon Buffers** (`controller/buffers/mastodon/`):
+- `base.py`: Mastodon-specific base buffer with timeline pagination
+- `users.py`: Home timeline, mentions buffer
+- `community.py`: Local/federated timelines
+- `notifications.py`: System notifications
+- `conversations.py`: Direct message threads
+- `search.py`: Search results
+
+Buffer lifecycle:
+1. Created by mainController when session initializes
+2. Added to view (wx.Treebook)
+3. Periodically updated via `start_stream()` or real-time via pub/sub events
+4. Destroyed when session ends or buffer removed
+
+#### 3. Controller Layer (`src/controller/`)
+Controllers orchestrate application logic and coordinate between sessions, buffers, and UI.
+
+**Main Controller** (`controller/mainController.py`):
+- Manages all active buffers and sessions
+- Binds keyboard shortcuts to actions
+- Handles pub/sub event subscriptions
+- Periodically calls `start_stream()` on visible buffers
+- Provides buffer search methods: `search_buffer()`, `get_current_buffer()`, `get_best_buffer()`
+
+**Specialized Controllers**:
+- `settings.py`: Settings dialog management
+- `userAlias.py` / `userList.py`: User management features
+- `mastodon/handler.py`: Mastodon-specific operations (filters, etc.)
+
+#### 4. GUI Layer (`src/wxUI/`)
+wxPython-based interface with menu-driven navigation and list controls.
+
+- **Main Frame** (`wxUI/view.py`): Primary window with wx.Treebook for buffers, menu system, system tray integration
+- **Buffer Panels** (`wxUI/buffers/`): Panel implementations for each buffer type
+- **Dialogs** (`wxUI/dialogs/`): Post composition, settings, user profiles, filters
+
+#### 5. Pub/Sub Event System
+Decoupled communication using PyPubSub 4.0.3.
+
+Key events:
+- `mastodon.status_received`: New post received via streaming
+- `mastodon.status_updated`: Post edited
+- `mastodon.notification_received`: New notification
+- `mastodon.conversation_received`: New DM
+
+Event flow:
+1. Streaming listener receives API event
+2. Publishes to topic via `pub.sendMessage()`
+3. mainController subscribes to topics and routes to appropriate buffer
+4. Buffer updates its display
+
+#### 6. Session Manager (`src/sessionmanager/`)
+Manages session lifecycle (creation, configuration, activation, deletion).
+
+- `sessionManager.py`: UI for managing multiple accounts
+- `manager.py`: Persists session list to global config
+- Handles OAuth2 authorization flow for new accounts
+- Loads saved sessions on startup
+
+#### 7. Configuration System (`src/config.py`, `src/config_utils.py`)
+Hierarchical configuration with defaults and user overrides.
+
+- Global config: `config/app-configuration.conf` (defaults in `src/app-configuration.defaults`)
+- Session configs: `config/{session_id}/session.conf` (defaults in `src/mastodon.defaults`)
+- Keymaps in `src/keymaps/`
+- Sound packs in `src/sounds/`
+
+**Path Management** (`src/paths.py`):
+- Portable mode: Config/logs in application directory
+- Installed mode: Config/logs in AppData
+- Detects installation by presence of `Uninstall.exe`
+
+#### 8. Accessibility Features
+Built for screen reader users from the ground up.
+
+- `accessible_output2`: Multi-screen reader support (NVDA, JAWS, SAPI, etc.)
+- `sound_lib`: Accessible audio playback with spatial audio
+- `platform_utils`: OS-specific accessibility hooks
+- `output.py`: Unified interface for speech output
+- `sound.py`: Sound system with volume control and sound pack management
+
+#### 9. Keyboard Handling (`src/keyboard_handler/`)
+Cross-platform keyboard input with global hotkey support.
+
+- `wx_handler.py`: wxPython integration
+- `global_handler.py`: System-wide hotkeys
+- Platform implementations: `windows.py`, `osx.py`, `linux.py`
+- `keystrokeEditor/`: UI for customizing shortcuts
+
+### Application Initialization Flow
+
+From `src/main.py`:
+1. Setup logging to temp directory, then move to permanent location
+2. Initialize language handler
+3. Load global configuration
+4. Setup sound system
+5. Setup accessibility output
+6. Initialize session manager
+7. Load saved sessions or prompt for account creation
+8. Create main controller
+9. Start main event loop
+
+### Data Flow Patterns
+
+#### Real-time Update Flow
+```
+Mastodon Streaming API
+  → sessions/mastodon/streaming.py (StreamListener)
+  → pub.sendMessage("mastodon.status_received", ...)
+  → controller/mainController.py (subscriber)
+  → buffer.add_new_item()
+  → compose_function(item)
+  → wxUI update
+```
+
+#### User Action Flow
+```
+Keyboard input
+  → wx event handler
+  → buffer.get_event()
+  → buffer action method (e.g., open_status())
+  → session.api_call()
+  → UI update or pub/sub event
+```
+
+#### Periodic Update Flow
+```
+RepeatingTimer (every N seconds)
+  → mainController calls buffer.start_stream()
+  → session.get_timeline_data()
+  → buffer.put_items_on_list()
+  → compose_function for each item
+  → wxUI list control update
+```
+
+## Key Design Patterns and Conventions
+
+### Compose Functions
+Buffers use compose functions to render API objects as user-readable strings. Located in `sessions/mastodon/compose.py`:
+
+```python
+compose_function(item, db, relative_times, show_screen_names=False, session=None)
+# Returns a string representation of the item for display
+```
+
+### Session Decorators
+Sessions use decorators to enforce prerequisites:
+
+```python
+@baseSession._require_login
+def post_status(self, text):
+    # Only executes if self.logged == True
+    pass
+
+@baseSession._require_configuration
+def get_timeline(self):
+    # Only executes if self.settings != None
+    pass
+```
+
+### Buffer Naming Convention
+Buffers have both a `name` (internal identifier) and `account` (associated username):
+- `name`: e.g., "home_timeline", "mentions", "notifications"
+- `account`: e.g., "user@mastodon.social"
+- Buffers are uniquely identified by (name, account) tuple
+
+### Configuration Hierarchy
+1. Default values in `src/*.defaults` files
+2. User overrides in `config/*.conf` files
+3. Runtime modifications via settings dialogs
+4. Written back to user config files on change
+
+## Important Caveats
+
+### Platform-Specific Code
+- VLC paths must be set via environment variables when running from source (see `main.py`)
+- Windows-specific: pywin32, win-inet-pton, winpaths dependencies
+- Accessibility output works best on Windows with NVDA/JAWS
+
+### Threading and Event Handling
+- API calls often wrapped in `call_threaded()` to avoid blocking UI
+- Streaming runs in background thread and publishes to main thread via pub/sub
+- wx events must be handled on main thread
+
+### Session Lifecycle
+- Sessions must be logged in before buffer creation
+- Buffers maintain references to sessions via `self.session`
+- Destroying a session should destroy all associated buffers
+- Session settings auto-save on write via `settings.write()`
+
+### Buffer Visibility
+- Buffers have `invisible` flag for internal/system buffers
+- Main controller distinguishes between visible buffers (shown in tree) and invisible buffers (used for data access)
+- Empty buffers serve as account placeholders in tree structure
+
+### Logging and Debugging
+- Logs written to temp directory on startup, then moved to permanent location
+- Binary builds redirect stdout/stderr to `logs/` directory
+- Source builds use console output
+- Use `logging.getLogger("module.name")` pattern throughout
+
+## Build System Details
+
+### cx_Freeze Configuration (`src/setup.py`)
+- Target: Win32GUI (suppresses console window)
+- Includes: keymaps, locales, sounds, documentation, icon, config defaults
+- Architecture-specific: Loads x86 or x64 dependencies from windows-dependencies submodule
+- Special handling for enchant dictionaries, VLC plugins, VC++ redistributables
+
+### NSIS Installer (`scripts/twblue.nsi`)
+- Expects binary distribution in `scripts/twblue64/`
+- Creates Start Menu shortcuts, Desktop shortcut (optional)
+- Registers uninstaller
+- Checks for running instances before install/uninstall
+
+### CI/CD (`.github/workflows/release.yml`)
+- Triggers on version tags (v20*)
+- Builds on Windows-latest with Python 3.10
+- Creates both installer (EXE) and portable (ZIP) distributions
+- Uploads to GitHub releases
+
+## Mastodon API Integration
+
+### Authentication
+OAuth2 flow implemented in `sessions/mastodon/session.py`:
+1. Create application credentials for instance
+2. Request OAuth authorization URL
+3. User authorizes in browser
+4. Exchange code for access token
+5. Store credentials in session config
+
+### API Client
+Uses Mastodon.py 2.1.4 library:
+- Instance created with base URL and access token
+- Methods: `status_post()`, `timeline()`, `account()`, etc.
+- Rate limiting handled by library
+- Supports multiple instances simultaneously
+
+### Streaming API
+Real-time updates via `sessions/mastodon/streaming.py`:
+- Inherits from `Mastodon.StreamListener`
+- Connects to user, public, or hashtag streams
+- Runs in background thread
+- Events published to main thread via pub/sub
+
+## Localization
+
+TWBlue supports 23 languages:
+- Translation files in `src/locales/{lang}/LC_MESSAGES/twblue.mo`
+- Uses gettext with `_()` function throughout codebase
+- Language selection in settings, stored in global config
+- Babel for extraction and compilation
+- Weblate for translation management
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,58 +1,58 @@
 accessible_output2 @ git+https://github.com/accessibleapps/accessible_output2@57bda997d98e87dd78aa049e7021cf777871619b
-arrow==1.3.0
-attrs==25.3.0
+arrow==1.4.0
+attrs==25.4.0
 backports.functools-lru-cache==2.0.0
-blurhash==1.1.4
-certifi==2025.4.26
+blurhash==1.1.5
+certifi==2025.10.5
 chardet==5.2.0
-charset-normalizer==3.4.2
+charset-normalizer==3.4.4
 colorama==0.4.6
 configobj==5.0.9
-coverage==7.8.2
-cx-Freeze==8.3.0
+coverage==7.11.0
+cx-Freeze==8.4.1
 cx-Logging==3.2.1
 decorator==5.2.1
 demoji==1.1.0
-deepl==1.22.0
+deepl==1.23.0
 future==1.0.0
-idna==3.10
+idna==3.11
 importlib-metadata==8.7.0
-iniconfig==2.1.0
+iniconfig==2.3.0
 libloader @ git+https://github.com/accessibleapps/libloader@bc94811c095b2e57a036acd88660be9a33260267
 libretranslatepy==2.1.4
 lief==0.15.1
-Markdown==3.8
-Mastodon.py==2.0.1
-numpy==2.2.3
-oauthlib==3.2.2
+Markdown==3.10
+Mastodon.py==2.1.4
+numpy==2.3.4
+oauthlib==3.3.1
 packaging==25.0
-pillow==11.2.1
+pillow==12.0.0
 platform_utils @ git+https://github.com/accessibleapps/platform_utils@e0d79f7b399c4ea677a633d2dde9202350d62c38
 pluggy==1.6.0
-psutil==7.0.0
-pyenchant==3.2.2
+psutil==7.1.3
+pyenchant==3.3.0
 pypiwin32==223
 Pypubsub==4.0.3
 PySocks==1.7.1
-pytest==8.3.5
+pytest==8.4.2
 python-dateutil==2.9.0.post0
 python-magic-bin==0.4.14
 python-vlc==3.0.21203
-pywin32==310
-requests==2.32.3
+pywin32==311
+requests==2.32.5
 requests-oauthlib==2.0.0
 requests-toolbelt==1.0.0
 rfc3986==2.0.0
-setuptools==80.9.0
+setuptools==69.0.0
 six==1.17.0
 sniffio==1.3.1
 sound_lib @ git+https://github.com/accessibleapps/sound_lib@a439f0943fb95ee7b6ba24f51a686f47c4ad66b2
 sqlitedict==2.1.0
 twitter-text-parser==3.0.0
-types-python-dateutil==2.9.0.20250516
-urllib3==2.4.0
+types-python-dateutil==2.9.0.20251008
+urllib3==2.5.0
 win-inet-pton==1.1.0
 winpaths==0.2
-wxPython==4.2.3
+wxPython==4.2.4
 youtube-dl==2021.12.17
-zipp==3.22.0
+zipp==3.23.0
--- a/src/locales/pl/LC_MESSAGES/twblue.mo
+++ b/src/locales/pl/LC_MESSAGES/twblue.mo
--- a/src/locales/pl/LC_MESSAGES/twblue.po
+++ b/src/locales/pl/LC_MESSAGES/twblue.po
@@ -1,22 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2019 ORGANIZATION
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# zvonimir stanecic <zvonimirek222@yandex.com>, 2023.
+# zvonimir stanecic <zvonimirek222@yandex.com>, 2023, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Tw Blue 0.80\n"
 "Report-Msgid-Bugs-To: manuel@manuelcortez.net\n"
 "POT-Creation-Date: 2025-04-13 01:18+0000\n"
-"PO-Revision-Date: 2023-04-21 07:45+0000\n"
+"PO-Revision-Date: 2025-08-10 16:08+0000\n"
 "Last-Translator: zvonimir stanecic <zvonimirek222@yandex.com>\n"
+"Language-Team: Polish <https://weblate.mcvsoftware.com/projects/twblue/"
+"twblue/pl/>\n"
 "Language: pl\n"
-"Language-Team: Polish "
-"<https://weblate.mcvsoftware.com/projects/twblue/twblue/pl/>\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && "
-"(n%100<10 || n%100>=20) ? 1 : 2;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 5.10.4\n"
 "Generated-By: Babel 2.17.0\n"

 #: languageHandler.py:61
@@ -101,7 +102,7 @@ msgstr "Domyślne dla użytkownika"
 #: main.py:105
 #, fuzzy
 msgid "https://twblue.mcvsoftware.com/donate"
-msgstr "https://twblue.es/donate"
+msgstr "https://twblue.mcvsoftware.com/donate"

 #: main.py:118
 #, python-brace-format
@@ -246,9 +247,8 @@ msgid "Following for {}"
 msgstr "Śledzący użytkownika {}"

 #: controller/messages.py:18
-#, fuzzy
 msgid "Translated"
-msgstr "&Przetłumacz"
+msgstr "Przetłumaczono"

 #: controller/settings.py:60
 msgid "System default"
@@ -540,9 +540,8 @@ msgid "There are no more items in this buffer."
 msgstr "W tym buforze nie ma więcej elementów."

 #: controller/mastodon/handler.py:30 wxUI/dialogs/mastodon/updateProfile.py:35
-#, fuzzy
 msgid "Update Profile"
-msgstr "&Edytuj profil"
+msgstr "Zaktualizuj profil"

 #: controller/mastodon/handler.py:31 wxUI/dialogs/mastodon/search.py:10
 #: wxUI/view.py:19
@@ -615,13 +614,12 @@ msgid "Add a&lias"
 msgstr "Dodaj a&lias"

 #: controller/mastodon/handler.py:51
-#, fuzzy
 msgid "Show user profile"
-msgstr "&Pokaż profil użytkownika"
+msgstr "Pokaż profil użytkownika"

 #: controller/mastodon/handler.py:54
 msgid "Create c&ommunity timeline"
-msgstr ""
+msgstr "Stwórz &oś czasu społeczności"

 #: controller/mastodon/handler.py:55 wxUI/view.py:57
 msgid "Create a &filter"
@@ -647,10 +645,9 @@ msgstr "Wyszukiwanie {}"

 #: controller/mastodon/handler.py:111
 msgid "Communities"
-msgstr ""
+msgstr "Społeczności"

 #: controller/mastodon/handler.py:114
-#, fuzzy
 msgid "federated"
 msgstr "federowana"

@@ -4864,4 +4861,3 @@ msgstr "Dodatki"

 #~ msgid "DeepL API Key: "
 #~ msgstr ""
-
--- a/src/wxUI/dialogs/mastodon/postDialogs.py
+++ b/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()
--- a/src/wxUI/dialogs/templateDialogs.py
+++ b/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()
--- a/src/wxUI/dialogs/userList.py
+++ b/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)