X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fbufferviewsettingspage.cpp;h=00faf0c00b85fe153377feb6262c7a94983efb92;hb=630dbdaf56fcee546387275898bde59426da71cb;hp=9e95996045099bd118d2443ba0e3fa53bde48358;hpb=f2e4609f070221a010eef8be98524c5ce88d228b;p=quassel.git

diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index 9e959960..00faf0c0 100644
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.cpp
@@ -41,7 +41,7 @@ BufferViewSettingsPage::BufferViewSettingsPage(QWidget *parent)
   ui.settingsGroupBox->setEnabled(false);
   ui.bufferViewPreview->setEnabled(false);
 
-  setEnabled(Client::isConnected());  // need a core connection!
+  coreConnectionStateChanged(Client::isConnected());  // need a core connection!
   connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
   connect(ui.bufferViewList->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
 	  this, SLOT(bufferViewSelectionChanged(const QItemSelection &, const QItemSelection &)));
@@ -99,7 +99,7 @@ void BufferViewSettingsPage::load() {
   _ignoreWidgetChanges = true;
   // load network selector
   ui.networkSelector->clear();
-  ui.networkSelector->addItem("All");
+  ui.networkSelector->addItem(tr("All"));
   ui.networkSelector->setItemData(0, qVariantFromValue<NetworkId>(NetworkId()));
   const Network *net;
   foreach(NetworkId netId, Client::networkIds()) {
@@ -196,9 +196,7 @@ void BufferViewSettingsPage::newBufferView(const QString &bufferViewName) {
 
   QList<BufferId> bufferIds;
   if(config->addNewBuffersAutomatically()) {
-    foreach(BufferInfo bufferInfo, Client::allBufferInfos()) {
-      bufferIds << bufferInfo.bufferId();
-    }
+    bufferIds = Client::networkModel()->allBufferIds();
     if(config->sortAlphabetically())
       qSort(bufferIds.begin(), bufferIds.end(), bufferIdLessThan);
   }
@@ -378,9 +376,7 @@ void BufferViewSettingsPage::saveConfig(BufferViewConfig *config) {
   if(_newBufferViews.contains(config)) {
     QList<BufferId> bufferIds;
     if(config->addNewBuffersAutomatically()) {
-      foreach(BufferInfo bufferInfo, Client::allBufferInfos()) {
-	bufferIds << bufferInfo.bufferId();
-      }
+      bufferIds = Client::networkModel()->allBufferIds();
       if(config->sortAlphabetically())
 	qSort(bufferIds.begin(), bufferIds.end(), bufferIdLessThan);
     }
@@ -424,7 +420,14 @@ BufferViewConfig *BufferViewSettingsPage::cloneConfig(BufferViewConfig *config)
 
   BufferViewConfig *changedConfig = new BufferViewConfig(-1, this);
   changedConfig->fromVariantMap(config->toVariantMap());
+  changedConfig->setInitialized();
   _changedBufferViews[config] = changedConfig;
+  connect(config, SIGNAL(bufferAdded(const BufferId &, int)), changedConfig, SLOT(addBuffer(const BufferId &, int)));
+  connect(config, SIGNAL(bufferMoved(const BufferId &, int)), changedConfig, SLOT(moveBuffer(const BufferId &, int)));
+  connect(config, SIGNAL(bufferRemoved(const BufferId &)), changedConfig, SLOT(removeBuffer(const BufferId &)));
+  connect(config, SIGNAL(addBufferRequested(const BufferId &, int)), changedConfig, SLOT(addBuffer(const BufferId &, int)));
+  connect(config, SIGNAL(moveBufferRequested(const BufferId &, int)), changedConfig, SLOT(moveBuffer(const BufferId &, int)));
+  connect(config, SIGNAL(removeBufferRequested(const BufferId &)), changedConfig, SLOT(removeBuffer(const BufferId &)));
 
   // if this is the currently displayed view we have to change the config of the preview filter
   BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(ui.bufferViewPreview->model());