summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-16 21:16:24 (UTC)
committer zautrix <zautrix>2005-03-16 21:16:24 (UTC)
commitb7184073d5e552e0f04b14c5fc0c20a7bfd26d3d (patch) (unidiff)
tree3e74cd9653c0aa4f65dd4658369662c93c3005aa
parent3f6f846915ac28e623e1f04201b233111d8bbbdf (diff)
downloadkdepimpi-b7184073d5e552e0f04b14c5fc0c20a7bfd26d3d.zip
kdepimpi-b7184073d5e552e0f04b14c5fc0c20a7bfd26d3d.tar.gz
kdepimpi-b7184073d5e552e0f04b14c5fc0c20a7bfd26d3d.tar.bz2
some fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp9
-rw-r--r--libkdepim/categoryeditdialog_base.cpp5
2 files changed, 8 insertions, 6 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3b1a0c1..3f7a7da 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2157,103 +2157,104 @@ void KABCore::addActionsManually()
2157#endif 2157#endif
2158 mActionMail->plug( fileMenu ); 2158 mActionMail->plug( fileMenu );
2159 fileMenu->insertSeparator(); 2159 fileMenu->insertSeparator();
2160 2160
2161 mActionNewContact->plug( fileMenu ); 2161 mActionNewContact->plug( fileMenu );
2162 mActionNewContact->plug( tb ); 2162 mActionNewContact->plug( tb );
2163 2163
2164 mActionEditAddressee->plug( fileMenu ); 2164 mActionEditAddressee->plug( fileMenu );
2165 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || 2165 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
2166 // (!KABPrefs::instance()->mMultipleViewsAtOnce )) 2166 // (!KABPrefs::instance()->mMultipleViewsAtOnce ))
2167 mActionEditAddressee->plug( tb ); 2167 mActionEditAddressee->plug( tb );
2168 2168
2169 fileMenu->insertSeparator(); 2169 fileMenu->insertSeparator();
2170 mActionSave->plug( fileMenu ); 2170 mActionSave->plug( fileMenu );
2171 fileMenu->insertItem( "&Import", ImportMenu ); 2171 fileMenu->insertItem( "&Import", ImportMenu );
2172 fileMenu->insertItem( "&Export", ExportMenu ); 2172 fileMenu->insertItem( "&Export", ExportMenu );
2173 fileMenu->insertItem( i18n("&Change"), changeMenu ); 2173 fileMenu->insertItem( i18n("&Change"), changeMenu );
2174#ifndef DESKTOP_VERSION 2174#ifndef DESKTOP_VERSION
2175 if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); 2175 if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu );
2176#endif 2176#endif
2177#if 0 2177#if 0
2178 // PENDING fix MailVCard 2178 // PENDING fix MailVCard
2179 fileMenu->insertSeparator(); 2179 fileMenu->insertSeparator();
2180 mActionMailVCard->plug( fileMenu ); 2180 mActionMailVCard->plug( fileMenu );
2181#endif 2181#endif
2182#ifndef DESKTOP_VERSION 2182#ifndef DESKTOP_VERSION
2183 if ( Ir::supported() ) mActionBR->plug( beamMenu ); 2183 if ( Ir::supported() ) mActionBR->plug( beamMenu );
2184 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); 2184 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
2185 if ( Ir::supported() ) mActionBeam->plug( beamMenu ); 2185 if ( Ir::supported() ) mActionBeam->plug( beamMenu );
2186#endif 2186#endif
2187 fileMenu->insertSeparator(); 2187 fileMenu->insertSeparator();
2188 mActionQuit->plug( fileMenu ); 2188 mActionQuit->plug( fileMenu );
2189#ifdef _OL_IMPORT_ 2189#ifdef _OL_IMPORT_
2190 mActionImportOL->plug( ImportMenu ); 2190 mActionImportOL->plug( ImportMenu );
2191#endif 2191#endif
2192 // edit menu 2192 // edit menu
2193 mActionUndo->plug( editMenu ); 2193 mActionUndo->plug( editMenu );
2194 mActionRedo->plug( editMenu ); 2194 mActionRedo->plug( editMenu );
2195 editMenu->insertSeparator(); 2195 editMenu->insertSeparator();
2196 mActionCut->plug( editMenu ); 2196 mActionCut->plug( editMenu );
2197 mActionCopy->plug( editMenu ); 2197 mActionCopy->plug( editMenu );
2198 mActionPaste->plug( editMenu ); 2198 mActionPaste->plug( editMenu );
2199 mActionDelete->plug( editMenu ); 2199 mActionDelete->plug( editMenu );
2200 editMenu->insertSeparator(); 2200 editMenu->insertSeparator();
2201 mActionSelectAll->plug( editMenu ); 2201 mActionSelectAll->plug( editMenu );
2202 2202
2203 mActionSetFormattedName->plug( changeMenu ); 2203 mActionSetFormattedName->plug( changeMenu );
2204 mActionRemoveVoice->plug( changeMenu ); 2204 mActionRemoveVoice->plug( changeMenu );
2205 // settings menu 2205 // settingsmings menu
2206//US special menuentry to configure the addressbook resources. On KDE 2206//US special menuentry to configure the addressbook resources. On KDE
2207// you do that through the control center !!! 2207// you do that through the control center !!!
2208 mActionConfigResources->plug( settingsMenu ); 2208 // settingsMenu->insertSeparator();
2209 settingsMenu->insertSeparator();
2210 2209
2211 mActionConfigKAddressbook->plug( settingsMenu ); 2210 mActionConfigKAddressbook->plug( settingsMenu, 0 );
2211 mActionConfigResources->plug( settingsMenu,1 );
2212 settingsMenu->insertSeparator(2);
2212 2213
2213 if ( mIsPart ) { 2214 if ( mIsPart ) {
2214 //US not implemented yet 2215 //US not implemented yet
2215 //mActionConfigShortcuts->plug( settingsMenu ); 2216 //mActionConfigShortcuts->plug( settingsMenu );
2216 //mActionConfigureToolbars->plug( settingsMenu ); 2217 //mActionConfigureToolbars->plug( settingsMenu );
2217 2218
2218 } else { 2219 } else {
2219 //US not implemented yet 2220 //US not implemented yet
2220 //mActionKeyBindings->plug( settingsMenu ); 2221 //mActionKeyBindings->plug( settingsMenu );
2221 } 2222 }
2222 2223
2223 settingsMenu->insertSeparator(); 2224 settingsMenu->insertSeparator();
2224 2225
2225 mActionJumpBar->plug( settingsMenu ); 2226 mActionJumpBar->plug( settingsMenu );
2226 mActionDetails->plug( settingsMenu ); 2227 mActionDetails->plug( settingsMenu );
2227 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) 2228 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop )
2228 mActionDetails->plug( tb ); 2229 mActionDetails->plug( tb );
2229 settingsMenu->insertSeparator(); 2230 settingsMenu->insertSeparator();
2230#ifndef DESKTOP_VERSION 2231#ifndef DESKTOP_VERSION
2231 if ( Ir::supported() ) mActionBR->plug(settingsMenu ); 2232 if ( Ir::supported() ) mActionBR->plug(settingsMenu );
2232 settingsMenu->insertSeparator(); 2233 settingsMenu->insertSeparator();
2233#endif 2234#endif
2234 2235
2235 mActionWhoAmI->plug( settingsMenu ); 2236 mActionWhoAmI->plug( settingsMenu );
2236 mActionEditCategories->plug( settingsMenu ); 2237 mActionEditCategories->plug( settingsMenu );
2237 mActionEditCategories->plug( changeMenu ); 2238 mActionEditCategories->plug( changeMenu );
2238 mActionCategories->plug( changeMenu ); 2239 mActionCategories->plug( changeMenu );
2239 mActionManageCategories->plug( changeMenu ); 2240 mActionManageCategories->plug( changeMenu );
2240 2241
2241 mActionCategories->plug( settingsMenu ); 2242 mActionCategories->plug( settingsMenu );
2242 mActionManageCategories->plug( settingsMenu ); 2243 mActionManageCategories->plug( settingsMenu );
2243 2244
2244 2245
2245 mActionWN->plug( helpMenu ); 2246 mActionWN->plug( helpMenu );
2246 mActionSyncHowto->plug( helpMenu ); 2247 mActionSyncHowto->plug( helpMenu );
2247 mActionKdeSyncHowto->plug( helpMenu ); 2248 mActionKdeSyncHowto->plug( helpMenu );
2248 mActionMultiSyncHowto->plug( helpMenu ); 2249 mActionMultiSyncHowto->plug( helpMenu );
2249 mActionFaq->plug( helpMenu ); 2250 mActionFaq->plug( helpMenu );
2250 mActionLicence->plug( helpMenu ); 2251 mActionLicence->plug( helpMenu );
2251 mActionAboutKAddressbook->plug( helpMenu ); 2252 mActionAboutKAddressbook->plug( helpMenu );
2252 2253
2253 if (KGlobal::getDesktopSize() > KGlobal::Small ) { 2254 if (KGlobal::getDesktopSize() > KGlobal::Small ) {
2254 2255
2255 mActionSave->plug( tb ); 2256 mActionSave->plug( tb );
2256 mViewManager->getFilterAction()->plug ( tb); 2257 mViewManager->getFilterAction()->plug ( tb);
2257 //LR hide filteraction on started in 480x640 2258 //LR hide filteraction on started in 480x640
2258 if (QApplication::desktop()->width() == 480 ) { 2259 if (QApplication::desktop()->width() == 480 ) {
2259 mViewManager->getFilterAction()->setComboWidth( 0 ); 2260 mViewManager->getFilterAction()->setComboWidth( 0 );
diff --git a/libkdepim/categoryeditdialog_base.cpp b/libkdepim/categoryeditdialog_base.cpp
index 2390bbd..1908576 100644
--- a/libkdepim/categoryeditdialog_base.cpp
+++ b/libkdepim/categoryeditdialog_base.cpp
@@ -1,119 +1,120 @@
1#include <klocale.h> 1#include <klocale.h>
2/**************************************************************************** 2/****************************************************************************
3** Form implementation generated from reading ui file '/build/kde/cvs/korge/kdepim/libkdepim/categoryeditdialog_base.ui' 3** Form implementation generated from reading ui file '/build/kde/cvs/korge/kdepim/libkdepim/categoryeditdialog_base.ui'
4** 4**
5** Created: Sat Mar 29 21:46:09 2003 5** Created: Sat Mar 29 21:46:09 2003
6** by: The User Interface Compiler () 6** by: The User Interface Compiler ()
7** 7**
8** WARNING! All changes made in this file will be lost! 8** WARNING! All changes made in this file will be lost!
9****************************************************************************/ 9****************************************************************************/
10 10
11#include "categoryeditdialog_base.h" 11#include "categoryeditdialog_base.h"
12 12
13#include <qvariant.h> 13#include <qvariant.h>
14#include <qheader.h> 14#include <qheader.h>
15#include <qlineedit.h> 15#include <qlineedit.h>
16#include <qlistview.h> 16#include <qlistview.h>
17#include <qpushbutton.h> 17#include <qpushbutton.h>
18#include <qlayout.h> 18#include <qlayout.h>
19#include <qtooltip.h> 19#include <qtooltip.h>
20#include <qwhatsthis.h> 20#include <qwhatsthis.h>
21 21
22/* 22/*
23 * Constructs a CategoryEditDialog_base as a child of 'parent', with the 23 * Constructs a CategoryEditDialog_base as a child of 'parent', with the
24 * name 'name' and widget flags set to 'f'. 24 * name 'name' and widget flags set to 'f'.
25 * 25 *
26 * The dialog will by default be modeless, unless you set 'modal' to 26 * The dialog will by default be modeless, unless you set 'modal' to
27 * TRUE to construct a modal dialog. 27 * TRUE to construct a modal dialog.
28 */ 28 */
29CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl ) 29CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
30 : QDialog( parent, name, true, fl ) 30 : QDialog( parent, name, true, fl )
31 31
32{ 32{
33 if ( !name ) 33 if ( !name )
34 setName( "CategoryEditDialog_base" ); 34 setName( "CategoryEditDialog_base" );
35 CategoryEditDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "CategoryEditDialog_baseLayout"); 35 CategoryEditDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "CategoryEditDialog_baseLayout");
36 36
37 mEdit = new QLineEdit( this, "mEdit" ); 37 mEdit = new QLineEdit( this, "mEdit" );
38 38
39 CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 1 ); 39 CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 0 );
40 40
41 Layout13 = new QHBoxLayout( 0, 0, 6, "Layout13"); 41 Layout13 = new QHBoxLayout( 0, 0, 6, "Layout13");
42 42
43 // mButtonHelp = new QPushButton( this, "mButtonHelp" ); 43 // mButtonHelp = new QPushButton( this, "mButtonHelp" );
44 //mButtonHelp->setAutoDefault( TRUE ); 44 //mButtonHelp->setAutoDefault( TRUE );
45 //Layout13->addWidget( mButtonHelp ); 45 //Layout13->addWidget( mButtonHelp );
46 //QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); 46 //QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
47 //Layout13->addItem( spacer ); 47 //Layout13->addItem( spacer );
48 48
49 //mApply = new QPushButton( this, "mApply" ); 49 //mApply = new QPushButton( this, "mApply" );
50 // Layout13->addWidget( mApply ); 50 // Layout13->addWidget( mApply );
51 51
52 mButtonOk = new QPushButton( this, "mButtonOk" ); 52 mButtonOk = new QPushButton( this, "mButtonOk" );
53 mButtonOk->setAutoDefault( TRUE ); 53 mButtonOk->setAutoDefault( TRUE );
54 mButtonOk->setDefault( TRUE ); 54 mButtonOk->setDefault( TRUE );
55 Layout13->addWidget( mButtonOk ); 55 Layout13->addWidget( mButtonOk );
56 56
57 mButtonCancel = new QPushButton( this, "mButtonCancel" ); 57 mButtonCancel = new QPushButton( this, "mButtonCancel" );
58 mButtonCancel->setAutoDefault( TRUE ); 58 mButtonCancel->setAutoDefault( TRUE );
59 Layout13->addWidget( mButtonCancel ); 59 Layout13->addWidget( mButtonCancel );
60 60
61 CategoryEditDialog_baseLayout->addMultiCellLayout( Layout13, 2, 2, 0, 1 ); 61 CategoryEditDialog_baseLayout->addMultiCellLayout( Layout13, 2, 2, 0, 1 );
62 62
63 mCategories = new QListView( this, "mCategories" ); 63 mCategories = new QListView( this, "mCategories" );
64 mCategories->addColumn( tr2i18n( "Category" ) ); 64 mCategories->addColumn( tr2i18n( "Category" ) );
65 65
66 CategoryEditDialog_baseLayout->addWidget( mCategories, 0, 0 ); 66 CategoryEditDialog_baseLayout->addWidget( mCategories, 0, 0 );
67 67
68 layout103 = new QVBoxLayout( 0, 0, 6, "layout103"); 68 layout103 = new QVBoxLayout( 0, 0, 6, "layout103");
69 69
70 mButtonAdd = new QPushButton( this, "mButtonAdd" ); 70 mButtonAdd = new QPushButton( this, "mButtonAdd" );
71 layout103->addWidget( mButtonAdd ); 71 CategoryEditDialog_baseLayout->addMultiCellWidget(mButtonAdd , 1, 1, 1, 1 );
72 //layout103->addWidget( mButtonAdd );
72 73
73 mButtonModify = new QPushButton( this, "mButtonModify" ); 74 mButtonModify = new QPushButton( this, "mButtonModify" );
74 layout103->addWidget( mButtonModify ); 75 layout103->addWidget( mButtonModify );
75 76
76 mButtonRemove = new QPushButton( this, "mButtonRemove" ); 77 mButtonRemove = new QPushButton( this, "mButtonRemove" );
77 layout103->addWidget( mButtonRemove ); 78 layout103->addWidget( mButtonRemove );
78 QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); 79 QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
79 layout103->addItem( spacer_2 ); 80 layout103->addItem( spacer_2 );
80 81
81 CategoryEditDialog_baseLayout->addLayout( layout103, 0, 1 ); 82 CategoryEditDialog_baseLayout->addLayout( layout103, 0, 1 );
82 languageChange(); 83 languageChange();
83 resize( sizeHint() ); 84 resize( sizeHint() );
84 85
85 // signals and slots connections 86 // signals and slots connections
86 connect( mButtonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); 87 connect( mButtonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
87 connect( mButtonAdd, SIGNAL( clicked() ), this, SLOT( add() ) ); 88 connect( mButtonAdd, SIGNAL( clicked() ), this, SLOT( add() ) );
88 connect( mButtonModify, SIGNAL( clicked() ), this, SLOT( modify() ) ); 89 connect( mButtonModify, SIGNAL( clicked() ), this, SLOT( modify() ) );
89 connect( mButtonRemove, SIGNAL( clicked() ), this, SLOT( remove() ) ); 90 connect( mButtonRemove, SIGNAL( clicked() ), this, SLOT( remove() ) );
90 connect( mButtonOk, SIGNAL( clicked() ), this, SLOT( slotOk() ) ); 91 connect( mButtonOk, SIGNAL( clicked() ), this, SLOT( slotOk() ) );
91 //connect( mApply, SIGNAL( clicked() ), this, SLOT( slotApply() ) ); 92 //connect( mApply, SIGNAL( clicked() ), this, SLOT( slotApply() ) );
92 93
93 // tab order 94 // tab order
94 // setTabOrder( mCategories, mEdit ); 95 // setTabOrder( mCategories, mEdit );
95// setTabOrder( mEdit, mButtonAdd ); 96// setTabOrder( mEdit, mButtonAdd );
96// setTabOrder( mButtonAdd, mButtonModify ); 97// setTabOrder( mButtonAdd, mButtonModify );
97// setTabOrder( mButtonModify, mButtonRemove ); 98// setTabOrder( mButtonModify, mButtonRemove );
98// setTabOrder( mButtonRemove, mButtonHelp ); 99// setTabOrder( mButtonRemove, mButtonHelp );
99// setTabOrder( mButtonHelp, mApply ); 100// setTabOrder( mButtonHelp, mApply );
100// setTabOrder( mApply, mButtonOk ); 101// setTabOrder( mApply, mButtonOk );
101// setTabOrder( mButtonOk, mButtonCancel ); 102// setTabOrder( mButtonOk, mButtonCancel );
102} 103}
103 104
104/* 105/*
105 * Destroys the object and frees any allocated resources 106 * Destroys the object and frees any allocated resources
106 */ 107 */
107CategoryEditDialog_base::~CategoryEditDialog_base() 108CategoryEditDialog_base::~CategoryEditDialog_base()
108{ 109{
109 // no need to delete child widgets, Qt does it all for us 110 // no need to delete child widgets, Qt does it all for us
110} 111}
111 112
112/* 113/*
113 * Sets the strings of the subwidgets using the current 114 * Sets the strings of the subwidgets using the current
114 * language. 115 * language.
115 */ 116 */
116void CategoryEditDialog_base::languageChange() 117void CategoryEditDialog_base::languageChange()
117{ 118{
118 setCaption( tr2i18n( "Edit Categories" ) ); 119 setCaption( tr2i18n( "Edit Categories" ) );
119 // mButtonHelp->setText( tr2i18n( "&Help" ) ); 120 // mButtonHelp->setText( tr2i18n( "&Help" ) );