← Back to branch summary

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

« back to all changes in this revision

Viewing changes to src/statuspanel.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2009-05-15 11:24:24 UTC
  • mfrom: (1.15.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20090515112424-b74i26lciabf4qnk
Tags: 1.1.75+svn968012-1
* New upstream development snapshot:
  - Last Changed Author: hein
  - Last Changed Rev: 968012
  - Last Changed Date: 2009-05-14 21:03:55 +0300
* Update README.source.
* Use dh --quilt instead of custom patch handling, build depend on
  quilt 0.46-7~.
* Update patches to upstream changes.
* Update konversation.install: remove docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/statuspanel.cpp
19
19
#include "server.h"
20
20
 
21
21
#include <qpushbutton.h>
22
 
#include <qcombobox.h>
23
22
#include <qlabel.h>
24
23
 
25
24
#include <qtextcodec.h>
29
28
#include <klocale.h>
30
29
#include <kmessagebox.h>
31
30
#include <kvbox.h>
 
31
#include <kcombobox.h>
 
32
#include <klineedit.h>
32
33
 
33
34
 
34
35
StatusPanel::StatusPanel(QWidget* parent) : ChatWindow(parent)
48
49
    commandLineBox->setSpacing(spacing());
49
50
    commandLineBox->setMargin(0);
50
51
 
51
 
    nicknameCombobox=new QComboBox(commandLineBox);
 
52
    nicknameCombobox = new KComboBox(commandLineBox);
52
53
    nicknameCombobox->setEditable(true);
53
 
    nicknameCombobox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 
54
    nicknameCombobox->setSizeAdjustPolicy(KComboBox::AdjustToContents);
 
55
    KLineEdit* nicknameComboboxLineEdit = qobject_cast<KLineEdit*>(nicknameCombobox->lineEdit());
 
56
    if (nicknameComboboxLineEdit) nicknameComboboxLineEdit->setClearButtonShown(false);
54
57
    nicknameCombobox->setWhatsThis(i18n("<qt><p>This shows your current nick, and any alternatives you have set up.  If you select or type in a different nickname, then a request will be sent to the IRC server to change your nick.  If the server allows it, the new nickname will be selected.  If you type in a new nickname, you need to press 'Enter' at the end.</p><p>You can add change the alternative nicknames from the <em>Identities</em> option in the <em>File</em> menu.</p></qt>"));
55
58
 
56
59
    awayLabel=new QLabel(i18n("(away)"), commandLineBox);