Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=1e740eb78b3940d9d3cd255dc153ac1b0e787c59

commit 1e740eb78b3940d9d3cd255dc153ac1b0e787c59
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sat Jan 1 13:35:15 2011 +0100

*added install to makefile
*added .desktop for each modules
*a module should be started standalone
*browser/check update/terminal
*this modules will provides a file xml/txt with name/comment/exec
*will install this files into /usr/share/frugalware-tweak/plugins/XX-system.xml 
etc...
*frugalware-tweak2 should parse this files and add it
*rename binary frugalware-tweak (vala) frugalware-tweak2 for keep mono frugal 
tweak

diff --git a/frugal-tweak-vala/DATA/desktop/frugalware-tweak-browser.desktop 
b/frugal-tweak-vala/DATA/desktop/frugalware-tweak-browser.desktop
new file mode 100644
index 0000000..c47f175
--- /dev/null
+++ b/frugal-tweak-vala/DATA/desktop/frugalware-tweak-browser.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=frugalware-tweak-browser
+Comment=browser webkit engine
+TryExec=frugalware-tweak-browser
+Exec=frugalware-tweak-browser
+Icon=frugalware-tweak
+Type=Application
+Categories=Application;Network;WebBrowser;
+StartupNotify=true
diff --git 
a/frugal-tweak-vala/DATA/desktop/frugalware-tweak-pacman-update.desktop 
b/frugal-tweak-vala/DATA/desktop/frugalware-tweak-pacman-update.desktop
new file mode 100644
index 0000000..6f0219a
--- /dev/null
+++ b/frugal-tweak-vala/DATA/desktop/frugalware-tweak-pacman-update.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=frugalware-tweak-pacman-update
+Comment=check available packages update
+TryExec=frugalware-tweak-pacman-update
+Exec=frugalware-tweak-pacman-update
+Icon=frugalware-tweak
+Type=Application
+Categories=Application;Application;GTK;System;
+StartupNotify=true
diff --git a/frugal-tweak-vala/DATA/desktop/frugalware-tweak-terminal.desktop 
b/frugal-tweak-vala/DATA/desktop/frugalware-tweak-terminal.desktop
new file mode 100644
index 0000000..1316eb1
--- /dev/null
+++ b/frugal-tweak-vala/DATA/desktop/frugalware-tweak-terminal.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=frugalware-tweak-terminal
+Comment=Use the command line
+TryExec=frugalware-tweak-terminal
+Exec=frugalware-tweak-terminal
+Icon=frugalware-tweak
+Type=Application
+Categories=GTK;Utility;TerminalEmulator;
+StartupNotify=true
diff --git a/frugal-tweak-vala/DATA/desktop/frugalware-tweak.desktop 
b/frugal-tweak-vala/DATA/desktop/frugalware-tweak.desktop
new file mode 100644
index 0000000..69f7879
--- /dev/null
+++ b/frugal-tweak-vala/DATA/desktop/frugalware-tweak.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=frugalware-tweak
+Comment=frugalware-tweak (vala)
+TryExec=frugalware-tweak2
+Exec=frugalware-tweak2
+Icon=frugalware-tweak
+Type=Application
+Categories=Application;Application;GTK;System;
+StartupNotify=true
diff --git a/frugal-tweak-vala/DATA/pictures/System.png 
b/frugal-tweak-vala/DATA/pictures/System.png
new file mode 100644
index 0000000..f470853
Binary files /dev/null and b/frugal-tweak-vala/DATA/pictures/System.png differ
diff --git a/frugal-tweak-vala/DATA/pictures/frugalware-tweak.png 
b/frugal-tweak-vala/DATA/pictures/frugalware-tweak.png
new file mode 100644
index 0000000..2ea4c15
Binary files /dev/null and 
b/frugal-tweak-vala/DATA/pictures/frugalware-tweak.png differ
diff --git a/frugal-tweak-vala/Makefile b/frugal-tweak-vala/Makefile
index f9f4dfa..401fcc1 100644
--- a/frugal-tweak-vala/Makefile
+++ b/frugal-tweak-vala/Makefile
@@ -17,7 +17,7 @@ all: daemon terminal browser frugalwaretweak pacmanupdate

frugalwaretweak:
$(VALAC) --define=$(VALAFLAG) --pkg gio-2.0 --pkg gtk+-2.0 --pkg gmodule-2.0 
--pkg pacman  --pkg unique-1.0 --pkg libnotify \
-       $(FRUGALTWEAKSOURCES) -o frugalware-tweak
+       $(FRUGALTWEAKSOURCES) -o frugalware-tweak2

pacmanupdate:
$(VALAC) --define=$(VALAFLAG) --pkg gio-2.0 --pkg gtk+-2.0 --pkg gmodule-2.0  
--pkg pacman $(PACMANUPDATESOURCES) -o frugalware-tweak-pacman-update
@@ -31,9 +31,28 @@ terminal:
browser:
$(VALAC) --define=$(VALAFLAG) --pkg gtk+-2.0 --pkg webkit-1.0 $(BROWSERSOURCES) 
-o frugalware-tweak-browser

+install:
+       mkdir -p $(destdir)/usr/bin
+       mkdir -p $(destdir)/usr/share/glib-2.0/schemas/
+       mkdir -p $(destdir)/usr/share/pixmaps/
+       mkdir -p $(destdir)/usr/share/applications/
+       mkdir -p $(destdir)/usr/share/frugalware-tweak/plugins/
+       mkdir -p $(destdir)/usr/share/frugalware-tweak/pictures/
+       mkdir -p $(destdir)/etc/xdg/autostart/
+       cp frugalware-tweak-browser $(destdir)/usr/bin/
+       cp frugalware-tweak-terminal $(destdir)/usr/bin/
+       cp frugalware-tweak-daemon $(destdir)/usr/bin/
+       cp frugalware-tweak2 $(destdir)/usr/bin/
+       cp frugalware-tweak-pacman-update $(destdir)/usr/bin/
+       cp DATA/org.frugalware.frugaltweak.gschema.xml 
$(destdir)/usr/share/glib-2.0/schemas/
+       cp DATA/pictures/frugalware-tweak.png $(destdir)/usr/share/pixmaps/
+       cp DATA/desktop/*.desktop $(destdir)/usr/share/applications/
+       cp DATA/desktop/frugalware-tweak.desktop 
$(destdir)/etc/xdg/autostart/frugalware-tweak.desktop
+       cp DATA/pictures/*.png $(destdir)/usr/share/frugalware-tweak/pictures/
+
clean:
@rm frugalware-tweak-terminal
@rm frugalware-tweak-daemon
@rm frugalware-tweak-browser
-       @rm frugalware-tweak
+       @rm frugalware-tweak2
@rm frugalware-tweak-pacman-update
diff --git a/frugal-tweak-vala/src/MainClient.vala 
b/frugal-tweak-vala/src/MainClient.vala
index b0ac548..72c6755 100644
--- a/frugal-tweak-vala/src/MainClient.vala
+++ b/frugal-tweak-vala/src/MainClient.vala
@@ -42,7 +42,7 @@ int main (string[] args) {
return 1;
}
/* Create tray icon */
-        StatusIcon trayicon = new 
StatusIcon.from_file("/usr/share/pixmaps/FrugalTools.png");
+        StatusIcon trayicon = new 
StatusIcon.from_file("/usr/share/frugalware-tweak/pictures/frugalware-tweak.png");
trayicon.set_tooltip_text ("Frugalware Tweak !");
trayicon.set_visible(true);
//TODO
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to