author | zautrix <zautrix> | 2005-03-20 20:53:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-20 20:53:07 (UTC) |
commit | e0351d382e7344191c3a7963eefe3396f816f7a0 (patch) (unidiff) | |
tree | 69d5e8fc038387ab16e17fe8e9a3550abc59e5fa | |
parent | b32c8de5dcd6c4f8dce9415fb686970e2c991ebb (diff) | |
download | kdepimpi-e0351d382e7344191c3a7963eefe3396f816f7a0.zip kdepimpi-e0351d382e7344191c3a7963eefe3396f816f7a0.tar.gz kdepimpi-e0351d382e7344191c3a7963eefe3396f816f7a0.tar.bz2 |
nf
-rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ab59d00..96ced08 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1840,49 +1840,49 @@ void CalendarView::readSettings() | |||
1840 | if ( !resetval ){// i.e. sizes.count() == 3 | 1840 | if ( !resetval ){// i.e. sizes.count() == 3 |
1841 | if ( KOPrefs::instance()->mVerticalScreen ) { | 1841 | if ( KOPrefs::instance()->mVerticalScreen ) { |
1842 | if ( sizes[0] < mDateNavigator->sizeHint().width()+1 ) | 1842 | if ( sizes[0] < mDateNavigator->sizeHint().width()+1 ) |
1843 | resetval = mDateNavigator->sizeHint().width()+2; | 1843 | resetval = mDateNavigator->sizeHint().width()+2; |
1844 | } else { | 1844 | } else { |
1845 | if ( sizes[0] < mDateNavigator->sizeHint().height()+1 ) | 1845 | if ( sizes[0] < mDateNavigator->sizeHint().height()+1 ) |
1846 | resetval = mDateNavigator->sizeHint().height()+2; | 1846 | resetval = mDateNavigator->sizeHint().height()+2; |
1847 | } | 1847 | } |
1848 | } | 1848 | } |
1849 | if ( resetval ) { | 1849 | if ( resetval ) { |
1850 | sizes.clear(); | 1850 | sizes.clear(); |
1851 | if ( KOPrefs::instance()->mVerticalScreen ) { | 1851 | if ( KOPrefs::instance()->mVerticalScreen ) { |
1852 | maxVal = QApplication::desktop()->width() -10; | 1852 | maxVal = QApplication::desktop()->width() -10; |
1853 | } else { | 1853 | } else { |
1854 | maxVal = QApplication::desktop()->height()-10; | 1854 | maxVal = QApplication::desktop()->height()-10; |
1855 | } | 1855 | } |
1856 | sizes << resetval; | 1856 | sizes << resetval; |
1857 | if ( maxVal < resetval + resetval) | 1857 | if ( maxVal < resetval + resetval) |
1858 | resetval = maxVal - resetval; | 1858 | resetval = maxVal - resetval; |
1859 | sizes << resetval; | 1859 | sizes << resetval; |
1860 | sizes << 100; | 1860 | sizes << 100; |
1861 | } | 1861 | } |
1862 | mLeftFrame->setSizes(sizes); | 1862 | mLeftFrame->setSizes(sizes); |
1863 | sizes = config->readIntListEntry("Main Splitter Frame"); | 1863 | sizes = config->readIntListEntry("Main Splitter Frame"); |
1864 | if (sizes.count() != 3) { | 1864 | if (sizes.count() != 2) { |
1865 | if ( !KOPrefs::instance()->mVerticalScreen ) { | 1865 | if ( !KOPrefs::instance()->mVerticalScreen ) { |
1866 | resetval = mDateNavigator->sizeHint().width()+2; | 1866 | resetval = mDateNavigator->sizeHint().width()+2; |
1867 | } else { | 1867 | } else { |
1868 | resetval = mDateNavigator->sizeHint().height()+2; | 1868 | resetval = mDateNavigator->sizeHint().height()+2; |
1869 | } | 1869 | } |
1870 | } | 1870 | } |
1871 | if ( !resetval ){// i.e. sizes.count() == 3 | 1871 | if ( !resetval ){// i.e. sizes.count() == 3 |
1872 | if ( !KOPrefs::instance()->mVerticalScreen ) { | 1872 | if ( !KOPrefs::instance()->mVerticalScreen ) { |
1873 | if ( sizes[0] < mDateNavigator->sizeHint().width()+1 ) | 1873 | if ( sizes[0] < mDateNavigator->sizeHint().width()+1 ) |
1874 | resetval = mDateNavigator->sizeHint().width()+2; | 1874 | resetval = mDateNavigator->sizeHint().width()+2; |
1875 | } else { | 1875 | } else { |
1876 | if ( sizes[0] < mDateNavigator->sizeHint().height()+1 ) | 1876 | if ( sizes[0] < mDateNavigator->sizeHint().height()+1 ) |
1877 | resetval = mDateNavigator->sizeHint().height()+2; | 1877 | resetval = mDateNavigator->sizeHint().height()+2; |
1878 | } | 1878 | } |
1879 | } | 1879 | } |
1880 | if ( resetval ) { | 1880 | if ( resetval ) { |
1881 | sizes.clear(); | 1881 | sizes.clear(); |
1882 | if ( !KOPrefs::instance()->mVerticalScreen ) { | 1882 | if ( !KOPrefs::instance()->mVerticalScreen ) { |
1883 | maxVal = QApplication::desktop()->width() -10; | 1883 | maxVal = QApplication::desktop()->width() -10; |
1884 | } else { | 1884 | } else { |
1885 | maxVal = QApplication::desktop()->height()-10; | 1885 | maxVal = QApplication::desktop()->height()-10; |
1886 | } | 1886 | } |
1887 | sizes << resetval; | 1887 | sizes << resetval; |
1888 | if ( maxVal < resetval + resetval) | 1888 | if ( maxVal < resetval + resetval) |
@@ -1942,50 +1942,50 @@ void CalendarView::readSettings() | |||
1942 | #endif | 1942 | #endif |
1943 | 1943 | ||
1944 | } | 1944 | } |
1945 | 1945 | ||
1946 | 1946 | ||
1947 | void CalendarView::writeSettings() | 1947 | void CalendarView::writeSettings() |
1948 | { | 1948 | { |
1949 | // kdDebug() << "CalendarView::writeSettings" << endl; | 1949 | // kdDebug() << "CalendarView::writeSettings" << endl; |
1950 | 1950 | ||
1951 | KConfig *config = KOGlobals::config(); | 1951 | KConfig *config = KOGlobals::config(); |
1952 | 1952 | ||
1953 | mViewManager->writeSettings( config ); | 1953 | mViewManager->writeSettings( config ); |
1954 | mTodoList->saveLayout(config,QString("Todo Layout")); | 1954 | mTodoList->saveLayout(config,QString("Todo Layout")); |
1955 | mDialogManager->writeSettings( config ); | 1955 | mDialogManager->writeSettings( config ); |
1956 | //KOPrefs::instance()->usrWriteConfig(); | 1956 | //KOPrefs::instance()->usrWriteConfig(); |
1957 | KOPrefs::instance()->writeConfig(); | 1957 | KOPrefs::instance()->writeConfig(); |
1958 | 1958 | ||
1959 | writeFilterSettings(config); | 1959 | writeFilterSettings(config); |
1960 | 1960 | ||
1961 | config->setGroup( "Views" ); | 1961 | config->setGroup( "Views" ); |
1962 | config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() ); | 1962 | config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() ); |
1963 | 1963 | ||
1964 | QValueList<int> listINT = mLeftFrame->sizes(); | 1964 | QValueList<int> listINT = mLeftFrame->sizes(); |
1965 | config->writeEntry("Left Splitter Frame",listINT); | 1965 | config->writeEntry("Left Splitter Frame",listINT); |
1966 | listINT = mMainFrame->sizes(); | 1966 | QValueList<int> listINT2 = mMainFrame->sizes(); |
1967 | config->writeEntry("Main Splitter Frame",listINT); | 1967 | config->writeEntry("Main Splitter Frame",listINT2); |
1968 | #ifdef DESKTOP_VERSION | 1968 | #ifdef DESKTOP_VERSION |
1969 | config->setGroup("WidgetLayout"); | 1969 | config->setGroup("WidgetLayout"); |
1970 | QStringList list ;//= config->readListEntry("MainLayout"); | 1970 | QStringList list ;//= config->readListEntry("MainLayout"); |
1971 | int x,y,w,h; | 1971 | int x,y,w,h; |
1972 | QWidget* wid; | 1972 | QWidget* wid; |
1973 | wid = topLevelWidget(); | 1973 | wid = topLevelWidget(); |
1974 | x = wid->geometry().x(); | 1974 | x = wid->geometry().x(); |
1975 | y = wid->geometry().y(); | 1975 | y = wid->geometry().y(); |
1976 | w = wid->width(); | 1976 | w = wid->width(); |
1977 | h = wid->height(); | 1977 | h = wid->height(); |
1978 | list.clear(); | 1978 | list.clear(); |
1979 | list << QString::number( x ); | 1979 | list << QString::number( x ); |
1980 | list << QString::number( y ); | 1980 | list << QString::number( y ); |
1981 | list << QString::number( w ); | 1981 | list << QString::number( w ); |
1982 | list << QString::number( h ); | 1982 | list << QString::number( h ); |
1983 | config->writeEntry("MainLayout",list ); | 1983 | config->writeEntry("MainLayout",list ); |
1984 | 1984 | ||
1985 | wid = mEventEditor; | 1985 | wid = mEventEditor; |
1986 | x = wid->geometry().x(); | 1986 | x = wid->geometry().x(); |
1987 | y = wid->geometry().y(); | 1987 | y = wid->geometry().y(); |
1988 | w = wid->width(); | 1988 | w = wid->width(); |
1989 | h = wid->height(); | 1989 | h = wid->height(); |
1990 | list.clear(); | 1990 | list.clear(); |
1991 | list << QString::number( x ); | 1991 | list << QString::number( x ); |