Skip to content

Commit baaef8a

Browse files
pescheck-brampescheck-bram
committed
Updated styles
1 parent 9047f84 commit baaef8a

File tree

8 files changed

+180
-36
lines changed

8 files changed

+180
-36
lines changed

‎.github/workflows/build-and-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ jobs:
167167
fi
168168
echo "ntldd.exe found at $NTLDD_PATH"
169169

170-
echo "Checking if build/EncryptionApp.exe exists..."
171-
if [ ! -f "build/EncryptionApp.exe" ]; then
172-
echo "build/EncryptionApp.exe not found!"
170+
echo "Checking if build/OpenCryptUI.exe exists..."
171+
if [ ! -f "build/OpenCryptUI.exe" ]; then
172+
echo "build/OpenCryptUI.exe not found!"
173173
exit 1
174174
fi
175175

176176
echo "Running ntldd and capturing DLLs..."
177177
DLL_PATHS=$(mktemp)
178-
"$NTLDD_PATH" -R build/EncryptionApp.exe | while IFS= read -r line
178+
"$NTLDD_PATH" -R build/OpenCryptUI.exe | while IFS= read -r line
179179
do
180180
if [[ "$line" =~ [A-Za-z]:\\[^[:space:]]+\.dll ]]; then
181181
dll_path="${BASH_REMATCH[0]}"

‎CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(EncryptionApp LANGUAGES CXX)
2+
project(OpenCryptUI LANGUAGES CXX)
33

44
# Enable position-independent code globally
55
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -105,12 +105,12 @@ target_link_libraries(EncryptionLib PRIVATE
105105
)
106106

107107
# Create the main executable and link against the library
108-
add_executable(EncryptionApp WIN32 src/main.cpp)
109-
set_target_properties(EncryptionApp PROPERTIES POSITION_INDEPENDENT_CODE ON)
108+
add_executable(OpenCryptUI WIN32 src/main.cpp)
109+
set_target_properties(OpenCryptUI PROPERTIES POSITION_INDEPENDENT_CODE ON)
110110

111-
target_compile_options(EncryptionApp PRIVATE -fPIC)
111+
target_compile_options(OpenCryptUI PRIVATE -fPIC)
112112

113-
target_include_directories(EncryptionApp PRIVATE
113+
target_include_directories(OpenCryptUI PRIVATE
114114
${CMAKE_CURRENT_SOURCE_DIR}/include
115115
${CMAKE_CURRENT_SOURCE_DIR}/src
116116
${CMAKE_CURRENT_SOURCE_DIR}/ui
@@ -120,20 +120,20 @@ target_include_directories(EncryptionApp PRIVATE
120120
${OPENSSL_INCLUDE_DIR}
121121
)
122122

123-
target_link_libraries(EncryptionApp PRIVATE EncryptionLib)
123+
target_link_libraries(OpenCryptUI PRIVATE EncryptionLib)
124124

125125
# Add test source
126126
set(TEST_SOURCES
127127
tests/test_encryption_app.cpp
128128
)
129129

130130
# Create test executable
131-
add_executable(EncryptionAppTest ${TEST_SOURCES})
132-
set_target_properties(EncryptionAppTest PROPERTIES POSITION_INDEPENDENT_CODE ON)
131+
add_executable(OpenCryptUITest ${TEST_SOURCES})
132+
set_target_properties(OpenCryptUITest PROPERTIES POSITION_INDEPENDENT_CODE ON)
133133

134-
target_compile_options(EncryptionAppTest PRIVATE -fPIC)
134+
target_compile_options(OpenCryptUITest PRIVATE -fPIC)
135135

136-
target_include_directories(EncryptionAppTest PRIVATE
136+
target_include_directories(OpenCryptUITest PRIVATE
137137
${CMAKE_CURRENT_SOURCE_DIR}/include
138138
${CMAKE_CURRENT_SOURCE_DIR}/src
139139
${CMAKE_CURRENT_SOURCE_DIR}/ui
@@ -143,7 +143,7 @@ target_include_directories(EncryptionAppTest PRIVATE
143143
${OPENSSL_INCLUDE_DIR}
144144
)
145145

146-
target_link_libraries(EncryptionAppTest PRIVATE
146+
target_link_libraries(OpenCryptUITest PRIVATE
147147
EncryptionLib
148148
Qt5::Core
149149
Qt5::Gui
@@ -159,7 +159,7 @@ target_link_libraries(EncryptionAppTest PRIVATE
159159

160160
# Add test to CTest
161161
enable_testing()
162-
add_test(NAME EncryptionAppTest COMMAND EncryptionAppTest)
162+
add_test(NAME OpenCryptUITest COMMAND OpenCryptUITest)
163163

164164
# Print paths for debugging
165165
message(STATUS "Qt5_DIR: ${Qt5_DIR}")

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To build the project, follow these steps:
4848

4949
5. Run the application:
5050
```bash
51-
./EncryptionApp
51+
./OpenCryptUI
5252
```
5353

5454
## Detailed Installation Instructions
@@ -63,7 +63,7 @@ For detailed installation instructions, please refer to the following:
6363

6464
1. Launch the application:
6565
```bash
66-
./EncryptionApp
66+
./OpenCryptUI
6767
```
6868

6969
2. Use the "File Encryption" tab to encrypt or decrypt individual files:

‎installation/windows.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
fi
8080

8181
DLL_PATHS=$(mktemp)
82-
"$NTLDD_PATH" -R build/EncryptionApp.exe | while IFS= read -r line
82+
"$NTLDD_PATH" -R build/OpenCryptUI.exe | while IFS= read -r line
8383
do
8484
if [[ "$line" =~ [A-Za-z]:\\[^[:space:]]+\.dll ]]; then
8585
dll_path="${BASH_REMATCH[0]}"

‎resources/darktheme.qss‎

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ QMainWindow {
55
}
66

77
/* General widget background and text color */
8-
QLabel, QLineEdit, QComboBox, QSpinBox, QCheckBox, QPushButton, QTabWidget::pane, QTableWidget, QMenuBar, QMenu, QMenu::item, QStatusBar, QProgressBar {
8+
QLabel, QLineEdit, QComboBox, QSpinBox, QCheckBox, QPushButton, QTabWidget::pane, QTableWidget, QProgressBar, QDialog, QDialogButtonBox {
99
background-color: #2d2d2d;
1010
color: #d3d3d3;
11+
padding: 5px;
1112
}
1213

1314
/* LineEdit, ComboBox, SpinBox, CheckBox, and PushButton borders and padding */
1415
QLineEdit, QComboBox, QSpinBox, QCheckBox, QPushButton {
1516
border: 1px solid #555555;
16-
padding: 2px;
17+
padding: 5px;
18+
border-radius: 5px;
1719
}
1820

1921
/* ProgressBar styling */
@@ -22,16 +24,45 @@ QProgressBar {
2224
border: 1px solid #555555;
2325
color: #d3d3d3;
2426
text-align: center;
27+
padding: 5px;
28+
border-radius: 5px;
2529
}
2630

2731
/* MenuBar, Menu, and Menu item styling */
28-
QMenuBar, QMenu, QMenu::item {
32+
QMenuBar {
2933
background-color: #2d2d2d;
3034
color: #d3d3d3;
35+
padding: 5px;
36+
border-bottom: 1px solid #555555;
3137
}
3238

33-
/* Selected Menu item styling */
34-
QMenu::item:selected {
39+
QMenuBar::item {
40+
background-color: #2d2d2d;
41+
color: #d3d3d3;
42+
padding: 10px;
43+
border-radius: 5px;
44+
}
45+
46+
QMenuBar::item:selected, QMenuBar::item:pressed, QMenuBar::item:hover {
47+
background-color: #555555;
48+
color: #d3d3d3;
49+
}
50+
51+
/* Menu item styling */
52+
QMenu {
53+
background-color: #2d2d2d;
54+
color: #d3d3d3;
55+
padding: 10px;
56+
}
57+
58+
QMenu::item {
59+
background-color: #2d2d2d;
60+
color: #d3d3d3;
61+
padding: 10px;
62+
border-radius: 5px;
63+
}
64+
65+
QMenu::item:selected, QMenu::item:hover {
3566
background-color: #555555;
3667
color: #d3d3d3;
3768
}
@@ -53,17 +84,28 @@ QTabBar::tab {
5384
background: #2d2d2d;
5485
color: #d3d3d3;
5586
padding: 10px;
87+
border: 1px solid #555555;
88+
border-top-left-radius: 5px;
89+
border-top-right-radius: 5px;
5690
}
5791

5892
QTabBar::tab:selected {
5993
background: #555555;
94+
color: #d3d3d3;
95+
border-bottom: 2px solid #d3d3d3;
96+
}
97+
98+
QTabBar::tab:hover {
99+
background: #444444;
100+
color: #d3d3d3;
60101
}
61102

62103
/* TableWidget header and item styling */
63104
QHeaderView::section {
64105
background-color: #2d2d2d;
65106
color: #d3d3d3;
66107
border: 1px solid #555555;
108+
padding: 5px;
67109
}
68110

69111
QTableWidget {
@@ -74,11 +116,41 @@ QTableWidget::item {
74116
background-color: #2d2d2d;
75117
color: #d3d3d3;
76118
border: 1px solid #555555;
119+
padding: 5px;
120+
}
121+
122+
QTableWidget::item:selected {
123+
background-color: #555555;
124+
color: #d3d3d3;
125+
}
126+
127+
/* ComboBox drop-down styling */
128+
QComboBox QAbstractItemView {
129+
background-color: #2d2d2d;
130+
color: #d3d3d3;
131+
selection-background-color: #555555;
132+
selection-color: #d3d3d3;
77133
}
78134

79135
/* CustomListWidget styling */
80136
CustomListWidget {
81137
background-color: #2d2d2d;
82138
color: #d3d3d3;
83139
border: 1px solid #555555;
140+
padding: 5px;
141+
border-radius: 5px;
142+
}
143+
144+
/* Large Encrypt and Decrypt buttons */
145+
QPushButton#fileEncryptButton, QPushButton#fileDecryptButton, QPushButton#folderEncryptButton, QPushButton#folderDecryptButton {
146+
font-size: 18px;
147+
padding: 15px;
148+
border: 2px solid #777777;
149+
background-color: #444444;
150+
border-radius: 10px;
151+
}
152+
153+
QPushButton#fileEncryptButton:hover, QPushButton#fileDecryptButton:hover, QPushButton#folderEncryptButton:hover, QPushButton#folderDecryptButton:hover {
154+
background-color: #555555;
155+
border: 2px solid #888888;
84156
}

‎resources/lighttheme.qss‎

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ QMainWindow {
55
}
66

77
/* General widget background and text color */
8-
QLabel, QLineEdit, QComboBox, QSpinBox, QCheckBox, QPushButton, QTabWidget::pane, QTableWidget, QMenuBar, QMenu, QMenu::item, QStatusBar, QProgressBar {
8+
QLabel, QLineEdit, QComboBox, QSpinBox, QCheckBox, QPushButton, QTabWidget::pane, QTableWidget, QProgressBar, QDialog, QDialogButtonBox {
99
background-color: #ffffff;
1010
color: #000000;
11+
padding: 5px;
1112
}
1213

1314
/* LineEdit, ComboBox, SpinBox, CheckBox, and PushButton borders and padding */
1415
QLineEdit, QComboBox, QSpinBox, QCheckBox, QPushButton {
1516
border: 1px solid #cccccc;
16-
padding: 2px;
17+
padding: 5px;
18+
border-radius: 5px;
1719
}
1820

1921
/* ProgressBar styling */
@@ -22,16 +24,45 @@ QProgressBar {
2224
border: 1px solid #cccccc;
2325
color: #000000;
2426
text-align: center;
27+
padding: 5px;
28+
border-radius: 5px;
2529
}
2630

2731
/* MenuBar, Menu, and Menu item styling */
28-
QMenuBar, QMenu, QMenu::item {
32+
QMenuBar {
2933
background-color: #ffffff;
3034
color: #000000;
35+
padding: 5px;
36+
border-bottom: 1px solid #cccccc;
3137
}
3238

33-
/* Selected Menu item styling */
34-
QMenu::item:selected {
39+
QMenuBar::item {
40+
background-color: #ffffff;
41+
color: #000000;
42+
padding: 10px;
43+
border-radius: 5px;
44+
}
45+
46+
QMenuBar::item:selected, QMenuBar::item:pressed, QMenuBar::item:hover {
47+
background-color: #cccccc;
48+
color: #000000;
49+
}
50+
51+
/* Menu item styling */
52+
QMenu {
53+
background-color: #ffffff;
54+
color: #000000;
55+
padding: 10px;
56+
}
57+
58+
QMenu::item {
59+
background-color: #ffffff;
60+
color: #000000;
61+
padding: 10px;
62+
border-radius: 5px;
63+
}
64+
65+
QMenu::item:selected, QMenu::item:hover {
3566
background-color: #cccccc;
3667
color: #000000;
3768
}
@@ -53,17 +84,28 @@ QTabBar::tab {
5384
background: #ffffff;
5485
color: #000000;
5586
padding: 10px;
87+
border: 1px solid #cccccc;
88+
border-top-left-radius: 5px;
89+
border-top-right-radius: 5px;
5690
}
5791

5892
QTabBar::tab:selected {
5993
background: #cccccc;
94+
color: #000000;
95+
border-bottom: 2px solid #000000;
96+
}
97+
98+
QTabBar::tab:hover {
99+
background: #dddddd;
100+
color: #000000;
60101
}
61102

62103
/* TableWidget header and item styling */
63104
QHeaderView::section {
64105
background-color: #ffffff;
65106
color: #000000;
66107
border: 1px solid #cccccc;
108+
padding: 5px;
67109
}
68110

69111
QTableWidget {
@@ -74,11 +116,41 @@ QTableWidget::item {
74116
background-color: #ffffff;
75117
color: #000000;
76118
border: 1px solid #cccccc;
119+
padding: 5px;
120+
}
121+
122+
QTableWidget::item:selected {
123+
background-color: #cccccc;
124+
color: #000000;
125+
}
126+
127+
/* ComboBox drop-down styling */
128+
QComboBox QAbstractItemView {
129+
background-color: #ffffff;
130+
color: #000000;
131+
selection-background-color: #cccccc;
132+
selection-color: #000000;
77133
}
78134

79135
/* CustomListWidget styling */
80136
CustomListWidget {
81137
background-color: #ffffff;
82138
color: #000000;
83139
border: 1px solid #cccccc;
140+
padding: 5px;
141+
border-radius: 5px;
142+
}
143+
144+
/* Large Encrypt and Decrypt buttons */
145+
QPushButton#fileEncryptButton, QPushButton#fileDecryptButton, QPushButton#folderEncryptButton, QPushButton#folderDecryptButton {
146+
font-size: 18px;
147+
padding: 15px;
148+
border: 2px solid #999999;
149+
background-color: #f0f0f0;
150+
border-radius: 10px;
151+
}
152+
153+
QPushButton#fileEncryptButton:hover, QPushButton#fileDecryptButton:hover, QPushButton#folderEncryptButton:hover, QPushButton#folderDecryptButton:hover {
154+
background-color: #e0e0e0;
155+
border: 2px solid #bbbbbb;
84156
}

0 commit comments

Comments
 (0)