-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 7 | ||||
-rw-r--r-- | core/pim/osearch/olistview.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 33a24bc..093ca54 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -48,111 +48,112 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
48 | setCaption( tr("OSearch") ); | 48 | setCaption( tr("OSearch") ); |
49 | 49 | ||
50 | setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); | 50 | setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); |
51 | 51 | ||
52 | QFrame *mainFrame = new QFrame( this, "mainFrame" ); | 52 | QFrame *mainFrame = new QFrame( this, "mainFrame" ); |
53 | 53 | ||
54 | mainLayout = new QVBoxLayout( mainFrame ); | 54 | mainLayout = new QVBoxLayout( mainFrame ); |
55 | mainLayout->setSpacing( 0 ); | 55 | mainLayout->setSpacing( 0 ); |
56 | mainLayout->setMargin( 0 ); | 56 | mainLayout->setMargin( 0 ); |
57 | 57 | ||
58 | resultsList = new OListView( mainFrame ); | 58 | resultsList = new OListView( mainFrame ); |
59 | resultsList->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); | 59 | resultsList->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); |
60 | mainLayout->addWidget( resultsList, 1 ); | 60 | mainLayout->addWidget( resultsList, 1 ); |
61 | 61 | ||
62 | detailsFrame = new QFrame( mainFrame, "detailsFrame" ); | 62 | detailsFrame = new QFrame( mainFrame, "detailsFrame" ); |
63 | QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame ); | 63 | QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame ); |
64 | richEdit = new QTextView( detailsFrame ); | 64 | richEdit = new QTextView( detailsFrame ); |
65 | richEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); | 65 | richEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding)); |
66 | //richEdit->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum )); | 66 | //richEdit->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum )); |
67 | detailsLayout->addWidget( richEdit, 1 ); | 67 | detailsLayout->addWidget( richEdit, 1 ); |
68 | 68 | ||
69 | buttonGroupActions = new QHButtonGroup( this ); | 69 | buttonGroupActions = new QHButtonGroup( this ); |
70 | buttonGroupActions->hide(); | 70 | buttonGroupActions->hide(); |
71 | _buttonCount = 0; | 71 | _buttonCount = 0; |
72 | // buttonGroupActions->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); | 72 | // buttonGroupActions->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); |
73 | 73 | ||
74 | buttonLayout = new QHBoxLayout( detailsFrame ); | 74 | buttonLayout = new QHBoxLayout( detailsFrame ); |
75 | detailsLayout->addLayout( buttonLayout ); | 75 | detailsLayout->addLayout( buttonLayout ); |
76 | 76 | ||
77 | mainLayout->addWidget( detailsFrame ); | 77 | mainLayout->addWidget( detailsFrame ); |
78 | detailsFrame->hide(); | 78 | detailsFrame->hide(); |
79 | 79 | ||
80 | searches.append( new AdressSearch( resultsList, tr("adressbook") ) ); | ||
81 | searches.append( new TodoSearch( resultsList, tr("todo") ) ); | ||
82 | searches.append( new DatebookSearch( resultsList, tr("datebook") ) ); | ||
83 | searches.append( new AppLnkSearch( resultsList, tr("applications") ) ); | 80 | searches.append( new AppLnkSearch( resultsList, tr("applications") ) ); |
84 | searches.append( new DocLnkSearch( resultsList, tr("documents") ) ); | 81 | searches.append( new DocLnkSearch( resultsList, tr("documents") ) ); |
82 | searches.append( new TodoSearch( resultsList, tr("todo") ) ); | ||
83 | searches.append( new DatebookSearch( resultsList, tr("datebook") ) ); | ||
84 | searches.append( new AdressSearch( resultsList, tr("adressbook") ) ); | ||
85 | 85 | ||
86 | makeMenu(); | 86 | makeMenu(); |
87 | setCentralWidget( mainFrame ); | 87 | setCentralWidget( mainFrame ); |
88 | 88 | ||
89 | popupTimer = new QTimer(); | 89 | popupTimer = new QTimer(); |
90 | searchTimer = new QTimer(); | 90 | searchTimer = new QTimer(); |
91 | 91 | ||
92 | connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup())); | 92 | connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup())); |
93 | connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged())); | 93 | connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged())); |
94 | connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*))); | 94 | connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*))); |
95 | connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*))); | 95 | connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*))); |
96 | connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) ); | 96 | connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) ); |
97 | 97 | ||
98 | } | 98 | } |
99 | 99 | ||
100 | void MainWindow::makeMenu() | 100 | void MainWindow::makeMenu() |
101 | { | 101 | { |
102 | QPEToolBar *toolBar = new QPEToolBar( this ); | 102 | QPEToolBar *toolBar = new QPEToolBar( this ); |
103 | QPEToolBar *searchBar = new QPEToolBar(this); | 103 | QPEToolBar *searchBar = new QPEToolBar(this); |
104 | QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); | 104 | QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); |
105 | QPopupMenu *searchMenu = new QPopupMenu( menuBar ); | 105 | QPopupMenu *searchMenu = new QPopupMenu( menuBar ); |
106 | // QPopupMenu *viewMenu = new QPopupMenu( menuBar ); | 106 | // QPopupMenu *viewMenu = new QPopupMenu( menuBar ); |
107 | // QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); | 107 | // QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); |
108 | // | 108 | // |
109 | setToolBarsMovable( false ); | 109 | setToolBarsMovable( false ); |
110 | toolBar->setHorizontalStretchable( true ); | 110 | toolBar->setHorizontalStretchable( true ); |
111 | menuBar->insertItem( tr( "Search" ), searchMenu ); | 111 | menuBar->insertItem( tr( "Search" ), searchMenu ); |
112 | // menuBar->insertItem( tr( "View" ), viewMenu ); | 112 | // menuBar->insertItem( tr( "View" ), viewMenu ); |
113 | // menuBar->insertItem( tr( "Settings" ), cfgMenu ); | 113 | // menuBar->insertItem( tr( "Settings" ), cfgMenu ); |
114 | 114 | ||
115 | //SEARCH | 115 | //SEARCH |
116 | SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); | 116 | SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); |
117 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); | 117 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); |
118 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); | 118 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); |
119 | SearchAllAction->addTo( searchMenu ); | 119 | SearchAllAction->addTo( searchMenu ); |
120 | actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); | 120 | actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); |
121 | actionCaseSensitiv->addTo( searchMenu ); | 121 | actionCaseSensitiv->addTo( searchMenu ); |
122 | actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); | 122 | actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); |
123 | actionWildcards->addTo( searchMenu ); | 123 | actionWildcards->addTo( searchMenu ); |
124 | 124 | ||
125 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); | 125 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); |
126 | QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); | 126 | QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); |
127 | searchEdit->setFocus(); | ||
127 | searchBar->setHorizontalStretchable( TRUE ); | 128 | searchBar->setHorizontalStretchable( TRUE ); |
128 | searchBar->setStretchableWidget( searchEdit ); | 129 | searchBar->setStretchableWidget( searchEdit ); |
129 | SearchAllAction->addTo( searchBar ); | 130 | SearchAllAction->addTo( searchBar ); |
130 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), | 131 | connect( searchEdit, SIGNAL( textChanged( const QString & ) ), |
131 | this, SLOT( setSearch( const QString & ) ) ); | 132 | this, SLOT( setSearch( const QString & ) ) ); |
132 | 133 | ||
133 | } | 134 | } |
134 | 135 | ||
135 | MainWindow::~MainWindow() | 136 | MainWindow::~MainWindow() |
136 | { | 137 | { |
137 | } | 138 | } |
138 | 139 | ||
139 | void MainWindow::setCurrent(QListViewItem *item) | 140 | void MainWindow::setCurrent(QListViewItem *item) |
140 | { | 141 | { |
141 | if (!item) return; | 142 | if (!item) return; |
142 | _currentItem = (OListViewItem*)item; | 143 | _currentItem = (OListViewItem*)item; |
143 | //_currentItem = dynamic_cast<OListViewItem*>(item); | 144 | //_currentItem = dynamic_cast<OListViewItem*>(item); |
144 | if (_currentItem->rtti() == OListViewItem::Result){ | 145 | if (_currentItem->rtti() == OListViewItem::Result){ |
145 | ResultItem *res = (ResultItem*)item; | 146 | ResultItem *res = (ResultItem*)item; |
146 | // ResultItem *res = dynamic_cast<ResultItem*>(item); | 147 | // ResultItem *res = dynamic_cast<ResultItem*>(item); |
147 | richEdit->setText( res->toRichText() ); | 148 | richEdit->setText( res->toRichText() ); |
148 | QIntDict<QString> acts = res->actions(); | 149 | QIntDict<QString> acts = res->actions(); |
149 | QButton *button; | 150 | QButton *button; |
150 | for (uint i = 0; i < acts.count(); i++){ | 151 | for (uint i = 0; i < acts.count(); i++){ |
151 | button = buttonGroupActions->find( i ); | 152 | button = buttonGroupActions->find( i ); |
152 | qDebug("action %i >%s<",i,acts[i]->latin1()); | 153 | qDebug("action %i >%s<",i,acts[i]->latin1()); |
153 | if (!button) { | 154 | if (!button) { |
154 | qDebug("BUTTON"); | 155 | qDebug("BUTTON"); |
155 | button = new QPushButton( detailsFrame ); | 156 | button = new QPushButton( detailsFrame ); |
156 | buttonLayout->addWidget( button, 0 ); | 157 | buttonLayout->addWidget( button, 0 ); |
157 | buttonGroupActions->insert( button, i); | 158 | buttonGroupActions->insert( button, i); |
158 | } | 159 | } |
diff --git a/core/pim/osearch/olistview.cpp b/core/pim/osearch/olistview.cpp index f5fe462..06392ba 100644 --- a/core/pim/osearch/olistview.cpp +++ b/core/pim/osearch/olistview.cpp | |||
@@ -1,35 +1,35 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * This program is free software; you can redistribute it and/or modify * | 3 | * This program is free software; you can redistribute it and/or modify * |
4 | * it under the terms of the GNU General Public License as published by * | 4 | * it under the terms of the GNU General Public License as published by * |
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * (at your option) any later version. * | 6 | * (at your option) any later version. * |
7 | * * | 7 | * * |
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> | 9 | // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> |
10 | 10 | ||
11 | #include "olistview.h" | 11 | #include "olistview.h" |
12 | #include "olistviewitem.h" | 12 | #include "olistviewitem.h" |
13 | #include <qmessagebox.h> | 13 | #include <qmessagebox.h> |
14 | 14 | ||
15 | 15 | ||
16 | OListView::OListView(QWidget *parent, const char *name ) | 16 | OListView::OListView(QWidget *parent, const char *name ) |
17 | : QListView(parent,name) | 17 | : QListView(parent,name) |
18 | { | 18 | { |
19 | 19 | ||
20 | setRootIsDecorated( true ); | 20 | setRootIsDecorated( true ); |
21 | addColumn(tr("Results")); | 21 | addColumn(tr("Results")); |
22 | 22 | setSorting( -1 ); | |
23 | connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); | 23 | connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); |
24 | } | 24 | } |
25 | 25 | ||
26 | 26 | ||
27 | OListView::~OListView() | 27 | OListView::~OListView() |
28 | { | 28 | { |
29 | } | 29 | } |
30 | 30 | ||
31 | void OListView::expand(QListViewItem *item) | 31 | void OListView::expand(QListViewItem *item) |
32 | { | 32 | { |
33 | ((OListViewItem*)item)->expand(); | 33 | ((OListViewItem*)item)->expand(); |
34 | } | 34 | } |
35 | 35 | ||