← Back to branch summary

~ubuntu-branches/ubuntu/karmic/psi/karmic

« back to all changes in this revision

Viewing changes to src/adduserdlg.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2008-08-28 18:46:52 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080828184652-iiik12dl91nq7cdi
Tags: 0.12-2
http://bugs.debian.org/494352
Uploading to unstable (Closes: Bug#494352)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/adduserdlg.cpp
83
83
 
84
84
        QString str = tr("<None>");
85
85
        cb_group->insertItem(str);
86
 
        cb_group->insertStringList(groups);
 
86
        QStringList temp=groups;
 
87
        temp.sort();
 
88
        cb_group->insertStringList(temp);
87
89
        str = ContactView::tr("Hidden");
88
90
        if(!groups.contains(str))
89
91
                cb_group->insertItem(str);
91
93
 
92
94
        pb_add->setDefault(true);
93
95
        connect(pb_add, SIGNAL(clicked()), SLOT(ok()));
94
 
        connect(pb_close, SIGNAL(clicked()), SLOT(reject()));
 
96
        connect(pb_close, SIGNAL(clicked()), SLOT(cancel()));
95
97
        connect(pb_transGet, SIGNAL(clicked()), SLOT(getTransID()));
96
98
 
97
99
        connect(tb_vCard, SIGNAL(clicked()), SLOT(getVCardActivated()));
123
125
        return Jid(le_jid->text().stripWhiteSpace());
124
126
}
125
127
 
 
128
void AddUserDlg::cancel()
 
129
{
 
130
        le_jid->setText("");
 
131
        le_nick->setText("");
 
132
        cb_group->setCurrentItem(0);
 
133
        reject();
 
134
}
 
135
 
126
136
void AddUserDlg::ok()
127
137
{
128
138
        if(le_jid->text().isEmpty()) {
136
146
 
137
147
        QString gname = cb_group->currentText();
138
148
        QStringList list;
139
 
        if(gname != tr("<None>"))
 
149
        if(gname != tr("<None>")) {
140
150
                list += gname;
 
151
        }
141
152
 
142
153
        add(jid(), le_nick->text(), list, ck_authreq->isChecked());
143
154
 
144
155
        QMessageBox::information(this, tr("Add User: Success"), tr("Added %1 to your roster.").arg(jid().full()));
145
156
        le_jid->setText("");
146
157
        le_nick->setText("");
147
 
        if(ck_close->isChecked())
 
158
        if(ck_close->isChecked()) {
 
159
                cb_group->setCurrentItem(0);
148
160
                accept();
149
 
        else {
 
161
        } else {
150
162
                le_jid->setFocus();
151
163
        }
152
164
}
280
292
        if(jt->success()) {
281
293
                if ( !jt->vcard().nickName().isEmpty() )
282
294
                        le_nick->setText( jt->vcard().nickName() );
 
295
                else if( !jt->vcard().fullName().isEmpty() )
 
296
                        le_nick->setText( jt->vcard().fullName() );
283
297
        }
284
298
}
285
299