devuan
/
xfce4-panel
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Add info panel by Xavier Maillard 

(Old svn revision: 3296)
upstream/xfce4-panel-4.10.1
Jasper Huijsmans 21 years ago
parent
29717f0441
commit
8a84501c13
11 changed files with 113 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      ChangeLog
  2. 5
      Makefile.am
  3. 38
      Makefile.in
  4. 12
      configure
  5. 2
      configure.ac
  6. 3
      panel/Makefile.am
  7. 27
      panel/Makefile.in
  8. 3
      panel/callbacks.c
  9. 10
      panel/dialogs.c
  10. 2
      panel/dialogs.h
  11. 2
      panel/xfce.c

31
ChangeLog
View File

@ -1,3 +1,34 @@
2002-08-08 23:27 huysmans
* panel/builtins.c: Additions to Exit/Lock module
2002-08-08 20:24 huysmans
* panel/: central.c, dialogs.c, global.h, xfce.c, xfce.h: More
config options for configuring central panel
2002-08-08 08:05 huysmans
* panel/: builtins.c, dialogs.c, global.h, module.c, module.h,
xfce.c, xfce.h: Add option to hide central panel
2002-08-06 20:15 huysmans
* Makefile.in, aclocal.m4, icons/Makefile.in, panel/Makefile.in,
panel/central.c, panel/global.h, panel/icons.c, panel/wmhints.c,
panel/wmhints.h, panel/xfce.c, plugins/Makefile.in,
plugins/mailcheck/Makefile.in, themes/Makefile.in,
themes/Gnome/Makefile.am, themes/Gnome/Makefile.in,
themes/Gnome/miniinfo.png, themes/Gnome/minilock.png,
themes/Gnome/minipalet.png, themes/Gnome/minipower.png: Add support
for themeable minibuttons and increased the maximum number of
groups to 16
2002-08-05 08:18 huysmans
* ChangeLog, panel/dialogs.c: Don't disable changing number of
desktops when desktop buttons are hidden
2002-08-04 16:42 huysmans
* panel/: central.c, central.h, dialogs.c, global.h, xfce.c: Add

5
Makefile.am
View File

@ -1,7 +1,12 @@
@SET_MAKE@
pkginfodir=$(pkgdatadir)
pkginfo_DATA = AUTHORS COPYING ChangeLog
noinst_DATA = example.xfce4rc
EXTRA_DIST = example.xfce4rc.in xfce4.spec xfce4.spec.in README.xml
SUBDIRS = @MY_SUBDIRS@

38
Makefile.in
View File

@ -91,6 +91,10 @@ am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
pkginfodir = $(pkgdatadir)
pkginfo_DATA = AUTHORS COPYING ChangeLog
noinst_DATA = example.xfce4rc
EXTRA_DIST = example.xfce4rc.in xfce4.spec xfce4.spec.in README.xml
@ -102,7 +106,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = xfce4.spec
DIST_SOURCES =
DATA = $(noinst_DATA)
DATA = $(noinst_DATA) $(pkginfo_DATA)
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
@ -163,6 +167,24 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
pkginfoDATA_INSTALL = $(INSTALL_DATA)
install-pkginfoDATA: $(pkginfo_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkginfodir)
@list='$(pkginfo_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(pkginfoDATA_INSTALL) $$d$$p $(DESTDIR)$(pkginfodir)/$$f"; \
$(pkginfoDATA_INSTALL) $$d$$p $(DESTDIR)$(pkginfodir)/$$f; \
done
uninstall-pkginfoDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkginfo_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(pkginfodir)/$$f"; \
rm -f $(DESTDIR)$(pkginfodir)/$$f; \
done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@ -366,6 +388,7 @@ check: check-recursive
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
$(mkinstalldirs) $(DESTDIR)$(pkginfodir)
install: install-recursive
install-exec: install-exec-recursive
@ -408,7 +431,7 @@ info: info-recursive
info-am:
install-data-am:
install-data-am: install-pkginfoDATA
install-exec-am:
@ -427,7 +450,7 @@ mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
uninstall-am: uninstall-info-am
uninstall-am: uninstall-info-am uninstall-pkginfoDATA
uninstall-info: uninstall-info-recursive
@ -440,13 +463,14 @@ uninstall-info: uninstall-info-recursive
install-data-am install-data-recursive install-exec \
install-exec-am install-exec-recursive install-info \
install-info-am install-info-recursive install-man \
install-recursive install-strip installcheck installcheck-am \
installdirs installdirs-am installdirs-recursive \
maintainer-clean maintainer-clean-generic \
install-pkginfoDATA install-recursive install-strip \
installcheck installcheck-am installdirs installdirs-am \
installdirs-recursive maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
uninstall uninstall-am uninstall-info-am \
uninstall-info-recursive uninstall-recursive
uninstall-info-recursive uninstall-pkginfoDATA \
uninstall-recursive
@SET_MAKE@

12
configure
View File

@ -1370,6 +1370,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
VERSION=`date +%y%m%d`
am__api_version="1.6"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@ -6197,7 +6199,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 6200 "configure"' > conftest.$ac_ext
echo '#line 6202 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -6733,7 +6735,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
if { (eval echo configure:6736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
if { (eval echo configure:6738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@ -8526,7 +8528,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 8529 "configure"
#line 8531 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -8624,7 +8626,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 8627 "configure"
#line 8629 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -9937,11 +9939,11 @@ s,@ECHO_C@,$ECHO_C,;t t
s,@ECHO_N@,$ECHO_N,;t t
s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
s,@VERSION@,$VERSION,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
s,@PACKAGE@,$PACKAGE,;t t
s,@VERSION@,$VERSION,;t t
s,@ACLOCAL@,$ACLOCAL,;t t
s,@AUTOCONF@,$AUTOCONF,;t t
s,@AUTOMAKE@,$AUTOMAKE,;t t

2
configure.ac
View File

@ -1,6 +1,8 @@
AC_INIT(panel/xfce.c)
VERSION=`date +%y%m%d`
AC_SUBST(VERSION)
AM_INIT_AUTOMAKE(xfce4, $VERSION)
AM_MAINTAINER_MODE

3
panel/Makefile.am
View File

@ -5,6 +5,7 @@ callbacks.c \
central.c \
dialogs.c \
icons.c \
info.c \
item.c \
item_dialog.c \
module.c \
@ -34,5 +35,5 @@ xfce.h \
xfce_support.h \
global.h
xfce4_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
xfce4_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DVERSION=\"@VERSION@\"
xfce4_LDADD = @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@

27
panel/Makefile.in
View File

@ -97,6 +97,7 @@ callbacks.c \
central.c \
dialogs.c \
icons.c \
info.c \
item.c \
item_dialog.c \
module.c \
@ -128,7 +129,7 @@ xfce_support.h \
global.h
xfce4_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
xfce4_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DVERSION=\"@VERSION@\"
xfce4_LDADD = @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@
subdir = panel
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -139,7 +140,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_xfce4_OBJECTS = xfce4-builtins.$(OBJEXT) xfce4-callbacks.$(OBJEXT) \
xfce4-central.$(OBJEXT) xfce4-dialogs.$(OBJEXT) \
xfce4-icons.$(OBJEXT) xfce4-item.$(OBJEXT) \
xfce4-icons.$(OBJEXT) xfce4-info.$(OBJEXT) xfce4-item.$(OBJEXT) \
xfce4-item_dialog.$(OBJEXT) xfce4-module.$(OBJEXT) \
xfce4-move.$(OBJEXT) xfce4-popup.$(OBJEXT) \
xfce4-settings.$(OBJEXT) xfce4-side.$(OBJEXT) \
@ -161,7 +162,7 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4-central.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4-dialogs.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4-icons.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4-item.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4-info.Po ./$(DEPDIR)/xfce4-item.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4-item_dialog.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4-module.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4-move.Po \
@ -228,6 +229,7 @@ xfce4-callbacks.$(OBJEXT): callbacks.c
xfce4-central.$(OBJEXT): central.c
xfce4-dialogs.$(OBJEXT): dialogs.c
xfce4-icons.$(OBJEXT): icons.c
xfce4-info.$(OBJEXT): info.c
xfce4-item.$(OBJEXT): item.c
xfce4-item_dialog.$(OBJEXT): item_dialog.c
xfce4-module.$(OBJEXT): module.c
@ -253,6 +255,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4-central.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4-dialogs.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4-icons.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4-info.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4-item.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4-item_dialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4-module.Po@am__quote@
@ -375,6 +378,24 @@ xfce4-icons.lo: icons.c
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_CFLAGS) $(CFLAGS) -c -o xfce4-icons.lo `test -f 'icons.c' || echo '$(srcdir)/'`icons.c
xfce4-info.o: info.c
@AMDEP_TRUE@ source='info.c' object='xfce4-info.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/xfce4-info.Po' tmpdepfile='$(DEPDIR)/xfce4-info.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_CFLAGS) $(CFLAGS) -c -o xfce4-info.o `test -f 'info.c' || echo '$(srcdir)/'`info.c
xfce4-info.obj: info.c
@AMDEP_TRUE@ source='info.c' object='xfce4-info.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/xfce4-info.Po' tmpdepfile='$(DEPDIR)/xfce4-info.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_CFLAGS) $(CFLAGS) -c -o xfce4-info.obj `cygpath -w info.c`
xfce4-info.lo: info.c
@AMDEP_TRUE@ source='info.c' object='xfce4-info.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/xfce4-info.Plo' tmpdepfile='$(DEPDIR)/xfce4-info.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_CFLAGS) $(CFLAGS) -c -o xfce4-info.lo `test -f 'info.c' || echo '$(srcdir)/'`info.c
xfce4-item.o: item.c
@AMDEP_TRUE@ source='item.c' object='xfce4-item.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/xfce4-item.Po' tmpdepfile='$(DEPDIR)/xfce4-item.TPo' @AMDEPBACKSLASH@

3
panel/callbacks.c
View File

@ -106,6 +106,9 @@ void mini_lock_cb(void)
void mini_info_cb(void)
{
hide_current_popup_menu();
info_panel_dialog();
}
void mini_palet_cb(void)

10
panel/dialogs.c
View File

@ -35,11 +35,11 @@
#include "icons.h"
enum
{ RESPONSE_REMOVE, RESPONSE_CHANGE, RESPONSE_CANCEL, RESPONSE_REVERT };
{ RESPONSE_REMOVE, RESPONSE_CHANGE, RESPONSE_CANCEL, RESPONSE_REVERT };
/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
Central panel dialogs
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
void screen_button_dialog(ScreenButton * sb)
{
GtkWidget *dialog;
@ -86,7 +86,7 @@ void screen_button_dialog(ScreenButton * sb)
/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
Side panel dialogs
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
GtkWidget *dialog = NULL;
@ -98,7 +98,7 @@ void set_transient_for_dialog(GtkWidget * window)
/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
Global settings
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
/* size: option menu
* popup size: option menu
@ -690,7 +690,7 @@ static void add_controls_box(GtkBox * box)
NULL);
/* subgroup central */
central_vbox = gtk_vbox_new(TRUE, 0);
central_vbox = gtk_vbox_new(TRUE, 4);
gtk_widget_show(central_vbox);
gtk_box_pack_start(GTK_BOX(vbox), central_vbox, FALSE, TRUE, 0);

2
panel/dialogs.h
View File

@ -28,4 +28,6 @@ void set_transient_for_dialog(GtkWidget * window);
void global_settings_dialog(void);
void info_panel_dialog( void );
#endif /* __XFCE_DIALOGS_H__ */

2
panel/xfce.c
View File

@ -206,7 +206,7 @@ static GtkWidget *create_panel_window(void)
gtk_window_set_resizable(window, FALSE);
gtk_window_stick(window);
/* set_window_type_dock(w);*/
set_window_type_dock(w);
gtk_container_set_border_width(GTK_CONTAINER(w), 0);

Write Preview
Loading…
Cancel
Save