[orca] Fix for bug #637654 - Several changes need to be made to the Save Profile As widgets

[Joanmarie Diggs <joanied src gnome org>]

commit 2952b29e0d527e3486585367b998f9cf03376d35
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Dec 20 08:53:47 2010 -0500

    Fix for bug #637654 - Several changes need to be made to the Save Profile As widgets
    
    * Changed 'new profile' to 'profile name'
    * Changed 'ok' to 'save'
    * Changed 'close' to 'cancel'
    * Removed some unnecessary/redundant accessible name setting
      (we get this information reliably from the widgets themselves
      through AT-SPI)
    * Fixed some issues found by pylint

 src/orca/orca-profile.ui     |   32 ++++++--------------------------
 src/orca/orca_gui_profile.py |   11 +++--------
 2 files changed, 9 insertions(+), 34 deletions(-)
---
diff --git a/src/orca/orca-profile.ui b/src/orca/orca-profile.ui
index e9b7f9a..2cb9bf6 100644
--- a/src/orca/orca-profile.ui
+++ b/src/orca/orca-profile.ui
@@ -25,16 +25,11 @@
                 <child>
                   <object class="GtkLabel" id="profileLabel">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">_New Profile:</property>
+                    <property name="label" translatable="yes">_Profile Name:</property>
                     <property name="use_markup">True</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">profileEntry</property>
                     <property name="width_chars">12</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="profileLabel-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">New Profile:</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -48,11 +43,6 @@
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <property name="activates_default">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="profileEntry-atkobject">
-                        <property name="AtkObject::accessible-name" translatable="yes">New Profile:</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -84,20 +74,15 @@ as a new profile.</property>
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="closeButton">
-                <property name="label">gtk-close</property>
+              <object class="GtkButton" id="cancelButton">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
                 <accelerator key="c" signal="activate" modifiers="GDK_MOD1_MASK"/>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="closeButton-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Close</property>
-                  </object>
-                </child>
-                <signal name="clicked" handler="closeButtonClicked"/>
+                <signal name="clicked" handler="cancelButtonClicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -107,18 +92,13 @@ as a new profile.</property>
             </child>
             <child>
               <object class="GtkButton" id="saveProfileButton">
-                <property name="label">gtk-ok</property>
+                <property name="label">gtk-save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="saveProfileButton-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Add Profile</property>
-                  </object>
-                </child>
                 <signal name="clicked" handler="on_saveProfileButton_clicked"/>
               </object>
               <packing>
@@ -137,7 +117,7 @@ as a new profile.</property>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-7">closeButton</action-widget>
+      <action-widget response="-7">cancelButton</action-widget>
       <action-widget response="0">saveProfileButton</action-widget>
     </action-widgets>
   </object>
diff --git a/src/orca/orca_gui_profile.py b/src/orca/orca_gui_profile.py
index 8e7b0c5..bbda316 100644
--- a/src/orca/orca_gui_profile.py
+++ b/src/orca/orca_gui_profile.py
@@ -33,16 +33,10 @@ import debug
 import gtk
 import locale
 
-import find
 import orca_gtkbuilder
 import orca_state
 import orca_platform
 
-from orca_i18n import _  # for gettext support
-
-from settings_manager import SettingsManager
-
-
 OS = None
 newProfile = None
 
@@ -62,6 +56,7 @@ class OrcaProfileGUI(orca_gtkbuilder.GtkBuilderWrapper):
         # Initialize variables to None to keep pylint happy.
         #
         self.searchString = None
+        self.profileString = None
 
     def init(self):
         # Initialize the dialog box controls.
@@ -96,7 +91,7 @@ class OrcaProfileGUI(orca_gtkbuilder.GtkBuilderWrapper):
 
         profileDialog.run()
 
-    def closeButtonClicked(self, widget):
+    def cancelButtonClicked(self, widget):
         """Signal handler for the "clicked" signal for the cancelButton
            GtkButton widget. The user has clicked the Cancel button.
            Hide the dialog.
@@ -129,7 +124,7 @@ class OrcaProfileGUI(orca_gtkbuilder.GtkBuilderWrapper):
     def onProfileEntryChanged(self, widget, data=None):
         """Signal handler for the "changed" signal for the ProfileEntry
            GtkEntry widget."""
-        
+
         if self.get_widget("profileEntry").get_text() != '':
             self.get_widget('availableProfilesCombo').set_sensitive(False)
         else: