Undo/Redo should be sensitive even if there is no layer :-)

1999-07-10 Michael Natterer <mitschel@cs.tu-berlin.de> * app/gdisplay.c (gdisplay_set_menu_sensitivity): Undo/Redo should be sensitive even if there is no layer :-) * app/commands.h * app/docindex.[ch] * app/docindexif.[ch] * app/file_new_dialog.[ch]: some #include cleanups. * plug-ins/helpbrowser/Makefile.classic: less primitive version.
1999-07-10 11:53:42 +00:00 · 1999-07-10 11:53:42 +00:00 · 9f92d833f0
parent a513b0d10e
commit 9f92d833f0
19 changed files with 122 additions and 64 deletions
--- a/12
+++ b/12
@ -1,3 +1,15 @@
+1999-07-10  Michael Natterer  <mitschel@cs.tu-berlin.de>
+
+	* app/gdisplay.c (gdisplay_set_menu_sensitivity): Undo/Redo should
+	be sensitive even if there is no layer :-)
+
+	* app/commands.h
+	* app/docindex.[ch]
+	* app/docindexif.[ch]
+	* app/file_new_dialog.[ch]: some #include cleanups.
+
+	* plug-ins/helpbrowser/Makefile.classic: less primitive version.
+
 Fri Jul  9 23:35 CST 1999 Seth Burgess <sjburges@gimp.org>
 	* app/qmask.c : fixed some small lil' bugs, made no selection not
 	automatically select all.  More features later.
--- a/app/actions/help-commands.h
+++ b/app/actions/help-commands.h
@ -3,9 +3,7 @@

 #include "gtk/gtk.h"

-void file_new_cmd_callback     (GtkWidget *widget,
-				gpointer   callback_data,
-				guint      callback_action);
+void file_new_cmd_callback     (GtkWidget *, gpointer, guint);
 void file_open_cmd_callback    (GtkWidget *, gpointer);
 void file_save_cmd_callback    (GtkWidget *, gpointer);
 void file_save_as_cmd_callback (GtkWidget *, gpointer);
--- a/app/commands.h
+++ b/app/commands.h
@ -3,9 +3,7 @@

 #include "gtk/gtk.h"

-void file_new_cmd_callback     (GtkWidget *widget,
-				gpointer   callback_data,
-				guint      callback_action);
+void file_new_cmd_callback     (GtkWidget *, gpointer, guint);
 void file_open_cmd_callback    (GtkWidget *, gpointer);
 void file_save_cmd_callback    (GtkWidget *, gpointer);
 void file_save_as_cmd_callback (GtkWidget *, gpointer);
--- a/app/core/gimpprojection.c
+++ b/app/core/gimpprojection.c
@ -1590,7 +1590,21 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
  SET_SENSITIVE ("/File/Revert", gdisp);
  SET_SENSITIVE ("/File/Close", gdisp);

-  SET_SENSITIVE ("/Edit", gdisp && lp);
+  SET_SENSITIVE ("/Edit", gdisp);
+  if (gdisp)
+    {
+      SET_SENSITIVE ("/Edit/Cut", lp);
+      SET_SENSITIVE ("/Edit/Copy", lp);
+      SET_SENSITIVE ("/Edit/Paste", lp);
+      SET_SENSITIVE ("/Edit/Paste Into", lp);
+      SET_SENSITIVE ("/Edit/Paste As New", lp);
+      SET_SENSITIVE ("/Edit/Clear", lp);
+      SET_SENSITIVE ("/Edit/Fill", lp);
+      SET_SENSITIVE ("/Edit/Stroke", lp);
+      SET_SENSITIVE ("/Edit/Cut Named", lp);
+      SET_SENSITIVE ("/Edit/Copy Named", lp);
+      SET_SENSITIVE ("/Edit/Paste Named", lp);
+    }

  SET_SENSITIVE ("/Select", gdisp && lp);
  SET_SENSITIVE ("/Select/Save To Channel", !fs);
--- a/app/dialogs/image-new-dialog.c
+++ b/app/dialogs/image-new-dialog.c
@ -17,7 +17,7 @@
 */
 #include "appenv.h"
 #include "actionarea.h"
-#include "commands.h"
+#include "file_new_dialog.h"
 #include "gimage.h"
 #include "gimpcontext.h"
 #include "gimprc.h"
--- a/app/dialogs/image-new-dialog.h
+++ b/app/dialogs/image-new-dialog.h
@ -1,12 +1,12 @@
-#ifndef __file_dialog_new_h__
-#define __file_dialog_new_h__
+#ifndef __FILE_NEW_DIALOG_H__
+#define __FILE_NEW_DIALOG_H__

 #include "gtk/gtk.h"

-void file_new_cmd_callback (GtkWidget           *widget,
-			    gpointer             callback_data,
-			    guint                callback_action);
+void file_new_cmd_callback (GtkWidget *widget,
+			    gpointer   callback_data,
+			    guint      callback_action);

-void file_new_reset_current_cut_buffer();
+void file_new_reset_current_cut_buffer ();

-#endif /* __FILE_DIALOG_NEW_H__ */
+#endif /* __FILE_NEW_DIALOG_H_H__ */
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@ -1590,7 +1590,21 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
  SET_SENSITIVE ("/File/Revert", gdisp);
  SET_SENSITIVE ("/File/Close", gdisp);

-  SET_SENSITIVE ("/Edit", gdisp && lp);
+  SET_SENSITIVE ("/Edit", gdisp);
+  if (gdisp)
+    {
+      SET_SENSITIVE ("/Edit/Cut", lp);
+      SET_SENSITIVE ("/Edit/Copy", lp);
+      SET_SENSITIVE ("/Edit/Paste", lp);
+      SET_SENSITIVE ("/Edit/Paste Into", lp);
+      SET_SENSITIVE ("/Edit/Paste As New", lp);
+      SET_SENSITIVE ("/Edit/Clear", lp);
+      SET_SENSITIVE ("/Edit/Fill", lp);
+      SET_SENSITIVE ("/Edit/Stroke", lp);
+      SET_SENSITIVE ("/Edit/Cut Named", lp);
+      SET_SENSITIVE ("/Edit/Copy Named", lp);
+      SET_SENSITIVE ("/Edit/Paste Named", lp);
+    }

  SET_SENSITIVE ("/Select", gdisp && lp);
  SET_SENSITIVE ("/Select/Save To Channel", !fs);
--- a/app/docindex.c
+++ b/app/docindex.c
@ -21,9 +21,9 @@
 #include "docindexif.h"
 #include "docindex.h"
 #include "gimprc.h"
-#include "menus.h"

 #include "libgimp/gimpenv.h"
+#include "libgimp/gimpintl.h"

 idea_manager *ideas = NULL;
 static GList *idea_list = NULL;   /* of gchar *. */
--- a/app/docindex.h
+++ b/app/docindex.h
@ -43,17 +43,17 @@ typedef struct idea_manager
  gint count;
 } idea_manager;

+void raise_idea_callback (GtkWidget *widget, gpointer data);
+
 void make_idea_window( gint x, gint y );
 void open_idea_window( void );
 void close_idea_window( void );
 void idea_add( gchar *label );
 void idea_add_in_position( gchar *label, gint position );
-void raise_idea_callback( GtkWidget *widget, gpointer data );
 void idea_hide_callback( GtkWidget *widget, gpointer data );
 void idea_up_callback( GtkWidget *widget, gpointer data );
 void idea_down_callback( GtkWidget *widget, gpointer data );
 void idea_remove_callback( GtkWidget *widget, gpointer data );
-void save_idea_manager( idea_manager * );
 gboolean idea_window_delete_event_callback( GtkWidget *widget, GdkEvent *event, gpointer data );
 void docindex_configure_drop_on_widget(GtkWidget * widget);

@ -64,6 +64,7 @@ FILE  * idea_manager_parse_init (int  * window_x,
 gchar * idea_manager_parse_line (FILE * fp);

 void    load_idea_manager       (idea_manager *);
+void    save_idea_manager       (idea_manager *);

 extern idea_manager *ideas;

--- a/app/docindexif.c
+++ b/app/docindexif.c
@ -13,10 +13,15 @@
 * GNU General Public License for more details.
 */

+#include <ctype.h>
 #include <string.h>

 #include "docindex.h"
 #include "docindexif.h"
+#include "fileops.h"
+#include "gimage.h"
+
+#include "libgimp/gimpintl.h"

 void
 raise_if_match( gpointer data, gpointer user_data )
--- a/app/docindexif.h
+++ b/app/docindexif.h
@ -16,26 +16,22 @@
 #ifndef __DOCINDEXIF_H__
 #define __DOCINDEXIF_H__

-
-#include <ctype.h>
 #include <stdio.h>
- 
-#include "libgimp/gimpintl.h"
-#include "gimage.h"
-#include "fileops.h"
-#include "file_new_dialog.h"
-#include "commands.h"

-void open_or_raise( gchar *file_name );
-void raise_if_match( gpointer data, gpointer user_data );
-gboolean exit_from_go();
-void open_file_in_position( gchar *filename, gint position );
-GtkMenuFactory *create_idea_menu();
-GtkWidget *create_idea_toolbar();
-void clear_white( FILE *fp );
-int getinteger( FILE *fp );
-gchar *append2( gchar *string1, gboolean del1, gchar *string2, gboolean del2);
-gint reset_usize( gpointer data );
+void             open_or_raise         (gchar *file_name);
+void             raise_if_match        (gpointer data, gpointer user_data);
+gboolean         exit_from_go          ();
+void             open_file_in_position (gchar *filename,
+					gint   position);
+GtkMenuFactory * create_idea_menu      ();
+GtkWidget      * create_idea_toolbar   ();
+void             clear_white           (FILE *fp);
+int              getinteger            (FILE *fp);
+gchar          * append2               (gchar *string1,
+					gboolean del1,
+					gchar *string2,
+					gboolean del2);
+gint             reset_usize           (gpointer data);

 struct bool_char_pair
 {
--- a/app/file_new_dialog.c
+++ b/app/file_new_dialog.c
@ -17,7 +17,7 @@
 */
 #include "appenv.h"
 #include "actionarea.h"
-#include "commands.h"
+#include "file_new_dialog.h"
 #include "gimage.h"
 #include "gimpcontext.h"
 #include "gimprc.h"
--- a/app/file_new_dialog.h
+++ b/app/file_new_dialog.h
@ -1,12 +1,12 @@
-#ifndef __file_dialog_new_h__
-#define __file_dialog_new_h__
+#ifndef __FILE_NEW_DIALOG_H__
+#define __FILE_NEW_DIALOG_H__

 #include "gtk/gtk.h"

-void file_new_cmd_callback (GtkWidget           *widget,
-			    gpointer             callback_data,
-			    guint                callback_action);
+void file_new_cmd_callback (GtkWidget *widget,
+			    gpointer   callback_data,
+			    guint      callback_action);

-void file_new_reset_current_cut_buffer();
+void file_new_reset_current_cut_buffer ();

-#endif /* __FILE_DIALOG_NEW_H__ */
+#endif /* __FILE_NEW_DIALOG_H_H__ */
--- a/app/gdisplay.c
+++ b/app/gdisplay.c
@ -1590,7 +1590,21 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
  SET_SENSITIVE ("/File/Revert", gdisp);
  SET_SENSITIVE ("/File/Close", gdisp);

-  SET_SENSITIVE ("/Edit", gdisp && lp);
+  SET_SENSITIVE ("/Edit", gdisp);
+  if (gdisp)
+    {
+      SET_SENSITIVE ("/Edit/Cut", lp);
+      SET_SENSITIVE ("/Edit/Copy", lp);
+      SET_SENSITIVE ("/Edit/Paste", lp);
+      SET_SENSITIVE ("/Edit/Paste Into", lp);
+      SET_SENSITIVE ("/Edit/Paste As New", lp);
+      SET_SENSITIVE ("/Edit/Clear", lp);
+      SET_SENSITIVE ("/Edit/Fill", lp);
+      SET_SENSITIVE ("/Edit/Stroke", lp);
+      SET_SENSITIVE ("/Edit/Cut Named", lp);
+      SET_SENSITIVE ("/Edit/Copy Named", lp);
+      SET_SENSITIVE ("/Edit/Paste Named", lp);
+    }

  SET_SENSITIVE ("/Select", gdisp && lp);
  SET_SENSITIVE ("/Select/Save To Channel", !fs);
--- a/app/gui/commands.h
+++ b/app/gui/commands.h
@ -3,9 +3,7 @@

 #include "gtk/gtk.h"

-void file_new_cmd_callback     (GtkWidget *widget,
-				gpointer   callback_data,
-				guint      callback_action);
+void file_new_cmd_callback     (GtkWidget *, gpointer, guint);
 void file_open_cmd_callback    (GtkWidget *, gpointer);
 void file_save_cmd_callback    (GtkWidget *, gpointer);
 void file_save_as_cmd_callback (GtkWidget *, gpointer);
--- a/app/gui/file-new-dialog.c
+++ b/app/gui/file-new-dialog.c
@ -17,7 +17,7 @@
 */
 #include "appenv.h"
 #include "actionarea.h"
-#include "commands.h"
+#include "file_new_dialog.h"
 #include "gimage.h"
 #include "gimpcontext.h"
 #include "gimprc.h"
--- a/app/gui/file-new-dialog.h
+++ b/app/gui/file-new-dialog.h
@ -1,12 +1,12 @@
-#ifndef __file_dialog_new_h__
-#define __file_dialog_new_h__
+#ifndef __FILE_NEW_DIALOG_H__
+#define __FILE_NEW_DIALOG_H__

 #include "gtk/gtk.h"

-void file_new_cmd_callback (GtkWidget           *widget,
-			    gpointer             callback_data,
-			    guint                callback_action);
+void file_new_cmd_callback (GtkWidget *widget,
+			    gpointer   callback_data,
+			    guint      callback_action);

-void file_new_reset_current_cut_buffer();
+void file_new_reset_current_cut_buffer ();

-#endif /* __FILE_DIALOG_NEW_H__ */
+#endif /* __FILE_NEW_DIALOG_H_H__ */
--- a/app/gui/help-commands.h
+++ b/app/gui/help-commands.h
@ -3,9 +3,7 @@

 #include "gtk/gtk.h"

-void file_new_cmd_callback     (GtkWidget *widget,
-				gpointer   callback_data,
-				guint      callback_action);
+void file_new_cmd_callback     (GtkWidget *, gpointer, guint);
 void file_open_cmd_callback    (GtkWidget *, gpointer);
 void file_save_cmd_callback    (GtkWidget *, gpointer);
 void file_save_as_cmd_callback (GtkWidget *, gpointer);
--- a/plug-ins/helpbrowser/Makefile.classic
+++ b/plug-ins/helpbrowser/Makefile.classic
@ -1,4 +1,14 @@
-all:
-	gcc `gtk-config --cflags` -g -Wall -ansi -c helpbrowser.c
-	gcc `gtk-config --cflags` -g -Wall -ansi -c queue.c 
-	gcc -o helpbrowser helpbrowser.o queue.o `gtk-config --libs` `gimptool --libs` -lgtkxmhtml
+CFLAGS = `gtk-config --cflags` -g -Wall -ansi
+
+LDFLAGS = `gtk-config --libs` `gimptool --libs` -lgtkxmhtml
+
+OBJECTS = helpbrowser.o queue.o
+
+TARGET = helpbrowser
+
+$(TARGET): $(OBJECTS)
+	$(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
+
+.PHONY: clean
+clean:
+	-rm -f $(OBJECTS)