author | zautrix <zautrix> | 2004-08-21 00:37:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-21 00:37:31 (UTC) |
commit | f7bf415be8c727c887ec01c2d8fb8f1c2f85d096 (patch) (unidiff) | |
tree | 7ea53cea72a757bb57bef12ea9e20543f2e7dfa9 | |
parent | ab07441b413dff6d478e2c3a39b823b4269931c5 (diff) | |
download | kdepimpi-f7bf415be8c727c887ec01c2d8fb8f1c2f85d096.zip kdepimpi-f7bf415be8c727c887ec01c2d8fb8f1c2f85d096.tar.gz kdepimpi-f7bf415be8c727c887ec01c2d8fb8f1c2f85d096.tar.bz2 |
Some fixes of the icons
-rw-r--r-- | bin/kdepim/kaddressbook/icons22/listview.png | bin | 365 -> 657 bytes | |||
-rw-r--r-- | kaddressbook/kabcore.cpp | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bin/kdepim/kaddressbook/icons22/listview.png b/bin/kdepim/kaddressbook/icons22/listview.png index b19d9f8..7de6ba0 100644 --- a/bin/kdepim/kaddressbook/icons22/listview.png +++ b/bin/kdepim/kaddressbook/icons22/listview.png | |||
Binary files differ | |||
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index cb9b992..f0f08f4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1291,49 +1291,51 @@ QString KABCore::getNameByPhone( const QString &phone ) | |||
1291 | qDebug("KABCore::getNameByPhone finsih method"); | 1291 | qDebug("KABCore::getNameByPhone finsih method"); |
1292 | return ""; | 1292 | return ""; |
1293 | #endif //KAB_EMBEDDED | 1293 | #endif //KAB_EMBEDDED |
1294 | 1294 | ||
1295 | } | 1295 | } |
1296 | 1296 | ||
1297 | void KABCore::openConfigDialog() | 1297 | void KABCore::openConfigDialog() |
1298 | { | 1298 | { |
1299 | KABPrefs* kab_prefs = KABPrefs::instance(); | 1299 | KABPrefs* kab_prefs = KABPrefs::instance(); |
1300 | KPimGlobalPrefs* kpim_prefs = KPimGlobalPrefs::instance(); | 1300 | KPimGlobalPrefs* kpim_prefs = KPimGlobalPrefs::instance(); |
1301 | 1301 | ||
1302 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true ); | 1302 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true ); |
1303 | KCMKabConfig* kabcfg = new KCMKabConfig( kab_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); | 1303 | KCMKabConfig* kabcfg = new KCMKabConfig( kab_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); |
1304 | ConfigureDialog->addModule(kabcfg ); | 1304 | ConfigureDialog->addModule(kabcfg ); |
1305 | KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( kpim_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" ); | 1305 | KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( kpim_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" ); |
1306 | ConfigureDialog->addModule(kdelibcfg ); | 1306 | ConfigureDialog->addModule(kdelibcfg ); |
1307 | 1307 | ||
1308 | 1308 | ||
1309 | 1309 | ||
1310 | connect( ConfigureDialog, SIGNAL( applyClicked() ), | 1310 | connect( ConfigureDialog, SIGNAL( applyClicked() ), |
1311 | this, SLOT( configurationChanged() ) ); | 1311 | this, SLOT( configurationChanged() ) ); |
1312 | connect( ConfigureDialog, SIGNAL( okClicked() ), | 1312 | connect( ConfigureDialog, SIGNAL( okClicked() ), |
1313 | this, SLOT( configurationChanged() ) ); | 1313 | this, SLOT( configurationChanged() ) ); |
1314 | saveSettings(); | 1314 | saveSettings(); |
1315 | #ifndef DESKTOP_VERSION | ||
1315 | ConfigureDialog->showMaximized(); | 1316 | ConfigureDialog->showMaximized(); |
1317 | #endif | ||
1316 | if ( ConfigureDialog->exec() ) | 1318 | if ( ConfigureDialog->exec() ) |
1317 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); | 1319 | KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); |
1318 | delete ConfigureDialog; | 1320 | delete ConfigureDialog; |
1319 | } | 1321 | } |
1320 | 1322 | ||
1321 | void KABCore::openLDAPDialog() | 1323 | void KABCore::openLDAPDialog() |
1322 | { | 1324 | { |
1323 | #ifndef KAB_EMBEDDED | 1325 | #ifndef KAB_EMBEDDED |
1324 | if ( !mLdapSearchDialog ) { | 1326 | if ( !mLdapSearchDialog ) { |
1325 | mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); | 1327 | mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); |
1326 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, | 1328 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, |
1327 | SLOT( refreshView() ) ); | 1329 | SLOT( refreshView() ) ); |
1328 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, | 1330 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, |
1329 | SLOT( setModified() ) ); | 1331 | SLOT( setModified() ) ); |
1330 | } else | 1332 | } else |
1331 | mLdapSearchDialog->restoreSettings(); | 1333 | mLdapSearchDialog->restoreSettings(); |
1332 | 1334 | ||
1333 | if ( mLdapSearchDialog->isOK() ) | 1335 | if ( mLdapSearchDialog->isOK() ) |
1334 | mLdapSearchDialog->exec(); | 1336 | mLdapSearchDialog->exec(); |
1335 | #else //KAB_EMBEDDED | 1337 | #else //KAB_EMBEDDED |
1336 | qDebug("KABCore::openLDAPDialog() finsih method"); | 1338 | qDebug("KABCore::openLDAPDialog() finsih method"); |
1337 | #endif //KAB_EMBEDDED | 1339 | #endif //KAB_EMBEDDED |
1338 | } | 1340 | } |
1339 | 1341 | ||
@@ -1849,49 +1851,49 @@ void KABCore::addActionsManually() | |||
1849 | editMenu->insertSeparator(); | 1851 | editMenu->insertSeparator(); |
1850 | mActionSelectAll->plug( editMenu ); | 1852 | mActionSelectAll->plug( editMenu ); |
1851 | 1853 | ||
1852 | mActionRemoveVoice->plug( changeMenu ); | 1854 | mActionRemoveVoice->plug( changeMenu ); |
1853 | // settings menu | 1855 | // settings menu |
1854 | //US special menuentry to configure the addressbook resources. On KDE | 1856 | //US special menuentry to configure the addressbook resources. On KDE |
1855 | // you do that through the control center !!! | 1857 | // you do that through the control center !!! |
1856 | mActionConfigResources->plug( settingsMenu ); | 1858 | mActionConfigResources->plug( settingsMenu ); |
1857 | settingsMenu->insertSeparator(); | 1859 | settingsMenu->insertSeparator(); |
1858 | 1860 | ||
1859 | mActionConfigKAddressbook->plug( settingsMenu ); | 1861 | mActionConfigKAddressbook->plug( settingsMenu ); |
1860 | 1862 | ||
1861 | if ( mIsPart ) { | 1863 | if ( mIsPart ) { |
1862 | mActionConfigShortcuts->plug( settingsMenu ); | 1864 | mActionConfigShortcuts->plug( settingsMenu ); |
1863 | mActionConfigureToolbars->plug( settingsMenu ); | 1865 | mActionConfigureToolbars->plug( settingsMenu ); |
1864 | 1866 | ||
1865 | } else { | 1867 | } else { |
1866 | mActionKeyBindings->plug( settingsMenu ); | 1868 | mActionKeyBindings->plug( settingsMenu ); |
1867 | } | 1869 | } |
1868 | 1870 | ||
1869 | settingsMenu->insertSeparator(); | 1871 | settingsMenu->insertSeparator(); |
1870 | 1872 | ||
1871 | mActionJumpBar->plug( settingsMenu ); | 1873 | mActionJumpBar->plug( settingsMenu ); |
1872 | mActionDetails->plug( settingsMenu ); | 1874 | mActionDetails->plug( settingsMenu ); |
1873 | if (!KABPrefs::instance()->mMultipleViewsAtOnce ) | 1875 | if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
1874 | mActionDetails->plug( tb ); | 1876 | mActionDetails->plug( tb ); |
1875 | settingsMenu->insertSeparator(); | 1877 | settingsMenu->insertSeparator(); |
1876 | 1878 | ||
1877 | mActionWhoAmI->plug( settingsMenu ); | 1879 | mActionWhoAmI->plug( settingsMenu ); |
1878 | mActionCategories->plug( settingsMenu ); | 1880 | mActionCategories->plug( settingsMenu ); |
1879 | 1881 | ||
1880 | mActionLicence->plug( helpMenu ); | 1882 | mActionLicence->plug( helpMenu ); |
1881 | mActionFaq->plug( helpMenu ); | 1883 | mActionFaq->plug( helpMenu ); |
1882 | mActionAboutKAddressbook->plug( helpMenu ); | 1884 | mActionAboutKAddressbook->plug( helpMenu ); |
1883 | 1885 | ||
1884 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { | 1886 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { |
1885 | 1887 | ||
1886 | mActionSave->plug( tb ); | 1888 | mActionSave->plug( tb ); |
1887 | mViewManager->getFilterAction()->plug ( tb); | 1889 | mViewManager->getFilterAction()->plug ( tb); |
1888 | if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { | 1890 | if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { |
1889 | mActionUndo->plug( tb ); | 1891 | mActionUndo->plug( tb ); |
1890 | mActionDelete->plug( tb ); | 1892 | mActionDelete->plug( tb ); |
1891 | mActionRedo->plug( tb ); | 1893 | mActionRedo->plug( tb ); |
1892 | } | 1894 | } |
1893 | } | 1895 | } |
1894 | //mActionQuit->plug ( tb ); | 1896 | //mActionQuit->plug ( tb ); |
1895 | // tb->insertWidget(-1, 0, mIncSearchWidget, 6); | 1897 | // tb->insertWidget(-1, 0, mIncSearchWidget, 6); |
1896 | 1898 | ||
1897 | //US link the searchwidget first to this. | 1899 | //US link the searchwidget first to this. |