Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Garg <ajay@activitycentral.com>2012-10-17 06:11:42 (GMT)
committer Ajay Garg <ajay@activitycentral.com>2012-10-17 06:13:39 (GMT)
commit5079cf047328b2f83f3d2a3fc859b40e36759158 (patch)
treecbe6b78eafaf382cdf6e7fe8cc225157c3505b52
parentc9cd48b893a7c412db613af7541d2c876e435289 (diff)
NTP-Servers configuration.
Signed-off-by: Ajay Garg <ajay@activitycentral.com>
-rw-r--r--extensions/cpsection/datetime/model.py47
-rw-r--r--extensions/cpsection/datetime/view.py185
-rw-r--r--src/jarabe/controlpanel/gui.py1
-rw-r--r--src/jarabe/controlpanel/sectionview.py4
4 files changed, 231 insertions, 6 deletions
diff --git a/extensions/cpsection/datetime/model.py b/extensions/cpsection/datetime/model.py
index c9b4586..f73bef7 100644
--- a/extensions/cpsection/datetime/model.py
+++ b/extensions/cpsection/datetime/model.py
@@ -21,10 +21,57 @@
#
import os
+import logging
+
from gettext import gettext as _
from gi.repository import GConf
_zone_tab = '/usr/share/zoneinfo/zone.tab'
+NTPDATE_PATH = '/usr/sbin/ntpdate'
+NTP_SERVER_CONFIG_FILENAME = '/etc/ntp/step-tickers'
+
+_logger = logging.getLogger('ControlPanel - TimeZone')
+
+
+def is_ntp_servers_config_feature_available():
+ return os.path.exists(NTPDATE_PATH)
+
+
+def get_ntp_servers():
+ servers = []
+
+ # If the file does not exist, return.
+ if not os.path.exists(NTP_SERVER_CONFIG_FILENAME):
+ return servers
+
+ f = open(NTP_SERVER_CONFIG_FILENAME, 'r')
+ for server in f.readlines():
+ servers.append(server.rstrip('\n'))
+ f.close()
+
+ return servers
+
+
+def set_ntp_servers(servers):
+
+ # First remove the old ssid-file, if it exists.
+ if os.path.exists(NTP_SERVER_CONFIG_FILENAME):
+ try:
+ os.remove(NTP_SERVER_CONFIG_FILENAME)
+ except:
+ _logger.exception('Error removing file.')
+ return
+
+ # Do nothing and return, if the values-list is empty
+ if len(servers) == 0:
+ return
+
+ # If we reach here, we have a non-empty ssid-values-list.
+ f = open(NTP_SERVER_CONFIG_FILENAME, 'w')
+ for server in servers:
+ if len(server) > 0:
+ f.write(server + '\n')
+ f.close()
def _initialize():
diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
index 64789b4..4ad94ca 100644
--- a/extensions/cpsection/datetime/view.py
+++ b/extensions/cpsection/datetime/view.py
@@ -20,11 +20,130 @@ from gettext import gettext as _
from sugar3.graphics import style
from sugar3.graphics import iconentry
+from sugar3.graphics.icon import Icon
from jarabe.controlpanel.sectionview import SectionView
from jarabe.controlpanel.inlinealert import InlineAlert
+class AddRemoveWidget(Gtk.HBox):
+
+ def __init__(self, label, add_button_clicked_cb,
+ remove_button_clicked_cb, index):
+ Gtk.Box.__init__(self)
+ self.set_homogeneous(False)
+ self.set_spacing(10)
+
+ self._index = index
+ self._add_button_added = False
+ self._remove_button_added = False
+
+ self._entry_box = Gtk.Entry()
+ self._entry_box.set_text(label)
+ self._entry_box.set_width_chars(40)
+ self.pack_start(self._entry_box, False, False, 0)
+ self._entry_box.show()
+
+ add_icon = Icon(icon_name='list-add')
+ self._add_button = Gtk.Button()
+ self._add_button.set_image(add_icon)
+ self._add_button.connect('clicked',
+ add_button_clicked_cb,
+ self)
+
+ remove_icon = Icon(icon_name='list-remove')
+ self._remove_button = Gtk.Button()
+ self._remove_button.set_image(remove_icon)
+ self._remove_button.connect('clicked',
+ remove_button_clicked_cb,
+ self)
+ self.__add_add_button()
+ self.__add_remove_button()
+
+ def _get_index(self):
+ return self._index
+
+ def _set_index(self, value):
+ self._index = value
+
+ def _get_entry(self):
+ return self._entry_box.get_text()
+
+ def __add_add_button(self):
+ self.pack_start(self._add_button, False, False, 0)
+ self._add_button.show()
+ self._add_button_added = True
+
+ def _remove_remove_button_if_not_already(self):
+ if self._remove_button_added:
+ self.__remove_remove_button()
+
+ def __remove_remove_button(self):
+ self.remove(self._remove_button)
+ self._remove_button_added = False
+
+ def _add_remove_button_if_not_already(self):
+ if not self._remove_button_added:
+ self.__add_remove_button()
+
+ def __add_remove_button(self):
+ self.pack_start(self._remove_button, False, False, 0)
+ self._remove_button.show()
+ self._remove_button_added = True
+
+
+class MultiWidget(Gtk.VBox):
+
+ def __init__(self):
+ Gtk.VBox.__init__(self)
+
+ def _add_widget(self, label):
+ new_widget = AddRemoveWidget(label,
+ self.__add_button_clicked_cb,
+ self.__remove_button_clicked_cb,
+ len(self.get_children()))
+ self.add(new_widget)
+ new_widget.show()
+ self.show()
+ self._update_remove_button_statuses()
+
+ def __add_button_clicked_cb(self, add_button,
+ add_button_container):
+ self._add_widget('')
+ self._update_remove_button_statuses()
+
+ def __remove_button_clicked_cb(self, remove_button,
+ remove_button_container):
+ for child in self.get_children():
+ if child._get_index() > remove_button_container._get_index():
+ child._set_index(child._get_index() - 1)
+
+ self.remove(remove_button_container)
+ self._update_remove_button_statuses()
+
+ def _update_remove_button_statuses(self):
+ children = self.get_children()
+
+ # Now, if there is only one entry, remove-button
+ # should not be shown.
+ if len(children) == 1:
+ children[0]._remove_remove_button_if_not_already()
+
+ # Alternatively, if there are more than 1 entries,
+ # remove-button should be shown for all.
+ if len(children) > 1:
+ for child in children:
+ child._add_remove_button_if_not_already()
+
+
+ def _get_entries(self):
+ entries = []
+ for child in self.get_children():
+ entries.append(child._get_entry())
+
+ return entries
+
+
class TimeZone(SectionView):
def __init__(self, model, alerts):
SectionView.__init__(self)
@@ -64,7 +183,10 @@ class TimeZone(SectionView):
self._treeview.set_search_entry(self._entry)
self._treeview.set_search_equal_func(self._search, None)
self._treeview.set_search_column(0)
- self._scrolled_window.add(self._treeview)
+ self._timezone_box = Gtk.VBox()
+ self._scrolled_window.add(self._timezone_box)
+ self._timezone_box.show_all()
+ self._timezone_box.add(self._treeview)
self._treeview.show()
self._timezone_column = Gtk.TreeViewColumn(_('Timezone'))
@@ -74,19 +196,29 @@ class TimeZone(SectionView):
self._timezone_column.set_sort_column_id(0)
self._treeview.append_column(self._timezone_column)
- self.pack_start(self._scrolled_window, True, True, 0)
- self._scrolled_window.show()
+ self._container = Gtk.VBox()
+ self._container.set_homogeneous(False)
+ self._container.pack_start(self._scrolled_window, True, True, 0)
+ self._container.set_spacing(style.DEFAULT_SPACING)
+ self._container.show_all()
+ self.pack_start(self._container, True, True, 0)
self._zone_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING)
- self.pack_start(self._zone_alert_box, False, False, 0)
-
+ self._timezone_box.pack_start(self._zone_alert_box, False, False, 0)
self._zone_alert = InlineAlert()
self._zone_alert_box.pack_start(self._zone_alert, True, True, 0)
if 'zone' in self.restart_alerts:
self._zone_alert.props.msg = self.restart_msg
self._zone_alert.show()
+
+ # Not showing this, as this hides the selected timezone.
+ # Instead, the alert will anyways be shown when user clicks
+ # on "Ok".
+ #self._zone_alert.show()
self._zone_alert_box.show()
+ self._ntp_ui_setup = False
+
self.setup()
def setup(self):
@@ -102,6 +234,45 @@ class TimeZone(SectionView):
self.needs_restart = False
self._cursor_change_handler = self._treeview.connect( \
'cursor-changed', self.__zone_changed_cd)
+ if self._model.is_ntp_servers_config_feature_available():
+ self.setup_ui_for_ntp_server_config()
+
+ def setup_ui_for_ntp_server_config(self):
+ if self._ntp_ui_setup:
+ return
+ self._ntp_ui_setup = True
+
+ self._ntp_scrolled_window = Gtk.ScrolledWindow()
+ self._ntp_scrolled_window.set_policy(Gtk.PolicyType.NEVER,
+ Gtk.PolicyType.AUTOMATIC)
+ box_ntp_servers_config = Gtk.VBox()
+ box_ntp_servers_config.set_spacing(style.DEFAULT_SPACING)
+
+ separator_ntp_servers_config= Gtk.HSeparator()
+ self._container.pack_start(separator_ntp_servers_config,
+ False, False, 0)
+ separator_ntp_servers_config.show()
+
+ label_ntp_servers_config = Gtk.Label(_('NTP Servers Configuration'))
+ label_ntp_servers_config.set_alignment(0, 0)
+ self._container.pack_start(label_ntp_servers_config,
+ False, False, 0)
+ label_ntp_servers_config.show()
+
+ self._widget_table = MultiWidget()
+ box_ntp_servers_config.pack_start(self._widget_table, False, False, 0)
+ box_ntp_servers_config.show_all()
+
+ self._ntp_scrolled_window.add_with_viewport(box_ntp_servers_config)
+ self._container.pack_start(self._ntp_scrolled_window, True, True, 0)
+ self._ntp_scrolled_window.show_all()
+
+ ntp_servers = self._model.get_ntp_servers()
+ if len(ntp_servers) == 0:
+ self._widget_table._add_widget('')
+ else:
+ for server in ntp_servers:
+ self._widget_table._add_widget(server)
def undo(self):
self._treeview.disconnect(self._cursor_change_handler)
@@ -136,5 +307,7 @@ class TimeZone(SectionView):
self.restart_alerts.append('zone')
self.needs_restart = True
self._zone_alert.props.msg = self.restart_msg
- self._zone_alert.show()
return False
+
+ def perform_accept_actions(self):
+ self._model.set_ntp_servers(self._widget_table._get_entries())
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 1e8769c..daa58e4 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -295,6 +295,7 @@ class ControlPanel(Gtk.Window):
self._show_main_view()
def __accept_clicked_cb(self, widget):
+ self._section_view.perform_accept_actions()
if self._section_view.needs_restart:
self._section_toolbar.accept_button.set_sensitive(False)
self._section_toolbar.cancel_button.set_sensitive(False)
diff --git a/src/jarabe/controlpanel/sectionview.py b/src/jarabe/controlpanel/sectionview.py
index cbf4768..074a8ae 100644
--- a/src/jarabe/controlpanel/sectionview.py
+++ b/src/jarabe/controlpanel/sectionview.py
@@ -52,3 +52,7 @@ class SectionView(Gtk.VBox):
def undo(self):
"""Undo here the changes that have been made in this section."""
pass
+
+ def perform_accept_actions(self):
+ """Perform additional actions, when the "Ok" button is clicked."""
+ pass