Commit 7c6fa79b authored by Glynn Foster's avatar Glynn Foster Committed by Glynn Foster

Did a little work according to Alex's guidelines. Things are still a long

2001-12-12  Glynn Foster  <glynn.foster@sun.com>

	* Makefile.am, main.c, panel-gconf.c,
	panel-per-panel-config.schemas:

	Did a little work according to Alex's guidelines.
	Things are still a long way off. MUCH work.
parent 2806684f
2001-12-12 Glynn Foster <glynn.foster@sun.com>
* Makefile.am, main.c, panel-gconf.c,
panel-per-panel-config.schemas:
Did a little work according to Alex's guidelines.
Things are still a long way off. MUCH work.
2001-12-12 Glynn Foster <glynn.foster@sun.com>
* button-widget.c, launcher.c, panel-widget.c,
......
......@@ -225,7 +225,7 @@ panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
$(panel_enum_headers) > $@
schemadir = $(sysconfdir)/gconf/schemas
schema_DATA = panelglobalconfig.schemas
schema_DATA = panelglobalconfig.schemas panel-per-panel-config.schemas
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_Panel.server.in
......
......@@ -56,6 +56,8 @@ char *kde_menudir = NULL;
char *kde_icondir = NULL;
char *kde_mini_icondir = NULL;
gchar *profile_name = NULL;
static gboolean
menu_age_timeout(gpointer data)
{
......@@ -435,6 +437,12 @@ session_notify_global_changes (GConfClient *client, guint cnxn_id, GConfEntry *e
session_read_global_config ();
}
static const struct poptOption options[] = {
{"profile", '\0', POPT_ARG_STRING, &profile_name, 0, N_("Specify a profile name to load"), NULL},
{NULL, '\0', 0, NULL, 0}
};
int
main(int argc, char **argv)
{
......@@ -447,6 +455,7 @@ main(int argc, char **argv)
gnome_program_init ("panel", VERSION,
LIBGNOMEUI_MODULE,
argc, argv,
GNOME_PARAM_POPT_TABLE, options,
GNOME_PROGRAM_STANDARD_PROPERTIES,
NULL);
......@@ -455,6 +464,9 @@ main(int argc, char **argv)
if (g_getenv ("I_LOVE_PANEL_CRACK") == NULL)
tell_user_Im_on_crack ();
if (profile_name == NULL)
profile_name = g_strdup ("default");
/*
* Let applets spew.
*/
......@@ -542,5 +554,6 @@ main(int argc, char **argv)
gtk_main ();
g_free (profile_name);
return 0;
}
......@@ -12,6 +12,22 @@ panel_gconf_global_config_get_full_key (const gchar *key) {
return g_strdup_printf ("/apps/panel/global/%s", key);
}
static gchar *
panel_gconf_general_profile_get_full_key (const gchar * profile, const gchar *key) {
return g_strdup_printf ("/apps/panel/profiles/%s/general/%s", profile, key);
}
static gchar *
panel_gconf_panel_profile_get_full_key (const gchar *profile, gint panel_id, const gchar *key) {
return g_strdup_printf ("/apps/panel/profiles/%s/panels/%d/%s", profile, panel_id, key);
}
static gchar *
panel_gconf_applets_profile_get_full_key (const gchar *profile, gint applet_id, const gchar *key) {
return g_strdup_printf ("/apps/panel/profiles/%s/applets/%d/%s", profile, applet_id, key);
}
GConfClient *
panel_gconf_get_client (void) {
static GConfClient *client = NULL;
......
<gconfschemafile>
<!--
Per Panel Config Schema File - work in progress
We need to change some of the ints into user visible strings
-->
<schemalist>
<!--
************
Small Screen
************
-->
<!-- ############### general ####################### -->
<schema>
<key>/schemas/apps/panel/default-profiles/small/general/panel-id-list</key>
<applyto>/apps/panel/default-profiles/small/general/panel-id-list</applyto>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001]</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<!-- ############### panel id: 00000001 ####################### -->
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-type</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-type</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-hide-mode</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-hide-mode</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-hide-state</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-hide-state</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/screen-id</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/screen-id</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/screen-edge</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/screen-edge</applyto>
<owner>panel</owner>
<type>int</type>
<default>2</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/hide-buttons-enabled</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/hide-buttons-enabled</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/hide-button-pixmaps-enabled</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/hide-button-pixmaps-enabled</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-type</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-type</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap</applyto>
<owner>panel</owner>
<type>string</type>
<default> </default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-fit</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-fit</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-stretch</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-stretch</applyto>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-rotate</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-rotate</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-color</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-color</applyto>
<owner>panel</owner>
<type>string</type>
<default>#000000</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<!--
*************
Medium Screen
*************
-->
<schema>
<key>/schemas/apps/panel/default-profiles/medium/general/panel-id-list</key>
<applyto>/apps/panel/default-profiles/medium/general/panel-id-list</applyto>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001 00000002]</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<!--
************
Large Screen
************
-->
<schema>
<key>/schemas/apps/panel/default-profiles/large/general/panel-id-list</key>
<applyto>/apps/panel/default-profiles/large/general/panel-id-list</applyto>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001 00000002]</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
</schemalist>
</gconfschemafile>
<gconfschemafile>
<!--
Per Panel Config Schema File - work in progress
We need to change some of the ints into user visible strings
-->
<schemalist>
<!--
************
Small Screen
************
-->
<!-- ############### general ####################### -->
<schema>
<key>/schemas/apps/panel/default-profiles/small/general/panel-id-list</key>
<applyto>/apps/panel/default-profiles/small/general/panel-id-list</applyto>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001]</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<!-- ############### panel id: 00000001 ####################### -->
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-type</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-type</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-hide-mode</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-hide-mode</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-hide-state</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-hide-state</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/screen-id</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/screen-id</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/screen-edge</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/screen-edge</applyto>
<owner>panel</owner>
<type>int</type>
<default>2</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/hide-buttons-enabled</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/hide-buttons-enabled</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/hide-button-pixmaps-enabled</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/hide-button-pixmaps-enabled</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-type</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-type</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap</applyto>
<owner>panel</owner>
<type>string</type>
<default> </default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-fit</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-fit</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-stretch</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-stretch</applyto>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-rotate</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-pixmap-rotate</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/default-profiles/small/panels/00000001/panel-background-color</key>
<applyto>/apps/panel/default-profiles/small/panels/00000001/panel-background-color</applyto>
<owner>panel</owner>
<type>string</type>
<default>#000000</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<!--
*************
Medium Screen
*************
-->
<schema>
<key>/schemas/apps/panel/default-profiles/medium/general/panel-id-list</key>
<applyto>/apps/panel/default-profiles/medium/general/panel-id-list</applyto>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001 00000002]</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<!--
************
Large Screen
************
-->
<schema>
<key>/schemas/apps/panel/default-profiles/large/general/panel-id-list</key>
<applyto>/apps/panel/default-profiles/large/general/panel-id-list</applyto>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001 00000002]</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
</schemalist>
</gconfschemafile>
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