Skip to content
Snippets Groups Projects
Commit e600101e authored by Thomas Holene Løkkeborg's avatar Thomas Holene Løkkeborg
Browse files

Merge branch 'master' into første-utkast-på-inline-edit-view

parents 662ccb39 fe81ec72
No related branches found
No related tags found
1 merge request!3#18 MVP brukergrensesnitt - inline edit view
Pipeline #71054 passed
......@@ -55,7 +55,19 @@ job_test_gui_ubuntu:
- python3 --version
- DISPLAY=':10.0' python3 -m unittest test.test_main
# name **må** være pages
job_pages_smoke_test:
stage: deploy
image: morkolai/soitool-ci
script:
- mkdir public
- pdoc --version
- pdoc soitool --html
- mv ./html/soitool/* ./public
# never run for master branch
except:
- master
# name has to be pages
pages:
stage: deploy
image: morkolai/soitool-ci
......@@ -67,6 +79,7 @@ pages:
artifacts:
paths:
- public
# only run for master branch
only:
- master
......@@ -61,11 +61,6 @@ class MainWindow(QMainWindow):
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")
......@@ -108,7 +103,11 @@ class MainWidget(QWidget):
layout1 = QHBoxLayout()
layout2 = QVBoxLayout()
# New module button
new_module = QPushButton("Ny modul")
new_module.setShortcut("Ctrl+m")
new_module.setStatusTip("Legg til en ny modul")
tree_view = QTreeWidget()
setup = QPushButton("Oppsett")
layout2.addWidget(tree_view)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment