From 5099ac96212f2c39fc795a8a0a0efbf627269872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= <manuel@manuelcortez.net>
Date: Wed, 29 Jun 2016 13:16:35 -0500
Subject: [PATCH] Added documentation in the help menu

---
 src/controller/mainController.py | 14 +++++++++++++-
 src/sessionmanager/wxUI.py       |  1 +
 src/wxUI/mainWindow.py           |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index 7e9c48f..88c509b 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -13,9 +13,11 @@ import webbrowser
 import logging
 import longpoolthread
 import selector
+from vk.exceptions import VkAuthError
 from pubsub import pub
 from mysc.repeating_timer import RepeatingTimer
 from mysc.thread_utils import call_threaded
+from mysc import localization
 from sessionmanager import session
 from wxUI import (mainWindow, commonMessages)
 from wxUI.dialogs import search as searchDialogs
@@ -126,6 +128,7 @@ class Controller(object):
 		widgetUtils.connect_event(self.window, widgetUtils.MENU, self.new_timeline, menuitem=self.window.timeline)
 		widgetUtils.connect_event(self.window, widgetUtils.MENU, self.create_audio_album, menuitem=self.window.audio_album)
 		widgetUtils.connect_event(self.window, widgetUtils.MENU, self.delete_audio_album, menuitem=self.window.delete_audio_album)
+		widgetUtils.connect_event(self.window, widgetUtils.MENU, self.check_documentation, menuitem=self.window.documentation)
 		pub.subscribe(self.get_chat, "order-sent-message")
 
 	def disconnect_events(self):
@@ -190,7 +193,10 @@ class Controller(object):
 
 	def exit(self, *args, **kwargs):
 		log.debug("Receibed an exit signal. closing...")
-		self.session.vk.client.account.setOffline()
+		try:
+			self.session.vk.client.account.setOffline()
+		except VkAuthError:
+			pass
 		self.disconnect_events()
 		self.window.Destroy()
 		wx.GetApp().ExitMainLoop()
@@ -399,3 +405,9 @@ class Controller(object):
 		self.buffers.remove(buffer)
 		del buffer
 		self.session.audio_albums = self.session.vk.client.audio.getAlbums(owner_id=self.session.user_id)["items"]
+
+	def check_documentation(self, *args, **kwargs):
+		lang = localization.get("documentation")
+		os.chdir("documentation/%s" % (lang,))
+		webbrowser.open("manual.html")
+		os.chdir("../../")
diff --git a/src/sessionmanager/wxUI.py b/src/sessionmanager/wxUI.py
index ff14713..bc5c088 100644
--- a/src/sessionmanager/wxUI.py
+++ b/src/sessionmanager/wxUI.py
@@ -23,6 +23,7 @@ class newSessionDialog(widgetUtils.BaseDialog):
 		sizer.Add(b1, 0, wx.ALL, 5)
 		sizer.Add(b2, 0, wx.ALL, 5)
 		ok = wx.Button(panel, wx.ID_OK)
+		ok.SetDefault()
 		cancel = wx.Button(panel, wx.ID_CANCEL)
 		btnb = wx.BoxSizer(wx.HORIZONTAL)
 		btnb.Add(ok, 0, wx.ALL, 5)
diff --git a/src/wxUI/mainWindow.py b/src/wxUI/mainWindow.py
index 0c384c1..1026a8a 100644
--- a/src/wxUI/mainWindow.py
+++ b/src/wxUI/mainWindow.py
@@ -25,6 +25,7 @@ class mainWindow(wx.Frame):
 		mb.Append(buffer, _(u"Buffer"))
 		help_ = wx.Menu()
 		self.about = help_.Append(wx.NewId(), _(u"About {0}").format(application.name,))
+		self.documentation = help_.Append(wx.NewId(), _(u"Manual"))
 		self.check_for_updates = help_.Append(wx.NewId(), _(u"Check for updates"))
 		self.changelog = help_.Append(wx.NewId(), _(u"Chan&gelog"))
 		mb.Append(help_, _(u"Help"))