Commit f7092202 authored by Kjartan Maraas's avatar Kjartan Maraas Committed by Kjartan Maraas
Browse files

Move the xml menu structure out into a file. Same. Same. Hook it up. Same.

2002-02-16  Kjartan Maraas  <kmaraas@gnome.org>

	* GNOME_ClockApplet.xml: Move the xml menu structure out into a file.
	* GNOME_MailCheckApplet.xml: Same.
	* GNOME_PagerApplet.xml: Same.
	* clock.c: Hook it up.
	* mailcheck.c: Same.
parent 52faace7
2002-02-16 Kjartan Maraas <kmaraas@gnome.org>
* GNOME_ClockApplet.xml: Move the xml menu structure out into a file.
* GNOME_MailCheckApplet.xml: Same.
* GNOME_PagerApplet.xml: Same.
* clock.c: Hook it up.
* mailcheck.c: Same.
* pager.c: Same.
* Makefile.am: Here too.
2002-02-15 Seth Nickell <snickell@stanford.edu>
* GNOME_GenUtilApplet_Factory.server.in.in:
......
<Root>
<popups>
<popup name="button3">
<menuitem name="Clock Properties Item" verb="ClockProperties" _label="Properties ..." pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Clock Copy Time Item" verb="ClockCopyTime" _label="Copy time" pixtype="stock" pixname="gtk-copy"/>
<menuitem name="Clock Copy Date Item" verb="ClockCopyDate" _label="Copy date" pixtype="stock" pixname="gtk-copy"/>
<menuitem name="Clock Help Item" verb="ClockHelp" _label="Help" pixtype="stock" pixname="gtk-help"/>
<menuitem name="Clock About Item" verb="ClockAbout" _label="About ..." pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
......@@ -51,6 +51,12 @@ mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)
schemadir = $(sysconfdir)/gconf/schemas
schema_DATA = mailcheck.schemas pager.schemas tasklist.schemas
uidir = $(datadir)/gnome-2.0/ui
ui_DATA = \
GNOME_ClockApplet.xml \
GNOME_MailCheckApplet.xml \
GNOME_PagerApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GenUtilApplet_Factory.server.in
server_DATA = $(server_in_files:.server.in=.server)
......@@ -69,4 +75,5 @@ EXTRA_DIST = GNOME_GenUtilApplet_Factory.server.in.in \
$(PRINTER_BITMAPS) \
$(MAILCHECK_BITMAPS) \
$(schema_DATA) \
$(glade_DATA)
$(glade_DATA) \
$(ui_DATA)
......@@ -507,20 +507,6 @@ static const BonoboUIVerb clock_menu_verbs [] = {
BONOBO_UI_VERB_END
};
static const char clock_menu_xml [] =
"<popup name=\"button3\">\n"
" <menuitem name=\"Clock Properties Item\" verb=\"ClockProperties\" _label=\"Properties ...\"\n"
" pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
" <menuitem name=\"Clock Copy Time Item\" verb=\"ClockCopyTime\" _label=\"Copy time\"\n"
" pixtype=\"stock\" pixname=\"gtk-copy\"/>\n"
" <menuitem name=\"Clock Copy Date Item\" verb=\"ClockCopyDate\" _label=\"Copy date\"\n"
" pixtype=\"stock\" pixname=\"gtk-copy\"/>\n"
" <menuitem name=\"Clock Help Item\" verb=\"ClockHelp\" _label=\"Help\"\n"
" pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
" <menuitem name=\"Clock About Item\" verb=\"ClockAbout\" _label=\"About ...\"\n"
" pixtype=\"stock\" pixname=\"gnome-stock-about\"/>\n"
"</popup>\n";
gboolean
fill_clock_applet(PanelApplet *applet)
{
......
2002-02-16 Kjartan Maraas <kmaraas@gnome.org>
* GNOME_ClockApplet.xml: Move the xml menu structure out into a file.
* GNOME_MailCheckApplet.xml: Same.
* GNOME_PagerApplet.xml: Same.
* clock.c: Hook it up.
* mailcheck.c: Same.
* pager.c: Same.
* Makefile.am: Here too.
2002-02-15 Seth Nickell <snickell@stanford.edu>
* GNOME_GenUtilApplet_Factory.server.in.in:
......
<Root>
<popups>
<popup name="button3">
<menuitem name="Clock Properties Item" verb="ClockProperties" _label="Properties ..." pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Clock Copy Time Item" verb="ClockCopyTime" _label="Copy time" pixtype="stock" pixname="gtk-copy"/>
<menuitem name="Clock Copy Date Item" verb="ClockCopyDate" _label="Copy date" pixtype="stock" pixname="gtk-copy"/>
<menuitem name="Clock Help Item" verb="ClockHelp" _label="Help" pixtype="stock" pixname="gtk-help"/>
<menuitem name="Clock About Item" verb="ClockAbout" _label="About ..." pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
<Root>
<popups>
<popup name="button3">
<menuitem name="Properties Item" verb="Properties" _label="Properties ..." pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Help Item" verb="Help" _label="Help" pixtype="stock" pixname="gtk-help"/>
<menuitem name="About Item" verb="About" _label="About ..." pixtype="stock" pixname="gnome-stock-about"/>
<menuitem name="Check Item" verb="Check" _label="Check for mail"/>
</popup>
</popups>
</Root>
<Root>
<popups>
<popup name="button3">
<menuitem name="Pager Properties Item" verb="PagerProperties" _label="Properties ..." pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Pager Help Item" verb="PagerHelp" _label="Help" pixtype="stock" pixname="gtk-help"/>
<menuitem name="Pager About Item" verb="PagerAbout" _label="About ..." pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
......@@ -51,6 +51,12 @@ mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)
schemadir = $(sysconfdir)/gconf/schemas
schema_DATA = mailcheck.schemas pager.schemas tasklist.schemas
uidir = $(datadir)/gnome-2.0/ui
ui_DATA = \
GNOME_ClockApplet.xml \
GNOME_MailCheckApplet.xml \
GNOME_PagerApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GenUtilApplet_Factory.server.in
server_DATA = $(server_in_files:.server.in=.server)
......@@ -69,4 +75,5 @@ EXTRA_DIST = GNOME_GenUtilApplet_Factory.server.in.in \
$(PRINTER_BITMAPS) \
$(MAILCHECK_BITMAPS) \
$(schema_DATA) \
$(glade_DATA)
$(glade_DATA) \
$(ui_DATA)
......@@ -507,20 +507,6 @@ static const BonoboUIVerb clock_menu_verbs [] = {
BONOBO_UI_VERB_END
};
static const char clock_menu_xml [] =
"<popup name=\"button3\">\n"
" <menuitem name=\"Clock Properties Item\" verb=\"ClockProperties\" _label=\"Properties ...\"\n"
" pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
" <menuitem name=\"Clock Copy Time Item\" verb=\"ClockCopyTime\" _label=\"Copy time\"\n"
" pixtype=\"stock\" pixname=\"gtk-copy\"/>\n"
" <menuitem name=\"Clock Copy Date Item\" verb=\"ClockCopyDate\" _label=\"Copy date\"\n"
" pixtype=\"stock\" pixname=\"gtk-copy\"/>\n"
" <menuitem name=\"Clock Help Item\" verb=\"ClockHelp\" _label=\"Help\"\n"
" pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
" <menuitem name=\"Clock About Item\" verb=\"ClockAbout\" _label=\"About ...\"\n"
" pixtype=\"stock\" pixname=\"gnome-stock-about\"/>\n"
"</popup>\n";
gboolean
fill_clock_applet(PanelApplet *applet)
{
......
......@@ -1448,17 +1448,6 @@ static const BonoboUIVerb mailcheck_menu_verbs [] = {
BONOBO_UI_VERB_END
};
static const char mailcheck_menu_xml [] =
"<popup name=\"button3\">\n"
" <menuitem name=\"Properties Item\" verb=\"Properties\" _label=\"Properties ...\"\n"
" pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
" <menuitem name=\"Help Item\" verb=\"Help\" _label=\"Help\"\n"
" pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
" <menuitem name=\"About Item\" verb=\"About\" _label=\"About ...\"\n"
" pixtype=\"stock\" pixname=\"gnome-stock-about\"/>\n"
" <menuitem name=\"Check Item\" verb=\"Check\" _label=\"Check for mail\"/>\n"
"</popup>\n";
gboolean
fill_mailcheck_applet(PanelApplet *applet)
{
......@@ -1512,8 +1501,12 @@ fill_mailcheck_applet(PanelApplet *applet)
G_CALLBACK(exec_clicked_cmd), mc);
panel_applet_setup_menu (applet, mailcheck_menu_xml,
mailcheck_menu_verbs, mc);
panel_applet_setup_menu_from_file (applet,
NULL,
"GNOME_MailCheckApplet.xml",
NULL,
mailcheck_menu_verbs,
mc);
gtk_widget_show (GTK_WIDGET (applet));
......
......@@ -142,17 +142,6 @@ static const BonoboUIVerb pager_menu_verbs [] = {
BONOBO_UI_VERB_END
};
static const char pager_menu_xml [] =
"<popup name=\"button3\">\n"
" <menuitem name=\"Pager Properties Item\" verb=\"PagerProperties\" _label=\"Properties ...\"\n"
" pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
" <menuitem name=\"Pager Help Item\" verb=\"PagerHelp\" _label=\"Help\"\n"
" pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
" <menuitem name=\"Pager About Item\" verb=\"PagerAbout\" _label=\"About ...\"\n"
" pixtype=\"stock\" pixname=\"gnome-stock-about\"/>\n"
"</popup>\n";
static void
num_rows_changed (GConfClient *client,
guint cnxn_id,
......@@ -358,7 +347,12 @@ fill_pager_applet(PanelApplet *applet)
G_CALLBACK (applet_change_pixel_size),
pager);
panel_applet_setup_menu (PANEL_APPLET (pager->applet), pager_menu_xml, pager_menu_verbs, pager);
panel_applet_setup_menu_from_file (PANEL_APPLET (pager->applet),
NULL,
"GNOME_PagerApplet.xml",
NULL,
pager_menu_verbs,
pager);
return TRUE;
}
......
2002-02-16 Kjartan Maraas <kmaraas@gnome.org>
* GNOME_ClockApplet.xml: Move the xml menu structure out into a file.
* GNOME_MailCheckApplet.xml: Same.
* GNOME_PagerApplet.xml: Same.
* clock.c: Hook it up.
* mailcheck.c: Same.
* pager.c: Same.
* Makefile.am: Here too.
2002-02-15 Seth Nickell <snickell@stanford.edu>
* GNOME_GenUtilApplet_Factory.server.in.in:
......
<Root>
<popups>
<popup name="button3">
<menuitem name="Properties Item" verb="Properties" _label="Properties ..." pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Help Item" verb="Help" _label="Help" pixtype="stock" pixname="gtk-help"/>
<menuitem name="About Item" verb="About" _label="About ..." pixtype="stock" pixname="gnome-stock-about"/>
<menuitem name="Check Item" verb="Check" _label="Check for mail"/>
</popup>
</popups>
</Root>
......@@ -51,6 +51,12 @@ mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)
schemadir = $(sysconfdir)/gconf/schemas
schema_DATA = mailcheck.schemas pager.schemas tasklist.schemas
uidir = $(datadir)/gnome-2.0/ui
ui_DATA = \
GNOME_ClockApplet.xml \
GNOME_MailCheckApplet.xml \
GNOME_PagerApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GenUtilApplet_Factory.server.in
server_DATA = $(server_in_files:.server.in=.server)
......@@ -69,4 +75,5 @@ EXTRA_DIST = GNOME_GenUtilApplet_Factory.server.in.in \
$(PRINTER_BITMAPS) \
$(MAILCHECK_BITMAPS) \
$(schema_DATA) \
$(glade_DATA)
$(glade_DATA) \
$(ui_DATA)
......@@ -1448,17 +1448,6 @@ static const BonoboUIVerb mailcheck_menu_verbs [] = {
BONOBO_UI_VERB_END
};
static const char mailcheck_menu_xml [] =
"<popup name=\"button3\">\n"
" <menuitem name=\"Properties Item\" verb=\"Properties\" _label=\"Properties ...\"\n"
" pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
" <menuitem name=\"Help Item\" verb=\"Help\" _label=\"Help\"\n"
" pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
" <menuitem name=\"About Item\" verb=\"About\" _label=\"About ...\"\n"
" pixtype=\"stock\" pixname=\"gnome-stock-about\"/>\n"
" <menuitem name=\"Check Item\" verb=\"Check\" _label=\"Check for mail\"/>\n"
"</popup>\n";
gboolean
fill_mailcheck_applet(PanelApplet *applet)
{
......@@ -1512,8 +1501,12 @@ fill_mailcheck_applet(PanelApplet *applet)
G_CALLBACK(exec_clicked_cmd), mc);
panel_applet_setup_menu (applet, mailcheck_menu_xml,
mailcheck_menu_verbs, mc);
panel_applet_setup_menu_from_file (applet,
NULL,
"GNOME_MailCheckApplet.xml",
NULL,
mailcheck_menu_verbs,
mc);
gtk_widget_show (GTK_WIDGET (applet));
......
2002-02-16 Kjartan Maraas <kmaraas@gnome.org>
* GNOME_ClockApplet.xml: Move the xml menu structure out into a file.
* GNOME_MailCheckApplet.xml: Same.
* GNOME_PagerApplet.xml: Same.
* clock.c: Hook it up.
* mailcheck.c: Same.
* pager.c: Same.
* Makefile.am: Here too.
2002-02-15 Seth Nickell <snickell@stanford.edu>
* GNOME_GenUtilApplet_Factory.server.in.in:
......
<Root>
<popups>
<popup name="button3">
<menuitem name="Pager Properties Item" verb="PagerProperties" _label="Properties ..." pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Pager Help Item" verb="PagerHelp" _label="Help" pixtype="stock" pixname="gtk-help"/>
<menuitem name="Pager About Item" verb="PagerAbout" _label="About ..." pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
......@@ -142,17 +142,6 @@ static const BonoboUIVerb pager_menu_verbs [] = {
BONOBO_UI_VERB_END
};
static const char pager_menu_xml [] =
"<popup name=\"button3\">\n"
" <menuitem name=\"Pager Properties Item\" verb=\"PagerProperties\" _label=\"Properties ...\"\n"
" pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
" <menuitem name=\"Pager Help Item\" verb=\"PagerHelp\" _label=\"Help\"\n"
" pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
" <menuitem name=\"Pager About Item\" verb=\"PagerAbout\" _label=\"About ...\"\n"
" pixtype=\"stock\" pixname=\"gnome-stock-about\"/>\n"
"</popup>\n";
static void
num_rows_changed (GConfClient *client,
guint cnxn_id,
......@@ -358,7 +347,12 @@ fill_pager_applet(PanelApplet *applet)
G_CALLBACK (applet_change_pixel_size),
pager);
panel_applet_setup_menu (PANEL_APPLET (pager->applet), pager_menu_xml, pager_menu_verbs, pager);
panel_applet_setup_menu_from_file (PANEL_APPLET (pager->applet),
NULL,
"GNOME_PagerApplet.xml",
NULL,
pager_menu_verbs,
pager);
return TRUE;
}
......
Supports Markdown
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