Commit Graph

246 Commits

Author SHA1 Message Date
punkrockguy318 11d7905868 gtk: add scrollbar to hotkey config 2012-08-07 14:20:24 +00:00
punkrockguy318 2c70120d62 gtk: allow configuration of first element in hotkey dialog 2012-08-07 14:05:09 +00:00
punkrockguy318 76617ae6e0 gtk: display hotkey keyname instead of keycode in hotkey gui 2012-08-07 13:58:31 +00:00
punkrockguy318 05d1b19f1e gtk: added gui hotkey config dialog 2012-08-07 00:40:52 +00:00
punkrockguy318 d2c378a434 gtk: preliminary hotkey configuration dialog (currently read-only and menu items commented) 2012-08-06 23:28:03 +00:00
punkrockguy318 e82addfedf gtk: added gui option for opposite directionals 2012-08-04 21:28:20 +00:00
punkrockguy318 fd64417ef2 gtk: no longer segfault on gamepad config when gtk < 2.24 (ubuntu 10.04) -- hide gamepad config option 2012-06-24 16:04:56 +00:00
zeromus 181278b136 apply changes made during brief timespan in new (abandoned) svn repository:
* support mapper 176. mapper 176 no longer maps to BMCFK23C. BMCFK23C is still accessible through crc or unif? test case would be welcome. it is unclear to me why mapper 176 control was removed from 176.cpp and given to BMCFK23C
* fix malformed ines.cpp file format
* gtk: bump about date to 2012
* Taseditor: fixed silly bug with JumpToFrame
* Taseditor: autosave works only when project has a filename
* Taseditor: small fixes
2012-06-06 17:15:06 +00:00
punkrockguy318 936b5af85f sdl: update todo; changelog; added some comments 2012-03-06 22:16:57 +00:00
punkrockguy318 2900ce17cb gtk: adjust 2.24 warning message 2012-03-06 22:12:11 +00:00
punkrockguy318 1e66b91359 sdl: fix last commit 2012-03-06 22:08:35 +00:00
punkrockguy318 44c419d7e3 gtk: added check for gtk 2.24 for the gamepad dialog 2012-03-06 22:05:21 +00:00
punkrockguy318 68aa80a5df gtk: added a check for GTK version; this is so we can detect old GTK versions and bail on dialogs instead of segfaulting
updated TODO for 2.1.6
2012-03-06 21:25:49 +00:00
punkrockguy318 b0c2758324 sdl: code cleanup; pre-release code review (in progress) 2012-03-06 11:12:28 +00:00
punkrockguy318 118b82544c gtk: use basedir instead of hardcoded default basedir path in gamegenie dialog for improved accuracy 2012-03-06 09:13:58 +00:00
punkrockguy318 646847ddc8 sdl: fixed formatting issues; overall code cleanup 2012-03-06 08:43:42 +00:00
ansstuff 703ab3d752 * changed ".tas" extension to ".fm3"
* Tasedit: Markers notes (strings)
* Tasedit: editing Marker notes, 2 text fields
* Tasedit: View->Follow Marker Note context
* Tasedit: View->Display Branch Tooltips
* Tasedit: new accelerators: Ctrl-PgUp/Ctrl-PgDn/Shift-PgUp/Shift-PgDn
* Tasedit: Config->Allow keyboard controls in Listview
2011-12-16 19:05:58 +00:00
ansstuff 840528d52a Replaying .tas files in SDL version 2011-12-09 15:51:36 +00:00
punkrockguy318 724616f718 sdl: make the coding style of gui.cpp consistent (hardtabs like pretty much src/*) 2011-11-12 07:52:59 +00:00
punkrockguy318 8fafc755df gtk: added ifdefs for newly added frameskip gui 2011-11-04 06:53:28 +00:00
punkrockguy318 4bbd74c740 gtk: added frameskip option; made label case consistent 2011-11-04 06:28:46 +00:00
punkrockguy318 3b33abf4c0 gtk: no longer compile in openGL gui code when openGL is not being compiled into fceux 2011-10-28 23:24:04 +00:00
punkrockguy318 1d664128d4 gtk: fix potentially build error on gtk < 2.24 (ubuntu 10.04 lts) 2011-10-21 02:31:34 +00:00
punkrockguy318 73f9e705fd gtk: remove unecessary/redundant config file saving 2011-10-20 02:15:54 +00:00
punkrockguy318 ca8fb4ab08 gtk: now remembers last loaded lua script for loadLua dialog 2011-10-19 07:12:10 +00:00
punkrockguy318 4b9c345266 gtk: improve load state dialog to filter for fcs sav files (default save format of fceux) 2011-10-19 05:00:23 +00:00
punkrockguy318 119d7cccc4 gtk: added option in video config for SDL.ClipSides 2011-10-19 02:29:35 +00:00
punkrockguy318 ffe7741ab7 gtk: added video option for double buffering 2011-10-19 01:58:00 +00:00
punkrockguy318 86124102b7 sdl: improve upon last commit by actually opening cwd instead of selecting it in the parent folder. also do this for open palette dialog 2011-10-18 23:03:23 +00:00
punkrockguy318 2b3ddd9f59 sdl: start file dialogs in cwd instead of the odd gtk "recently used" entry 2011-10-18 22:56:07 +00:00
punkrockguy318 8638c95d60 sdl: GTK3! removed more depreciated code and made adjustments so that fceux now compiles with GTK3 (although not by default). Compile by setting GTK3 to 1 in the SConstruct 2011-10-18 21:47:41 +00:00
punkrockguy318 654207e860 sdl: no longer use depreciated gtk2 objects and functions 2011-10-18 21:35:37 +00:00
punkrockguy318 2f992d1d0e sdl: fix last commit correctly 2011-10-17 22:11:51 +00:00
punkrockguy318 0aef8cea7d sdl: move the networkIP clensing out of CloseGame() because CloseGame is called in LoadGame() 2011-10-17 22:07:36 +00:00
punkrockguy318 68d9d0b33b sdl: SFid3424049 fix segfault do to nameclash 2011-10-17 15:07:10 +00:00
punkrockguy318 0fa5caf1e6 sdl: fix segfault on "record as" 2011-10-10 19:52:09 +00:00
punkrockguy318 72d063e247 gtk: support mouseclicks (ie: zapper) 2011-10-08 19:00:56 +00:00
punkrockguy318 b5c95f8a82 gtk: string change; there were two "q" menu shortcuts in the File menu 2011-03-30 03:16:12 +00:00
plombo 3dbcd76aa9 gtk: don't show state slot changes on the game screen if they are done using the menu (as opposed to using a hotkey) 2011-03-29 23:52:06 +00:00
plombo eb0c8e6175 gtk: make the 'Change State' menu items (0-9) look normal, and update its selection when the state slot is changed with a hotkey 2011-03-29 23:42:43 +00:00
punkrockguy318 14869a046a gtk: add some padding to network config
gtk: adjustment to last commit
2011-03-29 00:27:19 +00:00
punkrockguy318 0809f5261a gtk: don't have redundant labels on savestate menu 2011-03-29 00:18:47 +00:00
plombo 935946d83d gtk: add accelerators for recording and saving movies (same as hotkeys) 2011-03-28 21:40:46 +00:00
plombo cd3e32450c gtk: make save state slots (0-9) accessible through GUI 2011-03-28 21:29:41 +00:00
plombo 4b5c2b2167 gtk: make all config dialogs be GtkDialogs rather than toplevel windows 2011-03-28 02:58:57 +00:00
plombo 2c9fac5f2f gtk: disable Screenshot hotkey when the GUI is active
Like pause/resume, GTK+ handles screenshots using an accelerator.  The hotkey was also being triggered, so 2 screenshots were taken every time F12 was pressed.
2011-03-23 00:02:58 +00:00
plombo de992b79a0 gtk: don't forget to save the updated config after enabling/disabling the Game Genie 2011-03-22 23:41:12 +00:00
plombo c76d4bf20d gtk: fix some minor issues
Only allow the emulator to handle key events when the main window has the input focus

Don't write anything to stdout when configuring a button using the GTK+ control config dialog.
2011-03-22 23:36:16 +00:00
plombo f3eb06bde3 gtk: make control configuration dialog non-modal
It was the only modal dialog in the entire application.
This also fixes an issue where the emulator would unpause when closing the control config dialog, even if it had been paused manually by the user.
2011-03-22 23:02:45 +00:00
plombo 994ffdead9 gtk: bind About dialog to main window instead of making it a toplevel window, and fix window icon for Credits and License subwindows 2011-03-22 00:43:16 +00:00
punkrockguy318 a8f71e3264 gtk: added authors to about dialog 2011-03-21 19:15:26 +00:00
punkrockguy318 4427c066ec gtk: remove gtk_main_quit() and manually flush gtk event queue on quit
this supresses the Gtk-Critical error on fceux quit
sdl: removed unneccesary newline prepending "Starting FCEUX"
2011-03-21 18:57:00 +00:00
punkrockguy318 968dd77ccf gtk: renamed "Emulator" menu to "Emulation" menu 2011-03-19 19:52:58 +00:00
punkrockguy318 be05f73b97 gtk: added hard reset option (closes rom/re-opens rom)
gtk: renamed reset to soft reset (resetNes())
gtk: added seperators to emulator menu
2011-03-19 19:51:46 +00:00
plombo a845b822bc gtk: set window icon for About dialog 2011-03-19 02:53:40 +00:00
plombo a7c16f1835 gtk: set Pause key as an accelerator and don't send the keypress event to SDL
Now the Pause/Resume menu item changes state when the emulator is paused or unpaused using the Pause key.
2011-03-19 01:44:13 +00:00
plombo d8f4c3636c gtk: replaced Pause checkbox with Pause menu item that changes to Resume when pausing and vice versa when unpausing, and fixed the bug where FCEUX would stop responding after unpausing 2011-03-19 01:16:09 +00:00
punkrockguy318 e9b4ab74ec gtk: about dialog improvements 2011-03-19 01:02:30 +00:00
punkrockguy318 f3a1f8728d gtk: minor code cleanup 2011-03-19 00:54:07 +00:00
punkrockguy318 abe58dcd54 gtk: turn off game genie on gtk init to match game genie menu checkbox which is off by default 2011-03-19 00:50:24 +00:00
punkrockguy318 469bcb1b53 gtk: removed redundant functions and changed "pause emulation" to "pause" 2011-03-19 00:39:27 +00:00
punkrockguy318 8a19bdc66c gtk: pause/resume menu items replaced with pause checkbox 2011-03-19 00:31:05 +00:00
plombo 692b405bc6 gtk: add window icons to the configuration dialogs 2011-03-18 19:54:47 +00:00
plombo cfb3a88708 gtk: add even more icons to menu items 2011-03-18 19:29:02 +00:00
plombo 999c374013 gtk: use more stock icons for menu items 2011-03-18 18:58:58 +00:00
plombo ca66f4c765 gtk: migrate the menu bar from the deprecated GtkItemFactory to GtkUIManager 2011-03-18 18:36:56 +00:00
punkrockguy318 fea7c9f132 gtk: enable/disable game genie through menu 2011-03-16 05:22:13 +00:00
punkrockguy318 09818e412d gtk: added load game genie rom option
todo: checkbox somewhere for gg
gtk: cleaned some code
2011-03-16 04:59:58 +00:00
punkrockguy318 6730a2d237 gtk: let gtk decide window size of palette config window (looks better) 2011-03-16 04:25:43 +00:00
plombo fe73d11f9b gtk: Replaced the control config dialog with a newer, more usable one.
For a detailed changelog, see https://github.com/Plombo/fceux/tree/control-config2
2011-03-04 23:38:11 +00:00
punkrockguy318 8c51e45f7e gtk: added disable sprite limit option
(also did some sanity checks in video config function)
2011-02-08 05:30:48 +00:00
plombo b838d8da53 gtk: Add option in video config for OpenGL linear filtering (interpolation) 2011-02-08 04:41:41 +00:00
punkrockguy318 8efdc060c0 gtk: sf3175428 - applied icon patch (thanks bryan!) 2011-02-08 00:08:13 +00:00
punkrockguy318 0e09dcfecd gtk: fixed bug where sound would not init if sound was toggled on before the game was loaded 2011-02-03 00:27:38 +00:00
punkrockguy318 6e6777a793 gtk: gtk window is no longer usable resizable. use xscale/yscale in video config or command-line arguments 2011-01-28 07:34:14 +00:00
punkrockguy318 1df86cd42b gtk: fixed sav dialog 2011-01-28 06:40:23 +00:00
punkrockguy318 1561c3583e gtk: nsf and load/save statedialogs remember last directory 2011-01-28 06:38:23 +00:00
punkrockguy318 8ff01bbe57 gtk: update gtk window size when using scalers 2011-01-25 16:16:30 +00:00
punkrockguy318 acec8ad4c5 gtk: remember last file loaded and load it by default in the filechooser 2011-01-25 05:13:54 +00:00
punkrockguy318 fc8a43b524 gtk: autoresize window with x/yscale options
TODO: resize sdl window immediately
2011-01-25 04:39:04 +00:00
punkrockguy318 e5e716d84a gtk: fixed alt-tab entering fs 2011-01-25 04:23:44 +00:00
punkrockguy318 be15c0cfec *ID: 3165057 - Embed SDL window in GTK window patch applied
Big thanks to Bryan Cain!
*fixed issues with xscale/yscale options "not sticking" in gtk gui
*set gtk window to resize to xscale/yscale options

introduced known bug:  alt-tab won't currently go into fullscreen
2011-01-25 03:26:09 +00:00
zeromus 29cffedbbf don't use GPOINTER_TO_INT as this breaks on some gtk versions and os versions that we would like to support (namely, my macbook) 2010-07-18 04:33:33 +00:00
ugetab e5f12da441 After much effort, added NTSC 2x scaler option to both Windows and SDL. Includes new config option NTSCwinspecial. 2010-05-21 20:36:24 +00:00
shinydoofy 5d0aefac08 GTK: fix two typos in gui.cpp 2010-04-10 13:42:33 +00:00
punkrockguy318 d11744b9da gtK: removed some code that changed the scaler to null with opengl as it seems that it works in openGL now 2010-03-31 03:35:42 +00:00
punkrockguy318 8d3328c177 SDL: moved sound config options to SDL.Sound.* 2010-03-08 01:56:26 +00:00
punkrockguy318 f21d1f20a1 GTK: fixed some issues with the load palette dialog 2010-03-08 00:12:37 +00:00
punkrockguy318 7790de5fe3 GTK: fixed segfaults when fullscreen would be called with no rom loaded 2010-03-07 23:48:50 +00:00
punkrockguy318 a0924098ad GTK: fixed bug where palettes wouldn't open via GTK
GTK: code cleanup and compile warning silencing
2010-03-07 23:45:10 +00:00
punkrockguy318 a875e87a3f GTK: disabled some unused code to silence some warnings 2010-03-07 23:27:25 +00:00
punkrockguy318 45bcee9ecf GTK: some code cleanup --This line, and those below, will be ignored--
M    src/drivers/sdl/gui.cpp
2010-03-07 08:52:23 +00:00
punkrockguy318 f454e04542 GTK: added menu buttons for playing nsf files
i dind't even know this was possible with fceux, i'm a very happy man
2010-03-05 03:24:30 +00:00
punkrockguy318 3002e917b1 GTK: added power menu item 2010-03-04 05:41:20 +00:00
punkrockguy318 1ce0d7ffa6 GTK: added some code for controlling device types (incomplete) 2010-03-04 04:23:44 +00:00
punkrockguy318 a917321d1f gtk: added insert coin menu button 2010-03-03 22:57:59 +00:00
punkrockguy318 3e98bed606 GTK: set individual mixers on slider change instead of restarting sound
* runs much nicer off of a live cd
2010-03-03 06:10:40 +00:00
punkrockguy318 17057e9fce SDL: added stubs to compile with adelikats latest changes
GTK: added code for a gtk terminal window (broken) (not currently being used)
2010-03-03 03:28:42 +00:00
punkrockguy318 c15c8e5025 SDL: new default select is / 2010-02-28 07:50:10 +00:00
punkrockguy318 bbdc6f431b GTK: hotkey GUI dialog created (its broken right now) 2010-02-27 20:50:09 +00:00
punkrockguy318 48cd9126b7 unix-net: don't re-use options from cfg
GTK: network GUI is functional
2010-02-26 04:51:44 +00:00
punkrockguy318 560890f2e5 GTK: dummy gui for netplay
unix-net: use DispMessage to inform user of connection problems/success
2010-02-26 04:24:49 +00:00
punkrockguy318 a2fa9062e0 GTK: updated file filters in load game to include zip archives 2010-02-26 03:28:02 +00:00
punkrockguy318 ab51ce9d28 GTK: typo.. vound -> video 2010-02-25 18:20:57 +00:00
punkrockguy318 42801f4f10 GTK: dialog enhancements 2010-02-25 06:55:10 +00:00
punkrockguy318 5a9cbdc615 GTK: added exceptions for lua scripts, movies, fds bios 2010-02-25 06:43:24 +00:00
punkrockguy318 cd2d6c5dc5 GTK: added exceptions for loading roms 2010-02-25 06:31:23 +00:00
punkrockguy318 1481f6491f GTK: removed dependency on zenity
SDL: added GTK_LITE option which enables GTK for dialog boxes but sticks to a command-line interface
GTK: changed the name of some macros; enable with GTK instead of GTK2
2010-02-25 06:22:07 +00:00
punkrockguy318 3f99f5d6bc GTK: sdl openGL crashes with special scalers; turn off scalers when gl is checked
TODO: a solution in sdl-video so we don't segfault in this situation
2010-02-24 10:18:52 +00:00
punkrockguy318 cc09e4dad1 GTK: restructured movie menus; added some options 2010-02-24 10:04:55 +00:00
punkrockguy318 619e586b31 GTK: implemented record movie/stop movie into menus 2010-02-24 09:52:39 +00:00
punkrockguy318 8b46355bc8 GTK: added file filters for file choosers
GTK: added Load FDS Bios function
2010-02-24 09:24:05 +00:00
punkrockguy318 5f2bd46410 GTK: fixed NTSCcolor option 2010-02-24 08:05:53 +00:00
punkrockguy318 0547ec7af7 SDL: fds eject/insert now mappable; default f6 and f8
GTK: addded insert/eject menu options
NOTE: fds files are still broken in SDL (error loading auxillary fds file?)
2010-02-24 07:52:37 +00:00
punkrockguy318 eae3042e42 GTK: added clear palette button
GTK: added exception for bad palette file
2010-02-24 06:51:30 +00:00
punkrockguy318 39787369f3 GTK: added palette config dialog; moved color/tint/hue from video dialog 2010-02-24 06:37:18 +00:00
punkrockguy318 5edbb5d5aa GTK: added xscale/yscale UI options
GTK: added lowpass sound option
2010-02-24 06:01:30 +00:00
punkrockguy318 3c9dd8c793 SDL: verbose when loading custom palette
GTK: added color/tint/hue options in video dialog
2010-02-24 05:36:49 +00:00
punkrockguy318 f4bb1df7fd GTK: added volume mixer controls from individual mixers (square1/2, triangle, noise, etc) 2010-02-24 04:38:29 +00:00
punkrockguy318 1dd8e8b47b GTK: added Very High to sound quality options 2010-02-23 08:51:40 +00:00
punkrockguy318 ee997e6f9f GTK: cleaned GUI padding for video, sound, and input dialogs
GTK: title includes version number
GTK: added fourscore option
2010-02-23 08:34:06 +00:00
punkrockguy318 f5457f2ace gtk: code cleanup; added wrapper function to toggle cfg options 2010-02-22 21:54:48 +00:00
punkrockguy318 3376049269 GTK: added newPPU option
GTK: fixed issue where some options were not being saved when a game wasn't being loaded
SDL: fixed an issue with newPPU command-line option
2010-02-22 21:39:17 +00:00
punkrockguy318 d1bab4ef09 GTK: added PAL option
SDL: fixed PAL sf2842769
2010-02-20 03:33:26 +00:00
punkrockguy318 9f9cb9c2fc GTK: hide window on fullscreen
GTK: add framework for display FCEUD_Message()s
2010-02-19 16:36:39 +00:00
punkrockguy318 7b11c1e8a8 GTK: minor menu adjustments 2010-02-19 05:46:23 +00:00
punkrockguy318 6da628e69d GTK: added openGL option, and movie loading option 2010-02-19 05:44:06 +00:00
punkrockguy318 86b65da02e GTK: video config window added; special scaler options added 2010-02-19 05:29:16 +00:00
punkrockguy318 85138cc503 GTK: code cleanup
GTK: fixed issues with sound buffer widget
2010-02-19 04:48:51 +00:00
punkrockguy318 125648d2f7 GTK: replaced depreciated combo with a nice nifty combo box (minor UI improvement) 2010-02-19 04:33:43 +00:00
punkrockguy318 735e239977 GTK: sound config dialog completely functional 2010-02-19 04:29:07 +00:00
punkrockguy318 806f0661be GTK: added sound preferences window UI. The controls currently effectively do nothing 2010-02-19 02:46:55 +00:00
punkrockguy318 f4d8036223 GTK: added support for configuring gamepads besides gp1
GTK: cleaned gamepad config UI slightly
2010-02-19 02:03:04 +00:00
punkrockguy318 82c55b16e4 GTK: added GUI for --inputcfg; only works with gamepad 1 currently 2010-02-19 00:40:16 +00:00
punkrockguy318 160faa8837 SDL: Fixed possible audio segfault
GTK: Added menu options for screenshot
GTK: Added save as/load from for savestates
2010-02-18 23:29:33 +00:00
punkrockguy318 572f53f761 GTK: added fullscreen option; removed dummy menu options; removed WIP from titlebar 2010-02-18 01:23:03 +00:00
punkrockguy318 b0569356f0 GTK: added pause, resume, and reset menu options 2010-02-18 01:15:37 +00:00
punkrockguy318 eb504adb19 cleaned some code
moved sound checkbox to main window (pointless to have a pref window really; main window is pref window)
TODO:  Hotkey config / Input config
2009-12-22 06:40:33 +00:00
punkrockguy318 5011579ba1 added preferences window to gtk gui
added sound option in gui 
removed uncessary parameters from InitSound so it can be used from gui
2009-12-22 05:12:25 +00:00
punkrockguy318 491311db44 added lua script loading to gtk2 gui 2009-12-21 20:03:24 +00:00
punkrockguy318 af14209f43 Added about dialog to gtk2 2009-12-21 12:17:03 +00:00
punkrockguy318 ea64540d0f GTK GUI: Open, Close, and Quit menu options now work properly
Games can now be opened and closed on the fly without exiting fceux
2009-12-21 11:21:06 +00:00
punkrockguy318 4b6d0c4b3f cleaned up gtk2 code quite a bit
until direct sdl rendering on gtk2 can occur, the file menu will be in a seperate window
however this will allow direct interfacing with the emulator rather than just command line options like gfceux
2009-12-21 10:49:20 +00:00
punkrockguy318 98096d5b52 cleaned some gtk2 code
fixed build scripts for building w/ gtk2
2009-12-21 10:28:01 +00:00
punkrockguy318 86123d257e began integration of GTK into the SDL tree
see gui.cpp at r1601 for demonstration of how this SHOULD work
currently, fceuX is creating its own new window instead of using GTKs window
added flag GTK_GUI (in code for now, will add to scons build later)
added line to sconstruct for GTK libraries (commented by default)
2009-12-17 07:27:17 +00:00
punkrockguy318 7af0329bf4 added functional GTK2/SDL framework
currently seperate from all fceux code but will soon be integrated into fceux 
in order to create an integrated UI on the linux build
2009-12-17 06:19:08 +00:00