tpartially revert code merged #481, brreaks old qt versions - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 0063edb61b302b7d87c35f20f9d3706229fa1d87
DIR parent de94eaadeb65c2167ea8b1530e4907a2d904a9b4
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 17 Dec 2013 22:20:24 +0100
partially revert code merged #481, brreaks old qt versions
Diffstat:
M gui/qt/main_window.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -181,6 +181,7 @@ class ElectrumWindow(QMainWindow):
self.init_menubar()
QShortcut(QKeySequence("Ctrl+W"), self, self.close)
+ QShortcut(QKeySequence("Ctrl+Q"), self, self.close)
QShortcut(QKeySequence("Ctrl+R"), self, self.update_wallet)
QShortcut(QKeySequence("Ctrl+PgUp"), self, lambda: tabs.setCurrentIndex( (tabs.currentIndex() - 1 )%tabs.count() ))
QShortcut(QKeySequence("Ctrl+PgDown"), self, lambda: tabs.setCurrentIndex( (tabs.currentIndex() + 1 )%tabs.count() ))
t@@ -367,7 +368,7 @@ class ElectrumWindow(QMainWindow):
wallet_backup.triggered.connect(self.backup_wallet)
quit_item = file_menu.addAction(_("&Quit"))
- quit_item.setShortcut(QKeySequence.Quit)
+ #quit_item.setShortcut(QKeySequence.Quit)
quit_item.triggered.connect(self.close)
wallet_menu = menubar.addMenu(_("&Wallet"))
t@@ -413,7 +414,7 @@ class ElectrumWindow(QMainWindow):
# Settings / Preferences are all reserved keywords in OSX using this as work around
preferences_name = _("Electrum preferences") if sys.platform == 'darwin' else _("Preferences")
preferences_menu = tools_menu.addAction(preferences_name)
- preferences_menu.setShortcut(QKeySequence.Preferences)
+ #preferences_menu.setShortcut(QKeySequence.Preferences)
preferences_menu.triggered.connect(self.settings_dialog)
network = tools_menu.addAction(_("&Network"))