mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Indent, changelog and submodule update

Browse Source
This commit is contained in:
Thorvald Natvig 2009-07-18 21:17:55 +02:00
parent 0e1b3f3bbb
commit 417e9db488
7 changed files with 76 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CHANGES
View File

@ -1,3 +1,41 @@
2009-07-18
Stefan Hacker <dd0t@users.sourceforge.net>
0e1b3f3 Improve forced shutdown behavior
Thorvald Natvig <slicer@users.sourceforge.net>
947a420 Certhash-based ACL, and creators have full write on created
channels
2009-07-17
Stefan Hacker <dd0t@users.sourceforge.net>
a89e7c6 Added layout default value
cc57d13 Layout presets
fb8ca85 Removed wrong tooltip
Thorvald Natvig <slicer@users.sourceforge.net>
f1c926e Quiet the Avahi warnings for now, and make the static murmur
compile with bonjour
Bartek "stranded" Sumowski <sumowski@gmail.com>
95fd031 Bonjour installer strings in Polish
2009-07-16
Stefan Hacker <dd0t@users.sourceforge.net>
b236e4c Allow cancel while bj resolving
aa82976 Update German installer translation
Hengqing Hu <esrms@users.sourceforge.net>
9555bf6 Simplified Chinese Installer
Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
b3fa0e5 * fix german translation
Thorvald Natvig <slicer@users.sourceforge.net>
43ac694 Bonjour download in installer
477a065 Grey out LAN tab with suitable tooltip if empty
45705e2 Re-add variable buffer to WASAPI; hardware-reported minimums
are often false
2009-07-15
Stefan Hacker <dd0t@users.sourceforge.net>
a89c5e2 Switch bonjour identifier to _mumble._tcp
@ -52,7 +90,7 @@
96fe83c Link QtSvg. I really mean it.
8483892 Explicitly link svg
Bartek Sumowksi <sumowski@gmail.com>
Bartek "stranded" Sumowski <sumowski@gmail.com>
0afb4c7 Updated Polish installer
2009-07-10

4
installer/MumbleSimpChinese.nsh
View File

@ -31,8 +31,8 @@ LangString DESC_SectionMurmur ${LANG_SIMPCHINESE} "Mumble 服务器端包含所
LangString DESC_SectionDebug ${LANG_SIMPCHINESE} "Mumble 和 Murmur 的符号文件。仅用于调试。"
; Uninstall sections
LangString MUMBLE_UNSEC_BASE ${LANG_SIMPCHINESE} "Mumble 和 Murmur"
LangString MUMBLE_UNSEC_ALL ${LANG_SIMPCHINESE} "个人偏好和数据库"
LangString MUMBLE_UNSEC_BASE ${LANG_SIMPCHINESE} "Mumble 和 Murmur"
LangString MUMBLE_UNSEC_ALL ${LANG_SIMPCHINESE} "个人偏好和数据库"
LangString DESC_SectionUninstBase ${LANG_SIMPCHINESE} "卸载 Mumble 和 Murmur 应用程序"
LangString DESC_SectionUninstAll ${LANG_SIMPCHINESE} "完全卸载 Mumble 和 Murmur， 包括个人偏好和数据库。"

8
src/mumble/ConnectDialog.cpp
View File

@ -113,13 +113,13 @@ ConnectDialog::ConnectDialog(QWidget *p) : QDialog(p) {
} else {
qtwTab->setTabToolTip(2, tr("No LAN servers found."));
connect(g.bc->bsbBrowser, SIGNAL(error(DNSServiceErrorType)),
this, SLOT(onLanBrowseError(DNSServiceErrorType)));
this, SLOT(onLanBrowseError(DNSServiceErrorType)));
connect(g.bc->bsbBrowser, SIGNAL(currentBonjourRecordsChanged(const QList<BonjourRecord> &)),
this, SLOT(onUpdateLanList(const QList<BonjourRecord> &)));
this, SLOT(onUpdateLanList(const QList<BonjourRecord> &)));
connect(g.bc->bsrResolver, SIGNAL(error(DNSServiceErrorType)),
this, SLOT(onLanResolveError(DNSServiceErrorType)));
this, SLOT(onLanResolveError(DNSServiceErrorType)));
connect(g.bc->bsrResolver, SIGNAL(bonjourRecordResolved(const QHostInfo &, int)),
this, SLOT(accept(const QHostInfo &, int)));
this, SLOT(accept(const QHostInfo &, int)));
onUpdateLanList(g.bc->bsbBrowser->currentRecords());
}
#else

18
src/mumble/LookConfig.cpp
View File

@ -82,11 +82,14 @@ void LookConfig::load(const Settings &r) {
// Load Layout checkbox state
switch (r.iWindowLayout) {
case Settings::LayoutClassic: qrbLClassic->setChecked(true);
case Settings::LayoutClassic:
qrbLClassic->setChecked(true);
break;
case Settings::LayoutStacked: qrbLStacked->setChecked(true);
case Settings::LayoutStacked:
qrbLStacked->setChecked(true);
break;
case Settings::LayoutHybrid: qrbLHybrid->setChecked(true);
case Settings::LayoutHybrid:
qrbLHybrid->setChecked(true);
break;
case Settings::LayoutCustom:
default:
@ -139,14 +142,11 @@ void LookConfig::save() const {
// Save Layout radioboxes state
if (qrbLClassic->isChecked()) {
s.iWindowLayout = Settings::LayoutClassic;
}
else if (qrbLStacked->isChecked()) {
} else if (qrbLStacked->isChecked()) {
s.iWindowLayout = Settings::LayoutStacked;
}
else if (qrbLHybrid->isChecked()) {
} else if (qrbLHybrid->isChecked()) {
s.iWindowLayout = Settings::LayoutHybrid;
}
else {
} else {
s.iWindowLayout = Settings::LayoutCustom;
}

36
src/mumble/MainWindow.cpp
View File

@ -525,28 +525,28 @@ void MainWindow::setupView(bool toggle_minimize) {
int iTmp = g.s.iWindowLayout;
switch (iTmp) {
case Settings::LayoutClassic:
removeDockWidget(qdwLog);
addDockWidget(Qt::LeftDockWidgetArea, qdwLog);
qdwLog->show();
splitDockWidget(qdwLog, qdwChat, Qt::Vertical);
break;
removeDockWidget(qdwLog);
addDockWidget(Qt::LeftDockWidgetArea, qdwLog);
qdwLog->show();
splitDockWidget(qdwLog, qdwChat, Qt::Vertical);
break;
case Settings::LayoutStacked:
removeDockWidget(qdwLog);
addDockWidget(Qt::BottomDockWidgetArea, qdwLog);
qdwLog->show();
splitDockWidget(qdwLog, qdwChat, Qt::Vertical);
break;
removeDockWidget(qdwLog);
addDockWidget(Qt::BottomDockWidgetArea, qdwLog);
qdwLog->show();
splitDockWidget(qdwLog, qdwChat, Qt::Vertical);
break;
case Settings::LayoutHybrid:
removeDockWidget(qdwLog);
addDockWidget(Qt::LeftDockWidgetArea, qdwLog);
qdwLog->show();
removeDockWidget(qdwChat);
addDockWidget(Qt::BottomDockWidgetArea, qdwChat);
if (g.s.bShowChatbar) qdwChat->show();
break;
removeDockWidget(qdwLog);
addDockWidget(Qt::LeftDockWidgetArea, qdwLog);
qdwLog->show();
removeDockWidget(qdwChat);
addDockWidget(Qt::BottomDockWidgetArea, qdwChat);
if (g.s.bShowChatbar) qdwChat->show();
break;
default:
iTmp = Settings::LayoutCustom;
break;
break;
}
g.s.iWindowLayout = iTmp;

4
src/mumble/main.cpp
View File

@ -63,8 +63,8 @@ extern char *os_lang;
class QAppMumble:public QApplication {
public:
QAppMumble(int & argc, char ** argv) : QApplication(argc, argv) {}
void commitData(QSessionManager&);
QAppMumble(int & argc, char ** argv) : QApplication(argc, argv) {}
void commitData(QSessionManager&);
};
void QAppMumble::commitData(QSessionManager &manager) {

4
src/murmur/Messages.cpp
View File

@ -625,7 +625,7 @@ void Server::msgChannelState(ServerUser *uSource, MumbleProto::ChannelState &msg
ChanACL *a = new ChanACL(c);
a->bApplyHere=true;
a->bApplySubs=false;
if (uSource->iId >= 0)
if (uSource->iId >= 0)
a->iUserId=uSource->iId;
else
a->qsGroup=QLatin1Char('$') + uSource->qsHash;
@ -977,7 +977,7 @@ void Server::msgACL(ServerUser *uSource, MumbleProto::ACL &msg) {
a = new ChanACL(c);
a->bApplyHere=true;
a->bApplySubs=false;
if (uSource->iId >= 0)
if (uSource->iId >= 0)
a->iUserId=uSource->iId;
else
a->qsGroup=QLatin1Char('$') + uSource->qsHash;