#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <locale.h>
-#include <hildon-widgets/hildon-caption.h>
+#include <hildon/hildon-defines.h>
+#include <hildon/hildon-caption.h>
#include <stdlib.h>
#include <string.h>
#include <osso-log.h>
-#include <hildon-fm/hildon-widgets/hildon-file-chooser-dialog.h>
+#include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
#include "maemo-recorder.h"
#include "settings.h"
#define KEY_DEFAULT_DIR GCONF_PATH "/default_dir"
#define KEY_DEFAULT_FILTER GCONF_PATH "/default_filter"
+#define DEFAULT_SAVE_DIR "/home/user/MyDocs/.sounds"
+
typedef struct _SettingsPriv SettingsPriv;
struct _SettingsPriv
{
gchar *str;
- str = g_strdup_printf("/home/user/MyDocs/.sounds");
+ str = g_strdup_printf(DEFAULT_SAVE_DIR);
gconf_client_set_string(settings_priv->gconf, KEY_DEFAULT_DIR, str, NULL);
g_free(settings_priv->default_dir);
settings_priv->default_dir = str;
gconf_client_set_int(settings_priv->gconf,
- KEY_DEFAULT_FILTER, FORMAT_ILBC, NULL);
- settings_priv->default_filter = FORMAT_ILBC;
+ KEY_DEFAULT_FILTER, FORMAT_WAV, NULL);
+ settings_priv->default_filter = FORMAT_WAV;
}
gint
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(settings_data->window)->vbox),
vbox);
- /* GtkEntry looks worse because the text get ellipsized */
- settings_data->dir_entry = gtk_label_new(get_default_dir());
-
- /*
- gtk_editable_set_editable(GTK_EDITABLE(settings_data->dir_entry), FALSE);
-
- gtk_entry_set_text(GTK_ENTRY(settings_data->dir_entry), get_default_dir());
- */
-
- /* In maemo world it seems to "folder", not "directory" =( */
- caption = hildon_caption_new(group, _("Default save folder:"),
- settings_data->dir_entry, NULL,
- HILDON_CAPTION_OPTIONAL);
-
- gtk_box_pack_start(GTK_BOX(vbox), caption, FALSE, FALSE, 0);
-
- /* browse button */
- btn_chdir = gtk_button_new_with_label(_("Browse"));
- alignment = gtk_alignment_new(1.0, 0.5, 0.0, 0.0);
-
- gtk_container_add(GTK_CONTAINER(alignment), btn_chdir);
- gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, FALSE, 0);
-
- g_signal_connect(G_OBJECT(btn_chdir), "clicked",
- G_CALLBACK(cb_chdir), settings_data);
-
- /*
- gtk_widget_set_size_request(btn_chdir, 40, 40);
- */
+ /* with the format combo on top and directory thing at the bottom it looks cleaner */
/* format combo */
settings_data->format_combobox = gtk_combo_box_new_text();
gtk_box_pack_start(GTK_BOX(vbox), caption, FALSE, FALSE, 0);
+ /* save directory */
+ /* GtkEntry looks worse because the text get ellipsized */
+ settings_data->dir_entry = gtk_label_new(get_default_dir());
+
+ /*
+ gtk_editable_set_editable(GTK_EDITABLE(settings_data->dir_entry), FALSE);
+
+ gtk_entry_set_text(GTK_ENTRY(settings_data->dir_entry), get_default_dir());
+ */
+
+ /* In maemo world it seems to "folder", not "directory" =( */
+ caption = hildon_caption_new(group, _("Default save folder:"),
+ settings_data->dir_entry, NULL,
+ HILDON_CAPTION_OPTIONAL);
+
+ gtk_box_pack_start(GTK_BOX(vbox), caption, FALSE, FALSE, 0);
+
+ /* browse button */
+ btn_chdir = gtk_button_new_with_label(_("Browse"));
+ alignment = gtk_alignment_new(1.0, 0.5, 0.0, 0.0);
+
+ gtk_container_add(GTK_CONTAINER(alignment), btn_chdir);
+ gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, FALSE, 0);
+
+ g_signal_connect(G_OBJECT(btn_chdir), "clicked",
+ G_CALLBACK(cb_chdir), settings_data);
+
+ /*
+ gtk_widget_set_size_request(btn_chdir, 40, 40);
+ */
gtk_widget_show_all(settings_data->window);
res = gtk_dialog_run(GTK_DIALOG(settings_data->window));