Commit 214c447d authored by Tijmen de Mes's avatar Tijmen de Mes

Added preferences for history sylk-api

parent afb48027
...@@ -72,7 +72,11 @@ class SMSSettings(SettingsGroup): ...@@ -72,7 +72,11 @@ class SMSSettings(SettingsGroup):
class SMSSettingsExtension(SMSSettings): class SMSSettingsExtension(SMSSettings):
enable_history_synchronization = Setting(type=bool, default=True)
enable_message_replication = Setting(type=bool, default=True) enable_message_replication = Setting(type=bool, default=True)
history_synchronization_url = Setting(type=HTTPURL, default=None, nillable=True)
history_synchronization_token = Setting(type=str, default=None, nillable=True)
history_synchronization_id = Setting(type=str, default=None, nillable=True)
class SoundSettings(SettingsGroup): class SoundSettings(SettingsGroup):
......
...@@ -263,6 +263,9 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton): ...@@ -263,6 +263,9 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton):
self.message_add_unknown_contacts_button.clicked.connect(self._SH_AddUnknownContactsButtonClicked) self.message_add_unknown_contacts_button.clicked.connect(self._SH_AddUnknownContactsButtonClicked)
self.message_pgp_enabled_button.clicked.connect(self._SH_EnablePGPButtonClicked) self.message_pgp_enabled_button.clicked.connect(self._SH_EnablePGPButtonClicked)
self.message_replication_button.clicked.connect(self._SH_MessageReplicationButtonClicked) self.message_replication_button.clicked.connect(self._SH_MessageReplicationButtonClicked)
self.message_synchronization_button.clicked.connect(self._SH_MessageSynchronizationButtonClicked)
self.history_url_editor.editingFinished.connect(self._SH_HistoryUrlEditorEditingFinshed)
self.last_id_editor.editingFinished.connect(self._SH_LastIdEditorEditingFinished)
# Audio devices # Audio devices
self.audio_alert_device_button.activated[int].connect(self._SH_AudioAlertDeviceButtonActivated) self.audio_alert_device_button.activated[int].connect(self._SH_AudioAlertDeviceButtonActivated)
...@@ -491,6 +494,8 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton): ...@@ -491,6 +494,8 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton):
self.audio_sample_rate_button.setStyleSheet("""QComboBox { padding: 4px 4px 4px 4px; }""") self.audio_sample_rate_button.setStyleSheet("""QComboBox { padding: 4px 4px 4px 4px; }""")
self.unavailable_message_button.setStyleSheet("""QComboBox { padding: 4px 4px 4px 4px; }""") self.unavailable_message_button.setStyleSheet("""QComboBox { padding: 4px 4px 4px 4px; }""")
self.history_url_editor.setValidator(WebURLValidator(self))
def eventFilter(self, watched, event): def eventFilter(self, watched, event):
if watched is self.camera_preview: if watched is self.camera_preview:
event_type = event.type() event_type = event.type()
...@@ -905,11 +910,30 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton): ...@@ -905,11 +910,30 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton):
# Messages tab # Messages tab
self.message_replication_button.show() self.message_replication_button.show()
self.message_synchronization_button.show()
self.history_url_editor.show()
self.history_url_label.show()
self.last_id_editor.show()
self.last_id_label.show()
self.history_label.show()
self.history_line.show()
self.message_replication_button.setChecked(account.sms.enable_message_replication) self.message_replication_button.setChecked(account.sms.enable_message_replication)
self.message_synchronization_button.setChecked(account.sms.enable_history_synchronization)
self.history_url_editor.setEnabled(account.sms.enable_history_synchronization)
self.history_url_editor.setText(account.sms.history_synchronization_url)
self.last_id_editor.setEnabled(account.sms.enable_history_synchronization)
self.last_id_editor.setText(account.sms.history_synchronization_id)
else: else:
self.account_auto_answer.setText('Auto answer from all neighbours') self.account_auto_answer.setText('Auto answer from all neighbours')
self.message_replication_button.hide() self.message_replication_button.hide()
self.message_synchronization_button.hide()
self.history_url_editor.hide()
self.history_url_label.hide()
self.last_id_editor.hide()
self.last_id_label.hide()
self.history_label.hide()
self.history_line.hide()
def update_chat_preview(self): def update_chat_preview(self):
blink_settings = BlinkSettings() blink_settings = BlinkSettings()
...@@ -1467,6 +1491,25 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton): ...@@ -1467,6 +1491,25 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton):
account.sms.enable_message_replication = checked account.sms.enable_message_replication = checked
account.save() account.save()
def _SH_MessageSynchronizationButtonClicked(self, checked):
account = self.selected_account
account.sms.enable_history_synchronization = checked
account.save()
def _SH_HistoryUrlEditorEditingFinshed(self):
account = self.selected_account
history_url = self.history_url_editor.text() or None
if account.sms.history_synchronization_url != history_url:
account.sms.history_synchronization_url = history_url
account.save()
def _SH_LastIdEditorEditingFinished(self):
account = self.selected_account
last_id = self.last_id_editor.text() or None
if account.sms.history_synchronization_id != last_id:
account.sms.history_synchronization_id = last_id
account.save()
# Audio devices signal handlers # Audio devices signal handlers
def _SH_AudioAlertDeviceButtonActivated(self, index): def _SH_AudioAlertDeviceButtonActivated(self, index):
device = self.audio_alert_device_button.itemData(index) device = self.audio_alert_device_button.itemData(index)
...@@ -1897,6 +1940,11 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton): ...@@ -1897,6 +1940,11 @@ class PreferencesWindow(base_class, ui_class, metaclass=QSingleton):
self.reset_account_audio_codecs_button.setEnabled(account.rtp.audio_codec_list is not None) self.reset_account_audio_codecs_button.setEnabled(account.rtp.audio_codec_list is not None)
if 'rtp.video_codec_list' in notification.data.modified: if 'rtp.video_codec_list' in notification.data.modified:
self.reset_account_video_codecs_button.setEnabled(account.rtp.video_codec_list is not None) self.reset_account_video_codecs_button.setEnabled(account.rtp.video_codec_list is not None)
if 'sms.history_synchronization_url' in notification.data.modified:
if not account.sms.history_synchronization_url:
account.sms.history_synchronization_token = None
account.sms.enable_history_synchronization = False
account.save()
del ui_class, base_class del ui_class, base_class
...@@ -1242,34 +1242,6 @@ ...@@ -1242,34 +1242,6 @@
<string>Messages</string> <string>Messages</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="5" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QWidget" name="message_widget" native="true"> <widget class="QWidget" name="message_widget" native="true">
<property name="minimumSize"> <property name="minimumSize">
...@@ -1286,6 +1258,13 @@ ...@@ -1286,6 +1258,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1">
<widget class="QLineEdit" name="last_id_editor">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="message_cpim_enabled_button"> <widget class="QCheckBox" name="message_cpim_enabled_button">
<property name="text"> <property name="text">
...@@ -1316,6 +1295,16 @@ ...@@ -1316,6 +1295,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1">
<widget class="QLineEdit" name="history_url_editor">
<property name="enabled">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2"> <item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="message_add_unknown_contacts_button"> <widget class="QCheckBox" name="message_add_unknown_contacts_button">
<property name="text"> <property name="text">
...@@ -1336,6 +1325,13 @@ ...@@ -1336,6 +1325,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="history_url_label">
<property name="text">
<string>History URL</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2"> <item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="message_pgp_enabled_button"> <widget class="QCheckBox" name="message_pgp_enabled_button">
<property name="text"> <property name="text">
...@@ -1394,6 +1390,20 @@ ...@@ -1394,6 +1390,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="last_id_label">
<property name="text">
<string>Last fetched ID</string>
</property>
</widget>
</item>
<item row="13" column="0" colspan="2">
<widget class="QCheckBox" name="message_synchronization_button">
<property name="text">
<string>Enable history synchronization (Requires Sylkserver and server support)</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment