X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtopia%2Fbufferviewwidget.cpp;h=4ee2c9894bb560bbdef4a81aa62056bb5b6b9812;hb=0f206dd896485276cf25025e562c812b8c7fc5da;hp=b884cdef4d08b8c327e0fb3b4d35a5488bda093b;hpb=eaa92c3648f551569e504971ebc75021a7e3e720;p=quassel.git

diff --git a/src/qtopia/bufferviewwidget.cpp b/src/qtopia/bufferviewwidget.cpp
index b884cdef..4ee2c989 100644
--- a/src/qtopia/bufferviewwidget.cpp
+++ b/src/qtopia/bufferviewwidget.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -20,12 +20,13 @@
 
 #include "bufferviewwidget.h"
 #include "client.h"
+#include "buffermodel.h"
 
 
 BufferViewWidget::BufferViewWidget(QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);
   setModal(true);
-  setStyleSheet("background-color: rgba(255, 255, 255, 40%); color: rgb(0, 0, 0); font-size: 5pt;");
+  //setStyleSheet("background-color: rgb(220, 220, 255, 70%); color: rgb(0, 0, 0); font-size: 5pt;");
   //ui.tabWidget->tabBar()->setStyleSheet("font-size: 5pt;");
 
   // get rid of the default tab page designer forces upon us :(
@@ -33,13 +34,13 @@ BufferViewWidget::BufferViewWidget(QWidget *parent) : QDialog(parent) {
   ui.tabWidget->removeTab(0);
   delete w;
 
-  addPage(tr("Bufs"), BufferViewFilter::AllNets, QList<uint>());
-  addPage(tr("Chans"), BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<uint>());
-  addPage(tr("Queries"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<uint>());
-  addPage(tr("Nets"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<uint>());
-
-  //connect(Client::bufferModel(), SIGNAL(bufferSelected(Buffer *)), this, SLOT(accept()));
+  addPage(tr("All"), BufferViewFilter::AllNets, QList<NetworkId>());
+  addPage(tr("Chans"), BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<NetworkId>());
+  addPage(tr("Queries"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<NetworkId>());
+  addPage(tr("Nets"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<NetworkId>());
 
+  // this sometimes deadlocks, so we have to hide the dialog from the outside:
+  //connect(Client::bufferModel()->standardSelectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(accept()));
 }
 
 BufferViewWidget::~BufferViewWidget() {
@@ -47,16 +48,14 @@ BufferViewWidget::~BufferViewWidget() {
 
 }
 
-void BufferViewWidget::addPage(const QString &title, const BufferViewFilter::Modes &mode, const QList<uint> &nets) {
+void BufferViewWidget::addPage(const QString &title, const BufferViewFilter::Modes &mode, const QList<NetworkId> &nets) {
   BufferView *view = new BufferView(ui.tabWidget);
+  view->setStyleSheet("background-color: rgb(220, 220, 255, 70%); color: rgb(0, 0, 0); font-size: 5pt;");
   view->setFilteredModel(Client::bufferModel(), mode, nets);
   Client::bufferModel()->synchronizeView(view);
   ui.tabWidget->addTab(view, title);
 }
 
 void BufferViewWidget::accept() {
-  qDebug() << "accepting";
   QDialog::accept();
-  //hide();
-  qDebug() << "...done.";
 }