← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/viewer/viewcontainer.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2009-05-19 09:44:08 UTC
  • mfrom: (1.16.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20090519094408-yi3yv1v4zzbsu2nx
Tags: 1.1.75+svn969816-1
* New upstream development snapshot:
  - Last Changed Author: tjmchenry
  - Last Changed Rev: 969816
  - Last Changed Date: 2009-05-19 04:45:54 +0300
  - Translations as of Tue, 19 May 2009 09:21:13 are included.
* Update download URL in debian/copyright.
* Update Debian menu icons.
* Update konversation.install: install translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/viewer/viewcontainer.cpp
1803
1803
 
1804
1804
void ViewContainer::findNextText()
1805
1805
{
1806
 
    if (m_searchView) m_searchView->getTextView()->searchAgain();
 
1806
    if (m_searchView) m_searchView->getTextView()->searchNext();
1807
1807
}
1808
1808
 
1809
1809
void ViewContainer::findPrevText()
1877
1877
void ViewContainer::insertIRCColor()
1878
1878
{
1879
1879
    // TODO FIXME
1880
 
    IRCColorChooser dlg(m_window);
 
1880
    QPointer<IRCColorChooser> dlg = new IRCColorChooser(m_window);
1881
1881
 
1882
 
    if (dlg.exec() == KDialog::Accepted) m_frontView->appendInputText(dlg.color(), true/*fromCursor*/);
 
1882
    if (dlg->exec() == KDialog::Accepted)
 
1883
    {
 
1884
        m_frontView->appendInputText(dlg->color(), true/*fromCursor*/);
 
1885
    }
 
1886
    delete dlg;
1883
1887
}
1884
1888
 
1885
1889
void ViewContainer::clearViewLines()
2179
2183
    if (!server)
2180
2184
        return;
2181
2185
 
2182
 
    Konversation::JoinChannelDialog dlg(server, m_window);
 
2186
    QPointer<Konversation::JoinChannelDialog> dlg = new Konversation::JoinChannelDialog(server, m_window);
2183
2187
 
2184
 
    if (dlg.exec() == QDialog::Accepted)
2185
 
        server->sendJoinCommand(dlg.channel(), dlg.password());
 
2188
    if (dlg->exec() == QDialog::Accepted)
 
2189
    {
 
2190
        server->sendJoinCommand(dlg->channel(), dlg->password());
 
2191
    }
 
2192
    delete dlg;
2186
2193
}
2187
2194
 
2188
2195
void ViewContainer::connectionStateChanged(Server* server, Konversation::ConnectionState state)
2395
2402
    {
2396
2403
        KMessageBox::information(m_window,
2397
2404
            i18n(
2398
 
            "The channel list can only be opened from a "
2399
 
            "query, channel or status window to find out, "
2400
 
            "which server this list belongs to."
 
2405
            "To know which server to display the channel list "
 
2406
            "for, the list can only be opened from a "
 
2407
            "query, channel or status window."
2401
2408
            ),
2402
2409
            i18n("Channel List"),
2403
2410
            "ChannelListNoServerSelected");