Diffstat (limited to 'core/settings/launcher/tabdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 546e229..cef92d9 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -27,22 +27,27 @@ | |||
27 | 27 | ||
28 | #include "tabdialog.h" | 28 | #include "tabdialog.h" |
29 | 29 | ||
30 | /* OPIE */ | 30 | /* OPIE */ |
31 | #include <qpe/resource.h> | 31 | |
32 | #include <opie2/ofontselector.h> | 32 | #include <opie2/ofontselector.h> |
33 | #include <opie2/otabwidget.h> | 33 | #include <opie2/otabwidget.h> |
34 | #include <opie2/ocolorbutton.h> | 34 | #include <opie2/ocolorbutton.h> |
35 | #include <opie2/ofiledialog.h> | 35 | #include <opie2/ofiledialog.h> |
36 | #include <opie2/odebug.h> | 36 | #include <opie2/odebug.h> |
37 | 37 | ||
38 | /* QPE */ | ||
39 | #include <qpe/resource.h> | ||
40 | #include <qpe/qpeapplication.h> | ||
41 | |||
38 | /* QT */ | 42 | /* QT */ |
39 | #include <qlayout.h> | 43 | #include <qlayout.h> |
40 | #include <qvbox.h> | 44 | #include <qvbox.h> |
41 | #include <qtabbar.h> | 45 | #include <qtabbar.h> |
42 | #include <qiconview.h> | 46 | #include <qiconview.h> |
43 | #include <qapplication.h> | 47 | #include <qapplication.h> |
44 | #include <qlabel.h> | 48 | #include <qlabel.h> |
49 | #include <qfileinfo.h> | ||
45 | #include <qradiobutton.h> | 50 | #include <qradiobutton.h> |
46 | #include <qbuttongroup.h> | 51 | #include <qbuttongroup.h> |
47 | #include <qwhatsthis.h> | 52 | #include <qwhatsthis.h> |
48 | #include <qcheckbox.h> | 53 | #include <qcheckbox.h> |
@@ -413,11 +418,8 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) | |||
413 | gridLayout-> addWidget( rb, 1, 1 ); | 418 | gridLayout-> addWidget( rb, 1, 1 ); |
414 | 419 | ||
415 | connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int))); | 420 | connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int))); |
416 | 421 | ||
417 | // vertLayout-> addSpacing ( 8 ); | ||
418 | |||
419 | // gridLayout = new QGridLayout ( vertLayout ); | ||
420 | gridLayout-> addRowSpacing ( 2, 8 ); | 422 | gridLayout-> addRowSpacing ( 2, 8 ); |
421 | 423 | ||
422 | label = new QLabel ( tr( "Color:" ), tab ); | 424 | label = new QLabel ( tr( "Color:" ), tab ); |
423 | gridLayout-> addWidget ( label, 3, 0 ); | 425 | gridLayout-> addWidget ( label, 3, 0 ); |
@@ -427,8 +429,12 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) | |||
427 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); | 429 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); |
428 | 430 | ||
429 | vertLayout-> addStretch ( 10 ); | 431 | vertLayout-> addStretch ( 10 ); |
430 | 432 | ||
433 | if ( m_tc.m_last_directory == QString::null ) { | ||
434 | m_tc.m_last_directory = QPEApplication::documentDir(); | ||
435 | } | ||
436 | |||
431 | return tab; | 437 | return tab; |
432 | } | 438 | } |
433 | 439 | ||
434 | 440 | ||
@@ -479,10 +485,12 @@ void TabDialog::bgImageClicked ( ) | |||
479 | QStringList list; | 485 | QStringList list; |
480 | list << "image/*"; | 486 | list << "image/*"; |
481 | types. insert ( "Images", list ); | 487 | types. insert ( "Images", list ); |
482 | 488 | ||
483 | QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types ); | 489 | QString file = OFileDialog::getOpenFileName ( 1, m_tc.m_last_directory, QString::null, types ); |
490 | |||
484 | if ( !file. isEmpty ( )) { | 491 | if ( !file. isEmpty ( )) { |
492 | m_tc.m_last_directory = QFileInfo( file ).dirPath(); | ||
485 | m_bgimage = DocLnk ( file ). file ( ); | 493 | m_bgimage = DocLnk ( file ). file ( ); |
486 | bgTypeClicked ( TabConfig::Image ); | 494 | bgTypeClicked ( TabConfig::Image ); |
487 | } | 495 | } |
488 | } | 496 | } |