diff --git a/src/mumble/ACLEditor.ui b/src/mumble/ACLEditor.ui index c5f9927ad..6b6b76c49 100644 --- a/src/mumble/ACLEditor.ui +++ b/src/mumble/ACLEditor.ui @@ -5,8 +5,8 @@ 0 0 - 608 - 605 + 607 + 509 diff --git a/src/mumble/ALSAAudio.ui b/src/mumble/ALSAAudio.ui index 9e40d62e3..c1091b083 100644 --- a/src/mumble/ALSAAudio.ui +++ b/src/mumble/ALSAAudio.ui @@ -5,8 +5,8 @@ 0 0 - 400 - 300 + 217 + 184 diff --git a/src/mumble/ASIOInput.ui b/src/mumble/ASIOInput.ui index 635fc92af..5195f5484 100644 --- a/src/mumble/ASIOInput.ui +++ b/src/mumble/ASIOInput.ui @@ -5,8 +5,8 @@ 0 0 - 1002 - 638 + 506 + 434 diff --git a/src/mumble/AudioConfigDialog.ui b/src/mumble/AudioConfigDialog.ui index b79dcadfc..20a60dba0 100644 --- a/src/mumble/AudioConfigDialog.ui +++ b/src/mumble/AudioConfigDialog.ui @@ -5,8 +5,8 @@ 0 0 - 510 - 677 + 469 + 529 diff --git a/src/mumble/BanEditor.ui b/src/mumble/BanEditor.ui index 852829ab7..977a75278 100644 --- a/src/mumble/BanEditor.ui +++ b/src/mumble/BanEditor.ui @@ -1,6 +1,14 @@ BanEditor + + + 0 + 0 + 357 + 163 + + Mumble - Edit Bans diff --git a/src/mumble/ConfigDialog.cpp b/src/mumble/ConfigDialog.cpp index d968dc7f7..7e712be20 100644 --- a/src/mumble/ConfigDialog.cpp +++ b/src/mumble/ConfigDialog.cpp @@ -132,14 +132,17 @@ void ConfigDialog::addPage(ConfigWidget *cw) { QRect ds=dw.availableGeometry(this); QSize ms=cw->minimumSizeHint(); + cw->resize(ms); + cw->setMinimumSize(ms); ms.rwidth() += 128; ms.rheight() += 64; if ((ms.width() > ds.width()) || (ms.height() > ds.height())) { QScrollArea *qsa=new QScrollArea(this); + qsa->setWidgetResizable(true); qsa->setWidget(cw); qswPages->addWidget(qsa); - qWarning("Widget %s has size %d %d", qPrintable(cw->title()), ms.width(), ms.height()); + qWarning("Widget %s has size %d %d (%d %d)", qPrintable(cw->title()), ms.width(), ms.height(),ds.width(), ds.height()); } else { qswPages->addWidget(cw); } diff --git a/src/mumble/ConfigDialog.ui b/src/mumble/ConfigDialog.ui index 3ade5b356..12b7e60e0 100644 --- a/src/mumble/ConfigDialog.ui +++ b/src/mumble/ConfigDialog.ui @@ -12,6 +12,9 @@ Mumble Configuration + + true + @@ -68,19 +71,6 @@ - - - - Qt::Vertical - - - - 20 - 0 - - - - diff --git a/src/mumble/DXConfigDialog.ui b/src/mumble/DXConfigDialog.ui index aa1c2434c..2a16bd264 100644 --- a/src/mumble/DXConfigDialog.ui +++ b/src/mumble/DXConfigDialog.ui @@ -5,8 +5,8 @@ 0 0 - 761 - 593 + 198 + 351 diff --git a/src/mumble/Log.ui b/src/mumble/Log.ui index 9f7c4558f..731e975a0 100644 --- a/src/mumble/Log.ui +++ b/src/mumble/Log.ui @@ -5,8 +5,8 @@ 0 0 - 597 - 396 + 347 + 191 diff --git a/src/mumble/LookConfig.ui b/src/mumble/LookConfig.ui index 7b076a86f..91c69754e 100644 --- a/src/mumble/LookConfig.ui +++ b/src/mumble/LookConfig.ui @@ -5,8 +5,8 @@ 0 0 - 841 - 674 + 334 + 348 diff --git a/src/mumble/MainWindow.ui b/src/mumble/MainWindow.ui index e322ad569..2842f975d 100644 --- a/src/mumble/MainWindow.ui +++ b/src/mumble/MainWindow.ui @@ -5,8 +5,8 @@ 0 0 - 1019 - 647 + 542 + 348 @@ -47,8 +47,8 @@ 0 0 - 1019 - 24 + 542 + 25 diff --git a/src/mumble/OSS.ui b/src/mumble/OSS.ui index 63f076240..7b841d1b7 100644 --- a/src/mumble/OSS.ui +++ b/src/mumble/OSS.ui @@ -5,8 +5,8 @@ 0 0 - 400 - 300 + 217 + 184 diff --git a/src/mumble/Overlay.ui b/src/mumble/Overlay.ui index 66eefc21e..1fd5173b9 100644 --- a/src/mumble/Overlay.ui +++ b/src/mumble/Overlay.ui @@ -5,8 +5,8 @@ 0 0 - 854 - 683 + 383 + 591 diff --git a/src/mumble/PAAudioConfig.ui b/src/mumble/PAAudioConfig.ui index 2a4407438..f6f2e4230 100644 --- a/src/mumble/PAAudioConfig.ui +++ b/src/mumble/PAAudioConfig.ui @@ -5,8 +5,8 @@ 0 0 - 433 - 440 + 126 + 252 diff --git a/src/mumble/Plugins.ui b/src/mumble/Plugins.ui index 9eea8b0b8..fafd178ac 100644 --- a/src/mumble/Plugins.ui +++ b/src/mumble/Plugins.ui @@ -5,8 +5,8 @@ 0 0 - 839 - 573 + 321 + 235 diff --git a/src/mumble/PulseAudio.ui b/src/mumble/PulseAudio.ui index 558941911..5ce71efb9 100644 --- a/src/mumble/PulseAudio.ui +++ b/src/mumble/PulseAudio.ui @@ -5,8 +5,8 @@ 0 0 - 400 - 300 + 327 + 213