author | zautrix <zautrix> | 2005-01-18 23:10:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-18 23:10:44 (UTC) |
commit | c626089f47244d0c0a9ba73bcd12f42927acb28f (patch) (unidiff) | |
tree | 2f0ca8591dab470ed3ddd6c2af860c2a8081db97 | |
parent | bfb2947510c52f9c6b35c35786490f261adf30e3 (diff) | |
download | kdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.zip kdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.tar.gz kdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.tar.bz2 |
fix
-rw-r--r-- | kaddressbook/kabcore.cpp | 2 | ||||
-rw-r--r-- | microkde/kdecore/klocale.cpp | 2 | ||||
-rw-r--r-- | microkde/kresources/configpage.cpp | 7 | ||||
-rw-r--r-- | microkde/kresources/configwidget.h | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index e88706e..505cbf4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1717,257 +1717,257 @@ void KABCore::initGUI() | |||
1717 | mExtensionBarSplitter->setOrientation( Qt::Vertical ); | 1717 | mExtensionBarSplitter->setOrientation( Qt::Vertical ); |
1718 | 1718 | ||
1719 | mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); | 1719 | mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); |
1720 | 1720 | ||
1721 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); | 1721 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); |
1722 | mIncSearchWidget = new IncSearchWidget( viewSpace ); | 1722 | mIncSearchWidget = new IncSearchWidget( viewSpace ); |
1723 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1723 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1724 | SLOT( incrementalSearch( const QString& ) ) ); | 1724 | SLOT( incrementalSearch( const QString& ) ) ); |
1725 | 1725 | ||
1726 | mViewManager = new ViewManager( this, viewSpace ); | 1726 | mViewManager = new ViewManager( this, viewSpace ); |
1727 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1727 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1728 | 1728 | ||
1729 | mDetails = new ViewContainer( mDetailsSplitter ); | 1729 | mDetails = new ViewContainer( mDetailsSplitter ); |
1730 | 1730 | ||
1731 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1731 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1732 | 1732 | ||
1733 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1733 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1734 | 1734 | ||
1735 | topLayout->addWidget( mExtensionBarSplitter ); | 1735 | topLayout->addWidget( mExtensionBarSplitter ); |
1736 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); | 1736 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); |
1737 | topLayout->addWidget( mJumpButtonBar ); | 1737 | topLayout->addWidget( mJumpButtonBar ); |
1738 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); | 1738 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); |
1739 | 1739 | ||
1740 | mXXPortManager = new XXPortManager( this, this ); | 1740 | mXXPortManager = new XXPortManager( this, this ); |
1741 | 1741 | ||
1742 | #else //KAB_EMBEDDED | 1742 | #else //KAB_EMBEDDED |
1743 | //US initialize viewMenu before settingup viewmanager. | 1743 | //US initialize viewMenu before settingup viewmanager. |
1744 | // Viewmanager needs this menu to plugin submenues. | 1744 | // Viewmanager needs this menu to plugin submenues. |
1745 | viewMenu = new QPopupMenu( this ); | 1745 | viewMenu = new QPopupMenu( this ); |
1746 | settingsMenu = new QPopupMenu( this ); | 1746 | settingsMenu = new QPopupMenu( this ); |
1747 | //filterMenu = new QPopupMenu( this ); | 1747 | //filterMenu = new QPopupMenu( this ); |
1748 | ImportMenu = new QPopupMenu( this ); | 1748 | ImportMenu = new QPopupMenu( this ); |
1749 | ExportMenu = new QPopupMenu( this ); | 1749 | ExportMenu = new QPopupMenu( this ); |
1750 | syncMenu = new QPopupMenu( this ); | 1750 | syncMenu = new QPopupMenu( this ); |
1751 | changeMenu= new QPopupMenu( this ); | 1751 | changeMenu= new QPopupMenu( this ); |
1752 | beamMenu= new QPopupMenu( this ); | 1752 | beamMenu= new QPopupMenu( this ); |
1753 | 1753 | ||
1754 | //US since we have no splitter for the embedded system, setup | 1754 | //US since we have no splitter for the embedded system, setup |
1755 | // a layout with two frames. One left and one right. | 1755 | // a layout with two frames. One left and one right. |
1756 | 1756 | ||
1757 | QBoxLayout *topLayout; | 1757 | QBoxLayout *topLayout; |
1758 | 1758 | ||
1759 | // = new QHBoxLayout( this ); | 1759 | // = new QHBoxLayout( this ); |
1760 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); | 1760 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); |
1761 | 1761 | ||
1762 | // QWidget *mainBox = new QWidget( this ); | 1762 | // QWidget *mainBox = new QWidget( this ); |
1763 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); | 1763 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); |
1764 | 1764 | ||
1765 | #ifdef DESKTOP_VERSION | 1765 | #ifdef DESKTOP_VERSION |
1766 | topLayout = new QHBoxLayout( this ); | 1766 | topLayout = new QHBoxLayout( this ); |
1767 | 1767 | ||
1768 | 1768 | ||
1769 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1769 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1770 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1770 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1771 | 1771 | ||
1772 | topLayout->addWidget(mMiniSplitter ); | 1772 | topLayout->addWidget(mMiniSplitter ); |
1773 | 1773 | ||
1774 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); | 1774 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); |
1775 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1775 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1776 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); | 1776 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); |
1777 | mDetails = new ViewContainer( mMiniSplitter ); | 1777 | mDetails = new ViewContainer( mMiniSplitter ); |
1778 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1778 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1779 | #else | 1779 | #else |
1780 | if ( QApplication::desktop()->width() > 480 ) { | 1780 | if ( QApplication::desktop()->width() > 480 ) { |
1781 | topLayout = new QHBoxLayout( this ); | 1781 | topLayout = new QHBoxLayout( this ); |
1782 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1782 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1783 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1783 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1784 | } else { | 1784 | } else { |
1785 | 1785 | ||
1786 | topLayout = new QHBoxLayout( this ); | 1786 | topLayout = new QHBoxLayout( this ); |
1787 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this); | 1787 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this); |
1788 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1788 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1789 | } | 1789 | } |
1790 | 1790 | ||
1791 | topLayout->addWidget(mMiniSplitter ); | 1791 | topLayout->addWidget(mMiniSplitter ); |
1792 | mViewManager = new ViewManager( this, mMiniSplitter ); | 1792 | mViewManager = new ViewManager( this, mMiniSplitter ); |
1793 | mDetails = new ViewContainer( mMiniSplitter ); | 1793 | mDetails = new ViewContainer( mMiniSplitter ); |
1794 | 1794 | ||
1795 | 1795 | ||
1796 | mExtensionManager = new ExtensionManager( this, mMiniSplitter ); | 1796 | mExtensionManager = new ExtensionManager( this, mMiniSplitter ); |
1797 | #endif | 1797 | #endif |
1798 | //eh->hide(); | 1798 | //eh->hide(); |
1799 | // topLayout->addWidget(mExtensionManager ); | 1799 | // topLayout->addWidget(mExtensionManager ); |
1800 | 1800 | ||
1801 | 1801 | ||
1802 | /*US | 1802 | /*US |
1803 | #ifndef KAB_NOSPLITTER | 1803 | #ifndef KAB_NOSPLITTER |
1804 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1804 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1805 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); | 1805 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); |
1806 | topLayout->setSpacing( 10 ); | 1806 | topLayout->setSpacing( 10 ); |
1807 | 1807 | ||
1808 | mDetailsSplitter = new QSplitter( this ); | 1808 | mDetailsSplitter = new QSplitter( this ); |
1809 | 1809 | ||
1810 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); | 1810 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); |
1811 | 1811 | ||
1812 | mViewManager = new ViewManager( this, viewSpace ); | 1812 | mViewManager = new ViewManager( this, viewSpace ); |
1813 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1813 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1814 | 1814 | ||
1815 | mDetails = new ViewContainer( mDetailsSplitter ); | 1815 | mDetails = new ViewContainer( mDetailsSplitter ); |
1816 | 1816 | ||
1817 | topLayout->addWidget( mDetailsSplitter ); | 1817 | topLayout->addWidget( mDetailsSplitter ); |
1818 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1818 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1819 | #else //KAB_NOSPLITTER | 1819 | #else //KAB_NOSPLITTER |
1820 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1820 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1821 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); | 1821 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); |
1822 | topLayout->setSpacing( 10 ); | 1822 | topLayout->setSpacing( 10 ); |
1823 | 1823 | ||
1824 | // mDetailsSplitter = new QSplitter( this ); | 1824 | // mDetailsSplitter = new QSplitter( this ); |
1825 | 1825 | ||
1826 | QVBox *viewSpace = new QVBox( this ); | 1826 | QVBox *viewSpace = new QVBox( this ); |
1827 | 1827 | ||
1828 | mViewManager = new ViewManager( this, viewSpace ); | 1828 | mViewManager = new ViewManager( this, viewSpace ); |
1829 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1829 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1830 | 1830 | ||
1831 | mDetails = new ViewContainer( this ); | 1831 | mDetails = new ViewContainer( this ); |
1832 | 1832 | ||
1833 | topLayout->addWidget( viewSpace ); | 1833 | topLayout->addWidget( viewSpace ); |
1834 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1834 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1835 | topLayout->addWidget( mDetails ); | 1835 | topLayout->addWidget( mDetails ); |
1836 | #endif //KAB_NOSPLITTER | 1836 | #endif //KAB_NOSPLITTER |
1837 | */ | 1837 | */ |
1838 | 1838 | ||
1839 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); | 1839 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); |
1840 | syncManager->setBlockSave(false); | 1840 | syncManager->setBlockSave(false); |
1841 | 1841 | ||
1842 | connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 1842 | connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
1843 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 1843 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
1844 | QString sync_file = sentSyncFile(); | 1844 | QString sync_file = sentSyncFile(); |
1845 | qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1()); | 1845 | //qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1()); |
1846 | syncManager->setDefaultFileName( sync_file ); | 1846 | syncManager->setDefaultFileName( sync_file ); |
1847 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); | 1847 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); |
1848 | 1848 | ||
1849 | #endif //KAB_EMBEDDED | 1849 | #endif //KAB_EMBEDDED |
1850 | initActions(); | 1850 | initActions(); |
1851 | 1851 | ||
1852 | #ifdef KAB_EMBEDDED | 1852 | #ifdef KAB_EMBEDDED |
1853 | addActionsManually(); | 1853 | addActionsManually(); |
1854 | //US make sure the export and import menues are initialized before creating the xxPortManager. | 1854 | //US make sure the export and import menues are initialized before creating the xxPortManager. |
1855 | mXXPortManager = new XXPortManager( this, this ); | 1855 | mXXPortManager = new XXPortManager( this, this ); |
1856 | 1856 | ||
1857 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); | 1857 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); |
1858 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); | 1858 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); |
1859 | // mActionQuit->plug ( mMainWindow->toolBar()); | 1859 | // mActionQuit->plug ( mMainWindow->toolBar()); |
1860 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); | 1860 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); |
1861 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); | 1861 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); |
1862 | // mIncSearchWidget->hide(); | 1862 | // mIncSearchWidget->hide(); |
1863 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1863 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1864 | SLOT( incrementalSearch( const QString& ) ) ); | 1864 | SLOT( incrementalSearch( const QString& ) ) ); |
1865 | connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) ); | 1865 | connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) ); |
1866 | connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) ); | 1866 | connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) ); |
1867 | 1867 | ||
1868 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1868 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1869 | 1869 | ||
1870 | topLayout->addWidget( mJumpButtonBar ); | 1870 | topLayout->addWidget( mJumpButtonBar ); |
1871 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); | 1871 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); |
1872 | 1872 | ||
1873 | // mMainWindow->getIconToolBar()->raise(); | 1873 | // mMainWindow->getIconToolBar()->raise(); |
1874 | 1874 | ||
1875 | #endif //KAB_EMBEDDED | 1875 | #endif //KAB_EMBEDDED |
1876 | 1876 | ||
1877 | } | 1877 | } |
1878 | void KABCore::initActions() | 1878 | void KABCore::initActions() |
1879 | { | 1879 | { |
1880 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); | 1880 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); |
1881 | 1881 | ||
1882 | #ifndef KAB_EMBEDDED | 1882 | #ifndef KAB_EMBEDDED |
1883 | connect( QApplication::clipboard(), SIGNAL( dataChanged() ), | 1883 | connect( QApplication::clipboard(), SIGNAL( dataChanged() ), |
1884 | SLOT( clipboardDataChanged() ) ); | 1884 | SLOT( clipboardDataChanged() ) ); |
1885 | #endif //KAB_EMBEDDED | 1885 | #endif //KAB_EMBEDDED |
1886 | 1886 | ||
1887 | // file menu | 1887 | // file menu |
1888 | 1888 | ||
1889 | mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() ); | 1889 | mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() ); |
1890 | //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); | 1890 | //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); |
1891 | mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager, | 1891 | mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager, |
1892 | SLOT( printView() ), actionCollection(), "kaddressbook_print" ); | 1892 | SLOT( printView() ), actionCollection(), "kaddressbook_print" ); |
1893 | 1893 | ||
1894 | 1894 | ||
1895 | mActionPrintDetails = new KAction( i18n( "&Print Details" ), "fileprint", 0, mDetails, | 1895 | mActionPrintDetails = new KAction( i18n( "&Print Details" ), "fileprint", 0, mDetails, |
1896 | SLOT( printView() ), actionCollection(), "kaddressbook_print2" ); | 1896 | SLOT( printView() ), actionCollection(), "kaddressbook_print2" ); |
1897 | 1897 | ||
1898 | mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, | 1898 | mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, |
1899 | SLOT( save() ), actionCollection(), "file_sync" ); | 1899 | SLOT( save() ), actionCollection(), "file_sync" ); |
1900 | 1900 | ||
1901 | mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, | 1901 | mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, |
1902 | SLOT( newContact() ), actionCollection(), "file_new_contact" ); | 1902 | SLOT( newContact() ), actionCollection(), "file_new_contact" ); |
1903 | 1903 | ||
1904 | mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, | 1904 | mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, |
1905 | this, SLOT( mailVCard() ), | 1905 | this, SLOT( mailVCard() ), |
1906 | actionCollection(), "file_mail_vcard"); | 1906 | actionCollection(), "file_mail_vcard"); |
1907 | 1907 | ||
1908 | mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this, | 1908 | mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this, |
1909 | SLOT( export2phone() ), actionCollection(), | 1909 | SLOT( export2phone() ), actionCollection(), |
1910 | "kaddressbook_ex2phone" ); | 1910 | "kaddressbook_ex2phone" ); |
1911 | 1911 | ||
1912 | mActionBeamVCard = 0; | 1912 | mActionBeamVCard = 0; |
1913 | mActionBeam = 0; | 1913 | mActionBeam = 0; |
1914 | 1914 | ||
1915 | #ifndef DESKTOP_VERSION | 1915 | #ifndef DESKTOP_VERSION |
1916 | if ( Ir::supported() ) { | 1916 | if ( Ir::supported() ) { |
1917 | mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this, | 1917 | mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this, |
1918 | SLOT( beamVCard() ), actionCollection(), | 1918 | SLOT( beamVCard() ), actionCollection(), |
1919 | "kaddressbook_beam_vcard" ); | 1919 | "kaddressbook_beam_vcard" ); |
1920 | 1920 | ||
1921 | mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, | 1921 | mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, |
1922 | SLOT( beamMySelf() ), actionCollection(), | 1922 | SLOT( beamMySelf() ), actionCollection(), |
1923 | "kaddressbook_beam_myself" ); | 1923 | "kaddressbook_beam_myself" ); |
1924 | } | 1924 | } |
1925 | #endif | 1925 | #endif |
1926 | 1926 | ||
1927 | mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, | 1927 | mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, |
1928 | this, SLOT( editContact2() ), | 1928 | this, SLOT( editContact2() ), |
1929 | actionCollection(), "file_properties" ); | 1929 | actionCollection(), "file_properties" ); |
1930 | 1930 | ||
1931 | #ifdef KAB_EMBEDDED | 1931 | #ifdef KAB_EMBEDDED |
1932 | // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); | 1932 | // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); |
1933 | mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, | 1933 | mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, |
1934 | mMainWindow, SLOT( exit() ), | 1934 | mMainWindow, SLOT( exit() ), |
1935 | actionCollection(), "quit" ); | 1935 | actionCollection(), "quit" ); |
1936 | #endif //KAB_EMBEDDED | 1936 | #endif //KAB_EMBEDDED |
1937 | 1937 | ||
1938 | // edit menu | 1938 | // edit menu |
1939 | if ( mIsPart ) { | 1939 | if ( mIsPart ) { |
1940 | mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, | 1940 | mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, |
1941 | SLOT( copyContacts() ), actionCollection(), | 1941 | SLOT( copyContacts() ), actionCollection(), |
1942 | "kaddressbook_copy" ); | 1942 | "kaddressbook_copy" ); |
1943 | mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this, | 1943 | mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this, |
1944 | SLOT( cutContacts() ), actionCollection(), | 1944 | SLOT( cutContacts() ), actionCollection(), |
1945 | "kaddressbook_cut" ); | 1945 | "kaddressbook_cut" ); |
1946 | mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this, | 1946 | mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this, |
1947 | SLOT( pasteContacts() ), actionCollection(), | 1947 | SLOT( pasteContacts() ), actionCollection(), |
1948 | "kaddressbook_paste" ); | 1948 | "kaddressbook_paste" ); |
1949 | mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this, | 1949 | mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this, |
1950 | SLOT( selectAllContacts() ), actionCollection(), | 1950 | SLOT( selectAllContacts() ), actionCollection(), |
1951 | "kaddressbook_select_all" ); | 1951 | "kaddressbook_select_all" ); |
1952 | mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this, | 1952 | mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this, |
1953 | SLOT( undo() ), actionCollection(), | 1953 | SLOT( undo() ), actionCollection(), |
1954 | "kaddressbook_undo" ); | 1954 | "kaddressbook_undo" ); |
1955 | mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z, | 1955 | mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z, |
1956 | this, SLOT( redo() ), actionCollection(), | 1956 | this, SLOT( redo() ), actionCollection(), |
1957 | "kaddressbook_redo" ); | 1957 | "kaddressbook_redo" ); |
1958 | } else { | 1958 | } else { |
1959 | mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() ); | 1959 | mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() ); |
1960 | mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() ); | 1960 | mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() ); |
1961 | mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() ); | 1961 | mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() ); |
1962 | mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() ); | 1962 | mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() ); |
1963 | mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() ); | 1963 | mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() ); |
1964 | mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() ); | 1964 | mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() ); |
1965 | } | 1965 | } |
1966 | 1966 | ||
1967 | mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", | 1967 | mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", |
1968 | Key_Delete, this, SLOT( deleteContacts() ), | 1968 | Key_Delete, this, SLOT( deleteContacts() ), |
1969 | actionCollection(), "edit_delete" ); | 1969 | actionCollection(), "edit_delete" ); |
1970 | 1970 | ||
1971 | mActionUndo->setEnabled( false ); | 1971 | mActionUndo->setEnabled( false ); |
1972 | mActionRedo->setEnabled( false ); | 1972 | mActionRedo->setEnabled( false ); |
1973 | 1973 | ||
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp index aec74fa..7f31ab1 100644 --- a/microkde/kdecore/klocale.cpp +++ b/microkde/kdecore/klocale.cpp | |||
@@ -1,139 +1,139 @@ | |||
1 | #include <qregexp.h> | 1 | #include <qregexp.h> |
2 | #include <qapplication.h> | 2 | #include <qapplication.h> |
3 | 3 | ||
4 | #include "kdebug.h" | 4 | #include "kdebug.h" |
5 | #include "kcalendarsystemgregorian.h" | 5 | #include "kcalendarsystemgregorian.h" |
6 | 6 | ||
7 | #include "klocale.h" | 7 | #include "klocale.h" |
8 | 8 | ||
9 | #include <qstringlist.h> | 9 | #include <qstringlist.h> |
10 | 10 | ||
11 | #define COLLECT_TRANSLATION | 11 | //#define COLLECT_TRANSLATION |
12 | 12 | ||
13 | 13 | ||
14 | QDict<QString> *mLocaleDict = 0; | 14 | QDict<QString> *mLocaleDict = 0; |
15 | void setLocaleDict( QDict<QString> * dict ) | 15 | void setLocaleDict( QDict<QString> * dict ) |
16 | { | 16 | { |
17 | mLocaleDict = dict; | 17 | mLocaleDict = dict; |
18 | 18 | ||
19 | } | 19 | } |
20 | 20 | ||
21 | #ifdef COLLECT_TRANSLATION | 21 | #ifdef COLLECT_TRANSLATION |
22 | 22 | ||
23 | QStringList missingTrans; | 23 | QStringList missingTrans; |
24 | QStringList existingTrans1; | 24 | QStringList existingTrans1; |
25 | QStringList existingTrans2; | 25 | QStringList existingTrans2; |
26 | 26 | ||
27 | void addMissing(const char *text) | 27 | void addMissing(const char *text) |
28 | { | 28 | { |
29 | 29 | ||
30 | QString mis ( text ); | 30 | QString mis ( text ); |
31 | if ( !missingTrans.contains( mis ) ) | 31 | if ( !missingTrans.contains( mis ) ) |
32 | missingTrans.append(mis); | 32 | missingTrans.append(mis); |
33 | 33 | ||
34 | } | 34 | } |
35 | void addExist(const char *text,QString trans ) | 35 | void addExist(const char *text,QString trans ) |
36 | { | 36 | { |
37 | //return; | 37 | //return; |
38 | QString mis ( text ); | 38 | QString mis ( text ); |
39 | if ( !existingTrans1.contains( mis ) ) { | 39 | if ( !existingTrans1.contains( mis ) ) { |
40 | existingTrans1.append(mis); | 40 | existingTrans1.append(mis); |
41 | existingTrans2.append(trans); | 41 | existingTrans2.append(trans); |
42 | 42 | ||
43 | } | 43 | } |
44 | 44 | ||
45 | } | 45 | } |
46 | 46 | ||
47 | #include <qfile.h> | 47 | #include <qfile.h> |
48 | #include <qtextstream.h> | 48 | #include <qtextstream.h> |
49 | #include <qtextcodec.h> | 49 | #include <qtextcodec.h> |
50 | #endif | 50 | #endif |
51 | void dumpMissing() | 51 | void dumpMissing() |
52 | { | 52 | { |
53 | #ifdef COLLECT_TRANSLATION | 53 | #ifdef COLLECT_TRANSLATION |
54 | QString fileName = "/tmp/usernewtrans.txt"; | 54 | QString fileName = "/tmp/usernewtrans.txt"; |
55 | QFile file( fileName ); | 55 | QFile file( fileName ); |
56 | if (!file.open( IO_WriteOnly ) ) { | 56 | if (!file.open( IO_WriteOnly ) ) { |
57 | return ; | 57 | return ; |
58 | } | 58 | } |
59 | QTextStream ts( &file ); | 59 | QTextStream ts( &file ); |
60 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 60 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
61 | 61 | ||
62 | int i; | 62 | int i; |
63 | for ( i = 0; i< missingTrans.count(); ++i ) { | 63 | for ( i = 0; i< missingTrans.count(); ++i ) { |
64 | 64 | ||
65 | QString text = missingTrans[i].replace( QRegExp("\n"),"\\n" ); | 65 | QString text = missingTrans[i].replace( QRegExp("\n"),"\\n" ); |
66 | ts << "{ \""<<text<< "\",\""<< text <<"\" },\n"; | 66 | ts << "{ \""<<text<< "\",\""<< text <<"\" },\n"; |
67 | 67 | ||
68 | } | 68 | } |
69 | file.close(); | 69 | file.close(); |
70 | { | 70 | { |
71 | QString fileName = "/tmp/usertrans.txt"; | 71 | QString fileName = "/tmp/usertrans.txt"; |
72 | QFile file( fileName ); | 72 | QFile file( fileName ); |
73 | if (!file.open( IO_WriteOnly ) ) { | 73 | if (!file.open( IO_WriteOnly ) ) { |
74 | return ; | 74 | return ; |
75 | } | 75 | } |
76 | QTextStream ts( &file ); | 76 | QTextStream ts( &file ); |
77 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 77 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
78 | 78 | ||
79 | int i; | 79 | int i; |
80 | for ( i = 0; i< existingTrans1.count(); ++i ) { | 80 | for ( i = 0; i< existingTrans1.count(); ++i ) { |
81 | 81 | ||
82 | QString text = existingTrans1[i].replace( QRegExp("\n"),"\\n" ); | 82 | QString text = existingTrans1[i].replace( QRegExp("\n"),"\\n" ); |
83 | QString text2 = existingTrans2[i].replace( QRegExp("\n"),"\\n" ); | 83 | QString text2 = existingTrans2[i].replace( QRegExp("\n"),"\\n" ); |
84 | ts << "{ \""<<text<< "\",\""<< text2 <<"\" },\n"; | 84 | ts << "{ \""<<text<< "\",\""<< text2 <<"\" },\n"; |
85 | 85 | ||
86 | } | 86 | } |
87 | file.close(); | 87 | file.close(); |
88 | } | 88 | } |
89 | #endif | 89 | #endif |
90 | } | 90 | } |
91 | QString i18n(const char *text) | 91 | QString i18n(const char *text) |
92 | { | 92 | { |
93 | if ( ! mLocaleDict ) { | 93 | if ( ! mLocaleDict ) { |
94 | #ifdef COLLECT_TRANSLATION | 94 | #ifdef COLLECT_TRANSLATION |
95 | addMissing( text ); | 95 | addMissing( text ); |
96 | #endif | 96 | #endif |
97 | return QString( text ); | 97 | return QString( text ); |
98 | } | 98 | } |
99 | else { | 99 | else { |
100 | QString* ret = mLocaleDict->find(QString(text)) ; | 100 | QString* ret = mLocaleDict->find(QString(text)) ; |
101 | if ( ret == 0 ) { | 101 | if ( ret == 0 ) { |
102 | #ifdef COLLECT_TRANSLATION | 102 | #ifdef COLLECT_TRANSLATION |
103 | addMissing( text ); | 103 | addMissing( text ); |
104 | #endif | 104 | #endif |
105 | return QString( text ); | 105 | return QString( text ); |
106 | } | 106 | } |
107 | else { | 107 | else { |
108 | if ( (*ret).isEmpty() ) { | 108 | if ( (*ret).isEmpty() ) { |
109 | #ifdef COLLECT_TRANSLATION | 109 | #ifdef COLLECT_TRANSLATION |
110 | addMissing( text ); | 110 | addMissing( text ); |
111 | #endif | 111 | #endif |
112 | return QString( text ); | 112 | return QString( text ); |
113 | } | 113 | } |
114 | else { | 114 | else { |
115 | #ifdef COLLECT_TRANSLATION | 115 | #ifdef COLLECT_TRANSLATION |
116 | addExist( text, *ret ); | 116 | addExist( text, *ret ); |
117 | #endif | 117 | #endif |
118 | return (*ret); | 118 | return (*ret); |
119 | } | 119 | } |
120 | } | 120 | } |
121 | } | 121 | } |
122 | 122 | ||
123 | } | 123 | } |
124 | 124 | ||
125 | QString i18n(const char *,const char *text) | 125 | QString i18n(const char *,const char *text) |
126 | { | 126 | { |
127 | return i18n( text ); | 127 | return i18n( text ); |
128 | } | 128 | } |
129 | 129 | ||
130 | QString i18n(const char *text1, const char *textn, int num) | 130 | QString i18n(const char *text1, const char *textn, int num) |
131 | { | 131 | { |
132 | if ( num == 1 ) return i18n( text1 ); | 132 | if ( num == 1 ) return i18n( text1 ); |
133 | else { | 133 | else { |
134 | QString text = i18n( textn ); | 134 | QString text = i18n( textn ); |
135 | int pos = text.find( "%n" ); | 135 | int pos = text.find( "%n" ); |
136 | if ( pos >= 0 ) text.replace( pos, 2, QString::number( num ) ); | 136 | if ( pos >= 0 ) text.replace( pos, 2, QString::number( num ) ); |
137 | return text; | 137 | return text; |
138 | } | 138 | } |
139 | } | 139 | } |
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp index 533be51..011e47e 100644 --- a/microkde/kresources/configpage.cpp +++ b/microkde/kresources/configpage.cpp | |||
@@ -332,202 +332,199 @@ void ConfigPage::slotAdd() | |||
332 | ConfigViewItem *item = new ConfigViewItem( mListView, resource ); | 332 | ConfigViewItem *item = new ConfigViewItem( mListView, resource ); |
333 | 333 | ||
334 | mLastItem = item; | 334 | mLastItem = item; |
335 | 335 | ||
336 | // if there are only read-only resources we'll set this resource | 336 | // if there are only read-only resources we'll set this resource |
337 | // as standard resource | 337 | // as standard resource |
338 | if ( !resource->readOnly() ) { | 338 | if ( !resource->readOnly() ) { |
339 | bool onlyReadOnly = true; | 339 | bool onlyReadOnly = true; |
340 | QListViewItem *it = mListView->firstChild(); | 340 | QListViewItem *it = mListView->firstChild(); |
341 | while ( it != 0 ) { | 341 | while ( it != 0 ) { |
342 | ConfigViewItem *confIt = static_cast<ConfigViewItem*>( it ); | 342 | ConfigViewItem *confIt = static_cast<ConfigViewItem*>( it ); |
343 | if ( !confIt->readOnly() && confIt != item ) | 343 | if ( !confIt->readOnly() && confIt != item ) |
344 | onlyReadOnly = false; | 344 | onlyReadOnly = false; |
345 | 345 | ||
346 | it = it->itemBelow(); | 346 | it = it->itemBelow(); |
347 | } | 347 | } |
348 | 348 | ||
349 | if ( onlyReadOnly ) | 349 | if ( onlyReadOnly ) |
350 | item->setStandard( true ); | 350 | item->setStandard( true ); |
351 | } | 351 | } |
352 | 352 | ||
353 | emit changed( true ); | 353 | emit changed( true ); |
354 | } else { | 354 | } else { |
355 | delete resource; | 355 | delete resource; |
356 | resource = 0; | 356 | resource = 0; |
357 | } | 357 | } |
358 | } | 358 | } |
359 | 359 | ||
360 | void ConfigPage::slotRemove() | 360 | void ConfigPage::slotRemove() |
361 | { | 361 | { |
362 | if ( !mCurrentManager ) | 362 | if ( !mCurrentManager ) |
363 | return; | 363 | return; |
364 | 364 | ||
365 | QListViewItem *item = mListView->currentItem(); | 365 | QListViewItem *item = mListView->currentItem(); |
366 | ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item ); | 366 | ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item ); |
367 | 367 | ||
368 | if ( !confItem ) | 368 | if ( !confItem ) |
369 | return; | 369 | return; |
370 | 370 | ||
371 | if ( confItem->standard() ) { | 371 | if ( confItem->standard() ) { |
372 | KMessageBox::sorry( this, i18n( "You cannot remove your standard resource!\n Please select a new standard resource first." ) ); | 372 | KMessageBox::sorry( this, i18n( "You cannot remove your standard resource!\n Please select a new standard resource first." ) ); |
373 | return; | 373 | return; |
374 | } | 374 | } |
375 | 375 | ||
376 | mCurrentManager->remove( confItem->resource() ); | 376 | mCurrentManager->remove( confItem->resource() ); |
377 | 377 | ||
378 | if ( item == mLastItem ) | 378 | if ( item == mLastItem ) |
379 | mLastItem = 0; | 379 | mLastItem = 0; |
380 | 380 | ||
381 | mListView->takeItem( item ); | 381 | mListView->takeItem( item ); |
382 | delete item; | 382 | delete item; |
383 | 383 | ||
384 | emit changed( true ); | 384 | emit changed( true ); |
385 | } | 385 | } |
386 | 386 | ||
387 | void ConfigPage::slotEdit() | 387 | void ConfigPage::slotEdit() |
388 | { | 388 | { |
389 | if ( !mCurrentManager ) | 389 | if ( !mCurrentManager ) |
390 | return; | 390 | return; |
391 | 391 | ||
392 | QListViewItem *item = mListView->currentItem(); | 392 | QListViewItem *item = mListView->currentItem(); |
393 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item ); | 393 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item ); |
394 | if ( !configItem ) | 394 | if ( !configItem ) |
395 | return; | 395 | return; |
396 | 396 | ||
397 | Resource *resource = configItem->resource(); | 397 | Resource *resource = configItem->resource(); |
398 | 398 | ||
399 | ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" ); | 399 | ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" ); |
400 | 400 | ||
401 | if ( dlg.exec() ) { | 401 | if ( dlg.exec() ) { |
402 | configItem->setText( 0, resource->resourceName() ); | 402 | configItem->setText( 0, resource->resourceName() ); |
403 | configItem->setText( 1, resource->type() ); | 403 | configItem->setText( 1, resource->type() ); |
404 | 404 | ||
405 | if ( configItem->standard() && configItem->readOnly() ) { | 405 | if ( configItem->standard() && configItem->readOnly() ) { |
406 | KMessageBox::sorry( this, i18n( "You cannot use a read-only<br> resource as standard!" ) ); | 406 | KMessageBox::sorry( this, i18n( "You cannot use a read-only<br> resource as standard!" ) ); |
407 | configItem->setStandard( false ); | 407 | configItem->setStandard( false ); |
408 | } | 408 | } |
409 | 409 | ||
410 | mCurrentManager->resourceChanged( resource ); | 410 | mCurrentManager->resourceChanged( resource ); |
411 | emit changed( true ); | 411 | emit changed( true ); |
412 | } | 412 | } |
413 | } | 413 | } |
414 | 414 | ||
415 | void ConfigPage::slotStandard() | 415 | void ConfigPage::slotStandard() |
416 | { | 416 | { |
417 | if ( !mCurrentManager ) | 417 | if ( !mCurrentManager ) |
418 | return; | 418 | return; |
419 | 419 | ||
420 | ConfigViewItem *item = static_cast<ConfigViewItem*>( mListView->currentItem() ); | 420 | ConfigViewItem *item = static_cast<ConfigViewItem*>( mListView->currentItem() ); |
421 | if ( !item ) | 421 | if ( !item ) |
422 | return; | 422 | return; |
423 | 423 | ||
424 | if ( item->readOnly() ) { | 424 | if ( item->readOnly() ) { |
425 | KMessageBox::sorry( this, i18n( "You cannot use a read-only<br>resource as standard!" ) ); | 425 | KMessageBox::sorry( this, i18n( "You cannot use a read-only<br>resource as standard!" ) ); |
426 | return; | 426 | return; |
427 | } | 427 | } |
428 | 428 | ||
429 | if ( !item->isOn() ) { | 429 | if ( !item->isOn() ) { |
430 | KMessageBox::sorry( this, i18n( "You cannot use an inactive<br>resource as standard!" ) ); | 430 | KMessageBox::sorry( this, i18n( "You cannot use an inactive<br>resource as standard!" ) ); |
431 | return; | 431 | return; |
432 | } | 432 | } |
433 | 433 | ||
434 | QListViewItem *it = mListView->firstChild(); | 434 | QListViewItem *it = mListView->firstChild(); |
435 | while ( it != 0 ) { | 435 | while ( it != 0 ) { |
436 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it ); | 436 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it ); |
437 | if ( configItem->standard() ) | 437 | if ( configItem->standard() ) |
438 | configItem->setStandard( false ); | 438 | configItem->setStandard( false ); |
439 | it = it->itemBelow(); | 439 | it = it->itemBelow(); |
440 | } | 440 | } |
441 | 441 | ||
442 | item->setStandard( true ); | 442 | item->setStandard( true ); |
443 | mCurrentManager->setStandardResource( item->resource() ); | 443 | mCurrentManager->setStandardResource( item->resource() ); |
444 | emit changed( true ); | 444 | emit changed( true ); |
445 | 445 | ||
446 | } | 446 | } |
447 | 447 | ||
448 | void ConfigPage::slotSelectionChanged() | 448 | void ConfigPage::slotSelectionChanged() |
449 | { | 449 | { |
450 | bool state = ( mListView->currentItem() != 0 ); | 450 | bool state = ( mListView->currentItem() != 0 ); |
451 | 451 | ||
452 | mRemoveButton->setEnabled( state ); | 452 | mRemoveButton->setEnabled( state ); |
453 | mEditButton->setEnabled( state ); | 453 | mEditButton->setEnabled( state ); |
454 | mStandardButton->setEnabled( state ); | 454 | mStandardButton->setEnabled( state ); |
455 | } | 455 | } |
456 | 456 | ||
457 | void ConfigPage::resourceAdded( Resource* resource ) | 457 | void ConfigPage::resourceAdded( Resource* resource ) |
458 | { | 458 | { |
459 | qDebug("ConfigPage::resourceAdded : %s", resource->resourceName().latin1()); | 459 | qDebug("ConfigPage::resourceAdded : %s", resource->resourceName().latin1()); |
460 | kdDebug(5650) << "ConfigPage::resourceAdded( " << resource->resourceName() << " )" << endl; | ||
461 | ConfigViewItem *item = new ConfigViewItem( mListView, resource ); | 460 | ConfigViewItem *item = new ConfigViewItem( mListView, resource ); |
462 | 461 | ||
463 | // FIXME: this sucks. This should be in the config file, | 462 | // FIXME: this sucks. This should be in the config file, |
464 | // or application-dependent, in which case it's always Off | 463 | // or application-dependent, in which case it's always Off |
465 | item->setOn( false ); | 464 | item->setOn( false ); |
466 | 465 | ||
467 | mLastItem = item; | 466 | mLastItem = item; |
468 | 467 | ||
469 | emit changed( true ); | 468 | emit changed( true ); |
470 | } | 469 | } |
471 | 470 | ||
472 | void ConfigPage::resourceModified( Resource* resource ) | 471 | void ConfigPage::resourceModified( Resource* resource ) |
473 | { | 472 | { |
474 | qDebug("ConfigPage::resourceModified : %s", resource->resourceName().latin1()); | 473 | qDebug("ConfigPage::resourceModified : %s", resource->resourceName().latin1()); |
475 | kdDebug(5650) << "ConfigPage::resourceModified( " << resource->resourceName() << " )" << endl; | ||
476 | } | 474 | } |
477 | 475 | ||
478 | void ConfigPage::resourceDeleted( Resource* resource ) | 476 | void ConfigPage::resourceDeleted( Resource* resource ) |
479 | { | 477 | { |
480 | qDebug("ConfigPage::resourceDeleted : %s", resource->resourceName().latin1()); | 478 | qDebug("ConfigPage::resourceDeleted : %s", resource->resourceName().latin1()); |
481 | kdDebug(5650) << "ConfigPage::resourceDeleted( " << resource->resourceName() << " )" << endl; | ||
482 | } | 479 | } |
483 | 480 | ||
484 | void ConfigPage::slotItemClicked( QListViewItem *item ) | 481 | void ConfigPage::slotItemClicked( QListViewItem *item ) |
485 | { | 482 | { |
486 | ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item ); | 483 | ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item ); |
487 | if ( !configItem ) return; | 484 | if ( !configItem ) return; |
488 | 485 | ||
489 | if ( configItem->standard() && !configItem->isOn() ) { | 486 | if ( configItem->standard() && !configItem->isOn() ) { |
490 | KMessageBox::sorry( this, i18n( "You cannot deactivate the<br>standard resource. Choose<br>another standard resource first." ) ); | 487 | KMessageBox::sorry( this, i18n( "You cannot deactivate the<br>standard resource. Choose<br>another standard resource first." ) ); |
491 | configItem->setOn( true ); | 488 | configItem->setOn( true ); |
492 | return; | 489 | return; |
493 | } | 490 | } |
494 | 491 | ||
495 | if ( configItem->isOn() != configItem->resource()->isActive() ) { | 492 | if ( configItem->isOn() != configItem->resource()->isActive() ) { |
496 | emit changed( true ); | 493 | emit changed( true ); |
497 | } | 494 | } |
498 | } | 495 | } |
499 | 496 | ||
500 | void ConfigPage::saveResourceSettings() | 497 | void ConfigPage::saveResourceSettings() |
501 | { | 498 | { |
502 | qDebug("ConfigPage::saveResourceSettings() begin"); | 499 | //qDebug("ConfigPage::saveResourceSettings() begin"); |
503 | 500 | ||
504 | if ( mCurrentManager ) { | 501 | if ( mCurrentManager ) { |
505 | 502 | ||
506 | QListViewItem *item = mListView->firstChild(); | 503 | QListViewItem *item = mListView->firstChild(); |
507 | while ( item ) { | 504 | while ( item ) { |
508 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item ); | 505 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item ); |
509 | 506 | ||
510 | // check if standard resource | 507 | // check if standard resource |
511 | if ( configItem->standard() && !configItem->readOnly() && | 508 | if ( configItem->standard() && !configItem->readOnly() && |
512 | configItem->isOn() ) { | 509 | configItem->isOn() ) { |
513 | 510 | ||
514 | mCurrentManager->setStandardResource( configItem->resource() ); | 511 | mCurrentManager->setStandardResource( configItem->resource() ); |
515 | } | 512 | } |
516 | 513 | ||
517 | // check if active or passive resource | 514 | // check if active or passive resource |
518 | configItem->resource()->setActive( configItem->isOn() ); | 515 | configItem->resource()->setActive( configItem->isOn() ); |
519 | 516 | ||
520 | item = item->nextSibling(); | 517 | item = item->nextSibling(); |
521 | } | 518 | } |
522 | mCurrentManager->writeConfig( mCurrentConfig ); | 519 | mCurrentManager->writeConfig( mCurrentConfig ); |
523 | 520 | ||
524 | if ( !mCurrentManager->standardResource() ) | 521 | if ( !mCurrentManager->standardResource() ) |
525 | KMessageBox::sorry( this, i18n( "There is no valid standard resource!<br>Please select one which is neither read-only nor inactive." ) ); | 522 | KMessageBox::sorry( this, i18n( "There is no valid standard resource!<br>Please select one which is neither read-only nor inactive." ) ); |
526 | } | 523 | } |
527 | 524 | ||
528 | qDebug("ConfigPage::saveResourceSettings() end"); | 525 | //qDebug("ConfigPage::saveResourceSettings() end"); |
529 | 526 | ||
530 | } | 527 | } |
531 | 528 | ||
532 | //US #include "configpage.moc" | 529 | //US #include "configpage.moc" |
533 | 530 | ||
diff --git a/microkde/kresources/configwidget.h b/microkde/kresources/configwidget.h index b97e278..aecdda9 100644 --- a/microkde/kresources/configwidget.h +++ b/microkde/kresources/configwidget.h | |||
@@ -1,61 +1,61 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkresources. | 2 | This file is part of libkresources. |
3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> |
4 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> | 4 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #ifndef KRESOURCES_CONFIGWIDGET_H | 22 | #ifndef KRESOURCES_CONFIGWIDGET_H |
23 | #define KRESOURCES_CONFIGWIDGET_H | 23 | #define KRESOURCES_CONFIGWIDGET_H |
24 | 24 | ||
25 | #include <qwidget.h> | 25 | #include <qwidget.h> |
26 | 26 | ||
27 | #include <kconfig.h> | 27 | #include <kconfig.h> |
28 | 28 | ||
29 | #include "resource.h" | 29 | #include "resource.h" |
30 | 30 | ||
31 | namespace KRES { | 31 | namespace KRES { |
32 | 32 | ||
33 | class ConfigWidget : public QWidget | 33 | class ConfigWidget : public QWidget |
34 | { | 34 | { |
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | 36 | ||
37 | public: | 37 | public: |
38 | ConfigWidget( QWidget *parent = 0, const char *name = 0 ); | 38 | ConfigWidget( QWidget *parent = 0, const char *name = 0 ); |
39 | 39 | ||
40 | /** | 40 | /** |
41 | Sets the widget to 'edit' mode. Reimplement this method if you are | 41 | Sets the widget to 'edit' mode. Reimplement this method if you are |
42 | interested in the mode change (to disable some GUI element for | 42 | interested in the mode change (to disable some GUI element for |
43 | example). By default the widget is in 'create new' mode. | 43 | example). By default the widget is in 'create new' mode. |
44 | */ | 44 | */ |
45 | virtual void setInEditMode( bool value ); | 45 | virtual void setInEditMode( bool value ); |
46 | 46 | ||
47 | public slots: | 47 | public slots: |
48 | virtual void loadSettings( Resource *resource ); | 48 | virtual void loadSettings( Resource *resource ); |
49 | virtual void saveSettings( Resource *resource ); | 49 | virtual void saveSettings( Resource *resource ); |
50 | 50 | ||
51 | signals: | 51 | signals: |
52 | void setReadOnly( bool value ); | 52 | void setReadOnly( bool value ); |
53 | void setPersistentReadOnly( bool value ); | 53 | void setPersistentReadOnly( bool value ); |
54 | 54 | void setIncludeInSync(bool); | |
55 | 55 | ||
56 | protected: | 56 | protected: |
57 | Resource* mResource; | 57 | Resource* mResource; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | } | 60 | } |
61 | #endif | 61 | #endif |