[Plcreator-commits] r21 - HEAD

[jpakkane at garage.maemo.org]

Author: jpakkane
Date: 2007-01-29 01:56:24 +0200 (Mon, 29 Jan 2007)
New Revision: 21

Modified:
   HEAD/plcreator.c
Log:
Updates for N800.

Modified: HEAD/plcreator.c
===================================================================
--- HEAD/plcreator.c	2007-01-28 23:23:49 UTC (rev 20)
+++ HEAD/plcreator.c	2007-01-28 23:56:24 UTC (rev 21)
@@ -1,5 +1,5 @@
 /*
-    This file is a part of PLCreator. (C) 2005
+    This file is a part of PLCreator. (C) 2007
 
     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
@@ -25,19 +25,15 @@
 
 #include<string.h>
 
-/*
-#define APP_NAME "plcreator"
-#define APP_VER "0.9"
-*/
-
 #define M3U_HEADER "#EXTM3U\n"
 
-static const gchar *mmc_root = "/media/mmc1";
+static const gchar *outer_root = "/media/mmc1";
+static const gchar *inner_root = "/media/mmc2";
 static const gchar *myaudio_root = "/home/user/MyDocs/.sounds";
 static const gchar *outfile = "/home/user/MyDocs/.documents/plcreator.m3u";
 
 static GtkWidget *homedirbutton;
-static GtkWidget *mmcbutton;
+static GtkWidget *mcbutton;
 static GtkWidget *randomizebutton;
 
 static HildonProgram *app;
@@ -148,8 +144,10 @@
 
   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(homedirbutton)))
     l = AddFilesRecursive(l, myaudio_root);
-  if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mmcbutton)))
-    l = AddFilesRecursive(l, mmc_root);
+  if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mcbutton))) {
+    l = AddFilesRecursive(l, inner_root);
+    l = AddFilesRecursive(l, outer_root);
+  }
 
   if(l == NULL) {
     hildon_banner_show_information(GTK_WINDOW(main_view), NULL, "No mp3 files found.");
@@ -189,26 +187,28 @@
   GtkWidget *bbox; /* A box to hold action buttons. */
   GtkMenu *menu;
 
-  homedirbutton = gtk_check_button_new_with_label("Include Audio clips directory.");
-  mmcbutton = gtk_check_button_new_with_label("Include MultiMediaCard.");
-  randomizebutton = gtk_check_button_new_with_label("Randomize.");
+  homedirbutton = gtk_check_button_new_with_label("Include Audio clips directory");
+  mcbutton = gtk_check_button_new_with_label("Include memory cards");
+  randomizebutton = gtk_check_button_new_with_label("Randomize");
 
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mmcbutton), TRUE);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mcbutton), TRUE);
   /*gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(randomizebutton), TRUE);*/
 
   box = gtk_vbox_new(FALSE, 20);
   gtk_box_pack_start(GTK_BOX(box), homedirbutton, FALSE, FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(box), mmcbutton, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(box), mcbutton, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(box), randomizebutton, FALSE, FALSE, 0);
 
   bbox = gtk_hbox_new(TRUE, 20);
   gtk_box_pack_start(GTK_BOX(box), bbox, FALSE, FALSE, 0);
 
   w = gtk_button_new_from_stock(GTK_STOCK_EXECUTE);
+  gtk_widget_set_size_request(w, -1, 50);
   g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(Launch), NULL);
   gtk_box_pack_start(GTK_BOX(bbox), w, FALSE, TRUE, 0);
 
   w = gtk_button_new_from_stock(GTK_STOCK_QUIT);
+  gtk_widget_set_size_request(w, -1, 50);
   g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(Quit), NULL);
   gtk_box_pack_start(GTK_BOX(bbox), w, FALSE, TRUE, 0);