Rename NickCompletionSettings to TabCompletionSettings

Also add some more stuff to set which I might use later. I'll commit this now,
in order to avoid unnecessary migration later.

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index b5f6df3..217b673 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -188,16 +188,40 @@ bool KnownHostsSettings::isKnownHost(const QSslSocket *socket) {
 
 
 // ========================================
 
 
 // ========================================

-//  NickCompletionSettings
+//  TabCompletionSettings

 // ========================================
 
 // ========================================
 

-NickCompletionSettings::NickCompletionSettings() : ClientSettings("NickCompletion") {
+TabCompletionSettings::TabCompletionSettings() : ClientSettings("TabCompletion") {

 }
 
 }
 

-void NickCompletionSettings::setCompletionSuffix(const QString &suffix) {
+void TabCompletionSettings::setCompletionSuffix(const QString &suffix) {

   setLocalValue("CompletionSuffix", suffix);
 }
 
   setLocalValue("CompletionSuffix", suffix);
 }
 

-QString NickCompletionSettings::completionSuffix() {
+QString TabCompletionSettings::completionSuffix() {

   return localValue("CompletionSuffix", ": ").toString();
 }
   return localValue("CompletionSuffix", ": ").toString();
 }

+
+void TabCompletionSettings::setSortMode(SortMode mode) {
+  setLocalValue("SortMode", mode);
+}
+
+TabCompletionSettings::SortMode TabCompletionSettings::sortMode() {
+  return static_cast<SortMode>(localValue("SortMode"), LastActivity);
+}
+
+void TabCompletionSettings::setCaseSensitivity(Qt::CaseSensitivity cs) {
+  setLocalValue("CaseSensitivity", cs);
+}
+
+Qt::CaseSensitivity TabCompletionSettings::caseSensitivity() {
+  return (Qt::CaseSensitivity)localValue("CaseSensitivity", Qt::CaseInsensitive).toInt();
+}
+
+void TabCompletionSettings::setUseLastSpokenTo(bool use) {
+  setLocalValue("UseLastSpokenTo", use);
+}
+
+bool TabCompletionSettings::useLastSpokenTo() {
+  return localValue("UseLastSpokenTo", false).toBool();
+}

diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h
index ec354d9..0b1b3d5 100644 (file)
--- a/src/client/clientsettings.h
+++ b/src/client/clientsettings.h
@@ -122,16 +122,30 @@ public:
 };
 
 // ========================================
 };
 
 // ========================================

-// NickCompletionSettings
+// TabCompletionSettings

 // ========================================
 
 // ========================================
 

-class NickCompletionSettings : public ClientSettings {
+class TabCompletionSettings : public ClientSettings {

 public:
 public:

-  NickCompletionSettings();
+  enum SortMode {
+    Alphabetical,
+    LastActivity
+  };
+
+  TabCompletionSettings();

 
   void setCompletionSuffix(const QString &);
   QString completionSuffix();
 
 
   void setCompletionSuffix(const QString &);
   QString completionSuffix();
 

+  void setSortMode(SortMode);
+  SortMode sortMode();
+
+  void setCaseSensitivity(Qt::CaseSensitivity);
+  Qt::CaseSensitivity caseSensitivity();
+
+  void setUseLastSpokenTo(bool);
+  bool useLastSpokenTo();
+

 };
 
 #endif
 };
 
 #endif

diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index 31e8cb3..296fc1c 100644 (file)
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -27,7 +27,7 @@
 #include "network.h"
 
 ClientUserInputHandler::ClientUserInputHandler(QObject *parent) : QObject(parent) {
 #include "network.h"
 
 ClientUserInputHandler::ClientUserInputHandler(QObject *parent) : QObject(parent) {

-  NickCompletionSettings s;
+  TabCompletionSettings s;

   s.notify("CompletionSuffix", this, SLOT(completionSuffixChanged(QVariant)));
   completionSuffixChanged(s.completionSuffix());
 }
   s.notify("CompletionSuffix", this, SLOT(completionSuffixChanged(QVariant)));
   completionSuffixChanged(s.completionSuffix());
 }

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index e5bbea2..b329e63 100644 (file)
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -129,7 +129,7 @@ void GeneralSettingsPage::load() {
   ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
 
   // completion settings
   ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
 
   // completion settings

-  NickCompletionSettings completionSettings;
+  TabCompletionSettings completionSettings;

   settings["CompletionSuffix"] = completionSettings.completionSuffix();
   ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
 
   settings["CompletionSuffix"] = completionSettings.completionSuffix();
   ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
 


@@ -179,7 +179,7 @@ void GeneralSettingsPage::save() {
 
   bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
 
 
   bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
 

-  NickCompletionSettings completionSettings;
+  TabCompletionSettings completionSettings;

   completionSettings.setCompletionSuffix(ui.completionSuffix->text());
 
 
   completionSettings.setCompletionSuffix(ui.completionSuffix->text());
 
 

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 695923f..2b60cdd 100644 (file)
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -92,7 +92,7 @@ void TabCompleter::buildCompletionList() {
 }
 
 void TabCompleter::complete() {
 }
 
 void TabCompleter::complete() {

-  NickCompletionSettings s;
+  TabCompletionSettings s;

   nickSuffix = s.completionSuffix();
 
   if(!enabled) {
   nickSuffix = s.completionSuffix();
 
   if(!enabled) {