diff --git a/CHANGES b/CHANGES index 63dc75bbd..35574050b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,41 @@ +2009-07-18 + Stefan Hacker + 0e1b3f3 Improve forced shutdown behavior + + Thorvald Natvig + 947a420 Certhash-based ACL, and creators have full write on created + channels + +2009-07-17 + Stefan Hacker + a89e7c6 Added layout default value + cc57d13 Layout presets + fb8ca85 Removed wrong tooltip + + Thorvald Natvig + f1c926e Quiet the Avahi warnings for now, and make the static murmur + compile with bonjour + + Bartek "stranded" Sumowski + 95fd031 Bonjour installer strings in Polish + +2009-07-16 + Stefan Hacker + b236e4c Allow cancel while bj resolving + aa82976 Update German installer translation + + Hengqing Hu + 9555bf6 Simplified Chinese Installer + + Matthias Vogelgesang + b3fa0e5 * fix german translation + + Thorvald Natvig + 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 a89c5e2 Switch bonjour identifier to _mumble._tcp @@ -52,7 +90,7 @@ 96fe83c Link QtSvg. I really mean it. 8483892 Explicitly link svg - Bartek Sumowksi + Bartek "stranded" Sumowski 0afb4c7 Updated Polish installer 2009-07-10 diff --git a/installer/MumbleSimpChinese.nsh b/installer/MumbleSimpChinese.nsh index d1a388b0e..8f0a8f843 100644 --- a/installer/MumbleSimpChinese.nsh +++ b/installer/MumbleSimpChinese.nsh @@ -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， 包括个人偏好和数据库。" diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp index f0cf3b339..635ad0bcb 100644 --- a/src/mumble/ConnectDialog.cpp +++ b/src/mumble/ConnectDialog.cpp @@ -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 &)), - this, SLOT(onUpdateLanList(const QList &))); + this, SLOT(onUpdateLanList(const QList &))); 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 diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index 572a1c6ea..a713d212e 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -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; } diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 374f335da..4ec15943b 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -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; diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index e61d1deaf..1d5d0cf98 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -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) { diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp index 48c0563f1..166f481d0 100644 --- a/src/murmur/Messages.cpp +++ b/src/murmur/Messages.cpp @@ -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;