author | drw <drw> | 2004-04-06 15:42:02 (UTC) |
---|---|---|
committer | drw <drw> | 2004-04-06 15:42:02 (UTC) |
commit | e97648cdac8aba383e69e87c2d60644eb3bcc18d (patch) (unidiff) | |
tree | c85c0edba53e01966320fc64559b27cdbfc7ae50 | |
parent | f55329d69e2dd21085294916b3ba49ea529214e0 (diff) | |
download | opie-e97648cdac8aba383e69e87c2d60644eb3bcc18d.zip opie-e97648cdac8aba383e69e87c2d60644eb3bcc18d.tar.gz opie-e97648cdac8aba383e69e87c2d60644eb3bcc18d.tar.bz2 |
Some spelling and capitalization fixes for menu items
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/doclnksearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index 34cf0ce..1b44be2 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -9,50 +9,50 @@ | |||
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "datebooksearch.h" | 13 | #include "datebooksearch.h" |
14 | #include "eventitem.h" | 14 | #include "eventitem.h" |
15 | 15 | ||
16 | #include <opie2/odebug.h> | 16 | #include <opie2/odebug.h> |
17 | #include <opie2/opimevent.h> | 17 | #include <opie2/opimevent.h> |
18 | #include <opie2/opimrecurrence.h> | 18 | #include <opie2/opimrecurrence.h> |
19 | 19 | ||
20 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | 22 | ||
23 | #include <qaction.h> | 23 | #include <qaction.h> |
24 | #include <qpopupmenu.h> | 24 | #include <qpopupmenu.h> |
25 | 25 | ||
26 | 26 | ||
27 | 27 | ||
28 | DatebookSearch::DatebookSearch(QListView* parent, QString name) | 28 | DatebookSearch::DatebookSearch(QListView* parent, QString name) |
29 | : SearchGroup(parent, name), _dates(0), _popupMenu(0) | 29 | : SearchGroup(parent, name), _dates(0), _popupMenu(0) |
30 | { | 30 | { |
31 | QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" ); | 31 | QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" ); |
32 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 32 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
33 | actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null, 0, 0, 0, true ); | 33 | actionShowPastEvents = new QAction( QObject::tr("Show past events"),QString::null, 0, 0, 0, true ); |
34 | actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null, 0, 0, 0, true ); | 34 | actionSearchInDates = new QAction( QObject::tr("Search in dates"),QString::null, 0, 0, 0, true ); |
35 | Config cfg( "osearch", Config::User ); | 35 | Config cfg( "osearch", Config::User ); |
36 | cfg.setGroup( "datebook_settings" ); | 36 | cfg.setGroup( "datebook_settings" ); |
37 | actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) ); | 37 | actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) ); |
38 | actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) ); | 38 | actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) ); |
39 | } | 39 | } |
40 | 40 | ||
41 | DatebookSearch::~DatebookSearch() | 41 | DatebookSearch::~DatebookSearch() |
42 | { | 42 | { |
43 | odebug << "SAVE DATEBOOK SEARCH CONFIG" << oendl; | 43 | odebug << "SAVE DATEBOOK SEARCH CONFIG" << oendl; |
44 | Config cfg( "osearch", Config::User ); | 44 | Config cfg( "osearch", Config::User ); |
45 | cfg.setGroup( "datebook_settings" ); | 45 | cfg.setGroup( "datebook_settings" ); |
46 | cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() ); | 46 | cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() ); |
47 | cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() ); | 47 | cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() ); |
48 | delete _dates; | 48 | delete _dates; |
49 | delete _popupMenu; | 49 | delete _popupMenu; |
50 | delete actionShowPastEvents; | 50 | delete actionShowPastEvents; |
51 | delete actionSearchInDates; | 51 | delete actionSearchInDates; |
52 | } | 52 | } |
53 | 53 | ||
54 | 54 | ||
55 | void DatebookSearch::load() | 55 | void DatebookSearch::load() |
56 | { | 56 | { |
57 | _dates = new ODateBookAccess(); | 57 | _dates = new ODateBookAccess(); |
58 | _dates->load(); | 58 | _dates->load(); |
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp index 3f0d223..4631dce 100644 --- a/core/pim/osearch/doclnksearch.cpp +++ b/core/pim/osearch/doclnksearch.cpp | |||
@@ -13,49 +13,49 @@ | |||
13 | 13 | ||
14 | 14 | ||
15 | #include "doclnkitem.h" | 15 | #include "doclnkitem.h" |
16 | #include "doclnksearch.h" | 16 | #include "doclnksearch.h" |
17 | 17 | ||
18 | #include <opie2/owait.h> | 18 | #include <opie2/owait.h> |
19 | 19 | ||
20 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | 24 | ||
25 | #include <qaction.h> | 25 | #include <qaction.h> |
26 | #include <qfile.h> | 26 | #include <qfile.h> |
27 | #include <qpopupmenu.h> | 27 | #include <qpopupmenu.h> |
28 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
29 | 29 | ||
30 | 30 | ||
31 | DocLnkSearch::DocLnkSearch(QListView* parent, QString name) | 31 | DocLnkSearch::DocLnkSearch(QListView* parent, QString name) |
32 | : AppLnkSearch(parent, name), _popupMenu(0) | 32 | : AppLnkSearch(parent, name), _popupMenu(0) |
33 | { | 33 | { |
34 | QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" ); | 34 | QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" ); |
35 | setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) ); | 35 | setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) ); |
36 | 36 | ||
37 | actionSearchInFiles = new QAction( QObject::tr("search content"),QString::null, 0, 0, 0, true ); | 37 | actionSearchInFiles = new QAction( QObject::tr("Search content"),QString::null, 0, 0, 0, true ); |
38 | Config cfg( "osearch", Config::User ); | 38 | Config cfg( "osearch", Config::User ); |
39 | cfg.setGroup( "doclnk_settings" ); | 39 | cfg.setGroup( "doclnk_settings" ); |
40 | actionSearchInFiles->setOn( cfg.readBoolEntry( "search_content", false ) ); | 40 | actionSearchInFiles->setOn( cfg.readBoolEntry( "search_content", false ) ); |
41 | } | 41 | } |
42 | 42 | ||
43 | 43 | ||
44 | DocLnkSearch::~DocLnkSearch() | 44 | DocLnkSearch::~DocLnkSearch() |
45 | { | 45 | { |
46 | Config cfg( "osearch", Config::User ); | 46 | Config cfg( "osearch", Config::User ); |
47 | cfg.setGroup( "doclnk_settings" ); | 47 | cfg.setGroup( "doclnk_settings" ); |
48 | cfg.writeEntry( "search_content", actionSearchInFiles->isOn() ); | 48 | cfg.writeEntry( "search_content", actionSearchInFiles->isOn() ); |
49 | } | 49 | } |
50 | 50 | ||
51 | void DocLnkSearch::load() | 51 | void DocLnkSearch::load() |
52 | { | 52 | { |
53 | _apps = new DocLnkSet(QPEApplication::documentDir()); | 53 | _apps = new DocLnkSet(QPEApplication::documentDir()); |
54 | } | 54 | } |
55 | 55 | ||
56 | bool DocLnkSearch::searchFile( AppLnk *app ) | 56 | bool DocLnkSearch::searchFile( AppLnk *app ) |
57 | { | 57 | { |
58 | if (!actionSearchInFiles->isOn()) return false; | 58 | if (!actionSearchInFiles->isOn()) return false; |
59 | DocLnk *doc = (DocLnk*)app; | 59 | DocLnk *doc = (DocLnk*)app; |
60 | bool found = false; | 60 | bool found = false; |
61 | if ( doc->type().contains( "text" ) ){ | 61 | if ( doc->type().contains( "text" ) ){ |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 3edc8de..798e1f1 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -153,49 +153,49 @@ void MainWindow::makeMenu() | |||
153 | menuBar->insertItem( tr( "Settings" ), cfgMenu ); | 153 | menuBar->insertItem( tr( "Settings" ), cfgMenu ); |
154 | 154 | ||
155 | //SETTINGS MENU | 155 | //SETTINGS MENU |
156 | cfgMenu->insertItem( tr( "Search" ), searchOptions ); | 156 | cfgMenu->insertItem( tr( "Search" ), searchOptions ); |
157 | QPopupMenu *pop; | 157 | QPopupMenu *pop; |
158 | for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ | 158 | for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ |
159 | pop = s->popupMenu(); | 159 | pop = s->popupMenu(); |
160 | if (pop){ | 160 | if (pop){ |
161 | cfgMenu->insertItem( s->text(0), pop ); | 161 | cfgMenu->insertItem( s->text(0), pop ); |
162 | } | 162 | } |
163 | } | 163 | } |
164 | 164 | ||
165 | 165 | ||
166 | //SEARCH | 166 | //SEARCH |
167 | SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); | 167 | SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); |
168 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); | 168 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); |
169 | // QWhatsThis::add( SearchAllAction, tr("Search everything...") ); | 169 | // QWhatsThis::add( SearchAllAction, tr("Search everything...") ); |
170 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); | 170 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); |
171 | SearchAllAction->addTo( searchMenu ); | 171 | SearchAllAction->addTo( searchMenu ); |
172 | searchMenu->insertItem( tr( "Options" ), searchOptions ); | 172 | searchMenu->insertItem( tr( "Options" ), searchOptions ); |
173 | 173 | ||
174 | //SEARCH OPTIONS | 174 | //SEARCH OPTIONS |
175 | //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true ); | 175 | //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true ); |
176 | //actionWholeWordsOnly->addTo( searchOptions ); | 176 | //actionWholeWordsOnly->addTo( searchOptions ); |
177 | actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null, 0, this, 0, true ); | 177 | actionCaseSensitiv = new QAction( tr("Case sensitive"),QString::null, 0, this, 0, true ); |
178 | actionCaseSensitiv->addTo( searchOptions ); | 178 | actionCaseSensitiv->addTo( searchOptions ); |
179 | actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); | 179 | actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); |
180 | actionWildcards->addTo( searchOptions ); | 180 | actionWildcards->addTo( searchOptions ); |
181 | 181 | ||
182 | //SEARCH BAR | 182 | //SEARCH BAR |
183 | LabelEnterText = new QLabel( searchBar, "Label" ); | 183 | LabelEnterText = new QLabel( searchBar, "Label" ); |
184 | LabelEnterText->setAutoMask( FALSE ); | 184 | LabelEnterText->setAutoMask( FALSE ); |
185 | LabelEnterText->setText( tr( "Search for: " ) ); | 185 | LabelEnterText->setText( tr( "Search for: " ) ); |
186 | 186 | ||
187 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); | 187 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); |
188 | QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); | 188 | QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); |
189 | QWhatsThis::add( searchEdit, tr("Enter your search terms here") ); | 189 | QWhatsThis::add( searchEdit, tr("Enter your search terms here") ); |
190 | searchEdit->setFocus(); | 190 | searchEdit->setFocus(); |
191 | searchBar->setHorizontalStretchable( TRUE ); | 191 | searchBar->setHorizontalStretchable( TRUE ); |
192 | searchBar->setStretchableWidget( searchEdit ); | 192 | searchBar->setStretchableWidget( searchEdit ); |
193 | 193 | ||
194 | //Search button | 194 | //Search button |
195 | SearchAllAction->addTo( searchBar ); | 195 | SearchAllAction->addTo( searchBar ); |
196 | 196 | ||
197 | //image ripped of off opie-login/loginwindow.cpp | 197 | //image ripped of off opie-login/loginwindow.cpp |
198 | QPixmap image1( ( const char** ) image1_data ); | 198 | QPixmap image1( ( const char** ) image1_data ); |
199 | 199 | ||
200 | //Clear text | 200 | //Clear text |
201 | ClearSearchText = new QToolButton( searchBar, "ClearSearchText"); | 201 | ClearSearchText = new QToolButton( searchBar, "ClearSearchText"); |
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp index 1839566..48fa909 100644 --- a/core/pim/osearch/todosearch.cpp +++ b/core/pim/osearch/todosearch.cpp | |||
@@ -6,49 +6,49 @@ | |||
6 | // | 6 | // |
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "todosearch.h" | 13 | #include "todosearch.h" |
14 | #include "todoitem.h" | 14 | #include "todoitem.h" |
15 | 15 | ||
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
18 | 18 | ||
19 | #include <qaction.h> | 19 | #include <qaction.h> |
20 | #include <qpopupmenu.h> | 20 | #include <qpopupmenu.h> |
21 | 21 | ||
22 | using namespace Opie; | 22 | using namespace Opie; |
23 | TodoSearch::TodoSearch(QListView* parent, QString name) | 23 | TodoSearch::TodoSearch(QListView* parent, QString name) |
24 | : SearchGroup(parent, name), _todos(0), _popupMenu(0) | 24 | : SearchGroup(parent, name), _todos(0), _popupMenu(0) |
25 | { | 25 | { |
26 | //AppLnkSet als(QPEApplication::qpeDir()); | 26 | //AppLnkSet als(QPEApplication::qpeDir()); |
27 | //setPixmap( 0, als.findExec("todolist")->pixmap() ); | 27 | //setPixmap( 0, als.findExec("todolist")->pixmap() ); |
28 | QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" ); | 28 | QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" ); |
29 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 29 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
30 | actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true ); | 30 | actionShowCompleted = new QAction( QObject::tr("Show completed tasks"),QString::null, 0, 0, 0, true ); |
31 | Config cfg( "osearch", Config::User ); | 31 | Config cfg( "osearch", Config::User ); |
32 | cfg.setGroup( "todo_settings" ); | 32 | cfg.setGroup( "todo_settings" ); |
33 | actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) ); | 33 | actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) ); |
34 | 34 | ||
35 | } | 35 | } |
36 | 36 | ||
37 | 37 | ||
38 | TodoSearch::~TodoSearch() | 38 | TodoSearch::~TodoSearch() |
39 | { | 39 | { |
40 | Config cfg( "osearch", Config::User ); | 40 | Config cfg( "osearch", Config::User ); |
41 | cfg.setGroup( "todo_settings" ); | 41 | cfg.setGroup( "todo_settings" ); |
42 | cfg.writeEntry( "show_completed_tasks", actionShowCompleted->isOn() ); | 42 | cfg.writeEntry( "show_completed_tasks", actionShowCompleted->isOn() ); |
43 | delete _popupMenu; | 43 | delete _popupMenu; |
44 | delete actionShowCompleted; | 44 | delete actionShowCompleted; |
45 | delete _todos; | 45 | delete _todos; |
46 | } | 46 | } |
47 | 47 | ||
48 | 48 | ||
49 | void TodoSearch::load() | 49 | void TodoSearch::load() |
50 | { | 50 | { |
51 | _todos = new OPimTodoAccess(); | 51 | _todos = new OPimTodoAccess(); |
52 | _todos->load(); | 52 | _todos->load(); |
53 | } | 53 | } |
54 | 54 | ||