diff options
| -rw-r--r-- | module/gui/MainWindow.py | 8 | ||||
| -rw-r--r-- | module/gui/SettingsWidget.py | 22 |
2 files changed, 23 insertions, 7 deletions
diff --git a/module/gui/MainWindow.py b/module/gui/MainWindow.py index e457c984f..12f883287 100644 --- a/module/gui/MainWindow.py +++ b/module/gui/MainWindow.py @@ -101,15 +101,15 @@ class MainWindow(QMainWindow): self.tabs["collector"] = {"w":QWidget()} self.tabs["accounts"] = {"w":QWidget()} self.tabs["settings"] = {} - self.tabs["settings"]["s"] = QScrollArea() + #self.tabs["settings"]["s"] = QScrollArea() self.tabs["settings"]["w"] = SettingsWidget() - self.tabs["settings"]["s"].setWidgetResizable(True) - self.tabs["settings"]["s"].setWidget(self.tabs["settings"]["w"]) + #self.tabs["settings"]["s"].setWidgetResizable(True) + #self.tabs["settings"]["s"].setWidget(self.tabs["settings"]["w"]) self.tabs["log"] = {"w":QWidget()} self.tabw.addTab(self.tabs["queue"]["w"], _("Queue")) self.tabw.addTab(self.tabs["collector"]["w"], _("Collector")) self.tabw.addTab(self.tabs["accounts"]["w"], _("Accounts")) - self.tabw.addTab(self.tabs["settings"]["s"], _("Settings")) + self.tabw.addTab(self.tabs["settings"]["w"], _("Settings")) self.tabw.addTab(self.tabs["log"]["w"], _("Log")) #init tabs diff --git a/module/gui/SettingsWidget.py b/module/gui/SettingsWidget.py index ddfb45994..31d1acca8 100644 --- a/module/gui/SettingsWidget.py +++ b/module/gui/SettingsWidget.py @@ -63,8 +63,15 @@ class SettingsWidget(QWidget): tab = QTabWidget() self.tab = tab - tab.addTab(general, _("General")) - tab.addTab(plugins, _("Plugins")) + + gw = QWidget() + gw.setLayout(QVBoxLayout()) + gw.layout().addWidget(self.general) + pw = QWidget() + pw.setLayout(QVBoxLayout()) + pw.layout().addWidget(self.plugins) + tab.addTab(gw, _("General")) + tab.addTab(pw, _("Plugins")) layout.addWidget(tab) @@ -155,7 +162,16 @@ class Section(QGroupBox): self.ctype = ctype layout = QGridLayout(self) self.setLayout(layout) - parent.addTab(self, data["desc"]) + + sw = QWidget() + sw.setLayout(QVBoxLayout()) + sw.layout().addWidget(self) + + sa = QScrollArea() + sa.setWidgetResizable(True) + sa.setWidget(sw) + + parent.addTab(sa, data["desc"]) row = 0 for k, option in self.data.iteritems(): |