author | sandman <sandman> | 2002-09-23 22:41:28 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-23 22:41:28 (UTC) |
commit | 44e815d58c7565eccab2bd585923e343b70ac0f3 (patch) (unidiff) | |
tree | 3f8529224432f46f7a2a1f1fd0a15778d43d6e3e /noncore/settings/appearance2/appearance.h | |
parent | 074769a4adb816153e47d63087e9e326bd3a04bf (diff) | |
download | opie-44e815d58c7565eccab2bd585923e343b70ac0f3.zip opie-44e815d58c7565eccab2bd585923e343b70ac0f3.tar.gz opie-44e815d58c7565eccab2bd585923e343b70ac0f3.tar.bz2 |
- minor bugfixes
- fileselector is now in libopie as OFileSelector
Diffstat (limited to 'noncore/settings/appearance2/appearance.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/appearance2/appearance.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h index ce0d4b0..4a86e57 100644 --- a/noncore/settings/appearance2/appearance.h +++ b/noncore/settings/appearance2/appearance.h | |||
@@ -40,6 +40,7 @@ class QPushButton; | |||
40 | class QRadioButton; | 40 | class QRadioButton; |
41 | class QToolButton; | 41 | class QToolButton; |
42 | class SampleWindow; | 42 | class SampleWindow; |
43 | class OFontSelector; | ||
43 | 44 | ||
44 | class Appearance : public QDialog | 45 | class Appearance : public QDialog |
45 | { | 46 | { |
@@ -57,11 +58,8 @@ protected slots: | |||
57 | void styleClicked ( int ); | 58 | void styleClicked ( int ); |
58 | void styleSettingsClicked ( ); | 59 | void styleSettingsClicked ( ); |
59 | void decoClicked ( int ); | 60 | void decoClicked ( int ); |
60 | void fontFamilyClicked ( int ); | 61 | void fontClicked ( const QFont & ); |
61 | void fontStyleClicked ( int ); | ||
62 | void fontSizeClicked ( int ); | ||
63 | void colorClicked ( int ); | 62 | void colorClicked ( int ); |
64 | // void tabStyleClicked ( int ); | ||
65 | 63 | ||
66 | void editSchemeClicked(); | 64 | void editSchemeClicked(); |
67 | void saveSchemeClicked(); | 65 | void saveSchemeClicked(); |
@@ -70,7 +68,6 @@ protected slots: | |||
70 | private: | 68 | private: |
71 | void loadStyles ( QListBox * ); | 69 | void loadStyles ( QListBox * ); |
72 | void loadDecos ( QListBox * ); | 70 | void loadDecos ( QListBox * ); |
73 | void loadFonts ( QListBox * ); | ||
74 | void loadColors ( QListBox * ); | 71 | void loadColors ( QListBox * ); |
75 | 72 | ||
76 | void changeText(); | 73 | void changeText(); |
@@ -90,10 +87,8 @@ private: | |||
90 | 87 | ||
91 | int m_original_style; | 88 | int m_original_style; |
92 | int m_original_deco; | 89 | int m_original_deco; |
93 | int m_original_fontfamily; | ||
94 | int m_original_fontstyle; | ||
95 | int m_original_fontsize; | ||
96 | int m_original_tabstyle; | 90 | int m_original_tabstyle; |
91 | bool m_original_tabpos; | ||
97 | 92 | ||
98 | QListBox * m_style_list; | 93 | QListBox * m_style_list; |
99 | QPushButton * m_style_settings; | 94 | QPushButton * m_style_settings; |
@@ -102,9 +97,7 @@ private: | |||
102 | 97 | ||
103 | QListBox * m_color_list; | 98 | QListBox * m_color_list; |
104 | 99 | ||
105 | QListBox * m_font_family_list; | 100 | OFontSelector *m_fontselect; |
106 | QComboBox * m_font_style_list; | ||
107 | QComboBox * m_font_size_list; | ||
108 | 101 | ||
109 | SampleWindow *m_sample; | 102 | SampleWindow *m_sample; |
110 | 103 | ||
@@ -113,4 +106,4 @@ private: | |||
113 | QRadioButton *m_tabstyle_bottom; | 106 | QRadioButton *m_tabstyle_bottom; |
114 | }; | 107 | }; |
115 | 108 | ||
116 | #endif // APPEARANCESETTINGS_H | 109 | #endif |