author | waspe <waspe> | 2004-02-22 12:57:58 (UTC) |
---|---|---|
committer | waspe <waspe> | 2004-02-22 12:57:58 (UTC) |
commit | 5bc4dbd932fcfa64773b6e17fe57c665bdcd50b8 (patch) (unidiff) | |
tree | b97f5281b807b4218f437150a4e9082694e7a642 /core/apps/embeddedkonsole/konsole.h | |
parent | 908f9c9f0c68d1c3e5a620a69bbf0d05684e2ab3 (diff) | |
download | opie-5bc4dbd932fcfa64773b6e17fe57c665bdcd50b8.zip opie-5bc4dbd932fcfa64773b6e17fe57c665bdcd50b8.tar.gz opie-5bc4dbd932fcfa64773b6e17fe57c665bdcd50b8.tar.bz2 |
merged changes form qkonsole back into opie-embeddedkonsole (most likely not bugfree !)
Diffstat (limited to 'core/apps/embeddedkonsole/konsole.h') (more/less context) (show whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.h | 80 |
1 files changed, 71 insertions, 9 deletions
diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h index 7d5a908..37babbb 100644 --- a/core/apps/embeddedkonsole/konsole.h +++ b/core/apps/embeddedkonsole/konsole.h | |||
@@ -48,5 +48,10 @@ class Konsole : public QMainWindow | |||
48 | public: | 48 | public: |
49 | static QString appName() { return QString::fromLatin1("embeddedkonsole"); } | 49 | |
50 | static QString appName() | ||
51 | { | ||
52 | return QString::fromLatin1("embeddedkonsole"); | ||
53 | } | ||
50 | 54 | ||
51 | Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); | 55 | Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); |
56 | Konsole(const char * name, const char* pgm, QStrList & _args, int histon); | ||
52 | ~Konsole(); | 57 | ~Konsole(); |
@@ -55,10 +60,21 @@ public: | |||
55 | void show(); | 60 | void show(); |
56 | void setColor(); | 61 | void setColor(int); |
57 | int lastSelectedMenu; | 62 | int lastSelectedMenu; |
58 | int startUp; | 63 | int startUp; |
64 | |||
65 | public slots: | ||
66 | void changeFontSize(int); | ||
67 | void toggleFullScreen(); | ||
68 | void setFullScreen(bool); | ||
69 | void changeSession(int); | ||
70 | void cycleZoom(); | ||
71 | void newSession(); | ||
72 | |||
59 | private slots: | 73 | private slots: |
60 | void setDocument(const QString &); | 74 | void setDocument(const QString &); |
61 | void doneSession(TESession*,int); | 75 | void doneSession(TEWidget*,int); |
76 | void changeTitle(TEWidget*,QString); | ||
62 | void changeColumns(int); | 77 | void changeColumns(int); |
63 | void fontChanged(int); | 78 | void setFont(int); |
79 | // void fontChanged(int); | ||
64 | void configMenuSelected(int ); | 80 | void configMenuSelected(int ); |
@@ -66,2 +82,5 @@ private slots: | |||
66 | void colorMenuIsSelected(int); | 82 | void colorMenuIsSelected(int); |
83 | void tabMenuSelected(int); | ||
84 | void sessionListSelected(int); | ||
85 | |||
67 | void enterCommand(int); | 86 | void enterCommand(int); |
@@ -74,3 +93,2 @@ private slots: | |||
74 | void switchSession(QWidget *); | 93 | void switchSession(QWidget *); |
75 | void newSession(); | ||
76 | void changeCommand(const QString &, int); | 94 | void changeCommand(const QString &, int); |
@@ -82,2 +100,6 @@ private slots: | |||
82 | void changeBackgroundColor(const QColor &); | 100 | void changeBackgroundColor(const QColor &); |
101 | |||
102 | void historyDialog(); | ||
103 | void fullscreenTimeout(); | ||
104 | |||
83 | private: | 105 | private: |
@@ -89,2 +111,4 @@ private: | |||
89 | void setHistory(bool); | 111 | void setHistory(bool); |
112 | void setColors(QColor foreground, QColor background); | ||
113 | int findFont(QString name, int size, bool exact = false); | ||
90 | QSize calcSize(int columns, int lines); | 114 | QSize calcSize(int columns, int lines); |
@@ -95,2 +119,5 @@ private: | |||
95 | bool fromMenu; | 119 | bool fromMenu; |
120 | |||
121 | bool fullscreen; | ||
122 | |||
96 | private: | 123 | private: |
@@ -99,3 +126,3 @@ private: | |||
99 | public: | 126 | public: |
100 | VTFont(QString name, QFont& font) | 127 | VTFont(QString name, QFont& font, QString family, int familyNum, int size) |
101 | { | 128 | { |
@@ -103,2 +130,5 @@ private: | |||
103 | this->font = font; | 130 | this->font = font; |
131 | this->family = family; | ||
132 | this->size = size; | ||
133 | this->familyNum = familyNum; | ||
104 | } | 134 | } |
@@ -109,3 +139,2 @@ private: | |||
109 | } | 139 | } |
110 | |||
111 | QString getName() | 140 | QString getName() |
@@ -114,6 +143,21 @@ private: | |||
114 | } | 143 | } |
144 | int getSize() | ||
145 | { | ||
146 | return(size); | ||
147 | } | ||
148 | QString getFamily() | ||
149 | { | ||
150 | return(family); | ||
151 | } | ||
152 | int getFamilyNum() | ||
153 | { | ||
154 | return(familyNum); | ||
155 | } | ||
115 | 156 | ||
116 | private: | 157 | private: |
117 | QString name; | ||
118 | QFont font; | 158 | QFont font; |
159 | QString name; | ||
160 | QString family; | ||
161 | int familyNum; | ||
162 | int size; | ||
119 | }; | 163 | }; |
@@ -121,2 +165,3 @@ private: | |||
121 | EKNumTabWidget* tab; | 165 | EKNumTabWidget* tab; |
166 | int tabPos; | ||
122 | int nsessions; | 167 | int nsessions; |
@@ -127,4 +172,21 @@ private: | |||
127 | 172 | ||
128 | QPopupMenu *fontList,*configMenu,*colorMenu,*scrollMenu,*editCommandListMenu; | 173 | QToolBar *menuToolBar; |
174 | QToolBar *toolBar; | ||
129 | QComboBox *commonCombo; | 175 | QComboBox *commonCombo; |
176 | |||
177 | QPopupMenu *fontList,*configMenu,*colorMenu,*scrollMenu,*editCommandListMenu; | ||
178 | QPopupMenu *sessionList, *tabMenu; | ||
179 | |||
180 | int sm_none, sm_left, sm_right; | ||
181 | int cm_beep, cm_wrap; | ||
182 | int cm_default; | ||
183 | int cm_bw, cm_wb, cm_gb, cm_bt, cm_br, cm_rb, cm_gy, cm_bm, cm_mb, cm_cw, cm_wc, cm_bb, cm_ab; | ||
184 | int tm_top, tm_bottom, tm_hidden; | ||
185 | int ec_edit, ec_cmdlist, ec_quick; | ||
186 | |||
187 | bool show_fullscreen_msg; | ||
188 | QTimer *fullscreen_timer; | ||
189 | QLabel *fullscreen_msg; | ||
190 | |||
191 | |||
130 | // history scrolling I think | 192 | // history scrolling I think |