pelya
400065fa43
Fixed compilatin, reverted several of my changes
...
Conflicts:
src/gfx.cpp
src/widget.cpp
src/widget_type.h
src/window.cpp
src/window_func.h
2016-03-27 22:41:43 +03:00
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
michi_cc
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
2015-08-10 20:24:13 +00:00
frosch
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
2015-02-01 20:54:24 +00:00
frosch
e4063cb6d4
(svn r27063) -Fix [FS#6172]: Some lists did not use natural string sorting.
2014-11-18 20:12:42 +00:00
rubidium
09f6c46d0b
(svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed)
2014-10-21 19:16:47 +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
79e124cf2b
(svn r26957) -Codechange: Spread the station cargo icons out by GUI scale.
2014-10-04 20:18:25 +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
Sergii Pylypenko
a0581f42bd
Revert "Select the actions that will need confirmation."
...
This reverts commit 02caad7c1b
2014-06-03 18:14:15 +03:00
rubidium
fb9dbf30fa
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
2014-05-11 18:02:11 +00: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
Juanjo
02caad7c1b
Select the actions that will need confirmation.
2014-03-15 22:53:35 +02:00
Juanjo
723d9b6256
Center cargo icons on station GUI.
2014-03-15 21:36:24 +02:00
Juanjo
3f81edb664
More sizing and centering.
2014-03-15 21:36:24 +02:00
Juanjo
0442649289
Add min sizing.
2014-03-15 21:35:16 +02:00
Juanjo
cab76bd7af
Draw strings vertically aligned on some windows.
2014-03-15 21:34:36 +02:00
Juanjo
b5ea121dbc
Change the SetFill/Resize status of order/group by widgets on station GUI.
2014-03-15 21:33:24 +02:00
Juanjo
4f2f3c52c6
Adapt the boxes showing waiting cargo on the Station List:
...
- rtl suport.
- size of the boxes adapted to the height of the normal font.
- draw a shadowed box if there is no cargo waiting but cargo has been accepted in that station.
- also always draw the box for a cargo if cargo has been produced but there are no waiting units.
2014-03-15 21:33:24 +02:00
rubidium
e55aae44eb
(svn r26083) -Codechange: pass the CommandContainer for the station joiner around using a reference instead of by-value
2013-11-24 14:29:32 +00:00
frosch
0284db1a31
(svn r25731) -Fix [FS#5692]: Minor RTL alignment issues. (sbr)
2013-08-18 19:30:25 +00:00
rubidium
729a6a0acc
(svn r25432) -Fix [FS#5608]: clang compiler error; sometimes it's more strict than others
2013-06-22 07:44:59 +00:00
fonsinchen
caf5ef9aea
(svn r25426) -Fix: highlight the right entry in the sorting selector in station view window
2013-06-18 19:32:58 +00:00
rubidium
18d8db683d
(svn r25405) -Feature-ish: differentiate between total waiting cargo count and available (not reserved) cargo count in the station list
...
-Change: sort based on the cargo count, not the cargo value
2013-06-15 15:26:24 +00:00
fonsinchen
7b2f8a885e
(svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI
2013-06-09 13:08:52 +00:00
fonsinchen
f022550df9
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
2013-06-09 13:03: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
16feb5c4e9
(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
rubidium
d7751326c5
(svn r25272) -Feature: show the approximate monthly supply to a station of the different cargoes (fonsinchen)
2013-05-20 19:57:38 +00:00
frosch
c5d7445704
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
2013-04-13 13:42:08 +00:00
rubidium
e0d3265546
(svn r25149) -Codechange: replace 'magic' 'has rating' bitcheck by descriptive function
2013-04-06 12:10:16 +00:00
rubidium
d27e49d078
(svn r25013) -Feature: show the amount of cargo that has already been reserved by full loading vehicles in the station (fonsinchen)
2013-02-17 14:59:27 +00:00
frosch
acaa0f3502
(svn r24703) -Fix: Disallow closing oilrig airports in SE.
2012-11-12 18:09:33 +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
88b8e43090
(svn r24697) -Codechange: Use WDF_UNCLICK_BUTTONS instead of duplicating the same functionality.
2012-11-11 16:07:46 +00:00
frosch
c5328a1986
(svn r24668) -Feature(ette) [FS#5311]: Draw cargo labels in the station list black or white depending on the background colour. (sbr)
2012-11-07 21:23:26 +00:00
terkhen
11775f1b15
(svn r24615) -Feature [FS#5311]: Sort cargo filter by cargo name/label at the company stations window (sbr)
2012-10-20 08:44:07 +00:00
frosch
279bfa8482
(svn r24260) -Change [FS#5126]: Make the oilrig-vehicle list accessible to specators and colour it's caption neutrally grey.
2012-05-16 22:08:46 +00:00
frosch
675fc185be
(svn r24205) -Feature [FS#5178-ish]: Show a hint in the supplies tab of station windows, if the station is affected by exclusive transport rights.
2012-05-06 11:38:52 +00:00
michi_cc
90fa700cc7
(svn r24127) -Feature [FS#1497]: Allow closing airports for incoming aircraft. (Based on patch by cirdan)
2012-04-17 19:43:18 +00:00
rubidium
c4c8b44ab5
(svn r24023) -Fix [FS#5090]: pass cases down into the list of cargos
2012-03-10 19:18:04 +00:00
truebrain
74a9412141
(svn r23553) -Fix: avoid naming conflict in widget enums
2011-12-16 18:33:02 +00:00
truebrain
feddd40bcc
(svn r23546) -Codechange: document and rename widgets to be consistent and understandable
2011-12-16 18:14:11 +00:00
truebrain
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
2011-12-15 22:22:55 +00:00
rubidium
24263638bf
(svn r23526) -Codechange: unify cargos vs cargoes
2011-12-15 21:56:00 +00:00
truebrain
da63ce43fa
(svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable)
...
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
2011-12-15 19:54:23 +00:00
yexo
2de94c6b36
(svn r22595) -Fix [FS#4560] (r22593): build railstation gui was broken with newgrf stations
2011-06-17 20:32:25 +00:00
yexo
4968af3b39
(svn r22593) -Fix [FS#4647]: don't show cargo accepted/produced in the new station window when no tiles are selected (mouse hovering a window or toolbar)
2011-06-16 09:46:24 +00:00
terkhen
55695277c8
(svn r22540) -Codechange: Rename AcceptancePickup to GoodsEntryStatus.
2011-06-04 21:17:07 +00:00
