[Gpredict-svn] SF.net SVN: gpredict:[433] trunk/src

[<cs...@us...>]

Revision: 433
          http://gpredict.svn.sourceforge.net/gpredict/?rev=433&view=rev
Author:   csete
Date:     2009-09-25 10:47:21 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Minor layout and UI tweaks.

Modified Paths:
--------------
    trunk/src/gtk-sat-selector.c
    trunk/src/mod-cfg.c

Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c	2009-09-24 22:41:49 UTC (rev 432)
+++ trunk/src/gtk-sat-selector.c	2009-09-25 10:47:21 UTC (rev 433)
@@ -180,6 +180,7 @@
     GtkCellRenderer    *renderer;
     GtkTreeViewColumn  *column;
     GtkWidget          *table;
+    GtkWidget          *frame;
 
 
     if (!flags)
@@ -264,12 +265,19 @@
     gtk_container_add (GTK_CONTAINER (GTK_SAT_SELECTOR (widget)->swin),
                        GTK_SAT_SELECTOR (widget)->tree);
 
+    /* create a frame around the SWIN */
+    frame = gtk_frame_new (NULL);
+    gtk_container_add (GTK_CONTAINER (frame), GTK_SAT_SELECTOR (widget)->swin);
+
     table = gtk_table_new (7, 4, TRUE);
 
     /* Search */    
-    gtk_table_attach (GTK_TABLE (table), gtk_label_new (_("Search:")), 0, 1, 0, 1,
+    gtk_table_attach (GTK_TABLE (table), gtk_label_new (_("Search")), 0, 1, 0, 1,
                       GTK_SHRINK, GTK_SHRINK, 0, 0);
     GTK_SAT_SELECTOR (widget)->search = gtk_entry_new ();
+    gtk_widget_set_tooltip_text (GTK_SAT_SELECTOR (widget)->search,
+                                 _("Start typing in this field to search for a satellite"\
+                                   " in the selected group."));
 
     /* this enables automatic search */
     gtk_tree_view_set_search_entry (GTK_TREE_VIEW (GTK_SAT_SELECTOR (widget)->tree),
@@ -278,14 +286,14 @@
                       GTK_FILL, GTK_FILL, 0, 0);
 
     /* Group selector */
-    gtk_table_attach (GTK_TABLE (table), gtk_label_new (_("Group:")), 0, 1, 1, 2,
+    gtk_table_attach (GTK_TABLE (table), gtk_label_new (_("Group")), 0, 1, 1, 2,
                       GTK_SHRINK, GTK_SHRINK, 0, 0);
     gtk_table_attach (GTK_TABLE (table), GTK_SAT_SELECTOR (widget)->groups, 1, 4, 1, 2,
                       GTK_FILL, GTK_SHRINK, 0, 0);
 
 
     /* satellite list */
-    gtk_table_attach (GTK_TABLE (table), GTK_SAT_SELECTOR (widget)->swin, 0, 4, 2, 7,
+    gtk_table_attach (GTK_TABLE (table), frame, 0, 4, 2, 7,
                       GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0);
 
     /* Add tabel to main container */

Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c	2009-09-24 22:41:49 UTC (rev 432)
+++ trunk/src/mod-cfg.c	2009-09-25 10:47:21 UTC (rev 433)
@@ -25,35 +25,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, visit http://www.fsf.org/
 */
-/*  FIXME: Update diagram
-
-+------------------------------------+
-|           +---------------------+  |
-|  Name     | My Kool Module      |  |
-|           +---------------------+  |
-|           +-----------+---+ +---+  |
-|  Location | OZ9AEC    | v | | + |  |
-|           +-----------+---+ +---+  |
-| ---------------------------------- |
-|             Satellites             |
-| +--------------------------+-----+ |
-| | Available Satellites     | Sel | |
-| +--------------------------+-----+ |      
-| | > Amateur                |     | |
-| | v Weather                |     | |
-| |     NOAA 14              |  x  | |
-| |     NOAA 15              |  x  | |
-| |     NOAA 17              |  x  | |
-| | > Military               |     | |
-| +--------------------------+-----+ |
-| ---------------------------------- |
-| +----------------------+ +------+  |
-| |  (not implemented)   | | Find |  |
-| +----------------------+ +------+  |
-|                                    |
-|      Advanced Settings             |
-+------------------------------------+
-*/
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "sat-log.h"
@@ -469,9 +440,11 @@
     GtkWidget   *addbut, *delbut;
     GtkTooltips *tooltips;
     gchar       *icon;      /* window icon file name */
+    GtkWidget *frame;
 
 
 
+
     gboolean   new = (modname != NULL) ? FALSE : TRUE;
 
     if (new) {
@@ -544,8 +517,9 @@
 
     /* ground station selector */
     locw = create_loc_selector (cfgdata);
+    gtk_widget_set_tooltip_text (locw, _("Select a ground station for this module."));
 
-    table = gtk_table_new (2, 3, FALSE);
+    table = gtk_table_new (2, 5, TRUE);
     gtk_table_set_row_spacings (GTK_TABLE (table), 5);
     gtk_table_set_col_spacings (GTK_TABLE (table), 5);
 
@@ -559,16 +533,18 @@
     gtk_table_attach_defaults (GTK_TABLE (table), locw, 1, 3, 1, 2);
 
     /* add button */
-    add = gpredict_hstock_button (GTK_STOCK_ADD, NULL, _("Add new ground station"));
+    add = gpredict_hstock_button (GTK_STOCK_ADD, NULL, _("Add a new ground station"));
     g_signal_connect (add, "clicked", G_CALLBACK (add_qth_cb), dialog);
-    gtk_table_attach_defaults (GTK_TABLE (table), add, 4, 5, 1, 2);
+    gtk_table_attach (GTK_TABLE (table), add, 3, 4, 1, 2,
+                      GTK_SHRINK, GTK_SHRINK, 0, 0);
 
     gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, FALSE, 0);
     gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
                         gtk_hseparator_new (), FALSE, FALSE, 5);
 
     label = gtk_label_new (NULL);
-    gtk_label_set_markup (GTK_LABEL (label), _("<b>Select Satellites:</b>"));
+    gtk_label_set_markup (GTK_LABEL (label), _("<b>Satellites</b>"));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, FALSE, 5);
 
 
@@ -591,11 +567,23 @@
                                      _("Remove satellite from the list of selected satellites."));
     g_signal_connect (delbut, "clicked", G_CALLBACK (delbut_clicked_cb), NULL);
 
+    /* quick sat selecotr tutorial label */
+    label = gtk_label_new (NULL);
+    gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_label_set_markup (GTK_LABEL (label),
+                          _("<b>Hint: </b> Double click on any satellite\n"\
+                            "to move it to the other box."));
+
+    frame = gtk_frame_new (NULL);
+    gtk_container_add (GTK_CONTAINER (frame), swin);
+
     table = gtk_table_new (7, 9, TRUE);
     gtk_table_attach_defaults (GTK_TABLE (table), selector, 0, 4, 0, 7);
-    gtk_table_attach_defaults (GTK_TABLE (table), swin, 5, 9, 2, 7);
+    gtk_table_attach_defaults (GTK_TABLE (table), frame, 5, 9, 2, 7);
     gtk_table_attach (GTK_TABLE (table), addbut, 4, 5, 4, 5, GTK_SHRINK, GTK_SHRINK, 2, 5);
     gtk_table_attach (GTK_TABLE (table), delbut, 4, 5, 5, 6, GTK_SHRINK, GTK_SHRINK, 2, 5);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 5, 9, 0, 2);
 
     gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.