[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: b5157ce5a1114d85e85505de0acff3d81086fd85

The branch, twofactorauth has been updated via b5157ce5a1114d85e85505de0acff3d81086fd85 (commit) from c42ac5d0104e9e9ddb4c0bd1a132bd0b2af99178 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: icons/PyHoca/32x32/auth_disconnect.png | 1 + icons/PyHoca/32x32/auth_error.png | 1 + icons/PyHoca/32x32/auth_success.png | 1 + icons/PyHoca/32x32/profile_add.png | 1 + icons/PyHoca/32x32/profile_delete.png | 1 + icons/PyHoca/32x32/profile_edit.png | 1 + icons/PyHoca/32x32/profile_save.png | 1 + icons/PyHoca/32x32/session_cleanall.png | 1 + icons/PyHoca/32x32/session_error.png | 1 + icons/PyHoca/32x32/session_pause.png | 1 + icons/PyHoca/32x32/session_resume.png | 1 + icons/PyHoca/32x32/session_start.png | 1 + icons/PyHoca/32x32/session_terminate.png | 1 + icons/PyHoca/32x32/session_warning.png | 1 + icons/PyHoca/scalable/auth_disconnect.svg | 1 + icons/PyHoca/scalable/auth_error.svg | 1 + icons/PyHoca/scalable/auth_success.svg | 1 + icons/PyHoca/scalable/profile_add.svg | 1 + icons/PyHoca/scalable/profile_delete.svg | 1 + icons/PyHoca/scalable/profile_edit.svg | 1 + icons/PyHoca/scalable/profile_save.svg | 1 + icons/PyHoca/scalable/session_cleanall.svg | 1 + icons/PyHoca/scalable/session_error.svg | 1 + icons/PyHoca/scalable/session_pause.svg | 1 + icons/PyHoca/scalable/session_resume.svg | 1 + icons/PyHoca/scalable/session_start.svg | 1 + icons/PyHoca/scalable/session_terminate.svg | 1 + icons/PyHoca/scalable/session_warning.svg | 1 + icons/PyHoca/x2go-logo-rotated.png | Bin 138065 -> 0 bytes pyhoca/wxgui/notify.py | 24 +----------------------- 30 files changed, 29 insertions(+), 23 deletions(-) create mode 120000 icons/PyHoca/32x32/auth_disconnect.png create mode 120000 icons/PyHoca/32x32/auth_error.png create mode 120000 icons/PyHoca/32x32/auth_success.png create mode 120000 icons/PyHoca/32x32/profile_add.png create mode 120000 icons/PyHoca/32x32/profile_delete.png create mode 120000 icons/PyHoca/32x32/profile_edit.png create mode 120000 icons/PyHoca/32x32/profile_save.png create mode 120000 icons/PyHoca/32x32/session_cleanall.png create mode 120000 icons/PyHoca/32x32/session_error.png create mode 120000 icons/PyHoca/32x32/session_pause.png create mode 120000 icons/PyHoca/32x32/session_resume.png create mode 120000 icons/PyHoca/32x32/session_start.png create mode 120000 icons/PyHoca/32x32/session_terminate.png create mode 120000 icons/PyHoca/32x32/session_warning.png create mode 120000 icons/PyHoca/scalable/auth_disconnect.svg create mode 120000 icons/PyHoca/scalable/auth_error.svg create mode 120000 icons/PyHoca/scalable/auth_success.svg create mode 120000 icons/PyHoca/scalable/profile_add.svg create mode 120000 icons/PyHoca/scalable/profile_delete.svg create mode 120000 icons/PyHoca/scalable/profile_edit.svg create mode 120000 icons/PyHoca/scalable/profile_save.svg create mode 120000 icons/PyHoca/scalable/session_cleanall.svg create mode 120000 icons/PyHoca/scalable/session_error.svg create mode 120000 icons/PyHoca/scalable/session_pause.svg create mode 120000 icons/PyHoca/scalable/session_resume.svg create mode 120000 icons/PyHoca/scalable/session_start.svg create mode 120000 icons/PyHoca/scalable/session_terminate.svg create mode 120000 icons/PyHoca/scalable/session_warning.svg delete mode 100644 icons/PyHoca/x2go-logo-rotated.png The diff of changes is: diff --git a/icons/PyHoca/32x32/auth_disconnect.png b/icons/PyHoca/32x32/auth_disconnect.png new file mode 120000 index 0000000..54f2738 --- /dev/null +++ b/icons/PyHoca/32x32/auth_disconnect.png @@ -0,0 +1 @@ +network-wired.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/auth_error.png b/icons/PyHoca/32x32/auth_error.png new file mode 120000 index 0000000..ab8db5e --- /dev/null +++ b/icons/PyHoca/32x32/auth_error.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/auth_success.png b/icons/PyHoca/32x32/auth_success.png new file mode 120000 index 0000000..d3a064b --- /dev/null +++ b/icons/PyHoca/32x32/auth_success.png @@ -0,0 +1 @@ +dialog-apply.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/profile_add.png b/icons/PyHoca/32x32/profile_add.png new file mode 120000 index 0000000..7d4c878 --- /dev/null +++ b/icons/PyHoca/32x32/profile_add.png @@ -0,0 +1 @@ +list-add.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/profile_delete.png b/icons/PyHoca/32x32/profile_delete.png new file mode 120000 index 0000000..bb0a74a --- /dev/null +++ b/icons/PyHoca/32x32/profile_delete.png @@ -0,0 +1 @@ +edit-delete.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/profile_edit.png b/icons/PyHoca/32x32/profile_edit.png new file mode 120000 index 0000000..a09517d --- /dev/null +++ b/icons/PyHoca/32x32/profile_edit.png @@ -0,0 +1 @@ +gtk-edit.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/profile_save.png b/icons/PyHoca/32x32/profile_save.png new file mode 120000 index 0000000..b1240e1 --- /dev/null +++ b/icons/PyHoca/32x32/profile_save.png @@ -0,0 +1 @@ +document-save.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/session_cleanall.png b/icons/PyHoca/32x32/session_cleanall.png new file mode 120000 index 0000000..406821b --- /dev/null +++ b/icons/PyHoca/32x32/session_cleanall.png @@ -0,0 +1 @@ +broom-cleanup.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/session_error.png b/icons/PyHoca/32x32/session_error.png new file mode 120000 index 0000000..ab8db5e --- /dev/null +++ b/icons/PyHoca/32x32/session_error.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/session_pause.png b/icons/PyHoca/32x32/session_pause.png new file mode 120000 index 0000000..0ef65d6 --- /dev/null +++ b/icons/PyHoca/32x32/session_pause.png @@ -0,0 +1 @@ +media-playback-pause.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/session_resume.png b/icons/PyHoca/32x32/session_resume.png new file mode 120000 index 0000000..e06eca2 --- /dev/null +++ b/icons/PyHoca/32x32/session_resume.png @@ -0,0 +1 @@ +x2go-logo-rotated.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/session_start.png b/icons/PyHoca/32x32/session_start.png new file mode 120000 index 0000000..e06eca2 --- /dev/null +++ b/icons/PyHoca/32x32/session_start.png @@ -0,0 +1 @@ +x2go-logo-rotated.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/session_terminate.png b/icons/PyHoca/32x32/session_terminate.png new file mode 120000 index 0000000..f8a647d --- /dev/null +++ b/icons/PyHoca/32x32/session_terminate.png @@ -0,0 +1 @@ +window-close.png \ No newline at end of file diff --git a/icons/PyHoca/32x32/session_warning.png b/icons/PyHoca/32x32/session_warning.png new file mode 120000 index 0000000..91cec00 --- /dev/null +++ b/icons/PyHoca/32x32/session_warning.png @@ -0,0 +1 @@ +dialog-warning.png \ No newline at end of file diff --git a/icons/PyHoca/scalable/auth_disconnect.svg b/icons/PyHoca/scalable/auth_disconnect.svg new file mode 120000 index 0000000..84ab203 --- /dev/null +++ b/icons/PyHoca/scalable/auth_disconnect.svg @@ -0,0 +1 @@ +network-wired.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/auth_error.svg b/icons/PyHoca/scalable/auth_error.svg new file mode 120000 index 0000000..3b41d91 --- /dev/null +++ b/icons/PyHoca/scalable/auth_error.svg @@ -0,0 +1 @@ +dialog-error.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/auth_success.svg b/icons/PyHoca/scalable/auth_success.svg new file mode 120000 index 0000000..9af349f --- /dev/null +++ b/icons/PyHoca/scalable/auth_success.svg @@ -0,0 +1 @@ +dialog-apply.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/profile_add.svg b/icons/PyHoca/scalable/profile_add.svg new file mode 120000 index 0000000..742bd8e --- /dev/null +++ b/icons/PyHoca/scalable/profile_add.svg @@ -0,0 +1 @@ +list-add.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/profile_delete.svg b/icons/PyHoca/scalable/profile_delete.svg new file mode 120000 index 0000000..e3a4068 --- /dev/null +++ b/icons/PyHoca/scalable/profile_delete.svg @@ -0,0 +1 @@ +edit-delete.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/profile_edit.svg b/icons/PyHoca/scalable/profile_edit.svg new file mode 120000 index 0000000..b3fad1b --- /dev/null +++ b/icons/PyHoca/scalable/profile_edit.svg @@ -0,0 +1 @@ +gtk-edit.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/profile_save.svg b/icons/PyHoca/scalable/profile_save.svg new file mode 120000 index 0000000..e2277db --- /dev/null +++ b/icons/PyHoca/scalable/profile_save.svg @@ -0,0 +1 @@ +document-save.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/session_cleanall.svg b/icons/PyHoca/scalable/session_cleanall.svg new file mode 120000 index 0000000..c0b3175 --- /dev/null +++ b/icons/PyHoca/scalable/session_cleanall.svg @@ -0,0 +1 @@ +broom-cleanup.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/session_error.svg b/icons/PyHoca/scalable/session_error.svg new file mode 120000 index 0000000..3b41d91 --- /dev/null +++ b/icons/PyHoca/scalable/session_error.svg @@ -0,0 +1 @@ +dialog-error.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/session_pause.svg b/icons/PyHoca/scalable/session_pause.svg new file mode 120000 index 0000000..020f415 --- /dev/null +++ b/icons/PyHoca/scalable/session_pause.svg @@ -0,0 +1 @@ +media-playback-pause.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/session_resume.svg b/icons/PyHoca/scalable/session_resume.svg new file mode 120000 index 0000000..a5452f2 --- /dev/null +++ b/icons/PyHoca/scalable/session_resume.svg @@ -0,0 +1 @@ +x2go-logo-rotated.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/session_start.svg b/icons/PyHoca/scalable/session_start.svg new file mode 120000 index 0000000..a5452f2 --- /dev/null +++ b/icons/PyHoca/scalable/session_start.svg @@ -0,0 +1 @@ +x2go-logo-rotated.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/session_terminate.svg b/icons/PyHoca/scalable/session_terminate.svg new file mode 120000 index 0000000..b943971 --- /dev/null +++ b/icons/PyHoca/scalable/session_terminate.svg @@ -0,0 +1 @@ +window-close.svg \ No newline at end of file diff --git a/icons/PyHoca/scalable/session_warning.svg b/icons/PyHoca/scalable/session_warning.svg new file mode 120000 index 0000000..a626e0c --- /dev/null +++ b/icons/PyHoca/scalable/session_warning.svg @@ -0,0 +1 @@ +dialog-warning.svg \ No newline at end of file diff --git a/icons/PyHoca/x2go-logo-rotated.png b/icons/PyHoca/x2go-logo-rotated.png deleted file mode 100644 index 85f3507..0000000 Binary files a/icons/PyHoca/x2go-logo-rotated.png and /dev/null differ diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 8e49044..aa299bf 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -38,23 +38,6 @@ class PyHocaNotificationException(exceptions.StandardError): pass class libnotify_NotifierPopup(object): - icon_hash = { 'auth_success': 'PyHoca/32x32/dialog-apply.png', - 'auth_failed': 'PyHoca/32x32/dialog-warning.png', - 'auth_error': 'PyHoca/32x32/dialog-error.png', - 'auth_disconnect': 'PyHoca/32x32/network-wired.png', - 'session_start': 'PyHoca/32x32/x2go-logo-rotated.png', - 'session_resume': 'PyHoca/32x32/x2go-logo-rotated.png', - 'session_suspend': 'PyHoca/32x32/media-playback-pause.png', - 'session_terminate': 'PyHoca/32x32/window-close.png', - 'session_cleanall': 'PyHoca/32x32/broom-cleanup.png', - 'session_warning': 'PyHoca/32x32/dialog-warning.png', - 'session_error': 'PyHoca/32x32/dialog-error.png', - 'profile_new': 'PyHoca/32x32/list-add.png', - 'profile_delete': 'PyHoca/32x32/edit-delete.png', - 'profile_edit': 'PyHoca/32x32/gtk-edit.png', - 'profile_save': 'PyHoca/32x32/document-save.png', - } - title = {} text = {} icon = {} @@ -92,12 +75,7 @@ class libnotify_NotifierPopup(object): except KeyError: pass - # translate our meta names for notification icons - if icon in self.icon_hash.keys(): - icon = self.icon_hash[icon] - - if icon and '/' in icon: - icon = '%s/%s' % (_icons_location, icon) + icon = '%s/PyHoca/32x32/%s.png' % (_icons_location, icon) n = pynotify.Notification(title, text, icon) n.set_urgency(pynotify.URGENCY_NORMAL) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).