From 5ab2b0e510663f14c9dc8e2e6541e7f0c0373d66 Mon Sep 17 00:00:00 2001 From: mallum Date: Wed, 12 Jan 2005 19:36:45 +0000 Subject: Boring rename git-svn-id: http://svn.o-hand.com/repos/matchbox/trunk/Xoo@1030 b067294f-1dea-0310-9683-c47a78595994 --- ChangeLog | 18 ++ README | 4 +- configure.ac | 2 +- data/Makefile.am | 4 +- data/Xoo.glade | 582 +++++++++++++++++++++++++++++++++++++++++++++++ data/matchbox-nest.glade | 582 ----------------------------------------------- src/Makefile.am | 6 +- src/button.c | 4 +- src/callbacks.c | 4 +- src/config.c | 4 +- src/fakedev.h | 4 +- src/keys.c | 4 +- src/main.c | 8 +- src/prefs.c | 4 +- src/prefs.h | 6 +- 15 files changed, 627 insertions(+), 609 deletions(-) create mode 100644 data/Xoo.glade delete mode 100644 data/matchbox-nest.glade diff --git a/ChangeLog b/ChangeLog index d54e096..d816fa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2005-01-12 mallum,,, + + * README: + * configure.ac: + * data/Makefile.am: + * data/Xoo.glade: + * data/matchbox-nest.glade: + * src/Makefile.am: + * src/button.c: + * src/callbacks.c: + * src/config.c: + * src/fakedev.h: + * src/keys.c: + * src/main.c: (fakeapp_new): + * src/prefs.c: + * src/prefs.h: + Rename matchbox-nest -> Xoo + 2004-12-03 mallum,,, * Makefile.am: diff --git a/README b/README index 4574c70..6cc75b7 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -matchbox-nest ReadMe. +Xoo ReadMe. ====================== -Matchbox-nest is a graphical wrapper around xnest. You can make Xnest +Xoo is a graphical wrapper around xnest. You can make Xnest look like a particular device's display and set up buttons on that device. diff --git a/configure.ac b/configure.ac index 7b8eea8..38a69ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT([matchbox-nest], 0.5, [mallum@handhelds.org]) +AC_INIT([Xoo], 0.5, [mallum@handhelds.org]) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE() diff --git a/data/Makefile.am b/data/Makefile.am index cb863f6..d158b1b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,8 +1,8 @@ -EXTRA_DIST = ipaq3800.xml ipaq3800.png dot.png matchbox-nest.glade +EXTRA_DIST = ipaq3800.xml ipaq3800.png dot.png Xoo.glade devicedir = $(pkgdatadir) device_DATA = ipaq3800.xml ipaq3800.png dot.png uidir = $(pkgdatadir) -ui_DATA = matchbox-nest.glade +ui_DATA = Xoo.glade diff --git a/data/Xoo.glade b/data/Xoo.glade new file mode 100644 index 0000000..a9f0b69 --- /dev/null +++ b/data/Xoo.glade @@ -0,0 +1,582 @@ + + + + + + + True + True + GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK + Xoo + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + + + True + False + 0 + + + + True + + + + True + _Device + True + + + + + + + True + False + Select _Device... + True + + + + + + + True + _Send Debug Signal + True + + + + + + + True + gtk-preferences + True + + + + + + + True + + + + + + True + gtk-quit + True + + + + + + + + + + + True + _Help + True + + + + + + + True + _About + True + + + + + + + + + + 0 + False + False + + + + + + True + + + + + 50 + 50 + True + + + 48 + 48 + + + + + 0 + True + True + + + + + + + + True + + + + True + Popup + True + + + + + + + True + Show decorations + True + True + + + + + + + + + + + Preferences + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + + + + + 8 + True + False + 8 + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 6 + 12 + 0 + + + + True + 3 + 2 + False + 4 + 4 + + + + True + Extra Options: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + X Server: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + X Display: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + + True + False + 0 + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + + False + True + GTK_RELIEF_NORMAL + True + + + + True + gtk-open + 2 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + + + + + True + <b>Embedded X Server</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + GTK_BUTTONBOX_END + 8 + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + + + True + True + True + gtk-apply + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + False + False + + + + + + + + Xoo + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + + + + + 8 + True + False + 8 + + + + True + <span size="xx-large"><b>Xoo</b></span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + A tool for simulating X-based small-screen devices. + False + False + GTK_JUSTIFY_CENTER + True + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + <small>Copyright © 2004 OpenedHand Ltd +info@o-hand.com</small> + False + True + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + GTK_BUTTONBOX_DEFAULT_STYLE + 0 + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + True + False + + + + + + + diff --git a/data/matchbox-nest.glade b/data/matchbox-nest.glade deleted file mode 100644 index 41b5553..0000000 --- a/data/matchbox-nest.glade +++ /dev/null @@ -1,582 +0,0 @@ - - - - - - - True - True - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK - Matchbox-Nest - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - - - - - True - False - 0 - - - - True - - - - True - _Device - True - - - - - - - True - False - Select _Device... - True - - - - - - - True - _Send Debug Signal - True - - - - - - - True - gtk-preferences - True - - - - - - - True - - - - - - True - gtk-quit - True - - - - - - - - - - - True - _Help - True - - - - - - - True - _About - True - - - - - - - - - - 0 - False - False - - - - - - True - - - - - 50 - 50 - True - - - 48 - 48 - - - - - 0 - True - True - - - - - - - - True - - - - True - Popup - True - - - - - - - True - Show decorations - True - True - - - - - - - - - - - Preferences - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - - - - - 8 - True - False - 8 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 6 - 6 - 12 - 0 - - - - True - 3 - 2 - False - 4 - 4 - - - - True - Extra Options: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - X Server: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - X Display: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - False - 0 - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - - False - True - GTK_RELIEF_NORMAL - True - - - - True - gtk-open - 2 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - - - - - True - <b>Embedded X Server</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 8 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-apply - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - False - - - - - - - - Matchbox Nest - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - - - - - 8 - True - False - 8 - - - - True - <span size="xx-large"><b>Matchbox Nest</b></span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - A tool for simulating X-based small-screen devices. - False - False - GTK_JUSTIFY_CENTER - True - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - <small>Copyright © 2004 OpenedHand Ltd -info@o-hand.com</small> - False - True - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - False - - - - - - - diff --git a/src/Makefile.am b/src/Makefile.am index 3fffde1..2edee91 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @APP_CFLAGS@ @EXPAT_CFLAGS@ @X_CFLAGS@ -Wall -bin_PROGRAMS = matchbox-nest +bin_PROGRAMS = Xoo if HAVE_GCONF GCONF_SOURCES = prefs.c prefs.h endif -matchbox_nest_SOURCES = main.c button.c callbacks.h callbacks.c config.c keys.c fakedev.h $(GCONF_SOURCES) +Xoo_SOURCES = main.c button.c callbacks.h callbacks.c config.c keys.c fakedev.h $(GCONF_SOURCES) -matchbox_nest_LDADD = @APP_LIBS@ @EXPAT_LIBS@ @X_LIBS@ @XTEST_LIBS@ +Xoo_LDADD = @APP_LIBS@ @EXPAT_LIBS@ @X_LIBS@ @XTEST_LIBS@ diff --git a/src/button.c b/src/button.c index c95d69c..eeec5a1 100644 --- a/src/button.c +++ b/src/button.c @@ -1,6 +1,6 @@ -/* matchbox-nest - a graphical wrapper around xnest +/* Xoo - a graphical wrapper around xnest * - * Copyright 2004 Matthew Allum + * Copyright 2004,2005 Matthew Allum, Openedhand Ltd * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/callbacks.c b/src/callbacks.c index 02ba81a..197fc17 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -1,6 +1,6 @@ -/* matchbox-nest - a graphical wrapper around xnest +/* Xoo - a graphical wrapper around xnest * - * Copyright 2004 Matthew Allum + * Copyright 2004,2005 Matthew Allum, Openedhand Ltd * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config.c b/src/config.c index 56cfb6b..71210b9 100644 --- a/src/config.c +++ b/src/config.c @@ -1,6 +1,6 @@ -/* matchbox-nest - a graphical wrapper around xnest +/* Xoo - a graphical wrapper around xnest * - * Copyright 2004 Matthew Allum + * Copyright 2004,2005 Matthew Allum, Openedhand Ltd * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/fakedev.h b/src/fakedev.h index eec6037..845016c 100644 --- a/src/fakedev.h +++ b/src/fakedev.h @@ -1,6 +1,6 @@ -/* matchbox-nest - a graphical wrapper around xnest +/* Xoo - a graphical wrapper around xnest * - * Copyright 2004 Matthew Allum + * Copyright 2004,2005 Matthew Allum, Openedhand Ltd * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/keys.c b/src/keys.c index d2a38ee..ae38e7c 100644 --- a/src/keys.c +++ b/src/keys.c @@ -1,6 +1,6 @@ -/* matchbox-nest - a graphical wrapper around xnest +/* Xoo - a graphical wrapper around xnest * - * Copyright 2004 Matthew Allum + * Copyright 2004,2005 Matthew Allum, Openedhand Ltd * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main.c b/src/main.c index 336fb1d..88e2310 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ -/* matchbox-nest - a graphical wrapper around xnest +/* Xoo - a graphical wrapper around xnest * - * Copyright 2004 Matthew Allum + * Copyright 2004,2005 Matthew Allum, Openedhand Ltd * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,9 +52,9 @@ fakeapp_new(void) app->key_rep_timeout.tv_usec = 40000; app->key_rep_timeout.tv_sec = 0; - app->win_title = "matchbox-nest"; + app->win_title = "Xoo"; - glade = glade_xml_new (PKGDATADIR "/matchbox-nest.glade", NULL, NULL); + glade = glade_xml_new (PKGDATADIR "/Xoo.glade", NULL, NULL); g_assert (glade != NULL); glade_xml_signal_connect_data (glade, "on_send_signal_activate", (GCallback)on_send_signal_activate, app); diff --git a/src/prefs.c b/src/prefs.c index 22009fa..22edad1 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -1,6 +1,6 @@ -/* matchbox-nest - a graphical wrapper around xnest +/* Xoo - a graphical wrapper around xnest * - * Copyright 2004 Matthew Allum + * Copyright 2004,2005 Matthew Allum, Openedhand Ltd * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/prefs.h b/src/prefs.h index 8dd911d..c30305a 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -1,9 +1,9 @@ #include #include "fakedev.h" -#define GCONF_DISPLAY "/apps/matchbox-nest/display" -#define GCONF_SERVER "/apps/matchbox-nest/xserver" -#define GCONF_SERVER_OPTIONS "/apps/matchbox-nest/xserver-options" +#define GCONF_DISPLAY "/apps/Xoo/display" +#define GCONF_SERVER "/apps/Xoo/xserver" +#define GCONF_SERVER_OPTIONS "/apps/Xoo/xserver-options" void gconf_prefs_init(FakeApp *app); -- cgit v1.2.3