← Back to branch summary

~ubuntu-branches/ubuntu/precise/networkmanagement/precise

« back to all changes in this revision

Viewing changes to libs/ui/connectioneditor.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-23 14:00:13 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20111023140013-e38hdzybcg6zndrk
Tags: 0.9~svngit.nm09.20111023.ff842e-0ubuntu1
* New upstream snapshot.
* Drop all patches, merged upstream.
* Add kubuntu_add_subdirectory_po.diff to build the translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/ui/connectioneditor.cpp
65
65
 
66
66
Knm::Connection *ConnectionEditor::editConnection(Knm::Connection::Type type, const QVariantList &args)
67
67
{
68
 
    KDialog configDialog(0);
 
68
    QWidget *parentWidget = qobject_cast<QWidget*>(parent());
 
69
    KDialog configDialog(parentWidget);
69
70
    configDialog.setCaption(i18nc("Edit connection dialog caption", "Edit Network Connection"));
70
71
    configDialog.setWindowIcon(KIcon("networkmanager"));
 
72
    configDialog.setWindowModality(Qt::WindowModal);
71
73
 
72
74
    ConnectionPreferences * cprefs = editorForConnectionType(false, &configDialog, type, args);
73
75
    connect(cprefs, SIGNAL(valid(bool)), &configDialog, SLOT(enableButtonOk(bool)));
85
87
 
86
88
Knm::Connection *ConnectionEditor::editConnection(Knm::Connection *con)
87
89
{
88
 
 
89
90
    Knm::Connection *cprefsCon = NULL;
90
 
    KDialog configDialog(0);
 
91
    QWidget *parentWidget = qobject_cast<QWidget*>(parent());
 
92
    KDialog configDialog(parentWidget);
91
93
    configDialog.setCaption(i18nc("Edit connection dialog caption", "Edit Network Connection"));
92
94
    configDialog.setWindowIcon(KIcon("networkmanager"));
 
95
    configDialog.setWindowModality(Qt::WindowModal);
93
96
 
94
97
    ConnectionPreferences * cprefs = editorForConnectionType(false, &configDialog, con);
95
98
    connect(cprefs, SIGNAL(valid(bool)), &configDialog, SLOT(enableButtonOk(bool)));
117
120
Knm::Connection *ConnectionEditor::createConnection(bool useDefaults, Knm::Connection::Type type, const QVariantList &otherArgs, const bool autoAccept)
118
121
{
119
122
    Knm::Connection *cprefsCon = NULL;
120
 
    KDialog configDialog(0);
 
123
    QWidget *parentWidget = qobject_cast<QWidget*>(parent());
 
124
    KDialog configDialog(parentWidget);
121
125
    configDialog.setCaption(i18nc("Add connection dialog caption", "Add Network Connection"));
122
126
    configDialog.setWindowIcon(KIcon("networkmanager"));
 
127
    configDialog.setWindowModality(Qt::WindowModal);
123
128
 
124
129
    QVariantList args;
125
130