summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 96ced08..90b36ac 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1802,48 +1802,91 @@ void CalendarView::readSettings()
1802 // read settings from the KConfig, supplying reasonable 1802 // read settings from the KConfig, supplying reasonable
1803 // defaults where none are to be found 1803 // defaults where none are to be found
1804 KConfig *config = KOGlobals::config(); 1804 KConfig *config = KOGlobals::config();
1805#ifndef KORG_NOSPLITTER 1805#ifndef KORG_NOSPLITTER
1806 config->setGroup("KOrganizer Geometry"); 1806 config->setGroup("KOrganizer Geometry");
1807 1807
1808 QValueList<int> sizes = config->readIntListEntry("Separator1"); 1808 QValueList<int> sizes = config->readIntListEntry("Separator1");
1809 if (sizes.count() != 2) { 1809 if (sizes.count() != 2) {
1810 sizes << mDateNavigator->minimumSizeHint().width(); 1810 sizes << mDateNavigator->minimumSizeHint().width();
1811 sizes << 300; 1811 sizes << 300;
1812 } 1812 }
1813 mPanner->setSizes(sizes); 1813 mPanner->setSizes(sizes);
1814 1814
1815 sizes = config->readIntListEntry("Separator2"); 1815 sizes = config->readIntListEntry("Separator2");
1816 if ( ( mResourceView && sizes.count() == 4 ) || 1816 if ( ( mResourceView && sizes.count() == 4 ) ||
1817 ( !mResourceView && sizes.count() == 3 ) ) { 1817 ( !mResourceView && sizes.count() == 3 ) ) {
1818 mLeftSplitter->setSizes(sizes); 1818 mLeftSplitter->setSizes(sizes);
1819 } 1819 }
1820#endif 1820#endif
1821 globalFlagBlockAgenda = 1; 1821 globalFlagBlockAgenda = 1;
1822 mViewManager->showAgendaView(); 1822 mViewManager->showAgendaView();
1823 //mViewManager->readSettings( config ); 1823 //mViewManager->readSettings( config );
1824 mTodoList->restoreLayout(config,QString("Todo Layout")); 1824 mTodoList->restoreLayout(config,QString("Todo Layout"));
1825 readFilterSettings(config); 1825 readFilterSettings(config);
1826
1827#ifdef DESKTOP_VERSION
1828 config->setGroup("WidgetLayout");
1829 QStringList list;
1830 list = config->readListEntry("MainLayout");
1831 int x,y,w,h;
1832 if ( ! list.isEmpty() ) {
1833 x = list[0].toInt();
1834 y = list[1].toInt();
1835 w = list[2].toInt();
1836 h = list[3].toInt();
1837 topLevelWidget()->setGeometry(x,y,w,h);
1838
1839 } else {
1840 topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
1841 }
1842 list = config->readListEntry("EditEventLayout");
1843 if ( ! list.isEmpty() ) {
1844 x = list[0].toInt();
1845 y = list[1].toInt();
1846 w = list[2].toInt();
1847 h = list[3].toInt();
1848 mEventEditor->setGeometry(x,y,w,h);
1849
1850 }
1851 list = config->readListEntry("EditTodoLayout");
1852 if ( ! list.isEmpty() ) {
1853 x = list[0].toInt();
1854 y = list[1].toInt();
1855 w = list[2].toInt();
1856 h = list[3].toInt();
1857 mTodoEditor->setGeometry(x,y,w,h);
1858
1859 }
1860 list = config->readListEntry("ViewerLayout");
1861 if ( ! list.isEmpty() ) {
1862 x = list[0].toInt();
1863 y = list[1].toInt();
1864 w = list[2].toInt();
1865 h = list[3].toInt();
1866 getEventViewerDialog()->setGeometry(x,y,w,h);
1867 }
1868#endif
1826 config->setGroup( "Views" ); 1869 config->setGroup( "Views" );
1827 int dateCount = config->readNumEntry( "ShownDatesCount", 7 ); 1870 int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
1828 1871
1829 QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame"); 1872 QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
1830 1873
1831 int resetval = 0; 1874 int resetval = 0;
1832 int maxVal = 0; 1875 int maxVal = 0;
1833 if (sizes.count() != 3) { 1876 if (sizes.count() != 3) {
1834 if ( KOPrefs::instance()->mVerticalScreen ) { 1877 if ( KOPrefs::instance()->mVerticalScreen ) {
1835 resetval = mDateNavigator->sizeHint().width()+2; 1878 resetval = mDateNavigator->sizeHint().width()+2;
1836 } else { 1879 } else {
1837 resetval = mDateNavigator->sizeHint().height()+2; 1880 resetval = mDateNavigator->sizeHint().height()+2;
1838 } 1881 }
1839 } 1882 }
1840 if ( !resetval ){// i.e. sizes.count() == 3 1883 if ( !resetval ){// i.e. sizes.count() == 3
1841 if ( KOPrefs::instance()->mVerticalScreen ) { 1884 if ( KOPrefs::instance()->mVerticalScreen ) {
1842 if ( sizes[0] < mDateNavigator->sizeHint().width()+1 ) 1885 if ( sizes[0] < mDateNavigator->sizeHint().width()+1 )
1843 resetval = mDateNavigator->sizeHint().width()+2; 1886 resetval = mDateNavigator->sizeHint().width()+2;
1844 } else { 1887 } else {
1845 if ( sizes[0] < mDateNavigator->sizeHint().height()+1 ) 1888 if ( sizes[0] < mDateNavigator->sizeHint().height()+1 )
1846 resetval = mDateNavigator->sizeHint().height()+2; 1889 resetval = mDateNavigator->sizeHint().height()+2;
1847 } 1890 }
1848 } 1891 }
1849 if ( resetval ) { 1892 if ( resetval ) {
@@ -1877,91 +1920,48 @@ void CalendarView::readSettings()
1877 resetval = mDateNavigator->sizeHint().height()+2; 1920 resetval = mDateNavigator->sizeHint().height()+2;
1878 } 1921 }
1879 } 1922 }
1880 if ( resetval ) { 1923 if ( resetval ) {
1881 sizes.clear(); 1924 sizes.clear();
1882 if ( !KOPrefs::instance()->mVerticalScreen ) { 1925 if ( !KOPrefs::instance()->mVerticalScreen ) {
1883 maxVal = QApplication::desktop()->width() -10; 1926 maxVal = QApplication::desktop()->width() -10;
1884 } else { 1927 } else {
1885 maxVal = QApplication::desktop()->height()-10; 1928 maxVal = QApplication::desktop()->height()-10;
1886 } 1929 }
1887 sizes << resetval; 1930 sizes << resetval;
1888 if ( maxVal < resetval + resetval) 1931 if ( maxVal < resetval + resetval)
1889 resetval = maxVal - resetval; 1932 resetval = maxVal - resetval;
1890 sizes << resetval; 1933 sizes << resetval;
1891 } 1934 }
1892 mMainFrame->setSizes(sizes); 1935 mMainFrame->setSizes(sizes);
1893 1936
1894 if ( dateCount == 5 ) mNavigator->selectWorkWeek(); 1937 if ( dateCount == 5 ) mNavigator->selectWorkWeek();
1895 else if ( dateCount == 7 ) mNavigator->selectWeek(); 1938 else if ( dateCount == 7 ) mNavigator->selectWeek();
1896 else mNavigator->selectDates( dateCount ); 1939 else mNavigator->selectDates( dateCount );
1897 // mViewManager->readSettings( config ); 1940 // mViewManager->readSettings( config );
1898 updateConfig(); 1941 updateConfig();
1899 globalFlagBlockAgenda = 2; 1942 globalFlagBlockAgenda = 2;
1900 mViewManager->readSettings( config ); 1943 mViewManager->readSettings( config );
1901#ifdef DESKTOP_VERSION
1902 config->setGroup("WidgetLayout");
1903 QStringList list;
1904 list = config->readListEntry("MainLayout");
1905 int x,y,w,h;
1906 if ( ! list.isEmpty() ) {
1907 x = list[0].toInt();
1908 y = list[1].toInt();
1909 w = list[2].toInt();
1910 h = list[3].toInt();
1911 topLevelWidget()->setGeometry(x,y,w,h);
1912
1913 } else {
1914 topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
1915 }
1916 list = config->readListEntry("EditEventLayout");
1917 if ( ! list.isEmpty() ) {
1918 x = list[0].toInt();
1919 y = list[1].toInt();
1920 w = list[2].toInt();
1921 h = list[3].toInt();
1922 mEventEditor->setGeometry(x,y,w,h);
1923
1924 }
1925 list = config->readListEntry("EditTodoLayout");
1926 if ( ! list.isEmpty() ) {
1927 x = list[0].toInt();
1928 y = list[1].toInt();
1929 w = list[2].toInt();
1930 h = list[3].toInt();
1931 mTodoEditor->setGeometry(x,y,w,h);
1932
1933 }
1934 list = config->readListEntry("ViewerLayout");
1935 if ( ! list.isEmpty() ) {
1936 x = list[0].toInt();
1937 y = list[1].toInt();
1938 w = list[2].toInt();
1939 h = list[3].toInt();
1940 getEventViewerDialog()->setGeometry(x,y,w,h);
1941 }
1942#endif
1943
1944} 1944}
1945 1945
1946 1946
1947void CalendarView::writeSettings() 1947void 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 QValueList<int> listINT2 = mMainFrame->sizes(); 1966 QValueList<int> listINT2 = mMainFrame->sizes();
1967 config->writeEntry("Main Splitter Frame",listINT2); 1967 config->writeEntry("Main Splitter Frame",listINT2);