diff options
| -rw-r--r-- | demos/gtk-demo/themes.ui | 98 | ||||
| -rw-r--r-- | demos/gtk-demo/theming.ui | 97 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk4-sections.txt | 1 | ||||
| -rw-r--r-- | gtk/gtkstylecontext.h | 9 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 2 | ||||
| -rw-r--r-- | gtk/theme/HighContrast/_common.scss | 2 | ||||
| -rw-r--r-- | po-properties/POTFILES.skip | 1 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 | ||||
| -rw-r--r-- | tests/visuals/primary-toolbar.ui | 211 |
9 files changed, 0 insertions, 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 @@ -16,104 +16,6 @@ <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> <property name="halign">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 @@ -5,103 +5,6 @@ <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> <property name="halign">center</property> diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 5747a62fe8..1b204416a7 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 29820d7068..881e110689 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -241,15 +241,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: * * A CSS class to match statusbars. 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 diff --git a/tests/visuals/primary-toolbar.ui b/tests/visuals/primary-toolbar.ui deleted file mode 100644 index 31632c363a..0000000000 --- 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> |