Commit 17d52d46 authored by William Jon McCann's avatar William Jon McCann Committed by Bastien Nocera

shell: Don't use GtkBuilder for constructing the shell

So that we can more easily add GdHeaderBar in the following
patches.

Much of the advantage of using gtkbuilder was lost anyway because
we couldn't really use it from glade without corrupting the file.

https://bugzilla.gnome.org/show_bug.cgi?id=692174
parent 42974a3c
......@@ -16,10 +16,6 @@ libshell_la_SOURCES = \
bin_PROGRAMS = gnome-control-center
BUILT_SOURCES = \
cc-shell-resources.c \
cc-shell-resources.h
gnome_control_center_SOURCES = \
$(BUILT_SOURCES) \
main.c \
......@@ -96,12 +92,6 @@ menu_DATA = gnomecc.menu
gnomecc.menu: gnomecc.menu.in
$(AM_V_GEN) cat $< | sed 's,@applicationsdir@,$(datadir)/applications/,' > $@
resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/shell.gresource.xml)
cc-shell-resources.c: shell.gresource.xml $(resource_files)
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_shell $<
cc-shell-resources.h: shell.gresource.xml $(resource_files)
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_shell $<
sysdir = $(datadir)/applications
sys_in_files = gnome-control-center.desktop.in
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
......@@ -114,8 +104,6 @@ completions/gnome-control-center: completions/gnome-control-center.in list-panel
$(AM_V_GEN) mkdir -p `dirname $@` && cat $< | sed "s,@PANELS@,`$(srcdir)/list-panel.sh $(top_srcdir)`," > $@
EXTRA_DIST = \
$(resource_files) \
shell.gresource.xml \
gnome-control-center.desktop.in.in \
$(completion_in_files) \
list-panel.sh \
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/control-center/shell">
<file preprocess="xml-stripblanks">shell.ui</file>
</gresource>
</gresources>
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="3.0"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkApplicationWindow" id="main-window">
<property name="title" translatable="yes">Settings</property>
<property name="resizable">False</property>
<property name="icon_name">preferences-desktop</property>
<property name="window_position">center</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
<style>
<class name="menubar"/>
</style>
<child>
<object class="GtkToolItem" id="toolbutton1">
<property name="visible">True</property>
<style>
<class name="raised"/>
</style>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="top_padding">5</property>
<property name="bottom_padding">5</property>
<property name="left_padding">10</property>
<property name="right_padding">5</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
<object class="GtkAspectFrame" id="home-aspect-frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ratio">1</property>
<property name="shadow-type">none</property>
<property name="obey-child">False</property>
<child>
<object class="GtkButton" id="home-button">
<property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_action_appearance">False</property>
<property name="image">image1</property>
<property name="use_underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="home-button-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">All Settings</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="entry-alignment">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
<object class="GtkBox" id="topright">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<child>
<object class="GtkSearchEntry" id="search-entry">
<property name="width_request">210</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="secondary-icon-name">edit-find-symbolic</property>
<property name="secondary-icon-activatable">False</property>
<property name="secondary-icon-sensitive">False</property>
</object>
</child>
<child>
<object class="GtkLockButton" id="lock-button">
<property name="visible">False</property>
<property name="no_show_all">True</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show-tabs">False</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkViewport" id="viewport">
<property name="visible">True</property>
<property name="resize_mode">queue</property>
<property name="shadow_type">none</property>
<style>
<class name="view" />
</style>
<child>
<object class="GtkVBox" id="main-vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkScrolledWindow" id="search-scrolled-window">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkListStore" id="liststore">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
<!-- column-name exec -->
<column type="gchararray"/>
<!-- column-name icon -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkSizeGroup" id="sizegroup">
<property name="mode">vertical</property>
<widgets>
<widget name="home-button"/>
<widget name="search-entry"/>
</widgets>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">view-grid-symbolic</property>
<property name="use_fallback">True</property>
<property name="pixel-size">16</property>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment