2006-10-30 Rodney Dawes <dobey@novell.com>

	* scripts/Makefile.am: Add gnome-main-menu.py

	* scripts/control-center.py: Clean up a little bit

	* scripts/gnome-background-properties.py: Use the new objectexist()
	call from LDTP CVS to push the right button to close the dialog

	* scripts/gnome-main-menu.py: New script to test the main menu applet
	from the slab module in GNOME cvs

	* scripts/gnome-panel.py: Make window_title more specific so that
	we can correctly poke the right widgets

6 files changed, 48 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a4d1a1..f492825 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-10-30  Rodney Dawes  <dobey@novell.com>
+
+	* scripts/Makefile.am: Add gnome-main-menu.py
+
+	* scripts/control-center.py: Clean up a little bit
+
+	* scripts/gnome-background-properties.py: Use the new objectexist()
+	call from LDTP CVS to push the right button to close the dialog
+
+	* scripts/gnome-main-menu.py: New script to test the main menu applet
+	from the slab module in GNOME cvs
+
+	* scripts/gnome-panel.py: Make window_title more specific so that
+	we can correctly poke the right widgets
+
 2006-10-24  Rodney Dawes  <dobey@novell.com>
 
 	* scripts/Makefile.am:
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 8fc1406..c6c34c4 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -16,6 +16,7 @@ scriptfiles =			\
 	gnome-font-properties.py	\
 	gnome-keybinding-properties.py	\
 	gnome-keyboard-properties.py	\
+	gnome-main-menu.py		\
 	gnome-mouse-properties.py	\
 	gnome-network-preferences.py	\
 	gnome-panel.py		\
diff --git a/scripts/control-center.py b/scripts/control-center.py
index e29b51c..061e808 100755
--- a/scripts/control-center.py
+++ b/scripts/control-center.py
@@ -6,7 +6,7 @@ from ldtputils import *
 from A11yTestUtils import *
 
 program_name = 'control-center'
-window_title = '*Control*'
+window_title = 'Control Center'
 
 a11y_test_init (program_name)
 guiexist (window_title)
@@ -15,8 +15,6 @@ objlist = getobjectlist (window_title)
 
 a11y_scan_window (window_title)
 
-#selectmenuitem (window_title, 'mnuFile;mnuQuit')
-
 a11y_test_shutdown ()
 
 os.system ('pkill -9 ' + program_name)
diff --git a/scripts/gnome-background-properties.py b/scripts/gnome-background-properties.py
index 73ece96..26125c4 100755
--- a/scripts/gnome-background-properties.py
+++ b/scripts/gnome-background-properties.py
@@ -13,7 +13,11 @@ a11y_test_init (program_name)
 guiexist (window_title)
 
 a11y_scan_window (window_title)
-	
-click (window_title, 'btnFinish')
+
+if (objectexist (window_title, 'btnFinish')):
+        click (window_title, 'btnFinish')
+else:
+        click (window_title, 'btnClose')
+        
 
 a11y_test_shutdown ()
diff --git a/scripts/gnome-main-menu.py b/scripts/gnome-main-menu.py
new file mode 100755
index 0000000..0ca19e9
--- /dev/null
+++ b/scripts/gnome-main-menu.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+import string, sys, os
+from ldtp import *
+from ldtputils import *
+from A11yTestUtils import *
+
+program_name = 'main-menu'
+window_title = 'frmBottomExpandedEdgePanel'
+
+a11y_test_init (program_name, None, 1)
+
+if (guiexist (window_title)):
+    if (objectexist (window_title, 'tbtnComputer')):
+        press (window_title, 'tbtnComputer')
+        guiexist ('Main Menu')
+        a11y_scan_window ('Main Menu')
+        press (window_title, 'tbtnComputer')
+    else:
+        print "Main Menu applet not found on panel"
+else:
+    print "Panel not found"
+
+a11y_test_shutdown ()
diff --git a/scripts/gnome-panel.py b/scripts/gnome-panel.py
index 24dcec3..f933831 100755
--- a/scripts/gnome-panel.py
+++ b/scripts/gnome-panel.py
@@ -6,7 +6,7 @@ from ldtputils import *
 from A11yTestUtils import *
 
 program_name = 'gnome-panel'
-window_title = 'Bottom Expanded Edge Panel'
+window_title = 'frmBottomExpandedEdgePanel'
 
 a11y_test_init (program_name, '', 1)