From 9b6774e91674d5abe83863fa523d4101f5390e04 Mon Sep 17 00:00:00 2001
From: Petter <pettsag@stud.ntnu.no>
Date: Wed, 26 Feb 2020 10:42:51 +0100
Subject: [PATCH] =?UTF-8?q?La=20til=20rett=20st=C3=B8rrelse=20til=20layout?=
=?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
soitool/main_window.py | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/soitool/main_window.py b/soitool/main_window.py
index bde2045..e0bc7c4 100644
--- a/soitool/main_window.py
+++ b/soitool/main_window.py
@@ -16,22 +16,20 @@ class MainWindow(QMainWindow):
menu = self.menuBar()
file_menu = menu.addMenu("SOI")
codebook = menu.addMenu("Kodebok")
- # setup = menu.addMenu("Oppsett")
- menu.addMenu("Oppsett")
hjelp = menu.addMenu("Hjelp")
# Hadde egentlig help her, men "klagegutten" klagde på det
- file_menu.addMenu("Ã…pne")
- file_menu.addMenu("Ã…pne fra DB")
- file_menu.addMenu("Forhåndsvis")
- file_menu.addMenu("Lagre i DB")
- file_menu.addMenu("Eksporter")
+ file_menu.addAction("Ã…pne")
+ file_menu.addAction("Ã…pne fra DB")
+ file_menu.addAction("Forhåndsvis")
+ file_menu.addAction("Lagre i DB")
+ file_menu.addAction("Eksporter")
- codebook.addMenu("Liten Kodebok")
- codebook.addMenu("Stor Kodebok")
+ codebook.addAction("Liten Kodebok")
+ codebook.addAction("Stor Kodebok")
- hjelp.addMenu("Hurtigtaster")
- hjelp.addMenu("Enkel bruk")
+ hjelp.addAction("Hurtigtaster")
+ hjelp.addAction("Enkel bruk")
# Legger til MainWidget som en tab, kanskje flytt ut til egen funksjon
tabs = QTabWidget()
@@ -51,12 +49,14 @@ class MainWidget(QWidget):
new_module = QPushButton("Ny modul")
tree_view = QTreeWidget()
+ setup = QPushButton("Oppsett")
layout2.addWidget(tree_view)
layout2.addWidget(new_module)
+ layout2.addWidget(setup)
view = ViewArea()
- layout1.addLayout(layout2)
- layout1.addWidget(view)
+ layout1.addLayout(layout2, 2)
+ layout1.addWidget(view, 8)
self.setLayout(layout1)
--
GitLab