Revert "Renaming"

This reverts commit 3b090dfa6e2083ad461997cd3ea4d43ed0ed0d09.

9 files changed, 49 insertions, 49 deletions

diff --git a/src/controlpanel/Makefile.am b/src/controlpanel/Makefile.am
index 9730d05..41141aa 100644
--- a/src/controlpanel/Makefile.am
+++ b/src/controlpanel/Makefile.am
@@ -5,6 +5,6 @@ sugar_PYTHON = 				\
 	__init__.py			\
 	cmd.py				\
 	gui.py				\
-	toolbar.py			\
-	sectionview.py			\
+	controltoolbar.py		\
+	detailview.py			\
 	inlinealert.py
diff --git a/src/controlpanel/toolbar.py b/src/controlpanel/controltoolbar.py
index 98d3792..2d54bdc 100644
--- a/src/controlpanel/toolbar.py
+++ b/src/controlpanel/controltoolbar.py
@@ -26,7 +26,7 @@ from sugar.graphics import iconentry
 from sugar.graphics import style
 
 class MainToolbar(gtk.Toolbar):
-    """ Main toolbar of the control panel
+    """ Main
     """
     __gtype_name__ = 'MainToolbar'
 
@@ -83,10 +83,10 @@ class MainToolbar(gtk.Toolbar):
     def __stop_clicked_cb(self, button):
         self.emit('stop-clicked')
 
-class SectionToolbar(gtk.Toolbar):
-    """ Toolbar of the sections of the control panel
+class DetailToolbar(gtk.Toolbar):
+    """ Detail
     """
-    __gtype_name__ = 'SectionToolbar'
+    __gtype_name__ = 'DetailToolbar'
 
     __gsignals__ = {
         'cancel-clicked': (gobject.SIGNAL_RUN_FIRST,
diff --git a/src/controlpanel/sectionview.py b/src/controlpanel/detailview.py
index 54d488f..abfe513 100644
--- a/src/controlpanel/sectionview.py
+++ b/src/controlpanel/detailview.py
@@ -4,7 +4,7 @@ import gettext
 
 _ = lambda msg: gettext.dgettext('sugar', msg)
 
-class SectionView(gtk.VBox):
+class DetailView(gtk.VBox):
     __gsignals__ = {
         'valid-section': (gobject.SIGNAL_RUN_FIRST,
                           gobject.TYPE_NONE,
diff --git a/src/controlpanel/gui.py b/src/controlpanel/gui.py
index 60f0258..413d560 100644
--- a/src/controlpanel/gui.py
+++ b/src/controlpanel/gui.py
@@ -25,8 +25,8 @@ from sugar.graphics import style
 from sugar.graphics.alert import Alert
 import config 
 
-from controlpanel.toolbar import MainToolbar
-from controlpanel.toolbar import SectionToolbar
+from controlpanel.controltoolbar import MainToolbar
+from controlpanel.controltoolbar import DetailToolbar
 
 _ = lambda msg: gettext.dgettext('sugar', msg)
 
@@ -51,8 +51,8 @@ class ControlPanel(gtk.Window):
         self._canvas = None
         self._table = None
         self._separator = None
-        self._section_view = None
-        self._section_toolbar = None
+        self._detail_view = None
+        self._detail_toolbar = None
         self._main_toolbar = None
         
         self._vbox = gtk.VBox()
@@ -75,7 +75,7 @@ class ControlPanel(gtk.Window):
         self._current_option = None
         self._get_options()
         self._setup_main()
-        self._setup_section()
+        self._setup_detail()
         self._show_main_view()
 
     def _update_accept_focus(self):
@@ -160,33 +160,33 @@ class ControlPanel(gtk.Window):
             if not found:
                 self._options[option]['button'].set_sensitive(False)
 
-    def _setup_section(self):
-        self._section_toolbar = SectionToolbar()
-        self._section_toolbar.connect('cancel-clicked', 
+    def _setup_detail(self):
+        self._detail_toolbar = DetailToolbar()
+        self._detail_toolbar.connect('cancel-clicked', 
                                      self.__cancel_clicked_cb)
-        self._section_toolbar.connect('accept-clicked', 
+        self._detail_toolbar.connect('accept-clicked', 
                                      self.__accept_clicked_cb)
 
-    def _show_section_view(self, option):
-        self._set_toolbar(self._section_toolbar)
+    def _show_detail_view(self, option):
+        self._set_toolbar(self._detail_toolbar)
 
-        icon = self._section_toolbar.get_icon()
+        icon = self._detail_toolbar.get_icon()
         icon.set_from_icon_name(self._options[option]['icon'], 
                                 gtk.ICON_SIZE_LARGE_TOOLBAR)
         icon.props.xo_color = self._options[option]['color']
-        title = self._section_toolbar.get_title()
+        title = self._detail_toolbar.get_title()
         title.set_text(self._options[option]['title'])
-        self._section_toolbar.show()
-        self._section_toolbar.accept_button.set_sensitive(True)
+        self._detail_toolbar.show()
+        self._detail_toolbar.accept_button.set_sensitive(True)
 
         self._current_option = option
         class_pointer =  self._options[option]['view']
         model = self._options[option]['model']
-        self._section_view = class_pointer(model, 
+        self._detail_view = class_pointer(model, 
                                           self._options[option]['alerts'])
-        self._set_canvas(self._section_view)        
-        self._section_view.show()
-        self._section_view.connect('valid-section', self.__valid_section_cb)
+        self._set_canvas(self._detail_view)        
+        self._detail_view.show()
+        self._detail_view.connect('valid-section', self.__valid_section_cb)
         self._main_view.modify_bg(gtk.STATE_NORMAL, 
                                   style.COLOR_WHITE.get_gdk_color())
 
@@ -230,12 +230,12 @@ class ControlPanel(gtk.Window):
                     self._options[tmp]['keywords'] = keywords
 
     def __cancel_clicked_cb(self, widget, data=None):
-        self._section_view.undo()
+        self._detail_view.undo()
         self._show_main_view()
 
     def __accept_clicked_cb(self, widget, data=None):
-        if self._section_view.restart:
-            self._section_toolbar.accept_button.set_sensitive(False)
+        if self._detail_view.restart:
+            self._detail_toolbar.accept_button.set_sensitive(False)
             alert = Alert()
             alert.props.title = _('Warning') 
             alert.props.msg = _('Changes require restart to take effect') 
@@ -262,18 +262,18 @@ class ControlPanel(gtk.Window):
         self._vbox.remove(alert)        
         if response_id is gtk.RESPONSE_CANCEL:             
             logging.debug('Cancel...')        
-            self._section_view.undo()
-            self._section_toolbar.accept_button.set_sensitive(True)
+            self._detail_view.undo()
+            self._detail_toolbar.accept_button.set_sensitive(True)
         elif response_id is gtk.RESPONSE_ACCEPT:             
             logging.debug('Later...')
             self._options[self._current_option]['alerts'] = \
-                self._section_view.restart_alerts
+                self._detail_view.restart_alerts
             self._show_main_view()
         elif response_id is gtk.RESPONSE_APPLY:             
             logging.debug('Restart...')
 
     def __select_option_cb(self, button, event, option=None):
-        self._show_section_view(option)
+        self._show_detail_view(option)
 
     def __search_changed_cb(self, maintoolbar, query):
         self._update(query)            
@@ -282,7 +282,7 @@ class ControlPanel(gtk.Window):
         self.destroy()
     
     def __valid_section_cb(self, widget, valid):
-        self._section_toolbar.accept_button.set_sensitive(valid)
+        self._detail_toolbar.accept_button.set_sensitive(valid)
 
 class _GridWidget(gtk.EventBox):
     __gtype_name__ = "SugarGridWidget"
diff --git a/src/controlpanel/view/aboutme.py b/src/controlpanel/view/aboutme.py
index baa9806..99e049f 100644
--- a/src/controlpanel/view/aboutme.py
+++ b/src/controlpanel/view/aboutme.py
@@ -25,7 +25,7 @@ from sugar.graphics import style
 from sugar.graphics.xocolor import XoColor
 from sugar import profile
 
-from controlpanel.sectionview import SectionView
+from controlpanel.detailview import DetailView
 from controlpanel.inlinealert import InlineAlert
 
 ICON = 'module-about_me'
@@ -67,9 +67,9 @@ class ColorPicker(EventIcon):
         self.icon.props.xo_color = xocolor
         self.emit('color-changed', xocolor)
 
-class Aboutme(SectionView):
+class Aboutme(DetailView):
     def __init__(self, model, alerts):
-        SectionView.__init__(self)
+        DetailView.__init__(self)
 
         self.emit('valid_section', True)
 
diff --git a/src/controlpanel/view/aboutxo.py b/src/controlpanel/view/aboutxo.py
index 97a6f84..0df0871 100644
--- a/src/controlpanel/view/aboutxo.py
+++ b/src/controlpanel/view/aboutxo.py
@@ -7,14 +7,14 @@ _ = lambda msg: gettext.dgettext('sugar', msg)
 
 from sugar.graphics import style
 
-from controlpanel.sectionview import SectionView
+from controlpanel.detailview import DetailView
 
 ICON = 'module-about_my_xo'
 TITLE = _('About my XO')
 
-class Aboutxo(SectionView):
+class Aboutxo(DetailView):
     def __init__(self, model=None, alerts=None):
-        SectionView.__init__(self)
+        DetailView.__init__(self)
 
         self.set_border_width(style.DEFAULT_SPACING * 2)
         self.set_spacing(style.DEFAULT_SPACING)
diff --git a/src/controlpanel/view/language.py b/src/controlpanel/view/language.py
index 3a4abe9..55b3f7f 100644
--- a/src/controlpanel/view/language.py
+++ b/src/controlpanel/view/language.py
@@ -7,14 +7,14 @@ _ = lambda msg: gettext.dgettext('sugar', msg)
 from sugar.graphics import style
 from sugar.graphics import iconentry
 
-from controlpanel.sectionview import SectionView
+from controlpanel.detailview import DetailView
 
 ICON = 'module-language'
 TITLE = _('Language')
 
-class Language(SectionView):
+class Language(DetailView):
     def __init__(self, model, alerts):
-        SectionView.__init__(self)
+        DetailView.__init__(self)
         self._model = model
 
         self.set_border_width(style.DEFAULT_SPACING * 2)
diff --git a/src/controlpanel/view/network.py b/src/controlpanel/view/network.py
index 50c5360..c1814dd 100644
--- a/src/controlpanel/view/network.py
+++ b/src/controlpanel/view/network.py
@@ -6,15 +6,15 @@ _ = lambda msg: gettext.dgettext('sugar', msg)
 from sugar.graphics import style
 from sugar.graphics.icon import Icon
 
-from controlpanel.sectionview import SectionView
+from controlpanel.detailview import DetailView
 from controlpanel.inlinealert import InlineAlert
 
 ICON = 'module-network'
 TITLE = _('Network')
 
-class Network(SectionView):
+class Network(DetailView):
     def __init__(self, model, alerts):
-        SectionView.__init__(self)
+        DetailView.__init__(self)
 
         self.emit('valid_section', True)
                 
diff --git a/src/controlpanel/view/timezone.py b/src/controlpanel/view/timezone.py
index fbedfac..8c768cf 100644
--- a/src/controlpanel/view/timezone.py
+++ b/src/controlpanel/view/timezone.py
@@ -6,14 +6,14 @@ _ = lambda msg: gettext.dgettext('sugar', msg)
 from sugar.graphics import style
 from sugar.graphics import iconentry
 
-from controlpanel.sectionview import SectionView
+from controlpanel.detailview import DetailView
 
 ICON = 'module-date_and_time'
 TITLE = _('Date & Time')
 
-class Timezone(SectionView):
+class Timezone(DetailView):
     def __init__(self, model, alerts):
-        SectionView.__init__(self)
+        DetailView.__init__(self)
         self._model = model
 
         self.set_border_width(style.DEFAULT_SPACING * 2)