← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/options/opt_iconset.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2006-01-20 00:20:36 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060120002036-7nw6yo6totip0ee5
Tags: 0.10-2
http://bugs.debian.org/327748
http://bugs.debian.org/204416
* Added upstream changelog (Closes: Bug#327748)
* Mention --no-gpg and --no-gpg-agent in manpage (Closes: Bug#204416)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/options/opt_iconset.cpp
28
28
 
29
29
static void isDetails(const Iconset &is, QWidget *parent)
30
30
{
31
 
        IconsetDetailsDlg *isd = new IconsetDetailsDlg(parent, "IconsetDetailsDlg", true);
 
31
        IconsetDetailsDlg *isd = new IconsetDetailsDlg(parent, "IconsetDetailsDlg", false, QWidget::WDestructiveClose);
32
32
        isd->setIconset(is);
33
 
        isd->exec();
34
 
        delete isd;
 
33
        isd->show();
35
34
}
36
35
 
37
36
static QStringList dirs;
264
263
//----------------------------------------------------------------------------
265
264
 
266
265
OptionsTabIconsetSystem::OptionsTabIconsetSystem(QObject *parent)
267
 
: OptionsTab(parent, "iconset_system", "", tr("System Iconset"), tr("Select the system iconset"), "psi/info")
 
266
: OptionsTab(parent, "iconset_system", "", tr("System Icons"), tr("Select the system iconset"))
268
267
{
269
268
        w = 0;
270
269
        thread = 0;
417
416
//----------------------------------------------------------------------------
418
417
 
419
418
OptionsTabIconsetEmoticons::OptionsTabIconsetEmoticons(QObject *parent)
420
 
: OptionsTab(parent, "iconset_emoticons", "", tr("Emoticons"), tr("Select your emoticon iconsets"), "psi/smile")
 
419
: OptionsTab(parent, "iconset_emoticons", "", tr("Emoticons"), tr("Select your emoticon iconsets"))
421
420
{
422
421
        w = 0;
423
422
        thread = 0;
607
606
//----------------------------------------------------------------------------
608
607
 
609
608
OptionsTabIconsetRoster::OptionsTabIconsetRoster(QObject *parent)
610
 
: OptionsTab(parent, "iconset_roster", "", tr("Roster Iconsets"), tr("Select iconsets for your roster"), "psi/roster")
 
609
: OptionsTab(parent, "iconset_roster", "", tr("Roster Icons"), tr("Select iconsets for your roster"))
611
610
{
612
611
        w = 0;
613
612
        thread = 0;