diff --git a/src/ads.qrc b/src/ads.qrc index 7085b99..0c9f4e6 100644 --- a/src/ads.qrc +++ b/src/ads.qrc @@ -7,5 +7,8 @@ images/close-button-focused.svg stylesheets/focus_highlighting.css stylesheets/focus_highlighting_linux.css + images/tabs-menu-button.svg + images/detach-button.svg + images/detach-button-disabled.svg diff --git a/src/images/close-button-disabled.svg b/src/images/close-button-disabled.svg index e213ca7..cbcf1e5 100644 --- a/src/images/close-button-disabled.svg +++ b/src/images/close-button-disabled.svg @@ -59,7 +59,7 @@ inkscape:snap-bbox="true" inkscape:window-maximized="1" inkscape:window-y="-8" - inkscape:window-x="-8" + inkscape:window-x="1912" inkscape:window-height="1017" inkscape:window-width="1920" units="px" @@ -105,7 +105,7 @@ transform="translate(628,-140.49998)"> @@ -132,7 +132,7 @@ image/svg+xml - + diff --git a/src/images/detach-button-disabled.svg b/src/images/detach-button-disabled.svg new file mode 100644 index 0000000..3a7c082 --- /dev/null +++ b/src/images/detach-button-disabled.svg @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Jemis Mali + + + + + image/svg+xml + + + + + + + + diff --git a/src/images/detach-button.svg b/src/images/detach-button.svg new file mode 100644 index 0000000..88d9bf2 --- /dev/null +++ b/src/images/detach-button.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Jemis Mali + + + + + image/svg+xml + + + + + + + diff --git a/src/images/tabs-menu-button.svg b/src/images/tabs-menu-button.svg new file mode 100644 index 0000000..dcd5eb2 --- /dev/null +++ b/src/images/tabs-menu-button.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + Jemis Mali + + + + + image/svg+xml + + + + + + diff --git a/src/stylesheets/default.css b/src/stylesheets/default.css index 3f1f894..f5cd680 100644 --- a/src/stylesheets/default.css +++ b/src/stylesheets/default.css @@ -1,103 +1,93 @@ - /* * Default style sheet on Windows Platforms */ - -ads--CDockContainerWidget -{ - background: palette(dark); +ads--CDockContainerWidget { + background: palette(dark); } -ads--CDockContainerWidget QSplitter::handle -{ - background: palette(dark); +ads--CDockContainerWidget QSplitter::handle { + background: palette(dark); } -ads--CDockAreaWidget -{ - background: palette(window); - border: 1px solid white; +ads--CDockAreaWidget { + background: palette(window); + border: 1px solid white; } - - -ads--CDockWidgetTab -{ - background: palette(window); - border-color: palette(light); - border-style: solid; - border-width: 0 1px 0 0; - padding: 0 0px; +ads--CDockWidgetTab { + background: palette(window); + border-color: palette(light); + border-style: solid; + border-width: 0 1px 0 0; + padding: 0 0px; } -ads--CDockWidgetTab[activeTab="true"] -{ - background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:0.5, stop:0 palette(window), stop:1 palette(light)); - /*background: palette(highlight);*/ +ads--CDockWidgetTab[activeTab="true"] { + background: qlineargradient(spread : pad, x1 : 0, y1 : 0, x2 : 0, y2 : 0.5, stop : 0 + palette(window), stop:1 palette(light)); + /*background: palette(highlight);*/ } -ads--CDockWidgetTab QLabel -{ - color: palette(dark); +ads--CDockWidgetTab QLabel { + color: palette(dark); } -ads--CDockWidgetTab[activeTab="true"] QLabel -{ - color: palette(foreground); +ads--CDockWidgetTab[activeTab="true"] QLabel { + color: palette(foreground); } -ads--CDockWidget -{ - background: palette(light); - border-color: palette(light); - border-style: solid; - border-width: 1px 0 0 0; +ads--CDockWidget { + background: palette(light); + border-color: palette(light); + border-style: solid; + border-width: 1px 0 0 0; } -ads--CTitleBarButton -{ +ads--CTitleBarButton { padding: 0px 0px; } - -QScrollArea#dockWidgetScrollArea -{ +QScrollArea#dockWidgetScrollArea { padding: 0px; border: none; } - -#tabCloseButton -{ +#tabCloseButton { margin-top: 2px; background: none; border: none; padding: 0px -2px; - qproperty-icon: url(:/ads/images/close-button.svg); - qproperty-iconSize: 16px; + qproperty-icon: url(:/ads/images/close-button.svg), + url(:/ads/images/close-button-disabled.svg) disabled; + qproperty-iconSize: 16px; } -#tabCloseButton:hover -{ +#tabCloseButton:hover { border: 1px solid rgba(0, 0, 0, 32); background: rgba(0, 0, 0, 16); } -#tabCloseButton:pressed -{ +#tabCloseButton:pressed { background: rgba(0, 0, 0, 32); } - -#tabsMenuButton::menu-indicator -{ - image: none; +#tabsMenuButton::menu-indicator { + image: none; } +#tabsMenuButton { + qproperty-icon: url(:/ads/images/tabs-menu-button.svg); + qproperty-iconSize: 16px; +} -#dockAreaCloseButton -{ - qproperty-icon: url(:/ads/images/close-button.svg); +#dockAreaCloseButton { + qproperty-icon: url(:/ads/images/close-button.svg), + url(:/ads/images/close-button-disabled.svg) disabled; + qproperty-iconSize: 16px; +} + +#detachGroupButton { + qproperty-icon: url(:/ads/images/detach-button.svg), + url(:/ads/images/detach-button-disabled.svg) disabled; qproperty-iconSize: 16px; -} - +} \ No newline at end of file diff --git a/src/stylesheets/default_linux.css b/src/stylesheets/default_linux.css index 7302c3b..3356eac 100644 --- a/src/stylesheets/default_linux.css +++ b/src/stylesheets/default_linux.css @@ -1,103 +1,88 @@ - /* * Default style sheet on Linux Platforms */ - -ads--CDockContainerWidget -{ - background: palette(dark); +ads--CDockContainerWidget { + background: palette(dark); } -ads--CDockContainerWidget QSplitter::handle -{ - background: palette(dark); +ads--CDockContainerWidget QSplitter::handle { + background: palette(dark); } -ads--CDockAreaWidget -{ - background: palette(window); - border: 1px solid white; +ads--CDockAreaWidget { + background: palette(window); + border: 1px solid white; } -ads--CDockAreaWidget #tabsMenuButton::menu-indicator -{ - image: none; +ads--CDockAreaWidget #tabsMenuButton::menu-indicator { + image: none; } - -ads--CDockWidgetTab -{ - background: palette(window); - border-color: palette(light); - border-style: solid; - border-width: 0 1px 0 0; - padding: 0 0px; +ads--CDockWidgetTab { + background: palette(window); + border-color: palette(light); + border-style: solid; + border-width: 0 1px 0 0; + padding: 0 0px; } -ads--CDockWidgetTab[activeTab="true"] -{ - background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:0.5, stop:0 palette(window), stop:1 palette(light)); - /*background: palette(highlight);*/ +ads--CDockWidgetTab[activeTab="true"] { + background: qlineargradient(spread : pad, x1 : 0, y1 : 0, x2 : 0, y2 : 0.5, stop : 0 + palette(window), stop:1 palette(light)); + /*background: palette(highlight);*/ } -ads--CDockWidgetTab QLabel -{ - color: palette(dark); +ads--CDockWidgetTab QLabel { + color: palette(dark); } -ads--CDockWidgetTab[activeTab="true"] QLabel -{ - color: palette(foreground); +ads--CDockWidgetTab[activeTab="true"] QLabel { + color: palette(foreground); } -ads--CDockWidget -{ - background: palette(light); - border-color: palette(light); - border-style: solid; - border-width: 1px 0 0 0; +ads--CDockWidget { + background: palette(light); + border-color: palette(light); + border-style: solid; + border-width: 1px 0 0 0; } - -ads--CTitleBarButton -{ +ads--CTitleBarButton { padding: 0px 0px; } - - -QScrollArea#dockWidgetScrollArea -{ +QScrollArea#dockWidgetScrollArea { padding: 0px; border: none; } - -#tabCloseButton -{ - margin-top: 2px; - background: none; - border: none; - padding: 0px -2px; - qproperty-icon: url(:/ads/images/close-button.svg); - qproperty-iconSize: 16px; +#tabCloseButton { + margin-top: 2px; + background: none; + border: none; + padding: 0px -2px; + qproperty-icon: url(:/ads/images/close-button.svg), + url(:/ads/images/close-button-disabled.svg) disabled; + qproperty-iconSize: 16px; } -#tabCloseButton:hover -{ - border: 1px solid rgba(0, 0, 0, 32); - background: rgba(0, 0, 0, 16); +#tabCloseButton:hover { + border: 1px solid rgba(0, 0, 0, 32); + background: rgba(0, 0, 0, 16); } -#tabCloseButton:pressed -{ - background: rgba(0, 0, 0, 32); +#tabCloseButton:pressed { + background: rgba(0, 0, 0, 32); } -#dockAreaCloseButton -{ - qproperty-icon: url(:/ads/images/close-button.svg); +#dockAreaCloseButton { + qproperty-icon: url(:/ads/images/close-button.svg), + url(:/ads/images/close-button-disabled.svg) disabled; + qproperty-iconSize: 16px; +} + +#detachGroupButton { + qproperty-icon: url(:/ads/images/detach-button.svg), + url(:/ads/images/detach-button-disabled.svg) disabled; qproperty-iconSize: 16px; -} - - +} \ No newline at end of file diff --git a/src/stylesheets/focus_highlighting.css b/src/stylesheets/focus_highlighting.css index baf4c20..e954b0d 100644 --- a/src/stylesheets/focus_highlighting.css +++ b/src/stylesheets/focus_highlighting.css @@ -1,158 +1,125 @@ - /* * Default style sheet on Windows Platforms with focus highlighting flag enabled */ - -ads--CDockContainerWidget -{ - background: palette(dark); +ads--CDockContainerWidget { + background: palette(dark); } - -ads--CDockAreaWidget -{ - background: palette(window); - border: 1px solid white; +ads--CDockAreaWidget { + background: palette(window); + border: 1px solid white; } - -ads--CDockWidgetTab -{ - background: palette(window); - border-color: palette(light); - border-style: solid; - border-width: 0 1px 0 0; - padding: 0 0px; +ads--CDockWidgetTab { + background: palette(window); + border-color: palette(light); + border-style: solid; + border-width: 0 1px 0 0; + padding: 0 0px; } -ads--CDockWidgetTab[activeTab="true"] -{ - background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:0.5, stop:0 palette(window), stop:1 palette(light)); - /*background: palette(highlight);*/ +ads--CDockWidgetTab[activeTab="true"] { + background: qlineargradient(spread : pad, x1 : 0, y1 : 0, x2 : 0, y2 : 0.5, stop : 0 + palette(window), stop:1 palette(light)); + /*background: palette(highlight);*/ } -ads--CDockWidgetTab QLabel -{ - color: palette(dark); +ads--CDockWidgetTab QLabel { + color: palette(dark); } -ads--CDockWidgetTab[activeTab="true"] QLabel -{ - color: palette(foreground); +ads--CDockWidgetTab[activeTab="true"] QLabel { + color: palette(foreground); } -ads--CDockWidget -{ - background: palette(light); - border-color: palette(light); - border-style: solid; - border-width: 1px 0 0 0; +ads--CDockWidget { + background: palette(light); + border-color: palette(light); + border-style: solid; + border-width: 1px 0 0 0; } -ads--CTitleBarButton -{ +ads--CTitleBarButton { padding: 0px 0px; } - -QScrollArea#dockWidgetScrollArea -{ +QScrollArea#dockWidgetScrollArea { padding: 0px; border: none; } - -#tabsMenuButton::menu-indicator -{ - image: none; +#tabsMenuButton::menu-indicator { + image: none; } - - -#tabCloseButton -{ +#tabCloseButton { margin-top: 2px; background: none; border: none; padding: 0px -2px; - qproperty-icon: url(:/ads/images/close-button.svg); - qproperty-iconSize: 16px; + qproperty-icon: url(:/ads/images/close-button.svg), + url(:/ads/images/close-button-disabled.svg) disabled; + qproperty-iconSize: 16px; } -#tabCloseButton:hover -{ +#tabCloseButton:hover { /*border: 1px solid rgba(0, 0, 0, 32);*/ background: rgba(0, 0, 0, 24); } -#tabCloseButton:pressed -{ +#tabCloseButton:pressed { background: rgba(0, 0, 0, 48); } +#dockAreaCloseButton { + qproperty-icon: url(:/ads/images/close-button.svg), + url(:/ads/images/close-button-disabled.svg) disabled; + qproperty-iconSize: 16px; +} -#dockAreaCloseButton -{ - qproperty-icon: url(:/ads/images/close-button.svg); +#detachGroupButton { + qproperty-icon: url(:/ads/images/detach-button.svg), + url(:/ads/images/detach-button-disabled.svg) disabled; qproperty-iconSize: 16px; } - - -ads--CDockSplitter::handle -{ - background-color: palette(dark); - /* uncomment the following line if you would like to change the size of +ads--CDockSplitter::handle { + background-color: palette(dark); + /* uncomment the following line if you would like to change the size of the splitter handles */ - /* height: 1px; */ + /* height: 1px; */ } - /* Focus related styling */ -ads--CDockWidgetTab[focused="true"] -{ - background: palette(highlight); - border-color: palette(highlight); +ads--CDockWidgetTab[focused="true"] { + background: palette(highlight); + border-color: palette(highlight); } -ads--CDockWidgetTab[focused="true"] > #tabCloseButton -{ +ads--CDockWidgetTab[focused="true"]>#tabCloseButton { qproperty-icon: url(:/ads/images/close-button-focused.svg) } - - -ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover -{ +ads--CDockWidgetTab[focused="true"]>#tabCloseButton:hover { background: rgba(255, 255, 255, 48); } - -ads--CDockWidgetTab[focused="true"] > #tabCloseButton:pressed -{ +ads--CDockWidgetTab[focused="true"]>#tabCloseButton:pressed { background: rgba(255, 255, 255, 92); } - -ads--CDockWidgetTab[focused="true"] QLabel -{ - color: palette(light); +ads--CDockWidgetTab[focused="true"] QLabel { + color: palette(light); } - -ads--CDockAreaTitleBar -{ +ads--CDockAreaTitleBar { background: transparent; border-bottom: 2px solid palette(light); padding-bottom: 0px; } -ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar -{ +ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar { background: transparent; border-bottom: 2px solid palette(highlight); padding-bottom: 0px; -} - - - +} \ No newline at end of file diff --git a/src/stylesheets/focus_highlighting_linux.css b/src/stylesheets/focus_highlighting_linux.css index 99ce68b..73b5e63 100644 --- a/src/stylesheets/focus_highlighting_linux.css +++ b/src/stylesheets/focus_highlighting_linux.css @@ -1,160 +1,133 @@ - /* * Default style sheet on Linux Platforms with focus highlighting flag enabled */ - -ads--CDockContainerWidget -{ - background: palette(dark); +ads--CDockContainerWidget { + background: palette(dark); } -ads--CDockContainerWidget QSplitter::handle -{ - background: palette(dark); +ads--CDockContainerWidget QSplitter::handle { + background: palette(dark); } -ads--CDockAreaWidget -{ - background: palette(window); - border: 1px solid white; +ads--CDockAreaWidget { + background: palette(window); + border: 1px solid white; } -ads--CDockAreaWidget #tabsMenuButton::menu-indicator -{ - image: none; +ads--CDockAreaWidget #tabsMenuButton::menu-indicator { + image: none; } - -ads--CDockWidgetTab -{ - background: palette(window); - border-color: palette(light); - border-style: solid; - border-width: 0 1px 0 0; - padding: 0 0px; +ads--CDockWidgetTab { + background: palette(window); + border-color: palette(light); + border-style: solid; + border-width: 0 1px 0 0; + padding: 0 0px; } -ads--CDockWidgetTab[activeTab="true"] -{ - background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:0.5, stop:0 palette(window), stop:1 palette(light)); - /*background: palette(highlight);*/ +ads--CDockWidgetTab[activeTab="true"] { + background: qlineargradient(spread : pad, x1 : 0, y1 : 0, x2 : 0, y2 : 0.5, stop : 0 + palette(window), stop:1 palette(light)); + /*background: palette(highlight);*/ } -ads--CDockWidgetTab QLabel -{ - color: palette(dark); +ads--CDockWidgetTab QLabel { + color: palette(dark); } -ads--CDockWidgetTab[activeTab="true"] QLabel -{ - color: palette(foreground); +ads--CDockWidgetTab[activeTab="true"] QLabel { + color: palette(foreground); } -ads--CDockWidget -{ - background: palette(light); - border-color: palette(light); - border-style: solid; - border-width: 1px 0 0 0; +ads--CDockWidget { + background: palette(light); + border-color: palette(light); + border-style: solid; + border-width: 1px 0 0 0; } - -ads--CTitleBarButton -{ +ads--CTitleBarButton { padding: 0px 0px; } - - -QScrollArea#dockWidgetScrollArea -{ +QScrollArea#dockWidgetScrollArea { padding: 0px; border: none; } +#dockAreaCloseButton { + qproperty-icon: url(:/ads/images/close-button.svg), + url(:/ads/images/close-button-disabled.svg) disabled; + qproperty-iconSize: 16px; +} -#dockAreaCloseButton -{ - qproperty-icon: url(:/ads/images/close-button.svg); +#detachGroupButton { + qproperty-icon: url(:/ads/images/detach-button.svg), + url(:/ads/images/detach-button-disabled.svg) disabled; qproperty-iconSize: 16px; } - -#tabCloseButton -{ - margin-top: 2px; - background: none; - border: none; - padding: 0px -2px; - qproperty-icon: url(:/ads/images/close-button.svg); - qproperty-iconSize: 16px; +#tabCloseButton { + margin-top: 2px; + background: none; + border: none; + padding: 0px -2px; + qproperty-icon: url(:/ads/images/close-button.svg), + url(:/ads/images/close-button-disabled.svg) disabled; + qproperty-iconSize: 16px; } -#tabCloseButton:hover -{ - /*border: 1px solid rgba(0, 0, 0, 32);*/ - background: rgba(0, 0, 0, 24); +#tabCloseButton:hover { + /*border: 1px solid rgba(0, 0, 0, 32);*/ + background: rgba(0, 0, 0, 24); } -#tabCloseButton:pressed -{ - background: rgba(0, 0, 0, 48); +#tabCloseButton:pressed { + background: rgba(0, 0, 0, 48); } /* Focus related styling */ -ads--CDockWidgetTab[focused="true"] -{ - background: palette(highlight); - border-color: palette(highlight); +ads--CDockWidgetTab[focused="true"] { + background: palette(highlight); + border-color: palette(highlight); } -ads--CDockWidgetTab[focused="true"] > #tabCloseButton -{ - qproperty-icon: url(:/ads/images/close-button-focused.svg) +ads--CDockWidgetTab[focused="true"]>#tabCloseButton { + qproperty-icon: url(:/ads/images/close-button-focused.svg) } - - -ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover -{ - background: rgba(255, 255, 255, 48); +ads--CDockWidgetTab[focused="true"]>#tabCloseButton:hover { + background: rgba(255, 255, 255, 48); } - -ads--CDockWidgetTab[focused="true"] > #tabCloseButton:pressed -{ - background: rgba(255, 255, 255, 92); +ads--CDockWidgetTab[focused="true"]>#tabCloseButton:pressed { + background: rgba(255, 255, 255, 92); } -ads--CDockWidgetTab[focused="true"] QLabel -{ - color: palette(light); +ads--CDockWidgetTab[focused="true"] QLabel { + color: palette(light); } - -ads--CDockAreaTitleBar -{ - background: transparent; - border-bottom: 2px solid palette(light); - padding-bottom: 0px; +ads--CDockAreaTitleBar { + background: transparent; + border-bottom: 2px solid palette(light); + padding-bottom: 0px; } -ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar -{ - background: transparent; - border-bottom: 2px solid palette(highlight); - padding-bottom: 0px; +ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar { + background: transparent; + border-bottom: 2px solid palette(highlight); + padding-bottom: 0px; } - ads--CFloatingDockContainer[isActiveWindow="true"] ads--CFloatingWidgetTitleBar -{ - background: palette(highlight); + { + background: palette(highlight); } - -ads--CFloatingDockContainer[isActiveWindow="true"] ads--CFloatingWidgetTitleBar > QLabel -{ - color: palette(light); -} +ads--CFloatingDockContainer[isActiveWindow="true"] ads--CFloatingWidgetTitleBar>QLabel + { + color: palette(light); +} \ No newline at end of file