← Back to branch summary

~ubuntu-branches/ubuntu/precise/konversation/precise-updates

« back to all changes in this revision

Viewing changes to src/config/settingsdialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2010-08-07 00:55:26 UTC
  • mfrom: (2.2.16 sid)
  • Revision ID: james.westby@ubuntu.com-20100807005526-12qfordi35jebwvf
Tags: 1.3.1-1ubuntu1
https://launchpad.net/bugs/614610
* Merge from Debian Unstable, remaining changes: (LP: #614610)
  - Add kubuntu_01_default_channels.diff, disable debian_channel.diff
  - Keep message indicator patches
  - Build-Depends on libindicator-dev
  - Add export KUBUNTU_DESKTOP_POT=extragear-network_konversation
  - Keep VCS Bazaar fields

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"
14
13
#include "settingsdialog.h"
15
14
#include "configdialog.h"
16
15
#include "preferences.h"
37
36
 
38
37
#include <config-konversation.h>
39
38
 
40
 
#ifdef HAVE_INDICATEQT
41
 
#include "ui_messageindicator_config.h"
42
 
#endif
43
 
 
44
39
 
45
40
KonviSettingsDialog::KonviSettingsDialog( QWidget *parent) :
46
41
    KonviConfigDialog( parent, "settings", Preferences::self(), KPageDialog::Tree)
184
179
  //no modified connection needed - it's all kcfg widgets
185
180
  m_pages.append(m_confOSDWdg);
186
181
 
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
 
 
195
182
  //Notification/Warning Dialogs
196
183
  m_confWarningsWdg = new Warnings_Config( this, "Warnings" );
197
184
  addPage ( m_confWarningsWdg, notificationGroup, "dialog-warning", i18n("Warning Dialogs") );