[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.0.28.0-25-g10ad54b

[X2Go dev team]

The branch, twofactorauth has been updated
       via  10ad54b589031bbd3b6cbe155735165ff17f6afd (commit)
      from  968d69c9379b3fe851c6236aca5bf497a066d7d0 (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 => 64x64}/audio_error.png     |    0
 icons/PyHoca/{32x32 => 64x64}/auth_error.png      |    0
 icons/PyHoca/{32x32 => 64x64}/auth_failed.png     |    0
 icons/PyHoca/{32x32 => 64x64}/auth_success.png    |    0
 icons/PyHoca/64x64/dialog-apply.png               |  Bin 0 -> 3213 bytes
 icons/PyHoca/64x64/dialog-error.png               |  Bin 0 -> 3973 bytes
 icons/PyHoca/64x64/dialog-question.png            |  Bin 0 -> 4966 bytes
 icons/PyHoca/64x64/dialog-warning.png             |  Bin 0 -> 3894 bytes
 icons/PyHoca/{32x32 => 64x64}/profile_error.png   |    0
 icons/PyHoca/{32x32 => 64x64}/profile_warning.png |    0
 icons/PyHoca/{32x32 => 64x64}/session_error.png   |    0
 icons/PyHoca/{32x32 => 64x64}/session_resume.png  |    0
 icons/PyHoca/{32x32 => 64x64}/session_start.png   |    0
 icons/PyHoca/{32x32 => 64x64}/session_warning.png |    0
 pyhoca/wxgui/messages.py                          |   18 +++++++++++++++---
 15 files changed, 15 insertions(+), 3 deletions(-)
 copy icons/PyHoca/{32x32 => 64x64}/audio_error.png (100%)
 copy icons/PyHoca/{32x32 => 64x64}/auth_error.png (100%)
 copy icons/PyHoca/{32x32 => 64x64}/auth_failed.png (100%)
 copy icons/PyHoca/{32x32 => 64x64}/auth_success.png (100%)
 create mode 100644 icons/PyHoca/64x64/dialog-apply.png
 create mode 100644 icons/PyHoca/64x64/dialog-error.png
 create mode 100644 icons/PyHoca/64x64/dialog-question.png
 create mode 100644 icons/PyHoca/64x64/dialog-warning.png
 copy icons/PyHoca/{32x32 => 64x64}/profile_error.png (100%)
 copy icons/PyHoca/{32x32 => 64x64}/profile_warning.png (100%)
 copy icons/PyHoca/{32x32 => 64x64}/session_error.png (100%)
 copy icons/PyHoca/{32x32 => 64x64}/session_resume.png (100%)
 copy icons/PyHoca/{32x32 => 64x64}/session_start.png (100%)
 copy icons/PyHoca/{32x32 => 64x64}/session_warning.png (100%)

The diff of changes is:
diff --git a/icons/PyHoca/32x32/audio_error.png b/icons/PyHoca/64x64/audio_error.png
similarity index 100%
copy from icons/PyHoca/32x32/audio_error.png
copy to icons/PyHoca/64x64/audio_error.png
diff --git a/icons/PyHoca/32x32/auth_error.png b/icons/PyHoca/64x64/auth_error.png
similarity index 100%
copy from icons/PyHoca/32x32/auth_error.png
copy to icons/PyHoca/64x64/auth_error.png
diff --git a/icons/PyHoca/32x32/auth_failed.png b/icons/PyHoca/64x64/auth_failed.png
similarity index 100%
copy from icons/PyHoca/32x32/auth_failed.png
copy to icons/PyHoca/64x64/auth_failed.png
diff --git a/icons/PyHoca/32x32/auth_success.png b/icons/PyHoca/64x64/auth_success.png
similarity index 100%
copy from icons/PyHoca/32x32/auth_success.png
copy to icons/PyHoca/64x64/auth_success.png
diff --git a/icons/PyHoca/64x64/dialog-apply.png b/icons/PyHoca/64x64/dialog-apply.png
new file mode 100644
index 0000000..b43d5eb
Binary files /dev/null and b/icons/PyHoca/64x64/dialog-apply.png differ
diff --git a/icons/PyHoca/64x64/dialog-error.png b/icons/PyHoca/64x64/dialog-error.png
new file mode 100644
index 0000000..6811d8e
Binary files /dev/null and b/icons/PyHoca/64x64/dialog-error.png differ
diff --git a/icons/PyHoca/64x64/dialog-question.png b/icons/PyHoca/64x64/dialog-question.png
new file mode 100644
index 0000000..f504ac2
Binary files /dev/null and b/icons/PyHoca/64x64/dialog-question.png differ
diff --git a/icons/PyHoca/64x64/dialog-warning.png b/icons/PyHoca/64x64/dialog-warning.png
new file mode 100644
index 0000000..57f7e37
Binary files /dev/null and b/icons/PyHoca/64x64/dialog-warning.png differ
diff --git a/icons/PyHoca/32x32/profile_error.png b/icons/PyHoca/64x64/profile_error.png
similarity index 100%
copy from icons/PyHoca/32x32/profile_error.png
copy to icons/PyHoca/64x64/profile_error.png
diff --git a/icons/PyHoca/32x32/profile_warning.png b/icons/PyHoca/64x64/profile_warning.png
similarity index 100%
copy from icons/PyHoca/32x32/profile_warning.png
copy to icons/PyHoca/64x64/profile_warning.png
diff --git a/icons/PyHoca/32x32/session_error.png b/icons/PyHoca/64x64/session_error.png
similarity index 100%
copy from icons/PyHoca/32x32/session_error.png
copy to icons/PyHoca/64x64/session_error.png
diff --git a/icons/PyHoca/32x32/session_resume.png b/icons/PyHoca/64x64/session_resume.png
similarity index 100%
copy from icons/PyHoca/32x32/session_resume.png
copy to icons/PyHoca/64x64/session_resume.png
diff --git a/icons/PyHoca/32x32/session_start.png b/icons/PyHoca/64x64/session_start.png
similarity index 100%
copy from icons/PyHoca/32x32/session_start.png
copy to icons/PyHoca/64x64/session_start.png
diff --git a/icons/PyHoca/32x32/session_warning.png b/icons/PyHoca/64x64/session_warning.png
similarity index 100%
copy from icons/PyHoca/32x32/session_warning.png
copy to icons/PyHoca/64x64/session_warning.png
diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py
index a7130c4..6fda54e 100644
--- a/pyhoca/wxgui/messages.py
+++ b/pyhoca/wxgui/messages.py
@@ -25,13 +25,18 @@
 
 import wx
 
+# PyHoca-GUI modules
+import basepath
+
 pyhoca_messages = { 
     'MISSING_PROFILENAME': 'The profile name is missing, please specify a profile name.',
     }
 
+_icons_location = basepath.icons_basepath
+
 class PyHoca_MessageWindow(wx.Dialog):
 
-    def __init__(self, _PyHocaGUI, title=None, shortmsg=None, custom_message=None, icon='session_warning', buttontype='ok'):
+    def __init__(self, _PyHocaGUI, title=None, shortmsg=None, custom_message=None, icon=None, buttontype='ok'):
 
         self._PyHocaGUI = _PyHocaGUI
 
@@ -48,9 +53,13 @@ class PyHoca_MessageWindow(wx.Dialog):
         wx.Dialog.__init__(self, _PyHocaGUI.about, )
         self.SetTitle('%s' % title)
 
-        self.message = wx.StaticText(self, wx.ID_ANY, self.show_message, size=(-1, -1), style=wx.ALIGN_CENTER) 
+        if icon:
+            path_to_icon = '%s/PyHoca/64x64/%s.png' % (_icons_location, icon)
+            self.icon = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY))
+        self.message = wx.StaticText(self, wx.ID_ANY, self.show_message, size=(-1, -1), style=wx.ALIGN_LEFT) 
 
         btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+        msgSizer = wx.BoxSizer(wx.HORIZONTAL)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
         if buttontype in ('yesno', 'noyes'):
@@ -90,7 +99,10 @@ class PyHoca_MessageWindow(wx.Dialog):
             self.cancelBtn.SetDefault()
             self.cancelBtn.SetFocus()
 
-        mainSizer.Add(self.message, flag=wx.ALL, border=10) 
+        if icon:
+            msgSizer.Add(self.icon, flag=wx.RIGHT, border=15)
+        msgSizer.Add(self.message, flag=wx.ALL, border=0)
+        mainSizer.Add(msgSizer, flag=wx.ALL, border=10)
         mainSizer.Add(btnSizer, flag=wx.ALL|wx.ALIGN_RIGHT, border=5)
 
         self.SetSizerAndFit(mainSizer) 


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)).