Merge branch 'master' of github.com:jeena/Tentia
This commit is contained in:
commit
4b8c157601
2 changed files with 2 additions and 2 deletions
|
@ -104,7 +104,7 @@ class RestorableWindow(QtGui.QMainWindow):
|
||||||
|
|
||||||
def hide(self):
|
def hide(self):
|
||||||
self._saveGeometry()
|
self._saveGeometry()
|
||||||
QtGui.QMainWindow.hide(self)
|
QtGui.QMainWindow.close(self)
|
||||||
|
|
||||||
def sizeHint(self):
|
def sizeHint(self):
|
||||||
return QtCore.QSize(300, 500)
|
return QtCore.QSize(300, 500)
|
||||||
|
|
|
@ -166,7 +166,7 @@ class Controller(QtCore.QObject):
|
||||||
if message.isPrivate:
|
if message.isPrivate:
|
||||||
isPrivate = "true"
|
isPrivate = "true"
|
||||||
|
|
||||||
func = ("tentia_instance.sendNewMessage(\"" + text + "\", \"{}\", \"{}\", {}, {}, {});").format( in_reply_to_status_id, in_reply_to_entity, locationObject, imageFilePath, isPrivate)
|
func = u"tentia_instance.sendNewMessage(\"{}\", \"{}\", \"{}\", {}, {}, {});".format(text, in_reply_to_status_id, in_reply_to_entity, locationObject, imageFilePath, isPrivate)
|
||||||
self.app.timeline.evaluateJavaScript(func)
|
self.app.timeline.evaluateJavaScript(func)
|
||||||
|
|
||||||
@QtCore.pyqtSlot(str, str)
|
@QtCore.pyqtSlot(str, str)
|
||||||
|
|
Reference in a new issue