-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 | |||
@@ -81,6 +81,8 @@ int main( int argc, char **argv ) | |||
81 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 81 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
82 | #endif | 82 | #endif |
83 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer"))); | 83 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer"))); |
84 | |||
85 | QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); | ||
84 | MainWindow m; | 86 | MainWindow m; |
85 | #ifndef DESKTOP_VERSION | 87 | #ifndef DESKTOP_VERSION |
86 | 88 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 18a4b12..ab0e4d6 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -132,11 +132,7 @@ int globalFlagBlockStartup; | |||
132 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 132 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
133 | QMainWindow( parent, name ) | 133 | QMainWindow( parent, name ) |
134 | { | 134 | { |
135 | 135 | ||
136 | |||
137 | #ifdef DESKTOP_VERSION | ||
138 | setFont( QFont("Arial"), 14 ); | ||
139 | #endif | ||
140 | mClosed = false; | 136 | mClosed = false; |
141 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 137 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
142 | QString confFile = locateLocal("config","korganizerrc"); | 138 | QString confFile = locateLocal("config","korganizerrc"); |