[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.0.29.0-37-gd444350

X2Go dev team git-admin at x2go.org
Tue Aug 27 13:21:15 CEST 2013


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  d444350f168b5ad8dd5d49338d1cb14873738478 (commit)
      from  c37d4d706ac6daf41d05d17962c5ab06ced02655 (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:
 build/mo/de/LC_MESSAGES/pyhoca-gui.mo |  Bin 14740 -> 15020 bytes
 build/mo/en/LC_MESSAGES/pyhoca-gui.mo |  Bin 13790 -> 14046 bytes
 build/mo/es/LC_MESSAGES/pyhoca-gui.mo |  Bin 11137 -> 11137 bytes
 build/mo/nl/LC_MESSAGES/pyhoca-gui.mo |  Bin 10546 -> 10546 bytes
 po/de.po                              |   27 ++++++++++++++++++---------
 po/en.po                              |   25 +++++++++++++++++--------
 po/es.po                              |   23 ++++++++++++++++-------
 po/nl.po                              |   23 ++++++++++++++++-------
 po/pyhoca-gui.pot                     |   23 ++++++++++++++++-------
 pyhoca/wxgui/printingprefs.py         |   22 +++++++++++++++-------
 10 files changed, 98 insertions(+), 45 deletions(-)

The diff of changes is:
diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo
index 511131c..5f08da6 100644
Binary files a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo differ
diff --git a/build/mo/en/LC_MESSAGES/pyhoca-gui.mo b/build/mo/en/LC_MESSAGES/pyhoca-gui.mo
index ff18c1a..3e04462 100644
Binary files a/build/mo/en/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/en/LC_MESSAGES/pyhoca-gui.mo differ
diff --git a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo
index 1e52b6e..0091fb8 100644
Binary files a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo differ
diff --git a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo
index 0c16488..662b0da 100644
Binary files a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo differ
diff --git a/po/de.po b/po/de.po
index cc689c6..8e59df7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 18:04+0100\n"
-"PO-Revision-Date: 2011-02-27 18:04+0100\n"
+"POT-Creation-Date: 2011-02-27 18:47+0100\n"
+"PO-Revision-Date: 2011-02-27 18:47+0100\n"
 "Last-Translator: Mike Gabriel <m.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: de <m.gabriel at das-netzwerkteam.de>\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid "SSH proxy server login"
 msgstr "Anmeldung an SSH Proxy"
 
 #: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258
-#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:71
+#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -454,7 +454,7 @@ msgstr "Aktion"
 msgid "Defaults"
 msgstr "Standardwerte"
 
-#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:67
+#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73
 msgid "Save"
 msgstr "Speichern"
 
@@ -947,14 +947,23 @@ msgstr "Auf lokalem Drucker drucken"
 msgid "Run Custom Print Command"
 msgstr "Benutzerdefiniertes Druckkommando ausführen"
 
-#. ##
-#. ## widgets for CLIENT PRINTING
-#. ##
-#: ../pyhoca/wxgui/printingprefs.py:63
+#: ../pyhoca/wxgui/printingprefs.py:56
+msgid "Open this Dialog Window"
+msgstr "Dieses Auswahlfenster öffnen"
+
+#: ../pyhoca/wxgui/printingprefs.py:59
+msgid "<Select a Print Action here>"
+msgstr "Bearbeitungsmodus für Druckauftrag hier wählen"
+
+#: ../pyhoca/wxgui/printingprefs.py:67
 msgid "Print action"
-msgstr "Aktion bei eingehendem Druckauftrag"
+msgstr "Aktion für aktuellen Druckauftrag"
 
 #: ../pyhoca/wxgui/printingprefs.py:69
+msgid "Default action for incoming print jobs"
+msgstr "Aktion für eingehende Druckaufträge"
+
+#: ../pyhoca/wxgui/printingprefs.py:75
 msgid "Print"
 msgstr "Drucken"
 
diff --git a/po/en.po b/po/en.po
index 4827b94..b006419 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 18:04+0100\n"
-"PO-Revision-Date: 2011-02-27 18:02+0100\n"
+"POT-Creation-Date: 2011-02-27 18:47+0100\n"
+"PO-Revision-Date: 2011-02-27 18:45+0100\n"
 "Last-Translator: Mike Gabriel <m.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: en <m.gabriel at das-netzwerkteam.de>\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid "SSH proxy server login"
 msgstr "SSH proxy server login"
 
 #: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258
-#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:71
+#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -455,7 +455,7 @@ msgstr "Action"
 msgid "Defaults"
 msgstr "Defaults"
 
-#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:67
+#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73
 msgid "Save"
 msgstr "Save"
 
@@ -942,14 +942,23 @@ msgstr "Print to a local Printer"
 msgid "Run Custom Print Command"
 msgstr "Run Custom Print Command"
 
-#. ##
-#. ## widgets for CLIENT PRINTING
-#. ##
-#: ../pyhoca/wxgui/printingprefs.py:63
+#: ../pyhoca/wxgui/printingprefs.py:56
+msgid "Open this Dialog Window"
+msgstr "Open this Dialog Window"
+
+#: ../pyhoca/wxgui/printingprefs.py:59
+msgid "<Select a Print Action here>"
+msgstr "<Select a Print Action here>"
+
+#: ../pyhoca/wxgui/printingprefs.py:67
 msgid "Print action"
 msgstr "Print action"
 
 #: ../pyhoca/wxgui/printingprefs.py:69
+msgid "Default action for incoming print jobs"
+msgstr "Default action for incoming print jobs"
+
+#: ../pyhoca/wxgui/printingprefs.py:75
 msgid "Print"
 msgstr "Print"
 
diff --git a/po/es.po b/po/es.po
index 6f9d8eb..8cfef3a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 18:04+0100\n"
+"POT-Creation-Date: 2011-02-27 18:47+0100\n"
 "PO-Revision-Date: 2011-02-24 15:33+0100\n"
 "Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: es <oceanosoftlapalma at gmail.com>\n"
@@ -50,7 +50,7 @@ msgid "SSH proxy server login"
 msgstr "Inicio de sesión en el servidor proxy SSH"
 
 #: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258
-#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:71
+#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -455,7 +455,7 @@ msgstr "Acción"
 msgid "Defaults"
 msgstr "Valores por defecto"
 
-#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:67
+#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73
 msgid "Save"
 msgstr "Guardar"
 
@@ -930,15 +930,24 @@ msgstr ""
 msgid "Run Custom Print Command"
 msgstr "Comando personalizado"
 
-#. ##
-#. ## widgets for CLIENT PRINTING
-#. ##
-#: ../pyhoca/wxgui/printingprefs.py:63
+#: ../pyhoca/wxgui/printingprefs.py:56
+msgid "Open this Dialog Window"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:59
+msgid "<Select a Print Action here>"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:67
 #, fuzzy
 msgid "Print action"
 msgstr "Impresora"
 
 #: ../pyhoca/wxgui/printingprefs.py:69
+msgid "Default action for incoming print jobs"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:75
 #, fuzzy
 msgid "Print"
 msgstr "Impresora"
diff --git a/po/nl.po b/po/nl.po
index 9c1b3cf..5488ce9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 18:04+0100\n"
+"POT-Creation-Date: 2011-02-27 18:47+0100\n"
 "PO-Revision-Date: 2011-02-24 15:34+0100\n"
 "Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: nl <dick.kniep at lindix.nl>\n"
@@ -50,7 +50,7 @@ msgid "SSH proxy server login"
 msgstr "Login via SSH Proxy"
 
 #: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258
-#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:71
+#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77
 msgid "Cancel"
 msgstr "Afbreken"
 
@@ -453,7 +453,7 @@ msgstr "Actie"
 msgid "Defaults"
 msgstr "Standaardwaarden"
 
-#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:67
+#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73
 msgid "Save"
 msgstr "Opslaan"
 
@@ -928,15 +928,24 @@ msgstr ""
 msgid "Run Custom Print Command"
 msgstr "Speciaal Commando"
 
-#. ##
-#. ## widgets for CLIENT PRINTING
-#. ##
-#: ../pyhoca/wxgui/printingprefs.py:63
+#: ../pyhoca/wxgui/printingprefs.py:56
+msgid "Open this Dialog Window"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:59
+msgid "<Select a Print Action here>"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:67
 #, fuzzy
 msgid "Print action"
 msgstr "Afdrukken"
 
 #: ../pyhoca/wxgui/printingprefs.py:69
+msgid "Default action for incoming print jobs"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:75
 #, fuzzy
 msgid "Print"
 msgstr "Afdrukken"
diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot
index d92fb1e..444cad7 100644
--- a/po/pyhoca-gui.pot
+++ b/po/pyhoca-gui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-27 18:04+0100\n"
+"POT-Creation-Date: 2011-02-27 18:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -46,7 +46,7 @@ msgid "SSH proxy server login"
 msgstr ""
 
 #: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258
-#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:71
+#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77
 msgid "Cancel"
 msgstr ""
 
@@ -442,7 +442,7 @@ msgstr ""
 msgid "Defaults"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:67
+#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73
 msgid "Save"
 msgstr ""
 
@@ -890,13 +890,22 @@ msgstr ""
 msgid "Run Custom Print Command"
 msgstr ""
 
-#. ##
-#. ## widgets for CLIENT PRINTING
-#. ##
-#: ../pyhoca/wxgui/printingprefs.py:63
+#: ../pyhoca/wxgui/printingprefs.py:56
+msgid "Open this Dialog Window"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:59
+msgid "<Select a Print Action here>"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:67
 msgid "Print action"
 msgstr ""
 
 #: ../pyhoca/wxgui/printingprefs.py:69
+msgid "Default action for incoming print jobs"
+msgstr ""
+
+#: ../pyhoca/wxgui/printingprefs.py:75
 msgid "Print"
 msgstr ""
diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py
index 171a7a6..c4724bf 100644
--- a/pyhoca/wxgui/printingprefs.py
+++ b/pyhoca/wxgui/printingprefs.py
@@ -53,14 +53,20 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
             'PDFSAVE': _(u'Save to a local folder'),
             'PRINT': _(u'Print to a local Printer'),
             'PRINTCMD': _(u'Run Custom Print Command'),
+            'DIALOG': _(u'Open this Dialog Window'),
             }
+        if self.mode != 'edit':
+            self._availablePrintActions['DIALOG'] = _(u'<Select a Print Action here>')
 
         self.client_printing = self._PyHocaGUI.client_printing
 
         ###
         ### widgets for CLIENT PRINTING
         ###
-        self.PrintActionLabel = wx.StaticText(self, -1, _(u"Print action")+':')
+        if self.mode != 'edit':
+            self.PrintActionLabel = wx.StaticText(self, -1, _(u"Print action")+':')
+        else:
+            self.PrintActionLabel = wx.StaticText(self, -1, _(u"Default action for incoming print jobs")+':')
         self.PrintAction = wx.ComboBox(self, -1, choices=self._availablePrintActions.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY)
 
         if self.mode == 'edit':
@@ -91,16 +97,14 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_1_1_1.Add(self.PrintActionLabel, flag=wx.RIGHT, border=7)
+        sizer_1_1_1.Add(self.PrintActionLabel, flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, border=7)
         sizer_1_1_1.Add(self.PrintAction)
         sizer_1_1.Add(sizer_1_1_1, flag=wx.BOTTOM, border=5)
         sizer_1.Add(sizer_1_1, flag=wx.EXPAND|wx.ALL, border=10)
         # the bottom area with OK and Cancel buttons
         sizer_B = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_B_1 = wx.GridSizer(1, 3, 7, 14)
-        sizer_B_1.Add(self.OKButton)
-        sizer_B_1.Add(self.CancelButton)
-        sizer_B.Add(sizer_B_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
+        sizer_B.Add(self.OKButton, flag=wx.ALL, border=5)
+        sizer_B.Add(self.CancelButton, flag=wx.ALL, border=5)
 
         # put it all together...
         MainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -114,7 +118,11 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
         self.Show(True)
 
     def __update_fields(self):
-        pass
+        print_action_name = self.client_printing.get_print_action(reinit=True, return_name=True)
+        if self._availablePrintActions.has_key(print_action_name):
+            self.PrintAction.SetValue(self._availablePrintActions[print_action_name])
+        else:
+            self.PrintAction.SetValue(print_action_name)
 
     def __update_from_screen(self):
         pass


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




More information about the x2go-commits mailing list