author | zautrix <zautrix> | 2004-12-04 22:01:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-12-04 22:01:08 (UTC) |
commit | 9c7f3267a1d7db2dbc3bd6384e75cf8ffea1c3df (patch) (unidiff) | |
tree | 0b1707f003049d6c86b001d87e2c3e2525ac471e /kaddressbook | |
parent | 33a7e96870517ccf4b1daf5bfcbac4755ee535b4 (diff) | |
download | kdepimpi-9c7f3267a1d7db2dbc3bd6384e75cf8ffea1c3df.zip kdepimpi-9c7f3267a1d7db2dbc3bd6384e75cf8ffea1c3df.tar.gz kdepimpi-9c7f3267a1d7db2dbc3bd6384e75cf8ffea1c3df.tar.bz2 |
translation fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3c97ce9..76f9ab6 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2013,193 +2013,196 @@ void KABCore::initActions() | |||
2013 | this, SLOT( whatsnew() ), actionCollection(), | 2013 | this, SLOT( whatsnew() ), actionCollection(), |
2014 | "wn" ); | 2014 | "wn" ); |
2015 | mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, | 2015 | mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, |
2016 | this, SLOT( synchowto() ), actionCollection(), | 2016 | this, SLOT( synchowto() ), actionCollection(), |
2017 | "sync" ); | 2017 | "sync" ); |
2018 | mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0, | 2018 | mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0, |
2019 | this, SLOT( kdesynchowto() ), actionCollection(), | 2019 | this, SLOT( kdesynchowto() ), actionCollection(), |
2020 | "kdesync" ); | 2020 | "kdesync" ); |
2021 | mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0, | 2021 | mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0, |
2022 | this, SLOT( multisynchowto() ), actionCollection(), | 2022 | this, SLOT( multisynchowto() ), actionCollection(), |
2023 | "multisync" ); | 2023 | "multisync" ); |
2024 | 2024 | ||
2025 | mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, | 2025 | mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, |
2026 | this, SLOT( createAboutData() ), actionCollection(), | 2026 | this, SLOT( createAboutData() ), actionCollection(), |
2027 | "kaddressbook_about_data" ); | 2027 | "kaddressbook_about_data" ); |
2028 | #endif //KAB_EMBEDDED | 2028 | #endif //KAB_EMBEDDED |
2029 | 2029 | ||
2030 | clipboardDataChanged(); | 2030 | clipboardDataChanged(); |
2031 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 2031 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
2032 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 2032 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
2033 | } | 2033 | } |
2034 | 2034 | ||
2035 | //US we need this function, to plug all actions into the correct menues. | 2035 | //US we need this function, to plug all actions into the correct menues. |
2036 | // KDE uses a XML format to plug the actions, but we work her without this overhead. | 2036 | // KDE uses a XML format to plug the actions, but we work her without this overhead. |
2037 | void KABCore::addActionsManually() | 2037 | void KABCore::addActionsManually() |
2038 | { | 2038 | { |
2039 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); | 2039 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); |
2040 | 2040 | ||
2041 | #ifdef KAB_EMBEDDED | 2041 | #ifdef KAB_EMBEDDED |
2042 | QPopupMenu *fileMenu = new QPopupMenu( this ); | 2042 | QPopupMenu *fileMenu = new QPopupMenu( this ); |
2043 | QPopupMenu *editMenu = new QPopupMenu( this ); | 2043 | QPopupMenu *editMenu = new QPopupMenu( this ); |
2044 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 2044 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
2045 | 2045 | ||
2046 | KToolBar* tb = mMainWindow->toolBar(); | 2046 | KToolBar* tb = mMainWindow->toolBar(); |
2047 | 2047 | ||
2048 | #ifndef DESKTOP_VERSION | 2048 | #ifndef DESKTOP_VERSION |
2049 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { | 2049 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { |
2050 | #endif | 2050 | #endif |
2051 | QMenuBar* mb = mMainWindow->menuBar(); | 2051 | QMenuBar* mb = mMainWindow->menuBar(); |
2052 | 2052 | ||
2053 | //US setup menubar. | 2053 | //US setup menubar. |
2054 | //Disable the following block if you do not want to have a menubar. | 2054 | //Disable the following block if you do not want to have a menubar. |
2055 | mb->insertItem( i18n("&File"), fileMenu ); | 2055 | mb->insertItem( i18n("&File"), fileMenu ); |
2056 | mb->insertItem( i18n("&Edit"), editMenu ); | 2056 | mb->insertItem( i18n("&Edit"), editMenu ); |
2057 | mb->insertItem( i18n("&View"), viewMenu ); | 2057 | mb->insertItem( i18n("&View"), viewMenu ); |
2058 | mb->insertItem( i18n("&Settings"), settingsMenu ); | 2058 | mb->insertItem( i18n("&Settings"), settingsMenu ); |
2059 | mb->insertItem( i18n("Synchronize"), syncMenu ); | 2059 | mb->insertItem( i18n("Synchronize"), syncMenu ); |
2060 | //mb->insertItem( i18n("&Change"), changeMenu ); | 2060 | //mb->insertItem( i18n("&Change"), changeMenu ); |
2061 | mb->insertItem( i18n("&Help"), helpMenu ); | 2061 | mb->insertItem( i18n("&Help"), helpMenu ); |
2062 | mIncSearchWidget = new IncSearchWidget( tb ); | 2062 | mIncSearchWidget = new IncSearchWidget( tb ); |
2063 | // tb->insertWidget(-1, 0, mIncSearchWidget); | 2063 | // tb->insertWidget(-1, 0, mIncSearchWidget); |
2064 | #ifndef DESKTOP_VERSION | 2064 | #ifndef DESKTOP_VERSION |
2065 | } else { | 2065 | } else { |
2066 | //US setup toolbar | 2066 | //US setup toolbar |
2067 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); | 2067 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); |
2068 | QPopupMenu *popupBarTB = new QPopupMenu( this ); | 2068 | QPopupMenu *popupBarTB = new QPopupMenu( this ); |
2069 | menuBarTB->insertItem( "ME", popupBarTB); | 2069 | menuBarTB->insertItem( "ME", popupBarTB); |
2070 | tb->insertWidget(-1, 0, menuBarTB); | 2070 | tb->insertWidget(-1, 0, menuBarTB); |
2071 | mIncSearchWidget = new IncSearchWidget( tb ); | 2071 | mIncSearchWidget = new IncSearchWidget( tb ); |
2072 | 2072 | ||
2073 | tb->enableMoving(false); | 2073 | tb->enableMoving(false); |
2074 | popupBarTB->insertItem( i18n("&File"), fileMenu ); | 2074 | popupBarTB->insertItem( i18n("&File"), fileMenu ); |
2075 | popupBarTB->insertItem( i18n("&Edit"), editMenu ); | 2075 | popupBarTB->insertItem( i18n("&Edit"), editMenu ); |
2076 | popupBarTB->insertItem( i18n("&View"), viewMenu ); | 2076 | popupBarTB->insertItem( i18n("&View"), viewMenu ); |
2077 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); | 2077 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); |
2078 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); | 2078 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); |
2079 | mViewManager->getFilterAction()->plug ( popupBarTB); | 2079 | mViewManager->getFilterAction()->plug ( popupBarTB); |
2080 | //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); | 2080 | //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); |
2081 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); | 2081 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); |
2082 | if (QApplication::desktop()->width() > 320 ) { | 2082 | if (QApplication::desktop()->width() > 320 ) { |
2083 | // mViewManager->getFilterAction()->plug ( tb); | 2083 | // mViewManager->getFilterAction()->plug ( tb); |
2084 | } | 2084 | } |
2085 | } | 2085 | } |
2086 | #endif | 2086 | #endif |
2087 | // mActionQuit->plug ( mMainWindow->toolBar()); | 2087 | // mActionQuit->plug ( mMainWindow->toolBar()); |
2088 | 2088 | ||
2089 | 2089 | ||
2090 | 2090 | ||
2091 | //US Now connect the actions with the menue entries. | 2091 | //US Now connect the actions with the menue entries. |
2092 | mActionPrint->plug( fileMenu ); | 2092 | mActionPrint->plug( fileMenu ); |
2093 | mActionMail->plug( fileMenu ); | 2093 | mActionMail->plug( fileMenu ); |
2094 | fileMenu->insertSeparator(); | 2094 | fileMenu->insertSeparator(); |
2095 | 2095 | ||
2096 | mActionNewContact->plug( fileMenu ); | 2096 | mActionNewContact->plug( fileMenu ); |
2097 | mActionNewContact->plug( tb ); | 2097 | mActionNewContact->plug( tb ); |
2098 | 2098 | ||
2099 | mActionEditAddressee->plug( fileMenu ); | 2099 | mActionEditAddressee->plug( fileMenu ); |
2100 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || | 2100 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || |
2101 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) | 2101 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) |
2102 | mActionEditAddressee->plug( tb ); | 2102 | mActionEditAddressee->plug( tb ); |
2103 | 2103 | ||
2104 | fileMenu->insertSeparator(); | 2104 | fileMenu->insertSeparator(); |
2105 | mActionSave->plug( fileMenu ); | 2105 | mActionSave->plug( fileMenu ); |
2106 | fileMenu->insertItem( "&Import", ImportMenu ); | 2106 | fileMenu->insertItem( "&Import", ImportMenu ); |
2107 | fileMenu->insertItem( "&Export", ExportMenu ); | 2107 | fileMenu->insertItem( "&Export", ExportMenu ); |
2108 | fileMenu->insertItem( i18n("&Change"), changeMenu ); | 2108 | fileMenu->insertItem( i18n("&Change"), changeMenu ); |
2109 | fileMenu->insertItem( i18n("&Beam"), beamMenu ); | 2109 | #ifndef DESKTOP_VERSION |
2110 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); | ||
2111 | #endif | ||
2112 | |||
2110 | fileMenu->insertSeparator(); | 2113 | fileMenu->insertSeparator(); |
2111 | mActionMailVCard->plug( fileMenu ); | 2114 | mActionMailVCard->plug( fileMenu ); |
2112 | #ifndef DESKTOP_VERSION | 2115 | #ifndef DESKTOP_VERSION |
2113 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); | 2116 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); |
2114 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); | 2117 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); |
2115 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); | 2118 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); |
2116 | #endif | 2119 | #endif |
2117 | fileMenu->insertSeparator(); | 2120 | fileMenu->insertSeparator(); |
2118 | mActionQuit->plug( fileMenu ); | 2121 | mActionQuit->plug( fileMenu ); |
2119 | #ifdef _WIN32_ | 2122 | #ifdef _WIN32_ |
2120 | mActionImportOL->plug( ImportMenu ); | 2123 | mActionImportOL->plug( ImportMenu ); |
2121 | #endif | 2124 | #endif |
2122 | // edit menu | 2125 | // edit menu |
2123 | mActionUndo->plug( editMenu ); | 2126 | mActionUndo->plug( editMenu ); |
2124 | mActionRedo->plug( editMenu ); | 2127 | mActionRedo->plug( editMenu ); |
2125 | editMenu->insertSeparator(); | 2128 | editMenu->insertSeparator(); |
2126 | mActionCut->plug( editMenu ); | 2129 | mActionCut->plug( editMenu ); |
2127 | mActionCopy->plug( editMenu ); | 2130 | mActionCopy->plug( editMenu ); |
2128 | mActionPaste->plug( editMenu ); | 2131 | mActionPaste->plug( editMenu ); |
2129 | mActionDelete->plug( editMenu ); | 2132 | mActionDelete->plug( editMenu ); |
2130 | editMenu->insertSeparator(); | 2133 | editMenu->insertSeparator(); |
2131 | mActionSelectAll->plug( editMenu ); | 2134 | mActionSelectAll->plug( editMenu ); |
2132 | 2135 | ||
2133 | mActionRemoveVoice->plug( changeMenu ); | 2136 | mActionRemoveVoice->plug( changeMenu ); |
2134 | // settings menu | 2137 | // settings menu |
2135 | //US special menuentry to configure the addressbook resources. On KDE | 2138 | //US special menuentry to configure the addressbook resources. On KDE |
2136 | // you do that through the control center !!! | 2139 | // you do that through the control center !!! |
2137 | mActionConfigResources->plug( settingsMenu ); | 2140 | mActionConfigResources->plug( settingsMenu ); |
2138 | settingsMenu->insertSeparator(); | 2141 | settingsMenu->insertSeparator(); |
2139 | 2142 | ||
2140 | mActionConfigKAddressbook->plug( settingsMenu ); | 2143 | mActionConfigKAddressbook->plug( settingsMenu ); |
2141 | 2144 | ||
2142 | if ( mIsPart ) { | 2145 | if ( mIsPart ) { |
2143 | //US not implemented yet | 2146 | //US not implemented yet |
2144 | //mActionConfigShortcuts->plug( settingsMenu ); | 2147 | //mActionConfigShortcuts->plug( settingsMenu ); |
2145 | //mActionConfigureToolbars->plug( settingsMenu ); | 2148 | //mActionConfigureToolbars->plug( settingsMenu ); |
2146 | 2149 | ||
2147 | } else { | 2150 | } else { |
2148 | //US not implemented yet | 2151 | //US not implemented yet |
2149 | //mActionKeyBindings->plug( settingsMenu ); | 2152 | //mActionKeyBindings->plug( settingsMenu ); |
2150 | } | 2153 | } |
2151 | 2154 | ||
2152 | settingsMenu->insertSeparator(); | 2155 | settingsMenu->insertSeparator(); |
2153 | 2156 | ||
2154 | mActionJumpBar->plug( settingsMenu ); | 2157 | mActionJumpBar->plug( settingsMenu ); |
2155 | mActionDetails->plug( settingsMenu ); | 2158 | mActionDetails->plug( settingsMenu ); |
2156 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 2159 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
2157 | mActionDetails->plug( tb ); | 2160 | mActionDetails->plug( tb ); |
2158 | settingsMenu->insertSeparator(); | 2161 | settingsMenu->insertSeparator(); |
2159 | #ifndef DESKTOP_VERSION | 2162 | #ifndef DESKTOP_VERSION |
2160 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); | 2163 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); |
2161 | #endif | 2164 | #endif |
2162 | settingsMenu->insertSeparator(); | 2165 | settingsMenu->insertSeparator(); |
2163 | 2166 | ||
2164 | mActionWhoAmI->plug( settingsMenu ); | 2167 | mActionWhoAmI->plug( settingsMenu ); |
2165 | mActionEditCategories->plug( settingsMenu ); | 2168 | mActionEditCategories->plug( settingsMenu ); |
2166 | mActionEditCategories->plug( changeMenu ); | 2169 | mActionEditCategories->plug( changeMenu ); |
2167 | mActionCategories->plug( changeMenu ); | 2170 | mActionCategories->plug( changeMenu ); |
2168 | mActionManageCategories->plug( changeMenu ); | 2171 | mActionManageCategories->plug( changeMenu ); |
2169 | 2172 | ||
2170 | mActionCategories->plug( settingsMenu ); | 2173 | mActionCategories->plug( settingsMenu ); |
2171 | mActionManageCategories->plug( settingsMenu ); | 2174 | mActionManageCategories->plug( settingsMenu ); |
2172 | 2175 | ||
2173 | 2176 | ||
2174 | mActionWN->plug( helpMenu ); | 2177 | mActionWN->plug( helpMenu ); |
2175 | mActionSyncHowto->plug( helpMenu ); | 2178 | mActionSyncHowto->plug( helpMenu ); |
2176 | mActionKdeSyncHowto->plug( helpMenu ); | 2179 | mActionKdeSyncHowto->plug( helpMenu ); |
2177 | mActionMultiSyncHowto->plug( helpMenu ); | 2180 | mActionMultiSyncHowto->plug( helpMenu ); |
2178 | mActionFaq->plug( helpMenu ); | 2181 | mActionFaq->plug( helpMenu ); |
2179 | mActionLicence->plug( helpMenu ); | 2182 | mActionLicence->plug( helpMenu ); |
2180 | mActionAboutKAddressbook->plug( helpMenu ); | 2183 | mActionAboutKAddressbook->plug( helpMenu ); |
2181 | 2184 | ||
2182 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { | 2185 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { |
2183 | 2186 | ||
2184 | mActionSave->plug( tb ); | 2187 | mActionSave->plug( tb ); |
2185 | mViewManager->getFilterAction()->plug ( tb); | 2188 | mViewManager->getFilterAction()->plug ( tb); |
2186 | if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { | 2189 | if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { |
2187 | mActionUndo->plug( tb ); | 2190 | mActionUndo->plug( tb ); |
2188 | mActionDelete->plug( tb ); | 2191 | mActionDelete->plug( tb ); |
2189 | mActionRedo->plug( tb ); | 2192 | mActionRedo->plug( tb ); |
2190 | } | 2193 | } |
2191 | } else { | 2194 | } else { |
2192 | mActionSave->plug( tb ); | 2195 | mActionSave->plug( tb ); |
2193 | tb->enableMoving(false); | 2196 | tb->enableMoving(false); |
2194 | } | 2197 | } |
2195 | //mActionQuit->plug ( tb ); | 2198 | //mActionQuit->plug ( tb ); |
2196 | // tb->insertWidget(-1, 0, mIncSearchWidget, 6); | 2199 | // tb->insertWidget(-1, 0, mIncSearchWidget, 6); |
2197 | 2200 | ||
2198 | //US link the searchwidget first to this. | 2201 | //US link the searchwidget first to this. |
2199 | // The real linkage to the toolbar happens later. | 2202 | // The real linkage to the toolbar happens later. |
2200 | //US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); | 2203 | //US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); |
2201 | //US tb->insertItem( mIncSearchWidget ); | 2204 | //US tb->insertItem( mIncSearchWidget ); |
2202 | /*US | 2205 | /*US |
2203 | mIncSearchWidget = new IncSearchWidget( tb ); | 2206 | mIncSearchWidget = new IncSearchWidget( tb ); |
2204 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 2207 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
2205 | SLOT( incrementalSearch( const QString& ) ) ); | 2208 | SLOT( incrementalSearch( const QString& ) ) ); |