← Back to branch summary

~ubuntu-branches/ubuntu/karmic/mumble/karmic-updates

« back to all changes in this revision

Viewing changes to src/mumble/NetworkConfig.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Patrick Matthäi, Patrick Matthäi, Thorvald Natvig
  • Date: 2009-02-04 10:32:16 UTC
  • mfrom: (1.2.1 upstream) (4.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090204103216-vqx5fmlruwzn3uh2
http://bugs.debian.org/513119
[ Patrick Matthäi ]
* Add a mumble-dbg package, which contains the debugging symbols of mumble
  and mumble-server.
* Move swedish translation debian/sv.po to debian/po/sv.po.
  This was a bad error of mine.
* Remove debian/patches and dpatch, everything has been merged by upstream.

[ Thorvald Natvig ]
* New upstream release.
  Closes: #513119
* Added Spanish translation from Álvaro M. Recio
* Synchronized copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mumble/NetworkConfig.cpp
1
 
/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
2
 
   Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk>
 
1
/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
 
2
   Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk>
3
3
 
4
4
   All rights reserved.
5
5
 
68
68
 
69
69
        qleUsername->setText(r.qsProxyUsername);
70
70
        qlePassword->setText(r.qsProxyPassword);
 
71
 
 
72
        loadCheckBox(qcbAutoUpdate, r.bUpdateCheck);
 
73
        loadCheckBox(qcbUsage, r.bUsage);
71
74
}
72
75
 
73
76
void NetworkConfig::save() const {
79
82
        s.usProxyPort = qlePort->text().toUShort();
80
83
        s.qsProxyUsername = qleUsername->text();
81
84
        s.qsProxyPassword = qlePassword->text();
 
85
 
 
86
        s.bUpdateCheck=qcbAutoUpdate->isChecked();
 
87
        s.bUsage=qcbUsage->isChecked();
82
88
}
83
89
 
84
90
static QNetworkProxy::ProxyType local_to_qt_proxy(Settings::ProxyType pt) {
130
136
bool NetworkConfig::expert(bool b) {
131
137
        qcbTcpMode->setVisible(b);
132
138
        qgbProxy->setVisible(b);
 
139
        qcbUsage->setVisible(b);
133
140
        return true;
134
141
}
135
142