[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright/gtkshell about_dialog.c button.c cont...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright/gtkshell about_dialog.c button.c cont... |
|
Date: |
Wed, 09 May 2007 20:00:56 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/05/09 20:00:56
Modified files:
gtkshell : about_dialog.c button.c containers.c
dialog_options.c file_dialog.c file_dialog.h
geometry.c init.c main.c row.c update_manager.c
Log message:
Resolved conflicts from merge. Consolidated dialog code with macros.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/about_dialog.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.c?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/geometry.c?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/init.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/update_manager.c?cvsroot=antiright&r1=1.1&r2=1.2
Patches:
Index: about_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/about_dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- about_dialog.c 4 May 2007 00:59:58 -0000 1.3
+++ about_dialog.c 9 May 2007 20:00:56 -0000 1.4
@@ -32,18 +32,16 @@
g_free(text);
}
-static void
-setup_authors_field(GtkWidget * dialog)
-{
- const gchar *authors[] = GSH_AUTHORS;
-
- gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), authors);
+#define SETUP_AUTHORS_FIELD(dialog) \
+{\
+ const gchar *authors[] = GSH_AUTHORS;\
+ gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), authors);\
}
static GtkWidget *
setup_about_fields(GtkWidget * dialog)
{
- setup_authors_field(dialog);
+ SETUP_AUTHORS_FIELD(dialog);
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog),
PACKAGE_STRING);
gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog),
Index: button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- button.c 9 May 2007 19:53:37 -0000 1.40
+++ button.c 9 May 2007 20:00:56 -0000 1.41
@@ -74,8 +74,7 @@
{
GtkWidget * button;
- button = gsh->widgets.button;
- setup_label(button, command);
+ setup_label(button=gsh->widgets.button, command);
gsh_setup_drag_drop(gsh, button);
setup_callback(gsh, command);
if(GTK_IS_BUTTON(button))
@@ -107,7 +106,6 @@
gsh_manage(gsh, gsh->widgets.button);\
}
-
/* This is just a wrapper around gsh_new_button(), to
follow the convention of returning a created widget. */
GtkWidget *
Index: containers.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- containers.c 6 May 2007 05:00:11 -0000 1.16
+++ containers.c 9 May 2007 20:00:56 -0000 1.17
@@ -23,12 +23,11 @@
#include "gtkshell.h"
static void
-scrolled_window_options(struct GSH * gsh)
+set_scrolled_window_options(struct GSH * gsh)
{
gtk_scrolled_window_set_policy(
GTK_SCROLLED_WINDOW(gsh->widgets.scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
gtk_scrolled_window_set_shadow_type(
GTK_SCROLLED_WINDOW(gsh->widgets.scrolled_window),
GTK_SHADOW_OUT);
@@ -37,14 +36,15 @@
static void
gsh_setup_scrolled_window(struct GSH * gsh)
{
- gsh->widgets.scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- scrolled_window_options(gsh);
- gtk_container_add(GTK_CONTAINER(gsh->widgets.window),
- gsh->widgets.scrolled_window);
- gtk_widget_show(gsh->widgets.scrolled_window);
+ GtkWidget * scrolled_window;
+
+ scrolled_window = gsh->widgets.scrolled_window
+ = gtk_scrolled_window_new(NULL, NULL);
+ set_scrolled_window_options(gsh);
+ gtk_container_add(GTK_CONTAINER(gsh->widgets.window), scrolled_window);
+ gtk_widget_show(scrolled_window);
gtk_scrolled_window_add_with_viewport(
- GTK_SCROLLED_WINDOW(gsh->widgets.scrolled_window),
- gsh->rows->h);
+ GTK_SCROLLED_WINDOW(scrolled_window), gsh->rows->h);
}
static void
@@ -64,15 +64,19 @@
$(gsh->rows, new);
}
-void
-gsh_setup_base_container(struct GSH * gsh)
+static void
+setup_app_mode_frame(struct GSH * gsh)
{
- if(gsh->widgets.app_frame)
- {
gtk_container_add(GTK_CONTAINER(gsh->widgets.app_frame),
gsh->rows->h);
gsh->rows->h=gsh->widgets.app_row;
- }
+}
+
+void
+gsh_setup_base_container(struct GSH * gsh)
+{
+ if(gsh->widgets.app_frame)
+ setup_app_mode_frame(gsh);
if (GSH_FLAG(GSH_SCROLL))
gsh_setup_scrolled_window(gsh);
else if (!GSH_FLAG(GSH_NO_BASE_FRAME))
Index: dialog_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- dialog_options.c 9 May 2007 17:20:53 -0000 1.17
+++ dialog_options.c 9 May 2007 20:00:56 -0000 1.18
@@ -122,10 +122,10 @@
gsh_color_dialog();
break;
case 'D': /* Folder Creation Selector */
- gsh_folder_create_dialog(gsh);
+ GSH_FOLDER_CREATE_DIALOG(gsh);
break;
case 'd': /* Folder Selector */
- gsh_folder_open_dialog(gsh);
+ GSH_FOLDER_OPEN_DIALOG(gsh);
break;
case 'e': /* Error Message */
GSH_COUNT(argc, counter);
@@ -134,20 +134,23 @@
case 'F': /* Font Selection */
gsh_font_dialog();
break;
- case 'f': /* File Selection */
- gsh_file_open_dialog(gsh);
+ case 'f':
+ /* File Selection */
+ GSH_FILE_OPEN_DIALOG(gsh);
break;
case 'i': /* Information */
GSH_COUNT(argc, counter);
INFO_DIALOG(gsh, argv[*counter]);
break;
case 's': /* Filename Selection for Saving */
- gsh_file_save_dialog(gsh);
+
+ GSH_FILE_SAVE_DIALOG(gsh);
break;
case 'w': /* Warning */
GSH_COUNT(argc, counter);
WARNING_DIALOG(gsh, argv[*counter]);
break;
-
+ default:
+ ARWARN("invalid dialog option");
}
}
Index: file_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/file_dialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- file_dialog.c 5 May 2007 23:38:07 -0000 1.6
+++ file_dialog.c 9 May 2007 20:00:56 -0000 1.7
@@ -28,14 +28,9 @@
{
GtkWidget *dialog;
- dialog =
- gtk_file_chooser_dialog_new(
- "File Chooser",
- GTK_WINDOW(gsh->widgets.window),
- action,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ dialog=gtk_file_chooser_dialog_new("File Chooser",
+ GTK_WINDOW(gsh->widgets.window), action, GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
{
@@ -49,26 +44,4 @@
exit(0);
}
-void
-gsh_file_open_dialog(struct GSH * gsh)
-{
- gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_OPEN);
-}
-
-void
-gsh_file_save_dialog(struct GSH * gsh)
-{
- gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_SAVE);
-}
-void
-gsh_folder_create_dialog(struct GSH * gsh)
-{
- gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
-}
-
-void
-gsh_folder_open_dialog(struct GSH * gsh)
-{
- gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-}
Index: file_dialog.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/file_dialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- file_dialog.h 7 Mar 2007 06:44:47 -0000 1.5
+++ file_dialog.h 9 May 2007 20:00:56 -0000 1.6
@@ -27,16 +27,16 @@
gsh_file_dialog(struct GSH * gsh,
GtkFileChooserAction action) __attribute__((noreturn));
-void
-gsh_file_open_dialog(struct GSH * gsh) __attribute__((noreturn));
+#define GSH_FILE_OPEN_DIALOG(gsh)\
+ gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_OPEN)
-void
-gsh_file_save_dialog(struct GSH * gsh) __attribute__((noreturn));
+#define GSH_FILE_SAVE_DIALOG(gsh)\
+ gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_SAVE)
-void
-gsh_folder_open_dialog(struct GSH * gsh) __attribute__((noreturn));
+#define GSH_FOLDER_CREATE_DIALOG(gsh)\
+ gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
-void
-gsh_folder_create_dialog(struct GSH * gsh) __attribute__((noreturn));
+#define GSH_FOLDER_OPEN_DIALOG(gsh)\
+ gsh_file_dialog(gsh, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
#endif /* !GSH_FILE_DIALOG */
Index: geometry.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/geometry.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- geometry.c 5 May 2007 23:38:07 -0000 1.15
+++ geometry.c 9 May 2007 20:00:56 -0000 1.16
@@ -22,30 +22,20 @@
#include "gtkshell.h"
-/* gsh->geometry is freed after this, so only call once. */
-void
-gsh_set_geometry(struct GSH * gsh)
-{
-#ifdef DEBUG
- ARPASSERT(gsh);
-#endif /* DEBUG */
- ARIFP(gsh->geometry)
- {
- gtk_window_parse_geometry(GTK_WINDOW(gsh->widgets.window),
- gsh->geometry);
- g_free(gsh->geometry);
- }
-}
static gboolean
gsh_check_geometry(struct GSH * gsh)
{
+ /* Use a default geometry if the application has a scrolling window and
+ * the geometry has not yet been specified. */
if(GSH_FLAG(GSH_SCROLL) && !ARPBOOL(gsh->geometry))
gsh->geometry=g_strdup("400x267");
+ /* Result used in test of whether or not to set geometry. */
return ARPBOOL(gsh->geometry);
}
+/* gsh->geometry is freed after this, so only call once. */
void
gsh_check_and_set_geometry(struct GSH * gsh)
{
@@ -53,5 +43,15 @@
ARPASSERT(gsh);
#endif /* DEBUG */
if (gsh_check_geometry(gsh))
- gsh_set_geometry(gsh);
+ {
+ /* Use GTK convenience function to set window geometry. */
+ gtk_window_parse_geometry(GTK_WINDOW(gsh->widgets.window),
+ gsh->geometry);
+ /* Free the geometry string pointer after use, so this function,
+ * if called twice, will use a default geometry, not the user
+ * specified one. */
+ g_free(gsh->geometry);
+ /* Mark as unallocated. */
+ gsh->geometry=NULL;
+ }
}
Index: init.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/init.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- init.c 9 May 2007 19:53:37 -0000 1.7
+++ init.c 9 May 2007 20:00:56 -0000 1.8
@@ -23,10 +23,8 @@
#include "gtkshell.h"
#define SETUP_QUIT_SIGNAL(window, signal) \
-{\
- (void) g_signal_connect(window, signal,\
- G_CALLBACK(gtk_main_quit), NULL);\
-}
+ g_signal_connect(window, signal,\
+ G_CALLBACK(gtk_main_quit), NULL)
#define SETUP_QUIT_SIGNALS(window) \
{\
Index: main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- main.c 2 May 2007 14:55:31 -0000 1.19
+++ main.c 9 May 2007 20:00:56 -0000 1.20
@@ -22,6 +22,13 @@
#include "gtkshell.h"
+static void
+setup_gui(struct GSH * gsh, int argc, char ** argv)
+{
+ $(gsh, init);
+ $(gsh, parse, argc, argv); /* Setup GUI. */
+ $(gsh, finalize);
+}
int
main(int argc, char **argv)
@@ -30,9 +37,7 @@
gtk_init(&argc, &argv);
gsh=ARNEW(gsh, GSH);
- $(gsh, init);
- $(gsh, parse, argc, argv); /* Setup GUI. */
- $(gsh, finalize);
+ setup_gui(gsh, argc, argv);
gtk_main(); /* application main loop */
/* Cleanup when finished. */
$(gsh, delete);
Index: row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- row.c 3 May 2007 21:23:07 -0000 1.20
+++ row.c 9 May 2007 20:00:56 -0000 1.21
@@ -44,15 +44,24 @@
g_free(rows);
}
-static void
-gsh_setup_GSHRows(struct GSHRows * rows)
-{
- rows->current = 1;
- /* Use an arbitrary, though reasonable, initial number of rows. */
- rows->total = 8;
- rows->delete = &gsh_delete_GSHRows;
- rows->new=&gsh_GSHRows_new;
- rows->check=&gsh_GSHRows_check;
+#define SETUP_METHODS(rows)\
+{\
+ rows->delete=&gsh_delete_GSHRows;\
+ rows->new=&gsh_GSHRows_new;\
+ rows->check=&gsh_GSHRows_check;\
+}
+
+/* Use an arbitrary, though reasonable, initial number of rows. */
+#define SETUP_MEMBER_FIELDS(rows)\
+{\
+ rows->current=1;\
+ rows->total=8;\
+}
+
+#define SETUP_GSHROWS(rows)\
+{\
+ SETUP_MEMBER_FIELDS(rows);\
+ SETUP_METHODS(rows);\
}
struct GSHRows *
@@ -60,8 +69,8 @@
{
struct GSHRows * rows;
- rows=xmalloc(sizeof(struct GSHRows));
- gsh_setup_GSHRows(rows);
+ rows = xmalloc(sizeof(struct GSHRows));
+ SETUP_GSHROWS(rows);
return rows;
}
@@ -95,23 +104,13 @@
gsh_manage_generic(gsh, widget);
}
-static gboolean
-test_manage_unexpanded(struct GSH * gsh)
-{
- /* Alias to reduce dereferences. */
- GtkWidget * container = gsh->rows->v;
+#define GR gsh->rows
+#define CONTAINER GR->v
+#define TEST_MANAGE_UNEXPANDED(gsh)\
+ (GSH_FLAG(GSH_NO_EXPAND) &&(GR->total != 1)\
+ && !GTK_IS_MENU(CONTAINER) && !GTK_IS_MENU_BAR(CONTAINER)\
+ && !GTK_IS_MENU_ITEM(CONTAINER))
- /*
- * Checking for a 1 row counter allows the ACE Deskbar to
- * maintain a decent appearance.
- */
-
- return (GSH_FLAG(GSH_NO_EXPAND)
- &&(gsh->rows->total != 1)
- && !GTK_IS_MENU(container)
- && !GTK_IS_MENU_BAR(container)
- && !GTK_IS_MENU_ITEM(container));
-}
static void
manage_unexpanded(struct GSH * gsh, GtkWidget * widget)
@@ -125,7 +124,7 @@
void
gsh_manage(struct GSH * gsh, GtkWidget *widget)
{
- if(test_manage_unexpanded(gsh))
+ if(TEST_MANAGE_UNEXPANDED(gsh))
manage_unexpanded(gsh, widget);
else
manage_normal(gsh, widget);
Index: update_manager.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/update_manager.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- update_manager.c 3 May 2007 04:36:18 -0000 1.1
+++ update_manager.c 9 May 2007 20:00:56 -0000 1.2
@@ -42,10 +42,6 @@
static void
gsh_update_each(gpointer data, gpointer user_data)
{
-#ifdef DEBUG
- UNUSED(user_data); /* USER_DATA is unused. */
-#endif /* DEBUG */
-
/*
* Ensure that the argument containing the structure is not
* empty.
@@ -137,10 +133,11 @@
static void
gsh_setup_GSHUpdateManager(struct GSHUpdateManager * update)
{
+ /* Setup member data fields. */
update->period = 1000;
-
/* Pointer must have not previously been used. */
update->list = (GSList *) NULL;
+ /* Setup method function pointer assignments. */
update->delete=&gsh_delete_GSHUpdateManager;
update->add=&gsh_GSHUpdateManager_add;
update->start=&gsh_GSHUpdateManager_start;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright/gtkshell about_dialog.c button.c cont...,
Jeffrey Bedard <=