Commit Graph

512 Commits

Author SHA1 Message Date
pelya 3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
frosch 04aa61ffac (svn r27300) -Fix [FS#6306]: Silence GCC warning (Cif) 2015-06-20 11:05:11 +00:00
frosch 235b7946fc (svn r27300) -Fix [FS#6306]: Silence GCC warning (Cif) 2015-06-20 11:05:11 +00:00
peter1138 6872b647f1 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 2014-10-05 11:20:02 +00:00
peter1138 0877f892c5 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 2014-10-05 11:20:02 +00:00
Sergii Pylypenko 91ebce1a9c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
peter1138 816ab7fc8a (svn r26455) -Change: Prompt for confirmation when deleting a vehicle group. 2014-04-11 18:14:44 +00:00
peter1138 fc0646c229 (svn r26455) -Change: Prompt for confirmation when deleting a vehicle group. 2014-04-11 18:14:44 +00:00
peter1138 ed8f6f1a0f (svn r26450) -Feature: Hierarchical vehicle subgroups. 2014-04-08 21:09:06 +00:00
peter1138 567d0ff3a7 (svn r26450) -Feature: Hierarchical vehicle subgroups. 2014-04-08 21:09:06 +00:00
pelya 61e8275ebf Fixed vehicle and music dialog size 2014-03-23 18:47:49 +02:00
Juanjo 0442649289 Add min sizing. 2014-03-15 21:35:16 +02:00
Juanjo a315c978f6 Center group gui strings (and other minor changes). 2014-03-15 21:34:36 +02:00
Juanjo 9fa95981fc Display of group names is longer when autoreplace/protection sprites are hidden. 2014-03-15 21:33:24 +02:00
Juanjo 7e91026ec8 The space between the group name and the sprite is set to 2 instead of 8. Less unused space. 2014-03-15 21:33:24 +02:00
Juanjo 6a426ed2df Modify the length of the Group GUI.
Set it to the length of the 'a' character * maximum length of a group name.
2014-03-15 21:33:24 +02:00
frosch 538159cb1d (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 2013-06-30 14:36:31 +00:00
frosch 43ec0bf0c1 (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 2013-06-30 14:36:31 +00:00
frosch 7dac11fbb2 (svn r25533) -Codechange: Use SetCapacityFromWidget more often. 2013-06-30 14:33:32 +00:00
frosch e184b9799c (svn r25533) -Codechange: Use SetCapacityFromWidget more often. 2013-06-30 14:33:32 +00:00
frosch f6d27acb51 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 2013-06-30 14:32:31 +00:00
frosch 98fdd20f84 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 2013-06-30 14:32:31 +00:00
frosch ddf817e8f3 (svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them. 2013-06-01 14:33:48 +00:00
frosch ce110eed32 (svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them. 2013-06-01 14:33:48 +00:00
frosch 13badddd75 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 2013-05-26 19:30:07 +00:00
frosch 4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 2013-05-26 19:30:07 +00:00
frosch 16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch 25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
frosch eb20798aae (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 2012-12-08 17:18:51 +00:00
frosch b533523258 (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 2012-12-08 17:18:51 +00:00
frosch 3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
frosch 03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
terkhen 98e49d3648 (svn r24626) -Fix [FS#5432]: MSVC 2010 warnings. 2012-10-25 17:38:12 +00:00
terkhen 9b5ff794c7 (svn r24626) -Fix [FS#5432]: MSVC 2010 warnings. 2012-10-25 17:38:12 +00:00
frosch 33c07c0fd7 (svn r24595) -Change [FS#5168]: Make the group GUI drag&drop highlighting behave more intelligible. (based on work by Juanjo) 2012-10-14 19:15:00 +00:00
frosch 1ffa7d4488 (svn r24595) -Change [FS#5168]: Make the group GUI drag&drop highlighting behave more intelligible. (based on work by Juanjo) 2012-10-14 19:15:00 +00:00
alberth e54b1a177f (svn r24550) -Codechange: Remove unused panel widget in the group gui (Juanjo). 2012-09-22 19:16:04 +00:00
alberth d00dfaff4c (svn r24550) -Codechange: Remove unused panel widget in the group gui (Juanjo). 2012-09-22 19:16:04 +00:00
alberth 87214b78a9 (svn r24549) -Codechange: Remove the hard-coded sprite button sizes in the group gui (Juanjo). 2012-09-22 19:15:16 +00:00
alberth adae8b161e (svn r24549) -Codechange: Remove the hard-coded sprite button sizes in the group gui (Juanjo). 2012-09-22 19:15:16 +00:00
alberth 9f77118751 (svn r24548) -Add: Extra group line in the group gui, if possible (Juanjo). 2012-09-22 19:14:06 +00:00
alberth 224babe8c4 (svn r24548) -Add: Extra group line in the group gui, if possible (Juanjo). 2012-09-22 19:14:06 +00:00
alberth eedb4356f1 (svn r24547) -Add [FS#5263]: Separate the 'available vehicles' from the other buttons in the group gui (Juanjo). 2012-09-22 19:12:22 +00:00
alberth 4b59344b0d (svn r24547) -Add [FS#5263]: Separate the 'available vehicles' from the other buttons in the group gui (Juanjo). 2012-09-22 19:12:22 +00:00
michi_cc 83a0b3cf1d (svn r24139) -Add: Creating a new vehicle group by drag and drop. (Based on patch by Juanjo) 2012-04-17 19:44:16 +00:00
michi_cc 37e321044a (svn r24139) -Add: Creating a new vehicle group by drag and drop. (Based on patch by Juanjo) 2012-04-17 19:44:16 +00:00