Commit graph

31 commits

Author SHA1 Message Date
olejl
11bc4c1ab2 Merging all changes from trunk revision 304:1340 to the r0304-rerecording branch. Also added some initial QT4 GUI. 2009-03-10 11:29:34 +00:00
Richard Goedeken
47623cc7e6 reverted changes in 287 because debugger has a branch 2008-04-23 12:29:16 +00:00
Jesse Dean
e2fb5b7dd2 Initial cleanup of debugger & gtk gui code to allow use of DBG=1 flag. Code now compiles, and debugger shows up,
although at this time it does little else, and does prevent emulation from running properly.  --Jes
2008-04-23 11:25:24 +00:00
James Hood
16a274adb6 -Rewrote cheat dialog to handle add/edit and enable of cheats all in one dialog.
-Removed Cheat menu and replaced it with "Cheats..." menu item in the Options menu.
-Modified alert_message and confirm_message so they handle line wrap of the message internally, so now it's no longer necessary to insert newline chars into strings passed to alert_message and confirm_message.
-added list_find_node utility function to util.c.
-added utility functions to create/delete cheat structures for use by the gui.
2008-04-23 06:46:47 +00:00
James Hood
605a4a02b1 Changed pause/continue keyboard shortcut to Pause/Break key because the previous shortcut 'p' was conflicting with the new rom filter. 2008-04-22 20:49:45 +00:00
Scott Knauert
c456b9bfc1 Fixed a collision from variable rename. 2008-04-22 13:57:05 +00:00
Scott Knauert
cd92cf9f9a Gtk GUI filter and improved sorting functions. 2008-04-22 13:10:42 +00:00
Scott Knauert
e984cab71a Removed second status bar which was not used (even in 0.5)
as it caused two Gtk resize handles to be drawn on the 
main window. Left in framework for multiple status bars
in case we actually want to use this in the future.
2008-04-20 22:51:23 +00:00
James Hood
d37739f761 Fixed segfault introduced by r244. Segfault would happen if you start mupen64plus, press the play button without selecting any roms in the rombrowser. When the dialog pops up asking if you want to load a rom, select yes and select a rom via the file chooser and click open. 2008-04-20 15:24:54 +00:00
Scott Knauert
f272302d26 Fixed Issue 6, if a ROM is selected in the ROM browser and
the 'play' is pressed, emulation will start if mupen can 
load the ROM.
2008-04-20 09:28:49 +00:00
James Hood
64fcb851fe -Moved ability for start emulation to also continue emulation (committed in r237) to startEmulation function of main/main.c, so other gui's don't have to re-implement it.
-Also removed gui code that tries to change the name of the pause toolbar item to either "Pause" or "Resume". I think most users understand that the pause key will also unpause. Plus the name can get out of sync due to the many alternative ways to pause/continue emulation (lirc, keyboard shortcut, mapped controller button).
2008-04-19 23:32:34 +00:00
Scott Knauert
f3a922e71f Adds the ability for GUI start to also continue emulation. This minor GUI fix
makes our Play/Pause/Stop follow convention.
2008-04-19 22:02:23 +00:00
Richard Goedeken
cbc32cb208 Removed unused LimitFPS option 2008-04-17 15:27:04 +00:00
James Hood
49aad76ff0 Implemented accelerator keys in the gtk gui. These are keyboard shortcuts that cause certain menu items to be activated, e.g., Alt+Return activates the fullscreen menu item. This also adds the accelerator keys to the menu items so the user can see the shortcut for that function. 2008-04-17 06:38:26 +00:00
James Hood
5a27989463 -Fixed menu "accelerator" problem. The correct term to use for the underlined letter in the file menu items is "mnemonic". Anyway, they work now.
-Minor change to man page.
2008-04-17 06:00:23 +00:00
James Hood
f6d65f0ab6 -Added multi-threading support to gtk gui. This allows info_message, confirm_message, alert_message functions to safely be called from any thread.
-I also changed the name of gui_parseArgs to gui_init, which will affect the kde4 gui code slightly when it's merged back into trunk.
2008-04-15 23:38:29 +00:00
James Hood
2baec5c8eb Added cheat menu and implemented dialog to enable/disable cheats during gameplay. This dialog does not allow you to add/edit cheats. That's coming soon. 2008-04-14 19:32:07 +00:00
Richard Goedeken
9f10d202be Reverted all changes on trunk from rev 189. The reason why I made a branch was so that you would not commit these things on the trunk. 2008-04-14 11:29:15 +00:00
John Chadwick
ec8445cc55 Attempt 3 at commiting the patches.
THIS PATCH IS PRELIMINARY AND DOES NOT WORK.
It also needs some major cleanup and most plugins are not yet compiling. Going to need any help I can get here, but I'll be working on it.
2008-04-14 04:37:57 +00:00
James Hood
fa74232ba2 -Replaced custom directory browser in (appeared when you clicked the "Add" button in the "Rom Browser" tab of the config dialog) with a gtk file chooser. Was able to remove dirbrowser.[ch] because of this.
-Removed "Remove All" button from rom browser config tab. There wasn't a stock gtk button for remove all and it didn't really seem necessary since you can select all of the directories and then click the "Remove" button.
-Removed unnecessary callback functions for about dialog, made about dialog not resizable.
2008-04-08 07:32:55 +00:00
James Hood
9de4a1eb8e -GTK_GUI: fixed gtk warnings given on gui reload, e.g., when language is changed. Warnings were introduced by new hotkeys tab in config dialog. 2008-04-08 06:16:53 +00:00
James Hood
9920114bc8 -GTK_GUI: change buttons like ok and cancel to use gtk stock buttons.
-GTK_GUI: reorder ok/cancel buttons on dialogs to be consistent with gtk.
-minor whitespace changes.
2008-04-07 23:16:37 +00:00
James Hood
f1e86b8f51 -Added gzip format to open rom file filter.
-Change "clear" button to "delete" in set controller special function dialog. This was because clear and cancel buttons had the same accelerator 'c'.
2008-04-07 22:17:15 +00:00
Richard Goedeken
5f32c254fe Converted all tabs to 4-spaces, and all line endings to LF-only 2008-04-06 14:55:37 +00:00
John Chadwick
c3c53540eb Adds "FPS Limiter" Option, enabled by default. Some things need to have this off to operate properly. 2008-04-05 19:26:05 +00:00
James Hood
af3b85e37f -Fixed the rest of the places where deprecated GtkFileSelection widget was being used. Converted to GtkFileChooserDialog.
-Added file filters to load dialogs for a more polished file chooser.
-Removed chdir to the config dir (~/.mupen64plus) from setPaths function. This was a hack to get around the fact that plugins were looking in the current working dir for config files. I've since fixed that issue, so the chdir is no longer necessary. Plus, the chdir was causing the file chooser dialogs to default to ~/.mupen64plus, which could be confusing to a user.
2008-04-01 20:34:53 +00:00
James Hood
e8551a2754 Replaced deprecated GtkFileSelection widget with GtkFileChooserDialog widget. 2008-03-31 07:03:24 +00:00
John Chadwick
28fcce941d * Fixed some compilation problems (defines PATH_MAX to 1024 in a couple files, if they aren't already defined)
* More GUI work ("Toolbar Style" now works)
2008-03-27 20:29:30 +00:00
James Hood
ed26e44479 Removed gui_load_rom call from guifuncs.h. It's not a necessary call for common code. 2008-03-26 23:16:51 +00:00
James Hood
74a6a52a02 -Fixed LIRC support (it was broken during gui/nogui merge).
-Separated LIRC functions into new lirc.c file so they can be used in gui or nogui build.
-Added pause/continue functionality to LIRC.
-Made it so LIRC commands work while emulation is paused.
-Added wiki page on how to setup LIRC for Mupen64Plus.
-Fixed minor bug with g_EmulationRunning (it was being set to 1 during stopEmulation).
2008-03-25 05:40:42 +00:00
Richard Goedeken
cf8b8ca208 Imported mupen64plus/trunk from mupen64-amd64/trunk/mupen64-64bit rev 254 2008-03-15 14:33:00 +00:00