client: Default to AsNeeded backlog fetching

Default to the AsNeeded backlog requester for better performance with
modern (v0.13.0 or newer) Quassel cores.  Legacy cores are handled
as well.

This modifies new installs and existing configurations if the prior
default value wasn't changed.  Might be worth a mention in the release
notes given the potential performance improvement.

diff --git a/src/client/backlogsettings.cpp b/src/client/backlogsettings.cpp
index fda3076..a90d4e5 100644 (file)
--- a/src/client/backlogsettings.cpp
+++ b/src/client/backlogsettings.cpp
@@ -26,10 +26,10 @@ BacklogSettings::BacklogSettings()
 
 int BacklogSettings::requesterType() const
 {
 
 int BacklogSettings::requesterType() const
 {

-    int _requesterType = localValue("RequesterType", BacklogRequester::PerBufferUnread).toInt();
+    int _requesterType = localValue("RequesterType", BacklogRequester::AsNeeded).toInt();

     if (_requesterType == BacklogRequester::GlobalUnread) {
         // GlobalUnread is currently disabled; don't allow it to be used.  Reset to default instead.
     if (_requesterType == BacklogRequester::GlobalUnread) {
         // GlobalUnread is currently disabled; don't allow it to be used.  Reset to default instead.

-        _requesterType = BacklogRequester::PerBufferUnread;
+        _requesterType = BacklogRequester::AsNeeded;

     }
     return _requesterType;
 }
     }
     return _requesterType;
 }

diff --git a/src/qtui/settingspages/backlogsettingspage.cpp b/src/qtui/settingspages/backlogsettingspage.cpp
index e797861..98305c7 100644 (file)
--- a/src/qtui/settingspages/backlogsettingspage.cpp
+++ b/src/qtui/settingspages/backlogsettingspage.cpp
@@ -46,7 +46,7 @@ bool BacklogSettingsPage::hasDefaults() const
 
 void BacklogSettingsPage::defaults()
 {
 
 void BacklogSettingsPage::defaults()
 {

-    ui.requesterType->setCurrentIndex(BacklogRequester::PerBufferUnread - 1);
+    ui.requesterType->setCurrentIndex(BacklogRequester::AsNeeded - 1);

 
     SettingsPage::defaults();
 }
 
     SettingsPage::defaults();
 }

diff --git a/src/qtui/settingspages/backlogsettingspage.ui b/src/qtui/settingspages/backlogsettingspage.ui
index feac9cd..b8c70bf 100644 (file)
--- a/src/qtui/settingspages/backlogsettingspage.ui
+++ b/src/qtui/settingspages/backlogsettingspage.ui
@@ -94,6 +94,9 @@
      </item>
      <item>
       <widget class="QComboBox" name="requesterType">
      </item>
      <item>
       <widget class="QComboBox" name="requesterType">

+       <property name="currentIndex">
+        <number>2</number>
+       </property>

        <item>
         <property name="text">
          <string>Fixed amount per chat</string>
        <item>
         <property name="text">
          <string>Fixed amount per chat</string>


@@ -134,7 +137,7 @@
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">

-      <number>0</number>
+      <number>2</number>

      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_2">
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_2">

diff --git a/src/qtui/settingspages/chatmonitorsettingspage.cpp b/src/qtui/settingspages/chatmonitorsettingspage.cpp
index 414cd6d..5af07e3 100644 (file)
--- a/src/qtui/settingspages/chatmonitorsettingspage.cpp
+++ b/src/qtui/settingspages/chatmonitorsettingspage.cpp
@@ -73,7 +73,7 @@ ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget* parent)
 
     // AsNeededBacklogRequester conflicts with showing backlog in Chat Monitor
     BacklogSettings backlogSettings;
 
     // AsNeededBacklogRequester conflicts with showing backlog in Chat Monitor
     BacklogSettings backlogSettings;

-    backlogSettings.initAndNotify("RequesterType", this, &ChatMonitorSettingsPage::setRequesterType, BacklogRequester::PerBufferUnread);
+    backlogSettings.initAndNotify("RequesterType", this, &ChatMonitorSettingsPage::setRequesterType, BacklogRequester::AsNeeded);

 }
 
 bool ChatMonitorSettingsPage::hasDefaults() const
 }
 
 bool ChatMonitorSettingsPage::hasDefaults() const