Merge branch 'master'

Conflicts:
	soitool/main_window.py

soitool/main_window.py

@@ -9,36 +9,88 @@ import os
 from PySide2.QtCore import Qt
 from PySide2.QtWidgets import QTabWidget, QWidget, QMainWindow, \
     QApplication, QHBoxLayout, QVBoxLayout, QPushButton, QLabel, \
-    QAbstractItemView, QListWidget, QListWidgetItem
+    QAbstractItemView, QListWidget, QListWidgetItem, QAction, \
+    QLabel, 
 from PySide2.QtGui import QIcon
 
 
 class MainWindow(QMainWindow):
     """MainWindow, skallet til hele applikasjonen."""
 
-    def __init__(self):
+    def __init__(self):  # pylint: disable = R0914, R0915
         super().__init__()
         self.setGeometry(100, 100, 800, 800)
         self.setWindowTitle("SOI-tool")
+        self.statusBar()
 
         # flytt ut til egen funksjon, for setup av menubar
         menu = self.menuBar()
         file_menu = menu.addMenu("SOI")
         codebook = menu.addMenu("Kodebok")
-        hjelp = menu.addMenu("Hjelp")
+        help_menu = menu.addMenu("Hjelp")
         # Hadde egentlig help her, men "klagegutten" klagde på det
 
-        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.addAction("Liten Kodebok")
-        codebook.addAction("Stor Kodebok")
-
-        hjelp.addAction("Hurtigtaster")
-        hjelp.addAction("Enkel bruk")
+        # New SOI
+        new_soi = QAction("Ny SOI", self)
+        new_soi.setShortcut("Ctrl+n")
+        new_soi.setStatusTip("Opprett en ny SOI")
+        file_menu.addAction(new_soi)
+        # new_soi.triggered.connect(self.<nySOI>)
+
+        # Open file
+        open_file = QAction("Åpne", self)
+        open_file.setShortcut("Ctrl+o")
+        open_file.setStatusTip("Åpne en SOI fra fil")
+        file_menu.addAction(open_file)
+
+        # Open file from DB
+        open_file_db = QAction("Åpne fra DB", self)
+        open_file_db.setShortcut("Ctrl+d")
+        open_file_db.setStatusTip("Åpne en SOI fra databasen")
+        file_menu.addAction(open_file_db)
+
+        # Preview SOI
+        preview_soi = QAction("Forhåndsvis")
+        preview_soi.setShortcut("Ctrl+p")
+        preview_soi.setStatusTip("Forhåndsvis SOI som PDF")
+        file_menu.addAction(preview_soi)
+
+        # Save to DB
+        save_soi = QAction("Lagre i DB", self)
+        save_soi.setShortcut("Ctrl+s")
+        save_soi.setStatusTip("Lagre SOI i databasen")
+        file_menu.addAction(save_soi)
+
+        # Export
+        export = QAction("Eksporter", self)
+        export.setShortcut("Ctrl+e")
+        export.setStatusTip("Eksporter SOI til annet filformat")
+        file_menu.addAction(export)
+
+        # New Module
+        new_module = QAction("Ny modul", self)
+        new_module.setShortcut("Ctrl+m")
+        new_module.setStatusTip("Legg til en ny modul")
+
+        # Small codebook
+        small_codebook = QAction("Liten kodebok", self)
+        small_codebook.setStatusTip("Vis liten kodebok")
+        codebook.addAction(small_codebook)
+
+        # Big codebook
+        big_codebook = QAction("Stor kodebok", self)
+        big_codebook.setStatusTip("Vis stor kodebok")
+        codebook.addAction(big_codebook)
+
+        # Hot keys
+        hotkeys = QAction("Hurtigtaster", self)
+        hotkeys.setStatusTip("Vis oversikt over hurtigtaster")
+        help_menu.addAction(hotkeys)
+
+        # Easy use
+        easy_use = QAction("Enkel bruk", self)
+        easy_use.setStatusTip("Vis enkel bruk av programvaren")
+        help_menu.addAction(easy_use)
 
         # Legger til MainWidget som en tab, kanskje flytt ut til egen funksjon
         tabs = QTabWidget()