Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
soitool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bachelor-paa-bittet
soitool
Commits
e600101e
Commit
e600101e
authored
5 years ago
by
Thomas Holene Løkkeborg
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into første-utkast-på-inline-edit-view
parents
662ccb39
fe81ec72
No related branches found
Branches containing commit
No related tags found
1 merge request
!3
#18 MVP brukergrensesnitt - inline edit view
Pipeline
#71054
passed
5 years ago
Stage: lint
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+14
-1
14 additions, 1 deletion
.gitlab-ci.yml
soitool/main_window.py
+4
-5
4 additions, 5 deletions
soitool/main_window.py
with
18 additions
and
6 deletions
.gitlab-ci.yml
+
14
−
1
View file @
e600101e
...
...
@@ -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
This diff is collapsed.
Click to expand it.
soitool/main_window.py
+
4
−
5
View file @
e600101e
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment