← Back to branch summary

~ubuntu-branches/ubuntu/raring/konversation/raring

« back to all changes in this revision

Viewing changes to src/config/settingsdialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-08-12 10:48:48 UTC
  • Revision ID: james.westby@ubuntu.com-20100812104848-rddr7mdhfcs31p39
Tags: 1.3.1-1ubuntu3
Remove debian-changes-1.3.1-1ubuntu2 which reverted the other
patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/config/settingsdialog.cpp
10
10
  Copyright (C) 2006 Eike Hein <hein@kde.org>
11
11
*/
12
12
 
 
13
#include "config-konversation.h"
13
14
#include "settingsdialog.h"
14
15
#include "configdialog.h"
15
16
#include "preferences.h"
36
37
 
37
38
#include <config-konversation.h>
38
39
 
 
40
#ifdef HAVE_INDICATEQT
 
41
#include "ui_messageindicator_config.h"
 
42
#endif
 
43
 
39
44
 
40
45
KonviSettingsDialog::KonviSettingsDialog( QWidget *parent) :
41
46
    KonviConfigDialog( parent, "settings", Preferences::self(), KPageDialog::Tree)
179
184
  //no modified connection needed - it's all kcfg widgets
180
185
  m_pages.append(m_confOSDWdg);
181
186
 
 
187
  #ifdef HAVE_INDICATEQT
 
188
  //Notification/Message Indicator
 
189
  Ui::MessageIndicator_Config confMessageIndicator;
 
190
  w = new QWidget();
 
191
  confMessageIndicator.setupUi(w);
 
192
  addPage(w, notificationGroup, "mail-unread-new", i18n("Message Indicator"));
 
193
  #endif
 
194
 
182
195
  //Notification/Warning Dialogs
183
196
  m_confWarningsWdg = new Warnings_Config( this, "Warnings" );
184
197
  addPage ( m_confWarningsWdg, notificationGroup, "dialog-warning", i18n("Warning Dialogs") );