From 033962bc4118adafdb43f654add04098b9a0c885 Mon Sep 17 00:00:00 2001 From: jeena Date: Sun, 3 Mar 2013 13:58:57 +0100 Subject: [PATCH] changed new post icons to monochrome --- Linux/Bungloo.py | 3 +-- Linux/Helper.py | 4 ++-- Linux/Windows.py | 24 ++++++++++++++++++++---- images/glyphicons_123_message_out.png | Bin 0 -> 320 bytes images/glyphicons_138_picture.png | Bin 0 -> 338 bytes images/glyphicons_203_lock.png | Bin 0 -> 325 bytes images/glyphicons_204_unlock.png | Bin 0 -> 231 bytes 7 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 images/glyphicons_123_message_out.png create mode 100644 images/glyphicons_138_picture.png create mode 100644 images/glyphicons_203_lock.png create mode 100644 images/glyphicons_204_unlock.png diff --git a/Linux/Bungloo.py b/Linux/Bungloo.py index 59eeedc..42610f1 100755 --- a/Linux/Bungloo.py +++ b/Linux/Bungloo.py @@ -13,7 +13,6 @@ import shutil class Bungloo: def __init__(self): - print __file__ self.app = QtGui.QApplication(sys.argv) self.new_message_windows = [] self.controller = Controller(self) @@ -36,7 +35,7 @@ class Bungloo: return Helper.Helper.get_resource_path() def resources_uri(self): - return "file://localhost" + os.path.abspath(os.path.join(self.resources_path(), "WebKit")) + return "file://localhost/" + os.path.abspath(os.path.join(self.resources_path(), "WebKit")) def login_with_entity(self, entity): self.controller.setStringForKey(entity, "entity") diff --git a/Linux/Helper.py b/Linux/Helper.py index 50910fa..21b2212 100644 --- a/Linux/Helper.py +++ b/Linux/Helper.py @@ -62,12 +62,12 @@ class WebViewCreator(QtWebKit.QWebView): js_plugin_path = os.path.expanduser('~/.bungloo/Plugin.js') if os.access(js_plugin_path, os.R_OK): - func = "setTimeout(function() { loadJsPlugin('file://localhost" + js_plugin_path + "') }, 1000);" + func = "setTimeout(function() { loadJsPlugin('file://localhost/" + js_plugin_path + "') }, 1000);" frame.evaluateJavaScript(func) css_plugin_path = os.path.expanduser('~/.bungloo/Plugin.css') if os.access(css_plugin_path, os.R_OK): - func = "setTimeout(function() { loadCssPlugin('file://localhost" + css_plugin_path + "') }, 1000);" + func = "setTimeout(function() { loadCssPlugin('file://localhost/" + css_plugin_path + "') }, 1000);" frame.evaluateJavaScript(func) if callback: diff --git a/Linux/Windows.py b/Linux/Windows.py index 0495d24..ee1fc0c 100644 --- a/Linux/Windows.py +++ b/Linux/Windows.py @@ -294,6 +294,11 @@ class NewPost(Helper.RestorableWindow): sendPostAction.setStatusTip("Send post") sendPostAction.triggered.connect(self.sendMessage) + togglePrivateAction = QtGui.QAction("&Toggle private", self) + togglePrivateAction.setShortcut("Ctrl+P") + togglePrivateAction.setStatusTip("Toogle if private post") + togglePrivateAction.triggered.connect(self.toggleIsPrivate) + exitAction = QtGui.QAction("&Exit", self) exitAction.setShortcut("Ctrl+Q") exitAction.setStatusTip("Exit Bungloo") @@ -303,6 +308,7 @@ class NewPost(Helper.RestorableWindow): fileMenu = menubar.addMenu("&File") fileMenu.addAction(newPostAction) fileMenu.addAction(sendPostAction) + fileMenu.addAction(togglePrivateAction) fileMenu.addAction(exitAction) timelineAction = QtGui.QAction("&Timeline", self) @@ -315,6 +321,11 @@ class NewPost(Helper.RestorableWindow): mentionsAction.setStatusTip("Show Mentions") mentionsAction.triggered.connect(self.app.mentions_show) + findEntityAction = QtGui.QAction("&Open Profile", self) + findEntityAction.setShortcut("Ctrl+u") + findEntityAction.setStatusTip("Find entity and open its profile view") + findEntityAction.triggered.connect(self.app.find_entity_show) + hideAction = QtGui.QAction("&Hide window", self) hideAction.setShortcut("Ctrl+W") hideAction.setStatusTip("Hide this window") @@ -323,6 +334,7 @@ class NewPost(Helper.RestorableWindow): windowMenu = menubar.addMenu("&Windows") windowMenu.addAction(timelineAction) windowMenu.addAction(mentionsAction) + windowMenu.addAction(findEntityAction) windowMenu.addAction(hideAction) self.statusBar().showMessage('256') @@ -331,7 +343,8 @@ class NewPost(Helper.RestorableWindow): self.addButton.setToolTip("Add photo") self.addButton.clicked.connect(self.openFileDialog) self.addButton.setAutoRaise(True) - addIcon = QtGui.QIcon.fromTheme("insert-image", QtGui.QIcon(self.app.resources_path() + "/images/Actions-insert-image-icon.png")); + #addIcon = QtGui.QIcon.fromTheme("insert-image", QtGui.QIcon(self.app.resources_path() + "/images/Actions-insert-image-icon.png")) + addIcon = QtGui.QIcon(self.app.resources_path() + "/images/glyphicons_138_picture.png") self.addButton.setIcon(addIcon) self.statusBar().addPermanentWidget(self.addButton) @@ -339,8 +352,10 @@ class NewPost(Helper.RestorableWindow): self.isPrivateButton.setToolTip("Make private") self.isPrivateButton.clicked.connect(self.toggleIsPrivate) self.isPrivateButton.setAutoRaise(True) - self.isPrivateIcon = QtGui.QIcon(self.app.resources_path() + "/images/Lock-Lock-icon.png") - self.isNotPrivateIcon = QtGui.QIcon(self.app.resources_path() + "/images/Lock-Unlock-icon.png") + #self.isPrivateIcon = QtGui.QIcon(self.app.resources_path() + "/images/Lock-Lock-icon.png") + self.isPrivateIcon = QtGui.QIcon(self.app.resources_path() + "/images/glyphicons_203_lock.png") + #self.isNotPrivateIcon = QtGui.QIcon(self.app.resources_path() + "/images/Lock-Unlock-icon.png") + self.isNotPrivateIcon = QtGui.QIcon(self.app.resources_path() + "/images/glyphicons_204_unlock.png") self.isPrivateButton.setIcon(self.isNotPrivateIcon) self.statusBar().addPermanentWidget(self.isPrivateButton) @@ -348,7 +363,8 @@ class NewPost(Helper.RestorableWindow): self.sendButton.setToolTip("Send") self.sendButton.clicked.connect(self.sendMessage) self.sendButton.setAutoRaise(True) - sendIcon = QtGui.QIcon.fromTheme("mail-send", QtGui.QIcon(self.app.resources_path() + "/images/send-icon.png")) + #sendIcon = QtGui.QIcon.fromTheme("mail-send", QtGui.QIcon(self.app.resources_path() + "/images/send-icon.png")) + sendIcon = QtGui.QIcon(self.app.resources_path() + "/images/glyphicons_123_message_out.png") self.sendButton.setIcon(sendIcon) self.statusBar().addPermanentWidget(self.sendButton) diff --git a/images/glyphicons_123_message_out.png b/images/glyphicons_123_message_out.png new file mode 100644 index 0000000000000000000000000000000000000000..76126c39f85b23cf16f307c6d6d3d3604b5dd372 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^+#ogw8<4F3I>j1DaTa()76ZkFL70(Y)*K0-AbW|Y zuPggqW@a80?g+-?)7pG6kvIv|NWTKq9hR^Q%)hlBUUr^G;BTM z{*`yjMz5)EEYkH&9AO7d#4e__cr)c~PEUV+=G@KTsD3%UkFAwk1J?=g7qkk?Jk*_j z?SyVjvi#;N$14sl^2$q;d0KrZf%*B1N21+EErxuHE5w&tT5Y_1c+CNZUY{E-_Rs6G zUh;EoF+8e1Yo@|Z$(pXRnb)UR94hUtP)YN;J39|x{m>sV`6Iy+)Co%L;wbcQJhkberkXIuLcH+| zY#-aXv1lZC#!cwMtjHC5fjhvhIl~%e!J@6T_*YoRdCp*-oM9(sl)^T}7B*1MT30u! zZsGxN8PgO@7Eu+MV-KhJ!XaL8kIM*XVjZ&UFH_bxA&p_8N+5ebark)}JLJ5MP-ksRmy)m+-N51>LbM8F?P!xrf zWqBBe;T{P1mW!h3HOsQ+JkQktR8_U_y6yoG5xJ78D$_J=thHg&H18{bwrw8)!Z3WZ z)}AhKk|fzUj(1=4musYm;DZ3x+LNCYc#$m0e-F4p636jTRq^AN+(qQmdDg(M_{%() zI~ZfmbzMIhW6twCe!wDvb8ZdboLkRVyXn9s*raK?1I)j$s?zuUcB%Ij;QUX2ROmhc X&5LAYd~n)300000NkvXXu0mjfv-XQC literal 0 HcmV?d00001 diff --git a/images/glyphicons_204_unlock.png b/images/glyphicons_204_unlock.png new file mode 100644 index 0000000000000000000000000000000000000000..b38e078cb654913556b444a0a2e2b453c56e44a9 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^+(697!3HFMCO(@Aq&N#aB8!3I!XV7ZFl&wkP>{XE z)7O>#E;BQaG*|hI)%`%BHcuDF5RLOwFKpyJd`nTz&ybqV%+8W_jmP!-IH6?L8l}iYm_hbGhAo zKH~XbWij8kSN`PgTNPm9%s4%&BJ8ukou|^fq$(nRsK{{5Z&5aL-krAOr%74Dsv5Un Z3>+c?q3@;ArT|^U;OXk;vd$@?2>_1@Qbzy) literal 0 HcmV?d00001