diff --git a/branding.spec b/branding.spec index 7e463f0..003ff0d 100644 --- a/branding.spec +++ b/branding.spec @@ -14,7 +14,7 @@ Name: %theme Version: 5.0.0 -Release: alt25 +Release: alt25.1 BuildArch: noarch BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu diff --git a/components/browser-qt/design/backward.png b/components/browser-qt/design/backward.png deleted file mode 100644 index f83afbd..0000000 Binary files a/components/browser-qt/design/backward.png and /dev/null differ diff --git a/components/browser-qt/design/bg.png b/components/browser-qt/design/bg.png new file mode 100644 index 0000000..c286575 Binary files /dev/null and b/components/browser-qt/design/bg.png differ diff --git a/components/browser-qt/design/design.ini.in b/components/browser-qt/design/design.ini.in index 9be8535..0271e6a 100644 --- a/components/browser-qt/design/design.ini.in +++ b/components/browser-qt/design/design.ini.in @@ -1,4 +1,4 @@ -Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@MIDDLE_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312 -Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@MIDDLE_COLOR_HEX@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312 - Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4, #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7, #eeece9, #000000, #aed4a1, #141312 +Palette\active=#141312, #c8d1e0, #d4dcf0, #b5c5e6, #3e5985, #7599d7, #141312, #ffffff, #141312, #ffffff, #a3b7e1, #273853, #418bd4, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #c0daff, #141312 +Palette\inactive=#141312, #c8d1e0, #d4dcf0, #b5c5e6, #3e5985, #7599d7, #141312, #ffffff, #141312, #ffffff, #a3b7e1, #273853, #418bd4, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #c0daff, #141312 +Palette\disabled=#6c7891, #bcc8da, #c8d3ec, #aabce3, #3b557f, #6a92d5, #a5a4a4, #ffffff, #838891, #f4f4f4, #97afde, #263651, #97afde, #6c7891, #97bcdf, #c1b6d7, #eeece9, #000000, #c0daff, #141312 diff --git a/components/browser-qt/design/design.qss.in b/components/browser-qt/design/design.qss.in index b69cbc1..60f5ced 100644 --- a/components/browser-qt/design/design.qss.in +++ b/components/browser-qt/design/design.qss.in @@ -1,4 +1,4 @@ -/* Customize any plain widget that is a child of a QMainWindow. */ + .AWizardFace { border-style: none; background-image: url(:/design/bg.png); @@ -6,29 +6,101 @@ background-repeat: no-repeat } +AWizardFace > QScrollArea { + border-width: 2px; + border-color: #5175AE; + border-style: solid; + border-radius: 5; + background-color: rgba(234, 232, 226, 50%); +} + .ACenterFace { border-style: none; - } +} .ACenterFace #modules_view { background-color: white; } -/* Nice WindowsXP-style password character for password line edits. */ +.ACenterFace #modules_view QToolButton:hover { + border-width: 1px; + border-color: #5175AE; + border-style: solid; + background-color: white; + border-radius: 5; +} + +.AWizardFaceStepList { + border-style: none; + border-top-right-radius: 1ex; + border-bottom-right-radius: 1ex; + background-image: url(:/design/bg-steplist.png); +} + +.AWizardFaceStepList QLabel { + font-weight: bold; + font-size: 10px; +} + +/* Nice WindowsXP-style password character */ QLineEdit[echoMode="2"] { lineedit-password-character: 9679; } - -/* Customize tooltips. */ QToolTip { - background-color: rgb(@MIDDLE_COLOR_DEC@); - border-color: darkslategray; - border-width: 1px; - border-style: solid; - padding: 3px; - font: bold; + border: 2px solid #5175AE; + padding: 5px; border-radius: 3px; opacity: 200; } +QPushButton { + background-color: #BDD3EE; + border-width: 2px; + border-color: #5175AE; + border-style: solid; + border-radius: 5; + padding: 3px; + min-width: 9ex; + min-height: 2.5ex; +} + +QPushButton:hover { + background-color: #CAE2FF; +} + +QPushButton:pressed { + padding-left: 5px; + padding-top: 5px; + background-color: #CAE2FF; +} + +QRadioButton, QCheckBox { + border-style: none; + border-radius: 3px; +} + +QRadioButton:hover, QCheckBox:hover { + background-color: #B0C7F3; +} + +QLineEdit { + border-width: 2px; + padding: 1px; + border-style: solid; + border-color: #5175AE; + border-radius: 5px; +} + +QLineEdit:focus { + border-width: 3px; + padding: 0px; +} + +QListView, QTreeView { + show-decoration-selected: 1; +} + +QListView::item:hover, QTreeView::item:hover { + background-color: #D4E3FC; +} diff --git a/components/browser-qt/design/forward.png b/components/browser-qt/design/forward.png deleted file mode 100644 index 97e5ff0..0000000 Binary files a/components/browser-qt/design/forward.png and /dev/null differ diff --git a/components/browser-qt/design/logo_48.png b/components/browser-qt/design/logo_48.png new file mode 100644 index 0000000..040cfc3 Binary files /dev/null and b/components/browser-qt/design/logo_48.png differ diff --git a/components/browser-qt/design/wzface-step-current.png b/components/browser-qt/design/wzface-step-current.png new file mode 100644 index 0000000..3fe0518 Binary files /dev/null and b/components/browser-qt/design/wzface-step-current.png differ diff --git a/components/browser-qt/design/wzface-step-done.png b/components/browser-qt/design/wzface-step-done.png new file mode 100644 index 0000000..4a60396 Binary files /dev/null and b/components/browser-qt/design/wzface-step-done.png differ diff --git a/components/browser-qt/theme.qrc b/components/browser-qt/theme.qrc index 4e3e1cf..e19b390 100644 --- a/components/browser-qt/theme.qrc +++ b/components/browser-qt/theme.qrc @@ -1,9 +1,17 @@ - design/bg.png design/design.qss design/design.ini + + design/logo_48.png + design/bg.png + + design/wzface-step-done.png + design/wzface-step-current.png diff --git a/images/wallpaper.png b/images/wallpaper.png index 0780b82..684514d 100644 Binary files a/images/wallpaper.png and b/images/wallpaper.png differ