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
b6f6b762
Commit
b6f6b762
authored
5 years ago
by
Petter Sagvold
Browse files
Options
Downloads
Patches
Plain Diff
Fikset småfeil
parent
31a81bf8
No related branches found
Branches containing commit
No related tags found
1 merge request
!1
Oppsett av skjelettet til hovedvinduet
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
soitool/MainWindow.py
+0
-63
0 additions, 63 deletions
soitool/MainWindow.py
soitool/main_window.py
+4
-4
4 additions, 4 deletions
soitool/main_window.py
with
4 additions
and
67 deletions
soitool/MainWindow.py
deleted
100644 → 0
+
0
−
63
View file @
31a81bf8
import
sys
from
PySide2.QtWidgets
import
QTabWidget
,
QWidget
,
QMainWindow
,
QApplication
,
QHBoxLayout
,
QVBoxLayout
,
QPushButton
,
QTreeWidget
,
QLabel
class
Window
(
QMainWindow
):
def
__init__
(
self
):
super
().
__init__
()
self
.
setGeometry
(
100
,
100
,
800
,
800
)
self
.
setWindowTitle
(
"
SOI-tool
"
)
# flytt ut til egen funksjon, for setup av menubar
menu
=
self
.
menuBar
()
file_menu
=
menu
.
addMenu
(
"
SOI
"
)
codebook
=
menu
.
addMenu
(
"
Kodebok
"
)
# setup = menu.addMenu("Oppsett")
menu
.
addMenu
(
"
Oppsett
"
)
help
=
menu
.
addMenu
(
"
Hjelp
"
)
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
"
)
codebook
.
addMenu
(
"
Liten Kodebok
"
)
codebook
.
addMenu
(
"
Stor Kodebok
"
)
help
.
addMenu
(
"
Hurtigtaster
"
)
help
.
addMenu
(
"
Enkel bruk
"
)
# Legger til MainWidget som en tab, kanskje flytt ut til egen funksjon
tabs
=
QTabWidget
()
tab
=
MainWidget
()
tabs
.
addTab
(
tab
,
"
MainTab
"
)
self
.
setCentralWidget
(
tabs
)
class
MainWidget
(
QWidget
):
def
__init__
(
self
):
super
().
__init__
()
layout1
=
QHBoxLayout
()
layout2
=
QVBoxLayout
()
new_module
=
QPushButton
(
"
Ny modul
"
)
tree_view
=
QTreeWidget
()
layout2
.
addWidget
(
tree_view
)
layout2
.
addWidget
(
new_module
)
view
=
QLabel
(
"
Denne delen skal være størst på hele applikasjonen, kanskje 80% av skjermen
"
)
layout1
.
addLayout
(
layout2
)
layout1
.
addWidget
(
view
)
self
.
setLayout
(
layout1
)
app
=
QApplication
([])
window
=
Window
()
window
.
show
()
sys
.
exit
(
app
.
exec_
())
This diff is collapsed.
Click to expand it.
soitool/main_window.py
+
4
−
4
View file @
b6f6b762
...
...
@@ -4,7 +4,7 @@ from PySide2.QtWidgets import QTabWidget, QWidget, QMainWindow, \
QApplication
,
QHBoxLayout
,
QVBoxLayout
,
QPushButton
,
QTreeWidget
,
QLabel
class
Window
(
QMainWindow
):
class
Main
Window
(
QMainWindow
):
"""
MainWindow, skallet til hele applikasjonen.
"""
def
__init__
(
self
):
...
...
@@ -12,7 +12,7 @@ class Window(QMainWindow):
self
.
setGeometry
(
100
,
100
,
800
,
800
)
self
.
setWindowTitle
(
"
SOI-tool
"
)
# flytt ut til egen funksjon, for setup av menubar
# flytt ut til egen funksjon, for setup av menubar
menu
=
self
.
menuBar
()
file_menu
=
menu
.
addMenu
(
"
SOI
"
)
codebook
=
menu
.
addMenu
(
"
Kodebok
"
)
...
...
@@ -33,7 +33,7 @@ class Window(QMainWindow):
hjelp
.
addMenu
(
"
Hurtigtaster
"
)
hjelp
.
addMenu
(
"
Enkel bruk
"
)
# Legger til MainWidget som en tab, kanskje flytt ut til egen funksjon
# Legger til MainWidget som en tab, kanskje flytt ut til egen funksjon
tabs
=
QTabWidget
()
tab
=
MainWidget
()
...
...
@@ -74,7 +74,7 @@ class ViewArea(QWidget):
app
=
QApplication
([])
WINDOW
=
Window
()
# PYLINT klagde på window, så det ble WINDOW
WINDOW
=
Main
Window
()
# PYLINT klagde på window, så det ble WINDOW
WINDOW
.
show
()
sys
.
exit
(
app
.
exec_
())
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