[Maemo-recorder-commits] r9 - trunk/src

[jait at garage.maemo.org]

Author: jait
Date: 2006-09-08 19:36:39 +0300 (Fri, 08 Sep 2006)
New Revision: 9

Modified:
   trunk/src/maemo-recorder-ui.c
   trunk/src/settings.c
Log:
re-arranged the fields in settings dialog


Modified: trunk/src/maemo-recorder-ui.c
===================================================================
--- trunk/src/maemo-recorder-ui.c	2006-09-08 16:00:41 UTC (rev 8)
+++ trunk/src/maemo-recorder-ui.c	2006-09-08 16:36:39 UTC (rev 9)
@@ -1660,6 +1660,9 @@
     gtk_table_set_col_spacings (GTK_TABLE (table), 0);
 
     label = gtk_label_new_with_mnemonic(_("Filename:"));
+    /*
+    gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+    */
     gtk_table_attach_defaults (GTK_TABLE (table),
             label,
             0, 1, 0, 1);
@@ -1671,6 +1674,9 @@
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry1);
 
     label = gtk_label_new_with_mnemonic (_("Length:"));
+    /*
+    gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+    */
     gtk_table_attach_defaults (GTK_TABLE (table),
             label,
             0, 1, 1, 2);
@@ -1682,6 +1688,9 @@
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
 
     label = gtk_label_new_with_mnemonic (_("State:"));
+    /*
+    gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+    */
     gtk_table_attach_defaults (GTK_TABLE (table),
             label,
             0, 1, 2, 3);
@@ -1864,6 +1873,7 @@
         default:
             return -1.0;
     }
+
     if (bitrate == 0.0)
         return -1.0;
 

Modified: trunk/src/settings.c
===================================================================
--- trunk/src/settings.c	2006-09-08 16:00:41 UTC (rev 8)
+++ trunk/src/settings.c	2006-09-08 16:36:39 UTC (rev 9)
@@ -255,36 +255,8 @@
     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());
+    /* with the format combo on top and directory thing at the bottom it looks cleaner */
 
-    /*
-    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);
-    */
-
     /* format combo */
     settings_data->format_combobox = gtk_combo_box_new_text();
 
@@ -323,7 +295,37 @@
 
     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));