diff options
| author | Rael Gugelmin Cunha <rael.gc@gmail.com> | 2015-10-17 07:42:13 -0300 |
|---|---|---|
| committer | Rael Gugelmin Cunha <rael.gc@gmail.com> | 2015-10-17 07:42:13 -0300 |
| commit | 8161b31caf4d1cd8d23f73780f12040e1477a968 (patch) | |
| tree | 2cab0a9ad9faa5a0c054dbe6ff30f0c7708d7779 | |
| parent | 8d707a187d06355d5b75a86987eeb1563fa3c1f9 (diff) | |
| parent | 33314d7527dd9d27444d2d5d25ec0abc858d63fe (diff) | |
| download | scudcloud-8161b31caf4d1cd8d23f73780f12040e1477a968.zip scudcloud-8161b31caf4d1cd8d23f73780f12040e1477a968.tar.gz scudcloud-8161b31caf4d1cd8d23f73780f12040e1477a968.tar.bz2 | |
Merge pull request #263 from raelgc/251-remember-menubar-state
Saving menubar state (#251)
| -rw-r--r-- | scudcloud-1.0/lib/resources.py | 2 | ||||
| -rwxr-xr-x | scudcloud-1.0/lib/scudcloud.py | 11 | ||||
| -rw-r--r-- | scudcloud-1.0/resources/resources.css | 2 | ||||
| -rwxr-xr-x | scudcloud-1.0/scudcloud | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/scudcloud-1.0/lib/resources.py b/scudcloud-1.0/lib/resources.py index cb93d91..f9835d8 100644 --- a/scudcloud-1.0/lib/resources.py +++ b/scudcloud-1.0/lib/resources.py @@ -2,7 +2,7 @@ import os, re class Resources: - APP_NAME = "scudcloud" + APP_NAME = "ScudCloud Slack_SSB" SIGNIN_URL = "https://slack.com/signin" MAINPAGE_URL_RE = re.compile(r'^http[s]://[a-zA-Z0-9_\-]+.slack.com/?$') MESSAGES_URL_RE = re.compile(r'^http[s]://[a-zA-Z0-9_\-]+.slack.com/messages/.*') diff --git a/scudcloud-1.0/lib/scudcloud.py b/scudcloud-1.0/lib/scudcloud.py index af4fb0c..c590b09 100755 --- a/scudcloud-1.0/lib/scudcloud.py +++ b/scudcloud-1.0/lib/scudcloud.py @@ -104,7 +104,12 @@ class ScudCloud(QtGui.QMainWindow): def toggleMenuBar(self): menu = self.menuBar() - menu.setVisible(menu.isHidden()) + state = menu.isHidden() + menu.setVisible(state) + if state: + self.settings.setValue("Menu", "False") + else: + self.settings.setValue("Menu", "True") def restore(self): geometry = self.settings.value("geometry") @@ -204,6 +209,10 @@ class ScudCloud(QtGui.QMainWindow): showSystray = self.settings.value("Systray") == "True" self.menus["file"]["systray"].setChecked(showSystray) self.menus["file"]["close"].setEnabled(showSystray) + # Restore menu visibility + visible = self.settings.value("Menu") + if visible is not None and visible == "False": + menu.setVisible(False) def enableMenus(self, enabled): self.menus["file"]["preferences"].setEnabled(enabled == True) diff --git a/scudcloud-1.0/resources/resources.css b/scudcloud-1.0/resources/resources.css index 3d1279a..bc30435 100644 --- a/scudcloud-1.0/resources/resources.css +++ b/scudcloud-1.0/resources/resources.css @@ -1,2 +1,2 @@ -nav.top, footer {display: none !important;} +nav.top, footer, #prefs_mac_ssb_tab {display: none !important;} * {font-family: Lato,"Helvetica Neue",Helvetica,"Segoe UI",Tahoma,Arial,sans-serif;} diff --git a/scudcloud-1.0/scudcloud b/scudcloud-1.0/scudcloud index 6b07c37..2010636 100755 --- a/scudcloud-1.0/scudcloud +++ b/scudcloud-1.0/scudcloud @@ -44,7 +44,7 @@ def lock(): runtime_dir = os.environ['XDG_RUNTIME_DIR'] else: runtime_dir = tempfile.gettempdir() - pid_file = runtime_dir+'/'+Resources.APP_NAME+'.pid' + pid_file = runtime_dir+'/scudcloud.pid' fp = open(pid_file, 'w') try: fcntl.lockf(fp, fcntl.LOCK_EX | fcntl.LOCK_NB) |