Merge branch 'ui-new' of https://github.com/abhishekmj303/HardeningHub …

…into ui-new
abhishekmj303 · Dec 19, 2023 · 5ef1740 · 5ef1740
2 parents 3707abe + 71615c9
commit 5ef1740
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ __pycache__
 *.toml.tmp
 .DS_Store
 venv
-.venv
+.venv
+temp.qss
diff --git a/ui/components/hardware/file_systems.py b/ui/components/hardware/file_systems.py
@@ -64,12 +64,12 @@ def init_ui(self):
         hlayout.setContentsMargins(0, 0, 0, 0)
         hlayout.setAlignment(Qt.AlignmentFlag.AlignLeft)
         self.configure_label = QLabel('Configure /tmp size (in GB):')
-        self.configure_label.setProperty('class', 'label-for')
         self.size_input = QLineEdit()
-        self.size_input.setFixedWidth(100)
+        # self.size_input.setFixedWidth(100)
         validator = QIntValidator()
         self.size_input.setValidator(validator)
         self.size_input.textChanged.connect(self.size_changed)
+        self.configure_label.setProperty('class', 'label-for')
 
         hlayout.addWidget(self.configure_label)
         hlayout.addWidget(self.size_input)

diff --git a/ui/components/software/apparmor.py b/ui/components/software/apparmor.py
@@ -37,7 +37,11 @@ def init_ui(self):
         # Mode Dropdown
         hlayout = QHBoxLayout()
 
+        # Select Mode Label
         self.mode_label = QLabel('Select mode:')
+        self.mode_label.setProperty('class', 'normal-label-for')
+
+        # Mode Dropdown
         self.mode_list = QComboBox()
         self.mode_list.addItems(['enforce', 'complain'])
         self.mode_list.currentTextChanged.connect(self.new_item_selected)

diff --git a/ui/components/software/gdm.py b/ui/components/software/gdm.py
@@ -39,7 +39,10 @@ def init_ui(self):
 
         hlayout = QHBoxLayout()
 
+        # Lock on Idle Label
         self.lockon_lable = QLabel('Lock on Idle(seconds)')
+        self.lockon_lable.setProperty('class', 'normal-label-for')
+
         self.time_input = QLineEdit()
         self.time_input.setText(str(self.toml_gdm['lock_on_idle']))
         validator = QIntValidator()

diff --git a/ui/components/software/time_sync.py b/ui/components/software/time_sync.py
@@ -36,20 +36,20 @@ def init_ui(self):
         self.enable_ntp.stateChanged.connect(lambda state, name = 'enable_ntp': self.save_checkbox_state(name, state))
         self.container_layout.addWidget(self.enable_ntp)
 
-
-
         self.enable_user = QCheckBox('Enable NTP user')
         self.enable_user.stateChanged.connect(lambda state, name = 'enable_ntp_user': self.save_checkbox_state(name, state))
         self.container_layout.addWidget(self.enable_user)
 
         ntp_server_lable = QLabel('NTP Servers')
+        ntp_server_lable.setProperty('class', 'normal-label-for')
         self.container_layout.addWidget(ntp_server_lable)
 
         hlayout = QHBoxLayout()
 
         self.new_server = QLineEdit()
-        self.add_button = QPushButton('add')
+        self.add_button = QPushButton('Add')
         self.add_button.clicked.connect(self.add_new_server)
+        self.add_button.setProperty('class', 'add-btn')
 
         hlayout.addWidget(self.new_server)
         hlayout.addWidget(self.add_button)
@@ -68,14 +68,17 @@ def server_table(self):
 
     def add_new_server(self):
         server = self.new_server.text()
+        if server == '' or server is None:
+            return
         self.toml_time_sync['ntp_servers'].append(server)
         config_file.write(self.config)
         self.servers_table.insertRow(self.servers_table.rowCount())
         self.servers_table.setItem(self.servers_table.rowCount() - 1, 0, QTableWidgetItem(server))
-        remove_button = QPushButton('remove')
+        remove_button = QPushButton('Remove')
+        remove_button.setProperty('class', 'remove-btn')
         remove_button.clicked.connect(lambda state,n = server : self.remove_server(n))
-        self.servers_table.setCellWidget(self.servers_table.rowCount() - 1, 1, remove_button)
 
+        self.servers_table.setCellWidget(self.servers_table.rowCount() - 1, 1, remove_button)
         self.new_server.setText('')
 
     def add_servers(self):
@@ -85,7 +88,8 @@ def add_servers(self):
             name = rows[i]
             self.servers_table.setItem(i, 0, QTableWidgetItem(rows[i]))
 
-            remove_button = QPushButton('remove')
+            remove_button = QPushButton('Remove')
+            remove_button.setProperty('class', 'remove-btn')
             remove_button.clicked.connect(lambda state,n = name : self.remove_server(n))
             self.servers_table.setCellWidget(i, 1, remove_button)
 

diff --git a/ui/qss/style.qss b/ui/qss/style.qss
@@ -60,6 +60,30 @@ QMainWindow {
 	background-color: #6B56FF;
 }
 
+.add-btn {
+	background-color: #7B66FF;
+	padding: 2.5px 10px;
+	border-radius: 5px;
+	color: rgb(221, 221, 221);
+	font: 15px;
+	font-weight: 500;
+}
+.add-btn:hover {
+	background-color: #6B56FF;
+}
+
+.remove-btn {
+	background-color: #7B66FF;
+	padding: 1.5px 5px;
+	border-radius: 5px;
+	color: rgb(221, 221, 221);
+	font: 15px;
+	font-weight: 500;
+}
+.remove-btn:hover {
+	background-color: #6B56FF;
+}
+
 QCheckBox {
     spacing: 10px;
 	margin-bottom: 10px;
@@ -94,6 +118,12 @@ QCheckBox::indicator:unchecked:hover {
 	font-weight: 500;
 	color: rgb(221, 221, 221);
 }
+.normal-label-for {
+	margin: 5px 5px 10px 0px;
+	font: 15px;
+	font-weight: 500;
+	color: rgb(221, 221, 221);
+}
 
 .checkbox {
 	margin-left: 20px;