Long tweet and mention to all options won't be saved in config. Closes #170

src/Conf.defaults

@@ -42,6 +42,4 @@ autoread_buffers = list(default=list(mentions, direct_messages, events))
 spelling_language = string(default="")
 save_followers_in_autocompletion_db = boolean(default=False)
 save_friends_in_autocompletion_db = boolean(default=False)
-twishort_enabled = boolean(default=False)
-mention_all = boolean(default=True)
 ocr_language = string(default="")

src/controller/buffersController.py

@@ -136,11 +136,10 @@ class bufferController(object):
  def post_tweet(self, *args, **kwargs):
   title = _(u"Tweet")
   caption = _(u"Write the tweet here")
-  tweet = messages.tweet(self.session, title, caption, "", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"])
+  tweet = messages.tweet(self.session, title, caption, "")
   if tweet.message.get_response() == widgetUtils.OK:
-   self.session.settings["mysc"]["twishort_enabled"] = tweet.message.long_tweet.GetValue()
    text = tweet.message.get_text()
-   if len(text) > 140 and tweet.message.get("long_tweet") == True:
+   if len(text) > 280 and tweet.message.get("long_tweet") == True:
     if not hasattr(tweet, "attachments"):
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text)
     else:
@@ -517,12 +516,9 @@ class baseBufferController(bufferController):
    title=_("Reply to {arg0}").format(arg0=screen_name)
   else:
    title=_("Reply")
-  message = messages.reply(self.session, title, _(u"Reply to %s") % (screen_name,), "", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"], users=users, ids=ids)
+  message = messages.reply(self.session, title, _(u"Reply to %s") % (screen_name,), "", users=users, ids=ids)
   if message.message.get_response() == widgetUtils.OK:
    params = {"_sound": "reply_send.ogg", "in_reply_to_status_id": id,}
-   self.session.settings["mysc"]["twishort_enabled"] = message.message.long_tweet.GetValue()
-   if len(message.users) > 0:
-    self.session.settings["mysc"]["mention_all"] = message.message.mentionAll.GetValue()
    text = message.message.get_text()
    if twishort_enabled == False:
     excluded_ids = message.get_ids()
@@ -531,7 +527,7 @@ class baseBufferController(bufferController):
    else:
     mentioned_people = message.get_people()
     text = "@"+screen_name+" "+mentioned_people+u" "+text
-   if len(text) > 140 and message.message.get("long_tweet") == True:
+   if len(text) > 280 and message.message.get("long_tweet") == True:
     if message.image == None:
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text)
     else:
@@ -589,7 +585,7 @@ class baseBufferController(bufferController):
    comments = tweet["full_text"]
   else:
    comments = tweet["text"]
-  retweet = messages.tweet(self.session, _(u"Quote"), _(u"Add your comment to the tweet"), u"“@%s: %s ”" % (tweet["user"]["screen_name"], comments), max=116, messageType="retweet", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"])
+  retweet = messages.tweet(self.session, _(u"Quote"), _(u"Add your comment to the tweet"), u"“@%s: %s ”" % (tweet["user"]["screen_name"], comments), max=256, messageType="retweet")
   if comment != '':
    retweet.message.set_text(comment)
   if retweet.message.get_response() == widgetUtils.OK:
@@ -1217,12 +1213,11 @@ class trendsBufferController(bufferController):
   if self.buffer.list.get_count() == 0: return
   title = _(u"Tweet")
   caption = _(u"Write the tweet here")
-  tweet = messages.tweet(self.session, title, caption, self.get_message()+ " ", twishort_enabled=self.session.settings["mysc"]["twishort_enabled"])
+  tweet = messages.tweet(self.session, title, caption, self.get_message()+ " ")
   tweet.message.set_cursor_at_end()
   if tweet.message.get_response() == widgetUtils.OK:
-   self.session.settings["mysc"]["twishort_enabled"] = tweet.message.long_tweet.GetValue()
    text = tweet.message.get_text()
-   if len(text) > 140 and tweet.message.get("long_tweet") == True:
+   if len(text) > 280 and tweet.message.get("long_tweet") == True:
     if tweet.image == None:
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text)
     else:

src/controller/messages.py

@@ -124,14 +124,11 @@ class basicTweet(object):
   self.message.text_focus()
 
 class tweet(basicTweet):
- def __init__(self, session, title, caption, text, twishort_enabled, max=280, messageType="tweet", *args, **kwargs):
+ def __init__(self, session, title, caption, text, max=280, messageType="tweet", *args, **kwargs):
   super(tweet, self).__init__(session, title, caption, text, messageType, max, *args, **kwargs)
   self.image = None
   widgetUtils.connect_event(self.message.upload_image, widgetUtils.BUTTON_PRESSED, self.upload_image)
   widgetUtils.connect_event(self.message.autocompletionButton, widgetUtils.BUTTON_PRESSED, self.autocomplete_users)
-  if twishort_enabled == False:
-   try: self.message.long_tweet.SetValue(False)
-   except AttributeError: pass
   self.text_processor()
 
  def upload_image(self, *args, **kwargs):
@@ -144,16 +141,13 @@ class tweet(basicTweet):
   c.show_menu()
 
 class reply(tweet):
- def __init__(self, session, title, caption, text, twishort_enabled, users=[], ids=[]):
-  super(reply, self).__init__(session, title, caption, text, twishort_enabled, messageType="reply", users=users)
+ def __init__(self, session, title, caption, text, users=[], ids=[]):
+  super(reply, self).__init__(session, title, caption, text, messageType="reply", users=users)
   self.ids = ids
   self.users = users
   if len(users) > 0:
    widgetUtils.connect_event(self.message.mentionAll, widgetUtils.CHECKBOX, self.mention_all)
    self.message.enable_button("mentionAll")
-   self.message.mentionAll.SetValue(self.session.settings["mysc"]["mention_all"])
-   if self.message.mentionAll.GetValue() == True:
-    self.mention_all()
   self.message.set_cursor_at_end()
   self.text_processor()
 
@@ -167,7 +161,6 @@ class reply(tweet):
     i.SetValue(False)
     i.Show()
 
-
  def get_ids(self):
   excluded_ids  = ""
   for i in xrange(0, len(self.message.checkboxes)):

src/wxUI/dialogs/message.py

@@ -71,7 +71,6 @@ class tweet(textLimited):
   self.createTextArea(message, text)
   self.mainBox.Add(self.textBox, 0, wx.ALL, 5)
   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)