Skip to content

Commit ce0e584

Browse files
mxrcodemxrcode
committed
Adjust UI styles for improved appearance in the new Windows 11 (Alpha)
1 parent 0f4a508 commit ce0e584

4 files changed

Lines changed: 136 additions & 37 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.5)
22

3-
project(TaskGuard VERSION 1.3.3 LANGUAGES CXX)
3+
project(TaskGuard VERSION 1.3.4 LANGUAGES CXX)
44

55
set(CMAKE_AUTOUIC ON)
66
set(CMAKE_AUTOMOC ON)

‎src/mainwindow.cpp‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -545,16 +545,17 @@ void MainWindow::fill_group_list_widget(QListWidget* list_widget, QString table_
545545

546546
db_query.exec();
547547

548-
list_widget->setItemDelegate(new TextIndentDelegate(text_indent, list_widget)); // Text indent
549-
548+
// list_widget->setItemDelegate(new TextIndentDelegate(text_indent, list_widget)); // Text indent
549+
QString indent = QString(4, QChar(0x00A0));
550+
550551
QVector<QVector<QVariant>> db_items;
551552

552553
while (db_query.next()) {
553554
db_items.push_back({db_query.value(0), db_query.value(2)});
554555
}
555556

556557
for (int i = 0; i < db_items.size(); i++) {
557-
QListWidgetItem *item = new QListWidgetItem(db_items[i].at(1).toString());
558+
QListWidgetItem *item = new QListWidgetItem(indent + db_items[i].at(1).toString());
558559
item->setData(Qt::UserRole, db_items[i].at(0).toUInt());
559560
list_widget->addItem(item);
560561
}
@@ -581,6 +582,7 @@ void MainWindow::fill_task_list_widget(QListWidget* list_widget, QString table_n
581582
db_query.exec();
582583

583584
// list_widget->setItemDelegate(new TextIndentDelegate(text_indent, list_widget)); // Text indent
585+
QString indent = QString(2, QChar(0x00A0));
584586

585587
QVector<QMap<QString, QVariant>> item_map;
586588

@@ -613,9 +615,11 @@ void MainWindow::fill_task_list_widget(QListWidget* list_widget, QString table_n
613615
item_title.prepend(format_create_time);
614616
}
615617

616-
QListWidgetItem *item = new QListWidgetItem(item_title);
618+
QListWidgetItem *item = new QListWidgetItem(indent + item_title);
617619
item->setData(Qt::UserRole, item_map[i].value("id").toUInt());
618620

621+
item->setForeground(Qt::black);
622+
619623
if (item_map[i].value("task_status").toString() == "active") {
620624

621625
item->setCheckState(Qt::Unchecked);
@@ -646,7 +650,7 @@ void MainWindow::fill_task_list_widget(QListWidget* list_widget, QString table_n
646650
item_title.prepend(format_create_time);
647651
}
648652

649-
QListWidgetItem *item = new QListWidgetItem(item_title);
653+
QListWidgetItem *item = new QListWidgetItem(indent + item_title);
650654
item->setData(Qt::UserRole, item_map[i].value("id").toUInt());
651655

652656
item->setForeground(Qt::gray);
@@ -1218,9 +1222,11 @@ void MainWindow::on_add_alarm_clicked()
12181222
QTime current_alarm_time_qtime = current_alarm_time_datetime.time();
12191223

12201224
QDialog dialog(this);
1225+
dialog.resize(340, 360); // Set initial dialog size
1226+
12211227
dialog.setWindowTitle(tr("Select date and time for alarm"));
12221228
dialog.setWindowFlag(Qt::WindowStaysOnTopHint);
1223-
dialog.setStyleSheet("QDialog {background-color:#FFF;}");
1229+
// dialog.setStyleSheet("QDialog {background-color:#FFF;}");
12241230

12251231
QVBoxLayout layout(&dialog);
12261232

@@ -1229,6 +1235,8 @@ void MainWindow::on_add_alarm_clicked()
12291235
calendar->setGridVisible(true);
12301236
calendar->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
12311237
layout.addWidget(calendar);
1238+
1239+
layout.addSpacing(6); // Added 6 pixels of vertical spacing
12321240

12331241
QDateTimeEdit *time_edit = new QDateTimeEdit(QTime::currentTime());
12341242
time_edit->setDisplayFormat("hh:mm");

‎src/mainwindow.ui‎

Lines changed: 119 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@
1414
<string>Retask</string>
1515
</property>
1616
<property name="styleSheet">
17-
<string notr="true"/>
17+
<string notr="true">QSplitter::handle {
18+
background-color: #F4F5F6;
19+
width: 3px;
20+
}
21+
QSplitter::handle:hover {
22+
background-color: #F4F5F6;
23+
}
24+
QSplitter::handle:pressed {
25+
background-color: #F4F5F6;
26+
}</string>
1827
</property>
1928
<property name="locale">
2029
<locale language="English" country="UnitedStates"/>
@@ -48,10 +57,10 @@
4857
<string notr="true">QFrame {background-color: #313640;color:#FFF;}</string>
4958
</property>
5059
<property name="frameShape">
51-
<enum>QFrame::StyledPanel</enum>
60+
<enum>QFrame::Shape::StyledPanel</enum>
5261
</property>
5362
<property name="frameShadow">
54-
<enum>QFrame::Raised</enum>
63+
<enum>QFrame::Shadow::Raised</enum>
5564
</property>
5665
<property name="lineWidth">
5766
<number>0</number>
@@ -166,15 +175,44 @@ background: #636872;
166175
</font>
167176
</property>
168177
<property name="styleSheet">
169-
<string notr="true">QListWidget::item {
170-
padding: 3px;
178+
<string notr="true">#group_list {
179+
color: white;
180+
outline: none;
181+
}
182+
183+
#group_list::item {
184+
color: white;
185+
padding: 4px;
186+
187+
padding-left: 0px;
188+
}
189+
190+
#group_list::item:selected {
191+
background-color: #2a2e36;
192+
193+
padding-left: 0px;
194+
}
195+
#group_list::item:hover {
196+
background-color: #274665;
197+
198+
padding-left: 0px;
199+
}
200+
#group_list::item:selected:active {
201+
background-color: #27466;
202+
203+
padding-left: 0px;
204+
}
205+
#group_list::item:selected:!active {
206+
background-color: #2a2e36;
207+
208+
padding-left: 0px;
171209
}</string>
172210
</property>
173211
<property name="frameShape">
174-
<enum>QFrame::NoFrame</enum>
212+
<enum>QFrame::Shape::NoFrame</enum>
175213
</property>
176214
<property name="frameShadow">
177-
<enum>QFrame::Plain</enum>
215+
<enum>QFrame::Shadow::Plain</enum>
178216
</property>
179217
<property name="lineWidth">
180218
<number>1</number>
@@ -237,7 +275,7 @@ background: #636872;
237275
<item>
238276
<spacer name="horizontalSpacer_8">
239277
<property name="orientation">
240-
<enum>Qt::Horizontal</enum>
278+
<enum>Qt::Orientation::Horizontal</enum>
241279
</property>
242280
<property name="sizeHint" stdset="0">
243281
<size>
@@ -297,7 +335,7 @@ background: #636872;
297335
<item>
298336
<spacer name="horizontalSpacer_6">
299337
<property name="orientation">
300-
<enum>Qt::Horizontal</enum>
338+
<enum>Qt::Orientation::Horizontal</enum>
301339
</property>
302340
<property name="sizeHint" stdset="0">
303341
<size>
@@ -354,7 +392,7 @@ background: #636872;
354392
<item>
355393
<spacer name="horizontalSpacer_7">
356394
<property name="orientation">
357-
<enum>Qt::Horizontal</enum>
395+
<enum>Qt::Orientation::Horizontal</enum>
358396
</property>
359397
<property name="sizeHint" stdset="0">
360398
<size>
@@ -377,10 +415,10 @@ background: #636872;
377415
<string notr="true">QFrame {background:#F4F5F6;}</string>
378416
</property>
379417
<property name="frameShape">
380-
<enum>QFrame::StyledPanel</enum>
418+
<enum>QFrame::Shape::StyledPanel</enum>
381419
</property>
382420
<property name="frameShadow">
383-
<enum>QFrame::Raised</enum>
421+
<enum>QFrame::Shadow::Raised</enum>
384422
</property>
385423
<layout class="QVBoxLayout" name="verticalLayout_2">
386424
<property name="leftMargin">
@@ -406,7 +444,8 @@ background: #636872;
406444
</font>
407445
</property>
408446
<property name="styleSheet">
409-
<string notr="true">margin: 3px 3px 3px 12px;</string>
447+
<string notr="true">margin: 3px 3px 3px 12px;
448+
color: black;</string>
410449
</property>
411450
<property name="text">
412451
<string>Task List</string>
@@ -431,8 +470,10 @@ background: #636872;
431470
</property>
432471
<property name="styleSheet">
433472
<string notr="true">QLineEdit {
434-
border: 1px solid #F4F5F6;
435473
padding-left: 6px;
474+
background: white;
475+
color: black;
476+
border-radius: 3px;
436477
}</string>
437478
</property>
438479
</widget>
@@ -545,15 +586,62 @@ background: #DBDCDD;
545586
</font>
546587
</property>
547588
<property name="styleSheet">
548-
<string notr="true">QListWidget::item {
549-
padding: 3px;
589+
<string notr="true">#task_list {
590+
outline: none;
591+
}
592+
593+
/* ITEM */
594+
#task_list::item {
595+
padding: 3px;
596+
}
597+
598+
#task_list::item:focus {
599+
outline: none;
600+
color: black;
601+
}
602+
#task_list::item:selected:focus {
603+
outline: none;
604+
color: black;
605+
}
606+
607+
#task_list::item:selected {
608+
background-color: #c4e0f8;
609+
color: black;
610+
}
611+
#task_list::item:selected:active {
612+
background-color: #c4e0f8;
613+
color: black;
614+
}
615+
#task_list::item:selected:!active {
616+
background-color: #d0d0d1;
617+
color: black;
618+
}
619+
#task_list::item:hover {
620+
background-color: #dbeaf7;
621+
color: black;
622+
}
623+
624+
/* CHECKBOX */
625+
#task_list::indicator {
626+
width: 14px;
627+
height: 14px;
628+
position: absolute;
629+
left: 6px;
630+
}
631+
#task_list::indicator:unchecked {
632+
border: 1px solid #333333;
633+
background-color: #ffffff;
634+
}
635+
#task_list::indicator:checked {
636+
border: 1px solid #333333;
637+
background-color: #2a2e36;
550638
}</string>
551639
</property>
552640
<property name="frameShape">
553-
<enum>QFrame::NoFrame</enum>
641+
<enum>QFrame::Shape::NoFrame</enum>
554642
</property>
555643
<property name="frameShadow">
556-
<enum>QFrame::Plain</enum>
644+
<enum>QFrame::Shadow::Plain</enum>
557645
</property>
558646
<property name="lineWidth">
559647
<number>1</number>
@@ -572,10 +660,10 @@ background: #DBDCDD;
572660
<string notr="true">QFrame {background:#FFF;}</string>
573661
</property>
574662
<property name="frameShape">
575-
<enum>QFrame::StyledPanel</enum>
663+
<enum>QFrame::Shape::StyledPanel</enum>
576664
</property>
577665
<property name="frameShadow">
578-
<enum>QFrame::Raised</enum>
666+
<enum>QFrame::Shadow::Raised</enum>
579667
</property>
580668
<layout class="QVBoxLayout" name="verticalLayout_3">
581669
<property name="spacing">
@@ -619,6 +707,8 @@ background: #DBDCDD;
619707
<string notr="true">QLineEdit {
620708
border: none;
621709
margin-left: 17px;
710+
background: white;
711+
color: black;
622712
}</string>
623713
</property>
624714
<property name="inputMask">
@@ -715,7 +805,7 @@ background: #DBDCDD;
715805
}</string>
716806
</property>
717807
<property name="orientation">
718-
<enum>Qt::Horizontal</enum>
808+
<enum>Qt::Orientation::Horizontal</enum>
719809
</property>
720810
</widget>
721811
</item>
@@ -730,13 +820,14 @@ background: #DBDCDD;
730820
<string notr="true">QTextEdit {
731821
margin: 10px;
732822
margin-left: 14px;
823+
color: black;
733824
}</string>
734825
</property>
735826
<property name="frameShape">
736-
<enum>QFrame::NoFrame</enum>
827+
<enum>QFrame::Shape::NoFrame</enum>
737828
</property>
738829
<property name="frameShadow">
739-
<enum>QFrame::Plain</enum>
830+
<enum>QFrame::Shadow::Plain</enum>
740831
</property>
741832
<property name="lineWidth">
742833
<number>0</number>
@@ -774,7 +865,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
774865
<item row="1" column="0">
775866
<spacer name="horizontalSpacer_2">
776867
<property name="orientation">
777-
<enum>Qt::Horizontal</enum>
868+
<enum>Qt::Orientation::Horizontal</enum>
778869
</property>
779870
<property name="sizeHint" stdset="0">
780871
<size>
@@ -787,7 +878,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
787878
<item row="1" column="4">
788879
<spacer name="horizontalSpacer_4">
789880
<property name="orientation">
790-
<enum>Qt::Horizontal</enum>
881+
<enum>Qt::Orientation::Horizontal</enum>
791882
</property>
792883
<property name="sizeHint" stdset="0">
793884
<size>
@@ -800,7 +891,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
800891
<item row="3" column="0">
801892
<spacer name="horizontalSpacer_5">
802893
<property name="orientation">
803-
<enum>Qt::Horizontal</enum>
894+
<enum>Qt::Orientation::Horizontal</enum>
804895
</property>
805896
<property name="sizeHint" stdset="0">
806897
<size>
@@ -829,7 +920,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
829920
<item row="2" column="0">
830921
<spacer name="horizontalSpacer">
831922
<property name="orientation">
832-
<enum>Qt::Horizontal</enum>
923+
<enum>Qt::Orientation::Horizontal</enum>
833924
</property>
834925
<property name="sizeHint" stdset="0">
835926
<size>
@@ -868,7 +959,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
868959
<item row="2" column="4">
869960
<spacer name="horizontalSpacer_3">
870961
<property name="orientation">
871-
<enum>Qt::Horizontal</enum>
962+
<enum>Qt::Orientation::Horizontal</enum>
872963
</property>
873964
<property name="sizeHint" stdset="0">
874965
<size>

‎src/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#include <QCryptographicHash>
77

88
const QString SOFT_NAME = "TaskGuard";
9-
const QString SOFT_VERSION = "1.3.3";
9+
const QString SOFT_VERSION = "1.3.4";
1010

1111
// Used to encrypt various data in the application, we recommend that you change this value "QString(value)" for private use.
12-
const QString MAGIC = QCryptographicHash::hash(QString("ay4pFGqiEuoCN8Lg6QZoFnkfM7Uqoe9P62b7amZzO6wmcrPfkeUDcW2CT0JAvjnvF3uu7aWY30yRL2ylBQoxKtPkkC9NkvFlUZcipg11yRZwp5qN5m46YxE3pUtry2p2").toUtf8() + QSysInfo::machineUniqueId(), QCryptographicHash::Blake2b_512).toHex();
12+
const QString MAGIC = QCryptographicHash::hash(QString("2as3N6vtY5AjB674vig1YGuynTL2hQwU0eKUy4IiHi0eAG1HvcYnuzy8WAT2xQdrRhFPlnF0i0Ysgm3w47glH7gYbmqrxzz3TDMCECEAvOBqjN07xRASGY6fLAEHsSn5").toUtf8() + QSysInfo::machineUniqueId(), QCryptographicHash::Blake2b_512).toHex();
1313

1414
// Settings
1515
void save_settings(QString name, QString data);

0 commit comments

Comments
 (0)