css: Remove .primary-toolbar

It's not used anywhere anymore.

diff --git a/demos/gtk-demo/themes.ui b/demos/gtk-demo/themes.ui
index f9212052844a302ab3cf810d0453f6ef03525950..7d023658b268fa4efd920c52c0e87ed79a655a3a 100644 (file)
--- 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 b5bc13b1a8e86b0c52b16dd8229aba6c9b2e4f3d..431dd2e3cddffc91a4a5960011a2feaa1111d0bb 100644 (file)
--- 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 5747a62fe8aba7a4a856d4d8059393232057ac24..1b204416a7d9be87718fdc2d7d4f6a24399cdca1 100644 (file)
--- 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 29820d706878ff652e8a06f94a09fc5695ca6a6f..881e11068924526a16789f39f37764193c51d19f 100644 (file)
--- 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 57fcaf7eaa8ab16b7fbd39a63511b97f21b4ae28..d86b36a0c236e4d875d8d00bcdf753c63b088452 100644 (file)
--- 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 dbd9d71bd09da65c0dd424b67ca30513ed93738f..9bd5835ba0e9f1fc8f86ef909bcd168e1c0ec7d2 100644 (file)
--- 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 04042928829807752571ed0ac2cfebad85982257..cc6bf71df7dc118e49b3bd117c8bbc98c1e15b29 100644 (file)
--- 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 6d6400173634d50704c37d403bdd862fa2b6ccdb..2a059363a3ee8487cf2a7750a7b6667996ca5c5b 100644 (file)
--- 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

diff --git a/tests/visuals/primary-toolbar.ui b/tests/visuals/primary-toolbar.ui
deleted file mode 100644 (file)
index 31632c3..0000000
--- a/tests/visuals/primary-toolbar.ui
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="default_width">800</property>
-    <child>
-      <object class="GtkGrid" id="grid">
-        <property name="row-spacing">6</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkToolbar" id="toolbar1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkToggleToolButton" id="toolbutton1">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use_underline">True</property>
-                <property name="is_important">True</property>
-                <property name="icon_name">edit-find</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="toolbutton2">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use_underline">True</property>
-                <property name="is_important">True</property>
-                <property name="icon_name">edit-find</property>
-                <property name="active">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="toolbutton3">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Insensitive</property>
-                <property name="use_underline">True</property>
-                <property name="is_important">True</property>
-                <property name="icon_name">edit-find</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="toolbutton4">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Insensitive Active</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">edit-find</property>
-                <property name="is_important">True</property>
-                <property name="active">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolItem" id="toolitementry">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkEntry" id="entry1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</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>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolItem" id="toolitemswitch">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkSwitch" id="switch1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToolbar" id="toolbar2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkToggleToolButton" id="toolbutton5">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use_underline">True</property>
-                <property name="is_important">True</property>
-                <property name="icon_name">edit-find-symbolic</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="toolbutton6">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use_underline">True</property>
-                <property name="is_important">True</property>
-                <property name="icon_name">edit-find-symbolic</property>
-                <property name="active">True</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="toolbutton7">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Insensitive</property>
-                <property name="use_underline">True</property>
-                <property name="is_important">True</property>
-                <property name="icon_name">edit-find-symbolic</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="toolbutton8">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Insensitive Active</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">edit-find-symbolic</property>
-                <property name="is_important">True</property>
-                <property name="active">True</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>