Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*del* autoconf files not used anymore

Browse Source 
*add* install tint2conf .desktop and pixmaps
*fix* tint2conf warnings



git-svn-id: http://tint2.googlecode.com/svn/trunk@478 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2010-06-11 15:37:53 +00:00
parent d771fd9022
commit e26cecf664
12 changed files with 10 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Makefile.am
View File

@@ -1,43 +0,0 @@
if ENABLE_TINT2CONF
SUBDIRS = tint2conf
endif
AM_CFLAGS += @PANGOCAIRO_CFLAGS@ @PANGO_CFLAGS@ @CAIRO_CFLAGS@ @GLIB2_CFLAGS@ @GOBJECT2_CFLAGS@ @X11_CFLAGS@ @IMLIB2_CFLAGS@
LIBS = @PANGOCAIRO_LIBS@ @PANGO_LIBS@ @CAIRO_LIBS@ @GLIB2_LIBS@ @GOBJECT2_LIBS@ @X11_LIBS@ @IMLIB2_LIBS@ -lrt
INCLUDES = -Iutil -Iclock -Itaskbar -Isystray -Itooltip
bin_PROGRAMS = tint2
tint2_SOURCES = config.c \
util/area.h \
util/common.h \
util/common.c \
util/area.c \
util/window.h \
util/window.c \
util/timer.h \
util/timer.c \
panel.h \
clock/clock.c \
clock/clock.h \
config.h \
tint.c \
panel.c \
server.c \
server.h \
systray/systraybar.h \
systray/systraybar.c \
taskbar/taskbar.c \
taskbar/task.c \
taskbar/taskbar.h \
taskbar/task.h \
tooltip/tooltip.c \
tooltip/tooltip.h \
version.h
if ENABLE_BATTERY
DEFS += -DENABLE_BATTERY
INCLUDES += -Ibattery
tint2_SOURCES += battery/battery.c \
battery/battery.h
endif

2
src/tint2conf/CMakeLists.txt
View File

@@ -33,3 +33,5 @@ set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed)
install( TARGETS tint2conf DESTINATION bin )
install( PROGRAMS tintwizard.py DESTINATION bin )
install( FILES tint2conf.png tint2conf.svg DESTINATION share/pixmaps )
install( FILES tint2conf.desktop DESTINATION share/applications )

9
src/tint2conf/Makefile.am
View File

@@ -1,9 +0,0 @@
if ENABLE_TINT2CONF
bin_PROGRAMS = tint2conf
dist_bin_SCRIPTS = tintwizard.py
tint2conf_SOURCES = main.c theme_view.c theme_view.h ../util/common.c ../version.h
INCLUDES = -I../util
AM_CFLAGS += @TINT2CONF_CFLAGS@
LIBS += @TINT2CONF_LIBS@
endif

10
src/tint2conf/main.c
View File

@@ -192,7 +192,7 @@ static void menuAbout()
{
const char *authors[] = { "Thierry Lorthiois <lorthiois@bbsoft.fr>", "Andreas Fink <andreas.fink85@googlemail.com>", "Christian Ruppert <Spooky85@gmail.com> (Build system)", "Euan Freeman <euan04@gmail.com> (tintwizard)\n See http://code.google.com/p/tintwizard/", NULL };
gtk_show_about_dialog(g_window, "name", g_get_application_name( ),
gtk_show_about_dialog(GTK_WINDOW(g_window), "name", g_get_application_name( ),
"comments", _("Theming tool for tint2 panel"),
"version", VERSION_STRING,
"copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"),
@@ -211,7 +211,7 @@ static void menuAdd()
GtkFileChooser *chooser;
GtkFileFilter *filter;
dialog = gtk_file_chooser_dialog_new(_("Add a theme"), g_window, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL);
dialog = gtk_file_chooser_dialog_new(_("Add a theme"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL);
chooser = GTK_FILE_CHOOSER(dialog);
gtk_file_chooser_set_current_folder(chooser, g_get_home_dir());
@@ -246,7 +246,7 @@ static void menuAdd()
gchar *message;
message = g_strdup_printf(_("Couldn't add duplicate theme\n\'%s\'."), pt1);
GtkWidget *w = gtk_message_dialog_new(g_window, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message, NULL);
GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message, NULL);
g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w);
gtk_widget_show(w);
g_free(message);
@@ -282,7 +282,7 @@ static void menuSaveAs ()
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view));
if (!gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
GtkWidget *w = gtk_message_dialog_new(g_window, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select the theme to be saved."), NULL);
GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select the theme to be saved."));
g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w);
gtk_widget_show(w);
return;
@@ -292,7 +292,7 @@ static void menuSaveAs ()
pt1 = strrchr (file, '/');
if (pt1) pt1++;
dialog = gtk_file_chooser_dialog_new(_("Save theme as"), g_window, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
dialog = gtk_file_chooser_dialog_new(_("Save theme as"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
chooser = GTK_FILE_CHOOSER(dialog);
gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);

3
src/version.h.in
View File

@@ -1,3 +0,0 @@
#define VERSION_STRING "@PACKAGE_VERSION@"