← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/knetworkmanager/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_03_static_config.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2008-07-14 14:05:44 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080714140544-yjhxgrdwartk3kx7
Tags: 1:0.7svn830754-0ubuntu1
New upstream snapshot

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_03_static_config.patch
1
 
diff -Nur knetworkmanager-0.2~r674918/knetworkmanager/src/knetworkmanager-tray.cpp knetworkmanager-0.2~r674918.new/knetworkmanager/src/knetworkmanager-tray.cpp
2
 
--- knetworkmanager-0.2~r674918/knetworkmanager/src/knetworkmanager-tray.cpp    2007-06-13 16:16:18.000000000 +0200
3
 
+++ knetworkmanager-0.2~r674918.new/knetworkmanager/src/knetworkmanager-tray.cpp        2007-06-15 16:58:00.000000000 +0200
4
 
@@ -259,6 +259,14 @@
5
 
 }
6
 
 
7
 
 void
8
 
+Tray::staticConfiguration ()
9
 
+{
10
 
+  KProcess *proc = new KProcess;
11
 
+  *proc << "kdesu" << "kcmshell kcm_knetworkconfmodule";
12
 
+  proc->start();
13
 
+}
14
 
+
15
 
+void
16
 
 Tray::configureVPN ()
17
 
 {
18
 
        VPNConnectionsDialog* mvc;
19
 
@@ -815,6 +823,9 @@
20
 
                }
21
 
        }
22
 
 
23
 
+       KAction* staticAction = actionCollection()->action("static_configuration");
24
 
+       staticAction->plug(menu);
25
 
+
26
 
        /* build-up the ``Options'' sub menu if NM is running */
27
 
        if (state->isNetworkManagerRunning () && !state->isWaitingForKey()) {
28
 
                if (!separated)
29
 
@@ -1152,6 +1163,10 @@
30
 
        connectHiddenAction   = new KAction (i18n ("Connect to Other Wireless Network..."),
31
 
                                             SmallIcon ("wireless",  QIconSet::Automatic), 0,
32
 
                                             this, SLOT (connectHiddenNetwork ()), actionCollection (), "connect_hidden");
33
 
+
34
 
+       staticConfigurationAction   = new KAction (i18n ("Manual Configuration..."),
35
 
+                                            SmallIcon ("knetworkconf",  QIconSet::Automatic), 0,
36
 
+                                            this, SLOT (staticConfiguration ()), actionCollection (), "static_configuration");
37
 
        
38
 
        configureVPNAction = new KAction (i18n ("Configure VPN..."),
39
 
                                          SmallIcon ("configure",  QIconSet::Automatic), 0,
40
 
diff -Nur knetworkmanager-0.2~r674918/knetworkmanager/src/knetworkmanager-tray.h knetworkmanager-0.2~r674918.new/knetworkmanager/src/knetworkmanager-tray.h
41
 
--- knetworkmanager-0.2~r674918/knetworkmanager/src/knetworkmanager-tray.h      2007-06-13 16:16:18.000000000 +0200
42
 
+++ knetworkmanager-0.2~r674918.new/knetworkmanager/src/knetworkmanager-tray.h  2007-06-15 16:59:40.000000000 +0200
43
 
@@ -109,6 +109,7 @@
44
 
          ~Tray ();
45
 
 
46
 
          KAction* connectHiddenAction;
47
 
+         KAction* staticConfigurationAction;
48
 
          KAction* configureVPNAction;
49
 
          KAction* disconnectVPNAction;
50
 
          KAction* configureDialUpAction;
51
 
@@ -152,6 +153,7 @@
52
 
        public slots:
53
 
          void updateTooltip          (void);
54
 
          void connectHiddenNetwork   (void);
55
 
+         void staticConfiguration    (void);
56
 
          void configureVPN           (void);
57
 
          void disconnectVPN          (void);
58
 
          void configureDialUp        (void);