Last fixes before submitting QuasselTopia...

diff --git a/README b/README
index d7670cf..cbf78c6 100644 (file)
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ source code available to them.
 
 Please don't hesitate to inform us about bugs you encounter (but you probably
 don't need to report obviously missing features such as a working topic bar
-or nicklist, we know that ourselves ;-)).
+or nicklist, we know that ourselves ;-)
 
 On first run of the Quassel core, it will wait for a client to connect and present a
 (preliminary) first-run wizard. This will allow you to create the database and one

diff --git a/README.Qtopia b/README.Qtopia
index 22afb49..f2b5df8 100644 (file)
--- a/README.Qtopia
+++ b/README.Qtopia
@@ -9,12 +9,20 @@ something else. We'll call it QuasselTopia here.
 QuasselTopia has only been tested with the Trolltech Greenphone. We sort of
 rely on its features being available, and we assume a screensize of 240x320.
 Of course, QuasselTopia might well run on other Qtopia-enabled devices as
-well; it's just not tested yet.
+well; it's just not tested yet. We will eventually support general Qtopia
+devices as well.
 
 Note that QuasselTopia is just the client; it can't do IRC by itself. You'll
 need a Quassel core running on some server or PC for the phone to connect to.
 
-Also, in its current state, QuasselTopia cannot do much except for connecting
+For testing purposes we have provided a core on one of our servers. You can
+connect to it for checking out QuasselTopia without having to install your own.
+The core can be reached at <apollo.mindpool.net:4242>, with user 'testuser'
+and password 'testuser'. If you can't connect, please let us know, and we'll
+restart it. You may also connect with a Quassel desktop client to this core.
+The test account will be automatically created on first run.
+
+In its current state, QuasselTopia cannot do much except for connecting
 to a core and displaying the buffers you are in. Oh, and chatting of course.
 But you cannot change any settings, create/edit identities or networks,
 you can't even connect to a network from the Greenphone. So in order to test

diff --git a/i18n/README b/i18n/README
deleted file mode 100644 (file)
index 2f35722..0000000
--- a/i18n/README
+++ /dev/null
@@ -1,4 +0,0 @@
-To sync the source with a translation file for locale $LOC, run
-> lupdate ../src -ts quassel_$LOC.ts
-
-If you add a new language, don't forget to edit i18n.qrc as well!

diff --git a/qtopia-build/quasseltopia.pro b/qtopia-build/quasseltopia.pro
index 5f26232..361903a 100644 (file)
--- a/qtopia-build/quasseltopia.pro
+++ b/qtopia-build/quasseltopia.pro
@@ -30,7 +30,7 @@ FORMS   = $$FRMS
 desktop.files=../src/qtopia/quasseltopia.desktop
 desktop.path=/apps/Applications
 #desktop.trtarget=example-nct
-desktop.hint=nct desktop
+desktop.hint=desktop
 
 pics.files=../src/images/qirc-icon.png
 pics.path=/pics/quasselirc

diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp
index 3f68fe4..baa1dc6 100644 (file)
--- a/src/qtopia/qtopiamainwin.cpp
+++ b/src/qtopia/qtopiamainwin.cpp
@@ -113,6 +113,7 @@ void QtopiaMainWin::closeEvent(QCloseEvent *event) {
 void QtopiaMainWin::setupActions() {
   showBuffersAction = toolBar->addAction(QIcon(":icon/options-hide"), tr("Show Buffers"), this, SLOT(showBufferView()));  // FIXME provide real icon
   showNicksAction = toolBar->addAction(QIcon(":icon/list"), tr("Show Nicks"), this, SLOT(showNickList()));
+  showNicksAction->setEnabled(false);
 
   QMenu *menu = new QMenu(this);
   menu->addAction(showBuffersAction);
@@ -153,6 +154,7 @@ void QtopiaMainWin::showBuffer(Buffer *b) {
   bufferViewWidget->hide();
   mainWidget->setBuffer(b);
   nickListWidget->setBuffer(b);
+  showNicksAction->setEnabled(b && b->bufferType() == Buffer::ChannelType);
 
 }
 

diff --git a/src/qtopia/topicbar.cpp b/src/qtopia/topicbar.cpp
index 51c0c91..5fd5cb0 100644 (file)
--- a/src/qtopia/topicbar.cpp
+++ b/src/qtopia/topicbar.cpp
@@ -67,7 +67,7 @@ void TopicBar::calcTextMetrics() {
     secondTextStart = fillTextStart + boundingRect.width();
     displayText = QString("%1%2%1").arg(text).arg(fillText);
     offset = 0;
-    timer->start();
+    //timer->start();  // uncomment this to get autoscroll rather than on-demand
   }
 }