Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Redstart
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
Redstart
Commits
c8641d69
Commit
c8641d69
authored
Nov 20, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding Qt lib install lines, and progress on UI
parent
b6aff612
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
7 deletions
+32
-7
CMakeLists.txt
CMakeLists.txt
+6
-0
ui/RedstartWindow.ui
ui/RedstartWindow.ui
+26
-7
No files found.
CMakeLists.txt
View file @
c8641d69
...
...
@@ -113,6 +113,12 @@ endif( )
if
(
WIN32
)
configure_file
(
"run_Redstart.bat.proto"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/run_Redstart.bat"
@ONLY
)
install
(
FILES
"run_Redstart.bat"
DESTINATION
"."
)
# Qt specialty: copy Qt and plugin platform dlls that are loaded during execution from a fixed relative path
install
(
FILES
"
${
_qt5Core_install_prefix
}
/bin/Qt5Core.dll"
DESTINATION
"bin"
)
install
(
FILES
"
${
_qt5Core_install_prefix
}
/bin/Qt5Gui.dll"
DESTINATION
"bin"
)
install
(
FILES
"
${
_qt5Core_install_prefix
}
/bin/Qt5Widgets.dll"
DESTINATION
"bin"
)
install
(
DIRECTORY
"
${
_qt5Core_install_prefix
}
/plugins/platforms"
DESTINATION
"bin"
FILES_MATCHING PATTERN
"*.dll"
)
else
(
)
configure_file
(
"run_Redstart.sh.proto"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/run_Redstart.sh"
@ONLY
)
install
(
FILES
"run_Redstart.sh"
DESTINATION
"."
)
...
...
ui/RedstartWindow.ui
View file @
c8641d69
...
...
@@ -72,7 +72,7 @@
<x>
0
</x>
<y>
0
</y>
<width>
1029
</width>
<height>
66
6
</height>
<height>
66
0
</height>
</rect>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_5"
stretch=
"0,0,0,0,1"
>
...
...
@@ -389,8 +389,8 @@ background-color: rgb(208, 255, 188);</string>
</widget>
</item>
<item>
<layout
class=
"QGridLayout"
name=
"gridLayout_redstart_va"
rowstretch=
"3,0"
columnstretch=
"
1,0
,0"
>
<item
row=
"0"
column=
"
0
"
colspan=
"2"
>
<layout
class=
"QGridLayout"
name=
"gridLayout_redstart_va"
rowstretch=
"3,0"
columnstretch=
"
2,0,1
,0"
>
<item
row=
"0"
column=
"
1
"
colspan=
"2"
>
<widget
class=
"QGroupBox"
name=
"groupBox_paths"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
...
...
@@ -399,14 +399,14 @@ background-color: rgb(208, 255, 188);</string>
<string>
Paths
</string>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout_6"
>
<item
row=
"
1
"
column=
"0"
>
<item
row=
"
2
"
column=
"0"
>
<widget
class=
"QPushButton"
name=
"pushButton_add_path"
>
<property
name=
"text"
>
<string>
add path
</string>
</property>
</widget>
</item>
<item
row=
"
1
"
column=
"1"
>
<item
row=
"
2
"
column=
"1"
>
<widget
class=
"QPushButton"
name=
"pushButton_add_local_path"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
...
...
@@ -422,7 +422,7 @@ background-color: rgb(208, 255, 188);</string>
</layout>
</widget>
</item>
<item
row=
"1"
column=
"
0
"
colspan=
"2"
>
<item
row=
"1"
column=
"
1
"
colspan=
"2"
>
<widget
class=
"QGroupBox"
name=
"groupBox_macros"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
...
...
@@ -437,7 +437,7 @@ background-color: rgb(208, 255, 188);</string>
</layout>
</widget>
</item>
<item
row=
"0"
column=
"
2
"
rowspan=
"2"
>
<item
row=
"0"
column=
"
3
"
rowspan=
"2"
>
<widget
class=
"QGroupBox"
name=
"groupBox_core"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
...
...
@@ -696,6 +696,25 @@ background-color: rgb(208, 255, 188);</string>
</layout>
</widget>
</item>
<item
row=
"0"
column=
"0"
rowspan=
"2"
>
<widget
class=
"QGroupBox"
name=
"groupBox_output"
>
<property
name=
"title"
>
<string>
Output
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_13"
>
<item>
<widget
class=
"QListView"
name=
"listView_output"
>
<property
name=
"minimumSize"
>
<size>
<width>
400
</width>
<height>
0
</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment