Commit 8aca99e4 authored by Johan Dahlin's avatar Johan Dahlin Committed by Mark McLoughlin
Browse files

reviewed by Mark McLoughlin <mark@skynet.ie>

2002-03-09  Johan Dahlin  <jdahlin@telia.com>

        reviewed by Mark McLoughlin <mark@skynet.ie>

        * tasklist.c: Get rid of inline xml ui
        (fill_tasklist_applet): Call panel_applet_setup_menu_from_file
        instead of using inline xml so the menu items is translated
        correctly.

        * Makefile.am (ui_DATA): Add GNOME_TasklistApplet.xml

        * GNOME_TasklistApplet.xml: New file
parent 11383540
2002-03-09 Johan Dahlin <jdahlin@telia.com>
reviewed by Mark McLoughlin <mark@skynet.ie>
* tasklist.c: Get rid of inline xml ui
(fill_tasklist_applet): Call panel_applet_setup_menu_from_file
instead of using inline xml so the menu items is translated
correctly.
* Makefile.am (ui_DATA): Add GNOME_TasklistApplet.xml
* GNOME_TasklistApplet.xml: New file
2002-03-19 Mark McLoughlin <mark@skynet.ie>
* tasklist.c: (display_help_dialog): update for new docs names
......
......@@ -62,7 +62,8 @@ uidir = $(datadir)/gnome-2.0/ui
ui_DATA = \
GNOME_ClockApplet.xml \
GNOME_MailCheckApplet.xml \
GNOME_PagerApplet.xml
GNOME_PagerApplet.xml \
GNOME_TasklistApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GenUtilApplet_Factory.server.in
......
2002-03-09 Johan Dahlin <jdahlin@telia.com>
reviewed by Mark McLoughlin <mark@skynet.ie>
* tasklist.c: Get rid of inline xml ui
(fill_tasklist_applet): Call panel_applet_setup_menu_from_file
instead of using inline xml so the menu items is translated
correctly.
* Makefile.am (ui_DATA): Add GNOME_TasklistApplet.xml
* GNOME_TasklistApplet.xml: New file
2002-03-19 Mark McLoughlin <mark@skynet.ie>
* tasklist.c: (display_help_dialog): update for new docs names
......
<Root>
<popups>
<popup name="button3">
<menuitem name="Tasklist Properties Item" verb="TasklistProperties" _label="Properties..."
pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Tasklist Help Item" verb="TasklistHelp" _label="Help"
pixtype="stock" pixname="gtk-help"/>
<menuitem name="Tasklist About Item" verb="TasklistAbout" _label="About..."
pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
......@@ -62,7 +62,8 @@ uidir = $(datadir)/gnome-2.0/ui
ui_DATA = \
GNOME_ClockApplet.xml \
GNOME_MailCheckApplet.xml \
GNOME_PagerApplet.xml
GNOME_PagerApplet.xml \
GNOME_TasklistApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GenUtilApplet_Factory.server.in
......
......@@ -168,18 +168,6 @@ static const BonoboUIVerb tasklist_menu_verbs [] = {
BONOBO_UI_VERB_END
};
static const char tasklist_menu_xml [] =
"<popup name=\"button3\">\n"
" <menuitem name=\"Tasklist Properties Item\" verb=\"TasklistProperties\" _label=\"Properties ...\"\n"
" pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
" <menuitem name=\"Tasklist Help Item\" verb=\"TasklistHelp\" _label=\"Help\"\n"
" pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
" <menuitem name=\"Tasklist About Item\" verb=\"TasklistAbout\" _label=\"About ...\"\n"
" pixtype=\"stock\" pixname=\"gnome-stock-about\"/>\n"
"</popup>\n";
static void
tasklist_properties_update_content_radio (TasklistData *tasklist)
{
......@@ -453,7 +441,12 @@ fill_tasklist_applet(PanelApplet *applet)
G_CALLBACK (applet_change_background),
tasklist);
panel_applet_setup_menu (PANEL_APPLET (tasklist->applet), tasklist_menu_xml, tasklist_menu_verbs, tasklist);
panel_applet_setup_menu_from_file (PANEL_APPLET (tasklist->applet),
NULL,
"GNOME_TasklistApplet.xml",
NULL,
tasklist_menu_verbs,
tasklist);
return TRUE;
}
......
2002-03-09 Johan Dahlin <jdahlin@telia.com>
reviewed by Mark McLoughlin <mark@skynet.ie>
* tasklist.c: Get rid of inline xml ui
(fill_tasklist_applet): Call panel_applet_setup_menu_from_file
instead of using inline xml so the menu items is translated
correctly.
* Makefile.am (ui_DATA): Add GNOME_TasklistApplet.xml
* GNOME_TasklistApplet.xml: New file
2002-03-19 Mark McLoughlin <mark@skynet.ie>
* tasklist.c: (display_help_dialog): update for new docs names
......
......@@ -62,7 +62,8 @@ uidir = $(datadir)/gnome-2.0/ui
ui_DATA = \
GNOME_ClockApplet.xml \
GNOME_MailCheckApplet.xml \
GNOME_PagerApplet.xml
GNOME_PagerApplet.xml \
GNOME_TasklistApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_GenUtilApplet_Factory.server.in
......
2002-03-09 Johan Dahlin <jdahlin@telia.com>
reviewed by Mark McLoughlin <mark@skynet.ie>
* tasklist.c: Get rid of inline xml ui
(fill_tasklist_applet): Call panel_applet_setup_menu_from_file
instead of using inline xml so the menu items is translated
correctly.
* Makefile.am (ui_DATA): Add GNOME_TasklistApplet.xml
* GNOME_TasklistApplet.xml: New file
2002-03-19 Mark McLoughlin <mark@skynet.ie>
* tasklist.c: (display_help_dialog): update for new docs names
......
<Root>
<popups>
<popup name="button3">
<menuitem name="Tasklist Properties Item" verb="TasklistProperties" _label="Properties..."
pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Tasklist Help Item" verb="TasklistHelp" _label="Help"
pixtype="stock" pixname="gtk-help"/>
<menuitem name="Tasklist About Item" verb="TasklistAbout" _label="About..."
pixtype="stock" pixname="gnome-stock-about"/>
</popup>
</popups>
</Root>
......@@ -168,18 +168,6 @@ static const BonoboUIVerb tasklist_menu_verbs [] = {
BONOBO_UI_VERB_END
};
static const char tasklist_menu_xml [] =
"<popup name=\"button3\">\n"
" <menuitem name=\"Tasklist Properties Item\" verb=\"TasklistProperties\" _label=\"Properties ...\"\n"
" pixtype=\"stock\" pixname=\"gtk-properties\"/>\n"
" <menuitem name=\"Tasklist Help Item\" verb=\"TasklistHelp\" _label=\"Help\"\n"
" pixtype=\"stock\" pixname=\"gtk-help\"/>\n"
" <menuitem name=\"Tasklist About Item\" verb=\"TasklistAbout\" _label=\"About ...\"\n"
" pixtype=\"stock\" pixname=\"gnome-stock-about\"/>\n"
"</popup>\n";
static void
tasklist_properties_update_content_radio (TasklistData *tasklist)
{
......@@ -453,7 +441,12 @@ fill_tasklist_applet(PanelApplet *applet)
G_CALLBACK (applet_change_background),
tasklist);
panel_applet_setup_menu (PANEL_APPLET (tasklist->applet), tasklist_menu_xml, tasklist_menu_verbs, tasklist);
panel_applet_setup_menu_from_file (PANEL_APPLET (tasklist->applet),
NULL,
"GNOME_TasklistApplet.xml",
NULL,
tasklist_menu_verbs,
tasklist);
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