added search and logout to Linux

This commit is contained in:
jeena 2013-03-26 13:25:16 +01:00
parent cbc6755791
commit 3d1768540d
7 changed files with 236 additions and 50 deletions

View file

@ -101,19 +101,32 @@ class Timeline:
def initUI(self):
newPostAction = QtGui.QAction("&New Post", self.window)
menubar = self.window.menuBar()
newPostAction = QtGui.QAction("&New post", self.window)
newPostAction.setShortcut("Ctrl+N")
newPostAction.setStatusTip("Open new post window")
newPostAction.triggered.connect(self.app.controller.openNewMessageWidow)
findEntityAction = QtGui.QAction("&Open profile for entity ...", self.window)
findEntityAction.setShortcut("Ctrl+u")
findEntityAction.setStatusTip("Find entity and open its profile view")
findEntityAction.triggered.connect(self.app.find_entity_show)
logOutAction = QtGui.QAction("&Log out", self.window)
logOutAction.setStatusTip("Log out from this entity")
logOutAction.triggered.connect(self.app.log_out)
exitAction = QtGui.QAction("&Exit", self.window)
exitAction.setShortcut("Ctrl+Q")
exitAction.setStatusTip("Exit Bungloo")
exitAction.triggered.connect(QtGui.qApp.quit)
menubar = self.window.menuBar()
fileMenu = menubar.addMenu("&File")
fileMenu.addAction(newPostAction)
fileMenu.addAction(findEntityAction)
fileMenu.addSeparator()
fileMenu.addAction(logOutAction)
fileMenu.addAction(exitAction)
timelineAction = QtGui.QAction("&Timeline", self.window)
@ -126,26 +139,41 @@ class Timeline:
mentionsAction.setStatusTip("Show Mentions")
mentionsAction.triggered.connect(self.app.mentions_show)
findEntityAction = QtGui.QAction("&Open Profile", self.window)
findEntityAction.setShortcut("Ctrl+u")
findEntityAction.setStatusTip("Find entity and open its profile view")
findEntityAction.triggered.connect(self.app.find_entity_show)
conversationAction = QtGui.QAction("&Conversation", self.window)
conversationAction.setShortcut("Ctrl+3")
conversationAction.setStatusTip("Show Conversation")
conversationAction.triggered.connect(self.app.conversation_show)
hideAction = QtGui.QAction("&Hide window", self.window)
hideAction.setShortcut("Ctrl+W")
hideAction.setStatusTip("Hide this window")
hideAction.triggered.connect(self.hide)
profileAction = QtGui.QAction("&Profile", self.window)
profileAction.setShortcut("Ctrl+4")
profileAction.setStatusTip("Show Profile")
profileAction.triggered.connect(self.app.profile_show)
windowMenu = menubar.addMenu("&Windows")
searchAction = QtGui.QAction("&Search", self.window)
searchAction.setShortcut("Ctrl+F")
searchAction.setStatusTip("Show Search")
searchAction.triggered.connect(self.app.search_show)
windowMenu = menubar.addMenu("&View")
windowMenu.addAction(timelineAction)
windowMenu.addAction(mentionsAction)
windowMenu.addAction(hideAction)
windowMenu.addAction(findEntityAction)
windowMenu.addAction(conversationAction)
windowMenu.addAction(profileAction)
windowMenu.addAction(searchAction)
aboutAction = QtGui.QAction("&About Bungloo", self.window)
aboutAction.setStatusTip("Open about page in Webbrowser")
aboutAction.triggered.connect(self.app.open_about)
helpMenu = menubar.addMenu("&Help")
helpMenu.addAction(aboutAction)
def show(self):
self.window.show()
#self.window.raise_()
#QtGui.qApp.setActiveWindow(self.window)
def close(self):
self.window.close()
def hide(self):
self.window.hide()
@ -174,7 +202,11 @@ class Oauth:
self.core.page().mainFrame().evaluateJavaScript(script)
def login(self):
script = "bungloo_instance.authenticate();"
script = "bungloo.oauth.authenticate();"
self.core.page().mainFrame().evaluateJavaScript(script)
def log_out(self):
script = "bungloo.oauth.logout()";
self.core.page().mainFrame().evaluateJavaScript(script)
def handle_authentication(self, url):
@ -203,7 +235,7 @@ class Oauth:
dialog.exec_()
def bungloo_callback(self, url):
script = "bungloo_instance.requestAccessToken('" + url.toString() + "');"
script = "bungloo.oauth.requestAccessToken('" + url.toString() + "');"
self.core.page().mainFrame().evaluateJavaScript(script)
def hide(self):