From c2464d4c71bbc0154287f0b0441aef05e27cf084 Mon Sep 17 00:00:00 2001 From: erihel Date: Fri, 17 Aug 2012 22:43:07 +0200 Subject: * changes to ui classes --- src/ui/window.h | 73 +++++++++++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 46 deletions(-) (limited to 'src/ui/window.h') diff --git a/src/ui/window.h b/src/ui/window.h index 3acf3b4..8884c6f 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -19,27 +19,8 @@ #pragma once -#include "ui/control.h" - - -class CD3DEngine; -class CButton; -class CColor; -class CCheck; -class CKey; -class CGroup; -class CImage; -class CLabel; -class CEdit; -class CEditValue; -class CScroll; -class CSlider; -class CList; -class CShortcut; -class CMap; -class CGauge; -class CCompass; -class CTarget; +#include +#include const int MAXWINDOW = 100; @@ -48,34 +29,34 @@ const int MAXWINDOW = 100; class CWindow : public CControl { public: - CWindow(CInstanceManager* iMan); + CWindow(); ~CWindow(); void Flush(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CButton* CreateButton(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CColor* CreateColor(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CCheck* CreateCheck(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CKey* CreateKey(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CGroup* CreateGroup(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CImage* CreateImage(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CLabel* CreateLabel(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, char *name); - CEdit* CreateEdit(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CScroll* CreateScroll(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CSlider* CreateSlider(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CList* CreateList(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg, float expand=1.2f); - CShortcut* CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CMap* CreateMap(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CGauge* CreateGauge(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CCompass* CreateCompass(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - CTarget* CreateTarget(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); - bool DeleteControl(EventMsg eventMsg); - CControl* SearchControl(EventMsg eventMsg); - - EventMsg RetEventMsgReduce(); - EventMsg RetEventMsgFull(); - EventMsg RetEventMsgClose(); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CButton* CreateButton(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CColor* CreateColor(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CCheck* CreateCheck(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CKey* CreateKey(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CGroup* CreateGroup(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CImage* CreateImage(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CLabel* CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, char *name); + CEdit* CreateEdit(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CScroll* CreateScroll(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CSlider* CreateSlider(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CList* CreateList(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, float expand=1.2f); + CShortcut* CreateShortcut(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CMap* CreateMap(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CGauge* CreateGauge(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CCompass* CreateCompass(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + CTarget* CreateTarget(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); + bool DeleteControl(EventType eventMsg); + CControl* SearchControl(EventType eventMsg); + + EventType RetEventTypeReduce(); + EventType RetEventTypeFull(); + EventType RetEventTypeClose(); void SetName(char* name); -- cgit v1.2.3-1-g7c22 From bd9c581cedc3833fd9af4f5caee744090b31c8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Mon, 20 Aug 2012 21:22:24 +0200 Subject: added ui/window.* -- not fully ported --- src/ui/window.h | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'src/ui/window.h') diff --git a/src/ui/window.h b/src/ui/window.h index 8884c6f..b122b67 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -1,5 +1,6 @@ // * This file is part of the COLOBOT source code // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) // * // * This program is free software: you can redistribute it and/or modify // * it under the terms of the GNU General Public License as published by @@ -20,8 +21,9 @@ #include -#include +//#include +namespace Ui { const int MAXWINDOW = 100; @@ -54,38 +56,38 @@ public: bool DeleteControl(EventType eventMsg); CControl* SearchControl(EventType eventMsg); - EventType RetEventTypeReduce(); - EventType RetEventTypeFull(); - EventType RetEventTypeClose(); + EventType GetEventTypeReduce(); + EventType GetEventTypeFull(); + EventType GetEventTypeClose(); void SetName(char* name); void SetTrashEvent(bool bTrash); - bool RetTrashEvent(); + bool GetTrashEvent(); void SetPos(Math::Point pos); void SetDim(Math::Point dim); void SetMinDim(Math::Point dim); void SetMaxDim(Math::Point dim); - Math::Point RetMinDim(); - Math::Point RetMaxDim(); + Math::Point GetMinDim(); + Math::Point GetMaxDim(); void SetMovable(bool bMode); - bool RetMovable(); + bool GetMovable(); void SetRedim(bool bMode); - bool RetRedim(); + bool GetRedim(); void SetClosable(bool bMode); - bool RetClosable(); + bool GetClosable(); void SetMaximized(bool bMaxi); - bool RetMaximized(); + bool GetMaximized(); void SetMinimized(bool bMini); - bool RetMinimized(); + bool GetMinimized(); void SetFixed(bool bFix); - bool RetFixed(); + bool GetFixed(); bool GetTooltip(Math::Point pos, char* name); @@ -121,7 +123,8 @@ protected: bool m_bCapture; Math::Point m_pressPos; int m_pressFlags; - D3DMouse m_pressMouse; + Gfx::EngineMouseType m_pressMouse; }; +} -- cgit v1.2.3-1-g7c22 From 6ba0f42f22a170625f15879e01b4653a4ac153a1 Mon Sep 17 00:00:00 2001 From: erihel Date: Fri, 31 Aug 2012 22:28:07 +0200 Subject: latest changes; few more classes should compile now --- src/ui/window.h | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) (limited to 'src/ui/window.h') diff --git a/src/ui/window.h b/src/ui/window.h index b122b67..9262a1a 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -19,9 +19,33 @@ #pragma once - +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -//#include + +#include namespace Ui { @@ -42,7 +66,7 @@ public: CKey* CreateKey(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); CGroup* CreateGroup(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); CImage* CreateImage(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); - CLabel* CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, char *name); + CLabel* CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, std::string name); CEdit* CreateEdit(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); CEditValue* CreateEditValue(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); CScroll* CreateScroll(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); @@ -60,7 +84,7 @@ public: EventType GetEventTypeFull(); EventType GetEventTypeClose(); - void SetName(char* name); + void SetName(std::string name); void SetTrashEvent(bool bTrash); bool GetTrashEvent(); @@ -89,7 +113,7 @@ public: void SetFixed(bool bFix); bool GetFixed(); - bool GetTooltip(Math::Point pos, char* name); + bool GetTooltip(Math::Point pos, std::string &name); bool EventProcess(const Event &event); -- cgit v1.2.3-1-g7c22