author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kaddressbook/old_mainwindow.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
Diffstat (limited to 'kaddressbook/old_mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/old_mainwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kaddressbook/old_mainwindow.cpp b/kaddressbook/old_mainwindow.cpp index 0e886d9..7a445c7 100644 --- a/kaddressbook/old_mainwindow.cpp +++ b/kaddressbook/old_mainwindow.cpp | |||
@@ -303,39 +303,39 @@ QPixmap MainWindow::loadPixmap( QString name ) | |||
303 | QString file; | 303 | QString file; |
304 | file = QDir::homeDirPath()+"/kaddressbook/pics/" + name+".png"; | 304 | file = QDir::homeDirPath()+"/kaddressbook/pics/" + name+".png"; |
305 | //qDebug("pixmap name %s ", file.latin1()); | 305 | //qDebug("pixmap name %s ", file.latin1()); |
306 | pixmapLoader.load( file ); | 306 | pixmapLoader.load( file ); |
307 | return pixmapLoader; | 307 | return pixmapLoader; |
308 | #else | 308 | #else |
309 | return Resource::loadPixmap( name ); | 309 | return Resource::loadPixmap( name ); |
310 | #endif | 310 | #endif |
311 | */ | 311 | */ |
312 | } | 312 | } |
313 | 313 | ||
314 | void MainWindow::initActions() | 314 | void MainWindow::initActions() |
315 | { | 315 | { |
316 | iconToolBar->clear(); | 316 | iconToolBar->clear(); |
317 | KABPrefs *p = KABPrefs::instance(); | 317 | KABPrefs *p = KABPrefs::instance(); |
318 | QPEMenuBar *menuBar1 = new QPEMenuBar( iconToolBar ); | 318 | QPEMenuBar *menuBar1 = new QPEMenuBar( iconToolBar ); |
319 | QPopupMenu *menuBar = new QPopupMenu( this ); | 319 | Q3PopupMenu *menuBar = new Q3PopupMenu( this ); |
320 | menuBar1->insertItem( "ME", menuBar); | 320 | menuBar1->insertItem( "ME", menuBar); |
321 | QPopupMenu *fileMenu = new QPopupMenu( this ); | 321 | Q3PopupMenu *fileMenu = new Q3PopupMenu( this ); |
322 | QPopupMenu *editMenu = new QPopupMenu( this ); | 322 | Q3PopupMenu *editMenu = new Q3PopupMenu( this ); |
323 | QPopupMenu *viewMenu = new QPopupMenu( this ); | 323 | Q3PopupMenu *viewMenu = new Q3PopupMenu( this ); |
324 | QPopupMenu *settingsMenu = new QPopupMenu( this ); | 324 | Q3PopupMenu *settingsMenu = new Q3PopupMenu( this ); |
325 | QPopupMenu *importMenu = new QPopupMenu( this ); | 325 | Q3PopupMenu *importMenu = new Q3PopupMenu( this ); |
326 | 326 | ||
327 | menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); | 327 | menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); |
328 | 328 | ||
329 | QIconSet icon; | 329 | QIconSet icon; |
330 | 330 | ||
331 | 331 | ||
332 | icon = loadPixmap( pathString + "newtodo" ); | 332 | icon = loadPixmap( pathString + "newtodo" ); |
333 | configureToolBarMenu->insertItem(icon, "New todo", 20 ); | 333 | configureToolBarMenu->insertItem(icon, "New todo", 20 ); |
334 | QAction* nt_action = new QAction( "New Todo", icon, "New Todo...", 0, this ); | 334 | QAction* nt_action = new QAction( "New Todo", icon, "New Todo...", 0, this ); |
335 | nt_action->addTo( actionMenu ); | 335 | nt_action->addTo( actionMenu ); |
336 | connect( nt_action, SIGNAL( activated() ), | 336 | connect( nt_action, SIGNAL( activated() ), |
337 | mView, SLOT( newTodo() ) ); | 337 | mView, SLOT( newTodo() ) ); |
338 | 338 | ||
339 | /* | 339 | /* |
340 | QAction *action; | 340 | QAction *action; |
341 | QIconSet icon; | 341 | QIconSet icon; |