[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-76-g4fb87ed

[Giuseppe Scrivano]

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 "GNU MyServer".

The branch, master has been updated
       via  4fb87edf14cce994712b71d196d288c8f0b49e33 (commit)
      from  5105864fac02eb602a8460a2d02e320201cd31d1 (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 -----------------------------------------------------------------


commit 4fb87edf14cce994712b71d196d288c8f0b49e33
Author: Rupinder Singh <address@hidden(none)>
Date:   Wed Mar 24 02:17:48 2010 +0530

    Fix to prevent wobbling of Definition Tables upon switching data types.
    
    Also, set logo for AboutWindow and ConnectionWindow.

diff --git a/myserver/src/GUI/MyServer/GUI/AboutWindow.py 
b/myserver/src/GUI/MyServer/GUI/AboutWindow.py
index 2564dbf..8362d59 100644
--- a/myserver/src/GUI/MyServer/GUI/AboutWindow.py
+++ b/myserver/src/GUI/MyServer/GUI/AboutWindow.py
@@ -34,6 +34,7 @@ class About():
         self.window = gtk.AboutDialog()
         self.window.connect('response', self.on_aboutdialog_response)
         self.window.set_program_name('GNU MyServer Control')
+        self.window.set_icon_list(logo)
         self.window.set_version(version)
         self.window.set_copyright(copyright_notice)
         self.window.set_license(gpl_v3)
diff --git a/myserver/src/GUI/MyServer/GUI/ConnectionWindow.py 
b/myserver/src/GUI/MyServer/GUI/ConnectionWindow.py
index 1635e30..38ec00f 100644
--- a/myserver/src/GUI/MyServer/GUI/ConnectionWindow.py
+++ b/myserver/src/GUI/MyServer/GUI/ConnectionWindow.py
@@ -18,6 +18,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 
 import gtk
 from MyServer.pycontrollib.controller import Controller
+from MyServer.GUI.AboutWindow import logo
 
 class Connection():
     def __init__(self, parent):
@@ -28,13 +29,16 @@ class Connection():
                                      gtk.DIALOG_DESTROY_WITH_PARENT,
                                  (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
                                   gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
-        self.host_label = gtk.Label('host:')
+
+        self.window.set_icon_list(logo)
+
+        self.host_label = gtk.Label('Host:')
         self.host_entry = gtk.Entry()
-        self.port_label = gtk.Label('port:')
+        self.port_label = gtk.Label('Port:')
         self.port_entry = gtk.Entry()
-        self.username_label = gtk.Label('username:')
+        self.username_label = gtk.Label('Username:')
         self.username_entry = gtk.Entry()
-        self.password_label = gtk.Label('password:')
+        self.password_label = gtk.Label('Password:')
         self.password_entry = gtk.Entry()
         table = gtk.Table(4, 2)
         table.attach(self.host_label, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
diff --git a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py 
b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
index 09a353e..07023ad 100644
--- a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
@@ -167,15 +167,25 @@ class DefinitionTable(gtk.Table):
         self.string_value_field.hide()
         self.int_value_field.hide()
         self.bool_value_field.hide()
+
         if var_type == 'string':
             self.string_value_field.set_text(row[4])
             self.string_value_field.show()
+            self.set_col_spacing(1,0)
+            self.set_row_spacing(1,4)
+
         elif var_type == 'integer':
             self.int_value_field.set_value(int(row[4]))
             self.int_value_field.show()
+            self.set_col_spacing(1,66)
+            self.set_row_spacing(1,4)
+
         elif var_type == 'bool':
             self.bool_value_field.set_active(int(row[4] == 'NO'))
             self.bool_value_field.show()
+            self.set_col_spacing(1,103)
+            self.set_row_spacing(1,0)
+
         self.value_check_field.set_active(row[5])
         for attribute in row[6]:
             self.attributes_field.append((attribute, row[6][attribute], ))
diff --git a/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py 
b/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
index 9957fbe..9f52219 100644
--- a/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
@@ -28,7 +28,8 @@ class SecurityTree(gtk.TreeView):
                 gobject.TYPE_STRING, # tag
                 gobject.TYPE_PYOBJECT)) # object
         renderer = gtk.CellRendererText()
-        column = gtk.TreeViewColumn('tag')
+        column = gtk.TreeViewColumn('Tag')
+        column.set_resizable(True)
         column.pack_start(renderer)
         column.add_attribute(renderer, 'text', 0)
         self.append_column(column)
diff --git a/myserver/src/GUI/MyServerControl b/myserver/src/GUI/MyServerControl
index 976f409..839ffdf 100755
--- a/myserver/src/GUI/MyServerControl
+++ b/myserver/src/GUI/MyServerControl
@@ -25,8 +25,7 @@ from MyServer.pycontrollib.config import MyServerConfig
 from MyServer.pycontrollib.mimetypes import MIMETypes
 from MyServer.pycontrollib.vhost import VHosts
 from MyServer.GUI import GUIConfig
-from MyServer.GUI.AboutWindow import About
-from MyServer.GUI.AboutWindow import logo
+from MyServer.GUI.AboutWindow import About, logo
 from MyServer.GUI.ConnectionWindow import Connection
 from MyServer.GUI.DefinitionWidgets import DefinitionTable, DefinitionTreeView
 from MyServer.GUI.MIMEWidgets import MimeTable, MimeTreeView

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/GUI/MyServer/GUI/AboutWindow.py       |    1 +
 myserver/src/GUI/MyServer/GUI/ConnectionWindow.py  |   12 ++++++++----
 myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py |   10 ++++++++++
 myserver/src/GUI/MyServer/GUI/SecurityWidgets.py   |    3 ++-
 myserver/src/GUI/MyServerControl                   |    3 +--
 5 files changed, 22 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU MyServer