[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-101-
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-101-g5d2014f |
|
Date: |
Sat, 03 Apr 2010 21:46:21 +0000 |
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 5d2014f9c5d0957a46845214153e860bffd70c63 (commit)
via f214e159c68a713d08c369fe0cdbf500c661ede7 (commit)
via fb53c7c35e33ba0896ecaffb2d7bf164e2a00122 (commit)
via dd4554370c836fe29c0bc537536df9e7cf0809da (commit)
via 2e314e5d9280c55c4a87cd1c844f060fb43498d0 (commit)
via 0735df71c3b49a387a7e1a9e4db50df97ac8b7fd (commit)
from 4e50f5755c50760553267cac6f45740519f1ab91 (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 5d2014f9c5d0957a46845214153e860bffd70c63
Merge: f214e15 4e50f57
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Apr 3 23:47:15 2010 +0200
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/myserver
commit f214e159c68a713d08c369fe0cdbf500c661ede7
Merge: dd45543 fb53c7c
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Apr 3 23:41:43 2010 +0200
Merge branch 'master' of git://github.com/rupinder/GNU-MyServer
commit fb53c7c35e33ba0896ecaffb2d7bf164e2a00122
Author: Rupinder Singh <address@hidden>
Date: Sun Apr 4 02:58:35 2010 +0530
Set Default values while adding to tree_model, adding attributes and mime
diff --git a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
index e855ba9..778ed80 100644
--- a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
@@ -86,7 +86,7 @@ class DefinitionTable(gtk.Table):
button_table = gtk.Table(1, 3)
add_attribute_button.connect(
'clicked',
- lambda button: attributes_model.append(('', '', )))
+ lambda button: attributes_model.append(('var', '0', )))
def remove_attribute(button):
model, selected = attributes_list.get_selection().get_selected()
if selected is not None:
diff --git a/myserver/src/GUI/MyServer/GUI/GUIConfig.py
b/myserver/src/GUI/MyServer/GUI/GUIConfig.py
index fc14f6e..38d4ee0 100644
--- a/myserver/src/GUI/MyServer/GUI/GUIConfig.py
+++ b/myserver/src/GUI/MyServer/GUI/GUIConfig.py
@@ -80,11 +80,11 @@ vhost_name = 'name'
vhost_attributes = ['port', 'protocol', 'doc_root', 'sys_root', 'private_key',
'certificate']
vhost_lists = [
('ip', (
- ('ip', TYPE_STRING, '', ),
+ ('ip', TYPE_STRING, 'IP', ),
),
),
('host', (
- ('host name', TYPE_STRING, '', ),
+ ('host name', TYPE_STRING, 'HOST', ),
('use regexp', TYPE_BOOLEAN, False, ),
),
),
diff --git a/myserver/src/GUI/MyServer/GUI/MIMEWidgets.py
b/myserver/src/GUI/MyServer/GUI/MIMEWidgets.py
index 2f3ed7e..cee3171 100644
--- a/myserver/src/GUI/MyServer/GUI/MIMEWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/MIMEWidgets.py
@@ -109,7 +109,7 @@ class MimeTable(gtk.Table):
tree_scroll.add(tree)
def add_to_tree(button, model):
- model.append(('', ))
+ model.append(('ext', ))
add_button = gtk.Button('Add')
add_button.connect('clicked', add_to_tree, tree_model)
def remove_from_tree(button, tree):
diff --git a/myserver/src/GUI/MyServer/GUI/VHostWidgets.py
b/myserver/src/GUI/MyServer/GUI/VHostWidgets.py
index 165b1df..da6bf9f 100644
--- a/myserver/src/GUI/MyServer/GUI/VHostWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/VHostWidgets.py
@@ -372,13 +372,14 @@ class VHostTable(gtk.Table):
self.log_model = self.log_tree.get_model()
def add_stream(button, model):
- model.append(('', [], (0, False, ), False, [], {}, ))
- add_stream_button = gtk.Button('Add stream')
+ model.append(('stream', [], (0, False, ), False, [], {}, ))
+ add_stream_button = gtk.Button('Add Stream')
add_stream_button.connect(
'clicked', add_stream, stream_tree.get_model())
+
def add_filter(button, model):
- model.append(('', ))
- add_filter_button = gtk.Button('Add filter')
+ model.append(('ext', ))
+ add_filter_button = gtk.Button('Add Filter')
add_filter_button.connect(
'clicked', add_filter, filter_tree.get_model())
@@ -387,9 +388,9 @@ class VHostTable(gtk.Table):
if selected is not None:
model.remove(selected)
tree.last_selected = None
- remove_stream_button = gtk.Button('Remove stream')
+ remove_stream_button = gtk.Button('Remove Stream')
remove_stream_button.connect('clicked', remove_selected, stream_tree)
- remove_filter_button = gtk.Button('Remove filter')
+ remove_filter_button = gtk.Button('Remove Filter')
remove_filter_button.connect('clicked', remove_selected, filter_tree)
button_grid = gtk.Table(2, 2)
commit dd4554370c836fe29c0bc537536df9e7cf0809da
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Apr 3 22:19:18 2010 +0200
Use = to compare strings, not ==
diff --git a/myserver/configure.ac b/myserver/configure.ac
index a0df4b7..7b0e2cd 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -128,7 +128,7 @@ case "${host}" in
dnl Looking for dl
AC_SEARCH_LIBS([dlopen], [dl c], have_dl=yes)
- if test x$have_dl == xyes; then
+ if test "x$have_dl" = xyes; then
AC_DEFINE(HAVE_DL, 1, [LibDL support, define to 1 to enable])
MAKE_MSCGI=yes
else
@@ -278,7 +278,7 @@ else
AC_DEFINE(HAVE_IPV6, 0, [Disable IPv6 support])
fi
-if test x$enable_tests == xyes; then
+if test "x$enable_tests" = xyes; then
dnl Looking for cppunit
AM_PATH_CPPUNIT(1.12.0, have_cppunit=yes)
if test x$have_cppunit != xyes; then
@@ -296,7 +296,7 @@ else
MAKE_TESTS=no
fi
-if test x$enable_gui == xyes; then
+if test "x$enable_gui" = xyes; then
dnl Checking Python version
AM_PYTHON(2.6.0, have_python=yes)
if test x$have_python != xyes; then
commit 2e314e5d9280c55c4a87cd1c844f060fb43498d0
Merge: 29af152 0735df7
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Apr 3 22:15:38 2010 +0200
Merge branch 'master' of git://github.com/rupinder/GNU-MyServer
commit 0735df71c3b49a387a7e1a9e4db50df97ac8b7fd
Author: Rupinder Singh <address@hidden>
Date: Sun Apr 4 01:22:55 2010 +0530
Fix wobbling of TreeViewColumn in DefinitionTable
and DefinitionTreeView
Resize window to Adjust relative width of 'Tag'
TreeViewColumn
diff --git a/myserver/src/GUI/MyServer/GUI/BrowserWidgets.py
b/myserver/src/GUI/MyServer/GUI/BrowserWidgets.py
index 219ef16..cef5bd6 100644
--- a/myserver/src/GUI/MyServer/GUI/BrowserWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/BrowserWidgets.py
@@ -73,7 +73,7 @@ class BrowserTable(gtk.Table):
def set_show_hidden(button):
self.browser_tree.browser.show_hidden(button.get_active())
self.browser_tree.update()
- hide_check = gtk.CheckButton('Show hidden directories.')
+ hide_check = gtk.CheckButton ('Show Hidden Directories')
hide_check.connect('toggled', set_show_hidden)
self.attach(hide_check, 0, 1, 0, 1, yoptions = gtk.FILL)
diff --git a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
index e95f172..e855ba9 100644
--- a/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py
@@ -57,7 +57,7 @@ class DefinitionTable(gtk.Table):
value_checkbutton.set_active(True)
self.attach(value_label, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
- self.attach(value_box, 1, 2, 1, 2, yoptions = gtk.FILL)
+ self.attach(value_box, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
self.attach(value_checkbutton, 2, 3, 1, 2, gtk.FILL, gtk.FILL)
# Add Sub-Definition button
@@ -111,6 +111,7 @@ class DefinitionTable(gtk.Table):
model, col = data
model[path][col] = text
variable_column = gtk.TreeViewColumn('Variable')
+ variable_column.set_min_width(gtk.gdk.Screen().get_width() / 11)
variable_renderer = gtk.CellRendererText()
variable_renderer.set_property('editable', True)
variable_renderer.connect('edited', edited_handler,
@@ -237,6 +238,7 @@ class DefinitionTreeView(gtk.TreeView):
name_renderer = gtk.CellRendererText()
name_column = gtk.TreeViewColumn('Name')
+ name_column.set_min_width(gtk.gdk.Screen().get_width() / 5)
name_column.pack_start(name_renderer)
name_column.add_attribute(name_renderer, 'text', 0)
self.append_column(name_column)
diff --git a/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
b/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
index 9f52219..67647cc 100644
--- a/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
+++ b/myserver/src/GUI/MyServer/GUI/SecurityWidgets.py
@@ -38,7 +38,7 @@ class SecurityTree(gtk.TreeView):
self.last_selected = None
self.connect('cursor-changed', self.cursor_changed)
-
+
self.enable_model_drag_source(gtk.gdk.BUTTON1_MASK,
[('text/plain', 0, 0)],
gtk.gdk.ACTION_MOVE)
@@ -472,7 +472,7 @@ class ConditionTable(gtk.Table):
def add_sub_element(button, combo, tree):
tag = combo.get_model()[combo.get_active()][0]
tree.add_sub_element(tag)
- self.add_sub_element_button = gtk.Button('Add sub-element')
+ self.add_sub_element_button = gtk.Button('Add Sub-Element')
self.attach(self.add_sub_element_button, 0, 1, 5, 6, gtk.FILL,
gtk.FILL)
self.add_sub_element_combo = gtk.combo_box_new_text()
self.add_sub_element_combo.append_text('USER')
@@ -550,14 +550,14 @@ class DefinitionTable(gtk.Table):
def remove_element(button, tree):
tree.remove_element()
- button = gtk.Button('Remove this element')
+ button = gtk.Button('Remove This Element')
button.connect('clicked', remove_element, security_tree)
self.attach(button, 0, 2, 0, 1, yoptions = gtk.FILL)
def add_sub_element(button, combo, tree):
tag = combo.get_model()[combo.get_active()][0]
tree.add_sub_element(tag)
- self.add_sub_element_button = gtk.Button('Add sub-element')
+ self.add_sub_element_button = gtk.Button('Add Sub-Element')
self.attach(self.add_sub_element_button, 0, 1, 1, 2, gtk.FILL,
gtk.FILL)
self.add_sub_element_combo = gtk.combo_box_new_text()
self.add_sub_element_combo.append_text('DEFINE element')
@@ -568,13 +568,13 @@ class DefinitionTable(gtk.Table):
self.add_sub_element_combo,
security_tree)
- self.attach(gtk.Label('name'), 0, 1, 2, 3, gtk.FILL, gtk.FILL)
+ self.attach(gtk.Label('Name'), 0, 1, 2, 3, gtk.SHRINK, gtk.SHRINK)
self.name_entry = gtk.Entry()
self.attach(self.name_entry, 1, 2, 2, 3, yoptions = gtk.FILL)
self.name_check = gtk.CheckButton()
self.attach(self.name_check, 2, 3, 2, 3, gtk.FILL, gtk.FILL)
- self.value_label = gtk.Label('value')
+ self.value_label = gtk.Label('Value')
self.attach(self.value_label, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
self.value_entry = gtk.Entry()
self.attach(self.value_entry, 1, 2, 3, 4, yoptions = gtk.FILL)
@@ -641,15 +641,15 @@ class EmptyTable(gtk.Table):
def __init__(self, security_tree):
gtk.Table.__init__(self, 2, 2)
- self.attach(gtk.Label('Use security file'), 0, 1, 0, 1, gtk.FILL,
gtk.FILL)
+ self.attach(gtk.Label('Use Security File'), 0, 1, 0, 1, gtk.FILL,
gtk.FILL)
self.security_check = gtk.CheckButton()
self.attach(self.security_check, 1, 2, 0, 1, yoptions = gtk.FILL)
def add_sub_element(button, combo, tree):
tag = combo.get_model()[combo.get_active()][0]
tree.add_sub_element(tag)
- self.add_sub_element_button = gtk.Button('Add sub-element')
- self.attach(self.add_sub_element_button, 0, 1, 1, 2, gtk.FILL,
gtk.FILL)
+ self.add_sub_element_button = gtk.Button('Add Sub-Element')
+ self.attach(self.add_sub_element_button, 0, 1, 2, 3, gtk.FILL,
gtk.FILL)
self.add_sub_element_combo = gtk.combo_box_new_text()
self.add_sub_element_combo.append_text('USER')
self.add_sub_element_combo.append_text('CONDITION')
@@ -658,7 +658,7 @@ class EmptyTable(gtk.Table):
self.add_sub_element_combo.append_text('DEFINE element')
self.add_sub_element_combo.append_text('DEFINE tree')
self.add_sub_element_combo.set_active(0)
- self.attach(self.add_sub_element_combo, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
+ self.attach(self.add_sub_element_combo, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
self.add_sub_element_button.connect('clicked', add_sub_element,
self.add_sub_element_combo,
security_tree)
diff --git a/myserver/src/GUI/MyServerControl b/myserver/src/GUI/MyServerControl
index 839ffdf..e100cef 100755
--- a/myserver/src/GUI/MyServerControl
+++ b/myserver/src/GUI/MyServerControl
@@ -41,6 +41,7 @@ class PyGTKControl():
self.notebook = gtk.Notebook()
self.statusbar = gtk.Statusbar()
self.menubar = gtk.MenuBar()
+ self.screen = gtk.gdk.Screen()
# Class for Menu Item
class MenuItemWithStockImage(gtk.ImageMenuItem):
@@ -54,7 +55,9 @@ class PyGTKControl():
# Set logo for Main Window
- self.window.set_icon_list(logo)
+ self.window.set_icon_list (logo)
+ # Set default size for Main Window
+ self.window.set_default_size ((67*self.screen.get_width()) / 127, -1)
# Set up Menu Items
file_menu_item = gtk.MenuItem('_File')
@@ -685,7 +688,7 @@ class PyGTKControl():
self.browser_table = BrowserTable(self.security_table.read_from_file)
panels.pack1(self.browser_table, True, False)
- self.notebook.append_page(panels, gtk.Label('File browser'))
+ self.notebook.append_page(panels, gtk.Label('File Browser'))
self.notebook.show_all()
-----------------------------------------------------------------------
Summary of changes:
myserver/configure.ac | 6 +++---
myserver/src/GUI/MyServer/GUI/BrowserWidgets.py | 2 +-
myserver/src/GUI/MyServer/GUI/DefinitionWidgets.py | 6 ++++--
myserver/src/GUI/MyServer/GUI/GUIConfig.py | 4 ++--
myserver/src/GUI/MyServer/GUI/MIMEWidgets.py | 2 +-
myserver/src/GUI/MyServer/GUI/SecurityWidgets.py | 20 ++++++++++----------
myserver/src/GUI/MyServer/GUI/VHostWidgets.py | 13 +++++++------
myserver/src/GUI/MyServerControl | 7 +++++--
8 files changed, 33 insertions(+), 27 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-101-g5d2014f,
Giuseppe Scrivano <=