[Desmume-cvs] SF.net SVN: desmume:[2487] trunk/desmume/src/gtk

[<ric...@us...>]

Revision: 2487
          http://desmume.svn.sourceforge.net/desmume/?rev=2487&view=rev
Author:   riccardom
Date:     2009-07-04 08:56:14 +0000 (Sat, 04 Jul 2009)

Log Message:
-----------
Remove hardcoded ioregtool in tool menu creation by adding a shortname field in the dTool_t struct. While at it cleanup a bit the names and shrink a bit name field. 

Modified Paths:
--------------
    trunk/desmume/src/gtk/dTool.h
    trunk/desmume/src/gtk/main.cpp
    trunk/desmume/src/gtk/tools/ioregsView.cpp

Modified: trunk/desmume/src/gtk/dTool.h
===================================================================
--- trunk/desmume/src/gtk/dTool.h	2009-07-04 08:20:56 UTC (rev 2486)
+++ trunk/desmume/src/gtk/dTool.h	2009-07-04 08:56:14 UTC (rev 2487)
@@ -10,7 +10,9 @@
 
 typedef struct
 {
-	const char name[64];
+	/* this should be the same name of the action in the gui xml */
+	const char shortname[16];
+	const char name[32];
 	dTool_openFn open;
 	dTool_updateFn update;
 	dTool_closeFn close;

Modified: trunk/desmume/src/gtk/main.cpp
===================================================================
--- trunk/desmume/src/gtk/main.cpp	2009-07-04 08:20:56 UTC (rev 2486)
+++ trunk/desmume/src/gtk/main.cpp	2009-07-04 08:56:14 UTC (rev 2487)
@@ -226,7 +226,7 @@
 "      </menu>"
 "    </menu>"
 "    <menu action='ToolsMenu'>"
-"      <menuitem action='ioregtool'/>"
+"      <menuitem action='ioregs'/>"
 "    </menu>"
 "    <menu action='HelpMenu'>"
 "      <menuitem action='about'/>"
@@ -1682,8 +1682,7 @@
     gint i;
     for(i = 0; i < dTools_list_size; i++) {
         GtkAction *act;
-        //FIXME: remove hardcoded 'ioregtool' from here and in ui_description
-        act = gtk_action_new("ioregtool", dTools_list[i]->name, NULL, NULL);
+        act = gtk_action_new(dTools_list[i]->shortname, dTools_list[i]->name, NULL, NULL);
         g_signal_connect(G_OBJECT(act), "activate", G_CALLBACK(Start_dTool), GINT_TO_POINTER(i));
         gtk_action_group_add_action(ag, GTK_ACTION(act));
     }

Modified: trunk/desmume/src/gtk/tools/ioregsView.cpp
===================================================================
--- trunk/desmume/src/gtk/tools/ioregsView.cpp	2009-07-04 08:20:56 UTC (rev 2486)
+++ trunk/desmume/src/gtk/tools/ioregsView.cpp	2009-07-04 08:56:14 UTC (rev 2487)
@@ -25,6 +25,7 @@
 
 #include "../MMU.h"
 
+#define SHORTNAME "ioregs"
 #define TOOL_NAME "IO regs view"
 
 BOOL CPUS [2] = {TRUE, TRUE};
@@ -472,6 +473,7 @@
 
 dTool_t dTool_ioregsView =
 {
+	SHORTNAME,
 	TOOL_NAME,
 	&open,
 	&update,


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