[Gpredict-svn] SF.net SVN: gpredict: [51] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict: [51] trunk
|
From: <cs...@us...> - 2008-05-01 17:24:10
|
Revision: 51
http://gpredict.svn.sourceforge.net/gpredict/?rev=51&view=rev
Author: csete
Date: 2008-05-01 10:24:06 -0700 (Thu, 01 May 2008)
Log Message:
-----------
Change master rotor control to widget so that it can be instanciated several times from modules.
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
trunk/src/menubar.c
trunk/win32/Makefile
Removed Paths:
-------------
trunk/src/rot-ctrl-window.c
trunk/src/rot-ctrl-window.h
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/Makefile.am 2008-05-01 17:24:06 UTC (rev 51)
@@ -70,7 +70,6 @@
qth-editor.c qth-editor.h \
radio-conf.c radio-conf.h \
rig-io.c rig-io.h \
- rot-ctrl-window.c rot-ctrl-window.h \
rotor-conf.c rotor-conf.h \
rdv.c rdv.h \
sat-cfg.c sat-cfg.h \
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/gtk-rot-ctrl.c 2008-05-01 17:24:06 UTC (rev 51)
@@ -49,6 +49,11 @@
static void gtk_rot_ctrl_destroy (GtkObject *object);
+static GtkWidget *create_status_widgets (void);
+static GtkWidget *create_setup_widgets (void);
+static GtkWidget *create_control_widgets (void);
+
+
static GtkVBoxClass *parent_class = NULL;
@@ -130,7 +135,81 @@
widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
+ /* create contents */
+ table = gtk_table_new (2, 2, FALSE);
+ gtk_table_attach (GTK_TABLE (table), create_status_widgets (),
+ 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+ gtk_table_attach (GTK_TABLE (table), create_setup_widgets (),
+ 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+ gtk_table_attach (GTK_TABLE (table), create_control_widgets (),
+ 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+
+ gtk_container_add (GTK_CONTAINER (widget), table);
return widget;
}
+
+/** \brief Create status widgets. */
+static GtkWidget *create_status_widgets ()
+{
+ GtkWidget *frame,*table,*label,*ctrbut;
+
+ table = gtk_table_new (3,7, TRUE);
+
+ /* table header */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>SAT</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>\316\224</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>SET</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>READ</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 5, 6, 0, 1);
+
+ /* Azimuth widgets */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>AZ:</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+
+ /* Eevation widgets */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>EL:</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+
+ frame = gtk_frame_new (_("STATUS"));
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
+
+
+/** \brief Create setup widgets. */
+static GtkWidget *create_setup_widgets ()
+{
+ GtkWidget *frame;
+
+ frame = gtk_frame_new (_("SETUP"));
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
+
+/** \brief Create control buttons. */
+static GtkWidget *create_control_widgets ()
+{
+ GtkWidget *frame;
+
+ frame = gtk_frame_new (_("CONTROL"));
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/gtk-rot-ctrl.h 2008-05-01 17:24:06 UTC (rev 51)
@@ -61,6 +61,12 @@
{
GtkVBox vbox;
+ /* Azimuth labels */
+ GtkWidget *AzSat,*AzDelta,*AzLock,*AzSet,*AzRead;
+
+ /* Elevation labels */
+ GtkWidget *ElSat,*ElDelta,*ElLock,*ElSet,*ElRead;
+
};
struct _GtkRotCtrlClass
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/menubar.c 2008-05-01 17:24:06 UTC (rev 51)
@@ -57,9 +57,7 @@
# include <build-config.h>
#endif
-#include "rot-ctrl-window.h"
-
extern GtkWidget *app;
@@ -68,8 +66,6 @@
static void menubar_open_mod_cb (GtkWidget *widget, gpointer data);
static void menubar_message_log (GtkWidget *widget, gpointer data);
static void menubar_app_exit_cb (GtkWidget *widget, gpointer data);
-static void menubar_rig_cb (GtkWidget *widget, gpointer data);
-static void menubar_rot_cb (GtkWidget *widget, gpointer data);
static void menubar_rdv_cb (GtkWidget *widget, gpointer data);
static void menubar_freq_edit_cb (GtkWidget *widget, gpointer data);
static void menubar_pref_cb (GtkWidget *widget, gpointer data);
@@ -131,10 +127,6 @@
G_CALLBACK (menubar_window_cb)},
{ "Predict", GTK_STOCK_DND_MULTIPLE, N_("Advanced Predict"), NULL,
N_("Open advanced pass predictor"), G_CALLBACK (menubar_predict_cb)},
- { "Rig", NULL, N_("_Radio Control"), NULL,
- N_("Open the radio control window"), G_CALLBACK (menubar_rig_cb)},
- { "Rot", NULL, N_("_Antenna Control"), NULL,
- N_("Open the antenna rotator control window"), G_CALLBACK (menubar_rot_cb)},
{ "Rdv", NULL, N_("_Space Shuttle Tool"), NULL,
N_("Open the space shuttle tool window"), G_CALLBACK (menubar_rdv_cb)},
@@ -181,9 +173,6 @@
" <menuitem action='Window'/>"
" <menuitem action='Predict'/>"
" <separator/>"
-" <menuitem action='Rig'/>"
-" <menuitem action='Rot'/>"
-" <separator/>"
" <menuitem action='Rdv'/>"
/* " <separator/>" */
/* " <menuitem action='Lab'/>" */
@@ -242,18 +231,6 @@
}
/* load custom icons */
- icon = icon_file_name ("gpredict-oscilloscope-small.png");
- image = gtk_image_new_from_file (icon);
- g_free (icon);
- menuitem = gtk_ui_manager_get_widget (uimgr, "/GpredictMenu/ToolsMenu/Rig");
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-
- icon = icon_file_name ("gpredict-antenna-small.png");
- image = gtk_image_new_from_file (icon);
- g_free (icon);
- menuitem = gtk_ui_manager_get_widget (uimgr, "/GpredictMenu/ToolsMenu/Rot");
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-
icon = icon_file_name ("gpredict-shuttle-small.png");
image = gtk_image_new_from_file (icon);
g_free (icon);
@@ -764,51 +741,6 @@
static void
-menubar_rig_cb (GtkWidget *widget, gpointer data)
-{
- GtkWidget *dialog;
-
-
- dialog = gtk_message_dialog_new (GTK_WINDOW (app),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_OK,
- _("This function is still under development."));
-
- /* Destroy the dialog when the user responds to it (e.g. clicks a button) */
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
-
- gtk_widget_show_all (dialog);
-}
-
-
-static void
-menubar_rot_cb (GtkWidget *widget, gpointer data)
-{
- GtkWidget *dialog;
-
- rot_ctrl_window_open ();
-#if 0
- dialog = gtk_message_dialog_new (GTK_WINDOW (app),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_OK,
- _("This function is still under development."));
-
- /* Destroy the dialog when the user responds to it (e.g. clicks a button) */
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
-
-
- gtk_widget_show_all (dialog);
-#endif
-}
-
-
-static void
menubar_rdv_cb (GtkWidget *widget, gpointer data)
{
rdv_open ();
Deleted: trunk/src/rot-ctrl-window.c
===================================================================
--- trunk/src/rot-ctrl-window.c 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/rot-ctrl-window.c 2008-05-01 17:24:06 UTC (rev 51)
@@ -1,216 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
- More details can be found at the project home page:
-
- http://groundstation.sourceforge.net/
-
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include "sat-log.h"
-#include "compat.h"
-
-#ifdef HAVE_CONFIG_H
-# include <build-config.h>
-#endif
-
-#include "rot-ctrl-window.h"
-
-
-/** \brief Flag indicating whether the window is open or not. */
-static gboolean window_is_open = FALSE;
-
-/** \brief The rotor control window widget. */
-static GtkWidget *win;
-
-
-static GtkWidget *AzSat,*AzDelta,*AzLock,*AzSet,*AzRead;
-static GtkWidget *ElSat,*ElDelta,*ElLock,*ElSet,*ElRead;
-
-
-static gint rot_win_delete (GtkWidget *, GdkEvent *, gpointer);
-static void rot_win_destroy (GtkWidget *, gpointer);
-static gboolean rot_win_config (GtkWidget *, GdkEventConfigure *, gpointer);
-
-static GtkWidget *create_status_widgets (void);
-static GtkWidget *create_setup_widgets (void);
-static GtkWidget *create_control_widgets (void);
-
-
-
-/** \brief Open rotator control window */
-void rot_ctrl_window_open ()
-{
- GtkWidget *table;
- gchar *icon; /* icon file name */
-
-
- if (window_is_open) {
- /* window may be hidden so bring it to front */
- gtk_window_present (GTK_WINDOW (win));
- return;
- }
-
- /* create the window */
- win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (win), _("GPREDICT Rotator Control"));
- icon = icon_file_name ("gpredict-antenna.png");
- if (g_file_test (icon, G_FILE_TEST_EXISTS)) {
- gtk_window_set_icon_from_file (GTK_WINDOW (win), icon, NULL);
- }
- g_free (icon);
-
- /* connect delete and destroy signals */
- g_signal_connect (G_OBJECT (win), "delete_event",
- G_CALLBACK (rot_win_delete), NULL);
- g_signal_connect (G_OBJECT (win), "configure_event",
- G_CALLBACK (rot_win_config), NULL);
- g_signal_connect (G_OBJECT (win), "destroy",
- G_CALLBACK (rot_win_destroy), NULL);
-
- /* create contents */
- table = gtk_table_new (2, 2, FALSE);
- gtk_table_attach (GTK_TABLE (table), create_status_widgets (),
- 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
- gtk_table_attach (GTK_TABLE (table), create_setup_widgets (),
- 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
- gtk_table_attach (GTK_TABLE (table), create_control_widgets (),
- 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
-
- gtk_container_add (GTK_CONTAINER (win), table);
- gtk_widget_show_all (win);
-
- window_is_open = TRUE;
-}
-
-
-
-/** \brief Close rotator control window */
-void rot_ctrl_window_close ()
-{
- if (window_is_open) {
- gtk_widget_destroy (win);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Rotor control window is not open!"),
- __FUNCTION__);
- }
-}
-
-
-
-
-/** \brief Manage window delete events. */
-static gint
-rot_win_delete (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- return FALSE;
-}
-
-
-
-/** \brief Manage destroy signals. */
-static void
-rot_win_destroy (GtkWidget *widget, gpointer data)
-{
- /* cloase active hardware connections. */
-
- window_is_open = FALSE;
-}
-
-
-/** \brief Manage configure events. */
-static gboolean
-rot_win_config (GtkWidget *widget, GdkEventConfigure *event, gpointer data)
-{
- return FALSE;
-}
-
-
-/** \brief Create status widgets. */
-static GtkWidget *create_status_widgets ()
-{
- GtkWidget *frame,*table,*label,*ctrbut;
-
- table = gtk_table_new (3,7, TRUE);
-
- /* table header */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>SAT</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
-
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>\316\224</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
-
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>SET</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
-
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>READ</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 5, 6, 0, 1);
-
- /* Azimuth widgets */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>AZ:</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
-
- /* Eevation widgets */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>EL:</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
-
-
-
- frame = gtk_frame_new (_("STATUS"));
- gtk_container_add (GTK_CONTAINER (frame), table);
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
-
- return frame;
-}
-
-
-/** \brief Create setup widgets. */
-static GtkWidget *create_setup_widgets ()
-{
- GtkWidget *frame;
-
- frame = gtk_frame_new (_("SETUP"));
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
-
- return frame;
-}
-
-/** \brief Create control buttons. */
-static GtkWidget *create_control_widgets ()
-{
- GtkWidget *frame;
-
- frame = gtk_frame_new (_("CONTROL"));
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
-
- return frame;
-}
-
Deleted: trunk/src/rot-ctrl-window.h
===================================================================
--- trunk/src/rot-ctrl-window.h 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/rot-ctrl-window.h 2008-05-01 17:24:06 UTC (rev 51)
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
- More details can be found at the project home page:
-
- http://groundstation.sourceforge.net/
-
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-#ifndef ROT_CTRL_WINDOW_H
-#define ROT_CTRL_WINDOW_H 1
-
-void rot_ctrl_window_open (void);
-void rot_ctrl_window_close (void);
-
-#endif
Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/win32/Makefile 2008-05-01 17:24:06 UTC (rev 51)
@@ -120,7 +120,6 @@
qth-editor.c \
radio-conf.c \
rig-io.c \
- rot-ctrl-window.c \
rotor-conf.c \
rdv.c \
sat-cfg.c \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
