author | hash <hash> | 2002-11-27 09:53:25 (UTC) |
---|---|---|
committer | hash <hash> | 2002-11-27 09:53:25 (UTC) |
commit | 796b942cc070da91982689eb6e50b1e1e776c5ed (patch) (unidiff) | |
tree | e0c1733ca8f5fa9721af101f3db689c5cf0392dd | |
parent | e52158d2f9e1fdc9766d991dc672729648d5a020 (diff) | |
download | opie-796b942cc070da91982689eb6e50b1e1e776c5ed.zip opie-796b942cc070da91982689eb6e50b1e1e776c5ed.tar.gz opie-796b942cc070da91982689eb6e50b1e1e776c5ed.tar.bz2 |
now saving profiles works! yay!
-rw-r--r-- | inputmethods/handwriting/qimpensetup.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp index 10c136d..2441102 100644 --- a/inputmethods/handwriting/qimpensetup.cpp +++ b/inputmethods/handwriting/qimpensetup.cpp | |||
@@ -93,7 +93,8 @@ QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent, | |||
93 | 93 | ||
94 | QVBoxLayout *vb = new QVBoxLayout( this ); | 94 | QVBoxLayout *vb = new QVBoxLayout( this ); |
95 | 95 | ||
96 | #if 0 | 96 | #define MULTIPROFILE |
97 | #ifdef MULTIPROFILE | ||
97 | profileList.setAutoDelete( true ); | 98 | profileList.setAutoDelete( true ); |
98 | QHBoxLayout *hb = new QHBoxLayout( vb ); | 99 | QHBoxLayout *hb = new QHBoxLayout( vb ); |
99 | hb->setMargin( 6 ); | 100 | hb->setMargin( 6 ); |
@@ -103,11 +104,12 @@ QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent, | |||
103 | connect( profileCombo, SIGNAL(activated(const QString &)), | 104 | connect( profileCombo, SIGNAL(activated(const QString &)), |
104 | this, SLOT(selectProfile(const QString &)) ); | 105 | this, SLOT(selectProfile(const QString &)) ); |
105 | hb->addWidget( profileCombo ); | 106 | hb->addWidget( profileCombo ); |
106 | loadProfiles(); | ||
107 | #else | 107 | #else |
108 | profileList.append( profile ); | 108 | profileList.append( profile ); |
109 | #endif | 109 | #endif |
110 | 110 | ||
111 | qWarning("profiles: %d", profileList.count()); | ||
112 | |||
111 | QTabWidget *tw = new QTabWidget( this ); | 113 | QTabWidget *tw = new QTabWidget( this ); |
112 | vb->addWidget( tw ); | 114 | vb->addWidget( tw ); |
113 | 115 | ||
@@ -130,6 +132,10 @@ QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent, | |||
130 | 132 | ||
131 | edit = new QIMPenEdit( p, tw ); | 133 | edit = new QIMPenEdit( p, tw ); |
132 | tw->addTab( edit, tr("Customize") ); | 134 | tw->addTab( edit, tr("Customize") ); |
135 | #ifdef MULTIPROFILE | ||
136 | loadProfiles(); | ||
137 | #endif | ||
138 | |||
133 | } | 139 | } |
134 | 140 | ||
135 | void QIMPenSetup::loadProfiles() | 141 | void QIMPenSetup::loadProfiles() |
@@ -145,6 +151,7 @@ void QIMPenSetup::loadProfiles() | |||
145 | if ( p->name() == profile->name() ) { | 151 | if ( p->name() == profile->name() ) { |
146 | profileCombo->setCurrentItem( profileCombo->count()-1 ); | 152 | profileCombo->setCurrentItem( profileCombo->count()-1 ); |
147 | profile = p; | 153 | profile = p; |
154 | edit->setProfile( profile ); | ||
148 | } | 155 | } |
149 | } | 156 | } |
150 | } | 157 | } |
@@ -563,6 +570,7 @@ void QIMPenEdit::addChar() | |||
563 | 570 | ||
564 | // User characters override all matching system characters. | 571 | // User characters override all matching system characters. |
565 | // Copy and mark deleted identical system characters. | 572 | // Copy and mark deleted identical system characters. |
573 | |||
566 | QIMPenCharIterator it(currentSet->characters() ); | 574 | QIMPenCharIterator it(currentSet->characters() ); |
567 | QIMPenChar *sc = 0; | 575 | QIMPenChar *sc = 0; |
568 | while ( (sc = it.current()) != 0 ) { | 576 | while ( (sc = it.current()) != 0 ) { |