diff options
| author | Iain Lane <iain.lane@canonical.com> | 2014-04-24 11:49:26 +0100 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2014-04-24 16:49:23 +0100 |
| commit | f0edb1f9794cebe0f5be8052824e7e07d023efc8 (patch) | |
| tree | 3fe41ea98d993e16b69c380b842249b6abb430a6 /data | |
| parent | 8d26d0404a6bcbca96a58265aec1853fd5886cc8 (diff) | |
| download | cheese-f0edb1f9794cebe0f5be8052824e7e07d023efc8.tar.gz | |
Use a traditional title bar when requested
Not all environments desire header bars. We use the
'gtk-shell-shows-menubar' setting to decide whether to use the header
bar.
https://bugzilla.gnome.org/show_bug.cgi?id=728866
Diffstat (limited to 'data')
| -rw-r--r-- | data/cheese-main-window.ui | 11 | ||||
| -rw-r--r-- | data/headerbar.ui | 10 | ||||
| -rw-r--r-- | data/org.gnome.Cheese.gresource.xml | 1 |
3 files changed, 11 insertions, 11 deletions
diff --git a/data/cheese-main-window.ui b/data/cheese-main-window.ui index 153edb88..05b1216a 100644 --- a/data/cheese-main-window.ui +++ b/data/cheese-main-window.ui @@ -2,17 +2,6 @@ <interface domain="cheese"> <requires lib="gtk+" version="3.10"/> <template class="CheeseMainWindow" parent="GtkApplicationWindow"> - <child type="titlebar"> - <object class="GtkHeaderBar" id="header_bar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Take a Photo</property> - <property name="show-close-button">True</property> - <style> - <class name="titlebar"/> - </style> - </object> - </child> <child> <object class="GtkBox" id="main_vbox"> <property name="orientation">vertical</property> diff --git a/data/headerbar.ui b/data/headerbar.ui new file mode 100644 index 00000000..05be6210 --- /dev/null +++ b/data/headerbar.ui @@ -0,0 +1,10 @@ +<interface domain="cheese"> + <object class="GtkHeaderBar" id="header_bar"> + <property name="can_focus">False</property> + <property name="title" translatable="yes">Take a Photo</property> + <property name="show-close-button">True</property> + <style> + <class name="titlebar"/> + </style> + </object> +</interface> diff --git a/data/org.gnome.Cheese.gresource.xml b/data/org.gnome.Cheese.gresource.xml index bf1bdaad..4d02eeac 100644 --- a/data/org.gnome.Cheese.gresource.xml +++ b/data/org.gnome.Cheese.gresource.xml @@ -6,6 +6,7 @@ <file preprocess="xml-stripblanks">cheese-appmenu.ui</file> <file preprocess="xml-stripblanks">cheese-main-window.ui</file> <file preprocess="xml-stripblanks">cheese-prefs.ui</file> + <file preprocess="xml-stripblanks">headerbar.ui</file> <file>pixmaps/cheese-1.svg</file> <file>pixmaps/cheese-2.svg</file> <file>pixmaps/cheese-3.svg</file> |