From 58a2d5aa94b1d698f52c6756d2dd99f6135427f6 Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 3 May 2009 10:38:35 +0000 Subject: (svn r16211) -Codechange: Moving StationListWidgets out of the window class, completing StationViewWidgets. --- src/station_gui.cpp | 56 ++++++++++++++++++++++++++--------------------------- src/station_gui.h | 2 ++ 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 0ee92f629..ee4b5bb2a 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -79,39 +79,39 @@ static void StationsWndShowStationRating(int left, int right, int y, CargoID typ typedef GUIList GUIStationList; +/** Enum for CompanyStations, referring to _company_stations_widgets */ +enum StationListWidgets { + SLW_CLOSEBOX = 0, ///< Close window button + SLW_CAPTION, ///< Window caption + SLW_STICKY, ///< Sticky button + SLW_LIST, ///< The main panel, list of stations + SLW_SCROLLBAR, ///< Scrollbar next to the main panel + SLW_RESIZE, ///< Resize button + + SLW_TRAIN, ///< 'TRAIN' button - list only facilities where is a railroad station + SLW_TRUCK, ///< 'TRUCK' button - list only facilities where is a truck stop + SLW_BUS, ///< 'BUS' button - list only facilities where is a bus stop + SLW_AIRPLANE, ///< 'AIRPLANE' button - list only facilities where is an airport + SLW_SHIP, ///< 'SHIP' button - list only facilities where is a dock + SLW_FACILALL, ///< 'ALL' button - list all facilities + + SLW_PAN_BETWEEN, ///< Small panel between list of types of ficilities and list of cargo types + SLW_NOCARGOWAITING, ///< 'NO' button - list stations where no cargo is waiting + SLW_CARGOALL, ///< 'ALL' button - list all stations + SLW_PAN_RIGHT, ///< Panel right of list of cargo types + + SLW_SORTBY, ///< 'Sort by' button - reverse sort direction + SLW_SORTDROPBTN, ///< Dropdown button + SLW_PAN_SORT_RIGHT, ///< Panel right of sorting options + + SLW_CARGOSTART, ///< Widget numbers used for list of cargo types (not present in _company_stations_widgets) +}; + /** * The list of stations per company. */ class CompanyStationsWindow : public Window { - /** Enum for CompanyStations, referring to _company_stations_widgets */ - enum StationListWidgets { - SLW_CLOSEBOX = 0, ///< Close window button - SLW_CAPTION, ///< Window caption - SLW_STICKY, ///< Sticky button - SLW_LIST, ///< The main panel, list of stations - SLW_SCROLLBAR, ///< Scrollbar next to the main panel - SLW_RESIZE, ///< Resize button - - SLW_TRAIN, ///< 'TRAIN' button - list only facilities where is a railroad station - SLW_TRUCK, ///< 'TRUCK' button - list only facilities where is a truck stop - SLW_BUS, ///< 'BUS' button - list only facilities where is a bus stop - SLW_AIRPLANE, ///< 'AIRPLANE' button - list only facilities where is an airport - SLW_SHIP, ///< 'SHIP' button - list only facilities where is a dock - SLW_FACILALL, ///< 'ALL' button - list all facilities - - SLW_PAN_BETWEEN, ///< Small panel between list of types of ficilities and list of cargo types - SLW_NOCARGOWAITING, ///< 'NO' button - list stations where no cargo is waiting - SLW_CARGOALL, ///< 'ALL' button - list all stations - SLW_PAN_RIGHT, ///< Panel right of list of cargo types - - SLW_SORTBY, ///< 'Sort by' button - reverse sort direction - SLW_SORTDROPBTN, ///< Dropdown button - SLW_PAN_SORT_RIGHT, ///< Panel right of sorting options - - SLW_CARGOSTART, ///< Widget numbers used for list of cargo types (not present in _company_stations_widgets) - }; - protected: /* Runtime saved values */ static Listing last_sorting; diff --git a/src/station_gui.h b/src/station_gui.h index 8efe3aae2..b990779ae 100644 --- a/src/station_gui.h +++ b/src/station_gui.h @@ -11,7 +11,9 @@ enum StationViewWidgets { SVW_CLOSEBOX = 0, ///< Close 'X' button SVW_CAPTION = 1, ///< Caption of the window + SVW_STICKYBOX = 2, ///< Sticky button SVW_WAITING = 3, ///< List of waiting cargo + SVW_SCROLLBAR = 4, ///< Scrollbar SVW_ACCEPTLIST = 5, ///< List of accepted cargos SVW_RATINGLIST = 5, ///< Ratings of cargos SVW_LOCATION = 6, ///< 'Location' button -- cgit v1.2.3-54-g00ecf