assorted gnome-core patches
- From: Havoc Pennington <hp redhat com>
- To: gnome-core-maint gnome org
- Cc: gnome-hackers gnome org, timj gtk org, jirka 5z com, jacob ximian com, glynn foster sun com
- Subject: assorted gnome-core patches
- Date: 28 Aug 2001 16:22:57 -0400
Hi,
George, this is your big chance to get rid of distro-specific
changes. ;-) A bunch of patches to consider merging for gnome-core.
- change default for swap del/bs to match the Debian guidelines
- change how the logout animation is drawn to work on slow
X servers
- some random removal of from the Japanese default
help page; I have no idea what is up with this
- change default applets (remove fish and status applet,
add desk guide, clock, battery)
- avoid having a "gnome" submenu in the KDE submenu
- xscreensaver won't run as root, so don't offer the option
- don't turn on thumbnailing in desk guide by default.
people complain about the CPU usage, and
it is really too slow to be useful anyhow if you
switch desktops often (though I agree it's a nice UI
feature if it can be implemented to resolve these issues)
- disable http in help browser; it's useless and just confuses
people who think it should work. of course, we have
pretty much done s/helpbrowser/nautilus/ everywhere anyhow,
so ideally the help browser never comes up
- honor an info path in the help browser, I doubt anyone cares...
- remove ancient Red Hat compat support (anotherlevel)
- add start here launcher and menu item, use start-here: as default
nautilus URI (depends on gnome-vfs updates)
- remove spec-violating NO_XALF crackrock from gnome-terminal
.desktop file
- add an icon for the clock applet .desktop file
- turn off autosaving for gnome-session. Red Hat users complained
about this extensively. Poll around the office agrees it's
irritating and broken.
- make applets fail less gruesomely if no panel exists; exit,
don't try to start a new panel, and don't crash.
- turn off the hints feature by default; it clutters the screen
on startup, and no one reads it anyhow, and the dialog
is ugly.
- killall oafd on logout, to mop up oafd and all servers
it's launched (in its process group); a hackaround for
busted lifecycle management of oafd itself and bonobo
servers in general.
- fix check for console lock to work with new Red Hat
- couple uncontroversial tweaks to run dialog
- call gettext on gnome-terminal default font, because
the latin-1 default looks like hell in CJK
The final patch is our changes to the default config, some of these
may be of general interest:
- only one panel, at the bottom, to save screen real estate
- disable hide buttons unconditionally, to reduce clutter,
and improve UI stability
- always keep icons in memory, they look stupid/unstable if
progressively loaded
- disable large icons, they look dumb because only some icons
end up large, and the font is too small to go with the icons
- we change the default keybindings (alt-F1 etc.) to avoid
conflicting with "switch desktop" via alt-F1, alt-F2, etc.
I guess upstream just doesn't have desktop switch bindings
other than the Ctrl+arrow stuff?
- turn off the arrow in the desk guide; the popup that you get from
the arrow has serious UI problems, and the arrow adds visual
clutter
- make the desk guide 2x2 instead of a single row (if thumbnailing,
this would be a bad idea because it makes the window images too
small, but since we aren't thumbnailing it's OK)
- changes to default launcher applets (we have: lock, start here,
terminal, mozilla)
Also:
- we have a patch to remove some of the .desktop files that come with
gnome-core for packages we happen to ship, to avoid duplicates
since our packages contain their own .desktop files.
I think we should simply remove .desktop files entirely from
gnome-core, and require apps to come with their own. Otherwise
there's no way the apps can ever add their own without causing
problems.
- we have multibyte fixes to gnome-terminal that require gnome-libs
changes. I'll try to post that all as a separate patch.
- we have some magicdev-related patches. we really need an upstream
GNOME solution for the magicdev functionality.
Everything in our package I'm not mentioning is hopelessly
distribution-specific, I'm pretty sure.
Havoc
diff -ur gnome-core-1.4.0.4.orig/gnome-terminal/gnome-terminal.c gnome-core-1.4.0.4/gnome-terminal/gnome-terminal.c
--- gnome-core-1.4.0.4.orig/gnome-terminal/gnome-terminal.c Thu Apr 19 15:46:47 2001
+++ gnome-core-1.4.0.4/gnome-terminal/gnome-terminal.c Mon Jul 9 15:25:00 2001
@@ -521,7 +521,7 @@
cfg->bell = gnome_config_get_bool ("bell_silenced=0");
cfg->blink = gnome_config_get_bool ("blinking=0");
- cfg->swap_keys = gnome_config_get_bool ("swap_del_and_backspace=0");
+ cfg->swap_keys = gnome_config_get_bool ("swap_del_and_backspace=1");
#ifdef HAVE_ZVT_DEL_IS_DEL
cfg->del_is_del = gnome_config_get_bool ("del_is_del=0");
#endif
--- gnome-core-1.2.1/gsm/logout.c.rectfix Sat May 27 15:36:41 2000
+++ gnome-core-1.2.1/gsm/logout.c Thu Aug 3 17:23:16 2000
@@ -67,31 +67,15 @@
height_step = MIN (iris_rect.width / 2, iris_block);
for (i = 0; i < MIN (width_step, height_step); i++)
- {
- GdkPoint points[5];
- static gchar dash_list[2] =
- {1, 1};
-
- gdk_gc_set_dashes (iris_gc, i % 1, dash_list, 2);
-
- points[0].x = iris_rect.x + i;
- points[0].y = iris_rect.y + i;
- points[1].x = iris_rect.x + iris_rect.width - i;
- points[1].y = iris_rect.y + i;
- points[2].x = iris_rect.x + iris_rect.width - i;
- points[2].y = iris_rect.y + iris_rect.height - i;
- points[3].x = iris_rect.x + i;
- points[3].y = iris_rect.y + iris_rect.height - i;
- points[4].x = iris_rect.x + i;
- points[4].y = iris_rect.y + i;
-
- gdk_draw_lines (GDK_ROOT_PARENT (), iris_gc, points, 5);
- }
+ gdk_draw_rectangle (GDK_ROOT_PARENT (), iris_gc, FALSE,
+ iris_rect.x + i, iris_rect.y + i,
+ (gint)iris_rect.width - 2 * i,
+ (gint)iris_rect.height - 2 * i);
gdk_flush ();
iris_rect.x += width_step;
- iris_rect.y += width_step;
+ iris_rect.y += height_step;
iris_rect.width -= MIN (iris_rect.width, iris_block * 2);
iris_rect.height -= MIN (iris_rect.height, iris_block * 2);
@@ -115,6 +99,7 @@
if (!iris_gc)
{
GdkGCValues values;
+ static gchar dash_list[2] = {1, 1};
values.line_style = GDK_LINE_ON_OFF_DASH;
values.subwindow_mode = GDK_INCLUDE_INFERIORS;
@@ -122,6 +107,8 @@
iris_gc = gdk_gc_new_with_values (GDK_ROOT_PARENT (),
&values,
GDK_GC_LINE_STYLE | GDK_GC_SUBWINDOW);
+
+ gdk_gc_set_dashes (iris_gc, 0, dash_list, 2);
}
/* Plan for a time of 0.5 seconds for effect */
--- gnome-core-1.2.1/help-browser/help/ja/default-page.html.nbsp Mon Sep 11 18:10:37 2000
+++ gnome-core-1.2.1/help-browser/help/ja/default-page.html Mon Sep 11 18:10:42 2000
@@ -10,7 +10,6 @@
ALINK="#FF0000"
LINK="#804000"
VLINK="#600000">
-
<CENTER>
<IMG SRC="../C/gnome-logo-large.png" ALT="[ GNOME Logo by Tigert ]" border=0><BR>
--- gnome-core-1.4.0.4/panel/session.c.defaultapplets Mon Jul 9 16:35:00 2001
+++ gnome-core-1.4.0.4/panel/session.c Mon Jul 9 16:36:11 2001
@@ -942,15 +942,18 @@
panel, G_MAXINT/2 /*flush right*/,
TRUE, TRUE);
- /*load up the fish, but only if screen larger then 639*/
- if(gdk_screen_width() >= 640) {
- load_extern_applet ("fish_applet", NULL,
- panel, G_MAXINT/2 + 4000/*flush right*/,
- TRUE, TRUE);
- }
+ load_extern_applet("deskguide_applet", NULL,
+ panel, G_MAXINT/2 + 2000 /*flush right*/, TRUE, TRUE);
+
+ load_extern_applet("gen_util_clock", NULL,
+ panel, G_MAXINT/2 + 4000/*flush right*/,
+ TRUE, TRUE);
+
+ if(have_battery ())
+ load_extern_applet("battery_applet",NULL,
+ panel, G_MAXINT/2 + 6000 /*flush right*/,
+ TRUE, TRUE);
- load_status_applet(panel,
- G_MAXINT/2 + 8000/*flush right*/, TRUE);
}
static gboolean
--- gnome-core-1.4.0.1/panel/menu-fentry.c.kdesubmenus Sun Feb 25 17:11:39 2001
+++ gnome-core-1.4.0.1/panel/menu-fentry.c Wed Apr 18 14:25:50 2001
@@ -394,10 +394,16 @@
free_mfile (mfile);
if (S_ISDIR (s.st_mode)) {
- if (merged)
- ffr = fr_read_dir (NULL, name, NULL, &s, sublevels-1);
- else
- ffr = fr_read_dir (NULL, name, &s, NULL, sublevels-1);
+ if (strcmp (name, "/usr/share/applnk/gnome") != 0 &&
+ strcmp (name, "/usr/share/applnk/redhat") != 0) {
+ if (merged)
+ ffr = fr_read_dir (NULL, name, NULL, &s, sublevels-1);
+ else
+ ffr = fr_read_dir (NULL, name, &s, NULL, sublevels-1);
+ } else {
+ ffr = NULL;
+ }
+
g_free(name);
if(ffr) {
ffr->merged = merged;
--- gnome-core-1.4.0.4/panel/session.c.norootscreensaver Mon Jul 23 19:29:54 2001
+++ gnome-core-1.4.0.4/panel/session.c Mon Jul 23 19:31:39 2001
@@ -16,6 +16,7 @@
#include <gnome.h>
#include <gdk/gdkx.h>
#include <X11/keysym.h>
+#include <sys/types.h>
#include "panel-include.h"
#include "gnome-run.h"
#include "global-keys.h"
@@ -1104,7 +1105,8 @@
load_logout_applet (panel, pos, TRUE);
} else if (strcmp (applet_name, LOCK_ID) == 0) {
- load_lock_applet (panel, pos, TRUE);
+ if (geteuid () != 0)
+ load_lock_applet (panel, pos, TRUE);
} else if (strcmp (applet_name, STATUS_ID) == 0) {
load_status_applet (panel, pos, TRUE);
--- gnome-core-1.4.0.4/applets/desk-guide/deskguide_applet.c.nothumbnailing Mon Jul 23 19:32:23 2001
+++ gnome-core-1.4.0.4/applets/desk-guide/deskguide_applet.c Mon Jul 23 19:33:10 2001
@@ -84,7 +84,7 @@
CONFIG_BOOL (raise_grid, FALSE,
N_("Raise area grid over tasks")),
CONFIG_SECTION (sect_thumb_nail, N_("Thumb Nails")),
- CONFIG_BOOL (enable_thumb_nails, TRUE,
+ CONFIG_BOOL (enable_thumb_nails, FALSE,
N_("Fill window thumbnails with screen contents")),
CONFIG_RANGE (thumb_nail_delay, 500, 50, 5000,
N_("Incremental update delay [ms]")),
--- gnome-core-1.4.0.4/help-browser/docobj.c.nohttp Wed Aug 8 11:38:47 2001
+++ gnome-core-1.4.0.4/help-browser/docobj.c Wed Aug 8 11:38:48 2001
@@ -125,9 +125,6 @@
if (!strncmp(decomp->access, "file", 4)) {
obj->transportMethod = TRANS_FILE;
obj->transportFunc = transportFile;
- } else if (!strncmp(decomp->access, "http", 4)) {
- obj->transportMethod = TRANS_HTTP;
- obj->transportFunc = transportHTTP;
} else {
obj->transportMethod = TRANS_UNKNOWN;
obj->transportFunc = transportUnknown;
--- gnome-core-1.4.0.4/help-browser/transport.c.nohttp Wed Aug 8 11:45:11 2001
+++ gnome-core-1.4.0.4/help-browser/transport.c Wed Aug 8 11:45:31 2001
@@ -223,6 +223,7 @@
FILE *pipe;
gint res;
+ return -1;
statusMsg("Calling external download...");
url = docObjGetDecomposedUrl(obj);
--- gnome-core-1.2.4/help-browser/gnome-help-browser.c.sopwith Thu Feb 1 17:57:54 2001
+++ gnome-core-1.2.4/help-browser/gnome-help-browser.c Thu Feb 1 18:07:15 2001
@@ -534,11 +534,19 @@
gchar buf[BUFSIZ];
struct stat statb;
gchar *s;
+ char *ctmp;
manPath = gnome_config_get_string("/" NAME "/paths/manpath="
DEFAULT_MANPATH);
- infoPath = gnome_config_get_string("/" NAME "/paths/infopath="
- DEFAULT_INFOPATH);
+ ctmp = gnome_config_get_string("/" NAME "/paths/infopath=");
+ if(*ctmp) {
+ /* Append DEFAULT_INFOPATH to the retrieved path, to catch changed info
+ path and such */
+ infoPath = g_strjoin(":", ctmp, DEFAULT_INFOPATH, NULL);
+ } else
+ infoPath = g_strdup(DEFAULT_INFOPATH);
+ g_free(ctmp);
+
ghelpPath = gnome_config_get_string("/" NAME "/paths/ghelppath="
DEFAULT_GHELPPATH);
--- gnome-core-1.2.4/panel/distribution.c.noanotherlevel Tue Feb 13 15:52:03 2001
+++ gnome-core-1.2.4/panel/distribution.c Tue Feb 13 15:53:51 2001
@@ -27,11 +27,6 @@
"gnome-debian.png", "/var/lib/gnome/Debian/.",
NULL, NULL
},
- { DISTRIBUTION_REDHAT, "/etc/redhat-release",
- N_("Red Hat Linux"), N_("Red Hat menus"), NULL,
- "apps-redhat",
- rh_menu_init_func, rh_menu_show_func
- },
{ DISTRIBUTION_SUSE, "/etc/SuSE-release",
N_("SuSE Linux"), N_("SuSE menus"), "gnome-suse.png",
GNOME_DATADIR "/gnome/distribution-menus/SuSE/.",
--- gnome-core-1.4.0.4/gsm/default.in.starthere Wed Aug 1 18:18:22 2001
+++ gnome-core-1.4.0.4/gsm/default.in Wed Aug 1 18:18:23 2001
@@ -64,7 +64,7 @@
7,RestartCommand=panel --sm-client-id default7
8,id=default8
8,Priority=40
-8,RestartCommand=nautilus -n --sm-client-id default8
+8,RestartCommand=nautilus start-here: -g 600x410+150+100 --sm-client-id default8
num_clients=9
[Nautilus]
--- gnome-core-1.4.0.4/panel/menu.c.starthere Wed Aug 1 18:18:22 2001
+++ gnome-core-1.4.0.4/panel/menu.c Wed Aug 1 18:20:17 2001
@@ -5177,6 +5177,14 @@
panel_error_dialog (_("Cannot execute xscreensaver"));
}
+void
+panel_starthere (GtkWidget *widget, gpointer data)
+{
+ char *argv[4] = {"nautilus", "--no-desktop", "start-here:",NULL};
+ if (gnome_execute_async (g_get_home_dir (), 3, argv) < 0)
+ panel_error_dialog (_("Cannot execute nautilus"));
+}
+
static void
panel_menu_tearoff_new_menu(GtkWidget *w, gpointer data)
{
@@ -5427,6 +5435,7 @@
{
GtkWidget *menu;
GtkWidget *menuitem;
+ char *char_tmp;
gboolean has_inline = (flags & (MAIN_MENU_SYSTEM |
MAIN_MENU_USER |
@@ -5464,6 +5473,20 @@
GTK_SIGNAL_FUNC (panel_tearoff_new_menu),
GINT_TO_POINTER(flags));
}
+
+ char_tmp = panel_is_program_in_path ("nautilus");
+ if (char_tmp) {
+ menuitem = gtk_menu_item_new ();
+ gtk_widget_lock_accelerators (menuitem);
+ setup_menuitem_try_pixmap (menuitem,
+ "gnome-starthere.png",
+ _("Start Here"), SMALL_ICON_SIZE);
+ gtk_menu_append (GTK_MENU (root_menu), menuitem);
+ gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+ GTK_SIGNAL_FUNC(panel_starthere), 0);
+ setup_internal_applet_drag(menuitem, "STARTHERE:NEW");
+ }
+ g_free (char_tmp);
if (flags & MAIN_MENU_SYSTEM)
create_system_menu(root_menu, fake_submenus,
--- gnome-core-1.4.0.4/gnome-terminal/gnome-terminal.desktop.nonoxalf Tue Jul 17 18:05:45 2001
+++ gnome-core-1.4.0.4/gnome-terminal/gnome-terminal.desktop Tue Jul 17 18:05:57 2001
@@ -65,7 +65,7 @@
Comment[wa]=Purnea do terminå di Gnome
Comment[zh_CN.GB2312]=GNOME Öն˻ú
Comment[zh_TW.Big5]=GNOME ²×ºÝ¾÷
-Exec=NO_XALF gnome-terminal --use-factory --start-factory-server
+Exec=gnome-terminal --use-factory --start-factory-server
Icon=gnome-terminal.png
Terminal=0
Type=Application
--- gnome-core-1.4.0.4/applets/gen_util/clock_applet.desktop.icon Thu Jul 19 11:49:55 2001
+++ gnome-core-1.4.0.4/applets/gen_util/clock_applet.desktop Thu Jul 19 11:50:00 2001
@@ -62,6 +62,6 @@
Comment[zh_TW.Big5]=®ÉÄÁ
Comment[zh_CN.GB2312]=ʱÖÓ
Exec=gen_util_clock
-Icon=
+Icon=gnome-clock.png
Terminal=0
Type=PanelApplet
--- gnome-core-1.4.0.4/gsm/headers.h.noautosave Mon Jul 23 22:39:57 2001
+++ gnome-core-1.4.0.4/gsm/headers.h Mon Jul 23 22:43:16 2001
@@ -61,7 +61,7 @@
#define AUTOSAVE_MODE_KEY "AutoSave"
#ifndef AUTOSAVE_MODE_DEFAULT
-#define AUTOSAVE_MODE_DEFAULT "TRUE"
+#define AUTOSAVE_MODE_DEFAULT "FALSE"
#endif
/* Allow TCP connections to the session manager. */
--- gnome-core-1.4.0.4/gsm/session-properties-capplet.h.noautosave Mon Jul 23 22:43:03 2001
+++ gnome-core-1.4.0.4/gsm/session-properties-capplet.h Mon Jul 23 22:43:32 2001
@@ -13,7 +13,7 @@
#define SPLASH_SCREEN_KEY "SplashScreen"
#define SPLASH_SCREEN_DEFAULT "TRUE"
#define AUTOSAVE_MODE_KEY "AutoSave"
-#define AUTOSAVE_MODE_DEFAULT "TRUE"
+#define AUTOSAVE_MODE_DEFAULT "FALSE"
GSList *startup_list_read (gchar *name);
--- gnome-core-1.4.0.4/panel/applet-widget.c.handlenopanel Sun Apr 22 23:21:09 2001
+++ gnome-core-1.4.0.4/panel/applet-widget.c Tue Jul 31 17:12:57 2001
@@ -1,5 +1,6 @@
#include <config.h>
#include <string.h>
+#include <stdio.h>
#include <X11/X.h>
#include <X11/Xlib.h>
#include <gtk/gtk.h>
@@ -927,11 +928,13 @@
panel_client =
goad_server_activate_with_repo_id(NULL,
"IDL:GNOME/Panel:1.0",
- 0, NULL);
+ GOAD_ACTIVATE_EXISTING_ONLY,
+ NULL);
- if(panel_client == CORBA_OBJECT_NIL) {
- g_warning(_("Cannot activate a panel object"));
+ if (panel_client == CORBA_OBJECT_NIL) {
+ fprintf (stderr, _("The GNOME panel is not running."));
g_free (applet_servant);
+ exit (1);
return NULL;
}
}
--- gnome-core-1.4.0.4/gsm/splash.c.nohint Wed Aug 1 17:18:31 2001
+++ gnome-core-1.4.0.4/gsm/splash.c Wed Aug 1 17:18:43 2001
@@ -72,7 +72,7 @@
};
#define SPLASHING (gnome_config_get_bool (GSM_OPTION_CONFIG_PREFIX SPLASH_SCREEN_KEY"="SPLASH_SCREEN_DEFAULT))
-#define HINTING (gnome_config_get_bool ("Gnome/Login/RunHints=true"))
+#define HINTING (gnome_config_get_bool ("Gnome/Login/RunHints=false"))
#define BASE_WIDTH 480
#define BASE_ICONSIZE 36
--- gnome-core-1.4.0.4/gsm/command.c.killoafd Wed Aug 1 18:12:47 2001
+++ gnome-core-1.4.0.4/gsm/command.c Wed Aug 1 18:13:26 2001
@@ -277,6 +277,9 @@
void
execute_logout (void)
{
+ /* Bad hack of the century */
+ system ("killall -g oafd");
+
if (logout_command_argv)
execvp (logout_command_argv[0], logout_command_argv);
}
Check in two locations for the console lock file.
--- gnome-core/gsm/logout.c Tue Aug 14 15:27:27 2001
+++ gnome-core/gsm/logout.c Tue Aug 14 15:27:19 2001
@@ -165,7 +165,7 @@
GtkWidget *box;
GtkWidget *toggle_button = NULL;
gint result;
- gchar *s;
+ gchar *s, *t;
GtkWidget *halt = NULL;
GtkWidget *reboot = NULL;
GtkWidget *invisible;
@@ -229,7 +229,8 @@
* and if so, give them that option
*/
s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL);
+ t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL);
- if ((geteuid () == 0 || g_file_exists (s)) &&
+ if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) &&
access (halt_command[0], X_OK) == 0)
{
GtkWidget *frame;
@@ -254,6 +255,7 @@
gtk_box_pack_start (GTK_BOX (action_vbox), r, FALSE, FALSE, 0);
}
g_free (s);
+ g_free (t);
gtk_widget_show_all (box);
--- gnome-core-1.4.0.4/panel/gnome-run.c.rundialog Mon Aug 13 19:34:00 2001
+++ gnome-core-1.4.0.4/panel/gnome-run.c Mon Aug 13 19:51:29 2001
@@ -486,9 +486,13 @@
gtk_entry_set_text (GTK_ENTRY (entry),
command);
+ /* Sync terminal button */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (terminal_toggle),
- dentry->terminal);
-
+ dentry->terminal);
+ /* enable Run button */
+ gnome_dialog_set_sensitive (GNOME_DIALOG (dialog),
+ 0, TRUE);
+
gnome_desktop_entry_free (dentry);
g_free (command);
}
@@ -861,12 +865,20 @@
gtk_label_set_text (GTK_LABEL (desc_label), msg);
g_free (msg);
+
+ /* enable Run button */
+ gnome_dialog_set_sensitive (GNOME_DIALOG (dialog),
+ 0, TRUE);
} else {
if (label)
gtk_label_set_text (GTK_LABEL (label), _("No program selected"));
if (desc_label)
gtk_label_set_text (GTK_LABEL (desc_label), _("No program selected"));
+
+ /* disable Run button */
+ gnome_dialog_set_sensitive (GNOME_DIALOG (dialog),
+ 0, FALSE);
}
g_free (text);
@@ -1140,10 +1152,9 @@
gtk_window_set_policy (GTK_WINDOW (run_dialog),
FALSE, TRUE, FALSE);
- /* Get some reasonable height in simple list mode */
- if (!use_advanced)
- gtk_window_set_default_size (GTK_WINDOW (run_dialog),
- -1, 400);
+ /* Get some reasonable list height */
+ gtk_window_set_default_size (GTK_WINDOW (run_dialog),
+ -1, use_advanced ? 465 : 400);
gnome_window_icon_set_from_file (GTK_WINDOW (run_dialog),
GNOME_ICONDIR"/gnome-run.png");
--- gnome-core-1.4.0.4/gnome-terminal/gnome-terminal.c.translatefont Wed Aug 15 12:02:10 2001
+++ gnome-core-1.4.0.4/gnome-terminal/gnome-terminal.c Wed Aug 15 12:04:46 2001
@@ -51,7 +51,6 @@
char **env;
-#define DEFAULT_FONT "-*-fixed-medium-r-normal--14-*-*-*-*-*-*-*,*-r-*"
#define EXTRA 6
/* is there pixmap compiled into zvt */
@@ -502,13 +501,24 @@
int colour_count;
char **colours;
int i;
+ char *font_key;
/* It's very odd that these are here */
cfg->font = NULL;
cfg->class = g_strdup (class);
cfg->scrollback = gnome_config_get_int ("scrollbacklines=100");
- cfg->font = gnome_config_get_string ("font=" DEFAULT_FONT);
+
+ /* Translators, translate this font to one that's good for
+ * your language
+ */
+ font_key =
+ g_strconcat ("font=",
+ _("-*-fixed-medium-r-normal--14-*-*-*-*-*-*-*,*-r-*"),
+ NULL);
+ cfg->font = gnome_config_get_string (font_key);
+ g_free (font_key);
+
cfg->wordclass = gnome_config_get_string ("wordclass=-A-Za-z0-9,./?%&#");
p = gnome_config_get_string ("scrollpos=right");
if (g_strcasecmp (p, "left") == 0)
--- gnome-core-1.4.0.4/panel/config/panel.config.redhatdefaults Tue May 29 22:06:36 2001
+++ gnome-core-1.4.0.4/panel/config/panel.config Fri Aug 3 16:14:41 2001
@@ -1,13 +1,13 @@
[Config]
-applet_count=11
-panel_count=2
+applet_count=10
+panel_count=1
tearoffs_count=0
[Panel_1]
type=0
-hidebuttons_enabled=true
-hidebutton_pixmaps_enabled:Conditional={screen_width > 800}true{true}false
+hidebuttons_enabled=false
+hidebutton_pixmaps_enabled=true
mode=0
state=0
level=0
@@ -22,15 +22,3 @@
backcolor=#000000
back_type=0
edge=2
-
-[Panel_2]
-type=5
-unique_id=10000002
-sz=24
-fit_pixmap_bg=false
-strech_pixmap_bg=false
-rotate_pixmap_bg=false
-backpixmap=
-backcolor=#000000
-back_type=0
-screen=0
--- gnome-core-1.4.0.4/panel/config/panel.global.redhatdefaults Fri Jun 1 23:25:43 2001
+++ gnome-core-1.4.0.4/panel/config/panel.global Fri Aug 3 16:14:41 2001
@@ -9,8 +9,8 @@
movement_type=0
tooltips_enabled=true
show_dot_buttons=false
-memory_hungry_menus=false
-use_large_icons:Conditional={screen_height > 768}true{true}false
+memory_hungry_menus=true
+use_large_icons=false
merge_menus=true
menu_check=true
off_panel_popups=true
@@ -28,8 +28,8 @@
confirm_panel_remove=true
menu_flags=-1
keys_enabled=true
-menu_key=Mod1-F1
-run_key=Mod1-F2
+menu_key=Control-Escape
+run_key=Control-Shift-R
screenshot_key=Print
window_screenshot_key=Shift-Print
fast_button_scaling=false
--- gnome-core-1.4.0.4/panel/config/Applet_Config.redhatdefaults Tue May 29 22:06:36 2001
+++ gnome-core-1.4.0.4/panel/config/Applet_Config Fri Aug 3 16:15:14 2001
@@ -14,9 +14,8 @@
[Applet_2]
Conditional=screen_width >= 640
-id=Launcher
-parameters=gnome/apps/gnome-help.desktop
-position=12
+id=Lock
+position=10
panel=0
unique_panel_id=10000001
right_stick=false
@@ -24,8 +23,8 @@
[Applet_3]
Conditional=screen_width >= 640
id=Launcher
-parameters=gnome/apps/System/gnome-terminal.desktop
-position=13
+parameters=gnome/apps/nautilus-help.desktop
+position=12
panel=0
unique_panel_id=10000001
right_stick=false
@@ -33,8 +32,8 @@
[Applet_4]
Conditional=screen_width >= 640
id=Launcher
-parameters=gnome/apps/Settings/gnomecc.desktop
-position=14
+parameters=gnome/apps/System/gnome-terminal.desktop
+position=13
panel=0
unique_panel_id=10000001
right_stick=false
@@ -42,57 +41,51 @@
[Applet_5]
Conditional=screen_width >= 640
id=Launcher
-parameters:Conditional={exists '/etc/X11/applnk/Internet/mozilla.desktop'}/etc/X11/applnk/Internet/mozilla.desktop{exists 'gnome/apps/Internet/mozilla.desktop'}gnome/apps/Internet/mozilla.desktop{exists 'gnome/apps/Internet/Mozilla.desktop'}gnome/apps/Internet/Mozilla.desktop{true}gnome/apps/Internet/Netscape.desktop
-position=15
+parameters=/usr/share/nautilus/starthere.desktop
+position=11
panel=0
unique_panel_id=10000001
right_stick=false
[Applet_6]
-id=Extern
-goad_id=tasklist_applet
-position=1000
+Conditional=screen_width >= 640
+id=Launcher
+parameters:Conditional={exists '/etc/X11/applnk/Internet/mozilla.desktop'}/etc/X11/applnk/Internet/mozilla.desktop{exists 'gnome/apps/Internet/mozilla.desktop'}gnome/apps/Internet/mozilla.desktop{exists 'gnome/apps/Internet/Mozilla.desktop'}gnome/apps/Internet/Mozilla.desktop{exists '/etc/X11/applnk/Internet/netscape-communicator.desktop'}/etc/X11/applnk/Internet/netscape-communicator.desktop{exists '/etc/X11/applnk/Internet/netscape-navigator.desktop'}/etc/X11/applnk/Internet/netscape-navigator.desktop{true}gnome/apps/Internet/Netscape.desktop
+position=15
panel=0
unique_panel_id=10000001
-right_stick=true
+right_stick=false
[Applet_7]
-Conditional=screen_width >= 640
id=Extern
-goad_id=fish_applet
-position=1001
+goad_id=tasklist_applet
+position=1000
panel=0
unique_panel_id=10000001
right_stick=true
[Applet_8]
-id=Status
-position=1002
+id=Extern
+goad_id=deskguide_applet
+position=1001
panel=0
-unique_panel_id=10000001
+unique_panel_id=10000002
right_stick=true
[Applet_9]
+Conditional=have battery
id=Extern
-goad_id=deskguide_applet
-position=1000
-panel=1
+goad_id=battery_applet
+position=1002
+panel=0
unique_panel_id=10000002
right_stick=true
[Applet_10]
id=Extern
-goad_id=gen_util_mailcheck
-position=1001
-panel=1
+goad_id=gen_util_clock
+position=1003
+panel=0
unique_panel_id=10000002
right_stick=true
-[Applet_11]
-Conditional=have battery
-id=Extern
-goad_id=battery_applet
-position=1002
-panel=1
-unique_panel_id=10000002
-right_stick=true
--- gnome-core-1.4.0.4/applets/desk-guide/deskguide_applet.c.redhatdefaults Fri Aug 3 16:14:40 2001
+++ gnome-core-1.4.0.4/applets/desk-guide/deskguide_applet.c Fri Aug 3 16:14:41 2001
@@ -75,7 +75,7 @@
static ConfigItem gp_config_items[] = {
CONFIG_PAGE (N_("Display")),
CONFIG_SECTION (sect_layout, N_("Layout")),
- CONFIG_BOOL (show_arrow, TRUE,
+ CONFIG_BOOL (show_arrow, FALSE,
N_("Show tasklist arrow")),
CONFIG_BOOL (switch_arrow, FALSE,
N_("Switch horizontal/vertical position of tasklist arrow")),
@@ -118,7 +118,7 @@
N_("Override desktop height with panel size")),
CONFIG_BOOL (div_by_vareas, TRUE,
N_("Divide height by number of vertical areas")),
- CONFIG_RANGE (row_stackup, 1, 1, 64,
+ CONFIG_RANGE (row_stackup, 2, 1, 64,
N_("Rows of Desktops")),
CONFIG_BOOL (div_by_nrows, TRUE,
N_("Divide height by number of rows")),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
