author | zautrix <zautrix> | 2005-04-11 00:29:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-11 00:29:46 (UTC) |
commit | 93b536533e1c908085adb61553907615c31786c0 (patch) (unidiff) | |
tree | 42b150b957c815416143c4ba82be4099d254ba37 /microkde | |
parent | 726d9302b230f53cc058d2dbfd89c7a3c4f18fb2 (diff) | |
download | kdepimpi-93b536533e1c908085adb61553907615c31786c0.zip kdepimpi-93b536533e1c908085adb61553907615c31786c0.tar.gz kdepimpi-93b536533e1c908085adb61553907615c31786c0.tar.bz2 |
fixxxxxx
-rw-r--r-- | microkde/kdeui/klistview.cpp | 3 | ||||
-rw-r--r-- | microkde/kglobalsettings.cpp | 9 | ||||
-rw-r--r-- | microkde/kglobalsettings.h | 1 |
3 files changed, 11 insertions, 2 deletions
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 | |||
@@ -438,50 +438,49 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse | |||
438 | 438 | ||
439 | 439 | ||
440 | connect(&d->autoSelect, SIGNAL( timeout() ), | 440 | connect(&d->autoSelect, SIGNAL( timeout() ), |
441 | this, SLOT( slotAutoSelect() ) ); | 441 | this, SLOT( slotAutoSelect() ) ); |
442 | connect(&d->dragExpand, SIGNAL( timeout() ), | 442 | connect(&d->dragExpand, SIGNAL( timeout() ), |
443 | this, SLOT( slotDragExpand() ) ); | 443 | this, SLOT( slotDragExpand() ) ); |
444 | 444 | ||
445 | // context menu handling | 445 | // context menu handling |
446 | if (d->showContextMenusOnPress) | 446 | if (d->showContextMenusOnPress) |
447 | { | 447 | { |
448 | connect (this, SIGNAL (rightButtonPressed (QListViewItem*, const QPoint&, int)), | 448 | connect (this, SIGNAL (rightButtonPressed (QListViewItem*, const QPoint&, int)), |
449 | this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); | 449 | this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); |
450 | } | 450 | } |
451 | else | 451 | else |
452 | { | 452 | { |
453 | connect (this, SIGNAL (rightButtonClicked (QListViewItem*, const QPoint&, int)), | 453 | connect (this, SIGNAL (rightButtonClicked (QListViewItem*, const QPoint&, int)), |
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 | } |
472 | 471 | ||
473 | bool KListView::isExecuteArea( const QPoint& point ) | 472 | bool KListView::isExecuteArea( const QPoint& point ) |
474 | { | 473 | { |
475 | if ( itemAt( point ) ) | 474 | if ( itemAt( point ) ) |
476 | return isExecuteArea( point.x() ); | 475 | return isExecuteArea( point.x() ); |
477 | 476 | ||
478 | return false; | 477 | return false; |
479 | } | 478 | } |
480 | 479 | ||
481 | bool KListView::isExecuteArea( int x ) | 480 | bool KListView::isExecuteArea( int x ) |
482 | { | 481 | { |
483 | if( allColumnsShowFocus() ) | 482 | if( allColumnsShowFocus() ) |
484 | return true; | 483 | return true; |
485 | else { | 484 | else { |
486 | int offset = 0; | 485 | int offset = 0; |
487 | int width = columnWidth( 0 ); | 486 | int width = columnWidth( 0 ); |
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index b65ce66..92a2b48 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp | |||
@@ -37,41 +37,50 @@ QFont KGlobalSettings::generalMaxFont() | |||
37 | f.setPointSize( size ); | 37 | f.setPointSize( size ); |
38 | return f; | 38 | return f; |
39 | } | 39 | } |
40 | 40 | ||
41 | QString KGlobalSettings::timeTrackerDir() | 41 | QString KGlobalSettings::timeTrackerDir() |
42 | { | 42 | { |
43 | static QString dir; | 43 | static QString dir; |
44 | if ( dir.isEmpty() ) { | 44 | if ( dir.isEmpty() ) { |
45 | dir = locateLocal( "data", "timetrackerdir/d.ttl" ); | 45 | dir = locateLocal( "data", "timetrackerdir/d.ttl" ); |
46 | dir = dir.left ( dir.length() - 5); | 46 | dir = dir.left ( dir.length() - 5); |
47 | } | 47 | } |
48 | return dir; | 48 | return dir; |
49 | } | 49 | } |
50 | 50 | ||
51 | QFont KGlobalSettings::toolBarFont() | 51 | QFont KGlobalSettings::toolBarFont() |
52 | { | 52 | { |
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. |
69 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html | 78 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html |
70 | * @return true if single click mode, or false if double click mode. | 79 | * @return true if single click mode, or false if double click mode. |
71 | **/ | 80 | **/ |
72 | bool KGlobalSettings::singleClick() | 81 | bool KGlobalSettings::singleClick() |
73 | { | 82 | { |
74 | KConfig *c = KGlobal::config(); | 83 | KConfig *c = KGlobal::config(); |
75 | KConfigGroupSaver cgs( c, "KDE" ); | 84 | KConfigGroupSaver cgs( c, "KDE" ); |
76 | return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK); | 85 | return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK); |
77 | } | 86 | } |
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h index 3eeda35..e2620b3 100644 --- a/microkde/kglobalsettings.h +++ b/microkde/kglobalsettings.h | |||
@@ -1,32 +1,33 @@ | |||
1 | #ifndef MICROKDE_KGLOBALSETTINGS_H | 1 | #ifndef MICROKDE_KGLOBALSETTINGS_H |
2 | #define MICROKDE_KGLOBALSETTINGS_H | 2 | #define MICROKDE_KGLOBALSETTINGS_H |
3 | 3 | ||
4 | #include <qfont.h> | 4 | #include <qfont.h> |
5 | #include <qrect.h> | 5 | #include <qrect.h> |
6 | 6 | ||
7 | 7 | ||
8 | #define KDE_DEFAULT_SINGLECLICK true | 8 | #define KDE_DEFAULT_SINGLECLICK true |
9 | 9 | ||
10 | 10 | ||
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. |
27 | **/ | 28 | **/ |
28 | static bool singleClick(); | 29 | static bool singleClick(); |
29 | 30 | ||
30 | }; | 31 | }; |
31 | 32 | ||
32 | #endif | 33 | #endif |