summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anderson <ejona86@gmail.com>2009-05-02 10:00:18 -0500
committerEric Anderson <ejona86@gmail.com>2009-05-02 10:00:18 -0500
commit667f7811083b6f7e59f5ea65c78efd6b0adccbb4 (patch)
tree4feb48acb05b9a40ca1932d5b7801b14eebfbabd
parent2ca0a1302bb1d00a4bdca7063f9ebb93ca06fa9c (diff)
downloadkpl-667f7811083b6f7e59f5ea65c78efd6b0adccbb4.tar.gz
kpl-667f7811083b6f7e59f5ea65c78efd6b0adccbb4.zip
Add icons to buttons and to window
-rw-r--r--.gitignore1
-rw-r--r--KPLUnixStarter.c16
-rw-r--r--Makefile5
3 files changed, 19 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index a843c95..bf2c59a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Kernel_Panic_script.txt
+*~
diff --git a/KPLUnixStarter.c b/KPLUnixStarter.c
index 39821df..f4c5928 100644
--- a/KPLUnixStarter.c
+++ b/KPLUnixStarter.c
@@ -13,7 +13,7 @@ static void quick_message (gchar *message) {
GtkWidget *dialog, *label, *content_area;
/* Create the widgets */
dialog = gtk_dialog_new_with_buttons ("Message",
- mainWindow,
+ GTK_WINDOW(mainWindow),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK,
GTK_RESPONSE_NONE,
@@ -41,11 +41,13 @@ static void start_single_game(GtkButton *button, gpointer data) {
int main(int argc, char* argv[]) {
GtkWidget *container;
GtkWidget *button;
+ GtkWidget *image;
gtk_init(&argc, &argv);
mainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(mainWindow), "Kernel Panic Launcher");
+ gtk_window_set_default_icon_from_file("icons/KPL.ico", NULL);
g_signal_connect(G_OBJECT(mainWindow), "destroy", G_CALLBACK(on_destroy),
NULL);
@@ -54,26 +56,36 @@ int main(int argc, char* argv[]) {
gtk_container_add(GTK_CONTAINER(mainWindow), container);
button = gtk_button_new_with_mnemonic("_Spectate");
- gtk_container_add(GTK_CONTAINER(container), button);
+ image = gtk_image_new_from_file("icons/32x32LightBlueFlow.ico");
+ gtk_button_set_image(GTK_BUTTON(button), GTK_WIDGET(image));
+ gtk_container_add(GTK_CONTAINER(container), GTK_WIDGET(button));
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(start_single_game),
GINT_TO_POINTER(0));
button = gtk_button_new_with_mnemonic("_Easy");
+ image = gtk_image_new_from_file("icons/32x32GreenBit.ico");
+ gtk_button_set_image(GTK_BUTTON(button), GTK_WIDGET(image));
gtk_container_add(GTK_CONTAINER(container), button);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(start_single_game),
GINT_TO_POINTER(1));
button = gtk_button_new_with_mnemonic("_Medium");
+ image = gtk_image_new_from_file("icons/32x32YellowPointer.ico");
+ gtk_button_set_image(GTK_BUTTON(button), GTK_WIDGET(image));
gtk_container_add(GTK_CONTAINER(container), button);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(start_single_game),
GINT_TO_POINTER(2));
button = gtk_button_new_with_mnemonic("_Hard");
+ image = gtk_image_new_from_file("icons/32x32OrangeByte.ico");
+ gtk_button_set_image(GTK_BUTTON(button), GTK_WIDGET(image));
gtk_container_add(GTK_CONTAINER(container), button);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(start_single_game),
GINT_TO_POINTER(3));
button = gtk_button_new_with_mnemonic("_Very Hard");
+ image = gtk_image_new_from_file("icons/32x32RedConnection.ico");
+ gtk_button_set_image(GTK_BUTTON(button), GTK_WIDGET(image));
gtk_container_add(GTK_CONTAINER(container), button);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(start_single_game),
GINT_TO_POINTER(4));
diff --git a/Makefile b/Makefile
index 320179f..e5862bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
srcdir = .
-REALCFLAGS = $(CFLAGS) -fPIC
+REALCFLAGS = -Wall $(CFLAGS) -fPIC
.SUFFIXES:
.SUFFIXES: .cpp .o
all: obj/libKPL.so obj/KPLUnixStarter
+run: obj/libKPL.so obj/KPLUnixStarter
+ LD_LIBRARY_PATH=obj ./obj/KPLUnixStarter
+
obj/libKPL.so: obj/GenerateScript.o obj/ColorSpacesConversions.o obj/KPLFillModSpecific.o obj/KPLTypes.o obj/WriteScript.o obj/KPL_Start.o
g++ $(REALCFLAGS) -shared -o $@ $^