| -rw-r--r-- | korganizer/main.cpp | 2 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 4b207d9..ee9589c 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -76,16 +76,18 @@ int main( int argc, char **argv ) #ifndef DESKTOP_VERSION fileName = getenv("QPEDIR"); KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/"); #else fileName = qApp->applicationDirPath () + "/kdepim/korganizer/"; KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); #endif KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer"))); + + QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); MainWindow m; #ifndef DESKTOP_VERSION QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); a.showMainWidget(&m ); #else a.setMainWidget(&m ); m.show(); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 18a4b12..ab0e4d6 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -127,21 +127,17 @@ public: QCheckBox* mWriteBackFuture; QSpinBox* mWriteBackFutureWeeks; }; int globalFlagBlockStartup; MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : QMainWindow( parent, name ) { - - -#ifdef DESKTOP_VERSION - setFont( QFont("Arial"), 14 ); -#endif + mClosed = false; //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; QString confFile = locateLocal("config","korganizerrc"); QFileInfo finf ( confFile ); bool showWarning = !finf.exists(); setIcon(SmallIcon( "ko24" ) ); mBlockAtStartup = true; mFlagKeyPressed = false; |