author | zautrix <zautrix> | 2004-07-05 08:28:21 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-05 08:28:21 (UTC) |
commit | c2d4beeaeda44694a3e1c0b72a5808d2f518b286 (patch) (unidiff) | |
tree | ea8fffd3b18595781b6664f7a4aa705615351085 | |
parent | 9f0d4ee43ce6f8c61abbd546376ef4f262261a1e (diff) | |
download | kdepimpi-c2d4beeaeda44694a3e1c0b72a5808d2f518b286.zip kdepimpi-c2d4beeaeda44694a3e1c0b72a5808d2f518b286.tar.gz kdepimpi-c2d4beeaeda44694a3e1c0b72a5808d2f518b286.tar.bz2 |
Fix of Jumpbuttonbar on 5500 screen
-rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 68d3d2d..8d08713 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1089,193 +1089,193 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent, | |||
1089 | const char *name ) | 1089 | const char *name ) |
1090 | { | 1090 | { |
1091 | AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent, | 1091 | AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent, |
1092 | name ? name : "editorDialog" ); | 1092 | name ? name : "editorDialog" ); |
1093 | 1093 | ||
1094 | //US | 1094 | //US |
1095 | dialog->setMaximumSize( 640, 480 ); | 1095 | dialog->setMaximumSize( 640, 480 ); |
1096 | dialog->showMaximized(); | 1096 | dialog->showMaximized(); |
1097 | 1097 | ||
1098 | connect( dialog, SIGNAL( contactModified( const KABC::Addressee& ) ), | 1098 | connect( dialog, SIGNAL( contactModified( const KABC::Addressee& ) ), |
1099 | SLOT( contactModified( const KABC::Addressee& ) ) ); | 1099 | SLOT( contactModified( const KABC::Addressee& ) ) ); |
1100 | connect( dialog, SIGNAL( editorDestroyed( const QString& ) ), | 1100 | connect( dialog, SIGNAL( editorDestroyed( const QString& ) ), |
1101 | SLOT( slotEditorDestroyed( const QString& ) ) ); | 1101 | SLOT( slotEditorDestroyed( const QString& ) ) ); |
1102 | 1102 | ||
1103 | return dialog; | 1103 | return dialog; |
1104 | } | 1104 | } |
1105 | 1105 | ||
1106 | void KABCore::slotEditorDestroyed( const QString &uid ) | 1106 | void KABCore::slotEditorDestroyed( const QString &uid ) |
1107 | { | 1107 | { |
1108 | mEditorDict.remove( uid ); | 1108 | mEditorDict.remove( uid ); |
1109 | } | 1109 | } |
1110 | 1110 | ||
1111 | void KABCore::initGUI() | 1111 | void KABCore::initGUI() |
1112 | { | 1112 | { |
1113 | #ifndef KAB_EMBEDDED | 1113 | #ifndef KAB_EMBEDDED |
1114 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1114 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1115 | topLayout->setSpacing( KDialogBase::spacingHint() ); | 1115 | topLayout->setSpacing( KDialogBase::spacingHint() ); |
1116 | 1116 | ||
1117 | mExtensionBarSplitter = new QSplitter( this ); | 1117 | mExtensionBarSplitter = new QSplitter( this ); |
1118 | mExtensionBarSplitter->setOrientation( Qt::Vertical ); | 1118 | mExtensionBarSplitter->setOrientation( Qt::Vertical ); |
1119 | 1119 | ||
1120 | mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); | 1120 | mDetailsSplitter = new QSplitter( mExtensionBarSplitter ); |
1121 | 1121 | ||
1122 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); | 1122 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); |
1123 | mIncSearchWidget = new IncSearchWidget( viewSpace ); | 1123 | mIncSearchWidget = new IncSearchWidget( viewSpace ); |
1124 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1124 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1125 | SLOT( incrementalSearch( const QString& ) ) ); | 1125 | SLOT( incrementalSearch( const QString& ) ) ); |
1126 | 1126 | ||
1127 | mViewManager = new ViewManager( this, viewSpace ); | 1127 | mViewManager = new ViewManager( this, viewSpace ); |
1128 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1128 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1129 | 1129 | ||
1130 | mDetails = new ViewContainer( mDetailsSplitter ); | 1130 | mDetails = new ViewContainer( mDetailsSplitter ); |
1131 | 1131 | ||
1132 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1132 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1133 | 1133 | ||
1134 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1134 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1135 | 1135 | ||
1136 | topLayout->addWidget( mExtensionBarSplitter ); | 1136 | topLayout->addWidget( mExtensionBarSplitter ); |
1137 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); | 1137 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); |
1138 | topLayout->addWidget( mJumpButtonBar ); | 1138 | topLayout->addWidget( mJumpButtonBar ); |
1139 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); | 1139 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); |
1140 | 1140 | ||
1141 | mXXPortManager = new XXPortManager( this, this ); | 1141 | mXXPortManager = new XXPortManager( this, this ); |
1142 | 1142 | ||
1143 | #else //KAB_EMBEDDED | 1143 | #else //KAB_EMBEDDED |
1144 | //US initialize viewMenu before settingup viewmanager. | 1144 | //US initialize viewMenu before settingup viewmanager. |
1145 | // Viewmanager needs this menu to plugin submenues. | 1145 | // Viewmanager needs this menu to plugin submenues. |
1146 | viewMenu = new QPopupMenu( this ); | 1146 | viewMenu = new QPopupMenu( this ); |
1147 | settingsMenu = new QPopupMenu( this ); | 1147 | settingsMenu = new QPopupMenu( this ); |
1148 | //filterMenu = new QPopupMenu( this ); | 1148 | //filterMenu = new QPopupMenu( this ); |
1149 | ImportMenu = new QPopupMenu( this ); | 1149 | ImportMenu = new QPopupMenu( this ); |
1150 | ExportMenu = new QPopupMenu( this ); | 1150 | ExportMenu = new QPopupMenu( this ); |
1151 | 1151 | ||
1152 | 1152 | ||
1153 | //US since we have no splitter for the embedded system, setup | 1153 | //US since we have no splitter for the embedded system, setup |
1154 | // a layout with two frames. One left and one right. | 1154 | // a layout with two frames. One left and one right. |
1155 | 1155 | ||
1156 | QBoxLayout *topLayout; | 1156 | QBoxLayout *topLayout; |
1157 | 1157 | ||
1158 | // = new QHBoxLayout( this ); | 1158 | // = new QHBoxLayout( this ); |
1159 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); | 1159 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); |
1160 | 1160 | ||
1161 | // QWidget *mainBox = new QWidget( this ); | 1161 | // QWidget *mainBox = new QWidget( this ); |
1162 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); | 1162 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); |
1163 | 1163 | ||
1164 | #ifdef DESKTOP_VERSION | 1164 | #ifdef DESKTOP_VERSION |
1165 | topLayout = new QHBoxLayout( this ); | 1165 | topLayout = new QHBoxLayout( this ); |
1166 | 1166 | ||
1167 | 1167 | ||
1168 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1168 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1169 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1169 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1170 | 1170 | ||
1171 | topLayout->addWidget(mMiniSplitter ); | 1171 | topLayout->addWidget(mMiniSplitter ); |
1172 | 1172 | ||
1173 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); | 1173 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); |
1174 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1174 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1175 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); | 1175 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); |
1176 | mDetails = new ViewContainer( mMiniSplitter ); | 1176 | mDetails = new ViewContainer( mMiniSplitter ); |
1177 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1177 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1178 | #else | 1178 | #else |
1179 | if ( QApplication::desktop()->width() > 480 ) { | 1179 | if ( QApplication::desktop()->width() > 480 ) { |
1180 | topLayout = new QHBoxLayout( this ); | 1180 | topLayout = new QHBoxLayout( this ); |
1181 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1181 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1182 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1182 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1183 | } else { | 1183 | } else { |
1184 | 1184 | ||
1185 | topLayout = new QVBoxLayout( this ); | 1185 | topLayout = new QHBoxLayout( this ); |
1186 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this); | 1186 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this); |
1187 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1187 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1188 | } | 1188 | } |
1189 | 1189 | ||
1190 | topLayout->addWidget(mMiniSplitter ); | 1190 | topLayout->addWidget(mMiniSplitter ); |
1191 | mViewManager = new ViewManager( this, mMiniSplitter ); | 1191 | mViewManager = new ViewManager( this, mMiniSplitter ); |
1192 | mDetails = new ViewContainer( mMiniSplitter ); | 1192 | mDetails = new ViewContainer( mMiniSplitter ); |
1193 | 1193 | ||
1194 | 1194 | ||
1195 | mExtensionManager = new ExtensionManager( this, mMiniSplitter ); | 1195 | mExtensionManager = new ExtensionManager( this, mMiniSplitter ); |
1196 | #endif | 1196 | #endif |
1197 | //eh->hide(); | 1197 | //eh->hide(); |
1198 | // topLayout->addWidget(mExtensionManager ); | 1198 | // topLayout->addWidget(mExtensionManager ); |
1199 | 1199 | ||
1200 | 1200 | ||
1201 | /*US | 1201 | /*US |
1202 | #ifndef KAB_NOSPLITTER | 1202 | #ifndef KAB_NOSPLITTER |
1203 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1203 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1204 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); | 1204 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); |
1205 | topLayout->setSpacing( 10 ); | 1205 | topLayout->setSpacing( 10 ); |
1206 | 1206 | ||
1207 | mDetailsSplitter = new QSplitter( this ); | 1207 | mDetailsSplitter = new QSplitter( this ); |
1208 | 1208 | ||
1209 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); | 1209 | QVBox *viewSpace = new QVBox( mDetailsSplitter ); |
1210 | 1210 | ||
1211 | mViewManager = new ViewManager( this, viewSpace ); | 1211 | mViewManager = new ViewManager( this, viewSpace ); |
1212 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1212 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1213 | 1213 | ||
1214 | mDetails = new ViewContainer( mDetailsSplitter ); | 1214 | mDetails = new ViewContainer( mDetailsSplitter ); |
1215 | 1215 | ||
1216 | topLayout->addWidget( mDetailsSplitter ); | 1216 | topLayout->addWidget( mDetailsSplitter ); |
1217 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1217 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1218 | #else //KAB_NOSPLITTER | 1218 | #else //KAB_NOSPLITTER |
1219 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1219 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1220 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); | 1220 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); |
1221 | topLayout->setSpacing( 10 ); | 1221 | topLayout->setSpacing( 10 ); |
1222 | 1222 | ||
1223 | // mDetailsSplitter = new QSplitter( this ); | 1223 | // mDetailsSplitter = new QSplitter( this ); |
1224 | 1224 | ||
1225 | QVBox *viewSpace = new QVBox( this ); | 1225 | QVBox *viewSpace = new QVBox( this ); |
1226 | 1226 | ||
1227 | mViewManager = new ViewManager( this, viewSpace ); | 1227 | mViewManager = new ViewManager( this, viewSpace ); |
1228 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1228 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1229 | 1229 | ||
1230 | mDetails = new ViewContainer( this ); | 1230 | mDetails = new ViewContainer( this ); |
1231 | 1231 | ||
1232 | topLayout->addWidget( viewSpace ); | 1232 | topLayout->addWidget( viewSpace ); |
1233 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1233 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1234 | topLayout->addWidget( mDetails ); | 1234 | topLayout->addWidget( mDetails ); |
1235 | #endif //KAB_NOSPLITTER | 1235 | #endif //KAB_NOSPLITTER |
1236 | */ | 1236 | */ |
1237 | 1237 | ||
1238 | 1238 | ||
1239 | #endif //KAB_EMBEDDED | 1239 | #endif //KAB_EMBEDDED |
1240 | initActions(); | 1240 | initActions(); |
1241 | 1241 | ||
1242 | #ifdef KAB_EMBEDDED | 1242 | #ifdef KAB_EMBEDDED |
1243 | addActionsManually(); | 1243 | addActionsManually(); |
1244 | //US make sure the export and import menues are initialized before creating the xxPortManager. | 1244 | //US make sure the export and import menues are initialized before creating the xxPortManager. |
1245 | mXXPortManager = new XXPortManager( this, this ); | 1245 | mXXPortManager = new XXPortManager( this, this ); |
1246 | 1246 | ||
1247 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); | 1247 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); |
1248 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); | 1248 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); |
1249 | // mActionQuit->plug ( mMainWindow->toolBar()); | 1249 | // mActionQuit->plug ( mMainWindow->toolBar()); |
1250 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); | 1250 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); |
1251 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); | 1251 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); |
1252 | // mIncSearchWidget->hide(); | 1252 | // mIncSearchWidget->hide(); |
1253 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1253 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1254 | SLOT( incrementalSearch( const QString& ) ) ); | 1254 | SLOT( incrementalSearch( const QString& ) ) ); |
1255 | 1255 | ||
1256 | 1256 | ||
1257 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1257 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1258 | 1258 | ||
1259 | topLayout->addWidget( mJumpButtonBar ); | 1259 | topLayout->addWidget( mJumpButtonBar ); |
1260 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); | 1260 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); |
1261 | 1261 | ||
1262 | // mMainWindow->getIconToolBar()->raise(); | 1262 | // mMainWindow->getIconToolBar()->raise(); |
1263 | 1263 | ||
1264 | #endif //KAB_EMBEDDED | 1264 | #endif //KAB_EMBEDDED |
1265 | 1265 | ||
1266 | } | 1266 | } |
1267 | void KABCore::initActions() | 1267 | void KABCore::initActions() |
1268 | { | 1268 | { |
1269 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); | 1269 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); |
1270 | 1270 | ||
1271 | #ifndef KAB_EMBEDDED | 1271 | #ifndef KAB_EMBEDDED |
1272 | connect( QApplication::clipboard(), SIGNAL( dataChanged() ), | 1272 | connect( QApplication::clipboard(), SIGNAL( dataChanged() ), |
1273 | SLOT( clipboardDataChanged() ) ); | 1273 | SLOT( clipboardDataChanged() ) ); |
1274 | #endif //KAB_EMBEDDED | 1274 | #endif //KAB_EMBEDDED |
1275 | 1275 | ||
1276 | // file menu | 1276 | // file menu |
1277 | if ( mIsPart ) { | 1277 | if ( mIsPart ) { |
1278 | mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this, | 1278 | mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this, |
1279 | SLOT( sendMail() ), actionCollection(), | 1279 | SLOT( sendMail() ), actionCollection(), |
1280 | "kaddressbook_mail" ); | 1280 | "kaddressbook_mail" ); |
1281 | mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this, | 1281 | mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this, |