Merge 10ebf3a55f into 47a54c5c2a
This commit is contained in:
commit
eddb62d83f
39 changed files with 859 additions and 860 deletions
|
|
@ -15,7 +15,7 @@ class Bungloo:
|
|||
self.preferences = Windows.Preferences(self)
|
||||
self.preferences.show()
|
||||
|
||||
self.oauth_implementation = Windows.Oauth(self)
|
||||
self.oauth_implementation = Windows.Oauth(self)
|
||||
|
||||
if self.controller.stringForKey("user_access_token") != "":
|
||||
self.authentification_succeded()
|
||||
|
|
@ -196,7 +196,7 @@ class Controller(QtCore.QObject):
|
|||
msgBox = QtGui.QMessageBox()
|
||||
msgBox.setText(errorMessage)
|
||||
msgBox.exec_()
|
||||
|
||||
|
||||
@QtCore.pyqtSlot(str, str)
|
||||
def alertTitleWithMessage(self, title, message):
|
||||
msgBox = QtGui.QMessageBox()
|
||||
|
|
@ -230,6 +230,6 @@ class Console(QtCore.QObject):
|
|||
def debug(self, string):
|
||||
print "<js DEBUG>: " + string
|
||||
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
Bungloo()
|
||||
Reference in a new issue