-rw-r--r-- | kaddressbook/views/contactlistview.cpp | 8 | ||||
-rw-r--r-- | microkde/kdeui/klistview.cpp | 3 | ||||
-rw-r--r-- | microkde/kglobalsettings.cpp | 9 | ||||
-rw-r--r-- | microkde/kglobalsettings.h | 1 |
4 files changed, 15 insertions, 6 deletions
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 09d9c03..9accf78 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp | |||
@@ -249,21 +249,21 @@ ContactListView::ContactListView(KAddressBookTableView *view, | |||
249 | pabWidget( view ), | 249 | pabWidget( view ), |
250 | oldColumn( 0 ) | 250 | oldColumn( 0 ) |
251 | { | 251 | { |
252 | mFlagBlockKeyPressed = false; | 252 | mFlagBlockKeyPressed = false; |
253 | mFlagKeyPressed = false; | 253 | mFlagKeyPressed = false; |
254 | mABackground = true; | 254 | mABackground = true; |
255 | mSingleLine = false; | 255 | mSingleLine = false; |
256 | mToolTips = true; | 256 | mToolTips = true; |
257 | #ifndef KAB_EMBEDDED | 257 | |
258 | mAlternateColor = KGlobalSettings::alternateBackgroundColor(); | 258 | mAlternateColor = KGlobalSettings::alternateBackgroundColor(); |
259 | #else //KAB_EMBEDDED | 259 | |
260 | mAlternateColor = QColor(240, 240, 240); | 260 | |
261 | #endif //KAB_EMBEDDED | 261 | |
262 | 262 | ||
263 | setAlternateBackgroundEnabled(mABackground); | 263 | setAlternateBackgroundEnabled(mABackground); |
264 | setAcceptDrops( true ); | 264 | setAcceptDrops( true ); |
265 | viewport()->setAcceptDrops( true ); | 265 | viewport()->setAcceptDrops( true ); |
266 | setAllColumnsShowFocus( true ); | 266 | setAllColumnsShowFocus( true ); |
267 | setShowSortIndicator(true); | 267 | setShowSortIndicator(true); |
268 | 268 | ||
269 | setSelectionModeExt( KListView::Extended ); | 269 | setSelectionModeExt( KListView::Extended ); |
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp index 31e2053..25327aa 100644 --- a/microkde/kdeui/klistview.cpp +++ b/microkde/kdeui/klistview.cpp | |||
@@ -454,18 +454,17 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse | |||
454 | this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); | 454 | this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); |
455 | } | 455 | } |
456 | 456 | ||
457 | connect (this, SIGNAL (menuShortCutPressed (KListView*, QListViewItem*)), | 457 | connect (this, SIGNAL (menuShortCutPressed (KListView*, QListViewItem*)), |
458 | this, SLOT (emitContextMenu (KListView*, QListViewItem*))); | 458 | this, SLOT (emitContextMenu (KListView*, QListViewItem*))); |
459 | 459 | ||
460 | 460 | ||
461 | //qDebug("KListView::KListView make alternate color configurable"); | 461 | //qDebug("KListView::KListView make alternate color configurable"); |
462 | //US d->alternateBackground = KGlobalSettings::alternateBackgroundColor(); | 462 | d->alternateBackground = KGlobalSettings::alternateBackgroundColor(); |
463 | d->alternateBackground = QColor(240, 240, 240); | ||
464 | } | 463 | } |
465 | 464 | ||
466 | 465 | ||
467 | 466 | ||
468 | KListView::~KListView() | 467 | KListView::~KListView() |
469 | { | 468 | { |
470 | delete d; | 469 | delete d; |
471 | } | 470 | } |
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index b65ce66..92a2b48 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp | |||
@@ -53,16 +53,25 @@ QFont KGlobalSettings::toolBarFont() | |||
53 | return QApplication::font(); | 53 | return QApplication::font(); |
54 | } | 54 | } |
55 | 55 | ||
56 | QColor KGlobalSettings::toolBarHighlightColor() | 56 | QColor KGlobalSettings::toolBarHighlightColor() |
57 | { | 57 | { |
58 | return QColor( "black" ); | 58 | return QColor( "black" ); |
59 | } | 59 | } |
60 | 60 | ||
61 | QColor KGlobalSettings::alternateBackgroundColor() | ||
62 | { | ||
63 | #ifdef DESKTOP_VERSION | ||
64 | return QColor( 235, 235, 235 ); | ||
65 | #else | ||
66 | return QColor( 220, 220, 220 ); | ||
67 | #endif | ||
68 | } | ||
69 | |||
61 | QRect KGlobalSettings::desktopGeometry( QWidget * ) | 70 | QRect KGlobalSettings::desktopGeometry( QWidget * ) |
62 | { | 71 | { |
63 | return QApplication::desktop()->rect(); | 72 | return QApplication::desktop()->rect(); |
64 | } | 73 | } |
65 | 74 | ||
66 | /** | 75 | /** |
67 | * Returns whether KDE runs in single (default) or double click | 76 | * Returns whether KDE runs in single (default) or double click |
68 | * mode. | 77 | * mode. |
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h index 3eeda35..e2620b3 100644 --- a/microkde/kglobalsettings.h +++ b/microkde/kglobalsettings.h | |||
@@ -11,16 +11,17 @@ | |||
11 | class KGlobalSettings | 11 | class KGlobalSettings |
12 | { | 12 | { |
13 | public: | 13 | public: |
14 | static QFont generalFont(); | 14 | static QFont generalFont(); |
15 | static QFont generalMaxFont(); | 15 | static QFont generalMaxFont(); |
16 | static QFont toolBarFont(); | 16 | static QFont toolBarFont(); |
17 | 17 | ||
18 | static QColor toolBarHighlightColor(); | 18 | static QColor toolBarHighlightColor(); |
19 | static QColor alternateBackgroundColor(); | ||
19 | static QRect desktopGeometry( QWidget * ); | 20 | static QRect desktopGeometry( QWidget * ); |
20 | static QString timeTrackerDir(); | 21 | static QString timeTrackerDir(); |
21 | 22 | ||
22 | /** | 23 | /** |
23 | * Returns whether KDE runs in single (default) or double click | 24 | * Returns whether KDE runs in single (default) or double click |
24 | * mode. | 25 | * mode. |
25 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html | 26 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html |
26 | * @return true if single click mode, or false if double click mode. | 27 | * @return true if single click mode, or false if double click mode. |