diff --git a/Makefile b/Makefile index ae351a3..aee772f 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,7 @@ dist: $(PACKAGE)-$(VERSION)/src/applets/memory.c \ $(PACKAGE)-$(VERSION)/src/applets/pager.c \ $(PACKAGE)-$(VERSION)/src/applets/phone.c \ + $(PACKAGE)-$(VERSION)/src/applets/separator.c \ $(PACKAGE)-$(VERSION)/src/applets/swap.c \ $(PACKAGE)-$(VERSION)/src/applets/systray.c \ $(PACKAGE)-$(VERSION)/src/applets/tasks.c \ diff --git a/src/applets/Makefile b/src/applets/Makefile index 88a724a..4ccd866 100644 --- a/src/applets/Makefile +++ b/src/applets/Makefile @@ -1,4 +1,4 @@ -TARGETS = battery.so bluetooth.so clock.so close.so cpu.so cpufreq.so desktop.so gps.so gsm.so keyboard.so lock.so logout.so main.so memory.so pager.so phone.so swap.so systray.so tasks.so title.so usb.so volume.so wpa_supplicant.so +TARGETS = battery.so bluetooth.so clock.so close.so cpu.so cpufreq.so desktop.so gps.so gsm.so keyboard.so lock.so logout.so main.so memory.so pager.so phone.so separator.so swap.so systray.so tasks.so title.so usb.so volume.so wpa_supplicant.so PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib @@ -130,6 +130,13 @@ phone_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) phone.so: $(phone_OBJS) $(LD) -o phone.so $(phone_OBJS) $(phone_LDFLAGS) +separator_OBJS = separator.o +separator_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) +separator_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) + +separator.so: $(separator_OBJS) + $(LD) -o separator.so $(separator_OBJS) $(separator_LDFLAGS) + swap_OBJS = swap.o swap_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) swap_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) @@ -227,6 +234,9 @@ pager.o: pager.c ../../include/Panel.h phone.o: phone.c ../../include/Panel.h $(CC) $(phone_CFLAGS) -c phone.c +separator.o: separator.c ../../include/Panel.h + $(CC) $(separator_CFLAGS) -c separator.c + swap.o: swap.c ../../include/Panel.h $(CC) $(swap_CFLAGS) -c swap.c @@ -249,7 +259,7 @@ wpa_supplicant.o: wpa_supplicant.c ../../include/Panel.h $(CC) $(wpa_supplicant_CFLAGS) -c wpa_supplicant.c clean: - $(RM) -- $(battery_OBJS) $(bluetooth_OBJS) $(clock_OBJS) $(close_OBJS) $(cpu_OBJS) $(cpufreq_OBJS) $(desktop_OBJS) $(gps_OBJS) $(gsm_OBJS) $(keyboard_OBJS) $(lock_OBJS) $(logout_OBJS) $(main_OBJS) $(memory_OBJS) $(pager_OBJS) $(phone_OBJS) $(swap_OBJS) $(systray_OBJS) $(tasks_OBJS) $(title_OBJS) $(usb_OBJS) $(volume_OBJS) $(wpa_supplicant_OBJS) + $(RM) -- $(battery_OBJS) $(bluetooth_OBJS) $(clock_OBJS) $(close_OBJS) $(cpu_OBJS) $(cpufreq_OBJS) $(desktop_OBJS) $(gps_OBJS) $(gsm_OBJS) $(keyboard_OBJS) $(lock_OBJS) $(logout_OBJS) $(main_OBJS) $(memory_OBJS) $(pager_OBJS) $(phone_OBJS) $(separator_OBJS) $(swap_OBJS) $(systray_OBJS) $(tasks_OBJS) $(title_OBJS) $(usb_OBJS) $(volume_OBJS) $(wpa_supplicant_OBJS) distclean: clean $(RM) -- $(TARGETS) @@ -288,6 +298,8 @@ install: $(TARGETS) $(MKDIR) $(DESTDIR)$(LIBDIR)/Panel/applets $(INSTALL) -m 0644 -- phone.so $(DESTDIR)$(LIBDIR)/Panel/applets/phone.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Panel/applets + $(INSTALL) -m 0644 -- separator.so $(DESTDIR)$(LIBDIR)/Panel/applets/separator.so + $(MKDIR) $(DESTDIR)$(LIBDIR)/Panel/applets $(INSTALL) -m 0644 -- swap.so $(DESTDIR)$(LIBDIR)/Panel/applets/swap.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Panel/applets $(INSTALL) -m 0644 -- systray.so $(DESTDIR)$(LIBDIR)/Panel/applets/systray.so @@ -319,6 +331,7 @@ uninstall: $(RM) -- $(DESTDIR)$(LIBDIR)/Panel/applets/memory.so $(RM) -- $(DESTDIR)$(LIBDIR)/Panel/applets/pager.so $(RM) -- $(DESTDIR)$(LIBDIR)/Panel/applets/phone.so + $(RM) -- $(DESTDIR)$(LIBDIR)/Panel/applets/separator.so $(RM) -- $(DESTDIR)$(LIBDIR)/Panel/applets/swap.so $(RM) -- $(DESTDIR)$(LIBDIR)/Panel/applets/systray.so $(RM) -- $(DESTDIR)$(LIBDIR)/Panel/applets/tasks.so diff --git a/src/applets/project.conf b/src/applets/project.conf index 2111c46..920a5fe 100644 --- a/src/applets/project.conf +++ b/src/applets/project.conf @@ -1,4 +1,4 @@ -targets=battery,bluetooth,clock,close,cpu,cpufreq,desktop,gps,gsm,keyboard,lock,logout,main,memory,pager,phone,swap,systray,tasks,title,usb,volume,wpa_supplicant +targets=battery,bluetooth,clock,close,cpu,cpufreq,desktop,gps,gsm,keyboard,lock,logout,main,memory,pager,phone,separator,swap,systray,tasks,title,usb,volume,wpa_supplicant cppflags_force=-I ../../include #cppflags=-D EMBEDDED cflags_force=-W `pkg-config --cflags libSystem gtk+-2.0` -fPIC @@ -134,6 +134,14 @@ install=$(LIBDIR)/Panel/applets [phone.c] depends=../../include/Panel.h +[separator] +type=plugin +sources=separator.c +install=$(LIBDIR)/Panel/applets + +[separator.c] +depends=../../include/Panel.h + [swap] type=plugin sources=swap.c diff --git a/src/applets/separator.c b/src/applets/separator.c new file mode 100644 index 0000000..b5a3a3c --- /dev/null +++ b/src/applets/separator.c @@ -0,0 +1,64 @@ +/* $Id$ */ +/* Copyright (c) 2011 Pierre Pronchery */ +/* This file is part of DeforaOS Desktop Panel */ +/* 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 + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + + + +#include "Panel.h" + + +/* separator */ +/* private */ +/* prototypes */ +/* plug-in */ +static GtkWidget * _separator_init(PanelApplet * applet); +static void _separator_destroy(PanelApplet * applet); + + +/* public */ +/* variables */ +PanelApplet applet = +{ + NULL, + "Separator", + NULL, + _separator_init, + _separator_destroy, + NULL, + FALSE, + TRUE, + NULL +}; + + +/* private */ +/* functions */ +static GtkWidget * _separator_init(PanelApplet * applet) +{ + GtkWidget * widget; + + widget = gtk_vseparator_new(); + applet->priv = widget; + gtk_widget_show(widget); + return widget; +} + + +/* separator_destroy */ +static void _separator_destroy(PanelApplet * applet) +{ + GtkWidget * widget = applet->priv; + + gtk_widget_destroy(widget); +}