Merge branch 'master' of https://github.com/manuelcortez/TWBlue

.gitignore

@@ -1,6 +1,6 @@
 *.pyc
 *~
-windows-dependencies/*
+#windows-dependencies/*
 src/build/
 src/dist/
 src/config/

README.md

@@ -15,4 +15,57 @@ TW Blue is an app designed to use Twitter in a simple and fast way and avoiding,
 * Play various file and URL types which contain audio
 * and more!
 
-See the [TWBlue's webpage](http://twblue.com.mx) for more details.
+See the [TWBlue's webpage](http://twblue.com.mx) for more details.
+
+## Using TWBlue from sources
+
+This document describes how to run tw blue from source, and, after that, how to build a binary version, which doesn't need Python and the other dependencies to run.
+
+### Required dependencies.
+
+The following dependencies need to be installed in your system. If you want to build tw blue for 32-bit versions of Windows, you will find the required software in the x86 folder, inside windows-dependencies directory. If you want to build tw blue for 64-bit windows versions, use the x64 folder.
+
+In this document you will also find links to each dependency website.
+
+If you want to build manually some of the following libraries, you need Microsoft Visual studio 2008 professional.
+
+Dependencies list:
+
+* [Python,](http://python.org) version 2.7.8
+* [wxPython](http://www.wxpython.org) for Python 2.7, version 3.0.0 (2.9.5 to avoid problems in windows xp)
+* [Python windows extensions (pywin32)](http://www.sourceforge.net/projects/pywin32/) for python 2.7, build 218
+* [ConfigObj,](http://www.voidspace.org.uk/python/configobj.html) version 4.7.2
+* [oauthlib](https://pypi.python.org/pypi/oauthlib/0.6.1) 0.6.1
+* [Pycurl](http://pycurl.sourceforge.net) 7.19.3.1 for Python 2.7: [32-bit downloads,](https://pypi.python.org/pypi/pycurl/7.19.3.1) [64-bit downloads](http://www.lfd.uci.edu/~gohlke/pythonlibs/)
+* [Requests](http://www.python-requests.org/en/latest/) 2.2.1: [Recommended download site](https://pypi.python.org/pypi/requests/2.2.1)
+* [Requests-oauthlib](https://github.com/requests/requests-oauthlib) 0.4.0
+* [Suds](https://fedorahosted.org/suds) 0.4: [Recommended download site](https://pypi.python.org/pypi/suds/0.4)
+* Bootstrap 1.2.1: included in dependencies directory.  
+Copy the bootstrap.exe file corresponding to the desired platform in the windows folder, inside this repository.  
+This dependency has been built using pure basic 4.61. Its source can be found at http://hg.q-continuum.net/updater
+* [oggenc2.exe,](http://www.rarewares.org/ogg-oggenc.php) version 2.87  
+Copy the oggenc2.exe file corresponding to the desired platform in the windows folder, inside this repository.
+* Visual C++ 2008 dlls, included in vcredist-x86.7z and vcredist-x64.7z:  
+Extract the file corresponding to your platform to the src folder.
+
+If you want to build the binary version:
+
+* [Py2exe](http://www.sourceforge.net/projects/py2exe/) for Python 2.7, version 0.6.9
+* [Setuptools](https://pypi.python.org/pypi/setuptools) 2.1
+- [7-zip](http://7-zip.org)
+
+### How to run tw blue from source
+
+Run the file main.py located in the src folder. If you have a x64 system, you can install both 32-bit and 64-bit python versions, and test tw blue in these platforms.
+
+### How to build a binary version
+
+You must type the following command. In this example, we will assume that python is the path to the python executable (x86 or x64) and that you have navigated to the src directory:
+
+    python setup.py py2exe
+
+	You will find the binary version in the dist directory. You can compress this folder using 7-zip and you will get the zip version.
+
+### How to generate a translation template
+
+You must run the gen_pot.bat file, located in the tools directory. Your python installation should be in your path environment variable. The pot file will appear in the tools directory too.

readme.windows.txt

@@ -1,60 +0,0 @@
-tw blue build instructions for Windows
-
-Introduction.
-This document describes how to run tw blue from source, and, after that, how to build a binary version, which doesn't need Python and the other dependencies to run.
-
-Required dependencies.
-The following dependencies need to be installed in your system. If you want to build tw blue for 32-bit versions of Windows, you will find the required software in the x86 folder, inside dependencies directory. If you want to build tw blue for 64-bit windows versions, use the x64 folder.
-In this document you will also find links to each dependency website.
-If you want to build manually some of the following libraries, you need Microsoft Visual studio 2008 professional.
-
-Dependencies list:
-- Python, version 2.7.8: http://www.python.org
-- wxPython for Python 2.7, version 3.0.0 (2.9.5 to avoid problems in windows xp): http://www.wxpython.org
--Python windows extensions (pywin32) for python 2.7, build 218: http://www.sourceforge.net/projects/pywin32/
-- ConfigObj, version 4.7.2: http://www.voidspace.org.uk/python/configobj.html
-- oauthlib 0.6.1: https://pypi.python.org/pypi/oauthlib/0.6.1
-- Pycurl 7.19.3.1 for Python 2.7:
-Official website: http://pycurl.sourceforge.net/
-32-bit downloads: https://pypi.python.org/pypi/pycurl/7.19.3.1
-64-bit downloads: http://www.lfd.uci.edu/~gohlke/pythonlibs/
-- Requests 2.2.1:
-Official website: http://www.python-requests.org/en/latest/
-Recommended download site: https://pypi.python.org/pypi/requests/2.2.1
-- Requests-oauthlib 0.4.0: https://github.com/requests/requests-oauthlib
-- Suds 0.4:
-Official website: https://fedorahosted.org/suds
-Recommended download site: https://pypi.python.org/pypi/suds/0.4
-- Twython 3.1.2: https://pypi.python.org/pypi/twython/3.1.2
-- Bootstrap 1.2.1: included in dependencies directory.
-Copy the bootstrap.exe file corresponding to the desired platform in the windows folder, inside this repository.
-This dependency has been built using pure basic 4.61. Its source can be found at http://hg.q-continuum.net/updater
-- oggenc2.exe, version 2.87: http://www.rarewares.org/ogg-oggenc.php
-Copy the oggenc2.exe file corresponding to the desired platform in the windows folder, inside this repository.
--Visual C++ 2008 dlls, included in vcredist-x86.7z and vcredist-x64.7z:
-Extract the file corresponding to your platform to the windows folder.
-
-To build the binary version:
-- Py2exe for Python 2.7, version 0.6.9: http://www.sourceforge.net/projects/py2exe/
-- Setuptools 2.1: https://pypi.python.org/pypi/setuptools
-- 7-zip: http://7-zip.org
-
-To generate the documentation:
-- Pandoc, version 1.12.3:
-Official website: http://johnmacfarlane.net/pandoc/
-Downloads site: http://code.google.com/p/pandoc/downloads/list
-
-How to run tw blue from source
-Run the file main.py located in windows folder. If you have a x64 system, you can install both 32-bit and 64-bit python versions, and test tw blue in these platforms.
-
-How to generate the documentation
-To generate quickly the documentation, a bash console is required. You can find bash in git for windows, cygwin, or MSYS, for example.
-You must navigate to the tools directory and run the script gen_doc.sh. It will generate and place all html documentation in windows\documentation directory.
-
-How to build a binary version
-You must type the following command. In the following example, we will assume that python is the path to the python executable (x86 or x64) and that you have navigated to the windows directory:
-python setup.py py2exe
-You will find the binary version in the dist directory. You can compress this folder using 7-zip and you will get the zip version.
-
-How to generate a translation template
-You must run the gen_pot.bat file, located in the tools directory. Your python installation should be in your path environment variable. The pot file will appear in the tools directory too.

src/application.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 name = 'TW Blue'
-snapshot = False
+snapshot = True
 if snapshot == False:
  version = "0.48"
  update_url = 'http://twblue.com.mx/updates/tw_blue.json'
@@ -8,13 +8,13 @@ else:
  version = "4"
  update_url = 'http://twblue.com.mx/updates/snapshots.json'
 author = u"Manuel Cortéz"
-authorEmail = "info@twblue.com.mx"
+authorEmail = "manuel@manuelcortez.net"
 copyright = u"copyright (C) 2013-2014, Manuel cortéz"
 description = u"TW Blue is an app designed to use Twitter in a simple and fast way and avoiding, as far as possible, the consumtion of excessive resources of the machine where it’s running. With this app you’ll have access to most twitter features."
 translators = [u"Bryner Villalobos (English)", u"Mohammed Al Shara (Arabic)", u"Salva Doménech, Juan Carlos Rivilla(Catalan)", u"Manuel cortéz(Spanish)", u"Sukil Etxenike Arizaleta(Basque)", u"Jani Kinnunen(finnish)", u"Javier Currás, José Manuel Delicado, Alba Quinteiro(Galician)", u"Robert Osztolykan(Hungarian)", u"Paweł Masarczyk(Polish)", u"Odenilton Júnior Santos(Portuguese)", u"Alexander Jaszyn(Russian)", u"Burak (Turkish)"]
 url = u"http://twblue.com.mx"
-#report_bugs_url = "http://twblue.com.mx/errores/api/soap/mantisconnect.php?wsdl"
+report_bugs_url = "http://twblue.com.mx/bugs/api/soap/mantisconnect.php?wsdl"
 
 # Tokens
 app_key = '8pDLbyOW3saYnvSZ4uLFg'
-app_secret = 'YsgdrzY9B4yyYvYsyee78rKI3GshjHpenVS9LnFJXY'
+app_secret = 'YsgdrzY9B4yyYvYsyee78rKI3GshjHpenVS9LnFJXY'	

src/extra/AudioUploader/gui.py

@@ -68,8 +68,8 @@ class audioDialog(wx.Dialog):
   services = []
   if config.main["services"]["dropbox_token"] != "":
    services.append("Dropbox")
-   service.append("TwUp")
+  services.append("TwUp")
-   services.append("SNDUp")
+  services.append("SNDUp")
   return services
 
  def onPause(self, ev):

src/extra/autocompletionUsers/wx_settings.py

@@ -3,7 +3,7 @@ import wx
 
 class autocompletionSettingsDialog(wx.Dialog):
  def __init__(self):
-  super(autocompletionSettingsDialog, self).__init__(parent=None, id=-1, title=_(u"Autocompletion settings"))
+  super(autocompletionSettingsDialog, self).__init__(parent=None, id=-1, title=_(u"Autocomplete users’ settings"))
   panel = wx.Panel(self)
   sizer = wx.BoxSizer(wx.VERTICAL)
   self.followers_buffer = wx.CheckBox(panel, -1, _(u"Add users from followers buffer"))

src/gui/dialogs/configuration.py

@@ -51,7 +51,7 @@ class general(wx.Panel):
   langBox.Add(language, 0, wx.ALL, 5)
   langBox.Add(self.language, 0, wx.ALL, 5)
   sizer.Add(langBox, 0, wx.ALL, 5)
-  self.au = wx.Button(self, -1, u"Configure autocompltion")
+  self.au = wx.Button(self, -1, _(u"Set the autocomplete function"))
 #  self.Bind(wx.EVT_BUTTON, self.autocompletion, au)
   self.ask_at_exit = wx.CheckBox(self, -1, _(U"ask before exiting TwBlue?"))
   self.ask_at_exit.SetValue(config.main["general"]["ask_at_exit"])

src/gui/dialogs/message.py

@@ -315,7 +315,7 @@ class reply(tweet):
   super(reply, self).__init__(message, title, text, parent)
   self.in_reply_to = parent.db.settings[parent.name_buffer][parent.list.get_selected()]["id"]
   self.text.SetInsertionPoint(len(self.text.GetValue()))
-  self.mentionAll = wx.Button(self, -1, _(u"Mention to all"), size=wx.DefaultSize)
+  self.mentionAll = wx.Button(self, -1, _(u"Mention &to all"), size=wx.DefaultSize)
   self.mentionAll.Disable()
   self.mentionAll.Bind(wx.EVT_BUTTON, self.mentionAllUsers)
   self.buttonsBox1.Add(self.mentionAll, 0, wx.ALL, 5)

src/main.py

@@ -42,6 +42,7 @@ if hasattr(sys, 'frozen'):
   sys.stdout = open(paths.logs_path("stdout.log"), 'w')
 
 app = wx.App()
+#app = wx.App(redirect=True, useBestVisual=True, filename=paths.logs_path('tracebacks.log'))
 configured = False
 configs = []
 for i in os.listdir(paths.config_path()):