Reorganized code for audioRecorder and config module

src/controller/attach.py

@@ -8,7 +8,7 @@ import logging
 import widgetUtils
 import presenters
 import interactors
-from wxUI.dialogs import audioRecorder as gui2
+import views
 from mutagen.id3 import ID3
 from sessionmanager.utils import seconds_to_string
 from wxUI.dialogs import attach as gui
@@ -93,7 +93,7 @@ class attach(object):
 			self.dialog.remove.Enable(True)
 
 	def upload_voice_message(self, *args, **kwargs):
-		a = presenters.audioRecorderPresenter(view=gui2.audioRecorderDialog(), interactor=interactors.audioRecorderInteractor())
+		a = presenters.audioRecorderPresenter(view=views.audioRecorderDialog(), interactor=interactors.audioRecorderInteractor())
 		if a.file != None and a.duration != 0:
 			audioInfo = {"type": "voice_message", "file": a.file, "from": "local"}
 			self.attachments.append(audioInfo)

src/controller/mainController.py

@@ -25,7 +25,6 @@ from update import updater
 from issueReporter import issueReporter
 from . import messages
 from . import buffers
-from . import configuration
 from . import player
 from . import posts
 from . import profiles

src/views/__init__.py

@@ -1 +1,2 @@
+from .dialogs.audioRecorder import *
 from .dialogs.configuration import *

src/wxUI/dialogs/configuration.py

@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-import wx
-import widgetUtils
-
-class general(wx.Panel, widgetUtils.BaseDialog):
-	def __init__(self, panel):
-		super(general, self).__init__(panel)
-		sizer = wx.BoxSizer(wx.VERTICAL)
-		lbl1 = wx.StaticText(self, wx.NewId(), _("Number of items to load for newsfeed and wall buffers (maximun 100)"))
-		self.wall_buffer_count = wx.SpinCtrl(self, wx.NewId())
-		self.wall_buffer_count.SetRange(1, 100)
-		box1 = wx.BoxSizer(wx.HORIZONTAL)
-		box1.Add(lbl1, 0, wx.ALL, 5)
-		box1.Add(self.wall_buffer_count, 0, wx.ALL, 5)
-		sizer.Add(box1, 0, wx.ALL, 5)
-		lbl3 = wx.StaticText(self, wx.NewId(), _("Number of items to load in video buffers (maximun 200)"))
-		self.video_buffers_count = wx.SpinCtrl(self, wx.NewId())
-		self.video_buffers_count.SetRange(1, 200)
-		box3 = wx.BoxSizer(wx.HORIZONTAL)
-		box3.Add(lbl3, 0, wx.ALL, 5)
-		box3.Add(self.video_buffers_count, 0, wx.ALL, 5)
-		sizer.Add(box3, 0, wx.ALL, 5)
-		self.load_images = wx.CheckBox(self, wx.NewId(), _("Load images in posts"))
-		sizer.Add(self.load_images, 0, wx.ALL, 5)
-		lbl4 = wx.StaticText(self, wx.NewId(), _("Update channel"))
-		self.update_channel = wx.ComboBox(self, wx.NewId(), choices=[_("Stable"), _("Alpha")], value=_("Native"), style=wx.CB_READONLY)
-		box4 = wx.BoxSizer(wx.HORIZONTAL)
-		box4.Add(lbl4, 0, wx.ALL, 5)
-		box4.Add(self.update_channel, 0, wx.ALL, 5)
-		sizer.Add(box4, 0, wx.ALL, 5)
-		self.SetSizer(sizer)
-
-class chat(wx.Panel, widgetUtils.BaseDialog):
-	def __init__(self, panel):
-		super(chat, self).__init__(panel)
-		sizer = wx.BoxSizer(wx.VERTICAL)
-		self.notify_online = wx.CheckBox(self, wx.NewId(), _("Show notifications when users are online"))
-		sizer.Add(self.notify_online, 0, wx.ALL, 5)
-		self.notify_offline = wx.CheckBox(self, wx.NewId(), _("Show notifications when users are offline"))
-		sizer.Add(self.notify_offline, 0, wx.ALL, 5)
-		self.open_unread_conversations = wx.CheckBox(self, wx.NewId(), _("Open unread conversations at startup"))
-		sizer.Add(self.open_unread_conversations, 0, wx.ALL, 5)
-		self.automove_to_conversations = wx.CheckBox(self, wx.NewId(), _("Move focus to new conversations"))
-		sizer.Add(self.automove_to_conversations, 0, wx.ALL, 5)
-		lbl = wx.StaticText(self, wx.NewId(), _("Notification type"))
-		self.notifications = wx.ComboBox(self, wx.NewId(), choices=[_("Native"), _("Custom"),], value=_("Native"), style=wx.CB_READONLY)
-		nbox = wx.BoxSizer(wx.HORIZONTAL)
-		nbox.Add(lbl, 0, wx.ALL, 5)
-		nbox.Add(self.notifications, 0, wx.ALL, 5)
-		sizer.Add(nbox, 0, wx.ALL, 5)
-		self.SetSizer(sizer)
-
-class configurationDialog(widgetUtils.BaseDialog):
-
-	def __init__(self, title):
-		super(configurationDialog, self).__init__(None, -1, title=title)
-		self.panel = wx.Panel(self)
-		self.sizer = wx.BoxSizer(wx.VERTICAL)
-		self.notebook = wx.Notebook(self.panel)
-
-	def create_general(self):
-		self.general = general(self.notebook)
-		self.notebook.AddPage(self.general, _("General"))
-		self.general.SetFocus()
-
-	def create_chat(self):
-		self.chat = chat(self.notebook)
-		self.notebook.AddPage(self.chat, _("Chat settings"))
-
-
-	def realize(self):
-		self.sizer.Add(self.notebook, 0, wx.ALL, 5)
-		ok_cancel_box = wx.BoxSizer(wx.HORIZONTAL)
-		ok = wx.Button(self.panel, wx.ID_OK, _("Save"))
-		ok.SetDefault()
-		cancel = wx.Button(self.panel, wx.ID_CANCEL, _("Close"))
-		self.SetEscapeId(cancel.GetId())
-		ok_cancel_box.Add(ok, 0, wx.ALL, 5)
-		ok_cancel_box.Add(cancel, 0, wx.ALL, 5)
-		self.sizer.Add(ok_cancel_box, 0, wx.ALL, 5)
-		self.panel.SetSizer(self.sizer)
-		self.SetClientSize(self.sizer.CalcMin())
-
-	def get_value(self, panel, key):
-		p = getattr(self, panel)
-		return getattr(p, key).GetValue()
-
-	def set_value(self, panel, key, value):
-		p = getattr(self, panel)
-		control = getattr(p, key)
-		getattr(control, "SetValue")(value)
-
-def alpha_channel():
-	return wx.MessageDialog(None, _("The alpha channel contains bleeding edge changes introduced to Socializer. A new alpha update is generated every time there are new changes in the project. Take into account that updates are generated automatically and may fail at any time due to errors in the build process. Use alpha channels when you are sure you want to try the latest changes and contribute with reports to fix bugs. Never use alpha channel updates for everyday use. Do you want to continue?"), _("Attention"), style=wx.ICON_QUESTION|wx.YES_NO).ShowModal()
-
-def weekly_channel():
-	return wx.MessageDialog(None, _("The weekly channel generates an update automatically every week by building the source code present in the project. This version is used to test features added to the next stable version. Do you want to continue?"), _("Attention"), style=wx.ICON_QUESTION|wx.YES_NO).ShowModal()

src/wxui/dialogs/audioRecorder.py

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-import wx
-import widgetUtils
-
-class audioRecorderDialog(widgetUtils.BaseDialog):
-	def __init__(self):
-		super(audioRecorderDialog, self).__init__(None,  title=_("Record voice message"))
-		panel = wx.Panel(self)
-		sizer = wx.BoxSizer(wx.VERTICAL)
-		self.play = wx.Button(panel, -1, _("&Play"))
-		self.play.Disable()
-		self.record = wx.Button(panel, -1, _("&Record"))
-		self.record.SetFocus()
-		self.discard = wx.Button(panel, -1, _("&Discard"))
-		self.discard.Disable()
-		self.ok = wx.Button(panel, wx.ID_OK, _("&Add"))
-		cancel = wx.Button(panel, wx.ID_CANCEL, _("&Cancel"))
-		btnSizer = wx.BoxSizer(wx.HORIZONTAL)
-		btnSizer2 = wx.BoxSizer(wx.HORIZONTAL)
-		btnSizer.Add(self.play, 0, wx.ALL, 5)
-		btnSizer.Add(self.record, 0, wx.ALL, 5)
-		btnSizer2.Add(self.ok, 0, wx.ALL, 5)
-		btnSizer2.Add(cancel, 0, wx.ALL, 5)
-		sizer.Add(btnSizer, 0, wx.ALL, 5)
-		sizer.Add(btnSizer2, 0, wx.ALL, 5)
-		panel.SetSizer(sizer)
-		self.SetClientSize(sizer.CalcMin())
-
-	def enable_control(self, control):
-		if hasattr(self, control):
-			getattr(self, control).Enable()
-
-	def disable_control(self, control):
-		if hasattr(self, control):
-			getattr(self, control).Disable()