author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (unidiff) | |
tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /core/pim/today/plugins/todolist/todopluginconfig.h | |
parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 |
resolved merge conflict
Diffstat (limited to 'core/pim/today/plugins/todolist/todopluginconfig.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index e09251c..54d35cf 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h | |||
@@ -12,40 +12,41 @@ | |||
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef TODOLIST_PLUGIN_CONFIG_H | 17 | #ifndef TODOLIST_PLUGIN_CONFIG_H |
18 | #define TODOLIST_PLUGIN_CONFIG_H | 18 | #define TODOLIST_PLUGIN_CONFIG_H |
19 | 19 | ||
20 | //#include <qwidget.h> | ||
21 | #include <qspinbox.h> | 20 | #include <qspinbox.h> |
22 | 21 | ||
23 | #include <opie/todayconfigwidget.h> | 22 | #include <opie/todayconfigwidget.h> |
24 | 23 | ||
24 | #include "todopluginconfigbase.h" | ||
25 | |||
25 | class TodolistPluginConfig : public TodayConfigWidget { | 26 | class TodolistPluginConfig : public TodayConfigWidget { |
26 | 27 | ||
27 | Q_OBJECT | 28 | Q_OBJECT |
28 | 29 | ||
29 | public: | 30 | public: |
30 | 31 | ||
31 | TodolistPluginConfig( QWidget *parent, const char *name ); | 32 | TodolistPluginConfig( QWidget *parent, const char *name ); |
32 | ~TodolistPluginConfig(); | 33 | ~TodolistPluginConfig(); |
33 | 34 | ||
34 | private: | 35 | private: |
35 | /** | 36 | /** |
36 | * if changed then save | 37 | * if changed then save |
37 | */ | 38 | */ |
38 | bool changed(); | 39 | bool changed(); |
39 | void readConfig(); | 40 | void readConfig(); |
40 | void writeConfig(); | 41 | void writeConfig(); |
42 | |||
43 | TodoPluginConfigBase *m_gui; | ||
41 | 44 | ||
42 | QSpinBox* SpinBox2; | ||
43 | QSpinBox* SpinBoxClip; | ||
44 | 45 | ||
45 | // how many lines should be showed in the todolist section | 46 | // how many lines should be showed in the todolist section |
46 | int m_max_lines_task; | 47 | int m_max_lines_task; |
47 | // clip the lines after X chars | 48 | // clip the lines after X chars |
48 | int m_maxCharClip; | 49 | int m_maxCharClip; |
49 | 50 | ||
50 | 51 | ||
51 | 52 | ||