← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde-baseapps/quantal

« back to all changes in this revision

Viewing changes to dolphin/src/settings/kcm/kcmdolphingeneral.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-05-25 17:26:17 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20120525172617-xr9bzhlugldbflvq
Tags: 4:4.8.80a-0ubuntu1
* Merge with debian git, remainging changes:
  - keep breaks/replaces
  - keep symbol files
  - keep kubuntu patches
  - dolphin suggests and not recommends ruby
  - add kfind, konsole and kompare to dolphin suggests
* konq-plugins breaks/replaces kde-baseapps-data << 4:4.8.80

* Drop squence numbers from kubuntu patches 

* New upstream beta release
  - refresh kubuntu_fix_systemsettings_about_me.diff
  - add new doc images to {konqueror,dolphin}.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
dolphin/src/settings/kcm/kcmdolphingeneral.cpp
27
27
 
28
28
#include <settings/general/behaviorsettingspage.h>
29
29
#include <settings/general/previewssettingspage.h>
30
 
#include <settings/general/contextmenusettingspage.h>
 
30
#include <settings/general/confirmationssettingspage.h>
31
31
 
32
32
#include <QDir>
33
33
#include <QVBoxLayout>
61
61
    tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews"));
62
62
    connect(previewsPage, SIGNAL(changed()), this, SLOT(changed()));
63
63
 
64
 
    // initialize 'Context Menu' tab
65
 
    ContextMenuSettingsPage *contextMenuPage = new ContextMenuSettingsPage(tabWidget);
66
 
    tabWidget->addTab(contextMenuPage,  i18nc("@title:tab Context Menu settings", "Context Menu"));
67
 
    connect(contextMenuPage, SIGNAL(changed()), this, SLOT(changed()));
 
64
    // initialize 'Confirmations' tab
 
65
    ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget);
 
66
    tabWidget->addTab(confirmationsPage,  i18nc("@title:tab Confirmations settings", "Confirmations"));
 
67
    connect(confirmationsPage, SIGNAL(changed()), this, SLOT(changed()));
68
68
 
69
69
    m_pages.append(behaviorPage);
70
70
    m_pages.append(previewsPage);
71
 
    m_pages.append(contextMenuPage);
 
71
    m_pages.append(confirmationsPage);
72
72
 
73
73
    topLayout->addWidget(tabWidget, 0, 0);
74
74
}