Merge branch 'next-gen' into sane-gen

README.md

@@ -63,7 +63,7 @@ setuptools installs a script, called easy_install. You can find it in the python
 * requests-toolbelt
 * future
 * pygeocoder
-* arrow==0.6
+* arrow
 * markdown
 * winpaths
 * PySocks
@@ -72,7 +72,7 @@ setuptools installs a script, called easy_install. You can find it in the python
 
 easy_install will automatically get the additional libraries that these packages need to work properly.
 Run the following command to quickly install and upgrade all packages and their dependencies:  
-easy_install -Z --upgrade six configobj markdown future requests oauthlib requests-oauthlib requests-toolbelt pypubsub==3.3.0 pygeocoder arrow==0.6 python-dateutil futures winpaths PySocks win_inet_pton yandex.translate idna chardet urllib3
+easy_install -Z --upgrade six configobj markdown future requests oauthlib requests-oauthlib requests-toolbelt pypubsub==3.3.0 pygeocoder arrow python-dateutil futures winpaths PySocks win_inet_pton yandex.translate idna chardet urllib3
 
 #### Other dependencies
 

doc/changelog.md

@@ -7,7 +7,8 @@
 * Trending topics, searches and conversation buffers will use mute settings set for the session in wich  they were opened. ([#157](https://github.com/manuelcortez/TWBlue/issues/157))
 * The Tweet limit is now 280 characters lenght instead 140. It means you can tweet longer tweets. ([#172](https://github.com/manuelcortez/TWBlue/issues/172))
 * Per popular request, Status for mention to all and long tweet checkboxes will not be saved in settings. ([#170](https://github.com/manuelcortez/TWBlue/issues/170))
-* And more. ([#156,](https://github.com/manuelcortez/TWBlue/issues/156) [#163,](https://github.com/manuelcortez/TWBlue/issues/163) [#159,](https://github.com/manuelcortez/TWBlue/issues/159) [#173,](https://github.com/manuelcortez/TWBlue/issues/173) [#174,](https://github.com/manuelcortez/TWBlue/issues/174))
+* Fixed a problem that was making TWBlue unable to start if it was being ran in Windows with Serbian language. ([#175](https://github.com/manuelcortez/TWBlue/issues/175))
+* And more. ([#156,](https://github.com/manuelcortez/TWBlue/issues/156) [#163,](https://github.com/manuelcortez/TWBlue/issues/163) [#159,](https://github.com/manuelcortez/TWBlue/issues/159) [#173,](https://github.com/manuelcortez/TWBlue/issues/173) [#174,](https://github.com/manuelcortez/TWBlue/issues/174) [#176,](https://github.com/manuelcortez/TWBlue/issues/176))
 
 ## changes in version 0.91 and 0.92
 

mysc/pa.c format/App/AppInfo/appinfo.ini

@@ -1,6 +1,6 @@
 [Format]
 Type=PortableApps.comFormat
-Version=3.4
+Version=3.5
 
 [Details]
 Name=tw blue portable

src/application.py

@@ -3,16 +3,16 @@ name = 'TWBlue'
 snapshot = False
 if snapshot == False:
  version = "0.92"
- update_url = 'http://twblue.es/updates/twblue_ngen.json'
+ update_url = 'https://twblue.es/updates/stable.php'
  mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/stable.json'
 else:
- version = "10.99"
+ version = "1"
- update_url = 'http://twblue.es/updates/snapshots_ngen.json'
+ update_url = 'https://twblue.es/updates/snapshot.php'
  mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/snapshots.json'
 authors = [u"Manuel Cortéz", u"José Manuel Delicado"]
 authorEmail = "manuel@manuelcortez.net"
 copyright = u"Copyright (C) 2013-2017, Manuel cortéz."
 description = unicode(name+" is an app designed to use Twitter simply and efficiently while using minimal system resources. This app provides access to most Twitter features.")
 translators = [u"Manuel Cortéz (English)", u"Mohammed Al Shara, Hatoun Felemban (Arabic)", u"Francisco Torres (Catalan)", u"Manuel cortéz (Spanish)", u"Sukil Etxenike Arizaleta (Basque)", u"Jani Kinnunen (finnish)", u"Rémy Ruiz (French)", u"Juan Buño (Galician)", u"Steffen Schultz (German)", u"Zvonimir Stanečić (Croatian)", u"Robert Osztolykan (Hungarian)", u"Christian Leo Mameli (Italian)", u"Riku (Japanese)", u"Paweł Masarczyk (Polish)", u"Odenilton Júnior Santos (Portuguese)", u"Florian Ionașcu, Nicușor Untilă (Romanian)", u"Natalia Hedlund, Valeria Kuznetsova (Russian)", u"Aleksandar Đurić (Serbian)", u"Burak Yüksek (Turkish)"]
-url = u"http://twblue.es"
+url = u"https://twblue.es"
-report_bugs_url = "http://twblue.es/bugs/api/soap/mantisconnect.php?wsdl"
+report_bugs_url = "https://github.com/manuelcortez/twblue/issues"

src/controller/mainController.py

@@ -442,7 +442,7 @@ class Controller(object):
      buffer.session.settings["other_buffers"]["tweet_searches"].append(term)
      buffer.session.settings.write()
      args = {"lang": dlg.get_language(), "result_type": dlg.get_result_type()}
-     search = buffersController.searchBufferController(self.view.nb, "search", "%s-searchterm" % (term,), buffer.session, buffer.session.db["user_name"], bufferType="searchPanel", q=term, **args)
+     search = buffersController.searchBufferController(self.view.nb, "search", "%s-searchterm" % (term,), buffer.session, buffer.session.db["user_name"], bufferType="searchPanel", q=term, tweet_mode="extended", **args)
     else:
      log.error("A buffer for the %s search term is already created. You can't create a duplicate buffer." % (term,))
      return
@@ -1521,10 +1521,13 @@ class Controller(object):
   os.chdir("../../")
 
  def view_changelog(self, *args, **kwargs):
-  lang = localization.get("documentation")
+  if application.snapshot == True:
-  os.chdir("documentation/%s" % (lang,))
+   webbrowser.open("https://github.com/manuelcortez/twblue/blob/next-gen/doc/changelog.md")
-  webbrowser.open("changelog.html")
+  else:
-  os.chdir("../../")
+   lang = localization.get("documentation")
+   os.chdir("documentation/%s" % (lang,))
+   webbrowser.open("changelog.html")
+   os.chdir("../../")
 
  def insert_buffer(self, buffer, position):
   self.buffers.insert(position, buffer)

src/controller/messages.py

@@ -148,6 +148,8 @@ class reply(tweet):
   if len(users) > 0:
    widgetUtils.connect_event(self.message.mentionAll, widgetUtils.CHECKBOX, self.mention_all)
    self.message.enable_button("mentionAll")
+   self.message.set("mentionAll", True)
+   self.mention_all()
   self.message.set_cursor_at_end()
   self.text_processor()
 

src/fixes/fix_arrow.py

@@ -3,23 +3,16 @@ from arrow import locales
 from arrow.locales import Locale
 
 def fix():
-	''' This function adds the Catala, Basque and galician locales to the list of locales supported in Arrow.
-	it also fixes capitalizations in names from turkish and arabian locales.
-	see https://github.com/crsmithdev/arrow/pull/207 for following the pull request.'''
-	locales.CatalaLocale = CatalaLocale
-	locales.GalicianLocale = GalicianLocale
-	locales.BasqueLocale = BasqueLocale
-	locales.TurkishLocale.names[-1] = "tr_tr"
-	locales.ArabicLocale.names[-1] = "ar_eg"
 	# insert a modified function so if there is no language available in arrow, returns English locale.
 	locales.get_locale = get_locale
-	# We need to reassign the locales list for updating the list with our new contents.
-	locales._locales = locales._map_locales()
 
 def get_locale(name):
 	locale_cls = locales._locales.get(name.lower())
 	if locale_cls is None:
-		return locales.EnglishLocale()
+		name = name[:2]
+		locale_cls = locales._locales.get(name.lower())
+		if locale_cls == None:
+			return locales.EnglishLocale()
 	return locale_cls()
 
 class CatalaLocale(Locale):

src/languageHandler.py

@@ -3,6 +3,8 @@ import os
 import sys
 import ctypes
 import locale
+# add mapping for Serbian (latin) language
+locale.windows_locale[9242]='sr_RS'
 import gettext
 import paths
 import platform

src/wxUI/dialogs/message.py

@@ -252,7 +252,6 @@ class reply(textLimited):
    self.usersbox.Add(self.checkboxes[-1], 0, wx.ALL, 5)
   self.mainBox.Add(self.usersbox, 0, wx.ALL, 10)
   self.long_tweet = wx.CheckBox(self.panel, -1, _(u"&Long tweet"))
-  self.long_tweet.SetValue(True)
   self.upload_image = wx.Button(self.panel, -1, _(u"&Upload image..."), size=wx.DefaultSize)
   self.spellcheck = wx.Button(self.panel, -1, _("Check &spelling..."), size=wx.DefaultSize)
   self.attach = wx.Button(self.panel, -1, _(u"&Attach audio..."), size=wx.DefaultSize)

updates/snapshots.json

@@ -1,5 +1,5 @@
-{"current_version": "10.99",
+{"current_version": "1",
-"description": "Changes: Read the changelog from the help menu in the menu bar.",
+"description": "Snapshot version.",
-"date": "day_name_abr month day_numb, 2016",
+"date": "unknown",
 "downloads":
-{"Windows32": "http://twblue.es/pubs/twblue_snapshot.zip"}}
+{"Windows32": "https://twblue.es/pubs/snapshot.zip"}}