Cleaning up, getting rid of the old identity/serverlist dialogs.

FINALLY!!1!

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index da5eff1..236617a 100644 (file)
--- a/Quassel.kdevelop.filelist
+++ b/Quassel.kdevelop.filelist
@@ -164,6 +164,8 @@ src/qtui/guisettings.cpp
 src/qtui/guisettings.h
 src/qtui/identities.cpp
 src/qtui/identities.h
+src/qtui/inputwidget.cpp
+src/qtui/inputwidget.h
 src/qtui/mainwin.cpp
 src/qtui/mainwin.h
 src/qtui/nicklistwidget.cpp
@@ -211,6 +213,8 @@ src/qtui/ui/servereditdlg.ui
 src/qtui/ui/serverlistdlg.ui
 src/qtui/ui/settingsdlg.ui
 src/qtui/ui/topicwidget.ui
+src/qtui/verticaldock.cpp
+src/qtui/verticaldock.h
 src/uisupport
 src/uisupport/action.cpp
 src/uisupport/action.h
@@ -224,6 +228,8 @@ src/uisupport/inputline.cpp
 src/uisupport/inputline.h
 src/uisupport/nickview.cpp
 src/uisupport/nickview.h
+src/uisupport/nickviewfilter.cpp
+src/uisupport/nickviewfilter.h
 src/uisupport/settingspage.cpp
 src/uisupport/settingspage.h
 src/uisupport/tabcompleter.cpp

diff --git a/src/qtui/identities.cpp b/dev-notes/obsolete/identities.cpp
similarity index 100%
rename from src/qtui/identities.cpp
rename to dev-notes/obsolete/identities.cpp

diff --git a/src/qtui/identities.h b/dev-notes/obsolete/identities.h
similarity index 100%
rename from src/qtui/identities.h
rename to dev-notes/obsolete/identities.h

diff --git a/src/qtui/ui/identitiesdlg.ui b/dev-notes/obsolete/identitiesdlg.ui
similarity index 100%
rename from src/qtui/ui/identitiesdlg.ui
rename to dev-notes/obsolete/identitiesdlg.ui

diff --git a/src/qtui/ui/identitieseditdlg.ui b/dev-notes/obsolete/identitieseditdlg.ui
similarity index 100%
rename from src/qtui/ui/identitieseditdlg.ui
rename to dev-notes/obsolete/identitieseditdlg.ui

diff --git a/src/qtui/ui/networkeditdlg.ui b/dev-notes/obsolete/networkeditdlg.ui
similarity index 100%
rename from src/qtui/ui/networkeditdlg.ui
rename to dev-notes/obsolete/networkeditdlg.ui

diff --git a/src/qtui/ui/nickeditdlg.ui b/dev-notes/obsolete/nickeditdlg.ui
similarity index 100%
rename from src/qtui/ui/nickeditdlg.ui
rename to dev-notes/obsolete/nickeditdlg.ui

diff --git a/src/qtui/ui/servereditdlg.ui b/dev-notes/obsolete/servereditdlg.ui
similarity index 100%
rename from src/qtui/ui/servereditdlg.ui
rename to dev-notes/obsolete/servereditdlg.ui

diff --git a/src/qtui/serverlist.cpp b/dev-notes/obsolete/serverlist.cpp
similarity index 100%
rename from src/qtui/serverlist.cpp
rename to dev-notes/obsolete/serverlist.cpp

diff --git a/src/qtui/serverlist.h b/dev-notes/obsolete/serverlist.h
similarity index 100%
rename from src/qtui/serverlist.h
rename to dev-notes/obsolete/serverlist.h

diff --git a/src/qtui/ui/serverlistdlg.ui b/dev-notes/obsolete/serverlistdlg.ui
similarity index 100%
rename from src/qtui/ui/serverlistdlg.ui
rename to dev-notes/obsolete/serverlistdlg.ui

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 2b4b9b5..8288081 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -29,7 +29,6 @@
 #include "networkmodel.h"
 #include "buffermodel.h"
 #include "nicklistwidget.h"
-#include "serverlist.h"
 #include "settingsdlg.h"
 #include "signalproxy.h"
 #include "topicwidget.h"
@@ -54,7 +53,6 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
   setWindowIconText("Quassel IRC");
 
   statusBar()->showMessage(tr("Waiting for core..."));
-  serverListDlg = new ServerListDlg(this);
   settingsDlg = new SettingsDlg(this);
   debugConsole = new DebugConsole(this);
 }
@@ -122,10 +120,6 @@ void MainWin::init() {
   showCoreConnectionDlg(true); // autoconnect if appropriate
   //ui.actionConnectCore->activate(QAction::Trigger);
 
-  if(serverListDlg->showOnStartup()) {
-    showServerList();
-  }
-  
   // attach the BufferWidget to the PropertyMapper
   ui.bufferWidget->setModel(Client::bufferModel());
   ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
@@ -157,8 +151,7 @@ void MainWin::setupSettingsDlg() {
 void MainWin::setupMenus() {
   connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
   connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
-  connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
-  connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities()));
+  //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
   connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
   connect(ui.actionDisconnectNet, SIGNAL(triggered()), this, SLOT(disconnectFromNet()));
@@ -324,15 +317,6 @@ void MainWin::coreConnectionDlgFinished(int /*code*/) {
   //exit(1);
 }
 
-
-void MainWin::showServerList() {
-//  if(!serverListDlg) {
-//    serverListDlg = new ServerListDlg(this);
-//  }
-  serverListDlg->show();
-  serverListDlg->raise();
-}
-
 void MainWin::showSettingsDlg() {
   settingsDlg->show();
 }

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 16f1181..3a3be26 100644 (file)
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -60,7 +60,6 @@ class MainWin : public QMainWindow {
 
   private slots:
 
-    void showServerList();
     void showSettingsDlg();
     void showDebugConsole();
     void showCoreConnectionDlg(bool autoConnect = false);
@@ -91,7 +90,6 @@ class MainWin : public QMainWindow {
 
     QSystemTrayIcon *systray;
 
-    ServerListDlg *serverListDlg;
     CoreConnectDlg *coreConnectDlg;
     SettingsDlg *settingsDlg;
 

diff --git a/src/qtui/qtui.pri b/src/qtui/qtui.pri
index ba6182a..033e7be 100644 (file)
--- a/src/qtui/qtui.pri
+++ b/src/qtui/qtui.pri
@@ -3,15 +3,14 @@ QT_MOD = core gui network
 
 SRCS += bufferwidget.cpp chatline-old.cpp \
         chatwidget.cpp coreconnectdlg.cpp configwizard.cpp \
-        guisettings.cpp identities.cpp mainwin.cpp nicklistwidget.cpp qtui.cpp qtuistyle.cpp serverlist.cpp settingsdlg.cpp \
+        guisettings.cpp mainwin.cpp nicklistwidget.cpp qtui.cpp qtuistyle.cpp settingsdlg.cpp \
         topicwidget.cpp debugconsole.cpp inputwidget.cpp verticaldock.cpp
 
 HDRS += bufferwidget.h chatline-old.h chatwidget.h configwizard.h \
-        coreconnectdlg.h guisettings.h identities.h mainwin.h nicklistwidget.h qtui.h qtuistyle.h serverlist.h settingsdlg.h \
+        coreconnectdlg.h mainwin.h nicklistwidget.h qtui.h qtuistyle.h settingsdlg.h \
         topicwidget.h debugconsole.h inputwidget.h verticaldock.h
 
-FORMNAMES = identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui nickeditdlg.ui serverlistdlg.ui \
-            servereditdlg.ui coreaccounteditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \
+FORMNAMES = mainwin.ui coreaccounteditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \
             topicwidget.ui debugconsole.ui inputwidget.ui
 
 for(ui, FORMNAMES) {

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 88a59ee..a5ecfa4 100644 (file)
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -72,10 +72,6 @@
     <property name="title" >
      <string>Settings</string>
     </property>
-    <addaction name="separator" />
-    <addaction name="actionEditIdentities" />
-    <addaction name="separator" />
-    <addaction name="separator" />
     <addaction name="actionSettingsDlg" />
    </widget>
    <widget class="QMenu" name="menuViews" >
@@ -97,7 +93,6 @@
      <string>Debug</string>
     </property>
     <addaction name="actionDebug_Console" />
-    <addaction name="actionDisconnectNet" />
    </widget>
    <widget class="QMenu" name="menuCore" >
     <property name="title" >