author | sandman <sandman> | 2002-10-31 03:07:50 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-31 03:07:50 (UTC) |
commit | d9d6cc6b3a537439affc8095dedd046c86f09d9e (patch) (unidiff) | |
tree | 3b18a42dfc9f32eecc799104b3fea201ff8a14ba /core/settings/launcher/tabconfig.h | |
parent | 035eaf63bb2156ea7facd6b50f8891503d1f7bed (diff) | |
download | opie-d9d6cc6b3a537439affc8095dedd046c86f09d9e.zip opie-d9d6cc6b3a537439affc8095dedd046c86f09d9e.tar.gz opie-d9d6cc6b3a537439affc8095dedd046c86f09d9e.tar.bz2 |
- added a "[x] Use custom font" checkbox -- if this is not checked
(default), then launcher uses the global font for the tabs.
- reworked the internal handling of "All tabs", to make it possible to use
this information for newly added tabs (still missing)
Diffstat (limited to 'core/settings/launcher/tabconfig.h') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/launcher/tabconfig.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h index eebfd36..9086341 100644 --- a/core/settings/launcher/tabconfig.h +++ b/core/settings/launcher/tabconfig.h | |||
@@ -40,12 +40,13 @@ struct TabConfig { | |||
40 | 40 | ||
41 | ViewMode m_view; | 41 | ViewMode m_view; |
42 | BackgroundType m_bg_type; | 42 | BackgroundType m_bg_type; |
43 | QString m_bg_image; | 43 | QString m_bg_image; |
44 | QString m_bg_color; | 44 | QString m_bg_color; |
45 | QString m_text_color; | 45 | QString m_text_color; |
46 | bool m_font_use; | ||
46 | QString m_font_family; | 47 | QString m_font_family; |
47 | int m_font_size; | 48 | int m_font_size; |
48 | int m_font_weight; | 49 | int m_font_weight; |
49 | bool m_font_italic; | 50 | bool m_font_italic; |
50 | bool m_changed; | 51 | bool m_changed; |
51 | 52 | ||
@@ -53,14 +54,18 @@ struct TabConfig { | |||
53 | { | 54 | { |
54 | return ( m_view == tc. m_view ) && | 55 | return ( m_view == tc. m_view ) && |
55 | ( m_bg_type == tc. m_bg_type ) && | 56 | ( m_bg_type == tc. m_bg_type ) && |
56 | ( m_bg_image == tc. m_bg_image ) && | 57 | ( m_bg_image == tc. m_bg_image ) && |
57 | ( m_bg_color == tc. m_bg_color ) && | 58 | ( m_bg_color == tc. m_bg_color ) && |
58 | ( m_text_color == tc. m_text_color ) && | 59 | ( m_text_color == tc. m_text_color ) && |
60 | ( m_font_use == tc. m_font_use ) && | ||
61 | ( m_font_use ? ( | ||
59 | ( m_font_family == tc. m_font_family ) && | 62 | ( m_font_family == tc. m_font_family ) && |
60 | ( m_font_size == tc. m_font_size ) && | 63 | ( m_font_size == tc. m_font_size ) && |
61 | ( m_font_weight == tc. m_font_weight ) && | 64 | ( m_font_weight == tc. m_font_weight ) && |
62 | ( m_font_italic == tc. m_font_italic ); | 65 | ( m_font_italic == tc. m_font_italic ) |
66 | ) : true ); | ||
67 | |||
63 | } | 68 | } |
64 | }; | 69 | }; |
65 | 70 | ||
66 | #endif | 71 | #endif |