Changeset 6450 for trunk/qt4-gui/src/config
- Timestamp:
- 07/16/08 23:03:02 (4 months ago)
- Location:
- trunk/qt4-gui/src/config
- Files:
-
- 2 modified
-
general.cpp (modified) (3 diffs)
-
general.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/qt4-gui/src/config/general.cpp
r6239 r6450 81 81 szTemp[0] = '\0'; 82 82 setEditFont(szTemp); 83 iniFile.ReadStr("HistoryFont", szTemp, "default"); 84 if (strcmp(szTemp, "default") == 0) 85 szTemp[0] = '\0'; 86 setHistoryFont(szTemp); 83 87 iniFile.ReadStr("FixedFont", szTemp, "default"); 84 88 if (strcmp(szTemp, "default") == 0) … … 148 152 iniFile.WriteStr("EditFont", myEditFont == myDefaultFont ? 149 153 "default" : myEditFont.toString().toLatin1()); 154 iniFile.WriteStr("HistoryFont", myHistoryFont == myDefaultFont ? 155 "default" : myHistoryFont.toString().toLatin1()); 150 156 iniFile.WriteStr("FixedFont", myFixedFont == myDefaultFixedFont ? 151 157 "default" : myFixedFont.toString().toLatin1()); … … 278 284 } 279 285 286 void Config::General::setHistoryFont(QString historyFont) 287 { 288 QFont f; 289 if (historyFont.isEmpty()) 290 f = myDefaultFont; 291 else 292 f.fromString(historyFont); 293 294 if (f == myHistoryFont) 295 return; 296 297 myHistoryFont = f; 298 if (myBlockUpdates) 299 myFontHasChanged = true; 300 else 301 emit fontChanged(); 302 } 303 280 304 void Config::General::setFixedFont(QString fixedFont) 281 305 { -
trunk/qt4-gui/src/config/general.h
r6239 r6450 83 83 QFont normalFont() const; 84 84 QFont editFont() const { return myEditFont; } 85 QFont historyFont() const { return myHistoryFont; } 85 86 QFont fixedFont() const { return myFixedFont; } 86 87 … … 126 127 void setNormalFont(QString normalFont); 127 128 void setEditFont(QString editFont); 129 void setHistoryFont(QString historyFont); 128 130 void setFixedFont(QString fixedFont); 129 131 … … 204 206 QFont myDefaultFixedFont; 205 207 QFont myEditFont; 208 QFont myHistoryFont; 206 209 QFont myFixedFont; 207 210
