-rw-r--r-- | korganizer/calendarview.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 8100e25..9a4e719 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1881,15 +1881,6 @@ void CalendarView::readSettings() | |||
1881 | resetval = mDateNavigator->sizeHint().height()+2; | 1881 | resetval = mDateNavigator->sizeHint().height()+2; |
1882 | } | 1882 | } |
1883 | } | 1883 | } |
1884 | if ( !resetval ){// i.e. sizes.count() == 3 | ||
1885 | if ( KOPrefs::instance()->mVerticalScreen ) { | ||
1886 | if ( sizes[0] < mDateNavigator->sizeHint().width()+1 ) | ||
1887 | resetval = mDateNavigator->sizeHint().width()+2; | ||
1888 | } else { | ||
1889 | if ( sizes[0] < mDateNavigator->sizeHint().height()+1 ) | ||
1890 | resetval = mDateNavigator->sizeHint().height()+2; | ||
1891 | } | ||
1892 | } | ||
1893 | if ( resetval ) { | 1884 | if ( resetval ) { |
1894 | sizes.clear(); | 1885 | sizes.clear(); |
1895 | if ( KOPrefs::instance()->mVerticalScreen ) { | 1886 | if ( KOPrefs::instance()->mVerticalScreen ) { |
@@ -1905,6 +1896,8 @@ void CalendarView::readSettings() | |||
1905 | } | 1896 | } |
1906 | mLeftFrame->setSizes(sizes); | 1897 | mLeftFrame->setSizes(sizes); |
1907 | sizes = config->readIntListEntry("Main Splitter Frame"); | 1898 | sizes = config->readIntListEntry("Main Splitter Frame"); |
1899 | resetval = 0; | ||
1900 | maxVal = 0; | ||
1908 | if (sizes.count() != 2) { | 1901 | if (sizes.count() != 2) { |
1909 | if ( !KOPrefs::instance()->mVerticalScreen ) { | 1902 | if ( !KOPrefs::instance()->mVerticalScreen ) { |
1910 | resetval = mDateNavigator->sizeHint().width()+2; | 1903 | resetval = mDateNavigator->sizeHint().width()+2; |
@@ -1912,15 +1905,6 @@ void CalendarView::readSettings() | |||
1912 | resetval = mDateNavigator->sizeHint().height()+2; | 1905 | resetval = mDateNavigator->sizeHint().height()+2; |
1913 | } | 1906 | } |
1914 | } | 1907 | } |
1915 | if ( !resetval ){// i.e. sizes.count() == 3 | ||
1916 | if ( !KOPrefs::instance()->mVerticalScreen ) { | ||
1917 | if ( sizes[0] < mDateNavigator->sizeHint().width()+1 ) | ||
1918 | resetval = mDateNavigator->sizeHint().width()+2; | ||
1919 | } else { | ||
1920 | if ( sizes[0] < mDateNavigator->sizeHint().height()+1 ) | ||
1921 | resetval = mDateNavigator->sizeHint().height()+2; | ||
1922 | } | ||
1923 | } | ||
1924 | if ( resetval ) { | 1908 | if ( resetval ) { |
1925 | sizes.clear(); | 1909 | sizes.clear(); |
1926 | if ( !KOPrefs::instance()->mVerticalScreen ) { | 1910 | if ( !KOPrefs::instance()->mVerticalScreen ) { |