[gtk/wip/otte/toolbar: 4/6] css: Remove .primary-toolbar
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/toolbar: 4/6] css: Remove .primary-toolbar
- Date: Mon, 3 Feb 2020 16:54:18 +0000 (UTC)
commit d18cb575d1aca929b98744e0d9fbd27d3671ef8e
Author: Benjamin Otte <otte redhat com>
Date: Mon Feb 3 17:34:29 2020 +0100
css: Remove .primary-toolbar
It's not used anywhere anymore.
demos/gtk-demo/themes.ui | 98 ----------------
demos/gtk-demo/theming.ui | 97 ----------------
docs/reference/gtk/gtk4-sections.txt | 1 -
gtk/gtkstylecontext.h | 9 --
gtk/theme/Adwaita/_common.scss | 2 -
gtk/theme/HighContrast/_common.scss | 2 -
po-properties/POTFILES.skip | 1 -
po/POTFILES.skip | 1 -
tests/visuals/primary-toolbar.ui | 211 -----------------------------------
9 files changed, 422 deletions(-)
---
diff --git a/demos/gtk-demo/themes.ui b/demos/gtk-demo/themes.ui
index f921205284..7d023658b2 100644
--- a/demos/gtk-demo/themes.ui
+++ b/demos/gtk-demo/themes.ui
@@ -15,104 +15,6 @@
<property name="margin">10</property>
<property name="row-spacing">10</property>
<property name="orientation">vertical</property>
- <child>
- <object class="GtkToolbar">
- <property name="hexpand">1</property>
- <property name="show-arrow">0</property>
- <style>
- <class name="primary-toolbar"/>
- </style>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="label" translatable="yes">Normal</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="label" translatable="yes">Active</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- <property name="active">1</property>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="sensitive">0</property>
- <property name="label" translatable="yes">Insensitive</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="label" translatable="yes">Raised</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- <style>
- <class name="raised"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="label" translatable="yes">Raised Active</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- <property name="active">1</property>
- <style>
- <class name="raised"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="sensitive">0</property>
- <property name="label" translatable="yes">Insensitive Active</property>
- <property name="use-underline">1</property>
- <property name="icon-name">edit-find</property>
- <property name="is-important">1</property>
- <property name="active">1</property>
- </object>
- </child>
- <child>
- <object class="GtkToolItem">
- <child>
- <object class="GtkEntry" id="entry1">
- <property name="can-focus">1</property>
- <property name="width-chars">10</property>
- <property name="invisible-char">•</property>
- <property name="placeholder-text" translatable="yes">Search...</property>
- <property name="secondary-icon-name">edit-find-symbolic</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkToolItem">
- <child>
- <object class="GtkSwitch" id="switch1">
- <property name="can-focus">1</property>
- <property name="valign">center</property>
- <property name="tooltip_text">Switch it</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
<child>
<object class="GtkBox">
<property name="valign">center</property>
diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index b5bc13b1a8..431dd2e3cd 100644
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -4,103 +4,6 @@
<property name="row-spacing">10</property>
<property name="margin">10</property>
<property name="orientation">vertical</property>
- <child>
- <object class="GtkToolbar">
- <property name="hexpand">1</property>
- <property name="show-arrow">0</property>
- <style>
- <class name="primary-toolbar"/>
- </style>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="label" translatable="yes">Normal</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="label" translatable="yes">Active</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- <property name="active">1</property>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="sensitive">0</property>
- <property name="label" translatable="yes">Insensitive</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="label" translatable="yes">Raised</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- <style>
- <class name="raised"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="label" translatable="yes">Raised Active</property>
- <property name="use-underline">1</property>
- <property name="is-important">1</property>
- <property name="icon-name">edit-find</property>
- <property name="active">1</property>
- <style>
- <class name="raised"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkToggleToolButton">
- <property name="homogeneous">1</property>
- <property name="sensitive">0</property>
- <property name="label" translatable="yes">Insensitive Active</property>
- <property name="use-underline">1</property>
- <property name="icon-name">edit-find</property>
- <property name="is-important">1</property>
- <property name="active">1</property>
- </object>
- </child>
- <child>
- <object class="GtkToolItem">
- <child>
- <object class="GtkEntry" id="entry1">
- <property name="can-focus">1</property>
- <property name="invisible-char">•</property>
- <property name="placeholder-text" translatable="yes">Search...</property>
- <property name="secondary-icon-name">edit-find-symbolic</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkToolItem">
- <child>
- <object class="GtkSwitch" id="switch1">
- <property name="can-focus">1</property>
- <property name="valign">center</property>
- <property name="tooltip_text">Switch it</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
<child>
<object class="GtkBox">
<property name="valign">center</property>
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 2482f9e0dc..f692b4cde9 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4764,7 +4764,6 @@ GTK_STYLE_CLASS_PANE_SEPARATOR
GTK_STYLE_CLASS_PAPER
GTK_STYLE_CLASS_POPUP
GTK_STYLE_CLASS_POPOVER
-GTK_STYLE_CLASS_PRIMARY_TOOLBAR
GTK_STYLE_CLASS_PROGRESSBAR
GTK_STYLE_CLASS_PULSE
GTK_STYLE_CLASS_QUESTION
diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index ce72e45636..8ad4ba31fc 100644
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -240,15 +240,6 @@ struct _GtkStyleContextClass
*/
#define GTK_STYLE_CLASS_TOOLBAR "toolbar"
-/**
- * GTK_STYLE_CLASS_PRIMARY_TOOLBAR:
- *
- * A CSS class to match primary toolbars.
- *
- * Refer to individual widget documentation for used style classes.
- */
-#define GTK_STYLE_CLASS_PRIMARY_TOOLBAR "primary-toolbar"
-
/**
* GTK_STYLE_CLASS_STATUSBAR:
*
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 57fcaf7eaa..d86b36a0c2 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -825,8 +825,6 @@ button {
> box > box > label { font-weight: bold; }
}
- .primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows
-
.linked:not(.vertical) > & { @extend %linked; }
.linked.vertical > & { @extend %linked_vertical; }
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index dbd9d71bd0..9bd5835ba0 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -686,8 +686,6 @@ button {
}
}
- .primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows
-
.linked:not(.vertical) > & { @extend %linked; }
.linked.vertical > & { @extend %linked_vertical; }
diff --git a/po-properties/POTFILES.skip b/po-properties/POTFILES.skip
index 0404292882..cc6bf71df7 100644
--- a/po-properties/POTFILES.skip
+++ b/po-properties/POTFILES.skip
@@ -355,5 +355,4 @@ testsuite/tools/simplify-data-3to4/stack.ui
testsuite/tools/simplify-data/test3.ui
tests/visuals/linked-buttons-horizontal.ui
tests/visuals/linked-buttons-vertical.ui
-tests/visuals/primary-toolbar.ui
tests/visuals/suggested-action-buttons.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 6d64001736..2a059363a3 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -315,5 +315,4 @@ testsuite/tools/simplify-data-3to4/stack.ui
testsuite/tools/simplify-data/test3.ui
tests/visuals/linked-buttons-horizontal.ui
tests/visuals/linked-buttons-vertical.ui
-tests/visuals/primary-toolbar.ui
tests/visuals/suggested-action-buttons.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
