Commit 54959741 authored by Peter Simonsson's avatar Peter Simonsson
Browse files

Move nickname editor into ui file

parent aaa16c69
...@@ -47,14 +47,6 @@ namespace Konversation ...@@ -47,14 +47,6 @@ namespace Konversation
mainLayout->addWidget(w); mainLayout->addWidget(w);
mainLayout->addWidget(buttonBox); mainLayout->addWidget(buttonBox);
QGroupBox* nickGroupBox = new QGroupBox(i18n("Nickname"));
verticalLayout->insertWidget(1, nickGroupBox);
QVBoxLayout* nickGroupBoxLayout = new QVBoxLayout(nickGroupBox);
nickGroupBoxLayout->setContentsMargins(0, 0, 0, 0);
m_nicknameLBox = new KEditListWidget(nickGroupBox);
nickGroupBoxLayout->addWidget(m_nicknameLBox);
m_nicknameLBox->setWhatsThis(i18n("This is your list of nicknames. A nickname is the name that other users will " m_nicknameLBox->setWhatsThis(i18n("This is your list of nicknames. A nickname is the name that other users will "
"know you by. You may use any name you desire. The first character must be a letter.\n\n" "know you by. You may use any name you desire. The first character must be a letter.\n\n"
"Since nicknames must be unique across an entire IRC network, your desired name may be " "Since nicknames must be unique across an entire IRC network, your desired name may be "
......
...@@ -54,8 +54,6 @@ namespace Konversation ...@@ -54,8 +54,6 @@ namespace Konversation
IdentityList m_identityList; IdentityList m_identityList;
IdentityPtr m_currentIdentity; IdentityPtr m_currentIdentity;
KEditListWidget* m_nicknameLBox;
KMessageWidget* m_additionalAuthInfo; KMessageWidget* m_additionalAuthInfo;
Q_DISABLE_COPY(IdentityDialog) Q_DISABLE_COPY(IdentityDialog)
......
...@@ -6,12 +6,21 @@ ...@@ -6,12 +6,21 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>331</width> <width>406</width>
<height>344</height> <height>640</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
...@@ -203,6 +212,22 @@ ...@@ -203,6 +212,22 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QGroupBox" name="nickGroupBox">
<property name="title">
<string>Nickname</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="KEditListWidget" name="m_nicknameLBox">
<property name="checkAtEntering">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="autoIdentifyGroup"> <widget class="QGroupBox" name="autoIdentifyGroup">
<property name="title"> <property name="title">
...@@ -683,6 +708,11 @@ ...@@ -683,6 +708,11 @@
<extends>QSpinBox</extends> <extends>QSpinBox</extends>
<header>kpluralhandlingspinbox.h</header> <header>kpluralhandlingspinbox.h</header>
</customwidget> </customwidget>
<customwidget>
<class>KEditListWidget</class>
<extends>QWidget</extends>
<header>keditlistwidget.h</header>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>m_identityCBox</tabstop> <tabstop>m_identityCBox</tabstop>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment