Commit Graph

77 Commits

Author SHA1 Message Date
Stephen Kennedy
a7bb113e83 Merged revisions 33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621,33623,33626-33627,33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716,33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766,33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919,33928,33930,33932-33936,33938-33940,33942-33943,33948,33950,33953,33967,33973,33976,33978,33980,33985,33991,33993,33999-34000,34006,34009,34011,34013,34015,34019,34021-34023,34025,34027-34028,34030,34032-34034,34036,34038-34039,34041,34046-34048,34050-34055,34057,34059-34065,34067,34072,34074,34076,34078-34081,34084,34086-34087,34089-34090,34093,34096-34102,34104,34107,34113,34116,34119,34122,34124,34126,34128,34131-34132,34135,34138,34141,34144,34146,34149,34152-34154,34156-34157,34160,34163-34164,34169,34173,34179-34194,34196-34198,34200-34201,34205-34206,34208-34217,34219-34225,34227-34228,34234-34237,34239-34249,34251-34279,34281-34284,34286-34288,34290-34320,34323-34324,34326,34328-34329,34332,34334,34336,34338-34340,34343-34353,34356-34357,34359-34371,34373,34375,34378,34381-34382,34384-34385,34389-34391,34393-34394,34396-34397,34399-34405,34407-34409,34411,34413,34415,34417-34420,34423-34426,34428-34438,34440-34454,34456-34458,34460,34462-34469,34472,34474,34479-34481,34483-34498,34501-34505,34508,34511-34518,34520-34524,34526-34563,34566-34569,34571-34590,34592,34595-34599,34602-34603,34605,34613-34615,34617,34619-34624,34627-34628,34630-34639,34642-34649 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r34654
2008-09-26 21:53:08 +00:00
Stephen Kennedy
12d649f011 remap dialog updates
svn-id: r33990
2008-08-18 15:13:55 +00:00
Christopher Page
f45749759e Added ScummVM Title and version info to GMM
svn-id: r33955
2008-08-17 02:02:22 +00:00
Stephen Kennedy
6f09c4f10e Added close button on remap dialog
svn-id: r33888
2008-08-15 01:22:09 +00:00
Christopher Page
c747e1d105 Added 'delete' button to the launcher's load dialog, implementation for deleting a savegame to come
svn-id: r33855
2008-08-14 03:50:48 +00:00
Stephen Kennedy
17c1dba992 Keymapper WIP:
* Further improvement of automatic mapping
* Remap dialog - added timeout feature

svn-id: r33827
2008-08-13 14:33:17 +00:00
Stephen Kennedy
300a1df2b0 Remap dialog WIP
svn-id: r33791
2008-08-11 23:08:21 +00:00
Stephen Kennedy
4eacc09024 Keymapper WIP:
* Got rid of default keymaps as they over-complicated the API
* Remapping dialog WIP

svn-id: r33699
2008-08-08 14:23:59 +00:00
Christopher Page
1fe2700dab Added support for Savestates to be loaded from the launcher
svn-id: r33461
2008-07-30 21:48:45 +00:00
Christopher Page
f878820bbe Created Global Main Menu Dialog. Made a uniform _quit flag for engines. So far agi, agos, and cine are now using the new _quit flag.
svn-id: r32770
2008-06-24 21:15:30 +00:00
Jordi Vilalta Prat
420d376a90 Added the option to specify the custom path for loading plugins
svn-id: r31960
2008-05-09 01:58:12 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Johannes Schickel
fefc228cd2 Cleanup.
svn-id: r29287
2007-10-28 13:34:57 +00:00
Eugene Sandulenko
61c96353cf Patch v5.2 from #1752243: "backends lib patches"
svn-id: r29283
2007-10-28 12:04:38 +00:00
Eugene Sandulenko
8c36fcf64c Path #1743892: "Fix for segmentation fault in theming code"
svn-id: r27743
2007-06-27 09:32:42 +00:00
Eugene Sandulenko
cac0c0f256 Patch #1742050: "GUI: Enlarge some labels in the themes"
svn-id: r27701
2007-06-25 07:49:08 +00:00
Eugene Sandulenko
f7d90395cd Fix bug #1742561: "GUI: Missaligned text"
svn-id: r27700
2007-06-25 07:44:16 +00:00
Eugene Sandulenko
0d467367d2 Patch from bugreport #1742561: "GUI: Missaligned text"
svn-id: r27699
2007-06-25 07:13:53 +00:00
Eugene Sandulenko
2982a6ebb3 Fix bugs #1709323: "GUI: Button overlapping" and #1677997: "GUI: Switching
options dialog between 1x and 2x" by introducing Volume tab to all resolutions

svn-id: r27345
2007-06-11 07:57:39 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Kostas Nakos
6e8fe8632d improve the looks of keysdialog
svn-id: r26554
2007-04-21 14:01:36 +00:00
Eugene Sandulenko
6ee9e52f4b Move mass add dialog settings to theme config. Bump theme ini version.
svn-id: r26058
2007-03-10 14:15:47 +00:00
Eugene Sandulenko
5577379ac3 Implement FR #1559561: "GUI: output sample rate widgets"
svn-id: r26056
2007-03-10 13:39:38 +00:00
Eugene Sandulenko
474d49dc14 Implement FR#1611172: GUI: Add autosave period widgets
svn-id: r25563
2007-02-13 21:06:45 +00:00
Eugene Sandulenko
d90fc8914c Implement FR#1600020: GUI: Select "No SoundFont"
svn-id: r25556
2007-02-13 19:55:20 +00:00
Johannes Schickel
3a81941981 - Added dialog for selecting the theme to use
- Added runtime theme switching

svn-id: r24213
2006-10-08 18:22:28 +00:00
Eugene Sandulenko
39b08f70a6 - Fix bug #1513671 "GUI: PSP classic mode problems"
- Fix little inconsistency in modern theme for PSP resolution.

svn-id: r23394
2006-07-07 21:58:52 +00:00
Eugene Sandulenko
6f844ae420 - Make tabs narrower so they all fit on screen. Now navigation buttons
appear only on PSP resolution
- Combined Audio/Volume tab in game options for consistency.

svn-id: r23130
2006-06-15 13:18:28 +00:00
Eugene Sandulenko
bc74af60a6 - Consistent order of tabs between global and game options
- Consistent order of paths on paths tab in global and game options

svn-id: r23118
2006-06-15 02:30:05 +00:00
Eugene Sandulenko
021159724d Fix drawing of tab widget. Now it matches mock-ups. Added tab scrolling.
svn-id: r23116
2006-06-15 02:14:40 +00:00
Torbjörn Andersson
f22be03872 Increased the spacing between the widgets on the "Game" tab of the "Edit Game"
dialog in 320xX mode. They were so close to each other that it bordered on
being pornographic.

svn-id: r23058
2006-06-12 08:40:50 +00:00
Eugene Sandulenko
4867a75918 Patch #1336171: "MIDI gain setting for FluidSynth" with slight modifications
of PSP theme to fit new slider into MIDI tab.

svn-id: r23033
2006-06-11 20:51:14 +00:00
Eugene Sandulenko
62e286c30f Patch from bugreport #1502409: "Search ScummVM directory for GUI theme".
It adds theme patch setting to GUI.

svn-id: r23032
2006-06-11 20:40:22 +00:00
Torbjörn Andersson
8ef6ff1765 This may cut down a little on unnecessary strings / mallocs:
* Only create the self.[xywh] aliases and its variables if prefixedname has no
  periods in it, e.g. MusicText.x, but not MusicText.align.x

* Set the .r, .g and .b variables directly, rather than aliasing them through
  .x, .y and .w

svn-id: r23000
2006-06-10 10:09:40 +00:00
Torbjörn Andersson
c78409da15 Whitespace
svn-id: r22999
2006-06-10 08:24:00 +00:00
Eugene Sandulenko
6f8c4250f9 Move whole theme ini file to evaluator. Next step is caching. Also now it is
possible to use per-resolution gfx and colors, i.e. complete customization.

svn-id: r22964
2006-06-06 23:57:14 +00:00
Torbjörn Andersson
2023505402 Some minor tweaks to the classic theme's options dialog. The SoundFont and
the paths buttons have the same left margin now.

svn-id: r22941
2006-06-05 19:24:02 +00:00
Max Horn
0f18020010 Some more string usage tweaks
svn-id: r22936
2006-06-05 17:43:30 +00:00
Max Horn
5f76cd0d9e cleanup
svn-id: r22930
2006-06-05 12:35:33 +00:00
Torbjörn Andersson
5f3c930fd1 I just realized that by making the classic SCUMM options dialog just one pixel
wider, it matches the old, hard-coded, width for the 1x scaler. How can I
possibly resist something like that? :-)

svn-id: r22926
2006-06-05 07:17:42 +00:00
Torbjörn Andersson
a2718bc078 Base the width of the SCUMM options dialog, classic theme, on buttonWidth,
rather than hard-coding it. This should fix bug #1500674.

svn-id: r22925
2006-06-05 07:12:28 +00:00
Max Horn
76116f36dd *Loads* of Common::String related optimizations. Woa, *tons* of methods were copying strings needlessly
svn-id: r22873
2006-06-03 13:33:39 +00:00
Eugene Sandulenko
05871836b9 Turn AliasesMap and VariablesMap keys from String to const char *.
Stats before:
Strings: 12048
mallocs: 55629
after:
Strings: 6370
mallocs: 42117
Here Strings are non-empty strings. Mallocs are string-related mallocs
including mallocs in HashMap BaseNode.

svn-id: r22841
2006-06-02 17:51:20 +00:00
Eugene Sandulenko
eabca87697 Optimize string usage a tiny bit more
svn-id: r22839
2006-06-02 16:06:17 +00:00
Max Horn
9686e5a3be Optimize GUI string usage a tiny bit more
svn-id: r22828
2006-06-02 07:20:04 +00:00
Willem Jan Palenstijn
f33a2e2f31 reduce number of string allocations
svn-id: r22823
2006-06-01 22:50:05 +00:00
Eugene Sandulenko
1ec42e169e Fixes for MM NES resolution:
- Introduce useAsIs keyword for resolution aliases
- Extend skipFor keyword to accept multiple values

svn-id: r22779
2006-05-30 18:36:08 +00:00
Eugene Sandulenko
b13e157c16 Put volume controls conditionally into separate tab. Used by PSP theme.
svn-id: r22775
2006-05-30 17:49:53 +00:00
Eugene Sandulenko
b6a56e0795 - Split global audio tab into audio and volume
- More logical order in game options tab

svn-id: r22774
2006-05-30 17:35:57 +00:00
Johannes Schickel
0165c98e00 - adds option to fill GraphicsWidgets with a special color
- updates builtin theme config for my next commit
- bumps theme config

svn-id: r22743
2006-05-29 14:38:56 +00:00