Commit f0c41103 authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin

Bit of renaming for Glynn.

2001-12-12  Mark McLoughlin  <mark@skynet.ie>

        Bit of renaming for Glynn.

        * panel_config.c: rename to panel-config.c
        * panel_config.h: rename to panel-config.h
        * panel_config_global.h: rename to panel-config-global.h
        * panelglobalconfig.schemas: rename to
          panel-global-config.schemas

        * Makefile.am, aligned-widget.c, applet.c, basep-widget.c,
          border-widget.c, button-widget.c, drawer-widget.c, drawer.c,
          drawer.h, edge-widget.c, extern.c, floating-widget.c,
          foobar-widget.c, global-keys.c, launcher.c, logout.c,
          main.c, menu-fentry.c, menu-util.c, menu.c, panel-config.c,
          panel-util.c, panel.c, session.c, sliding-widget.c:
        update.
parent d683a031
2001-12-12 Mark McLoughlin <mark@skynet.ie>
Bit of renaming for Glynn.
* panel_config.c: rename to panel-config.c
* panel_config.h: rename to panel-config.h
* panel_config_global.h: rename to panel-config-global.h
* panelglobalconfig.schemas: rename to
panel-global-config.schemas
* Makefile.am, aligned-widget.c, applet.c, basep-widget.c,
border-widget.c, button-widget.c, drawer-widget.c, drawer.c,
drawer.h, edge-widget.c, extern.c, floating-widget.c,
foobar-widget.c, global-keys.c, launcher.c, logout.c,
main.c, menu-fentry.c, menu-util.c, menu.c, panel-config.c,
panel-util.c, panel.c, session.c, sliding-widget.c:
update.
2001-12-12 Stephen Browne <stephen.browne@sun.com>
* gnome-panel-properties.c, gnome-panel-properties.glade,
......
......@@ -75,7 +75,7 @@ panel_sources = \
panel-util.c \
panel-gconf.c \
global-keys.c \
panel_config.c \
panel-config.c \
status.c \
distribution.c \
gnome-run.c \
......@@ -115,8 +115,8 @@ panel_headers = \
drawer.h \
panel-util.h \
global-keys.h \
panel_config.h \
panel_config_global.h \
panel-config.h \
panel-config-global.h \
panel-gconf.h \
status.h \
distribution.h \
......@@ -227,7 +227,7 @@ panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
$(panel_enum_headers) > $@
schemadir = $(sysconfdir)/gconf/schemas
schema_DATA = panelglobalconfig.schemas panel-per-panel-config.schemas
schema_DATA = panel-global-config.schemas panel-per-panel-config.schemas
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_Panel.server.in
......
......@@ -8,7 +8,7 @@
#include "config.h"
#include "panel-marshal.h"
#include "aligned-widget.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "foobar-widget.h"
#include "multiscreen-stuff.h"
#include "panel-typebuiltins.h"
......
......@@ -19,8 +19,8 @@
#include "launcher.h"
#include "menu-properties.h"
#include "menu-util.h"
#include "panel_config.h"
#include "panel_config_global.h"
#include "panel-config.h"
#include "panel-config-global.h"
#include "session.h"
#include "status.h"
#include "swallow.h"
......
......@@ -17,7 +17,7 @@
#include "panel-widget.h"
#include "basep-widget.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "foobar-widget.h"
#include "drawer-widget.h"
#include "border-widget.h"
......
......@@ -9,7 +9,7 @@
#include "border-widget.h"
#include "panel-marshal.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "multiscreen-stuff.h"
#include "panel-typebuiltins.h"
......
......@@ -13,7 +13,7 @@
#include "basep-widget.h"
#include "panel-types.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "rgb-stuff.h"
#undef BUTTON_WIDGET_DEBUG
......
......@@ -10,7 +10,7 @@
#include "drawer-widget.h"
#include "border-widget.h"
#include "floating-widget.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "multiscreen-stuff.h"
......
......@@ -23,7 +23,7 @@
#include "applet.h"
#include "button-widget.h"
#include "drawer-widget.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "panel-util.h"
#include "session.h"
#include "xstuff.h"
......
......@@ -2,7 +2,7 @@
#define DRAWER_H
#include "panel.h"
#include "panel_config.h"
#include "panel-config.h"
G_BEGIN_DECLS
......
......@@ -7,7 +7,7 @@
#include "config.h"
#include "edge-widget.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "foobar-widget.h"
#include "multiscreen-stuff.h"
......
......@@ -24,7 +24,7 @@
#include "menu-fentry.h"
#include "menu.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "session.h"
#include "status.h"
......
......@@ -11,7 +11,7 @@
#include "floating-widget.h"
#include "border-widget.h"
#include "panel-marshal.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "foobar-widget.h"
#include "panel-util.h"
#include "panel-gconf.h"
......
......@@ -30,7 +30,7 @@
#include "panel-widget.h"
#include "xstuff.h"
#include "basep-widget.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "panel-util.h"
#include "drawer-widget.h"
#include "gnome-run.h"
......
......@@ -12,7 +12,7 @@
#include "gnome-run.h"
#include "panel.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
extern GlobalConfig global_config;
extern GSList *panels;
......
......@@ -29,7 +29,7 @@
#include "menu-fentry.h"
#include "menu.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "session.h"
#include "xstuff.h"
......
......@@ -12,7 +12,7 @@
#include "applet.h"
#include "drawer-widget.h"
#include "menu.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "panel.h"
#include "session.h"
......
......@@ -27,7 +27,7 @@
#include "multiscreen-stuff.h"
#include "panel-util.h"
#include "panel-gconf.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "session.h"
#include "status.h"
#include "xstuff.h"
......
......@@ -31,7 +31,7 @@
#include "quick-desktop-reader.h"
#include "panel-util.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "session.h"
#undef MENU_FENTRY_DEBUG
......
......@@ -14,7 +14,7 @@
#include "foobar-widget.h"
#include "multiscreen-stuff.h"
#include "distribution.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "menu.h"
#undef MENU_UTIL_DEBUG
......
......@@ -54,7 +54,7 @@
#include "panel-util.h"
#include "panel-gconf.h"
#include "panel.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "session.h"
#include "sliding-widget.h"
#include "status.h"
......
......@@ -19,7 +19,7 @@
#include <libgnome/libgnome.h>
#include <libgnomeui/libgnomeui.h>
#include "panel_config.h"
#include "panel-config.h"
#include "aligned-widget.h"
#include "basep-widget.h"
......
......@@ -27,7 +27,7 @@
#include "panel-util.h"
#include "applet.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
extern GlobalConfig global_config;
......
......@@ -36,7 +36,7 @@
#include "menu-util.h"
#include "menu.h"
#include "panel-util.h"
#include "panel_config.h"
#include "panel-config.h"
#include "session.h"
#include "status.h"
#include "swallow.h"
......
This diff is collapsed.
#ifndef PANEL_CONFIG_H
#define PANEL_CONFIG_H
#include "panel-widget.h"
#include "border-widget.h"
#include "aligned-widget.h"
#include "sliding-widget.h"
#include "panel-util.h"
/* used to temporarily store config values until the 'Apply'
button is pressed. */
typedef struct _PerPanelConfig PerPanelConfig;
struct _PerPanelConfig {
GtkWidget *panel;
UpdateFunction update_function;
gpointer update_data;
/*basep types*/
int screen;
gboolean hidebuttons;
gboolean hidebutton_pixmaps;
BasePMode mode;
/*floating widget*/
GtkOrientation orient;
int x, y;
/*indexes for toggle*/
int edge;
int align;
gint16 offset;
/*panel types*/
int sz;
gboolean fit_pixmap_bg;
gboolean strech_pixmap_bg;
gboolean rotate_pixmap_bg;
PanelBackType back_type;
char *back_pixmap;
GdkColor back_color;
gboolean register_changes; /*used for startup*/
gboolean ppc_origin_change; /* if true then the dialog
will NOT be updated on changes,
so that we don't get into infinite
loops, set before we ourselves
apply changes. */
GtkWidget *config_window;
GtkWidget *type_tab; /* the type specific tab of
the notebook, this is just
an eventbox, which we will
be able to change contents
of */
GtkWidget *type_tab_label;
GtkWidget *pix_entry;
/*screen number spinner*/
GtkWidget *screen_spin;
/*hiding stuff*/
GtkWidget *autohide_button;
GtkWidget *hidebuttons_button;
GtkWidget *hidebutton_pixmaps_button;
/*size*/
GtkWidget *size_menu;
/*color buttons*/
GtkWidget *non;
GtkWidget *pix;
GtkWidget *col;
GtkWidget *backsel;
GtkWidget *back_om; /* the back type option menu */
/*position widgets*/
#define POSITION_EDGES 4
#define POSITION_ALIGNS 3
GtkWidget *toggle[POSITION_EDGES][POSITION_ALIGNS];
/*floating buttons*/
GtkWidget *h_orient;
GtkWidget *v_orient;
GtkWidget *x_spin;
GtkWidget *y_spin;
/*sliding buttons*/
GtkWidget *offset_spin;
};
void panel_config_register_changes (PerPanelConfig *ppc);
void panel_config (GtkWidget *panel);
void update_config_size (GtkWidget *panel);
void update_config_screen (BasePWidget *panel);
void update_config_mode (BasePWidget *panel);
void update_config_hidebuttons (BasePWidget *panel);
void update_config_back (PanelWidget *panel);
void update_config_edge (BasePWidget *w);
void update_config_anchor (BasePWidget *w);
void update_config_offset (BasePWidget *w);
void update_config_offset_limit (BasePWidget *panel);
void update_config_align (BasePWidget *w);
void update_config_floating_pos (BasePWidget *panel);
void update_config_floating_orient (BasePWidget *panel);
void update_config_floating_pos_limits (BasePWidget *panel);
void update_config_type (BasePWidget *panel);
void kill_config_dialog (GtkWidget *panel);
GtkWidget *make_size_widget (PerPanelConfig *ppc);
#endif /* PANEL_CONFIG_H */
#include "panel-widget.h"
#include "panel-types.h"
#ifndef PANEL_CONFIG_GLOBAL_H
#define PANEL_CONFIG_GLOBAL_H
typedef struct _GlobalConfig GlobalConfig;
struct _GlobalConfig {
int animation_speed;
int minimized_size;
int hide_delay;
int show_delay;
gboolean tooltips_enabled;
gboolean keep_menus_in_memory;
gboolean enable_animations;
gboolean autoraise;
PanelLayer layer;
gboolean drawer_auto_close;
gboolean highlight_when_over;
gboolean confirm_panel_remove;
gboolean keys_enabled;
char *menu_key;
guint menu_keysym; /* these are not really properties but */
guint menu_state; /* from the above */
char *run_key;
guint run_keysym; /* these are not really properties but */
guint run_state; /* from the above */
char *screenshot_key;
guint screenshot_keysym; /* these are not really properties but */
guint screenshot_state; /* from the above */
char *window_screenshot_key;
guint window_screenshot_keysym; /* these are not really properties */
guint window_screenshot_state; /* but from the above */
int menu_flags;
gboolean use_large_icons;
gboolean merge_menus;
gboolean avoid_collisions;
gboolean menu_check;
};
#endif /* PANEL_CONFIG_GLOBAL_H */
<gconfschemafile>
<!--
Panel Global Config Schema File - work in progress
-->
<schemalist>
<schema>
<key>/schemas/apps/panel/global/tooltips-enabled</key>
<applyto>/apps/panel/global/tooltips-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/global/keep-menus-in-memory</key>
<applyto>/apps/panel/global/keep-menus-in-memory</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>FIXME - is this resolved with the new menu stuff?</short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/use-large-icons</key>
<applyto>/apps/panel/global/use-large-icons</applyto>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/auto-update-menus</key>
<applyto>/apps/panel/global/auto-update-menus</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>FIXME - is this resolved with the new menu stuff?</short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/enable-animations</key>
<applyto>/apps/panel/global/enable-animations</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/panel-minimized-size</key>
<applyto>/apps/panel/global/panel-minimized-size</applyto>
<owner>panel</owner>
<type>int</type>
<default>3</default>
<locale name="C">
<short>FIXME - need to define limits</short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/panel-show-delay</key>
<applyto>/apps/panel/global/panel-show-delay</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>FIXME - need to define limits</short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/panel-animation-speed</key>
<applyto>/apps/panel/global/panel-animation-speed</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>FIXME - need to define limits fast = 0, medium = 1, slow = 2</short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/panel-hide-delay</key>
<applyto>/apps/panel/global/panel-hide-delay</applyto>
<owner>panel</owner>
<type>int</type>
<default>30</default>
<locale name="C">
<short>FIXME - need to define limits</short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/enable-key-bindings</key>
<applyto>/apps/panel/global/enable-key-bindings</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/menu-key</key>
<applyto>/apps/panel/global/menu-key</applyto>
<owner>panel</owner>
<type>string</type>
<default>Mod1-F1</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/menu-key</key>
<applyto>/apps/panel/global/menu-key</applyto>
<owner>panel</owner>
<type>string</type>
<default>Mod1-F1</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/run-key</key>
<applyto>/apps/panel/global/run-key</applyto>
<owner>panel</owner>
<type>string</type>
<default>Mod1-F2</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/window-screenshot-key</key>
<applyto>/apps/panel/global/window-screenshot-key</applyto>
<owner>panel</owner>
<type>string</type>
<default>Mod1-F2</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/autoraise-panel</key>
<applyto>/apps/panel/global/autoraise-panel</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/panel-window-layer</key>
<applyto>/apps/panel/global/panel-window-layer</applyto>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C">
<short>Values are - NORMAL, BELOW, ABOVE</short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/drawer-autoclose</key>
<applyto>/apps/panel/global/drawer-autoclose</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/confirm-panel-remove</key>
<applyto>/apps/panel/global/confirm-panel-remove</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/highlight-launchers-on-mouseover</key>
<applyto>/apps/panel/global/highlight-launchers-on-mouseover</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/avoid-panel-overlap</key>
<applyto>/apps/panel/global/avoid-panel-overlap</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/global/clock-format</key>
<applyto>/apps/panel/global/clock-format</applyto>
<owner>panel</owner>
<type>string</type>
<default>%I:%M:%S %p</default>
<locale name="C">
<short>FIXME - This needs to be done better for something that is
at least user understandable
</short>
<long></long>
</locale>
</schema>
</schemalist>
</gconfschemafile>
......@@ -38,7 +38,7 @@
#include "menu.h"
#include "panel-util.h"
#include "panel-gconf.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "session.h"
#include "sliding-widget.h"
#include "status.h"
......
......@@ -8,7 +8,7 @@
#include "config.h"
#include "sliding-widget.h"
#include "panel_config_global.h"
#include "panel-config-global.h"
#include "foobar-widget.h"
#include "panel-marshal.h"
#include "panel-util.h"
......
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