adding timers works now

[enigma2.git] / lib / gui / einput.h

diff --git a/lib/gui/einput.h b/lib/gui/einput.h
index b742a6d8655eed6efd892a58313ee37fb26448a5..7c65cc13ec6b5dd65d714d1a914339b979702e4e 100644 (file)
--- a/lib/gui/einput.h
+++ b/lib/gui/einput.h
@@ -1,12 +1,12 @@
 #ifndef __lib_gui_einput_h
 #define __lib_gui_einput_h
 
 #ifndef __lib_gui_einput_h
 #define __lib_gui_einput_h
 

-#include <lib/gui/elabel.h>
+#include <lib/gui/ewidget.h>

 #include <lib/python/connections.h>
 
 class eInputContent;
 
 #include <lib/python/connections.h>
 
 class eInputContent;
 

-class eInput: public eLabel
+class eInput: public eWidget

 {
 public:
        eInput(eWidget *parent);
 {
 public:
        eInput(eWidget *parent);


@@ -20,13 +20,20 @@ public:
                moveRight, 
                moveHome, 
                moveEnd,
                moveRight, 
                moveHome, 
                moveEnd,

-               deleteChar
+               deleteForward,
+               deleteBackward,
+               toggleOverwrite,
+               accept

        };
        
        void setContent(eInputContent *cnt);
        
        };
        
        void setContent(eInputContent *cnt);
        

-       int getNumber();
+       void setOverwriteMode(int o);
+       
+       void setFont(gFont *font);

 protected:
 protected:

+       ePtr<gFont> m_font;
+       int m_mode, m_have_focus;

        ePtr<eInputContent> m_content;
        int event(int event, void *data=0, void *data2=0);
 };
        ePtr<eInputContent> m_content;
        int event(int event, void *data=0, void *data2=0);
 };


@@ -47,34 +54,19 @@ public:
                dirUser
        };
        virtual void moveCursor(int dir)=0;
                dirUser
        };
        virtual void moveCursor(int dir)=0;

+       
+       enum {
+               deleteForward, deleteBackward
+       };
+       virtual void deleteChar(int dir)=0;
+       

                /* no movement keys except stuff like '.' or so*/
                /* no movement keys except stuff like '.' or so*/

-       virtual int haveKey(int code)=0;
+       virtual int haveKey(int code, int overwrite)=0;

        
        virtual int isValid()=0;
        
        virtual int isValid()=0;

+       virtual void validate()=0;

 protected:
        eInput *m_input;
 };
 
 protected:
        eInput *m_input;
 };
 

-class eInputContentNumber: public eInputContent
-{
-       DECLARE_REF(eInputContentNumber);
-public:
-       eInputContentNumber(int cur, int min, int max);
-
-       void getDisplay(std::string &res, int &cursor);
-       void moveCursor(int dir);
-       int haveKey(int code);
-       int isValid();
-       
-private:
-       void recalcLen();
-       
-       void insertDigit(int pos, int dig);
-       
-       int m_value;
-       int m_cursor, m_len;
-       
-       int m_min, m_max;
-};
-

 #endif
 #endif