Commit graph

136 commits

Author SHA1 Message Date
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
Scott Knauert
4f87fa787f Minor update to the ROM Properties dialogue. Minor
GUI style corrections. Made hitting enter in the comments 
dialogue apply the changes. Partially fixes Issue 66.
2008-04-20 20:33:20 +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
Scott Knauert
b2c0dafa81 After the Comment is altered in the ROM Properties dialogue,
the ROM browser is updated. Minor changes to the sorting and 
refresh functions as I had incorrectly renamed the sorting 
function when I rewrote it in commit 242. Also set the default
sort elsewhere to refresh to be general and not effect sorting.
2008-04-20 08:59:39 +00:00
Scott Knauert
48846dd477 Fixed Issue 62, restored ROM browser column sorting as in 0.5
with the change of the default sort category being the Filename 
istead of the GoodName. This is easily changed if after the GoodName 
update we want to put it back. 

Also changed the column sizing policy to be more sane, allowing 
the user to resize and reorder columns and for columns which normally 
contain large strings (FileName, GoodName, Comments) to expand on 
resize.
2008-04-20 08:10:28 +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
0165af30c5 -Added global variable representing whether the Gameshark button is pressed or not.
-Added 'g' shortcut key that will act as the Gameshark button.
-Added user ability to map a joystick button to the Gameshark button.

Note, I did not add support for the Gameshark button to the emulator core yet, so cheats triggered by the GS button will not work until that's done.
2008-04-09 17:11:00 +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
James Hood
117a8e545e minor whitespace changes 2008-04-06 22:55:37 +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
57bfd1a1ab Bugfix: Correctly adds GtkTreeView to the GtkScrolledWindow, now the headers move properly and type-to-scroll should work properly. 2008-04-06 05:57:57 +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
dd00ce7987 -Added support for mapping emulator special functions (fullscreen, stop emulation, etc) to joystick buttons or axis movements.
-Added new tab to configuration dialog for user to create mappings.
-Minor fix: Reset configuration dialog to have first tab selected everytime it's shown.
2008-04-03 22:07:45 +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
1f2151c960 Fixes compilation of the VCR GUI. It couldn't possibly work before because it relied on a header that no longer exists. It adds alot of includes for standard headers though, I believe some of them are not needed (I'll fix that right now, trial and error.) 2008-03-30 20:23:56 +00:00
James Hood
1a3e0662d1 changed default toolbar style to icons since that's what everyone will be set to before r59 2008-03-27 20:53:10 +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
James Hood
58773a915a -bugfix: newlines in Catalan translation file were causing problems with that translation.
-Readded --noask functionality (it was lost during gui/nogui merge).
-Added config dialog checkbox to toggle noask setting.
-Fixed problem with too many dialog windows when loading a bad dump or hacked rom.
2008-03-19 01:29:19 +00:00
James Hood
e81f213c6f -Created config/ dir and moved all config files to it.
-Modified Makefile so 'make install' will copy default config files to install dir
-Modified gui_gtk/rombrowser.c so rombrowser.cache file is saved to user config dir.
-Modified main/main.c so on creation of user config dir ~/.mupen64plus, all config files from install dir are copied to user config dir.
2008-03-17 00:40:43 +00:00
Richard Goedeken
3ad9e08591 Changed project name to Mupen64Plus 2008-03-15 16:23:36 +00:00
Richard Goedeken
cf8b8ca208 Imported mupen64plus/trunk from mupen64-amd64/trunk/mupen64-64bit rev 254 2008-03-15 14:33:00 +00:00