More minor changes while playing around. Enter /c now in the channel widget to connec...

We really need network settings, me thinks.

diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp
index 9cc0576..b271ec4 100644 (file)
--- a/gui/channelwidget.cpp
+++ b/gui/channelwidget.cpp
@@ -26,7 +26,8 @@
 
 ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
   ui.setupUi(this);
 
 ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
   ui.setupUi(this);

-  //ui.lineEdit->setText("foobar");
+  ui.inputEdit->grabKeyboard();
+  ui.inputEdit->setFocus();

 
 /*  //ui.splitter->
   ui.textBrowser->setHtml("[17:21] <em>--> Dante has joined #quassel (~hurz@p1af2242.dip.t-dialin.net)</em><br>"
 
 /*  //ui.splitter->
   ui.textBrowser->setHtml("[17:21] <em>--> Dante has joined #quassel (~hurz@p1af2242.dip.t-dialin.net)</em><br>"


@@ -50,11 +51,13 @@ ChannelWidget::ChannelWidget(QWidget *parent) : QWidget(parent) {
   connect(guiProxy, SIGNAL(csCoreMessage(QString)), this, SLOT(lineReceived(QString)));
 
   //emit requestConnect("irc.scortum.moep.net", 6668);
   connect(guiProxy, SIGNAL(csCoreMessage(QString)), this, SLOT(lineReceived(QString)));
 
   //emit requestConnect("irc.scortum.moep.net", 6668);

-  emit requestConnect("irc.quakenet.org", 6668);
+  //emit requestConnect("irc.quakenet.org", 6668);

 }
 
 void ChannelWidget::enterPressed() {
 }
 
 void ChannelWidget::enterPressed() {

-  emit inputLine(ui.inputEdit->text());
+  QString l = ui.inputEdit->text();
+  if(l == "/c") emit requestConnect("irc.quakenet.org", 6668);
+  else emit inputLine(ui.inputEdit->text());

   ui.inputEdit->clear();
 }
 
   ui.inputEdit->clear();
 }
 

diff --git a/gui/channelwidget.ui b/gui/channelwidget.ui
index f5bb9d8..734d8f9 100644 (file)
--- a/gui/channelwidget.ui
+++ b/gui/channelwidget.ui
@@ -17,7 +17,7 @@
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >

-    <number>9</number>
+    <number>1</number>

    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
    <property name="spacing" >
     <number>6</number>

diff --git a/gui/mainwin.cpp b/gui/mainwin.cpp
index 66b5754..49196f8 100644 (file)
--- a/gui/mainwin.cpp
+++ b/gui/mainwin.cpp
@@ -40,8 +40,8 @@ MainWin::MainWin() : QMainWindow() {
   move(s.value("MainWinPos", QPoint(50, 50)).toPoint());
   s.endGroup();
 
   move(s.value("MainWinPos", QPoint(50, 50)).toPoint());
   s.endGroup();
 

-  //workspace = new QWorkspace(this);
-  //setCentralWidget(workspace);
+  workspace = new QWorkspace(this);
+  setCentralWidget(workspace);

   //ChannelWidget *cw = new ChannelWidget(this);
   //workspace->addWindow(cw);
   //setCentralWidget(cw);
   //ChannelWidget *cw = new ChannelWidget(this);
   //workspace->addWindow(cw);
   //setCentralWidget(cw);


@@ -56,7 +56,9 @@ MainWin::MainWin() : QMainWindow() {
   //identitiesAct = settingsMenu->addAction(QIcon(":/default/identity.png"), tr("&Identities..."), serverListDlg, SLOT(editIdentities()));
   //showServerList();
   ChannelWidget *cw = new ChannelWidget(this);
   //identitiesAct = settingsMenu->addAction(QIcon(":/default/identity.png"), tr("&Identities..."), serverListDlg, SLOT(editIdentities()));
   //showServerList();
   ChannelWidget *cw = new ChannelWidget(this);

-  setCentralWidget(cw);
+  //setCentralWidget(cw);
+  workspace->addWindow(cw);
+  cw->showMaximized();

   //setEnabled(true);
   statusBar()->showMessage(tr("Ready."));
 }
   //setEnabled(true);
   statusBar()->showMessage(tr("Ready."));
 }

diff --git a/network/server.cpp b/network/server.cpp
index e008170..7f8b705 100644 (file)
--- a/network/server.cpp
+++ b/network/server.cpp
@@ -72,7 +72,7 @@ void Server::socketError( QAbstractSocket::SocketError err ) {
 
 void Server::socketConnected( ) {
   qDebug() << "Socket connected!";
 
 void Server::socketConnected( ) {
   qDebug() << "Socket connected!";

-  putRawLine("NICK :Sput|QuasselDev");
+  putRawLine("NICK :QuasselDev");

   putRawLine("USER Sputnick 8 * :Using Quassel IRC (WiP Version)");
 }
 
   putRawLine("USER Sputnick 8 * :Using Quassel IRC (WiP Version)");
 }