summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/mainwindow.cpp28
1 files changed, 22 insertions, 6 deletions
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 093ca54..b80c637 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -15,12 +15,13 @@
15#include <qpe/qpemenubar.h> 15#include <qpe/qpemenubar.h>
16#include <qpe/qpemessagebox.h> 16#include <qpe/qpemessagebox.h>
17#include <qpe/resource.h> 17#include <qpe/resource.h>
18#include <qpe/config.h> 18#include <qpe/config.h>
19#include <qpe/qpetoolbar.h> 19#include <qpe/qpetoolbar.h>
20#include <qpe/qpeapplication.h> 20#include <qpe/qpeapplication.h>
21#include <qpe/config.h>
21#include <qaction.h> 22#include <qaction.h>
22#include <qmessagebox.h> 23#include <qmessagebox.h>
23#include <qpopupmenu.h> 24#include <qpopupmenu.h>
24#include <qtoolbutton.h> 25#include <qtoolbutton.h>
25#include <qstring.h> 26#include <qstring.h>
26#include <qlabel.h> 27#include <qlabel.h>
@@ -92,39 +93,50 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
92 connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup())); 93 connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup()));
93 connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged())); 94 connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged()));
94 connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*))); 95 connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
95 connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*))); 96 connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
96 connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) ); 97 connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) );
97 98
99
100 Config cfg( "osearch", Config::User );
101 cfg.setGroup( "search_settings" );
102 actionCaseSensitiv->setOn( cfg.readBoolEntry( "caseSensitiv", false ) );
103 actionWildcards->setOn( cfg.readBoolEntry( "wildcards", false ) );
98} 104}
99 105
100void MainWindow::makeMenu() 106void MainWindow::makeMenu()
101{ 107{
102 QPEToolBar *toolBar = new QPEToolBar( this ); 108 QPEToolBar *toolBar = new QPEToolBar( this );
103 QPEToolBar *searchBar = new QPEToolBar(this); 109 QPEToolBar *searchBar = new QPEToolBar(this);
104 QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); 110 QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
105 QPopupMenu *searchMenu = new QPopupMenu( menuBar ); 111 QPopupMenu *searchMenu = new QPopupMenu( menuBar );
106// QPopupMenu *viewMenu = new QPopupMenu( menuBar ); 112// QPopupMenu *viewMenu = new QPopupMenu( menuBar );
107// QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); 113 QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
108// 114 QPopupMenu *searchOptions = new QPopupMenu( cfgMenu );
115
109 setToolBarsMovable( false ); 116 setToolBarsMovable( false );
110 toolBar->setHorizontalStretchable( true ); 117 toolBar->setHorizontalStretchable( true );
111 menuBar->insertItem( tr( "Search" ), searchMenu ); 118 menuBar->insertItem( tr( "Search" ), searchMenu );
112// menuBar->insertItem( tr( "View" ), viewMenu ); 119 menuBar->insertItem( tr( "Settings" ), cfgMenu );
113// menuBar->insertItem( tr( "Settings" ), cfgMenu ); 120 cfgMenu->insertItem( tr( "Search" ), searchOptions );
121
114 122
115 //SEARCH 123 //SEARCH
116 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); 124 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 );
117 SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); 125 SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
118 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); 126 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
119 SearchAllAction->addTo( searchMenu ); 127 SearchAllAction->addTo( searchMenu );
128 searchMenu->insertItem( tr( "Options" ), searchOptions );
129
130 //SEARCH OPTIONS
120 actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); 131 actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true );
121 actionCaseSensitiv->addTo( searchMenu ); 132 actionCaseSensitiv->addTo( searchOptions );
122 actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); 133 actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true );
123 actionWildcards->addTo( searchMenu ); 134 actionWildcards->addTo( searchOptions );
124 135
136 //SEARCH BAR
125 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); 137 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
126 QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); 138 QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
127 searchEdit->setFocus(); 139 searchEdit->setFocus();
128 searchBar->setHorizontalStretchable( TRUE ); 140 searchBar->setHorizontalStretchable( TRUE );
129 searchBar->setStretchableWidget( searchEdit ); 141 searchBar->setStretchableWidget( searchEdit );
130 SearchAllAction->addTo( searchBar ); 142 SearchAllAction->addTo( searchBar );
@@ -132,12 +144,16 @@ void MainWindow::makeMenu()
132 this, SLOT( setSearch( const QString & ) ) ); 144 this, SLOT( setSearch( const QString & ) ) );
133 145
134} 146}
135 147
136MainWindow::~MainWindow() 148MainWindow::~MainWindow()
137{ 149{
150 Config cfg( "osearch", Config::User );
151 cfg.setGroup( "search_settings" );
152 cfg.writeEntry( "caseSensitiv", actionCaseSensitiv->isOn() );
153 cfg.writeEntry( "wildcards", actionWildcards->isOn() );
138} 154}
139 155
140void MainWindow::setCurrent(QListViewItem *item) 156void MainWindow::setCurrent(QListViewItem *item)
141{ 157{
142 if (!item) return; 158 if (!item) return;
143 _currentItem = (OListViewItem*)item; 159 _currentItem = (OListViewItem*)item;